Merge branch 'fix-latest-issues' into 'master'

Fix tax per item issue & check currency key See merge request mohit.panjvani/crater-web!1460
crater-invoice-inc · Mar 6, 2022 · 7275f3d · 7275f3d
2 parents 7ba120d + e31f947
commit 7275f3d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php b/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php
@@ -25,7 +25,7 @@ public function __invoke(UpdateSettingsRequest $request)
 
         if (
             Arr::exists($data, 'currency') &&
-            (CompanySetting::getSetting('currency', $company->id) !== $data['currency']) && 
+            (CompanySetting::getSetting('currency', $company->id) !== $data['currency']) &&
             $company->hasTransactions()
         ) {
             return response()->json([

diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
@@ -498,6 +498,10 @@ public static function createItems($invoice, $invoiceItems)
             if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) {
                 foreach ($invoiceItem['taxes'] as $tax) {
                     $tax['company_id'] = $invoice->company_id;
+                    $tax['exchange_rate'] = $invoice->exchange_rate;
+                    $tax['base_amount'] = $tax['amount'] * $exchange_rate;
+                    $tax['currency_id'] = $invoice->currency_id;
+
                     if (gettype($tax['amount']) !== "NULL") {
                         if (array_key_exists('recurring_invoice_id', $invoiceItem)) {
                             unset($invoiceItem['recurring_invoice_id']);
@@ -520,7 +524,7 @@ public static function createTaxes($invoice, $taxes)
 
         foreach ($taxes as $tax) {
             $tax['company_id'] = $invoice->company_id;
-            $tax['exchnage_rate'] = $invoice->exchange_rate;
+            $tax['exchange_rate'] = $invoice->exchange_rate;
             $tax['base_amount'] = $tax['amount'] * $exchange_rate;
             $tax['currency_id'] = $invoice->currency_id;
 

diff --git a/database/migrations/2022_03_04_051438_calculate_base_values_for_invoice_items.php b/database/migrations/2022_03_04_051438_calculate_base_values_for_invoice_items.php
@@ -0,0 +1,38 @@
+<?php
+
+use Crater\Models\InvoiceItem;
+use Crater\Models\Tax;
+use Illuminate\Database\Migrations\Migration;
+
+class CalculateBaseValuesForInvoiceItems extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $taxes = Tax::whereRelation('invoiceItem', 'base_amount', null)->get();
+
+        if ($taxes) {
+            $taxes->map(function ($tax) {
+                $invoiceItem = InvoiceItem::find($tax->invoice_item_id);
+                $exchange_rate = $invoiceItem->exchange_rate;
+                $tax->exchange_rate = $exchange_rate;
+                $tax->base_amount = $tax->amount * $exchange_rate;
+                $tax->save();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}