Apple Pay on PDP causes issue on normal add to cart closes #195

assets/js/stripe-apple-pay-single.js

@@ -26,16 +26,6 @@ jQuery( function( $ ) {
 		init: function() {
 			Stripe.applePay.checkAvailability( function( available ) {
 				if ( available ) {
-					$( document.body ).on( 'woocommerce_variation_has_changed', function() {
-						wc_stripe_apple_pay_single.generate_cart();
-					})
-
-					.on( 'change', '.quantity .qty', function() {
-						wc_stripe_apple_pay_single.generate_cart();
-					});
-
-					wc_stripe_apple_pay_single.generate_cart();
-
 					$( '.apple-pay-button' ).show();
 				}
 			});
@@ -61,9 +51,14 @@ jQuery( function( $ ) {
 						currencyCode: wc_stripe_apple_pay_single_params.currency_code,
 						total: {
 							label: wc_stripe_apple_pay_single_params.label,
-							amount: wc_stripe_apple_pay_single_params.total
+							amount: 1,
+							type: 'pending'
+						},
+						lineItems: {
+							label: 'Sub-Total',
+							amount: 1,
+							type: 'pending'
 						},
-						lineItems: wc_stripe_apple_pay_single_params.line_items,
 						requiredBillingContactFields: ['postalAddress'],
 						requiredShippingContactFields: 'yes' === wc_stripe_apple_pay_single_params.needs_shipping ? ['postalAddress', 'phone', 'email', 'name'] : ['phone', 'email', 'name']
 					};
@@ -126,7 +121,7 @@ jQuery( function( $ ) {
 						});
 					};
 
-					// After the shipping method has been selected
+					// After the shipping method has been selected.
 					applePaySession.onshippingmethodselected = function( event ) {
 						var data = {
 							'nonce': wc_stripe_apple_pay_single_params.stripe_apple_pay_update_shipping_method_nonce,
@@ -155,6 +150,20 @@ jQuery( function( $ ) {
 					};
 				}
 
+				// When payment is selected, we need to fetch cart.
+				applePaySession.onpaymentmethodselected = function( event ) {
+					$.when( wc_stripe_apple_pay_single.generate_cart() ).then( function() {
+
+						var total = {
+								label: wc_stripe_apple_pay_single_params.label,
+								amount: wc_stripe_apple_pay_single_params.total
+							},
+							lineItems = wc_stripe_apple_pay_single_params.line_items;
+
+						applePaySession.completePaymentMethodSelection( total, lineItems );
+					});
+				};
+
 				applePaySession.begin();
 			});
 		},

includes/class-wc-stripe-apple-pay.php

@@ -234,7 +234,7 @@ public function display_apple_pay_button() {
 
 			$product = wc_get_product( $post->ID );
 
-			if ( ! in_array( ( version_compare( WC_VERSION, '3.0.0', '<' ) ? $product->product_type : $product->get_type() ), $this->supported_product_types() ) ) {
+			if ( ! is_object( $product ) || ! in_array( ( version_compare( WC_VERSION, '3.0.0', '<' ) ? $product->product_type : $product->get_type() ), $this->supported_product_types() ) ) {
 				return;
 			}
 		}

readme.txt

@@ -98,6 +98,7 @@ If you get stuck, you can ask for help in the Plugin Forum.
 = 3.1.4 =
 * Tweak - If Apple Pay is not enabled, prevent Apple Pay Init.
 * Fix - Update for WooCommerce 3.0 compatibility.
+* Fix - Apple Pay on product detail page causes qty issue when using normal add to cart.
 
 = 3.1.3 =
 * Fix - When using Stripe Checkout, add payment method was disabled.