Merge pull request #4057 from fossasia/development

chore: Release v1.11
fossasia · Feb 11, 2020 · d767ad8 · d767ad8
2 parents 0a82d66 + 747f7aa
commit d767ad8
Show file tree

Hide file tree

Showing 23 changed files with 405 additions and 356 deletions.
diff --git a/app/components/forms/wizard/basic-details-step.js b/app/components/forms/wizard/basic-details-step.js
@@ -12,6 +12,7 @@ import { inject as service } from '@ember/service';
 import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
 import { protocolLessValidUrlPattern } from 'open-event-frontend/utils/validators';
 import ENV from 'open-event-frontend/config/environment';
+import $ from 'jquery';
 
 export default Component.extend(FormMixin, EventWizardMixin, {
 
@@ -128,6 +129,12 @@ export default Component.extend(FormMixin, EventWizardMixin, {
 
   // TODO: Removing the Event Time Validations due to the weird and buggy behaviour. Will be restored once a perfect solution is found. Please check issue: https://github.com/fossasia/open-event-frontend/issues/3667
   getValidationRules() {
+    $.fn.form.settings.rules.checkMaxMinPrice = () => {
+      return $('.ui.form').form('get value', 'min_price') <= $('.ui.form').form('get value', 'max_price');
+    };
+    $.fn.form.settings.rules.checkMaxMinOrder = () => {
+      return $('.ui.form').form('get value', 'ticket_min_order') <= $('.ui.form').form('get value', 'ticket_max_order');
+    };
 
     let validationRules = {
       inline : true,
@@ -257,6 +264,10 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'number',
               prompt : this.l10n.t('Invalid number')
+            },
+            {
+              type   : 'checkMaxMinOrder',
+              prompt : this.l10n.t('Minimum order should not be greater than maximum')
             }
           ]
         },
@@ -274,6 +285,10 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'integer[1..]',
               prompt : this.l10n.t('Maximum tickets per order should be greater than 0')
+            },
+            {
+              type   : 'checkMaxMinOrder',
+              prompt : this.l10n.t('Maximum order should not be less than minimum')
             }
           ]
         },
@@ -287,6 +302,10 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'integer[1..]',
               prompt : this.l10n.t('Minimum price needs to be greater than zero')
+            },
+            {
+              type   : 'checkMaxMinPrice',
+              prompt : this.l10n.t('Minimum price should not be greater than maximum')
             }
           ]
         },
@@ -300,6 +319,10 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'integer[1..]',
               prompt : this.l10n.t('Maximum price needs to be greater than zero')
+            },
+            {
+              type   : 'checkMaxMinPrice',
+              prompt : this.l10n.t('Maximum price should not be less than minimum')
             }
           ]
         },

