Merge pull request #26 from insane-code/fix/loger-changes

fix: add support for tax amount from form
insane-code · Mar 16, 2023 · c9fcb4e · c9fcb4e
2 parents 0e59523 + b4f5196
commit c9fcb4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/Http/Controllers/InvoiceController.php b/src/Http/Controllers/InvoiceController.php
@@ -16,6 +16,9 @@
 
 class InvoiceController
 {
+    private $searchable = [];
+    private $validationRules = [];
+
     public function __construct()
     {
         $this->searchable = ['name'];

diff --git a/src/Jobs/Invoice/CreateInvoiceLine.php b/src/Jobs/Invoice/CreateInvoiceLine.php
@@ -77,7 +77,7 @@ private function createItemTaxes($taxes, $line) {
                         "concept" => $tax['description'] ?? $tax['concept'],
                         "rate" => $taxRate,
                         "type" => $tax['type'],
-                        "amount" => $taxLineTotal,
+                        "amount" => $tax['amount'] ?? $taxLineTotal,
                         "amount_base" => $line->amount,
                         "index" => $index,
                     ]);

diff --git a/src/Models/Invoice/Invoice.php b/src/Models/Invoice/Invoice.php
@@ -250,7 +250,9 @@ public static function setNumber($invoice)
     public static function calculateTotal($invoice)
     {
         $total = InvoiceLine::where(["invoice_id" =>  $invoice->id])->selectRaw('sum(price) as price, sum(discount) as discount, sum(amount) as amount')->get();
-        $totalTax = InvoiceLineTax::where(["invoice_id" =>  $invoice->id])->selectRaw('sum(amount * type) as amount')->get();
+        $totalTax = InvoiceLineTax::where(["invoice_id" =>  $invoice->id])
+        ->selectRaw('sum(amount * type) as amount')
+        ->get();
 
         $discount = $total[0]['discount'] ?? 0;
         $taxTotal = $totalTax[0]['amount'] ?? 0;