20221014 phoneNumber 改為非必填

app/Rules/RegionLimitedRules.php

@@ -28,38 +28,40 @@ class RegionLimitedRules implements Rule, DataAwareRule
      */
     public function passes($attribute, $value)
     {
-        //
-        if (substr($value, 0, 2)=='TP'||substr($value, 0, 2)=='HS') {
+        if ($this->data['phoneNumber']) {
+            if (substr($value, 0, 2)=='TP'||substr($value, 0, 2)=='HS') {
 
-            if (is_null($this->data['registeredSession'])) {
-                return false;
-            }
+                if (is_null($this->data['registeredSession'])) {
+                    return false;
+                }
 
-            if (is_null($this->data['lunchOptions'])) {
-                return false;
-            }
+                if (is_null($this->data['lunchOptions'])) {
+                    return false;
+                }
 
-            $pattern = '/09\d{2}\d{3}\d{3}/';
-            $string = $this->data['phoneNumber'];
-            if (!preg_match($pattern, $string, $matches)) {
-                return false;
-            }
+                $pattern = '/09\d{2}\d{3}\d{3}/';
+                $string = $this->data['phoneNumber'];
+                if (!preg_match($pattern, $string, $matches)) {
+                    return false;
+                }
 
-        } elseif (substr($value, 0, 2)=='JP') {
+            } elseif (substr($value, 0, 2)=='JP') {
 
-            $pattern = '/^0[789]0\d{8}/';
-            $string = $this->data['phoneNumber'];
-            if (!preg_match( $pattern, $string, $matches)) {
-                return false;
-            }
-        } elseif (substr($value, 0, 2)=='KR') {
+                $pattern = '/^0[789]0\d{8}/';
+                $string = $this->data['phoneNumber'];
+                if (!preg_match( $pattern, $string, $matches)) {
+                    return false;
+                }
+            } elseif (substr($value, 0, 2)=='KR') {
 
-            $pattern = '/^01\d{1}\d{4}\d{4}/';
-            $string = $this->data['phoneNumber'];
-            if (!preg_match( $pattern, $string, $matches)) {
-                return false;
+                $pattern = '/^01\d{1}\d{4}\d{4}/';
+                $string = $this->data['phoneNumber'];
+                if (!preg_match( $pattern, $string, $matches)) {
+                    return false;
+                }
             }
         }
+            
         return true;
     }