Merge branch 'development' into user-payment-information

uds5501 · web-flow · commit a5861c80290c · 2019-07-07T09:29:49.000+05:30
diff --git a/app/components/explore/side-bar.js b/app/components/explore/side-bar.js
@@ -13,8 +13,8 @@ export default Component.extend({
   customEndDate : null,
   showFilters   : false,
 
-  hideClearFilters: computed('category', 'sub_category', 'event_type', 'startDate', 'endDate', 'location', 'ticket_type', function() {
-    return !(this.category || this.sub_category || this.event_type || this.startDate || this.endDate || this.location || this.ticket_type !== null);
+  hideClearFilters: computed('category', 'sub_category', 'event_type', 'startDate', 'endDate', 'location', 'ticket_type', 'cfs', function() {
+    return !(this.category || this.sub_category || this.event_type || this.startDate || this.endDate || this.location || this.ticket_type || this.cfs);
   }),
 
   showAllCategories: computed('category', 'sub_category', function() {
@@ -61,6 +61,10 @@ export default Component.extend({
       this.send('selectDateFilter', 'custom_dates');
     },
 
+    selectEventCfs(cfs) {
+      this.set('cfs', cfs === this.cfs ? null : cfs);
+    },
+
     selectDateFilter(dateType) {
       let newStartDate = null;
       let newEndDate = null;
@@ -128,7 +132,6 @@ export default Component.extend({
     },
     clearFilterTypes() {
       this.set('event_type', null);
-
     },
 
     clearFilters() {
@@ -140,15 +143,13 @@ export default Component.extend({
         sub_category : null,
         event_type   : null,
         location     : null,
-        ticket_type  : null
+        ticket_type  : null,
+        cfs          : null
       });
-
-
     },
 
     toggleFilters() {
       this.set('showFilters', !this.showFilters);
-
     }
   }
 });
diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js
@@ -11,6 +11,7 @@ import {
   compulsoryProtocolValidUrlPattern, validTwitterProfileUrlPattern, validFacebookProfileUrlPattern,
   validGithubProfileUrlPattern
 } from 'open-event-frontend/utils/validators';
+import { genders } from 'open-event-frontend/utils/dictionary/genders';
 
 export default Component.extend(FormMixin, {
   router: service(),
@@ -466,6 +467,8 @@ export default Component.extend(FormMixin, {
     return orderBy(countries, 'name');
   }),
 
+  genders: orderBy(genders, 'name'),
+
   actions: {
     submit(data) {
       this.onValid(() => {
diff --git a/app/controllers/admin/sales/revenue.js b/app/controllers/admin/sales/revenue.js
diff --git a/app/controllers/events/list.js b/app/controllers/events/list.js
@@ -1,20 +1,16 @@
 import Controller from '@ember/controller';
 import { computed, action } from '@ember/object';
+import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
+
+export default class extends Controller.extend(EmberTableControllerMixin) {
 
-export default class extends Controller {
-  queryParams = ['page', 'per_page'];
-  page = 1;
-  per_page = 10;
-  search = null;
-  sort_dir = null;
-  sort_by = null;
-  sorts = [];
   @computed()
   get columns() {
     return [
       {
         name            : 'Name',
         valuePath       : 'name',
+        width           : 150,
         isSortable      : true,
         extraValuePaths : ['startsAt', 'endAt'],
         headerComponent : 'tables/headers/sort',
@@ -39,6 +35,7 @@ export default class extends Controller {
       {
         name          : 'Roles',
         valuePath     : 'roles',
+        width         : 180,
         cellComponent : 'ui-table/cell/cell-roles',
         isSortable    : false
       },
@@ -65,6 +62,7 @@ export default class extends Controller {
       {
         name          : 'Public URL',
         valuePath     : 'url',
+        width         : 250,
         cellComponent : 'ui-table/cell/cell-link',
         isSortable    : false
       }
diff --git a/app/controllers/explore.js b/app/controllers/explore.js
@@ -1,14 +1,15 @@
 import Controller from '@ember/controller';
 
 export default Controller.extend({
-  queryParams  : ['category', 'sub_category', 'event_type', 'start_date', 'end_date', 'location', 'ticket_type'],
+  queryParams  : ['category', 'sub_category', 'event_type', 'start_date', 'end_date', 'location', 'ticket_type', 'cfs'],
   category     : null,
   sub_category : null,
   event_type   : null,
   start_date   : null,
   end_date     : null,
   location     : null,
   ticket_type  : null,
+  cfs          : null,
 
   actions: {
     shareEvent(event) {
@@ -37,6 +38,9 @@ export default Controller.extend({
       if (filterType === 'ticket_type') {
         this.set('ticket_type', null);
       }
+      if (filterType === 'cfs') {
+        this.set('cfs', null);
+      }
     }
   }
 });
diff --git a/app/extensions/ember-table/template.hbs b/app/extensions/ember-table/template.hbs
@@ -1,10 +1,9 @@
-<div class="resize-container">
-  <table class="ui unstackable table">
-    {{yield (hash
-              api=api
-              head=(component "ember-thead" api=api)
-              body=(component "ember-tbody" api=api)
-              foot=(component "ember-tfoot" api=api)
-            )}}
-  </table>
-</div>
+
+<table class="ui unstackable table">
+  {{yield (hash
+           api=api
+           head=(component "ember-thead" api=api)
+           body=(component "ember-tbody" api=api)
+           foot=(component "ember-tfoot" api=api)
+         )}}
+</table>
diff --git a/app/mixins/custom-form.js b/app/mixins/custom-form.js
@@ -286,7 +286,7 @@ export default Mixin.create(MutableArray, {
       this.store.createRecord('custom-form', {
         fieldIdentifier : 'gender',
         form            : 'attendee',
-        type            : 'text',
+        type            : 'select',
         isRequired      : false,
         isIncluded      : false,
         event           : parent
diff --git a/app/mixins/ember-table-controller.js b/app/mixins/ember-table-controller.js
@@ -0,0 +1,11 @@
+import Mixin from '@ember/object/mixin';
+
+export default Mixin.create({
+  queryParams : ['page', 'per_page', 'search', 'sort_dir', 'sort_by'],
+  page        : 1,
+  per_page    : 10,
+  search      : null,
+  sort_dir    : null,
+  sort_by     : null,
+  sorts       : []
+});
diff --git a/app/mixins/ember-table-route.js b/app/mixins/ember-table-route.js
diff --git a/app/models/admin-sales-fee.js b/app/models/admin-sales-fee.js
@@ -7,5 +7,6 @@ export default ModelBase.extend({
   feePercentage   : attr('number'),
   maximumFee      : attr('number'),
   revenue         : attr('number'),
-  ticketCount     : attr('number')
+  ticketCount     : attr('number'),
+  eventDate       : attr('moment')
 });
diff --git a/app/router.js b/app/router.js
@@ -144,8 +144,8 @@ router.map(function() {
       this.route('organizers');
       this.route('marketer');
       this.route('locations');
-      this.route('fees');
       this.route('invoices');
+      this.route('revenue');
       this.route('discounted-events');
     });
     this.route('sessions',  function() {
diff --git a/app/routes/admin/sales/revenue.js b/app/routes/admin/sales/revenue.js
@@ -2,7 +2,7 @@ import Route from '@ember/routing/route';
 
 export default Route.extend({
   titleToken() {
-    return this.l10n.t('Fees');
+    return this.l10n.t('Revenue');
   },
 
   model() {
diff --git a/app/routes/events/list.js b/app/routes/events/list.js
@@ -1,8 +1,8 @@
 import Route from '@ember/routing/route';
 import { action } from '@ember/object';
 import moment from 'moment';
-import EmberTableMixin from 'open-event-frontend/mixins/ember-table';
-export default class extends Route.extend(EmberTableMixin) {
+import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
+export default class extends Route.extend(EmberTableRouteMixin) {
 
   titleToken() {
     switch (this.get('params.event_state')) {
diff --git a/app/routes/explore.js b/app/routes/explore.js
@@ -76,6 +76,13 @@ export default Route.extend({
         val  : `%${params.location}%`
       });
     }
+    if (params.cfs) {
+      filterOptions.push({
+        name : 'is_sessions_speakers_enabled',
+        op   : 'eq',
+        val  : params.cfs === 'open'
+      });
+    }
 
     if (params.start_date && params.end_date) {
       filterOptions.push({
diff --git a/app/templates/admin/sales.hbs b/app/templates/admin/sales.hbs
@@ -17,8 +17,8 @@
         {{#link-to 'admin.sales.discounted-events' class='item'}}
           {{t 'Discounted events'}}
         {{/link-to}}
-        {{#link-to 'admin.sales.fees' class='item'}}
-          {{t 'Fees'}}
+        {{#link-to 'admin.sales.revenue' class='item'}}
+          {{t 'Revenue'}}
         {{/link-to}}
         {{#link-to 'admin.sales.invoices' class='item'}}
           {{t 'Invoices'}}
diff --git a/app/templates/admin/sales/revenue.hbs b/app/templates/admin/sales/revenue.hbs
@@ -1,7 +1,7 @@
 <div class="ui stackable grid">
   <div class="row">
     <h2 class="ui header column">
-      {{t 'Fee Summary'}}
+      {{t 'Revenue Summary'}}
     </h2>
   </div>
   <div class="row">
@@ -12,6 +12,9 @@
             <th rowspan="2">
               {{t 'Events'}}
             </th>
+            <th rowspan="2">
+              {{t 'Event Date '}}
+            </th>
             <th colspan="3" class="ui green inverted segment center aligned">
               {{t 'Completed Orders '}}
             </th>
@@ -34,6 +37,9 @@
               <td>
                 {{order.name}}
               </td>
+              <td>
+                {{moment-format order.eventDate 'MM/DD/YYYY'}} 
+              </td>
               <td class="right aligned">
                 {{order.ticketCount}}
               </td>
diff --git a/app/templates/components/explore/side-bar.hbs b/app/templates/components/explore/side-bar.hbs
@@ -124,6 +124,26 @@
     {{/ui-accordion}}
   </div>
 {{/if}}
+<div class="item">
+  {{#ui-accordion}}
+    <span class="title">
+      <i class="dropdown icon"></i>
+      {{t 'Event Call For Speakers' }}
+    </span>
+    <div class="content menu">
+      <a href="#"
+        class="link item {{if (eq cfs 'open') 'active'}}"
+        {{action 'selectEventCfs' 'open'}}>
+        {{t 'Open'}}
+      </a>
+      <a href="#"
+        class="link item {{if (eq cfs 'closed') 'active'}}"
+        {{action 'selectEventCfs' 'closed'}}>
+        {{t 'Closed'}}
+      </a>
+    </div>
+  {{/ui-accordion}}
+</div>
 <div class="item">
   <button class="ui red button {{if hideClearFilters 'disabled'}}" {{action 'clearFilters'}}>{{t 'Clear Filters'}}</button>
   {{#if device.isMobile}}
diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
@@ -47,7 +47,7 @@
           <i class="user icon"></i>
           <label>{{t 'Ticket Holder '}}{{inc index}}{{t ' -for- '}}{{holder.ticket.name}}</label>
         </div>
-        {{# each allFields.attendee as |field|}}
+        {{#each allFields.attendee as |field|}}
           {{#if field.isIncluded}}
             <div class="field {{if
               (and sameAsBuyer (eq index 0) (or (eq field.fieldIdentifier 'firstname') (eq field.fieldIdentifier 'lastname') (eq field.fieldIdentifier 'email')))
@@ -57,9 +57,22 @@
                 {{#if field.isLongText}}
                   {{widgets/forms/rich-text-editor value=(mut (get holder field.fieldIdentifier))
                                                    name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
+                {{else if (eq field.fieldIdentifier 'gender')}}
+                  {{#ui-dropdown class='search selection' value=(mut (get holder field.fieldIdentifier)) onChange=(action (mut holder.gender)) as |execute mapper|}}
+                    <i class="dropdown icon"></i>
+                    <div class="default text">{{t 'Select your gender'}}</div>
+                    <div class="menu">
+                      {{#each genders as |gender|}}
+                        <div class="item" data-value="{{map-value mapper gender.name}}">
+                          {{gender.name}}
+                        </div>
+                      {{/each}}
+                    </div>
+                  {{/ui-dropdown}}
                 {{else}}
                   {{input type=field.type value=(mut (get holder field.fieldIdentifier))
                           name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
+
                 {{/if}}
               {{/if}}
             </div>
diff --git a/app/templates/explore.hbs b/app/templates/explore.hbs
@@ -1,6 +1,6 @@
 <div class="ui stackable grid">
   <div class="four wide column">
-    {{explore/side-bar model=model category=category sub_category=sub_category event_type=event_type startDate=start_date endDate=end_date location=location ticket_type=ticket_type}}
+    {{explore/side-bar model=model category=category sub_category=sub_category event_type=event_type startDate=start_date endDate=end_date location=location ticket_type=ticket_type cfs=cfs}}
   </div>
   <div class="twelve wide column">
     <h1 class="ui header">{{t 'Events'}}</h1>
@@ -41,6 +41,12 @@
           <a role="button" {{action 'clearFilter' 'ticket_type'}}><i class="icon close"></i></a>
         </div>
       {{/if}}
+      {{#if filters.cfs}}
+        <div class="ui mini label">
+          {{filters.cfs}}
+          <a role="button" {{action 'clearFilter' 'cfs'}}><i class="icon close"></i></a>
+        </div>
+      {{/if}}
     </div>
     {{#each filteredEvents as |event|}}
       {{event-card event=event isWide=true filterByTags=true category=category subCategory=sub_category eventType=event_type shareEvent=(action 'shareEvent')}}
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
@@ -26,7 +26,13 @@
         {{event-card event=event isCFS=true shareEvent=(action 'shareEvent')}}
       {{/each}}
     </div>
+    <div class="ui hidden divider"></div>
+    <div class="ui centered grid">
+      <div class="row">
+        {{#link-to "explore" (query-params cfs=true) class='ui blue button'}}{{t 'Show more calls for speakers'}}{{/link-to}}
+      </div>
+    </div>
   {{/if}}
-  
+
   {{modals/event-share-modal isOpen=isShareModalOpen event=eventToShare}}
-</div>
+</div>
diff --git a/tests/unit/mixins/ember-table-controller-test.js b/tests/unit/mixins/ember-table-controller-test.js
@@ -0,0 +1,12 @@
+import EmberObject from '@ember/object';
+import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | ember-table-controller', function() {
+  // Replace this with your real tests.
+  test('it works', function(assert) {
+    let EmberTableControllerObject = EmberObject.extend(EmberTableControllerMixin);
+    let subject = EmberTableControllerObject.create();
+    assert.ok(subject);
+  });
+});
diff --git a/tests/unit/mixins/ember-table-route-test.js b/tests/unit/mixins/ember-table-route-test.js
@@ -0,0 +1,12 @@
+import EmberObject from '@ember/object';
+import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | ember-table-route', function() {
+  // Replace this with your real tests.
+  test('it works', function(assert) {
+    let EmberTableRouteObject = EmberObject.extend(EmberTableRouteMixin);
+    let subject = EmberTableRouteObject.create();
+    assert.ok(subject);
+  });
+});
diff --git a/tests/unit/mixins/ember-table-test.js b/tests/unit/mixins/ember-table-test.js
