From be6061fb6e91689714260dd0139839b9cfbffbc7 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sat, 17 Aug 2024 13:14:51 +1000
Subject: [PATCH] old can be passed 'false' to ignore the redirect value

---
 resources/components/form/base.blade.php     | 2 +-
 resources/components/form/checkbox.blade.php | 2 +-
 resources/components/form/date.blade.php     | 2 +-
 resources/components/form/email.blade.php    | 2 +-
 resources/components/form/file.blade.php     | 2 +-
 resources/components/form/password.blade.php | 2 +-
 resources/components/form/select.blade.php   | 2 +-
 resources/components/form/text.blade.php     | 2 +-
 resources/components/form/textarea.blade.php | 2 +-
 resources/components/form/toggle.blade.php   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/components/form/base.blade.php b/resources/components/form/base.blade.php
index 47a6266..634783d 100644
--- a/resources/components/form/base.blade.php
+++ b/resources/components/form/base.blade.php
@@ -10,7 +10,7 @@
 		@endif
 		{{ $slot }}
 		<span class="invalid-feedback">
-			@error($old ?? $name)
+			@error((! empty($old)) ? $old : $name)
 				{{ $message }}
 			@elseif(isset($feedback))
 				{{ $feedback }}
diff --git a/resources/components/form/checkbox.blade.php b/resources/components/form/checkbox.blade.php
index a380c06..00b6800 100644
--- a/resources/components/form/checkbox.blade.php
+++ b/resources/components/form/checkbox.blade.php
@@ -1,5 +1,5 @@
 <x-leenooks::form.base {{ $attributes }}>
 	<div class="form-check text-right">
-		<input type="checkbox" class="form-check-input {{ $class ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @checked(old($old ?? $name)) @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
+		<input type="checkbox" class="form-check-input {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @checked(old($old ?? $name)) @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
 	</div>
 </x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/date.blade.php b/resources/components/form/date.blade.php
index 7dea1d4..258aa54 100644
--- a/resources/components/form/date.blade.php
+++ b/resources/components/form/date.blade.php
@@ -1,3 +1,3 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<input type="date" class="form-control {{ $classes ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
+	<input type="date" class="form-control {{ $classes ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
 </x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/email.blade.php b/resources/components/form/email.blade.php
index 33b638c..d851536 100644
--- a/resources/components/form/email.blade.php
+++ b/resources/components/form/email.blade.php
@@ -1,3 +1,3 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<input type="email" class="form-control {{ $classes ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
+	<input type="email" class="form-control {{ $classes ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
 </x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/file.blade.php b/resources/components/form/file.blade.php
index 75f12f4..6e416c6 100644
--- a/resources/components/form/file.blade.php
+++ b/resources/components/form/file.blade.php
@@ -1,5 +1,5 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<input type="file" class="form-control {{ $classes ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
+	<input type="file" class="form-control {{ $classes ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
 </x-leenooks::form.base>
 {{ $slot }}
 
diff --git a/resources/components/form/password.blade.php b/resources/components/form/password.blade.php
index 4d26875..d82f6cb 100644
--- a/resources/components/form/password.blade.php
+++ b/resources/components/form/password.blade.php
@@ -1,3 +1,3 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<input type="password" class="form-control {{ $classes ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
+	<input type="password" class="form-control {{ $classes ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
 </x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/select.blade.php b/resources/components/form/select.blade.php
index 209289b..3790e32 100644
--- a/resources/components/form/select.blade.php
+++ b/resources/components/form/select.blade.php
@@ -1,6 +1,6 @@
 <x-leenooks::form.base {{ $attributes }}>
 	<input type="hidden" id="{{ $name }}_disabled" name="{{ $name }}" value="" disabled>
-	<select class="form-control @error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @required(isset($required)) @disabled(isset($disabled))>
+	<select class="form-control @error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @required(isset($required)) @disabled(isset($disabled))>
 		@if(empty($value) || isset($addnew) || isset($choose))
 			<option value=""></option>
 			@isset($addnew)
diff --git a/resources/components/form/text.blade.php b/resources/components/form/text.blade.php
index 842621d..29904f8 100644
--- a/resources/components/form/text.blade.php
+++ b/resources/components/form/text.blade.php
@@ -1,3 +1,3 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<input type="text" class="form-control {{ $class ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" placeholder="{{ $placeholder ?? '' }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
+	<input type="text" class="form-control {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" placeholder="{{ $placeholder ?? '' }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
 </x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/textarea.blade.php b/resources/components/form/textarea.blade.php
index 5c8402b..4752503 100644
--- a/resources/components/form/textarea.blade.php
+++ b/resources/components/form/textarea.blade.php
@@ -10,7 +10,7 @@
 			</div>
 		@endif
 		<div class="w-100">
-			<textarea class="form-control {{ $classes ?? ''}} @error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @isset($placeholder)placeholder="{{ $placeholder }}"@endisset @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>{{ old($old ?? $name,$value ?? '') }}</textarea>
+			<textarea class="form-control {{ $classes ?? ''}} @error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @isset($placeholder)placeholder="{{ $placeholder }}"@endisset @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>{{ old($old ?? $name,$value ?? '') }}</textarea>
 			<span class="invalid-feedback">
 				@error($old ?? $name)
 					{{ $message }}
diff --git a/resources/components/form/toggle.blade.php b/resources/components/form/toggle.blade.php
index a3a64e0..56fce91 100644
--- a/resources/components/form/toggle.blade.php
+++ b/resources/components/form/toggle.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group">
 	<div class="input-group has-validation">
 		<div class="custom-control custom-switch custom-switch-off-danger custom-switch-on-success">
-			<input type="checkbox" class="custom-control-input @error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @checked(old($old ?? $name,$value ?? '')) @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
+			<input type="checkbox" class="custom-control-input @error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @checked(old($old ?? $name,$value ?? '')) @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
 			@if(isset($label))
 				<label class="custom-control-label" for="{{ $id ?? $name }}">{{ $label }}</label>
 			@endif