Include cart product subscription and taxes if id not empty

Author: givanz

system/cart/cart.php

@@ -120,7 +120,7 @@ public function updateCart() {
 					}
 				}
 
-				if (isset($product['subscription_plan_id'])) {
+				if (isset($product['subscription_plan_id']) && $product['subscription_plan_id']) {
 					$productSubscriptions[$productId] = $product['subscription_plan_id'];
 				}
 			}
@@ -214,7 +214,7 @@ public function updateCart() {
 				}
 
 				//add subscription data
-				if (isset($prod['subscription_plan_id'])) {
+				if (isset($prod['subscription_plan_id']) && $prod['subscription_plan_id']) {
 					$prod['subscription']      = $subscriptionResults[$prod['subscription_plan_id']] ?? [];
 					$prod['subscription_name'] = $prod['subscription']['name'];
 				}
@@ -289,8 +289,8 @@ function add($productId, $quantity = 1, $option = [], $subscriptionPlanId = fals
 			$this->products[$key]['quantity'] += $quantity;
 		} else {
 			$this->products[$key] = [
-				'product_id'           => $productId,
-				'quantity'             => $quantity,
+				'product_id'           => (int) $productId,
+				'quantity'             => (int)$quantity,
 				'option'               => $option,
 				'subscription_plan_id' => $subscriptionPlanId,
 			];

system/cart/tax-trait.php

@@ -38,7 +38,7 @@ public function getTaxes() {
 		$products = $this->products + $this->taxes;
 
 		foreach ($products as $product) {
-			if ($product['tax_type_id']) {
+			if (isset($product['tax_type_id']) && $product['tax_type_id']) {
 				$tax_rates = $this->tax->getRates($product['price'], $product['tax_type_id']);
 
 				foreach ($tax_rates as $tax_rate) {