shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refs #412 Added payment check currency

Browse Source
This commit is contained in:
cuneytsenturk 2018-07-10 17:21:40 +03:00
parent 51b3e37856
commit 7641d7e315
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Customers/Invoices.php
View File

@ -50,9 +50,15 @@ class Invoices extends Controller
$paid = 0; $paid = 0;
foreach ($invoice->payments as $item) { foreach ($invoice->payments as $item) {
$item->default_currency_code = $invoice->currency_code; $amount = $item->amount;
$paid += $item->getDynamicConvertedAmount(); if ($invoice->currency_code != $item->currency_code) {
$item->default_currency_code = $invoice->currency_code;
$amount = $item->getDynamicConvertedAmount();
}
$paid += $amount;
} }
$invoice->paid = $paid; $invoice->paid = $paid;
@ -118,9 +124,15 @@ class Invoices extends Controller
$paid = 0; $paid = 0;
foreach ($invoice->payments as $item) { foreach ($invoice->payments as $item) {
$item->default_currency_code = $invoice->currency_code; $amount = $item->amount;
$paid += $item->getDynamicConvertedAmount(); if ($invoice->currency_code != $item->currency_code) {
$item->default_currency_code = $invoice->currency_code;
$amount = $item->getDynamicConvertedAmount();
}
$paid += $amount;
} }
$invoice->paid = $paid; $invoice->paid = $paid;

20
app/Http/Controllers/Incomes/Invoices.php
View File

@ -69,9 +69,15 @@ class Invoices extends Controller
$paid = 0; $paid = 0;
foreach ($invoice->payments as $item) { foreach ($invoice->payments as $item) {
$item->default_currency_code = $invoice->currency_code; $amount = $item->amount;
$paid += $item->getDynamicConvertedAmount(); if ($invoice->currency_code != $item->currency_code) {
$item->default_currency_code = $invoice->currency_code;
$amount = $item->getDynamicConvertedAmount();
}
$paid += $amount;
} }
$invoice->paid = $paid; $invoice->paid = $paid;
@ -821,9 +827,15 @@ class Invoices extends Controller
$paid = 0; $paid = 0;
foreach ($invoice->payments as $item) { foreach ($invoice->payments as $item) {
$item->default_currency_code = $invoice->currency_code; $amount = $item->amount;
$paid += $item->getDynamicConvertedAmount(); if ($invoice->currency_code != $item->currency_code) {
$item->default_currency_code = $invoice->currency_code;
$amount = $item->getDynamicConvertedAmount();
}
$paid += $amount;
} }
$invoice->paid = $paid; $invoice->paid = $paid;