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

Partial payment fixed

Browse Source
This commit is contained in:
Batuhan Baş 2019-02-01 16:20:44 +03:00
parent 941989d746
commit 69e456b5bf
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,8 +391,8 @@ class Bills extends Controller
$multiplier *= 10;
}
$amount *= $multiplier;
$total_amount *= $multiplier;
$amount_check = (int) ($amount * $multiplier);
$total_amount_check = (int) (round($total_amount, $currency->precision) * $multiplier);
if ($amount > $total_amount) {
$message = trans('messages.error.over_payment');

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

@ -520,8 +520,8 @@ class Invoices extends Controller
$multiplier *= 10;
}
$amount *= $multiplier;
$total_amount *= $multiplier;
$amount_check = (int) ($amount * $multiplier);
$total_amount_check = (int) (round($total_amount, $currency->precision) * $multiplier);
if ($amount > $total_amount) {
$message = trans('messages.error.over_payment');

6
app/Http/Controllers/Modals/BillPayments.php
View File

@ -55,7 +55,7 @@ class BillPayments extends Controller
$bill->grand_total = money($total, $currency->code)->getAmount();
if (!empty($paid)) {
$bill->grand_total = $bill->total - $paid;
$bill->grand_total = round($bill->total - $paid, $currency->precision) ;
}
$html = view('modals.bills.payment', compact('bill', 'accounts', 'currencies', 'currency', 'payment_methods'))->render();
@ -121,8 +121,8 @@ class BillPayments extends Controller
$multiplier *= 10;
}
$amount_check = $amount * $multiplier;
$total_amount_check = $total_amount * $multiplier;
$amount_check = (int) ($amount * $multiplier);
$total_amount_check = (int) (round($total_amount, $currency->precision) * $multiplier);
if ($amount_check > $total_amount_check) {
$error_amount = $total_amount;

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

@ -55,7 +55,7 @@ class InvoicePayments extends Controller
$invoice->grand_total = money($total, $currency->code)->getAmount();
if (!empty($paid)) {
$invoice->grand_total = $invoice->total - $paid;
$invoice->grand_total = round($invoice->total - $paid, $currency->precision) ;
}
$html = view('modals.invoices.payment', compact('invoice', 'accounts', 'currencies', 'currency', 'payment_methods'))->render();
@ -121,8 +121,8 @@ class InvoicePayments extends Controller
$multiplier *= 10;
}
$amount_check = $amount * $multiplier;
$total_amount_check = $total_amount * $multiplier;
$amount_check = (int) ($amount * $multiplier);
$total_amount_check = (int) (round($total_amount, $currency->precision) * $multiplier);
if ($amount_check > $total_amount_check) {
$error_amount = $total_amount;
@ -158,7 +158,7 @@ class InvoicePayments extends Controller
'message' => $message,
'html' => 'null',
]);
} elseif ($amount == $total_amount) {
} elseif ($amount_check == $total_amount_check) {
$invoice->invoice_status_code = 'paid';
} else {
$invoice->invoice_status_code = 'partial';