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

Merge pull request #461 from batuhawk/master

Browse Source 
refs #451 invoice and bill currency issue some fix
This commit is contained in:
Cüneyt Şentürk 2018-08-29 19:51:02 +03:00 committed by GitHub
commit 4fe94cf1a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Common/Items.php
View File

@ -280,8 +280,8 @@ class Items extends Controller
$item_tax_price = ($item->sale_price / 100) * $tax->rate; $item_tax_price = ($item->sale_price / 100) * $tax->rate;
} }
$item->sale_price = $this->convertPrice($item->sale_price, $currency_code, $currency->rate); //$item->sale_price = $this->convertPrice($item->sale_price, $currency_code, $currency->rate);
$item->purchase_price = $this->convertPrice($item->purchase_price, $currency_code, $currency->rate); //$item->purchase_price = $this->convertPrice($item->purchase_price, $currency_code, $currency->rate);
switch ($type) { switch ($type) {
case 'bill': case 'bill':

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

@ -76,7 +76,9 @@ class Invoices extends Controller
foreach ($invoice->payments as $item) { foreach ($invoice->payments as $item) {
$default_amount = $item->amount; $default_amount = $item->amount;
if ($invoice->currency_code != $item->currency_code) { if ($invoice->currency_code == $item->currency_code) {
$amount = (double)$default_amount;
} else {
$default_amount_model = new InvoicePayment(); $default_amount_model = new InvoicePayment();
$default_amount_model->default_currency_code = $invoice->currency_code; $default_amount_model->default_currency_code = $invoice->currency_code;
@ -85,17 +87,17 @@ class Invoices extends Controller
$default_amount_model->currency_rate = $_currencies[$item->currency_code]; $default_amount_model->currency_rate = $_currencies[$item->currency_code];
$default_amount = (double) $default_amount_model->getDivideConvertedAmount(); $default_amount = (double) $default_amount_model->getDivideConvertedAmount();
$convert_amount = new InvoicePayment();
$convert_amount->default_currency_code = $item->currency_code;
$convert_amount->amount = $default_amount;
$convert_amount->currency_code = $invoice->currency_code;
$convert_amount->currency_rate = $_currencies[$invoice->currency_code];
$amount = (double) $convert_amount->getDynamicConvertedAmount();
} }
$convert_amount = new InvoicePayment();
$convert_amount->default_currency_code = $item->currency_code;
$convert_amount->amount = $default_amount;
$convert_amount->currency_code = $invoice->currency_code;
$convert_amount->currency_rate = $_currencies[$invoice->currency_code];
$amount = (double) $convert_amount->getDynamicConvertedAmount();
$paid += $amount; $paid += $amount;
} }
} }

70
app/Http/Controllers/Modals/InvoicePayments.php
View File

