From 67ec7bc5438abc3725fa19927066985f4419faa7 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Mon, 29 Nov 2021 16:38:20 +0530
Subject: [PATCH] Some Test Case Fixed

---
 .../src/Contracts/Validations/PhoneNumber.php | 30 +++++++++++++++++++
 .../Core/src/Resources/lang/en/validation.php |  1 +
 .../Http/Requests/CustomerAddressRequest.php  |  3 +-
 tests/functional/Customer/CustomerCest.php    | 18 +++++------
 4 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 packages/Webkul/Core/src/Contracts/Validations/PhoneNumber.php

diff --git a/packages/Webkul/Core/src/Contracts/Validations/PhoneNumber.php b/packages/Webkul/Core/src/Contracts/Validations/PhoneNumber.php
new file mode 100644
index 000000000..50ce2e218
--- /dev/null
+++ b/packages/Webkul/Core/src/Contracts/Validations/PhoneNumber.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Webkul\Core\Contracts\Validations;
+
+use Illuminate\Contracts\Validation\Rule;
+
+class PhoneNumber implements Rule
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string  $attribute
+     * @param  mixed  $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return preg_match('%^(?:(?:\(?(?:00|\+)([1-4]\d\d|[1-9]\d?)\)?)?[\-\.\ \\\/]?)?((?:\(?\d{1,}\)?[\-\.\ \\\/]?){0,})(?:[\-\.\ \\\/]?(?:#|ext\.?|extension|x)[\-\.\ \\\/]?(\d+))?$%i', $value) && strlen($value) >= 10;
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return trans('core::validation.phone-number');
+    }
+}
diff --git a/packages/Webkul/Core/src/Resources/lang/en/validation.php b/packages/Webkul/Core/src/Resources/lang/en/validation.php
index 2b2c0bde6..78fa4fcc9 100755
--- a/packages/Webkul/Core/src/Resources/lang/en/validation.php
+++ b/packages/Webkul/Core/src/Resources/lang/en/validation.php
@@ -4,5 +4,6 @@ return [
     'alpha-numeric-space' => 'The :attribute can only accept alpha, numeric and spaces.',
     'code' => 'The :attribute must be valid.',
     'decimal' => 'The :attribute must be valid.',
+    'phone-number' => 'The :attribute must be valid phone number.',
     'slug' => 'The :attribute must be valid slug.',
 ];
diff --git a/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php b/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
index 39805afcd..2bbba489d 100644
--- a/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
+++ b/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
@@ -4,6 +4,7 @@ namespace Webkul\Customer\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Webkul\Core\Contracts\Validations\AlphaNumericSpace;
+use Webkul\Core\Contracts\Validations\PhoneNumber;
 use Webkul\Customer\Rules\VatIdRule;
 
 class CustomerAddressRequest extends FormRequest
@@ -35,7 +36,7 @@ class CustomerAddressRequest extends FormRequest
             'state'        => ['required', 'alpha'],
             'city'         => ['required', new AlphaNumericSpace],
             'postcode'     => ['required', 'numeric'],
-            'phone'        => ['required', 'numeric'],
+            'phone'        => ['required', new PhoneNumber],
             'vat_id'       => [new VatIdRule()],
         ];
     }
diff --git a/tests/functional/Customer/CustomerCest.php b/tests/functional/Customer/CustomerCest.php
index f2532b44f..1c275856c 100644
--- a/tests/functional/Customer/CustomerCest.php
+++ b/tests/functional/Customer/CustomerCest.php
@@ -52,15 +52,15 @@ class CustomerCest
         $I->click('Add Address');
 
         $this->fields = [
-            'company_name' => $faker->company,
-            'first_name'   => $faker->firstName,
-            'last_name'    => $faker->lastName,
+            'company_name' => preg_replace('/[^A-Za-z0-9 ]/', '', $faker->company),
+            'first_name'   => preg_replace('/[^A-Za-z0-9 ]/', '', $faker->firstName),
+            'last_name'    => preg_replace('/[^A-Za-z0-9 ]/', '', $faker->lastName),
             'vat_id'       => 'INVALIDVAT',
-            'address1[]'   => $faker->streetName,
-            'country'      => $faker->countryCode,
-            'state'        => $faker->state,
-            'city'         => $faker->city,
-            'postcode'     => $faker->postcode,
+            'address1[]'   => preg_replace('/[^A-Za-z0-9 ]/', '', $faker->streetAddress),
+            'country'      => preg_replace('/[^A-Za-z0-9 ]/', '', $faker->countryCode),
+            'state'        => preg_replace('/[^A-Za-z0-9 ]/', '', $faker->state),
+            'city'         => preg_replace('/[^A-Za-z0-9 ]/', '', $faker->city),
+            'postcode'     => preg_replace('/[^0-9]/', '', $faker->postcode),
             'phone'        => $faker->phoneNumber,
         ];
 
@@ -99,7 +99,7 @@ class CustomerCest
         $I->click('Edit');
 
         $oldcompany = $this->fields['company_name'];
-        $this->fields['company_name'] = $faker->company;
+        $this->fields['company_name'] = preg_replace('/[^A-Za-z0-9 ]/', '', $faker->company);
 
         $I->submitForm($formCssSelector, $this->fields);