From da08630a1fbcaad45841333c9c02988f1f37ac43 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Thu, 18 Mar 2021 21:01:56 +0900 Subject: [PATCH] payment testing --- .../MiningTaxes/MiningTaxesAdminController.php | 9 ++++++++- .../views/miningtax/admin/display/paidinvoices.blade.php | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php b/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php index 99cdb3a02..2fcd9966a 100644 --- a/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php +++ b/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php @@ -85,6 +85,13 @@ class MiningTaxesAdminController extends Controller 'status' => 'Paid Late', ])->paginate(50); - return view('miningtax.admin.display.paidinvoices')->with('invoices', $invoices); + $totalAmount = Invoice::where([ + 'status' => 'Paid', + ])->orWhere([ + 'status' => 'Paid Late', + ])->sum('invoice_amount'); + + return view('miningtax.admin.display.paidinvoices')->with('invoices', $invoices) + ->with('totalAmount', $totalAmount); } } diff --git a/resources/views/miningtax/admin/display/paidinvoices.blade.php b/resources/views/miningtax/admin/display/paidinvoices.blade.php index be1b04245..449fc297a 100644 --- a/resources/views/miningtax/admin/display/paidinvoices.blade.php +++ b/resources/views/miningtax/admin/display/paidinvoices.blade.php @@ -20,7 +20,7 @@ {{ $invoice->character_name }} {{ $invoice->invoice_id }} - {{ $invoice->amount }} + {{ number_format($invoice->invoice_amount, 2, ".", ",") }} {{ $invoice->date_issued }} {{ $invoice->date_due }} @@ -28,6 +28,7 @@ {{ $invoices->links() }} +

Total Paid: {{ $totalAmount }}