TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 11:41:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix tax per item issue & check currency key

Browse Source
This commit is contained in:
harshjagad20
2022-03-04 12:08:03 +05:30
parent 83a7c97e9e
commit fadef0ea07
3 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php
View File

@ -23,11 +23,13 @@ class UpdateCompanySettingsController extends Controller
$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'));

4
app/Models/Invoice.php
View File

@ -498,6 +498,10 @@ class Invoice extends Model implements HasMedia
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']);