Merge branch 'trunk' into modularity-full-migration

# Conflicts:
#	modules/ppcp-blocks/src/BlocksModule.php

modules/ppcp-applepay/extensions.php

@@ -49,7 +49,9 @@ return array(
 
 		// Domain validation.
 		$domain_validation_text = __( 'Status: Domain validation failed ❌', 'woocommerce-paypal-payments' );
-		if ( $container->get( 'applepay.is_validated' ) ) {
+		if ( ! $container->get( 'applepay.has_validated' ) ) {
+			$domain_validation_text = __( 'The domain has not yet been validated. Use the Apple Pay button to validate the domain ❌', 'woocommerce-paypal-payments' );
+		} elseif ( $container->get( 'applepay.is_validated' ) ) {
 			$domain_validation_text = __( 'Status: Domain successfully validated ✔️', 'woocommerce-paypal-payments' );
 		}
 
@@ -157,6 +159,7 @@ return array(
 									->action_visible( 'applepay_button_color' )
 									->action_visible( 'applepay_button_type' )
 									->action_visible( 'applepay_button_language' )
+									->action_visible( 'applepay_checkout_data_mode' )
 									->to_array(),
 							)
 						),

modules/ppcp-applepay/resources/css/styles.scss

@@ -1,63 +1,44 @@
-#applepay-container, .ppcp-button-applepay {
+.ppcp-button-applepay {
+	// Should replicate apm-button.scss sizes.
 	--apple-pay-button-height: 45px;
-	--apple-pay-button-min-height: 40px;
+	--apple-pay-button-min-height: 35px;
 	--apple-pay-button-width: 100%;
 	--apple-pay-button-max-width: 750px;
 	--apple-pay-button-border-radius: 4px;
 	--apple-pay-button-overflow: hidden;
-	margin:7px 0;
+
+	.ppcp-width-min & {
+		--apple-pay-button-height: 35px;
+	}
+	.ppcp-width-300 & {
+		--apple-pay-button-height: 45px;
+	}
+	.ppcp-width-500 & {
+		--apple-pay-button-height: 55px;
+	}
+
 	&.ppcp-button-pill {
 		--apple-pay-button-border-radius: 50px;
 	}
 
 	&.ppcp-button-minicart {
 		--apple-pay-button-display: block;
-		--apple-pay-button-height: 40px;
 	}
 }
 
-.woocommerce-checkout {
-	#applepay-container, .ppcp-button-applepay {
-		margin-top: 0.5em;
-		--apple-pay-button-border-radius: 4px;
-		--apple-pay-button-height: 45px;
-		&.ppcp-button-pill {
-			--apple-pay-button-border-radius: 50px;
-		}
-	}
-}
+.wp-block-woocommerce-checkout, .wp-block-woocommerce-cart {
+	.ppcp-button-applepay {
+		--apple-pay-button-margin: 0;
 
-.ppcp-has-applepay-block {
-
-	.wp-block-woocommerce-checkout {
-		#applepay-container, .ppcp-button-applepay {
-			--apple-pay-button-margin: 0;
-			--apple-pay-button-height: 40px;
-			&.ppcp-button-pill {
-				--apple-pay-button-border-radius: 50px;
-			}
-		}
-	}
-
-	.wp-block-woocommerce-cart {
-		#applepay-container, .ppcp-button-applepay {
-			--apple-pay-button-margin: 0;
-			--apple-pay-button-height: 40px;
-		}
-		/* Workaround for blocks grid */
-		.wc-block-components-express-payment__event-buttons {
-			--apple-pay-button-display: block;
-			li[id*="express-payment-method-ppcp-"] {
-				--apple-pay-button-padding-bottom: 0;
-			}
+		apple-pay-button {
+			min-width: 0;
+			width: 100%;
+			--apple-pay-button-width-default: 100%;
 		}
 	}
 }
 
 .wp-admin {
-	.ppcp-button-applepay {
-		pointer-events: none;
-	}
 	&.ppcp-non-ios-device {
 		.ppcp-button-applepay {
 			apple-pay-button {

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

@@ -5,10 +5,13 @@ import {setEnabled} from '../../../ppcp-button/resources/js/modules/Helper/Butto
 import FormValidator from "../../../ppcp-button/resources/js/modules/Helper/FormValidator";
 import ErrorHandler from '../../../ppcp-button/resources/js/modules/ErrorHandler';
 import widgetBuilder from "../../../ppcp-button/resources/js/modules/Renderer/WidgetBuilder";
+import {apmButtonsInit} from "../../../ppcp-button/resources/js/modules/Helper/ApmButtons";
 
 class ApplepayButton {
 
     constructor(context, externalHandler, buttonConfig, ppcpConfig) {
+        apmButtonsInit(ppcpConfig);
+
         this.isInitialized = false;
 
         this.context = context;
@@ -60,7 +63,7 @@ class ApplepayButton {
         this.initEventHandlers();
         this.isInitialized = true;
         this.applePayConfig = config;
-        const isEligible = this.applePayConfig.isEligible;
+        const isEligible = (this.applePayConfig.isEligible && window.ApplePaySession) || this.buttonConfig.is_admin;
 
         if (isEligible) {
             this.fetchTransactionInfo().then(() => {
@@ -84,6 +87,10 @@ class ApplepayButton {
                     });
                 }
             });
+        } else {
+            jQuery('#' + this.buttonConfig.button.wrapper).hide();
+            jQuery('#' + this.buttonConfig.button.mini_cart_wrapper).hide();
+            jQuery('#express-payment-method-ppcp-applepay').hide();
         }
     }
 
@@ -107,7 +114,7 @@ class ApplepayButton {
         let config = {
             wrapper: this.buttonConfig.button.wrapper,
             ppcpStyle: this.ppcpConfig.button.style,
-            //buttonStyle: this.buttonConfig.button.style,
+            buttonStyle: this.buttonConfig.button.style,
             ppcpButtonWrapper: this.ppcpConfig.button.wrapper
         }
 
@@ -119,7 +126,7 @@ class ApplepayButton {
         }
 
         if (['cart-block', 'checkout-block'].indexOf(this.context) !== -1) {
-            config.ppcpButtonWrapper = '#express-payment-method-ppcp-gateway';
+            config.ppcpButtonWrapper = '#express-payment-method-ppcp-gateway-paypal';
         }
 
         return config;
@@ -167,14 +174,8 @@ class ApplepayButton {
     addButton() {
         this.log('addButton', this.context);
 
-        const wrapper =
-            (this.context === 'mini-cart')
-                ? this.buttonConfig.button.mini_cart_wrapper
-                : this.buttonConfig.button.wrapper;
-        const shape =
-            (this.context === 'mini-cart')
-                ? this.ppcpConfig.button.mini_cart_style.shape
-                : this.ppcpConfig.button.style.shape;
+        const { wrapper, ppcpStyle } = this.contextConfig();
+
         const appleContainer = document.getElementById(wrapper);
         const type = this.buttonConfig.button.type;
         const language = this.buttonConfig.button.lang;
@@ -185,8 +186,13 @@ class ApplepayButton {
             appleContainer.innerHTML = `<apple-pay-button id="${id}" buttonstyle="${color}" type="${type}" locale="${language}">`;
         }
 
-        jQuery('#' + wrapper).addClass('ppcp-button-' + shape);
-        jQuery(wrapper).append(appleContainer);
+        const $wrapper = jQuery('#' + wrapper);
+        $wrapper.addClass('ppcp-button-' + ppcpStyle.shape);
+
+        if (ppcpStyle.height) {
+            $wrapper.css('--apple-pay-button-height', `${ppcpStyle.height}px`)
+            $wrapper.css('height', `${ppcpStyle.height}px`)
+        }
     }
 
     //------------------------

modules/ppcp-applepay/resources/js/boot-admin.js

@@ -65,7 +65,7 @@ import widgetBuilder from "../../../ppcp-button/resources/js/modules/Renderer/Wi
         buttonConfig.button.wrapper = selector.replace('#', '');
         applyConfigOptions(buttonConfig);
 
-        const wrapperElement = `<div id="${selector.replace('#', '')}" class="ppcp-button-applepay"></div>`;
+        const wrapperElement = `<div id="${selector.replace('#', '')}" class="ppcp-button-apm ppcp-button-applepay"></div>`;
 
         if (!jQuery(selector).length) {
             jQuery(ppcpConfig.button.wrapper).after(wrapperElement);

modules/ppcp-applepay/resources/js/boot-block.js

@@ -23,12 +23,6 @@ const ApplePayComponent = () => {
         const manager = new ApplepayManager(buttonConfig, ppcpConfig);
         manager.init();
     };
-    useEffect(() => {
-        const bodyClass = 'ppcp-has-applepay-block';
-        if (!document.body.classList.contains(bodyClass)) {
-            document.body.classList.add(bodyClass);
-        }
-    }, []);
 
     useEffect(() => {
         // Load ApplePay SDK
@@ -50,14 +44,13 @@ const ApplePayComponent = () => {
     }, [paypalLoaded, applePayLoaded]);
 
     return (
-        <div id={buttonConfig.button.wrapper.replace('#', '')}></div>
+        <div id={buttonConfig.button.wrapper.replace('#', '')} className="ppcp-button-apm ppcp-button-applepay"></div>
     );
 }
 
 const features = ['products'];
-let registerMethod = registerExpressPaymentMethod;
 
-registerMethod({
+registerExpressPaymentMethod({
     name: buttonData.id,
     label: <div dangerouslySetInnerHTML={{__html:  buttonData.title}}/>,
     content: <ApplePayComponent isEditing={false}/>,

modules/ppcp-applepay/services.php

@@ -62,6 +62,11 @@ return array(
 		);
 	},
 
+	'applepay.has_validated'                     => static function ( ContainerInterface $container ): bool {
+		$settings = $container->get( 'wcgateway.settings' );
+		return $settings->has( 'applepay_validated' );
+	},
+
 	'applepay.is_validated'                      => static function ( ContainerInterface $container ): bool {
 		$settings = $container->get( 'wcgateway.settings' );
 		return $settings->has( 'applepay_validated' ) ? $settings->get( 'applepay_validated' ) === true : false;

modules/ppcp-applepay/src/Assets/ApplePayButton.php

@@ -968,7 +968,7 @@ class ApplePayButton implements ButtonInterface {
 			add_action(
 				$render_placeholder,
 				function () {
-					echo '<span id="applepay-container-minicart" class="ppcp-button-applepay ppcp-button-minicart"></span>';
+					echo '<span id="applepay-container-minicart" class="ppcp-button-apm ppcp-button-applepay ppcp-button-minicart"></span>';
 				},
 				21
 			);
@@ -981,7 +981,7 @@ class ApplePayButton implements ButtonInterface {
 	 */
 	protected function applepay_button(): void {
 		?>
-		<div id="applepay-container">
+		<div id="applepay-container" class="ppcp-button-apm ppcp-button-applepay">
 			<?php wp_nonce_field( 'woocommerce-process_checkout', 'woocommerce-process-checkout-nonce' ); ?>
 		</div>
 		<?php

modules/ppcp-applepay/src/Assets/DataToAppleButtonScripts.php

@@ -149,6 +149,7 @@ class DataToAppleButtonScripts {
 		return array(
 			'sdk_url'     => $this->sdk_url,
 			'is_debug'    => defined( 'WP_DEBUG' ) && WP_DEBUG ? true : false,
+			'is_admin'    => false,
 			'preferences' => array(
 				'checkout_data_mode' => $checkout_data_mode,
 			),
@@ -204,6 +205,7 @@ class DataToAppleButtonScripts {
 		return array(
 			'sdk_url'     => $this->sdk_url,
 			'is_debug'    => defined( 'WP_DEBUG' ) && WP_DEBUG ? true : false,
+			'is_admin'    => false,
 			'preferences' => array(
 				'checkout_data_mode' => $checkout_data_mode,
 			),
@@ -252,6 +254,7 @@ class DataToAppleButtonScripts {
 		return array(
 			'sdk_url'     => $this->sdk_url,
 			'is_debug'    => defined( 'WP_DEBUG' ) && WP_DEBUG ? true : false,
+			'is_admin'    => true,
 			'preferences' => array(
 				'checkout_data_mode' => $checkout_data_mode,
 			),

modules/ppcp-applepay/src/Helper/ApmApplies.php

@@ -1,6 +1,7 @@
 <?php
 /**
  * ApmApplies helper.
+ * Checks if ApplePay is available for a given country and currency.
  *
  * @package WooCommerce\PayPalCommerce\ApplePay\Helper
  */
@@ -15,7 +16,7 @@ namespace WooCommerce\PayPalCommerce\Applepay\Helper;
 class ApmApplies {
 
 	/**
-	 * The matrix which countries and currency combinations can be used for DCC.
+	 * The matrix which countries and currency combinations can be used for ApplePay.
 	 *
 	 * @var array
 	 */
@@ -38,7 +39,7 @@ class ApmApplies {
 	/**
 	 * ApmApplies constructor.
 	 *
-	 * @param array  $allowed_country_currency_matrix The matrix which countries and currency combinations can be used for DCC.
+	 * @param array  $allowed_country_currency_matrix The matrix which countries and currency combinations can be used for ApplePay.
 	 * @param string $currency 3-letter currency code of the shop.
 	 * @param string $country 2-letter country code of the shop.
 	 */