Merge pull request #106 from bold-commerce/CHK-4371

ApplePay for PPCP
bold-commerce · Oct 31, 2024 · 91c264f · 91c264f
2 parents 1cc6ae8 + 28f2aad
commit 91c264f
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 28 deletions.
diff --git a/Service/ExpressPay/Order/Create.php b/Service/ExpressPay/Order/Create.php
@@ -84,9 +84,11 @@ public function execute($quoteMaskId, $gatewayId, $shippingStrategy): array
             throw new LocalizedException(__('Could not create Express Pay order. Invalid quote ID "%1".', $quoteId));
         }
 
-        if (!empty($quote->getShippingAddress()->getShippingMethod())) {
-            $quote->getShippingAddress()->setShippingMethod('');
-        }
+       $hasBillingData = $quote->getBillingAddress()->getFirstname() && $quote->getBillingAddress()->getStreet();
+
+       if (!$hasBillingData && !empty($quote->getShippingAddress()->getShippingMethod())) {
+           $quote->getShippingAddress()->setShippingMethod('');
+       }
 
         $websiteId = (int)$quote->getStore()->getWebsiteId();
         $uri = 'checkout/orders/{{shopId}}/wallet_pay';

diff --git a/Service/ExpressPay/QuoteConverter.php b/Service/ExpressPay/QuoteConverter.php
@@ -98,6 +98,7 @@ public function convertLocale(Quote $quote): array
     public function convertCustomer(Quote $quote): array
     {
         $billingAddress = $quote->getBillingAddress();
+        $shippingAddress = $quote->getShippingAddress();
 
         if ($billingAddress->getId() === null) {
             return [];
@@ -108,7 +109,7 @@ public function convertCustomer(Quote $quote): array
                 'customer' => [
                     'first_name' => $billingAddress->getFirstname() ?? '',
                     'last_name' => $billingAddress->getLastname() ?? '',
-                    'email' => $billingAddress->getEmail() ?? ''
+                    'email' => $billingAddress->getEmail() ?? $shippingAddress->getEmail() ?? ''
                 ]
             ]
         ];
