Merge branch 'development' into 7

kushthedude · web-flow · commit 46d42a07e58e · 2019-07-30T11:09:43.000+05:30
diff --git a/app/adapters/discount-code.js b/app/adapters/discount-code.js
@@ -0,0 +1,13 @@
+import ApplicationAdapter from './application';
+import ENV from 'open-event-frontend/config/environment';
+
+export default ApplicationAdapter.extend({
+
+  urlForQueryRecord(query) {
+    if (query && query.code && query.eventIdentifier) {
+      return `${ENV.APP.apiHost}/v1/events/${query.eventIdentifier}/discount-codes/${query.code}`;
+    } else {
+      return this._super(...arguments);
+    }
+  }
+});
diff --git a/app/components/events/view/export/download-zip.js b/app/components/events/view/export/download-zip.js
@@ -1,4 +1,23 @@
 import Component from '@ember/component';
+import { action } from '@ember/object';
 
-export default Component.extend({
-});
+export default class extends Component {
+  @action
+  async exportEventDownload(eventDownloadUrl) {
+    this.set('isLoading', true);
+    try {
+      const res = await this.loader.downloadFile(`${eventDownloadUrl}`);
+      const anchor = document.createElement('a');
+      anchor.style.display = 'none';
+      anchor.href = URL.createObjectURL(new Blob([res], { type: 'octet/stream' }));
+      anchor.download = 'EventExport.zip';
+      anchor.click();
+      this.notify.success(this.l10n.t('Exported Event Downloaded successfully.'));
+    } catch (e) {
+      console.error(e);
+      this.notify.error(this.l10n.t(e));
+    }
+    this.set('isLoading', false);
+  }
+
+}
diff --git a/app/components/forms/admin/settings/billing.js b/app/components/forms/admin/settings/billing.js
@@ -47,7 +47,7 @@ export default class extends Component.extend(FormMixin) {
           rules      : [
             {
               type   : 'empty',
-              prompt : this.l10n.t('Please enter the country')
+              prompt : this.l10n.t('Please select the country')
             }
           ]
         },
diff --git a/app/components/forms/orders/attendee-list.js b/app/components/forms/orders/attendee-list.js
@@ -1,21 +1,24 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { groupBy } from 'lodash-es';
+import { or } from '@ember/object/computed';
 
