Merge branch 'trunk' into PCP-2186-apple-pay-button-preview

modules/ppcp-applepay/resources/js/ApplepayButton.js

@@ -26,7 +26,7 @@ class ApplepayButton {
 
         this.updated_contact_info = []
         this.selectedShippingMethod = []
-        this.nonce = document.getElementById('woocommerce-process-checkout-nonce')?.value
+        this.nonce = document.getElementById('woocommerce-process-checkout-nonce')?.value || buttonConfig.nonce
 
         this.log = function() {
             if ( this.buttonConfig.is_debug ) {
@@ -243,6 +243,11 @@ class ApplepayButton {
             requiredShippingContactFields: ["postalAddress", "email", "phone"],
             requiredBillingContactFields: ["postalAddress", "email", "phone"],
         }
+
+        if (!this.contextHandler.shippingAllowed()) {
+            baseRequest.requiredShippingContactFields = [];
+        }
+
         const paymentDataRequest = Object.assign({}, baseRequest);
         paymentDataRequest.currencyCode = buttonConfig.shop.currencyCode;
         paymentDataRequest.total = {
@@ -512,18 +517,53 @@ class ApplepayButton {
                 if (confirmOrderResponse && confirmOrderResponse.approveApplePayPayment) {
                     if (confirmOrderResponse.approveApplePayPayment.status === "APPROVED") {
                         try {
-                            let data = {
-                                billing_contact: event.payment.billingContact,
-                                shipping_contact: event.payment.shippingContact,
-                                paypal_order_id: id,
-                            };
-                            let authorizationResult = await processInWooAndCapture(data);
-                            if (authorizationResult.result === "success") {
-                                session.completePayment(ApplePaySession.STATUS_SUCCESS)
-                                window.location.href = authorizationResult.redirect
+
+                            if (!this.contextHandler.shippingAllowed()) {
+                                // No shipping, expect immediate capture, ex: PayNow.
+
+                                let approveFailed = false;
+                                await this.contextHandler.approveOrder({
+                                    orderID: id
+                                }, { // actions mock object.
+                                    restart: () => new Promise((resolve, reject) => {
+                                        approveFailed = true;
+                                        resolve();
+                                    }),
+                                    order: {
+                                        get: () => new Promise((resolve, reject) => {
+                                            resolve(null);
+                                        })
+                                    }
+                                });
+
+                                if (!approveFailed) {
+                                    this.log('onpaymentauthorized approveOrder OK');
+                                    session.completePayment(ApplePaySession.STATUS_SUCCESS);
+                                } else {
+                                    this.log('onpaymentauthorized approveOrder FAIL');
+                                    session.completePayment(ApplePaySession.STATUS_FAILURE);
+                                    session.abort()
+                                    console.error(error);
+                                }
+
                             } else {
-                                session.completePayment(ApplePaySession.STATUS_FAILURE)
+                                // Default payment.
+
+                                let data = {
+                                    billing_contact: event.payment.billingContact,
+                                    shipping_contact: event.payment.shippingContact,
+                                    paypal_order_id: id,
+                                };
+                                let authorizationResult = await processInWooAndCapture(data);
+                                if (authorizationResult.result === "success") {
+                                    session.completePayment(ApplePaySession.STATUS_SUCCESS)
+                                    window.location.href = authorizationResult.redirect
+                                } else {
+                                    session.completePayment(ApplePaySession.STATUS_FAILURE)
+                                }
+
                             }
+
                         } catch (error) {
                             session.completePayment(ApplePaySession.STATUS_FAILURE);
                             session.abort()

modules/ppcp-applepay/resources/js/Context/BaseHandler.js

@@ -1,8 +1,6 @@
 import ErrorHandler from "../../../../ppcp-button/resources/js/modules/ErrorHandler";
 import CartActionHandler
     from "../../../../ppcp-button/resources/js/modules/ActionHandler/CartActionHandler";
-import onApprove
-    from "../../../../ppcp-button/resources/js/modules/OnApproveHandler/onApproveForContinue";
 
 class BaseHandler {
 
@@ -11,6 +9,10 @@ class BaseHandler {
         this.ppcpConfig = ppcpConfig;
     }
 
+    shippingAllowed() {
+        return true;
+    }
+
     transactionInfo() {
         return new Promise((resolve, reject) => {
 
@@ -42,30 +44,32 @@ class BaseHandler {
     }
 
     createOrder() {
-        const errorHandler = new ErrorHandler(
-            this.ppcpConfig.labels.error.generic,
-            document.querySelector('.woocommerce-notices-wrapper')
-        );
-
-        const actionHandler = new CartActionHandler(
-            this.ppcpConfig,
-            errorHandler,
-        );
-
-        return actionHandler.configuration().createOrder(null, null);
+        return this.actionHandler().configuration().createOrder(null, null);
     }
 
-    approveOrderForContinue(data, actions) {
-        const errorHandler = new ErrorHandler(
+    approveOrder(data, actions) {
+        return this.actionHandler().configuration().onApprove(data, actions);
+    }
+
+    actionHandler() {
+        return new CartActionHandler(
+            this.ppcpConfig,
+            this.errorHandler(),
+        );
+    }
+
+    errorHandler() {
+        return new ErrorHandler(
             this.ppcpConfig.labels.error.generic,
             document.querySelector('.woocommerce-notices-wrapper')
         );
+    }
 
-        let onApproveHandler = onApprove({
-            config: this.ppcpConfig
-        }, errorHandler);
-
-        return onApproveHandler(data, actions);
+    errorHandler() {
+        return new ErrorHandler(
+            this.ppcpConfig.labels.error.generic,
+            document.querySelector('.woocommerce-notices-wrapper')
+        );
     }
 
 }

modules/ppcp-applepay/resources/js/Context/ContextHandlerFactory.js

@@ -5,6 +5,7 @@ import CartBlockHandler from "./CartBlockHandler";
 import CheckoutBlockHandler from "./CheckoutBlockHandler";
 import MiniCartHandler from "./MiniCartHandler";
 import PreviewHandler from "./PreviewHandler";
+import PayNowHandler from "./PayNowHandler";
 
 class ContextHandlerFactory {
 
@@ -15,8 +16,9 @@ class ContextHandlerFactory {
             case 'cart':
                 return new CartHandler(buttonConfig, ppcpConfig);
             case 'checkout':
-            case 'pay-now': // same as checkout
                 return new CheckoutHandler(buttonConfig, ppcpConfig);
+            case 'pay-now':
+                return new PayNowHandler(buttonConfig, ppcpConfig);
             case 'mini-cart':
                 return new MiniCartHandler(buttonConfig, ppcpConfig);
             case 'cart-block':

modules/ppcp-applepay/resources/js/Context/PayNowHandler.js

@@ -0,0 +1,35 @@
+import Spinner from "../../../../ppcp-button/resources/js/modules/Helper/Spinner";
+import BaseHandler from "./BaseHandler";
+import CheckoutActionHandler
+    from "../../../../ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler";
+
+class PayNowHandler extends BaseHandler {
+
+    shippingAllowed() {
+        return false;
+    }
+
+    transactionInfo() {
+        return new Promise(async (resolve, reject) => {
+            const data = this.ppcpConfig['pay_now'];
+
+            resolve({
+                countryCode: data.country_code,
+                currencyCode: data.currency_code,
+                totalPriceStatus: 'FINAL',
+                totalPrice: data.total_str
+            });
+        });
+    }
+
+    actionHandler() {
+        return new CheckoutActionHandler(
+            this.ppcpConfig,
+            this.errorHandler(),
+            new Spinner()
+        );
+    }
+
+}
+
+export default PayNowHandler;

modules/ppcp-applepay/resources/js/Context/SingleProductHandler.js

@@ -49,19 +49,14 @@ class SingleProductHandler extends BaseHandler {
     }
 
     createOrder() {
-        return this.actionHandler().configuration().createOrder();
-    }
-
-    products() {
-        return this.actionHandler().getProducts();
+        return this.actionHandler().configuration().createOrder(null, null, {
+            'updateCartOptions': {
+                'keepShipping': true
+            }
+        });
     }
 
     actionHandler() {
-        const errorHandler = new ErrorHandler(
-            this.ppcpConfig.labels.error.generic,
-            document.querySelector('.woocommerce-notices-wrapper')
-        );
-
         return new SingleProductActionHandler(
             this.ppcpConfig,
             new UpdateCart(
@@ -69,10 +64,13 @@ class SingleProductHandler extends BaseHandler {
                 this.ppcpConfig.ajax.change_cart.nonce,
             ),
             document.querySelector('form.cart'),
-            errorHandler,
+            this.errorHandler(),
         );
     }
 
+    products() {
+        return this.actionHandler().getProducts();
+    }
 }
 
 export default SingleProductHandler;