fix tax-per-item issue

ACarolan · Jul 16, 2021 · d3a7456 · d3a7456
1 parent 2b80082
commit d3a7456
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
@@ -476,33 +476,22 @@ public static function createTaxes($invoice, $request)
 
     public function getPDFData()
     {
-        $taxTypes = [];
-        $taxes = [];
-        $labels = [];
+        $taxes = collect();
 
         if ($this->tax_per_item === 'YES') {
             foreach ($this->items as $item) {
                 foreach ($item->taxes as $tax) {
-                    if (! in_array($tax->name, $taxTypes)) {
-                        array_push($taxTypes, $tax->name);
-                        array_push($labels, $tax->name.' ('.$tax->percent.'%)');
+                    $found = $taxes->filter(function ($item) use ($tax) {
+                        return $item->tax_type_id == $tax->tax_type_id;
+                    })->first();
+
+                    if ($found) {
+                        $found->amount += $tax->amount;
+                    } else {
+                        $taxes->push($tax);
                     }
                 }
             }
-
-            foreach ($taxTypes as $taxType) {
-                $total = 0;
-
-                foreach ($this->items as $item) {
-                    foreach ($item->taxes as $tax) {
-                        if ($tax->name == $taxType) {
-                            $total += $tax->amount;
-                        }
-                    }
-                }
-
-                array_push($taxes, $total);
-            }
         }
 
         $invoiceTemplate = self::find($this->id)->template_name;
@@ -521,7 +510,6 @@ public function getPDFData()
             'billing_address' => $this->getCustomerBillingAddress(),
             'notes' => $this->getNotes(),
             'logo' => $logo ?? null,
-            'labels' => $labels,
             'taxes' => $taxes,
         ]);
 

diff --git a/resources/views/app/pdf/invoice/partials/table.blade.php b/resources/views/app/pdf/invoice/partials/table.blade.php
@@ -79,16 +79,16 @@ class="text-right item-cell"
         </tr>
 
         @if ($invoice->tax_per_item === 'YES')
-            @for ($i = 0; $i < count($labels); $i++)
+            @foreach ($taxes as $tax)
                 <tr>
                     <td class="border-0 total-table-attribute-label">
-                        {{$labels[$i]}}
+                        {{$tax->name.' ('.$tax->percent.'%)'}}
                     </td>
                     <td class="py-2 border-0 item-cell total-table-attribute-value">
-                        {!! format_money_pdf($taxes[$i], $invoice->user->currency) !!}
+                        {!! format_money_pdf($tax->amount, $invoice->user->currency) !!}
                     </td>
                 </tr>
-            @endfor
+            @endforeach
         @else
             @foreach ($invoice->taxes as $tax)
                 <tr>