diff --git a/app/Http/Controllers/InsuranceController.php b/app/Http/Controllers/InsuranceController.php index 38e19d7..56867ae 100644 --- a/app/Http/Controllers/InsuranceController.php +++ b/app/Http/Controllers/InsuranceController.php @@ -310,7 +310,7 @@ class InsuranceController extends Controller } $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->total_bonus_amount = $this->toMoneyWithCurrencyCode($insurance->total_bonus_amount, $currency_code); $insurance->insurance_consumed_amount = $this->toMoneyWithCurrencyCode($insurance->insurance_coverage_amount, $currency_code); diff --git a/app/Http/Controllers/InsuranceInvoiceController.php b/app/Http/Controllers/InsuranceInvoiceController.php index 1dc33f8..c2c282e 100644 --- a/app/Http/Controllers/InsuranceInvoiceController.php +++ b/app/Http/Controllers/InsuranceInvoiceController.php @@ -142,7 +142,9 @@ class InsuranceInvoiceController extends Controller $query = $query->where('state', $state); // } } else { - $query = $query->with(['payments']); + $query = $query->with(['payments' => function ($q) { + return $q->orderBy('created_at', 'DESC'); + }]); } $query = $query->orderBy('created_at', 'DESC'); @@ -155,6 +157,7 @@ class InsuranceInvoiceController extends Controller $array = $pagination ? $invoices->items() : $invoices; foreach ($array as $invoice) { $paid_amount = floatval($invoice->paid_amount_non_formatted); + $invoice->insurance->state = trans('states.' . $invoice->insurance->state); $invoice->state = trans('states.' . $invoice->state); $invoice->reason = trans('states.' . $invoice->reason); $invoice->remaining_amount = $this->toMoneyWithCurrencyCode($invoice->amount - $paid_amount, $currency_code);