From 4ec9b2e817d09131897bfec574091dcec0556aa5 Mon Sep 17 00:00:00 2001 From: jayvirsinh_gohil Date: Thu, 17 Jun 2021 16:23:06 +0530 Subject: [PATCH 1/3] change message for number validation --- app/Rules/UniqueNumber.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Rules/UniqueNumber.php b/app/Rules/UniqueNumber.php index 3623f09b..2c34f94c 100644 --- a/app/Rules/UniqueNumber.php +++ b/app/Rules/UniqueNumber.php @@ -10,6 +10,8 @@ class UniqueNumber implements Rule public $class; + public $type; + /** * Create a new rule instance. * @param string $class @@ -38,6 +40,8 @@ class UniqueNumber implements Rule $uniqueNumber = $value; } + $this->type = $attribute; + if ($this->id && $this->class::where('id', $this->id)->where($attribute, $uniqueNumber)->first()) { return true; } @@ -56,6 +60,7 @@ class UniqueNumber implements Rule */ public function message() { - return 'Invalid number passed.'; + $type = str_replace('_', ' ', $this->type); + return "Invalid {$type} passed."; } } From 43c871f374bc08a792adbb136ac8771501bc4266 Mon Sep 17 00:00:00 2001 From: jayvirsinh_gohil Date: Thu, 17 Jun 2021 18:57:17 +0530 Subject: [PATCH 2/3] refactor unique number message --- app/Rules/UniqueNumber.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Rules/UniqueNumber.php b/app/Rules/UniqueNumber.php index 2c34f94c..3490295d 100644 --- a/app/Rules/UniqueNumber.php +++ b/app/Rules/UniqueNumber.php @@ -61,6 +61,6 @@ class UniqueNumber implements Rule public function message() { $type = str_replace('_', ' ', $this->type); - return "Invalid {$type} passed."; + return "{$type} already used."; } } From 6fcddd6feb90146d8f4abbcc9bb62a875ff97d6e Mon Sep 17 00:00:00 2001 From: jayvirsinh_gohil Date: Thu, 17 Jun 2021 18:58:08 +0530 Subject: [PATCH 3/3] refactor message --- app/Rules/UniqueNumber.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Rules/UniqueNumber.php b/app/Rules/UniqueNumber.php index 3490295d..f85a6d57 100644 --- a/app/Rules/UniqueNumber.php +++ b/app/Rules/UniqueNumber.php @@ -61,6 +61,6 @@ class UniqueNumber implements Rule public function message() { $type = str_replace('_', ' ', $this->type); - return "{$type} already used."; + return "{$type} is already used."; } }