From de0d74bb5f0c156216b26b1134d097203efa3630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 9 Mar 2020 12:43:56 +0300 Subject: [PATCH] close #1336 Fixed: Wrong amount sent to backend --- app/Http/Middleware/Money.php | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/app/Http/Middleware/Money.php b/app/Http/Middleware/Money.php index 538ded968..a84e0a3b2 100644 --- a/app/Http/Middleware/Money.php +++ b/app/Http/Middleware/Money.php @@ -22,15 +22,10 @@ class Money $sale_price = $request->get('sale_price'); $purchase_price = $request->get('purchase_price'); $opening_balance = $request->get('opening_balance'); - $currency_code = $request->get('currency_code'); $items = $request->get('items'); - if (empty($currency_code)) { - $currency_code = setting('default.currency'); - } - if (!empty($amount)) { - $amount = money($request->get('amount'), $currency_code)->getAmount(); + $amount = money($amount)->getAmount(); $request->request->set('amount', $amount); } @@ -42,11 +37,7 @@ class Money continue; } - 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(); - } + $items[$key]['price'] = money($item['price'])->getAmount(); } $request->request->set('items', $items); @@ -54,24 +45,10 @@ class Money } 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); } - - /* 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);