Fix: recreate intent when quote price is changed

airwallex · May 4, 2024 · 4db8870 · 4db8870
1 parent 6b96446
commit 4db8870
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 29 deletions.
diff --git a/Model/Client/Request/PaymentIntents/Get.php b/Model/Client/Request/PaymentIntents/Get.php
@@ -21,6 +21,10 @@
 
 class Get extends AbstractClient implements BearerAuthenticationInterface
 {
+    public const INTENT_STATUS_SUCCESS = 'SUCCEEDED';
+
+    public const INTENT_STATUS_REQUIRES_CAPTURE = 'REQUIRES_CAPTURE';
+
     /**
      * @var string
      */

diff --git a/Model/PaymentIntents.php b/Model/PaymentIntents.php
@@ -154,7 +154,7 @@ public function removeIntents(): void
      */
     private function getCacheKey(Quote $quote): string
     {
-        return 'airwallex-intent-' . $quote->getId();
+        return 'airwallex-intent-' . $quote->getId() . '-' . sprintf("%.4f", $quote->getGrandTotal());
     }
 
     /**

diff --git a/Model/Service.php b/Model/Service.php
@@ -472,7 +472,7 @@ public function postAddress(): string
             $cartId = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id')->getQuoteId();
         }
 
-        $address = $quote->getBillingAddress();
+        $address = $quote->getShippingAddress();
         $address->setCountryId($this->request->getParam('country_id'));
         $address->setCity($this->request->getParam('city'));
         $address->setRegion($region->getRegion());
@@ -519,7 +519,7 @@ public function postAddress(): string
      * Apple pay validate merchant
      *
      * @return string
-     * @throws Exception
+     * @throws Exception|GuzzleException
      */
     public function validateMerchant()
     {
@@ -566,7 +566,8 @@ protected function checkIntent($id)
         $resp = $this->intentGet->setPaymentIntentId($id)->send();
 
         $respArr = json_decode($resp, true);
-        if (!in_array($respArr['status'], ["SUCCEEDED", "REQUIRES_CAPTURE"], true)) {
+        $okStatus = [$this->intentGet::INTENT_STATUS_SUCCESS, $this->intentGet::INTENT_STATUS_REQUIRES_CAPTURE];
+        if (!in_array($respArr['status'], $okStatus, true)) {
             throw new Exception(__('Something went wrong while processing your request. Please try again later.'));
         }
     }

diff --git a/view/base/web/css/admin.css b/view/base/web/css/admin.css
@@ -14,9 +14,8 @@
  */
 
 .airwallex-admin-config .heading {
-    padding-left: 20rem;
     background: url('../img/airwallex_logo.svg') no-repeat 0 50% / 18rem auto;
-    height: 40px;
+    padding-left: 20rem;
 }
 
 .airwallex-admin-config .button-container {

diff --git a/view/frontend/web/js/view/payment/method-renderer/express-checkout.js b/view/frontend/web/js/view/payment/method-renderer/express-checkout.js
@@ -102,26 +102,26 @@ define(
                     return;
                 }
 
-                let recreateGooglepay = async () => {
+                let recreatePays = async () => {
                     if (!$(this.showMinicartSelector).hasClass('active')) {
                         return;
                     }
 
-                    Airwallex.destroyElement('googlePayButton');
+                    this.destroyElement()
                     await this.fetchExpressData();
                     if (this.from === 'minicart' && utils.isCartEmpty(this.expressData)) {
                         return;
                     }
-                    googlepay.create(this);
+                    this.createPays()
                 };
 
                 let cartData = customerData.get('cart');
-                cartData.subscribe(recreateGooglepay, this);
+                cartData.subscribe(recreatePays, this);
 
                 if (this.from !== 'minicart' || utils.isFromMinicartAndShouldNotShow(this.from)) {
                     return;
                 }
-                $(this.showMinicartSelector).on("click", recreateGooglepay);
+                $(this.showMinicartSelector).on("click", recreatePays);
             },
 
             async initialize() {
@@ -164,22 +164,31 @@ define(
                 if (this.from === 'minicart' && utils.isCartEmpty(this.expressData)) {
                     return;
                 }
-                googlepay.create(this);
-                applepay.create(this);
+                this.createPays()
             },
 
             initHashPaymentEvent() {
                 window.addEventListener('hashchange', async () => {
                     if (window.location.hash === '#payment') {
-                        Airwallex.destroyElement('googlePayButton');
+                        this.destroyElement()
                         // we need update quote, because we choose shipping method last step
                         await this.fetchExpressData();
-                        googlepay.create(this);
+                        this.createPays()
                     }
                 });
             },
 
-            placeOrder() {
+            destroyElement() {
+                Airwallex.destroyElement('googlePayButton');
+                Airwallex.destroyElement('applePayButton');
+            },
+
+            createPays() {
+                googlepay.create(this);
+                applepay.create(this);
+            },
+
+            placeOrder(pay) {
                 $('body').trigger('processStart');
                 const payload = {
                     cartId: utils.getCartId(),
@@ -218,7 +227,8 @@ define(
                             addressHandler.setIntentConfirmBillingAddressFromOfficial(this.expressData.billing_address);
                             params.payment_method.billing = addressHandler.intentConfirmBillingAddressFromOfficial;
                         }
-                        await applepay.confirmIntent(params);
+
+                        await eval(pay).confirmIntent(params)
 
                         payload.intent_id = intentResponse.intent_id;
                         const endResult = await storage.post(
@@ -227,8 +237,8 @@ define(
 
                         resolve(endResult);
                     } catch (e) {
-                        Airwallex.destroyElement('googlePayButton');
-                        googlepay.create(this);
+                        this.destroyElement()
+                        this.createPays()
                         reject(e);
                     }
                 })).then(response => {

diff --git a/view/frontend/web/js/view/payment/method-renderer/express/applepay.js b/view/frontend/web/js/view/payment/method-renderer/express/applepay.js
@@ -19,16 +19,13 @@ define([
         methods: [],
         selectedMethod: {},
         intermediateShippingAddress: {},
-        applePayRequiredBillingContactFields: [
+        requiredShippingContactFields: [
             'email',
             'name',
             'phone',
             'postalAddress',
         ],
-        applePayRequiredShippingContactFields: [
-            'email',
-            'name',
-            'phone',
+        requiredBillingContactFields: [
             'postalAddress',
         ],
 
@@ -100,13 +97,17 @@ define([
                     }, utils.isLoggedIn(), utils.getCartId());
                 }
                 addressHandler.setIntentConfirmBillingAddressFromApple(billing, shipping.emailAddress);
-                that.placeOrder();
+                that.placeOrder('applepay');
             });
         },
 
         getRequestOptions() {
             let paymentDataRequest = this.getOptions();
 
+            if (!utils.isRequireShippingOption()) {
+                paymentDataRequest.requiredShippingContactFields = this.requiredShippingContactFields.filter(e => e !== 'postalAddress');
+            }
+
             const transactionInfo = {
                 amount: {
                     value: utils.formatCurrency(this.expressData.grand_total),
@@ -126,8 +127,8 @@ define([
                 origin: window.location.origin,
                 totalPriceLabel: this.paymentConfig.express_seller_name || '',
                 countryCode: this.paymentConfig.country_code,
-                requiredBillingContactFields: this.applePayRequiredBillingContactFields,
-                requiredShippingContactFields: this.applePayRequiredShippingContactFields,
+                requiredBillingContactFields: this.requiredBillingContactFields,
+                requiredShippingContactFields: this.requiredShippingContactFields,
                 autoCapture: this.paymentConfig.is_express_capture_enabled,
             };
         },

diff --git a/view/frontend/web/js/view/payment/method-renderer/express/googlepay.js b/view/frontend/web/js/view/payment/method-renderer/express/googlepay.js
@@ -69,7 +69,7 @@ define([
                     }, utils.isLoggedIn(), utils.getCartId());
                 }
                 addressHandler.setIntentConfirmBillingAddressFromGoogle(event.detail.paymentData);
-                that.placeOrder();
+                that.placeOrder('googlepay');
             });
         },
 

diff --git a/view/frontend/web/js/view/payment/method-renderer/express/utils.js b/view/frontend/web/js/view/payment/method-renderer/express/utils.js
@@ -222,7 +222,6 @@ define([
         },
 
         error(response) {
-            console.log(response);
             let modalSelector = $('#awx-modal');
             modal({title: 'Error'}, modalSelector);
-Original file line number
+Diff line change
@@ Expand Up / @@ -154,7 +154,7 @@ public function removeIntents(): void @@
          */
         private function getCacheKey(Quote $quote): string
         {
-            return 'airwallex-intent-' . $quote->getId();
+            return 'airwallex-intent-' . $quote->getId() . '-' . sprintf("%.4f", $quote->getGrandTotal());
         }
         /**
@@ Expand Down @@