From d4d965e748ab11988181d4b8cc2b3d58942df4b2 Mon Sep 17 00:00:00 2001
From: mrsaicharan1 <saicharan.reddy1@gmail.com>
Date: Thu, 22 Aug 2019 12:03:19 +0530
Subject: [PATCH] fix: Fixed alipay workflow

---
 app/components/forms/wizard/basic-details-step.js            | 4 ++--
 app/controllers/orders/pending.js                            | 2 +-
 app/models/event.js                                          | 2 +-
 app/models/setting.js                                        | 2 +-
 app/templates/components/forms/orders/order-form.hbs         | 4 ++--
 app/templates/components/forms/wizard/basic-details-step.hbs | 2 +-
 app/templates/orders/pending.hbs                             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/components/forms/wizard/basic-details-step.js b/app/components/forms/wizard/basic-details-step.js
index f96b2f2b354..3c70a79e826 100644
--- a/app/components/forms/wizard/basic-details-step.js
+++ b/app/components/forms/wizard/basic-details-step.js
@@ -52,8 +52,8 @@ export default Component.extend(FormMixin, EventWizardMixin, {
     return this.get('settings.isOmiseActivated') && find(paymentCurrencies, ['code', this.get('data.event.paymentCurrency')]).omise;
   }),
 
-  canAcceptAliPay: computed('data.event.paymentCurrency', 'settings.isAliPayActivated', function() {
-    return this.get('settings.isAliPayActivated') && find(paymentCurrencies, ['code', this.get('data.event.paymentCurrency')]).alipay;
+  canAcceptAliPay: computed('data.event.paymentCurrency', 'settings.isAlipayActivated', function() {
+    return this.get('settings.isAlipayActivated') && find(paymentCurrencies, ['code', this.get('data.event.paymentCurrency')]).alipay;
   }),
 
   tickets: computed('data.event.tickets.@each.isDeleted', 'data.event.tickets.@each.position', function() {
diff --git a/app/controllers/orders/pending.js b/app/controllers/orders/pending.js
index 38e25680440..ca8dabcaa56 100644
--- a/app/controllers/orders/pending.js
+++ b/app/controllers/orders/pending.js
@@ -42,7 +42,7 @@ export default Controller.extend({
   }),
 
   actions: {
-    async aliPayCheckout(order_identifier) {
+    async alipayCheckout(order_identifier) {
       try {
         const res = await this.loader.load(`alipay/create_source/${order_identifier}`);
         this.notify.success(this.l10n.t('Payment has succeeded'));
diff --git a/app/models/event.js b/app/models/event.js
index 49d8f2a592d..df19b08f0b0 100644
--- a/app/models/event.js
+++ b/app/models/event.js
@@ -60,7 +60,7 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, {
   canPayByCheque  : attr('boolean', { defaultValue: false }),
   canPayByBank    : attr('boolean', { defaultValue: false }),
   canPayByOmise   : attr('boolean', { defaultValue: false }),
-  canPayByAliPay  : attr('boolean', { defaultValue: false }),
+  canPayByAlipay  : attr('boolean', { defaultValue: false }),
   canPayOnsite    : attr('boolean', { defaultValue: false }),
   paymentCountry  : attr('string'),
   paymentCurrency : attr('string', { defaultValue: 'USD' }),
diff --git a/app/models/setting.js b/app/models/setting.js
index f700f27dcc3..fc8eada0e85 100644
--- a/app/models/setting.js
+++ b/app/models/setting.js
@@ -53,7 +53,7 @@ export default ModelBase.extend({
   stripeTestClientId         : attr('string'),
   stripeTestSecretKey        : attr('string'),
   stripeTestPublishableKey   : attr('string'),
-  isAliPayActivated          : attr('boolean'),
+  isAlipayActivated          : attr('boolean'),
   isPaypalActivated          : attr('boolean'),
   isStripeActivated          : attr('boolean'),
   isOmiseActivated           : attr('boolean'),
diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
index 549e16b9a2d..194a77653e0 100644
--- a/app/templates/components/forms/orders/order-form.hbs
+++ b/app/templates/components/forms/orders/order-form.hbs
@@ -164,11 +164,11 @@
                 <label for="payment_mode"><img src="/images/payment-logos/omise.png" alt="omise"></label>
               </div>
             {{/if}}
-            {{#if data.event.canPayByAliPay}}
+            {{#if data.event.canPayByAlipay}}
               <div class="field">
                 {{ui-radio name='payment_mode' label=(t 'AliPay') value='alipay' current=data.paymentMode
                            onChange=(action (mut data.paymentMode))}}
-                <label for="payment_mode"><img src="/images/payment-logos/alipay.png" alt="alipay"></label>
+                <label for="payment_mode"><img src="/images/payment-logos/alipay.png" alt="alipay" class="ui tiny image"></label>
               </div>
             {{/if}}
             {{#if data.event.canPayByCheque}}
diff --git a/app/templates/components/forms/wizard/basic-details-step.hbs b/app/templates/components/forms/wizard/basic-details-step.hbs
index a61cc956214..b571fc4a301 100644
--- a/app/templates/components/forms/wizard/basic-details-step.hbs
+++ b/app/templates/components/forms/wizard/basic-details-step.hbs
@@ -345,7 +345,7 @@
         <label>{{t 'Payment with AliPay'}}</label>
         <div class="field payments">
           <div class="ui checkbox">
-            {{input type='checkbox' id='payment_by_alipay' checked=data.event.canPayByAliPay}}
+            {{input type='checkbox' id='payment_by_alipay' checked=data.event.canPayByAlipay}}
             <label for="payment_by_alipay">
               {{t 'Yes, accept payment through AliPay Gateway'}}
               <div class="ui hidden divider"></div>
diff --git a/app/templates/orders/pending.hbs b/app/templates/orders/pending.hbs
index 8acbb1564d3..332871e6e24 100644
--- a/app/templates/orders/pending.hbs
+++ b/app/templates/orders/pending.hbs
@@ -62,7 +62,7 @@
           </div>
         {{/if}}
         {{#if isAliPay}}
-          <button class="ui button primary" {{action alipayCheckout model.order.identifier}}>{{t 'Pay with AliPay'}}</button>          
+          <button class="ui button primary" {{action "alipayCheckout" model.order.identifier}}>{{t 'Pay with AliPay'}}</button>          
         {{/if}}
       </div>
     </div>