@@ -177,6 +178,8 @@ static function (Rate $rate) use ($currencyCode): array {
 
         if ($includeAddress && $hasRequiredAddressData) {
             $convertedQuote['order_data']['shipping_address'] = [
+                'first_name' => $shippingAddress->getFirstname() ?? '',
+                'last_name' => $shippingAddress->getLastname() ?? '',
                 'address_line_1' => $shippingAddress->getStreet()[0] ?? '',
                 'address_line_2' => $shippingAddress->getStreet()[1] ?? '',
                 'city' => $shippingAddress->getCity() ?? '',
@@ -186,6 +189,9 @@ static function (Rate $rate) use ($currencyCode): array {
             ];
         }
 
+        if ($shippingAddress->getTelephone()) {
+            $convertedQuote['order_data']['shipping_address']['phone_number'] = $shippingAddress->getTelephone();
+        }
         if ($hasRequiredAddressData && $shippingAddress->hasShippingMethod()) { // @phpstan-ignore method.notFound
             $convertedQuote['order_data']['selected_shipping_option'] = [
                 'id' => $shippingAddress->getShippingMethod(),

diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
@@ -18,6 +18,7 @@
                 <value id="bold_static_eps" type="host">static-eps.secure.boldcommerce.com</value>
                 <value id="bold_static_eps_staging" type="host">static-eps.secure.staging.boldcommerce.com</value>
                 <value id="bold_local" type="host">*.bold.ninja</value>
+                <value id="bold_applepay" type="host">*.cdn-apple.com</value>
             </values>
         </policy>
         <policy id="script-src">
@@ -33,6 +34,8 @@
                 <value id="bold_static_eps_staging" type="host">static-eps.secure.staging.boldcommerce.com</value>
                 <value id="bold_paypal_script" type="hash" algorithm="sha256">1ozuCt5fPv779wJQEWXLF2gXag+V1bnu3hmAhDbY0Cg=</value>
                 <value id="bold_local" type="host">*.bold.ninja</value>
+                <value id="bold_applepay_script" type="host">*.cdn-apple.com</value>
+                <value id="bold_stripe" type="host">*.stripe.com</value>
             </values>
         </policy>
         <policy id="frame-src">

diff --git a/view/frontend/web/js/action/express-pay/get-required-order-data-action.js b/view/frontend/web/js/action/express-pay/get-required-order-data-action.js
@@ -64,7 +64,7 @@ define(
                             shipping_total: parseFloat(totals()['shipping_amount'] || 0) * 100,
                             discounts_total: parseFloat(totals()['discount_amount'] || 0) * 100,
                             fees_total: parseFloat(totals()['fee_amount'] || 0) * 100,
-                            taxes_total: parseFloat(totals()['tax'] || 0) * 100,
+                            taxes_total: parseFloat(totals()['tax_amount'] || 0) * 100,
                         };
                         break;
                 }

diff --git a/view/frontend/web/js/action/express-pay/save-shipping-information-action.js b/view/frontend/web/js/action/express-pay/save-shipping-information-action.js
@@ -21,7 +21,7 @@ define(
          * @param {Boolean} saveBillingAddress - Save billing address with shipping information.
          * @return {Deferred}
          */
-        return function (saveBillingAddress = false) {
+        return async function (saveBillingAddress = false) {
             let payload;
             payload = {
                 addressInformation: {
@@ -37,6 +37,10 @@ define(
             return storage.post(
                 resourceUrlManager.getUrlForSetShippingInformation(quote),
                 JSON.stringify(payload)
+            ).done(
+                function (response) {
+                    quote.setTotals(response.totals);
+                }
             ).fail((response) => {
                 errorProcessor.process(response);
             });

diff --git a/view/frontend/web/js/action/express-pay/update-quote-address-action.js b/view/frontend/web/js/action/express-pay/update-quote-address-action.js
@@ -58,6 +58,8 @@ define(
                 region_code: state,
                 region_id: regionId
             } : regionName;
+            const email = addressData['email'] || quote.shippingAddress.email || quote.billingAddress.email;
+            const phone = addressData['phone'] || quote.shippingAddress.telephone || quote.billingAddress.telephone;
             const quoteAddress = magentoAddressConverter.formAddressDataToQuoteAddress(
                 {
                     address_type: addressType,
@@ -70,10 +72,10 @@ define(
                     city: addressData['city'] || addressData['locality'],
                     region: region,
                     region_id: regionId,
-                    telephone: addressData['phoneNumber'] ?? null,
+                    telephone: phone ?? null,
                     postcode: addressData['postal_code'] || addressData['postalCode'],
                     country_id: countryCode,
-                    email: addressData['email'] ?? null
+                    email: email ?? null
                 }
             );
 

diff --git a/view/frontend/web/js/action/express-pay/update-quote-ppcp-action.js b/view/frontend/web/js/action/express-pay/update-quote-ppcp-action.js
@@ -25,6 +25,10 @@ define(
          * @return {Promise}
          */
         return async function (paymentApprovalData) {
+            const paymentData = paymentApprovalData['payment_data'];
+            const availableWalletTypes = ['apple', 'google'];
+            const isWalletPayment = availableWalletTypes.includes(paymentData.payment_type);
+
             let order;
             try {
                 order = await getExpressPayOrderAction(
@@ -41,17 +45,22 @@ define(
                 address.last_name = order.last_name;
                 address.state = address.province;
                 address.country_code = address.country;
-                address.email = order.email;
+
+                if (!address.email && order.email) {
+                    address.email = order.email;
+                }
 
                 delete address.province;
                 delete address.country;
 
                 return address;
             }
 
-            quote.guestEmail = order.email;
-            updateQuoteAddressAction('shipping', _convertAddress(order.shipping_address, order));
-            updateQuoteAddressAction('billing', _convertAddress(order.billing_address, order));
+            if (!isWalletPayment) {
+                quote.guestEmail = order.email;
+                updateQuoteAddressAction('shipping', _convertAddress(order.shipping_address, order));
+                updateQuoteAddressAction('billing', _convertAddress(order.billing_address, order));
+            }
         };
     }
 );
diff --git a/view/frontend/web/js/action/express-pay/update-quote-shipping-method-action.js b/view/frontend/web/js/action/express-pay/update-quote-shipping-method-action.js
@@ -2,12 +2,14 @@ define(
     [
         'Magento_Checkout/js/model/quote',
         'Magento_Checkout/js/model/shipping-service',
-        'Bold_CheckoutPaymentBooster/js/action/express-pay/save-shipping-information-action'
+        'Bold_CheckoutPaymentBooster/js/action/express-pay/save-shipping-information-action',
+        'Magento_Checkout/js/action/select-shipping-method'
     ],
     function (
         quote,
         shippingService,
-        saveShippingInformation
+        saveShippingInformation,
+        selectShippingMethodAction
     ) {
         'use strict';
 
@@ -17,13 +19,13 @@ define(
          * @param {Object} shippingMethod
          * @return void
          */
-        return function (shippingMethod = null) {
+        return async function (shippingMethod = null) {
             let newMethod = null;
             if (shippingMethod !== null) {
                 let availableMethods = shippingService.getShippingRates().filter((method) => {
                     let methodId = `${method.carrier_code}_${method.method_code}`;
                     methodId = methodId.replace(/\s/g, '');
-                    return methodId === shippingMethod['id'];
+                    return methodId === shippingMethod['id'] || methodId === shippingMethod['identifier'];
                 });
                 if (availableMethods.length > 0) {
                     newMethod = availableMethods[0];
@@ -32,12 +34,13 @@ define(
                 newMethod = shippingService.getShippingRates().first();
             }
             if (newMethod !== null) {
-                quote.shippingMethod(newMethod);
+                selectShippingMethodAction(newMethod);
             }
             if (quote.guestEmail === null) {
                 quote.guestEmail = '[email protected]';
             }
-            saveShippingInformation();
+
+            await saveShippingInformation();
         }
     }
 );
diff --git a/view/frontend/web/js/model/spi/callbacks/on-approve-payment-order-callback.js b/view/frontend/web/js/model/spi/callbacks/on-approve-payment-order-callback.js
@@ -30,26 +30,37 @@ define(
          * @return {Promise}
          */
         return async function (paymentType, paymentInformation, paymentApprovalData) {
+            const paymentData = paymentApprovalData['payment_data'];
+            const availableWalletTypes = ['apple', 'google'];
+            const isWalletPayment = availableWalletTypes.includes(paymentData.payment_type);
+
             if (paymentApprovalData === null) {
                 console.error('Express Pay payment data is not set.');
                 return;
             }
             const paymentMethodData = {
-                method: 'bold',
+                method: window.checkoutConfig?.bold?.paymentBooster?.payment?.method ?? 'bold',
             };
-            if (paymentType === 'ppcp') {
+
+            if (paymentType === 'ppcp' || isWalletPayment) {
                 paymentMethodData['additional_data'] = {
                     order_id: paymentApprovalData?.payment_data.order_id
                 };
+            }
+
+            if (paymentType === 'ppcp') {
                 await updateQuotePPCPAction(paymentApprovalData);
             } else {
                 await updateQuoteBraintreeAction(paymentInformation, paymentApprovalData);
             }
-            try {
-                await saveShippingInformationAction(true);
-            } catch (error) {
-                console.error('Could not save shipping information for Express Pay order.', error);
-                return;
+
+            if (!isWalletPayment) {
+                try {
+                    await saveShippingInformationAction(true);
+                } catch (error) {
+                    console.error('Could not save shipping information for Express Pay order.', error);
+                    return;
+                }
             }
             const messageContainer = registry.get('checkout.errors').messageContainer;
             $.when(placeOrderAction(paymentMethodData, messageContainer))

diff --git a/view/frontend/web/js/model/spi/callbacks/on-create-payment-order-callback.js b/view/frontend/web/js/model/spi/callbacks/on-create-payment-order-callback.js
@@ -1,8 +1,14 @@
 define(
     [
+        'Bold_CheckoutPaymentBooster/js/action/express-pay/update-quote-address-action',
+        'Bold_CheckoutPaymentBooster/js/action/express-pay/update-quote-shipping-method-action',
+        'Bold_CheckoutPaymentBooster/js/action/express-pay/save-shipping-information-action',
         'Bold_CheckoutPaymentBooster/js/action/express-pay/create-wallet-pay-order-action'
     ],
     function (
+        updateQuoteAddressAction,
+        updateQuoteShippingMethodAction,
+        saveShippingInformationAction,
         createWalletPayOrderAction
     ) {
         'use strict';
@@ -14,9 +20,27 @@ define(
          * @param {Object} paymentOrder
          */
         return async function (paymentType, paymentPayload) {
+            const paymentData = paymentPayload['payment_data'];
+            const availableWalletTypes = ['apple', 'google'];
+            const isWalletPayment = availableWalletTypes.includes(paymentData.payment_type);
+
             if (paymentType !== 'ppcp') {
                 return;
             }
+
+            if (isWalletPayment) {
+                if (paymentData['shipping_address']) {
+                    updateQuoteAddressAction('shipping', paymentData['shipping_address']);
+                }
+                if (paymentData['billing_address']) {
+                    updateQuoteAddressAction('billing', paymentData['billing_address']);
+                }
+            } else {
+                await updateQuoteShippingMethodAction(paymentData['shipping_options']);
+            }
+
+            await saveShippingInformationAction(true);
+
             const walletPayResult = await createWalletPayOrderAction(paymentPayload);
             return {
                 payment_data: {

diff --git a/view/frontend/web/js/model/spi/callbacks/on-update-payment-order-callback.js b/view/frontend/web/js/model/spi/callbacks/on-update-payment-order-callback.js
@@ -1,15 +1,19 @@
 define(
     [
+        'jquery',
         'Bold_CheckoutPaymentBooster/js/action/express-pay/update-quote-address-action',
         'Bold_CheckoutPaymentBooster/js/action/express-pay/update-quote-shipping-method-action',
         'Bold_CheckoutPaymentBooster/js/action/express-pay/update-wallet-pay-order-action',
         'Bold_CheckoutPaymentBooster/js/action/express-pay/get-required-order-data-action',
+        'Magento_Checkout/js/action/get-totals'
     ],
     function (
+        $,
         updateQuoteAddressAction,
         updateQuoteShippingMethodAction,
         updateWalletPayOrderAction,
-        getRequiredOrderDataAction
+        getRequiredOrderDataAction,
+        getTotalsAction
     ) {
         'use strict';
 
@@ -21,13 +25,18 @@ define(
          */
         return async function (paymentType, paymentPayload) {
             const paymentData = paymentPayload['payment_data'];
+            const availableWalletTypes = ['apple', 'google'];
+            const isWalletPayment = availableWalletTypes.includes(paymentData.payment_type);
+
             if (paymentData['shipping_address']) {
                 updateQuoteAddressAction('shipping', paymentData['shipping_address']);
             }
-            updateQuoteShippingMethodAction(paymentData['shipping_options']);
-            if (paymentType === 'ppcp') {
+            await updateQuoteShippingMethodAction(paymentData['shipping_options']);
+
+            if (paymentType === 'ppcp' && !isWalletPayment) {
                 await updateWalletPayOrderAction(paymentData['order_id']);
             }
+
             return getRequiredOrderDataAction(
                 paymentPayload['require_order_data'] || []
             );