From cc906e9b221439fb01dffb5829bcc40f2c3e2f45 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Mon, 25 Jul 2022 23:59:28 +1000
Subject: [PATCH] Fixes for viewing unprocessed charges

---
 app/Models/Charge.php                                       | 2 +-
 .../theme/backend/adminlte/a/charge/unprocessed.blade.php   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Models/Charge.php b/app/Models/Charge.php
index e09a8b5..85528b0 100644
--- a/app/Models/Charge.php
+++ b/app/Models/Charge.php
@@ -61,7 +61,7 @@ class Charge extends Model
 	{
 		return $query
 			->where('active',TRUE)
-			->whereNotNull('charge_date')
+			->whereNotNull('charge_at')
 			->whereNotNull('type')
 			->where(function($q) {
 				return $q->where('processed',FALSE)
diff --git a/resources/views/theme/backend/adminlte/a/charge/unprocessed.blade.php b/resources/views/theme/backend/adminlte/a/charge/unprocessed.blade.php
index 4a1d4a2..95fd19d 100644
--- a/resources/views/theme/backend/adminlte/a/charge/unprocessed.blade.php
+++ b/resources/views/theme/backend/adminlte/a/charge/unprocessed.blade.php
@@ -34,9 +34,9 @@
 						<tbody>
 						@foreach(\App\Models\Charge::unprocessed()->with(['account.user','service'])->get() as $o)
 							<tr>
-								<td><a href="{{ url('a/charge/addedit',$o->id) }}">{{ $o->id }}</td>
-								<td>{{ $o->charge_date->format('Y-m-d') }}</td>
-								<td>{{ $o->date_orig->format('Y-m-d') }}</td>
+								<td><a href="{{ url('a/charge/addedit',$o->id) }}">{{ $o->id }}</a></td>
+								<td>{{ $o->charge_at->format('Y-m-d') }}</td>
+								<td>{{ $o->created_at->format('Y-m-d') }}</td>
 								<td>{{ $o->account->name }}</td>
 								<td>{{ $o->service->name_short }}</td>
 								<td>{{ $o->description }}</td>