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

fixed #372

Browse Source
This commit is contained in:
denisdulici 2018-07-05 16:55:35 +03:00
parent a6492033da
commit d0c6e327c1
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/Http/Controllers/Banking/Transfers.php
View File

@ -128,26 +128,25 @@ class Transfers extends Controller
$payment = Payment::create($request->all()); $payment = Payment::create($request->all());
$transfer = new Transfer(); // Convert amount if not same currency
if ($payment_currency_code != $revenue_currency_code) {
$transfer = new Transfer();
$transfer->default_currency_code = $payment_currency_code; $transfer->default_currency_code = $payment_currency_code;
$transfer->amount = $request['amount']; $transfer->amount = $request['amount'];
$transfer->currency_code = $revenue_currency_code; $transfer->currency_code = $revenue_currency_code;
$transfer->currency_rate = $currencies[$revenue_currency_code]; $transfer->currency_rate = $currencies[$revenue_currency_code];
$amount = $transfer->getDynamicConvertedAmount(); $amount = $transfer->getDynamicConvertedAmount();
} else {
$amount = $request['amount'];
}
$request['account_id'] = $request['to_account_id']; $request['account_id'] = $request['to_account_id'];
// paid_at
$request['amount'] = $amount; $request['amount'] = $amount;
$request['currency_code'] = $revenue_currency_code; $request['currency_code'] = $revenue_currency_code;
$request['currency_rate'] = $currencies[$revenue_currency_code]; $request['currency_rate'] = $currencies[$revenue_currency_code];
$request['customer_id'] = '0'; $request['customer_id'] = '0';
// description
// category_id
// payment_method
// reference
// attachment
$revenue = Revenue::create($request->all()); $revenue = Revenue::create($request->all());
@ -218,27 +217,26 @@ class Transfers extends Controller
$payment->update($request->all()); $payment->update($request->all());
$transfer = new Transfer(); // Convert amount if not same currency
if ($payment_currency_code != $revenue_currency_code) {
$transfer = new Transfer();
$transfer->default_currency_code = $payment_currency_code; $transfer->default_currency_code = $payment_currency_code;
$transfer->amount = $request['amount']; $transfer->amount = $request['amount'];
$transfer->currency_code = $revenue_currency_code; $transfer->currency_code = $revenue_currency_code;
$transfer->currency_rate = $currencies[$revenue_currency_code]; $transfer->currency_rate = $currencies[$revenue_currency_code];
$amount = $transfer->getDynamicConvertedAmount(); $amount = $transfer->getDynamicConvertedAmount();
} else {
$amount = $request['amount'];
}
$request['account_id'] = $request['to_account_id']; $request['account_id'] = $request['to_account_id'];
// paid_at
$request['amount'] = $amount; $request['amount'] = $amount;
$request['currency_code'] = $revenue_currency_code; $request['currency_code'] = $revenue_currency_code;
$request['currency_rate'] = $currencies[$revenue_currency_code]; $request['currency_rate'] = $currencies[$revenue_currency_code];
$request['customer_id'] = '0'; $request['customer_id'] = '0';
// description
// category_id
// payment_method
// reference
// attachment
$revenue->update($request->all()); $revenue->update($request->all());
$request['payment_id'] = $payment->id; $request['payment_id'] = $payment->id;