Additional check on shippingOverride

lunarphp · Oct 27, 2023 · 24835c0 · 24835c0
1 parent 86ff74d
commit 24835c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/core/src/Pipelines/Cart/ApplyShipping.php b/packages/core/src/Pipelines/Cart/ApplyShipping.php
@@ -36,7 +36,7 @@ public function handle(Cart $cart, Closure $next)
             $shippingSubTotal = $shippingOption->price->value;
             $shippingTotal = $shippingSubTotal;
 
-            if ($cart->shippingAddress) {
+            if ($cart->shippingAddress && ! $cart->shippingBreakdown) {
                 $cart->shippingAddress->shippingTotal = new Price($shippingTotal, $cart->currency, 1);
                 $cart->shippingAddress->shippingSubTotal = new Price($shippingOption->price->value, $cart->currency, 1);
             }

diff --git a/packages/core/src/Pipelines/Cart/CalculateTax.php b/packages/core/src/Pipelines/Cart/CalculateTax.php
@@ -75,11 +75,11 @@ public function handle(Cart $cart, Closure $next)
 
             $taxTotal += $shippingTaxTotal?->value;
 
-            if ($cart->shippingAddress) {
+            if ($cart->shippingAddress && ! $cart->shippingOptionOverride) {
                 $cart->shippingAddress->taxBreakdown = $shippingTax;
                 $cart->shippingAddress->shippingTaxTotal = $shippingTaxTotal;
             }
-            
+
             $taxBreakDownAmounts = $taxBreakDownAmounts->merge(
                 $shippingTax->amounts
             );