-export default Component.extend({
-  buyer: computed('data.user', function() {
-    return this.get('data.user');
-  }),
-  holders: computed('data.attendees', function() {
-    return this.get('data.attendees');
-  }),
-  isPaidOrder: computed('data', function() {
-    if (!this.get('data.amount')) {
-      return false;
-    }
-    return true;
-  }),
-  allFields: computed('fields', function() {
-    return groupBy(this.fields.toArray(), field => field.get('form'));
-  })
-});
+export default class extends Component {
+  @computed('data.user')
+  get buyer() {
+    return this.data.user;
+  }
+
+  @computed('data.attendees')
+  get holders() {
+    return this.data.attendees;
+  }
+
+  @or('data.amount', 'data.isBillingEnabled')
+  showBillingInfo;
+
+  @computed('fields.@each.form')
+  get allFields() {
+    return groupBy(this.fields.toArray(), field => field.form);
+  }
+}
diff --git a/app/components/public/ticket-list.js b/app/components/public/ticket-list.js
@@ -62,7 +62,7 @@ export default Component.extend(FormMixin, {
   total: computed('tickets.@each.price', 'tickets.@each.orderQuantity', 'tickets.@each.discount', function() {
     if (this.taxInfo !== null) {
       return sumBy(this.tickets.toArray(),
-        ticket => (ticket.ticketPriceWithTax || 0) * (ticket.orderQuantity || 0)
+        ticket => ((ticket.ticketPriceWithTax || 0) - (ticket.discount || 0)) * (ticket.orderQuantity || 0)
       );
     }
     return sumBy(this.tickets.toArray(),
@@ -123,9 +123,7 @@ export default Component.extend(FormMixin, {
         this.set('invalidPromotionalCode', true);
       }
       try {
-        let discountCode = await this.store.findRecord('discount-code', this.promotionalCode, {
-          include: 'tickets'
-        });
+        let discountCode = await this.store.queryRecord('discount-code', { eventIdentifier: this.event.id, code: this.promotionalCode });
         let discountCodeEvent = await discountCode.get('event');
         if (this.currentEventIdentifier === discountCodeEvent.identifier) {
           let discountType = discountCode.get('type');
@@ -151,6 +149,7 @@ export default Component.extend(FormMixin, {
           this.set('invalidPromotionalCode', true);
         }
       } catch (e) {
+        console.warn(e);
         if (this.invalidPromotionalCode) {
           this.set('invalidPromotionalCode', true);
         }
diff --git a/app/controllers/admin/events/list.js b/app/controllers/admin/events/list.js
@@ -18,6 +18,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
          isSortable      : true,
          headerComponent : 'tables/headers/sort',
          cellComponent   : 'ui-table/cell/cell-event',
+         width           : 180,
          options         : {
            hasRestorePrivileges: this.hasRestorePrivileges
          },
@@ -35,7 +36,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
          isSortable      : true,
          headerComponent : 'tables/headers/sort',
          cellComponent   : 'ui-table/cell/cell-simple-date',
-         width           : 40,
+         width           : 65,
          options         : {
            dateFormat: 'MMMM DD, YYYY - hh:mm A'
          }
@@ -46,7 +47,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
          isSortable      : true,
          headerComponent : 'tables/headers/sort',
          cellComponent   : 'ui-table/cell/cell-simple-date',
-         width           : 40,
+         width           : 65,
          options         : {
            dateFormat: 'MMMM DD, YYYY - hh:mm A'
          }
@@ -56,26 +57,27 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
          valuePath       : 'state',
          isSortable      : true,
          headerComponent : 'tables/headers/sort',
-         width           : 50
+         width           : 80
        },
        {
          name            : 'Roles',
          valuePath       : 'owner',
          extraValuePaths : ['organizers', 'coorganizers', 'trackOrganizers', 'registrars', 'moderators'],
-         cellComponent   : 'ui-table/cell/cell-roles'
+         cellComponent   : 'ui-table/cell/cell-roles',
+         width           : 185
        },
        {
          name          : 'Sessions',
          valuePath     : 'eventStatisticsGeneral',
          cellComponent : 'ui-table/cell/cell-sessions',
-         width         : 60
+         width         : 90
 
        },
        {
          name          : 'Speakers',
          valuePath     : 'eventStatisticsGeneral',
          cellComponent : 'ui-table/cell/cell-speakers-dashboard',
-         width         : 60
+         width         : 90
        },
        {
          name          : 'Tickets',
@@ -85,14 +87,15 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
        {
          name          : 'Public URL',
          valuePath     : 'url',
-         cellComponent : 'ui-table/cell/cell-link'
+         cellComponent : 'ui-table/cell/cell-link',
+         width         : 220
        },
        {
          name            : 'Featured Event',
          valuePath       : 'id',
          extraValuePaths : ['isFeatured'],
          cellComponent   : 'ui-table/cell/admin/event-is-featured',
-         width           : 40,
+         width           : 80,
          actions         : {
            toggleFeatured: this.toggleFeatured.bind(this)
          }
diff --git a/app/controllers/admin/users/list.js b/app/controllers/admin/users/list.js
@@ -15,6 +15,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         valuePath       : 'id',
         extraValuePaths : ['firstName', 'deletedAt'],
         cellComponent   : 'ui-table/cell/admin/users/cell-first-name',
+        width           : 155,
         options         : {
           hasRestorePrivileges: this.hasRestorePrivileges
         },
@@ -24,47 +25,38 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
           openEditModal     : this.openEditModal.bind(this),
           restoreUser       : this.restoreUser.bind(this)
         }
-
       },
       {
         name      : 'Email',
-        valuePath : 'email'
-
-
+        valuePath : 'email',
+        width     : 160
       },
       {
         name          : 'Status',
         valuePath     : 'status',
         cellComponent : 'ui-table/cell/admin/users/cell-status'
-
-
       },
       {
         name            : 'System Roles',
         valuePath       : 'isSuperAdmin',
         extraValuePaths : ['isAdmin', 'isVerified'],
         cellComponent   : 'ui-table/cell/admin/users/cell-system-roles'
-
-
       },
       {
         name            : 'Event Roles',
         valuePath       : 'isSuperAdmin',
+        width           : 260,
         extraValuePaths : ['isAdmin', 'isUserOwner', 'ownerEvents',
           'isUserOrganizer', 'organizerEvents', 'isUserCoorganizer', 'coorganizerEvents',
           'isUserTrackOrganizer', 'trackOrganizerEvents', 'isUserRegistrar', 'registrarEvents',
           'isUserModerator', 'moderatorEvents', 'isMarketer', 'marketerEvents', 'isSalesAdmin',
           'salesAdminEvents'],
         cellComponent: 'ui-table/cell/admin/users/cell-event-roles'
-
-
       },
       {
         name          : 'User Links',
         valuePath     : 'id',
         cellComponent : 'ui-table/cell/admin/users/cell-user-links'
-
-
       },
       {
         name          : 'Member Since',
diff --git a/app/controllers/admin/users/view/events/list.js b/app/controllers/admin/users/view/events/list.js
@@ -17,6 +17,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         isSortable      : true,
         headerComponent : 'tables/headers/sort',
         cellComponent   : 'ui-table/cell/cell-event',
+        width           : 160,
         options         : {
           hasRestorePrivileges: this.hasRestorePrivileges
         },
@@ -40,7 +41,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
       {
         name          : 'Sessions',
         valuePath     : 'eventStatisticsGeneral',
-        width         : 80,
+        width         : 90,
         isSortable    : false,
         cellComponent : 'ui-table/cell/cell-sessions-dashboard'
       },
@@ -62,6 +63,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         name          : 'Public URL',
         valuePath     : 'url',
         cellComponent : 'ui-table/cell/cell-link',
+        width         : 240,
         isSortable    : false
       }
     ];
diff --git a/app/controllers/events/list.js b/app/controllers/events/list.js
@@ -9,10 +9,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
     return [
       {
         name            : 'Name',
-        valuePath       : 'name',
+        valuePath       : 'identifier',
         width           : 150,
         isSortable      : true,
-        extraValuePaths : ['startsAt', 'endAt'],
+        extraValuePaths : ['name', 'logoUrl'],
         headerComponent : 'tables/headers/sort',
         cellComponent   : 'ui-table/cell/cell-event-general',
         options         : {
@@ -27,65 +27,43 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
       {
         name            : 'Date',
         valuePath       : 'startsAt',
+        extraValuePaths : ['endsAt'],
         isSortable      : true,
         headerComponent : 'tables/headers/sort',
         cellComponent   : 'ui-table/cell/cell-event-date'
 
       },
       {
-        name          : 'Roles',
-        valuePath     : 'roles',
-        width         : 180,
-        cellComponent : 'ui-table/cell/cell-roles',
-        isSortable    : false
+        name            : 'Roles',
+        valuePath       : 'owner',
+        extraValuePaths : ['organizers', 'coorganizers', 'trackOrganizers', 'registrars', 'moderators'],
+        width           : 180,
+        cellComponent   : 'ui-table/cell/cell-roles'
       },
       {
         name          : 'Sessions',
-        valuePath     : 'sessions',
-        isSortable    : false,
+        valuePath     : 'eventStatisticsGeneral',
         cellComponent : 'ui-table/cell/cell-sessions-dashboard'
       },
       {
         name          : 'Speakers',
-        valuePath     : 'speakers',
-        cellComponent : 'ui-table/cell/cell-speakers-dashboard',
-        isSortable    : false
-
+        valuePath     : 'eventStatisticsGeneral',
+        cellComponent : 'ui-table/cell/cell-speakers-dashboard'
       },
       {
         name          : 'Tickets',
         valuePath     : 'tickets',
-        cellComponent : 'ui-table/cell/cell-tickets',
-        isSortable    : false
-
+        cellComponent : 'ui-table/cell/cell-tickets'
       },
       {
         name          : 'Public URL',
         valuePath     : 'url',
         width         : 250,
-        cellComponent : 'ui-table/cell/cell-link',
-        isSortable    : false
+        cellComponent : 'ui-table/cell/cell-link'
       }
     ];
   }
 
-  @computed('model.data')
-  get rows() {
-    const rows = [];
-    this.model.data.forEach(row => {
-      rows.pushObject({
-        name     : row,
-        startsAt : row,
-        roles    : row,
-        sessions : row,
-        speakers : row,
-        tickets  : row,
-        url      : row
-      });
-    });
-    return rows;
-  }
-
   @action
   moveToPublic(id) {
     this.transitionToRoute('public', id);
diff --git a/app/routes/events/list.js b/app/routes/events/list.js
@@ -89,11 +89,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {
       'page[number]' : params.page || 4
     };
     queryString = this.applySortFilters(queryString, params);
-
-    return {
-      data: await this.authManager.currentUser.query('events', queryString)
-    };
-
+    return this.asArray(this.authManager.currentUser.query('events', queryString));
   }
 
   @action
diff --git a/app/templates/admin/users/view/events.hbs b/app/templates/admin/users/view/events.hbs
@@ -17,7 +17,5 @@
       {{/tabbed-navigation}}
     </div>
   </div>
-  <div class="ui segment">
-    {{outlet}}
-  </div>
+  {{outlet}}
 </div>
diff --git a/app/templates/components/events/view/export/download-zip.hbs b/app/templates/components/events/view/export/download-zip.hbs
@@ -25,7 +25,7 @@
     <button class="ui blue button" {{action startGeneration}}>
       {{t 'Start'}}
     </button>
-    <a href="{{eventDownloadUrl}}" class="ui button {{if isDownloadDisabled 'disabled' ''}}">
+    <a href="#" class="ui button {{if isDownloadDisabled 'disabled' ''}}" {{action exportEventDownload eventDownloadUrl }}>
       {{t 'Download'}}
     </a>
     <div class="hidden divider"></div>
diff --git a/app/templates/components/forms/admin/settings/billing.hbs b/app/templates/components/forms/admin/settings/billing.hbs
diff --git a/app/templates/components/forms/orders/attendee-list.hbs b/app/templates/components/forms/orders/attendee-list.hbs
diff --git a/app/templates/components/public/ticket-list.hbs b/app/templates/components/public/ticket-list.hbs
diff --git a/app/templates/components/ui-table/cell/cell-event-general.hbs b/app/templates/components/ui-table/cell/cell-event-general.hbs
diff --git a/app/templates/events/list.hbs b/app/templates/events/list.hbs
diff --git a/tests/integration/components/ui-table/cell/cell-event-general-test.js b/tests/integration/components/ui-table/cell/cell-event-general-test.js

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export default class extends Component.extend(FormMixin) {`
`47`	`47`	`rules : [`
`48`	`48`	`{`
`49`	`49`	`type : 'empty',`
`50`		`- prompt : this.l10n.t('Please enter the country')`
	`50`	`+ prompt : this.l10n.t('Please select the country')`
`51`	`51`	`}`
`52`	`52`	`]`
`53`	`53`	`},`