From 35854d136789a533ad62481f8acd378d4eda6bdd Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal.catic@hotmail.com>
Date: Wed, 21 Nov 2018 12:25:34 +0100
Subject: [PATCH 1/5] add phone number field

---
 .../admin/class-wiaas-admin-user-profile.php  | 32 +++++++++++++++++++
 .../wiaas/includes/class-wiaas-admin.php      |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php

diff --git a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
new file mode 100644
index 0000000..a4b6d1a
--- /dev/null
+++ b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
@@ -0,0 +1,32 @@
+<?php
+
+class Wiaas_Admin_Profile {
+
+    public static function init() {
+        add_filter( 'user_contactmethods', array(__CLASS__, 'modify_user_contact_methods') );
+
+        add_action( 'user_profile_update_errors', array(__CLASS__, 'crf_user_profile_update_errors'), 10, 3 );
+
+    }
+
+    function crf_user_profile_update_errors( $errors, $update, $user ) {
+
+        $phone = $_POST['phone'];
+
+        if (!preg_match('/^[\d +]*$/', $phone)){
+            $errors->add('phone_error', __( '<strong>ERROR</strong>: Enter valid phone number.', 'crf' ));
+        };
+
+    }
+
+
+    function modify_user_contact_methods($user_contact){
+        $user_contact['phone'] = __( 'Phone number' );
+
+        return $user_contact;
+    }
+
+
+}
+
+Wiaas_Admin_Profile::init();
\ No newline at end of file
diff --git a/backend/app/plugins/wiaas/includes/class-wiaas-admin.php b/backend/app/plugins/wiaas/includes/class-wiaas-admin.php
index 6d5021e..5c5ef1f 100644
--- a/backend/app/plugins/wiaas/includes/class-wiaas-admin.php
+++ b/backend/app/plugins/wiaas/includes/class-wiaas-admin.php
@@ -28,6 +28,8 @@ class Wiaas_Admin {
 
         require_once dirname(__FILE__) . '/admin/class-wiaas-admin-supplier.php';
 
+        require_once dirname(__FILE__) . '/admin/class-wiaas-admin-user-profile.php';
+
         add_action( 'admin_enqueue_scripts', array(__CLASS__, 'enqueue_scripts'), 100 );
 	}
 

From 68c760a42695b3298d13d6d63283c661781c6807 Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal.catic@hotmail.com>
Date: Wed, 21 Nov 2018 12:25:47 +0100
Subject: [PATCH 2/5] validate phone number from frontend

---
 .../plugins/wiaas/includes/api/class-wiaas-rest-customer.php  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