diff --git a/app/components/public/side-menu.js b/app/components/public/side-menu.js
@@ -9,6 +9,23 @@ export default Component.extend({
     this.set('shouldShowCallforSpeakers',
       speakersCall && speakersCall.announcement && (speakersCall.privacy === 'public'));
   },
+  actions: {
+    scrollToTarget() {
+      document.querySelectorAll('.scroll').forEach(anchor => {
+        anchor.addEventListener('click', function(e) {
+          e.preventDefault();
+          document.querySelector(this.getAttribute('href')).scrollIntoView({
+            behavior: 'smooth'
+          });
+
+          document.querySelectorAll('.scroll').forEach(node => {
+            node.classList.remove('active');
+          });
+          e.target.classList.add('active');
+        });
+      });
+    }
+  },
   isSchedulePublished: computed('event.schedulePublishedOn', function() {
     return this.get('event.schedulePublishedOn') && this.get('event.schedulePublishedOn').toISOString() !== moment(0).toISOString();
   })

diff --git a/app/controllers/admin/users/view/events/list.js b/app/controllers/admin/users/view/events/list.js
@@ -12,8 +12,8 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
     return [
       {
         name            : 'Name',
-        valuePath       : 'id',
-        extraValuePaths : ['logoUrl', 'name', 'identifier', 'deletedAt'],
+        valuePath       : 'name',
+        extraValuePaths : ['logoUrl', 'identifier', 'deletedAt'],
         isSortable      : true,
         headerComponent : 'tables/headers/sort',
         cellComponent   : 'ui-table/cell/cell-event',

diff --git a/app/controllers/events/view.js b/app/controllers/events/view.js
@@ -3,11 +3,6 @@ import { isEmpty } from '@ember/utils';
 import { action } from '@ember/object';
 
 export default class extends Controller {
-  @action
-  openDeleteEventModal() {
-    this.set('isEventDeleteModalOpen', true);
-  }
-
   @action
   togglePublishState() {
     if (isEmpty(this.model.locationName)) {
@@ -46,29 +41,6 @@ export default class extends Controller {
       });
   }
 
-  @action
-  deleteEvent() {
-    this.set('isLoading', true);
-    this.model.destroyRecord()
-      .then(() => {
-        this.transitionToRoute('events');
-        this.notify.success(this.l10n.t('Event has been deleted successfully.'),
-          {
-            id: 'event_deleted_succ'
-          });
-      })
-      .catch(() => {
-        this.notify.error(this.l10n.t('An unexpected error has occurred.'),
-          {
-            id: 'event_deleted_error'
-          });
-      })
-      .finally(() => {
-        this.set('isLoading', false);
-      });
-    this.set('isEventDeleteModalOpen', false);
-  }
-
   @action
   copyEvent() {
     this.set('isCopying', true);

diff --git a/app/controllers/events/view/settings.js b/app/controllers/events/view/settings.js
@@ -3,6 +3,34 @@ import { action } from '@ember/object';
 
 export default class extends Controller {
 
+  @action
+  openDeleteEventModal() {
+    this.set('isEventDeleteModalOpen', true);
+  }
+
+  @action
+  deleteEvent() {
+    this.set('isLoading', true);
+    this.model.event.destroyRecord()
+      .then(() => {
+        this.transitionToRoute('events');
+        this.notify.success(this.l10n.t('Event has been deleted successfully.'),
+          {
+            id: 'event_deleted_succ'
+          });
+      })
+      .catch(() => {
+        this.notify.error(this.l10n.t('An unexpected error has occurred.'),
+          {
+            id: 'event_deleted_error'
+          });
+      })
+      .finally(() => {
+        this.set('isLoading', false);
+      });
+    this.set('isEventDeleteModalOpen', false);
+  }
+
   @action
   openEventTransferModal(id, name) {
     this.setProperties({

diff --git a/app/controllers/public/index.js b/app/controllers/public/index.js
@@ -131,7 +131,7 @@ export default Controller.extend({
         order.set('attendees', attendees);
         await order.save()
           .then(order => {
-            this.notify.success(this.l10n.t('Order details saved. Please fill further details within 10 minutes.'));
+            this.notify.success(this.l10n.t(`Order details saved. Please fill further details within ${this.settings.orderExpiryTime} minutes.`));
             this.transitionToRoute('orders.new', order.identifier);
           })
           .catch(async e => {

diff --git a/app/mixins/event-wizard.js b/app/mixins/event-wizard.js
@@ -117,9 +117,6 @@ export default Mixin.create(MutableArray, CustomFormMixin, {
       if (event.name === undefined || event.name === '') {
         errorObject.errors.push({ 'detail': 'Event name has not been provided' });
       }
-      if (event.locationName === undefined || event.locationName === '') {
-        errorObject.errors.push({ 'detail': 'Location has not been provided' });
-      }
       if (event.startsAtDate === undefined || event.endsAtDate === undefined) {
         errorObject.errors.push({ 'detail': 'Dates have not been provided' });
       }

diff --git a/app/routes/public/role-invites.js b/app/routes/public/role-invites.js
@@ -1,8 +1,13 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  redirectionParams: null,
+  fastboot          : service(),
+  redirectionParams : null,
   async beforeModel(transition) {
+    // We don't want to process or transition in fastboot mode
+    // Since this is only an intermediate page
+    if (this.fastboot.isFastBoot) {return}
     const { token } = transition.to.queryParams;
     const originalEventId = transition.resolvedModels.public.originalId;
     const payload = {
@@ -31,6 +36,7 @@ export default Route.extend({
 
   },
   afterModel() {
+    if (this.fastboot.isFastBoot) {return}
     this.transitionTo('register', this.redirectionParams);
   }
 });