PIWOO-414 add phone only if optional

mollie · Mar 13, 2024 · ff6cedc · ff6cedc
1 parent 6faa795
commit ff6cedc
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 25 deletions.
diff --git a/src/Gateway/GatewayModule.php b/src/Gateway/GatewayModule.php
@@ -346,6 +346,17 @@ static function ($paymentContext) {
             }
         );
         add_action('add_meta_boxes_woocommerce_page_wc-orders', [$this, 'addShopOrderMetabox'], 10);
+        add_filter( 'woocommerce_form_field_args', static function ($args, $key, $value) use ($container) {
+            if ($key !== 'billing_phone') {
+                return $args;
+            }
+            if ($args['required'] === true) {
+                update_option('mollie_wc_is_phone_required_flag', true);
+            }else{
+                update_option('mollie_wc_is_phone_required_flag', false);
+            }
+            return $args;
+        }, 10, 3);
         return true;
     }
 
@@ -873,7 +884,7 @@ public function switchFields($data)
 
     private function isPhoneValid($billing_phone)
     {
-        return preg_match('/^\+[1-9]\d{1,14}$/', $billing_phone);
+        return preg_match('/^\+[1-9]\d{10,13}$/', $billing_phone);
     }
 
     public function addPhoneWhenRest($arrayContext)

diff --git a/src/PaymentMethods/Bancomatpay.php b/src/PaymentMethods/Bancomatpay.php
@@ -19,7 +19,7 @@ public function getConfig(): array
                 'products',
                 'refunds',
             ],
-            'filtersOnBuild' => false,
+            'filtersOnBuild' => true,
             'confirmationDelayed' => false,
             'errorMessage' => __(
                 'Required field is empty. Phone field is required.',
@@ -33,4 +33,24 @@ public function getFormFields($generalFormFields): array
     {
         return $generalFormFields;
     }
+
+    public function filtersOnBuild()
+    {
+        add_filter('woocommerce_mollie_wc_gateway_' . $this->getProperty('id') . 'payment_args', function (array $args, \WC_Order $order): array {
+            return $this->addPaymentArguments($args, $order);
+        }, 10, 2);
+    }
+    /**
+     * @param WC_Order $order
+     * @return array
+     */
+    public function addPaymentArguments(array $args, $order)
+    {
+        $phone = $order->get_billing_phone();
+        if (!empty($phone)) {
+            $args['billingAddress']['phone'] = $phone;
+        }
+
+        return $args;
+    }
 }
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php
@@ -11,18 +11,21 @@ class BancomatpayFieldsStrategy implements PaymentFieldsStrategyI
     public function execute($gateway, $dataHelper)
     {
         $showPhoneField = false;
+        $isPhoneRequired = get_option('mollie_wc_is_phone_required_flag');
+        $phoneValue = false;
 
         if (is_checkout_pay_page()) {
             $order = $this->getOrderIdOnPayForOrderPage();
-            $showPhoneField = empty($order->get_billing_phone()) || !$this->isPhoneValid($order->get_billing_phone());
+            $phoneValue = $order->get_billing_phone();
+            $showPhoneField = true;
         }
 
-        if (is_checkout() && !is_checkout_pay_page()) {
-                $showPhoneField = true;
+        if (is_checkout() && !is_checkout_pay_page() && !$isPhoneRequired) {
+            $showPhoneField = true;
         }
 
         if ($showPhoneField) {
-            $this->phoneNumber();
+            $this->phoneNumber($phoneValue);
         }
     }
 
@@ -33,8 +36,9 @@ protected function getOrderIdOnPayForOrderPage()
         return wc_get_order($orderId);
     }
 
