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

Use paid attribute of model

Browse Source
This commit is contained in:
Burak Çakırel 2020-01-22 00:47:27 +03:00
parent 717cb26a3e
commit 62d74f2016
2 changed files with 4 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/Purchases/Bills.php
View File

@ -75,8 +75,6 @@ class Bills extends Controller
$date_format = $this->getCompanyDateFormat(); $date_format = $this->getCompanyDateFormat();
$paid = $this->getPaidAmount($bill);
// Get Bill Totals // Get Bill Totals
foreach ($bill->totals as $bill_total) { foreach ($bill->totals as $bill_total) {
$bill->{$bill_total->code} = $bill_total->amount; $bill->{$bill_total->code} = $bill_total->amount;
@ -86,8 +84,8 @@ class Bills extends Controller
$bill->grand_total = money($total, $currency->code)->getAmount(); $bill->grand_total = money($total, $currency->code)->getAmount();
if (!empty($paid)) { if (!empty($bill->paid)) {
$bill->grand_total = round($bill->total - $paid, $currency->precision) ; $bill->grand_total = round($bill->total - $bill->paid, $currency->precision) ;
} }
return view('purchases.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format')); return view('purchases.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format'));
@ -395,44 +393,4 @@ class Bills extends Controller
return $bill; return $bill;
} }
protected function getPaidAmount($bill)
{
$paid = 0;
// Get Bill Transactions
if (!$bill->transactions->count()) {
return $paid;
}
$currencies = Currency::enabled()->pluck('rate', 'code')->toArray();
foreach ($bill->transactions as $item) {
$default_amount = (double) $item->amount;
if ($bill->currency_code == $item->currency_code) {
$amount = $default_amount;
} else {
$default_amount_model = new Transaction();
$default_amount_model->default_currency_code = $bill->currency_code;
$default_amount_model->amount = $default_amount;
$default_amount_model->currency_code = $item->currency_code;
$default_amount_model->currency_rate = $currencies[$item->currency_code];
$default_amount = (double) $default_amount_model->getDivideConvertedAmount();
$convert_amount_model = new Transaction();
$convert_amount_model->default_currency_code = $item->currency_code;
$convert_amount_model->amount = $default_amount;
$convert_amount_model->currency_code = $bill->currency_code;
$convert_amount_model->currency_rate = $currencies[$bill->currency_code];
$amount = (double) $convert_amount_model->getAmountConvertedFromCustomDefault();
}
$paid += $amount;
}
return $paid;
}
} }

46
app/Http/Controllers/Sales/Invoices.php
View File

@ -78,8 +78,6 @@ class Invoices extends Controller
$date_format = $this->getCompanyDateFormat(); $date_format = $this->getCompanyDateFormat();
$paid = $this->getPaidAmount($invoice);
// Get Invoice Totals // Get Invoice Totals
foreach ($invoice->totals as $invoice_total) { foreach ($invoice->totals as $invoice_total) {
$invoice->{$invoice_total->code} = $invoice_total->amount; $invoice->{$invoice_total->code} = $invoice_total->amount;
@ -89,8 +87,8 @@ class Invoices extends Controller
$invoice->grand_total = money($total, $currency->code)->getAmount(); $invoice->grand_total = money($total, $currency->code)->getAmount();
if (!empty($paid)) { if (!empty($invoice->paid)) {
$invoice->grand_total = round($invoice->total - $paid, $currency->precision); $invoice->grand_total = round($invoice->total - $invoice->paid, $currency->precision);
} }
return view('sales.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format')); return view('sales.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format'));
@ -464,44 +462,4 @@ class Invoices extends Controller
return $invoice; return $invoice;
} }
protected function getPaidAmount($invoice)
{
$paid = 0;
// Get invoice transactions
if (!$invoice->transactions->count()) {
return $paid;
}
$currencies = Currency::enabled()->pluck('rate', 'code')->toArray();
foreach ($invoice->transactions as $item) {
$default_amount = $item->amount;
if ($invoice->currency_code == $item->currency_code) {
$amount = (double) $default_amount;
} else {
$default_amount_model = new Transaction();
$default_amount_model->default_currency_code = $invoice->currency_code;
$default_amount_model->amount = $default_amount;
$default_amount_model->currency_code = $item->currency_code;
$default_amount_model->currency_rate = $currencies[$item->currency_code];
$default_amount = (double) $default_amount_model->getDivideConvertedAmount();
$convert_amount_model = new Transaction();
$convert_amount_model->default_currency_code = $item->currency_code;
$convert_amount_model->amount = $default_amount;
$convert_amount_model->currency_code = $invoice->currency_code;
$convert_amount_model->currency_rate = $currencies[$invoice->currency_code];
$amount = (double) $convert_amount_model->getAmountConvertedFromCustomDefault();
}
$paid += $amount;
}
return $paid;
}
} }