Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix tax per item issue & check currency key
  • Loading branch information
HarshJagad20 committed Mar 4, 2022
1 parent 83a7c97 commit fadef0e
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 5 deletions.
Expand Up @@ -23,11 +23,13 @@ public function __invoke(UpdateSettingsRequest $request)
$companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
$data = $request->settings;

if ($companyCurrency !== $data['currency'] && $company->hasTransactions()) {
return response()->json([
'success' => false,
'message' => 'Cannot update company currency after transactions are created.'
]);
if (array_key_exists('currency', $data)) {
if ($companyCurrency !== $data['currency'] && $company->hasTransactions()) {
return response()->json([
'success' => false,
'message' => 'Cannot update company currency after transactions are created.'
]);
}
}

CompanySetting::setSettings($data, $request->header('company'));
Expand Down
4 changes: 4 additions & 0 deletions app/Models/Invoice.php
Expand Up @@ -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['exchnage_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']);
Expand Down
@@ -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()
{
//
}
}

0 comments on commit fadef0e

Please sign in to comment.