From 67228694a14ff297bac0b7f6c0c46067c9b282ef Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 18 Jul 2018 17:21:08 +0300 Subject: [PATCH] invoice mark paid show add payment price --- app/Http/Controllers/Incomes/Invoices.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 250ee3012..044a2c670 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -675,9 +675,15 @@ class Invoices extends Controller $paid = 0; 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; } $amount = $invoice->amount - $paid;