@ -39,13 +39,13 @@ class InvoicePayments extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$currency = Currency::where('code', setting('general.default_currency'))->first();
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first(); $account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
$currency = Currency::where('code', $account_currency_code)->first();
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
$invoice->paid = $this->getPaid($invoice); $paid = $this->getPaid($invoice);
// Get Invoice Totals // Get Invoice Totals
foreach ($invoice->totals as $invoice_total) { foreach ($invoice->totals as $invoice_total) {
@ -88,7 +88,9 @@ class InvoicePayments extends Controller
$default_amount = (double) $request['amount']; $default_amount = (double) $request['amount'];
if ($invoice->currency_code != $request['currency_code']) { if ($invoice->currency_code == $request['currency_code']) {
$amount = $default_amount;
} else {
$default_amount_model = new InvoicePayment(); $default_amount_model = new InvoicePayment();
$default_amount_model->default_currency_code = $invoice->currency_code; $default_amount_model->default_currency_code = $invoice->currency_code;
@ -97,17 +99,17 @@ class InvoicePayments extends Controller
$default_amount_model->currency_rate = $currencies[$request['currency_code']]; $default_amount_model->currency_rate = $currencies[$request['currency_code']];
$default_amount = (double) $default_amount_model->getDivideConvertedAmount(); $default_amount = (double) $default_amount_model->getDivideConvertedAmount();
$convert_amount = new InvoicePayment();
$convert_amount->default_currency_code = $request['currency_code'];
$convert_amount->amount = $default_amount;
$convert_amount->currency_code = $invoice->currency_code;
$convert_amount->currency_rate = $currencies[$invoice->currency_code];
$amount = (double) $convert_amount->getDynamicConvertedAmount();
} }
$convert_amount = new InvoicePayment();
$convert_amount->default_currency_code = $request['currency_code'];
$convert_amount->amount = $default_amount;
$convert_amount->currency_code = $invoice->currency_code;
$convert_amount->currency_rate = $currencies[$invoice->currency_code];
$amount = (double) $convert_amount->getDynamicConvertedAmount();
if ($invoice->payments()->count()) { if ($invoice->payments()->count()) {
$total_amount -= $this->getPaid($invoice); $total_amount -= $this->getPaid($invoice);
} }
@ -134,18 +136,18 @@ class InvoicePayments extends Controller
$error_amount_model->currency_rate = $currencies[$invoice->currency_code]; $error_amount_model->currency_rate = $currencies[$invoice->currency_code];
$error_amount = (double) $error_amount_model->getDivideConvertedAmount(); $error_amount = (double) $error_amount_model->getDivideConvertedAmount();
$convert_amount = new InvoicePayment();
$convert_amount->default_currency_code = $invoice->currency_code;
$convert_amount->amount = $error_amount;
$convert_amount->currency_code = $request['currency_code'];
$convert_amount->currency_rate = $currencies[$request['currency_code']];
$error_amount = (double) $convert_amount->getDynamicConvertedAmount();
} }
$convert_amount = new InvoicePayment(); $message = trans('messages.error.over_payment', ['amount' => money($error_amount, $request['currency_code'],true)]);
$convert_amount->default_currency_code = $invoice->currency_code;
$convert_amount->amount = $error_amount;
$convert_amount->currency_code = $request['currency_code'];
$convert_amount->currency_rate = $currencies[$request['currency_code']];
$error_amount = (double) $convert_amount->getDynamicConvertedAmount();
$message = trans('messages.error.over_payment', ['amount' => money($error_amount, $request['currency_code'], true)]);
return response()->json([ return response()->json([
'success' => false, 'success' => false,
@ -217,7 +219,9 @@ class InvoicePayments extends Controller
foreach ($invoice->payments as $item) { foreach ($invoice->payments as $item) {
$default_amount = $item->amount; $default_amount = $item->amount;
if ($invoice->currency_code != $item->currency_code) { if ($invoice->currency_code == $item->currency_code) {
$amount = (double) $default_amount;
} else {
$default_amount_model = new InvoicePayment(); $default_amount_model = new InvoicePayment();
$default_amount_model->default_currency_code = $invoice->currency_code; $default_amount_model->default_currency_code = $invoice->currency_code;
@ -226,17 +230,17 @@ class InvoicePayments extends Controller
$default_amount_model->currency_rate = $_currencies[$item->currency_code]; $default_amount_model->currency_rate = $_currencies[$item->currency_code];
$default_amount = (double) $default_amount_model->getDivideConvertedAmount(); $default_amount = (double) $default_amount_model->getDivideConvertedAmount();
$convert_amount = new InvoicePayment();
$convert_amount->default_currency_code = $item->currency_code;
$convert_amount->amount = $default_amount;
$convert_amount->currency_code = $invoice->currency_code;
$convert_amount->currency_rate = $_currencies[$invoice->currency_code];
$amount = (double) $convert_amount->getDynamicConvertedAmount();
} }
$convert_amount = new InvoicePayment();
$convert_amount->default_currency_code = $item->currency_code;
$convert_amount->amount = $default_amount;
$convert_amount->currency_code = $invoice->currency_code;
$convert_amount->currency_rate = $_currencies[$invoice->currency_code];
$amount = (double) $convert_amount->getDynamicConvertedAmount();
$paid += $amount; $paid += $amount;
} }
} }

5
resources/views/incomes/invoices/create.blade.php
View File

@ -373,6 +373,11 @@
$('#currency_rate').val(data.currency_rate); $('#currency_rate').val(data.currency_rate);
$('.input-price').each(function(){ $('.input-price').each(function(){
input_price_id = $(this).attr('id');
input_currency_id = input_price_id.replace('price', 'currency');
$('#' + input_currency_id).val(data.currency_code);
amount = $(this).maskMoney('unmasked')[0]; amount = $(this).maskMoney('unmasked')[0];
$(this).maskMoney({ $(this).maskMoney({

5
resources/views/incomes/invoices/edit.blade.php
View File

@ -381,6 +381,11 @@
$('#currency_rate').val(data.currency_rate); $('#currency_rate').val(data.currency_rate);
$('.input-price').each(function(){ $('.input-price').each(function(){
input_price_id = $(this).attr('id');
input_currency_id = input_price_id.replace('price', 'currency');
$('#' + input_currency_id).val(data.currency_code);
amount = $(this).maskMoney('unmasked')[0]; amount = $(this).maskMoney('unmasked')[0];
$(this).maskMoney({ $(this).maskMoney({