From 9e889008bfac944960a3e3b1728d05e2067e1a94 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Mon, 13 Jun 2022 14:34:45 +1000
Subject: [PATCH] Fix recording charges

---
 app/Http/Controllers/AdminController.php                  | 4 ++--
 app/Models/Charge.php                                     | 2 +-
 .../theme/backend/adminlte/a/charge/addedit.blade.php     | 8 ++++----
 .../backend/adminlte/a/charge/widgets/pending.blade.php   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 5a410d8..b9b43a6 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -27,7 +27,7 @@ class AdminController extends Controller
 		if ($request->post()) {
 			$request->validate([
 				'account_id' => 'required|exists:accounts,id',
-				'charge_date' => 'required|date',
+				'charge_at' => 'required|date',
 				'service_id' => 'required|exists:services,id',
 				'quantity' => 'required|numeric|not_in:0',
 				'amount' => 'required|numeric|min:0.01',
@@ -43,7 +43,7 @@ class AdminController extends Controller
 				$o->active = TRUE;
 			}
 
-			$o->forceFill($request->only(['account_id','charge_date','service_id','quantity','amount','sweep_type','type','taxable','description']));
+			$o->forceFill($request->only(['account_id','charge_at','service_id','quantity','amount','sweep_type','type','taxable','description']));
 			$o->save();
 
 			return redirect()->back()
diff --git a/app/Models/Charge.php b/app/Models/Charge.php
index 5ad4311..e09a8b5 100644
--- a/app/Models/Charge.php
+++ b/app/Models/Charge.php
@@ -25,7 +25,7 @@ class Charge extends Model
 	protected $dates = [
 		'start_at',
 		'stop_at',
-		'charged_at',	// @todo Dont remember what this attribute is for
+		'charge_at',			// The date the charge applies - since it can be different to created_at
 	];
 
 	public const sweep = [
diff --git a/resources/views/theme/backend/adminlte/a/charge/addedit.blade.php b/resources/views/theme/backend/adminlte/a/charge/addedit.blade.php
index c821319..cae4574 100644
--- a/resources/views/theme/backend/adminlte/a/charge/addedit.blade.php
+++ b/resources/views/theme/backend/adminlte/a/charge/addedit.blade.php
@@ -32,21 +32,21 @@
 							<!-- DATE CHARGE -->
 							<div class="col-4">
 								<div class="form-group has-validation">
-									<label for="charge_date">Date Charge</label>
+									<label for="charge_at">Date Charge</label>
 									<div class="input-group">
 										<div class="input-group-prepend">
 											<span class="input-group-text"><i class="fas fa-fw fa-calendar"></i></span>
 										</div>
-										<input type="date" class="form-control @error('charge_date') is-invalid @enderror" id="charge_date" name="charge_date" value="{{ old('charge_date',($o->exists ? $o->charge_date : \Carbon\Carbon::now())->format('Y-m-d')) }}" required>
+										<input type="date" class="form-control @error('charge_at') is-invalid @enderror" id="charge_at" name="charge_at" value="{{ old('charge_at',($o->exists ? $o->charge_at : \Carbon\Carbon::now())->format('Y-m-d')) }}" required>
 										<span class="invalid-feedback" role="alert">
-											@error('charge_date')
+											@error('charge_at')
 												{{ $message }}
 											@else
 												Charge Date is required.
 											@enderror
 										</span>
 									</div>
-									<span class="input-helper">Date Payment Received.</span>
+									<span class="input-helper">Date of Charge</span>
 								</div>
 							</div>
 
diff --git a/resources/views/theme/backend/adminlte/a/charge/widgets/pending.blade.php b/resources/views/theme/backend/adminlte/a/charge/widgets/pending.blade.php
index 1012499..106513e 100644
--- a/resources/views/theme/backend/adminlte/a/charge/widgets/pending.blade.php
+++ b/resources/views/theme/backend/adminlte/a/charge/widgets/pending.blade.php
@@ -23,7 +23,7 @@
 					<tr>
 						<td><a href="{{ url('a/charge/addedit',[$co->id]) }}">{{ $co->id }}</a></td>
 						<td>{{ $co->created_at->format('Y-m-d') }}</td>
-						<td>{{ $co->charged_at ? $co->charged_at->format('Y-m-d') : '-' }}</td>
+						<td>{{ $co->charge_at ? $co->charge_at->format('Y-m-d') : '-' }}</td>
 						<td>{{ $co->service->sid }}</td>
 						<td>{{ $co->type }}</td>
 						<td>{{ $co->description }}</td>