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

close #1336 Fixed: Wrong amount sent to backend

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-03-09 12:43:56 +03:00
parent 27b12da354
commit de0d74bb5f
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,15 +22,10 @@ class Money
$sale_price = $request->get('sale_price'); $sale_price = $request->get('sale_price');
$purchase_price = $request->get('purchase_price'); $purchase_price = $request->get('purchase_price');
$opening_balance = $request->get('opening_balance'); $opening_balance = $request->get('opening_balance');
$currency_code = $request->get('currency_code');
$items = $request->get('items'); $items = $request->get('items');
if (empty($currency_code)) {
$currency_code = setting('default.currency');
}
if (!empty($amount)) { if (!empty($amount)) {
$amount = money($request->get('amount'), $currency_code)->getAmount(); $amount = money($amount)->getAmount();
$request->request->set('amount', $amount); $request->request->set('amount', $amount);
} }
@ -42,11 +37,7 @@ class Money
continue; continue;
} }
if (isset($item['currency']) && $item['currency'] != $currency_code) { $items[$key]['price'] = money($item['price'])->getAmount();
$items[$key]['price'] = money($item['price'], $item['currency'])->getAmount();
} else {
$items[$key]['price'] = money($item['price'], $currency_code)->getAmount();
}
} }
$request->request->set('items', $items); $request->request->set('items', $items);
@ -54,24 +45,10 @@ class Money
} }
if (isset($opening_balance)) { if (isset($opening_balance)) {
$opening_balance = money($opening_balance, $currency_code)->getAmount(); $opening_balance = money($opening_balance)->getAmount();
$request->request->set('opening_balance', $opening_balance); $request->request->set('opening_balance', $opening_balance);
} }
/* check item price use money
if (isset($sale_price)) {
$sale_price = money($sale_price, $currency_code)->getAmount();
$request->request->set('sale_price', $sale_price);
}
if (isset($purchase_price)) {
$purchase_price = money($purchase_price, $currency_code)->getAmount();
$request->request->set('purchase_price', $purchase_price);
}
*/
} }
return $next($request); return $next($request);