-    protected function phoneNumber()
+    protected function phoneNumber($phoneValue)
     {
+        $phoneValue = $phoneValue ?: '';
         ?>
         <p class="form-row form-row-wide" id="billing_phone_field">
             <label for="<?= esc_attr(self::FIELD_PHONE); ?>" class=""><?= esc_html__('Phone', 'mollie-payments-for-woocommerce'); ?>
@@ -43,7 +47,7 @@ protected function phoneNumber()
             <span class="woocommerce-input-wrapper">
         <input type="tel" class="input-text " name="<?= esc_attr(self::FIELD_PHONE); ?>" id="<?= esc_attr(self::FIELD_PHONE); ?>"
                placeholder="+00000000000"
-               value="" autocomplete="phone">
+               value="<?= esc_attr($phoneValue); ?>" autocomplete="phone">
         </span>
         </p>
         <?php
@@ -53,9 +57,4 @@ public function getFieldMarkup($gateway, $dataHelper)
     {
         return "";
     }
-
-    private function isPhoneValid(string $get_billing_phone)
-    {
-        return preg_match('/^\+[0-9]{11,13}$/', $get_billing_phone) === 1;
-    }
 }
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
@@ -13,20 +13,25 @@ public function execute($gateway, $dataHelper)
     {
         $showBirthdateField = false;
         $showPhoneField = false;
+        $isPhoneRequired = get_option('mollie_wc_is_phone_required_flag');
+        $phoneValue = false;
 
         if (is_checkout_pay_page()) {
-            $order = $this->getOrderIdOnPayForOrderPage();
-            $showPhoneField = empty($order->get_billing_phone()) || !$this->isPhoneValid($order->get_billing_phone());
             $showBirthdateField = true;
+            $showPhoneField = true;
+            $order = $this->getOrderIdOnPayForOrderPage();
+            $phoneValue = $order->get_billing_phone();
         }
 
+        if (is_checkout() && !is_checkout_pay_page() && !$isPhoneRequired) {
+            $showPhoneField = true;
+        }
         if (is_checkout() && !is_checkout_pay_page()) {
-                $showPhoneField = true;
-                $showBirthdateField = true;
+            $showBirthdateField = true;
         }
 
         if ($showPhoneField) {
-            $this->phoneNumber();
+            $this->phoneNumber($phoneValue);
         }
 
         if ($showBirthdateField) {
@@ -56,8 +61,9 @@ protected function dateOfBirth()
         <?php
     }
 
-    protected function phoneNumber()
+    protected function phoneNumber($phoneValue)
     {
+        $phoneValue = $phoneValue ?: '';
         ?>
         <p class="form-row form-row-wide" id="billing_phone_field">
             <label for="<?= esc_attr(self::FIELD_PHONE); ?>" class=""><?= esc_html__('Phone', 'mollie-payments-for-woocommerce'); ?>
@@ -66,7 +72,7 @@ protected function phoneNumber()
             <span class="woocommerce-input-wrapper">
         <input type="tel" class="input-text " name="<?= esc_attr(self::FIELD_PHONE); ?>" id="<?= esc_attr(self::FIELD_PHONE); ?>"
                placeholder="+00000000000"
-               value="" autocomplete="phone">
+               value="<?= esc_attr($phoneValue); ?>" autocomplete="phone">
         </span>
         </p>
         <?php
@@ -76,9 +82,4 @@ public function getFieldMarkup($gateway, $dataHelper)
     {
         return "";
     }
-
-    private function isPhoneValid(string $get_billing_phone)
-    {
-        return preg_match('/^\+[0-9]{11,13}$/', $get_billing_phone) === 1;
-    }
 }
diff --git a/src/Shared/SharedDataDictionary.php b/src/Shared/SharedDataDictionary.php
@@ -69,6 +69,7 @@ class SharedDataDictionary
         'mollie-payments-for-woocommerce_removeOptionsAndTransients',
         'mollie-plugin-version',
         'mollie-new-install',
+        'mollie_wc_is_phone_required_flag',
     ];
     public const DB_VERSION_PARAM_NAME = 'mollie-db-version';
     public const PLUGIN_VERSION_PARAM_NAME = 'mollie-plugin-version';