Merge branch 'development' into publishEvent

Author: mariobehling

app/components/forms/session-speaker-form.js

@@ -6,6 +6,7 @@ import { compulsoryProtocolValidUrlPattern, protocolLessValidUrlPattern, validTw
   validGithubProfileUrlPattern, validLinkedinProfileUrlPattern, validPhoneNumber } from 'open-event-frontend/utils/validators';
 import { countries } from 'open-event-frontend/utils/dictionary/demography';
 import { languages } from 'open-event-frontend/utils/dictionary/languages';
+import { genders } from 'open-event-frontend/utils/dictionary/genders';
 
 export default Component.extend(FormMixin, {
 
@@ -484,6 +485,8 @@ export default Component.extend(FormMixin, {
 
   languages: orderBy(languages, 'name'),
 
+  genders: orderBy(genders, 'name'),
+
   allFields: computed('fields', function() {
     return groupBy(this.get('fields').toArray(), field => field.get('form'));
   }),

app/components/modals/confirm-user-delete-modal.js

@@ -0,0 +1,4 @@
+import ModalBase from 'open-event-frontend/components/modals/modal-base';
+
+export default ModalBase.extend({
+});

app/components/modals/user-delete-modal.js

@@ -0,0 +1,10 @@
+import { computed } from '@ember/object';
+import ModalBase from 'open-event-frontend/components/modals/modal-base';
+
+export default ModalBase.extend({
+  isSmall          : true,
+  confirmEmail     : '',
+  isEmailDifferent : computed('confirmEmail', function() {
+    return this.get('userEmail') ? this.get('confirmEmail') !== this.get('userEmail') : true;
+  })
+});

app/components/settings/danger-zone.js

@@ -0,0 +1,50 @@
+import { computed } from '@ember/object';
+import Component from '@ember/component';
+
+export default Component.extend({
+
+  isUserDeletable: computed('data.events', 'data.orders', function() {
+    if (this.get('data.events').length || this.get('data.orders').length) {
+      return false;
+    }
+    return true;
+  }),
+
+  actions: {
+    openDeleteUserModal(id, email) {
+      this.setProperties({
+        'isUserDeleteModalOpen' : true,
+        'confirmEmail'          : '',
+        'userEmail'             : email,
+        'userId'                : id
+      });
+    },
+    openConfirmDeleteUserModal() {
+      this.setProperties({
+        'isUserDeleteModalOpen'        : false,
+        'confirmEmail'                 : '',
+        'isConfirmUserDeleteModalOpen' : true,
+        'checked'                      : false
+      });
+    },
+    deleteUser(user) {
+      this.set('isLoading', true);
+      user.destroyRecord()
+        .then(() => {
+          this.get('authManager').logout();
+          this.get('routing').transitionTo('index');
+          this.notify.success(this.get('l10n').t('Your account has been deleted successfully.'));
+        })
+        .catch(() => {
+          this.notify.error(this.get('l10n').t('An unexpected error has occurred.'));
+        })
+        .finally(() => {
+          this.setProperties({
+            'isLoading'                    : false,
+            'isConfirmUserDeleteModalOpen' : false,
+            'checked'                      : false
+          });
+        });
+    }
+  }
+});

app/controllers/orders/view.js

@@ -8,23 +8,26 @@ export default Controller.extend({
     downloadInvoice() {
       const selector = '.print';
       const options = {
-        header: 'Order Invoice'
+        header     : 'Order Invoice',
+        printDelay : 800
       };
       this.get('printThis').print(selector, options);
     }
   },
 
-  downloadTickets() {
+  downloadTickets(eventName, orderId) {
     this.set('isLoading', true);
     this.get('loader')
       .downloadFile(`/tickets/${this.get('model.order.identifier')}`)
       .then(res => {
         const anchor = document.createElement('a');
         anchor.style.display = 'none';
         anchor.href = URL.createObjectURL(new Blob([res], { type: 'application/pdf' }));
-        anchor.download = 'Tickets.pdf';
+        anchor.download = `${eventName}-Tickets-${orderId}.pdf`;
+        document.body.appendChild(anchor);
         anchor.click();
         this.get('notify').success(this.get('l10n').t('Here are your tickets'));
+        document.body.removeChild(anchor);
       })
       .catch(e => {
         console.warn(e);
@@ -34,5 +37,4 @@ export default Controller.extend({
         this.set('isLoading', false);
       });
   }
-
 });

app/mixins/custom-form.js

@@ -196,7 +196,7 @@ export default Mixin.create(MutableArray, {
       this.store.createRecord('custom-form', {
         fieldIdentifier : 'gender',
         form            : 'speaker',
-        type            : 'text',
+        type            : 'select',
         isRequired      : false,
         isIncluded      : false,
         event           : parent

app/models/custom-form.js

@@ -89,7 +89,7 @@ export default ModelBase.extend({
 
   isLongText: computed('type', function() {
     return this.get('type') === 'text'
-    && (['shortBiography', 'longBiography', 'longAbstract', 'shortAbstract', 'comments'].includes(this.get('fieldIdentifier')));
+    && (['shortBiography', 'longBiography', 'longAbstract', 'shortAbstract', 'comments', 'speakingExperience'].includes(this.get('fieldIdentifier')));
   }),
 
   isIncludedObserver: observer('isIncluded', function() {

app/router.js

@@ -108,6 +108,7 @@ router.map(function() {
     this.route('password');
     this.route('email-preferences');
     this.route('applications');
+    this.route('danger-zone');
   });
   this.route('explore');
   this.route('my-tickets', function() {

app/routes/settings/danger-zone.js

@@ -0,0 +1,20 @@
+import Route from '@ember/routing/route';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
+
+export default Route.extend(AuthenticatedRouteMixin, {
+  titleToken() {
+    return this.get('l10n').t('Danger Zone');
+  },
+  async model() {
+
+    let user = this.get('authManager.currentUser');
+    const events = await user.query('events', {});
+    const orders = await user.query('orders', {});
+
+    return {
+      user,
+      events,
+      orders
+    };
+  }
+});

app/templates/components/forms/session-speaker-form.hbs

@@ -213,6 +213,18 @@
                   {{/each}}
                 </div>
               {{/ui-dropdown}}
+            {{else if (eq field.fieldIdentifier 'gender')}}
+              {{#ui-dropdown class='search selection' selected=data.speaker.gender onChange=(action (mut data.speaker.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}}
               {{#ui-dropdown class='search selection' onChange=(action (mut (get data.speaker field.fieldIdentifier))) as |execute mapper|}}
                 <i class="dropdown icon"></i>