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

refs #451 Invoice item currency

Browse Source
This commit is contained in:
cuneytsenturk
2018-08-29 17:51:10 +03:00
parent 398c8d38a6
commit 4594bc6a72
7 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Expenses/Bills.php
View File

@ -755,7 +755,7 @@ class Bills extends Controller
// it should be integer for amount mask
$currency->precision = (int) $currency->precision;
$html = view('expenses.bills.item', compact('item_row', 'taxes'))->render();
$html = view('expenses.bills.item', compact('item_row', 'taxes', 'currency'))->render();
return response()->json([
'success' => true,

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

@ -892,7 +892,7 @@ class Invoices extends Controller
// it should be integer for amount mask
$currency->precision = (int) $currency->precision;
$html = view('incomes.invoices.item', compact('item_row', 'taxes'))->render();
$html = view('incomes.invoices.item', compact('item_row', 'taxes', 'currency'))->render();
return response()->json([
'success' => true,

6
app/Http/Middleware/Money.php
View File

@ -38,7 +38,11 @@ class Money
if (isset($bill_number) || isset($invoice_number) || !empty($items)) {
if (!empty($items)) {
foreach ($items as $key => $item) {
$items[$key]['price'] = money($item['price'], $currency_code)->getAmount();
if (isset($item['currency']) && $item['currency'] != $currency_code) {
$items[$key]['price'] = money($item['price'], $item['currency'])->getAmount();
} else {
$items[$key]['price'] = money($item['price'], $currency_code)->getAmount();
}
}
$request->request->set('item', $items);