adminnistrateur
/
nanosanteservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set order in payments while fetch insurances invoices

This commit is contained in:
Djery-Tom 2022-05-11 10:46:01 +01:00
parent 601f608b83
commit d44545333c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/InsuranceController.php
View File

@ -310,7 +310,7 @@ class InsuranceController extends Controller
} }
$currency_code = $this->getNetworkCurrency($insurance->network_id); $currency_code = $this->getNetworkCurrency($insurance->network_id);
$insurance->state = trans($insurance->state); $insurance->state = trans('states.' . $insurance->state);
$insurance->bonus_amount = $this->toMoneyWithCurrencyCode($insurance->bonus_amount, $currency_code); $insurance->bonus_amount = $this->toMoneyWithCurrencyCode($insurance->bonus_amount, $currency_code);
$insurance->total_bonus_amount = $this->toMoneyWithCurrencyCode($insurance->total_bonus_amount, $currency_code); $insurance->total_bonus_amount = $this->toMoneyWithCurrencyCode($insurance->total_bonus_amount, $currency_code);
$insurance->insurance_consumed_amount = $this->toMoneyWithCurrencyCode($insurance->insurance_coverage_amount, $currency_code); $insurance->insurance_consumed_amount = $this->toMoneyWithCurrencyCode($insurance->insurance_coverage_amount, $currency_code);

5
app/Http/Controllers/InsuranceInvoiceController.php
View File

@ -142,7 +142,9 @@ class InsuranceInvoiceController extends Controller
$query = $query->where('state', $state); $query = $query->where('state', $state);
// } // }
} else { } else {
$query = $query->with(['payments']); $query = $query->with(['payments' => function ($q) {
return $q->orderBy('created_at', 'DESC');
}]);
} }
$query = $query->orderBy('created_at', 'DESC'); $query = $query->orderBy('created_at', 'DESC');
@ -155,6 +157,7 @@ class InsuranceInvoiceController extends Controller
$array = $pagination ? $invoices->items() : $invoices; $array = $pagination ? $invoices->items() : $invoices;
foreach ($array as $invoice) { foreach ($array as $invoice) {
$paid_amount = floatval($invoice->paid_amount_non_formatted); $paid_amount = floatval($invoice->paid_amount_non_formatted);
$invoice->insurance->state = trans('states.' . $invoice->insurance->state);
$invoice->state = trans('states.' . $invoice->state); $invoice->state = trans('states.' . $invoice->state);
$invoice->reason = trans('states.' . $invoice->reason); $invoice->reason = trans('states.' . $invoice->reason);
$invoice->remaining_amount = $this->toMoneyWithCurrencyCode($invoice->amount - $paid_amount, $currency_code); $invoice->remaining_amount = $this->toMoneyWithCurrencyCode($invoice->amount - $paid_amount, $currency_code);