From e9ada2468e1a390e732fca8e465c6b446cef1363 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 2 Feb 2022 16:01:12 +1100
Subject: [PATCH] Minor fixes to get charging working

---
 app/Models/Service.php                        |  2 --
 .../adminlte/a/charge/addedit.blade.php       | 19 +++++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/Models/Service.php b/app/Models/Service.php
index e9723ff..2875b55 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -52,8 +52,6 @@ class Service extends Model implements IDs
 		'billing_price',
 		'name_short',
 		'next_invoice',
-		'product_category',
-		'product_name',
 		'service_id',
 		'service_id_url',
 		'status',
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 1e1fe59..e27ee37 100644
--- a/resources/views/theme/backend/adminlte/a/charge/addedit.blade.php
+++ b/resources/views/theme/backend/adminlte/a/charge/addedit.blade.php
@@ -89,10 +89,10 @@
 
 										<span class="invalid-feedback" role="alert">
 											@error('account_id')
-											{{ $message }}
+												{{ $message }}
 											@else
 												Account is required.
-												@enderror
+											@enderror
 										</span>
 									</div>
 									<span class="input-helper">Account to add charge to.</span>
@@ -114,10 +114,10 @@
 										</select>
 										<span class="invalid-feedback" role="alert">
 											@error('sweep_type')
-											{{ $message }}
+												{{ $message }}
 											@else
 												Sweep Type is required.
-												@enderror
+											@enderror
 										</span>
 									</div>
 									<span class="input-helper">When to add the charge to an invoice.</span>
@@ -171,13 +171,16 @@
 
 										<span class="invalid-feedback" role="alert">
 											@error('service_id')
-											{{ $message }}
+												{{ $message }}
 											@else
 												Service is required.
-												@enderror
+											@enderror
 										</span>
 									</div>
+									{{--
+									<!-- @todo -->
 									<span class="input-helper"><sup>**</sup>Service inactive.</span>
+									--}}
 								</div>
 							</div>
 
@@ -332,6 +335,10 @@
 
 			$('#service_id').select2();
 
+			$('#sweep_type').select2();
+
+			$('#type').select2();
+
 			if ($('#quantity').val() && $('#amount').val()) {
 				total();
 			}