From 465f41b34b56e90f9ab3145b918f917a96ebb44b Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Sun, 10 Sep 2023 11:21:58 +0200
Subject: [PATCH] Fix amount logic in cart

---
 modules/ppcp-applepay/src/Assets/ApplePayButton.php  | 12 +++---------
 .../src/Assets/ApplePayDataObjectHttp.php            |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/modules/ppcp-applepay/src/Assets/ApplePayButton.php b/modules/ppcp-applepay/src/Assets/ApplePayButton.php
index dc577cf4c..3970fde35 100644
--- a/modules/ppcp-applepay/src/Assets/ApplePayButton.php
+++ b/modules/ppcp-applepay/src/Assets/ApplePayButton.php
@@ -546,9 +546,6 @@ class ApplePayButton implements ButtonInterface {
 				);
 			}
 			if ( $cart->needs_shipping() ) {
-				if ( ! $shipping_method ) {
-					return array();
-				}
 				list(
 					$shipping_methods_array, $selected_shipping_method
 					) = $this->cart_shipping_methods(
@@ -602,14 +599,14 @@ class ApplePayButton implements ButtonInterface {
 	 *
 	 * @param WC_Cart $cart WC Cart instance.
 	 * @param array   $customer_address Customer address.
-	 * @param array   $shipping_method Shipping method.
+	 * @param array|null   $shipping_method Shipping method.
 	 * @param string  $shipping_method_id Shipping method id.
 	 */
 	protected function cart_shipping_methods(
 		$cart,
 		$customer_address,
-		$shipping_method,
-		$shipping_method_id
+		$shipping_method = null,
+		$shipping_method_id = ''
 	): array {
 
 		$shipping_methods_array = array();
@@ -731,9 +728,6 @@ class ApplePayButton implements ButtonInterface {
 			}
 
 			if ( $cart->needs_shipping() ) {
-				if ( ! $shipping_method ) {
-					return array();
-				}
 				list(
 					$shipping_methods_array, $selected_shipping_method
 					) = $this->cart_shipping_methods(
diff --git a/modules/ppcp-applepay/src/Assets/ApplePayDataObjectHttp.php b/modules/ppcp-applepay/src/Assets/ApplePayDataObjectHttp.php
index 61558325b..b112596f4 100644
--- a/modules/ppcp-applepay/src/Assets/ApplePayDataObjectHttp.php
+++ b/modules/ppcp-applepay/src/Assets/ApplePayDataObjectHttp.php
@@ -43,7 +43,7 @@ class ApplePayDataObjectHttp {
 	 *
 	 * @var mixed
 	 */
-	protected $product_id;
+	protected $product_id = '';
 
 	/**
 	 * The caller page.
@@ -55,9 +55,9 @@ class ApplePayDataObjectHttp {
 	/**
 	 * The product quantity.
 	 *
-	 * @var mixed
+	 * @var string
 	 */
-	protected $product_quantity;
+	protected $product_quantity = '';
 
 	/**
 	 * The shipping methods.