Merge branch 'development' into country-fix

iamareebjamal · web-flow · commit ec22808c80b4 · 2020-11-18T17:57:59.000+05:30
diff --git a/app/components/account/contact-info-section.js b/app/components/account/contact-info-section.js
@@ -48,7 +48,7 @@ export default Component.extend(FormMixin, {
   actions: {
     submit() {
       this.onValid(() => {
-        this.submit();
+        this.sendAction('submit');
       });
     }
   }
diff --git a/app/components/account/password-section.js b/app/components/account/password-section.js
@@ -49,7 +49,7 @@ export default Component.extend(FormMixin, {
     },
     submit() {
       this.onValid(() => {
-        this.changePassword({ passwordCurrent: this.passwordCurrent, passwordNew: this.passwordNew });
+        this.sendAction('changePassword', { passwordCurrent: this.passwordCurrent, passwordNew: this.passwordNew });
       });
     }
   }
diff --git a/app/components/forms/admin/content/pages-form.js b/app/components/forms/admin/content/pages-form.js
@@ -79,7 +79,7 @@ export default Component.extend(FormMixin, {
   actions: {
     submit(data) {
       this.onValid(() => {
-        this.save(data);
+        this.sendAction('save', data);
       });
     },
     deletePage(data) {
diff --git a/app/components/forms/admin/content/social-links-form.js b/app/components/forms/admin/content/social-links-form.js
@@ -27,7 +27,7 @@ export default Component.extend(FormMixin, {
   actions: {
     submit() {
       this.onValid(() => {
-        this.save();
+        this.sendAction('save');
       });
     }
   }
diff --git a/app/components/forms/admin/settings/analytics-form.js b/app/components/forms/admin/settings/analytics-form.js
@@ -3,7 +3,7 @@ import Component from '@ember/component';
 export default Component.extend({
   actions: {
     submit() {
-      this.save();
+      this.sendAction('save');
     }
   }
 });
diff --git a/app/components/forms/admin/settings/billing.js b/app/components/forms/admin/settings/billing.js
@@ -100,7 +100,8 @@ export default class Billing extends Component.extend(FormMixin) {
   }
 
   @action
-  submit() {
+  submit(e) {
+    e.preventDefault();
     this.onValid(() => {
       this.save();
     });
diff --git a/app/components/forms/admin/settings/images-form.js b/app/components/forms/admin/settings/images-form.js
@@ -169,7 +169,7 @@ export default Component.extend(FormMixin, {
   actions: {
     submit() {
       this.onValid(() => {
-        this.save();
+        this.sendAction('save');
       });
     }
   }
diff --git a/app/components/forms/admin/settings/microservices-form.js b/app/components/forms/admin/settings/microservices-form.js
@@ -38,7 +38,7 @@ export default Component.extend(FormMixin, {
   actions: {
     submit() {
       this.onValid(() => {
-        this.save();
+        this.sendAction('save');
       });
     }
   }
diff --git a/app/components/forms/admin/settings/payment-gateway-form.js b/app/components/forms/admin/settings/payment-gateway-form.js
@@ -253,7 +253,7 @@ export default Component.extend(FormMixin, {
             'omiseLiveSecret' : null
           });
         }
-        this.save();
+        this.sendAction('save');
       });
     }
   }
diff --git a/app/components/forms/admin/settings/system-form.js b/app/components/forms/admin/settings/system-form.js
@@ -222,7 +222,7 @@ export default Component.extend(FormMixin, {
   actions: {
     submit() {
       this.onValid(() => {
-        this.save();
+        this.sendAction('save');
       });
     }
   }
diff --git a/app/components/forms/events/view/create-access-code.js b/app/components/forms/events/view/create-access-code.js
@@ -145,7 +145,7 @@ export default Component.extend(FormMixin, {
     },
     submit(data) {
       this.onValid(() => {
-        this.save(data);
+        this.sendAction('save', data);
       });
     },
     copiedText() {
diff --git a/app/components/forms/events/view/create-discount-code.js b/app/components/forms/events/view/create-discount-code.js
@@ -163,7 +163,7 @@ export default Component.extend(FormMixin, {
     },
     submit(data) {
       this.onValid(() => {
-        this.save(data);
+        this.sendAction('save', data);
       });
     },
     copiedText() {
diff --git a/app/components/forms/events/view/edit-session.js b/app/components/forms/events/view/edit-session.js
@@ -5,7 +5,7 @@ export default Component.extend(FormMixin, {
   actions: {
     submit() {
       this.onValid(() => {
-        this.save();
+        this.sendAction('save');
       });
     }
   }
diff --git a/app/components/forms/login-form.js b/app/components/forms/login-form.js
@@ -44,7 +44,8 @@ export default class LoginForm extends Component.extend(FormMixin) {
   }
 
   @action
-  async submit() {
+  async submit(e) {
+    e.preventDefault();
     this.onValid(async() => {
       const credentials = { username: this.identification, password: this.password };
       const authenticator = 'authenticator:jwt';
diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js
@@ -202,7 +202,7 @@ export default Component.extend(FormMixin, {
     };
 
     const companyValidation = {
-      rules      : [
+      rules: [
         {
           type   : 'empty',
           prompt : this.l10n.t('Please enter your company')
@@ -499,7 +499,7 @@ export default Component.extend(FormMixin, {
         const currentUser = this.data.user;
         currentUser.set('firstName', this.buyerFirstName);
         currentUser.set('lastName', this.buyerLastName);
-        this.save(data);
+        this.sendAction('save', data);
       });
     },
     modifyHolder(holder) {
diff --git a/app/components/forms/register-form.js b/app/components/forms/register-form.js
@@ -58,7 +58,7 @@ export default Component.extend(FormMixin, {
       this.onValid(() => {
         this.set('errorMessage', null);
         this.set('isLoading', true);
-        this.submit();
+        this.sendAction('submit');
       });
     },
 
diff --git a/app/components/forms/session-speaker-form.js b/app/components/forms/session-speaker-form.js
@@ -441,7 +441,7 @@ export default Component.extend(FormMixin, {
   actions: {
     submit() {
       this.onValid(() => {
-        this.save();
+        this.sendAction('save');
       });
     },
 
diff --git a/app/components/forms/user-payment-info-form.js b/app/components/forms/user-payment-info-form.js
@@ -97,7 +97,8 @@ export default class UserPaymentInfoForm extends Component.extend(FormMixin) {
   }
 
   @action
-  submit() {
+  submit(e) {
+    e.preventDefault();
     this.onValid(async() => {
       this.set('isLoading', true);
       try {
diff --git a/app/components/modals/add-system-role-modal.js b/app/components/modals/add-system-role-modal.js
@@ -11,7 +11,7 @@ export default class AddSystemRoleModal extends ModalBase.extend(FormMixin) {
   @action
   addRole() {
     this.onValid(() => {
-      this.addSystemRole();
+      this.sendAction('addSystemRole');
     });
   }
 
diff --git a/app/components/modals/add-user-role-modal.js b/app/components/modals/add-user-role-modal.js
@@ -11,7 +11,7 @@ export default class AddUserRoleModal extends ModalBase.extend(FormMixin) {
   @action
   addRole() {
     this.onValid(() => {
-      this.updateUserRoles();
+      this.sendAction('updateUserRoles');
     });
   }
 
diff --git a/app/components/modals/admin/content/new-event-sub-topic-modal.js b/app/components/modals/admin/content/new-event-sub-topic-modal.js
@@ -9,7 +9,7 @@ export default ModalBase.extend(FormMixin, {
     addEventProperty(modelInstance, eventTopic) {
       this.onValid(() => {
         modelInstance.set('eventTopic', eventTopic);
-        this.addEventProperty(modelInstance);
+        this.sendAction('addEventProperty', modelInstance);
       });
     }
   },
diff --git a/app/components/modals/admin/content/new-event-topic-modal.js b/app/components/modals/admin/content/new-event-topic-modal.js
@@ -8,7 +8,7 @@ export default ModalBase.extend(FormMixin, {
   actions: {
     addEventProperty(modelInstance) {
       this.onValid(() => {
-        this.addEventProperty(modelInstance);
+        this.sendAction('addEventProperty', modelInstance);
       });
     }
   },
diff --git a/app/components/modals/admin/content/new-event-type-modal.js b/app/components/modals/admin/content/new-event-type-modal.js
@@ -8,7 +8,7 @@ export default ModalBase.extend(FormMixin, {
   actions: {
     addEventProperty(modelInstance) {
       this.onValid(() => {
-        this.addEventProperty(modelInstance);
+        this.sendAction('addEventProperty', modelInstance);
       });
     }
   },
diff --git a/app/components/modals/confirm-event-transfer-modal.js b/app/components/modals/confirm-event-transfer-modal.js
@@ -5,7 +5,7 @@ export default ModalBase.extend(FormMixin, {
   actions: {
     submit() {
       this.onValid(() => {
-        this.transferEvent();
+        this.sendAction('transferEvent');
       });
     },
     close() {
diff --git a/app/templates/components/forms/admin/settings/billing.hbs b/app/templates/components/forms/admin/settings/billing.hbs
@@ -1,4 +1,4 @@
-<form class="ui form" {{action 'submit' on='submit'}}> 
+<form class="ui form"> 
   <h3 class="ui header">
     {{t 'Invoice Handling'}}
   </h3>
diff --git a/app/templates/components/forms/login-form.hbs b/app/templates/components/forms/login-form.hbs
@@ -1,6 +1,6 @@
 <div class="ui stackable {{unless this.noSocial 'three' 'one'}} column doubling centered grid">
   <div class="column">
-    <form class="ui large form" autocomplete="off" {{action 'submit' on='submit'}}>
+    <form class="ui large form" autocomplete="off">
       <div class="ui aligned segment basic no margin no padding">
         <h3 class="weight-400">{{t 'Login'}}</h3>
       </div>
diff --git a/app/templates/components/forms/user-payment-info-form.hbs b/app/templates/components/forms/user-payment-info-form.hbs
@@ -1,4 +1,4 @@
-<form class="ui form {{if this.isLoading 'loading'}}" {{action 'submit' on='submit'}}>
+<form class="ui form {{if this.isLoading 'loading'}}">
   <h3 class="ui header">
     {{t 'Payment Information'}}
   </h3>

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ export default Component.extend(FormMixin, {`
`48`	`48`	`actions: {`
`49`	`49`	`submit() {`
`50`	`50`	`this.onValid(() => {`
`51`		`- this.submit();`
	`51`	`+ this.sendAction('submit');`
`52`	`52`	`});`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export default Component.extend(FormMixin, {`
`49`	`49`	`},`
`50`	`50`	`submit() {`
`51`	`51`	`this.onValid(() => {`
`52`		`- this.changePassword({ passwordCurrent: this.passwordCurrent, passwordNew: this.passwordNew });`
	`52`	`+ this.sendAction('changePassword', { passwordCurrent: this.passwordCurrent, passwordNew: this.passwordNew });`
`53`	`53`	`});`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export default Component.extend(FormMixin, {`
`27`	`27`	`actions: {`
`28`	`28`	`submit() {`
`29`	`29`	`this.onValid(() => {`
`30`		`- this.save();`
	`30`	`+ this.sendAction('save');`
`31`	`31`	`});`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import Component from '@ember/component';`
`3`	`3`	`export default Component.extend({`
`4`	`4`	`actions: {`
`5`	`5`	`submit() {`
`6`		`- this.save();`
	`6`	`+ this.sendAction('save');`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`	`});`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ export default class Billing extends Component.extend(FormMixin) {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`@action`
`103`		`- submit() {`
	`103`	`+ submit(e) {`
	`104`	`+ e.preventDefault();`
`104`	`105`	`this.onValid(() => {`
`105`	`106`	`this.save();`
`106`	`107`	`});`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ export default Component.extend(FormMixin, {`
`169`	`169`	`actions: {`
`170`	`170`	`submit() {`
`171`	`171`	`this.onValid(() => {`
`172`		`- this.save();`
	`172`	`+ this.sendAction('save');`
`173`	`173`	`});`
`174`	`174`	`}`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export default Component.extend(FormMixin, {`
`38`	`38`	`actions: {`
`39`	`39`	`submit() {`
`40`	`40`	`this.onValid(() => {`
`41`		`- this.save();`
	`41`	`+ this.sendAction('save');`
`42`	`42`	`});`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ export default Component.extend(FormMixin, {`
`253`	`253`	`'omiseLiveSecret' : null`
`254`	`254`	`});`
`255`	`255`	`}`
`256`		`- this.save();`
	`256`	`+ this.sendAction('save');`
`257`	`257`	`});`
`258`	`258`	`}`
`259`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ export default Component.extend(FormMixin, {`
`222`	`222`	`actions: {`
`223`	`223`	`submit() {`
`224`	`224`	`this.onValid(() => {`
`225`		`- this.save();`
	`225`	`+ this.sendAction('save');`
`226`	`226`	`});`
`227`	`227`	`}`
`228`	`228`	`}`