index 79bffe7..c040a2d 100644
--- a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
+++ b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
@@ -148,6 +148,10 @@ class Wiaas_REST_Customer_API {
 			return wiaas_api_notice('ADD_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
 		}
 
+        if (!preg_match('/^[\d +]*$/', $phone)){
+            return wiaas_api_notice('INVALID_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
+        };
+
 		if (!Wiaas_Customer::update_customer_profile_info($customer_id, $first_name, $last_name, $phone)){
 			return wiaas_api_notice('PROFILE_NOT_CHANGED', 'warning', Wiaas_Customer::get_customer_info($customer_id));
 		}

From 8d954469ee81e1e9967ced7189fedd80f796e9de Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal.catic@hotmail.com>
Date: Thu, 22 Nov 2018 11:27:30 +0100
Subject: [PATCH 3/5] use woocommerce validation

---
 .../includes/admin/class-wiaas-admin-user-profile.php      | 7 +++----
 .../wiaas/includes/api/class-wiaas-rest-customer.php       | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
index a4b6d1a..ba5b7b5 100644
--- a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
+++ b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
@@ -9,18 +9,17 @@ class Wiaas_Admin_Profile {
 
     }
 
-    function crf_user_profile_update_errors( $errors, $update, $user ) {
+    public static function crf_user_profile_update_errors( $errors, $update, $user ) {
 
         $phone = $_POST['phone'];
 
-        if (!preg_match('/^[\d +]*$/', $phone)){
+        if (!WC_Validation::is_phone($phone)){
             $errors->add('phone_error', __( '<strong>ERROR</strong>: Enter valid phone number.', 'crf' ));
         };
 
     }
 
-
-    function modify_user_contact_methods($user_contact){
+    public static function modify_user_contact_methods($user_contact){
         $user_contact['phone'] = __( 'Phone number' );
 
         return $user_contact;
diff --git a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
index c040a2d..0507578 100644
--- a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
+++ b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
@@ -148,7 +148,7 @@ class Wiaas_REST_Customer_API {
 			return wiaas_api_notice('ADD_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
 		}
 
-        if (!preg_match('/^[\d +]*$/', $phone)){
+        if (!WC_Validation::is_phone($phone)){
             return wiaas_api_notice('INVALID_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
         };
 

From 217dfb188973b77ae57c19d0f6435b45c0035965 Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal.catic@hotmail.com>
Date: Thu, 22 Nov 2018 12:08:41 +0100
Subject: [PATCH 4/5] add validation functions class

---
 .../admin/class-wiaas-admin-user-profile.php        |  2 +-
 .../includes/api/class-wiaas-rest-customer.php      |  2 +-
 .../includes/class-wiaas-validation-functions.php   | 13 +++++++++++++
 backend/app/plugins/wiaas/wiaas.php                 |  2 ++
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 backend/app/plugins/wiaas/includes/class-wiaas-validation-functions.php

diff --git a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
index ba5b7b5..59fc0df 100644
--- a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
+++ b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
@@ -13,7 +13,7 @@ class Wiaas_Admin_Profile {
 
         $phone = $_POST['phone'];
 
-        if (!WC_Validation::is_phone($phone)){
+        if (!Wiaas_Validation_Functions::is_phone($phone)){
             $errors->add('phone_error', __( '<strong>ERROR</strong>: Enter valid phone number.', 'crf' ));
         };
 
diff --git a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
index 0507578..60c3594 100644
--- a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
+++ b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
@@ -148,7 +148,7 @@ class Wiaas_REST_Customer_API {
 			return wiaas_api_notice('ADD_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
 		}
 
-        if (!WC_Validation::is_phone($phone)){
+        if (!Wiaas_Validation_Functions::is_phone($phone)){
             return wiaas_api_notice('INVALID_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
         };
 
diff --git a/backend/app/plugins/wiaas/includes/class-wiaas-validation-functions.php b/backend/app/plugins/wiaas/includes/class-wiaas-validation-functions.php
new file mode 100644
index 0000000..9988b67
--- /dev/null
+++ b/backend/app/plugins/wiaas/includes/class-wiaas-validation-functions.php
@@ -0,0 +1,13 @@
+<?php
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Class Wiaas_Validation_Functions
+ */
+class Wiaas_Validation_Functions {
+
+    public static function is_phone($phone){
+        return WC_Validation::is_phone($phone);
+    }
+}
diff --git a/backend/app/plugins/wiaas/wiaas.php b/backend/app/plugins/wiaas/wiaas.php
index 5bafd13..b2d0fe1 100644
--- a/backend/app/plugins/wiaas/wiaas.php
+++ b/backend/app/plugins/wiaas/wiaas.php
@@ -59,6 +59,8 @@ include_once WIAAS_DIR . '/includes/class-wiass-templates.php';
 
 include_once WIAAS_DIR . '/includes/wiaas-class-measurement-units.php';
 
+include_once WIAAS_DIR . '/includes/class-wiaas-validation-functions.php';
+
 function wiaas_redirect_to_login() {
     wp_safe_redirect(get_site_url('', 'wp-login.php'));
 }

From 09fc3f80184007fbbff6eb05e8fafd2f6aed338f Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal.catic@hotmail.com>
Date: Thu, 22 Nov 2018 13:22:05 +0100
Subject: [PATCH 5/5] Rename class

---
 .../wiaas/includes/admin/class-wiaas-admin-user-profile.php   | 2 +-
 .../plugins/wiaas/includes/api/class-wiaas-rest-customer.php  | 2 +-
 ...as-validation-functions.php => class-wiaas-validation.php} | 4 ++--
 backend/app/plugins/wiaas/wiaas.php                           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename backend/app/plugins/wiaas/includes/{class-wiaas-validation-functions.php => class-wiaas-validation.php} (67%)

diff --git a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
index 59fc0df..44d92a0 100644
--- a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
+++ b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-user-profile.php
@@ -13,7 +13,7 @@ class Wiaas_Admin_Profile {
 
         $phone = $_POST['phone'];
 
-        if (!Wiaas_Validation_Functions::is_phone($phone)){
+        if (!Wiaas_Validation::is_phone($phone)){
             $errors->add('phone_error', __( '<strong>ERROR</strong>: Enter valid phone number.', 'crf' ));
         };
 
diff --git a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
index 60c3594..2c57629 100644
--- a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
+++ b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php
@@ -148,7 +148,7 @@ class Wiaas_REST_Customer_API {
 			return wiaas_api_notice('ADD_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
 		}
 
-        if (!Wiaas_Validation_Functions::is_phone($phone)){
+        if (!Wiaas_Validation::is_phone($phone)){
             return wiaas_api_notice('INVALID_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
         };
 
diff --git a/backend/app/plugins/wiaas/includes/class-wiaas-validation-functions.php b/backend/app/plugins/wiaas/includes/class-wiaas-validation.php
similarity index 67%
rename from backend/app/plugins/wiaas/includes/class-wiaas-validation-functions.php
rename to backend/app/plugins/wiaas/includes/class-wiaas-validation.php
index 9988b67..e9771c2 100644
--- a/backend/app/plugins/wiaas/includes/class-wiaas-validation-functions.php
+++ b/backend/app/plugins/wiaas/includes/class-wiaas-validation.php
@@ -3,9 +3,9 @@
 defined( 'ABSPATH' ) || exit;
 
 /**
- * Class Wiaas_Validation_Functions
+ * Class Wiaas_Validation
  */
-class Wiaas_Validation_Functions {
+class Wiaas_Validation {
 
     public static function is_phone($phone){
         return WC_Validation::is_phone($phone);
diff --git a/backend/app/plugins/wiaas/wiaas.php b/backend/app/plugins/wiaas/wiaas.php
index b2d0fe1..582e624 100644
--- a/backend/app/plugins/wiaas/wiaas.php
+++ b/backend/app/plugins/wiaas/wiaas.php
@@ -59,7 +59,7 @@ include_once WIAAS_DIR . '/includes/class-wiass-templates.php';
 
 include_once WIAAS_DIR . '/includes/wiaas-class-measurement-units.php';
 
-include_once WIAAS_DIR . '/includes/class-wiaas-validation-functions.php';
+include_once WIAAS_DIR . '/includes/class-wiaas-validation.php';
 
 function wiaas_redirect_to_login() {
     wp_safe_redirect(get_site_url('', 'wp-login.php'));