Update CalculateTax.php (#905)

lunarphp · Mar 29, 2023 · 48e1820 · 48e1820
1 parent a25ae05
commit 48e1820
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/packages/core/src/Pipelines/Cart/CalculateTax.php b/packages/core/src/Pipelines/Cart/CalculateTax.php
@@ -17,7 +17,7 @@ class CalculateTax
      */
     public function handle(Cart $cart, Closure $next)
     {
-        $taxBreakDown = new TaxBreakdown;
+        $taxBreakDownAmounts = collect();
 
         foreach ($cart->lines as $cartLine) {
             $subTotal = $cartLine->subTotal?->value;
@@ -28,26 +28,33 @@ public function handle(Cart $cart, Closure $next)
                 $subTotal = $cartLine->subTotalDiscounted?->value;
             }
 
-            $taxBreakDown = Taxes::setShippingAddress($cart->shippingAddress)
+            $taxBreakDownResult = Taxes::setShippingAddress($cart->shippingAddress)
                 ->setBillingAddress($cart->billingAddress)
                 ->setCurrency($cart->currency)
                 ->setPurchasable($cartLine->purchasable)
                 ->setCartLine($cartLine)
                 ->getBreakdown($subTotal);
 
-            $taxTotal = $taxBreakDown->amounts->sum('price.value');
+            $taxBreakDownAmounts = $taxBreakDownAmounts->merge(
+                $taxBreakDownResult->amounts
+            );
 
-            $cartLine->taxBreakdown = $taxBreakDown;
+            $taxTotal = $taxBreakDownResult->amounts->sum('price.value');
+
+            $cartLine->taxBreakdown = $taxBreakDownResult;
 
             $cart->taxTotal = new Price($taxTotal, $cart->currency, 1);
             $cartLine->taxAmount = new Price($taxTotal, $cart->currency, $unitQuantity);
             $cartLine->total = new Price($subTotal + $taxTotal, $cart->currency, $unitQuantity);
         }
 
+        $taxBreakDown = new TaxBreakdown($taxBreakDownAmounts);
+
         $taxTotal = $cart->lines->sum('taxAmount.value');
         $taxBreakDownAmounts = $taxBreakDown->amounts->filter()->flatten();
 
         if ($shippingAddress = $cart->shippingAddress) {
+
             $taxTotal += $shippingAddress->shippingTaxTotal?->value;
             $shippingTaxBreakdown = $shippingAddress->taxBreakdown;