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

bill/invoice show page currency enhancement

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-01-21 16:11:44 +03:00
parent f0293f0c1f
commit 76eab1900e
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Purchases/Bills.php
View File

@ -47,19 +47,17 @@ class Bills extends Controller
*/ */
public function show(Document $bill) public function show(Document $bill)
{ {
$currency = Currency::where('code', $bill->currency_code)->first();
// Get Bill Totals // Get Bill Totals
foreach ($bill->totals_sorted as $bill_total) { foreach ($bill->totals_sorted as $bill_total) {
$bill->{$bill_total->code} = $bill_total->amount; $bill->{$bill_total->code} = $bill_total->amount;
} }
$total = money($bill->total, $currency->code, true)->format(); $total = money($bill->total, $bill->currency_code, true)->format();
$bill->grand_total = money($total, $currency->code)->getAmount(); $bill->grand_total = money($total, $bill->currency_code)->getAmount();
if (!empty($bill->paid)) { if (!empty($bill->paid)) {
$bill->grand_total = round($bill->total - $bill->paid, $currency->precision); $bill->grand_total = round($bill->total - $bill->paid, config('money.' . $bill->currency_code . '.precision'));
} }
return view('purchases.bills.show', compact('bill')); return view('purchases.bills.show', compact('bill'));

8
app/Http/Controllers/Sales/Invoices.php
View File

@ -47,19 +47,17 @@ class Invoices extends Controller
*/ */
public function show(Document $invoice) public function show(Document $invoice)
{ {
$currency = Currency::where('code', $invoice->currency_code)->first();
// Get Invoice Totals // Get Invoice Totals
foreach ($invoice->totals_sorted as $invoice_total) { foreach ($invoice->totals_sorted as $invoice_total) {
$invoice->{$invoice_total->code} = $invoice_total->amount; $invoice->{$invoice_total->code} = $invoice_total->amount;
} }
$total = money($invoice->total, $currency->code, true)->format(); $total = money($invoice->total, $invoice->currency_code, true)->format();
$invoice->grand_total = money($total, $currency->code)->getAmount(); $invoice->grand_total = money($total, $invoice->currency_code)->getAmount();
if (!empty($invoice->paid)) { if (!empty($invoice->paid)) {
$invoice->grand_total = round($invoice->total - $invoice->paid, $currency->precision); $invoice->grand_total = round($invoice->total - $invoice->paid, config('money.' . $invoice->currency_code . '.precision'));
} }
return view('sales.invoices.show', compact('invoice')); return view('sales.invoices.show', compact('invoice'));