From f68b429700d922b93801127b435ed4dd9f36149d Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Thu, 12 Sep 2024 10:39:57 +0200
Subject: [PATCH 1/4] Add birth from meta to fields in pay page PIWOO-521

---
 .../PaymentFieldsStrategies/In3FieldsStrategy.php      |  9 ++++++---
 .../PaymentFieldsStrategies/RivertyFieldsStrategy.php  | 10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
index 3df76754..74d977f8 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
@@ -15,12 +15,14 @@ public function execute($gateway, $dataHelper)
         $showPhoneField = false;
         $isPhoneRequired = get_option('mollie_wc_is_phone_required_flag');
         $phoneValue = false;
+        $birthValue = false;
 
         if (is_checkout_pay_page()) {
             $showBirthdateField = true;
             $showPhoneField = true;
             $order = $this->getOrderIdOnPayForOrderPage();
             $phoneValue = $order->get_billing_phone();
+            $birthValue = $order->get_meta('billing_birthdate');
         }
 
         if (is_checkout() && !is_checkout_pay_page() && !$isPhoneRequired) {
@@ -35,7 +37,7 @@ public function execute($gateway, $dataHelper)
         }
 
         if ($showBirthdateField) {
-            $this->dateOfBirth();
+            $this->dateOfBirth($birthValue);
         }
     }
 
@@ -46,15 +48,16 @@ protected function getOrderIdOnPayForOrderPage()
         return wc_get_order($orderId);
     }
 
-    protected function dateOfBirth()
+    protected function dateOfBirth($birthValue)
     {
+        $birthValue = $birthValue?: '';
         ?>
         <p class="form-row form-row-wide" id="billing_birthdate_field">
             <label for="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" class=""><?php echo esc_html__('Birthdate', 'mollie-payments-for-woocommerce'); ?>
             </label>
             <span class="woocommerce-input-wrapper">
                 <input type="date" class="input-text " name="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>"
-                       id="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" value=""
+                       id="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" value="<?php echo esc_attr($birthValue); ?>"
                        autocomplete="birthdate"></span>
         </p>
         <?php
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
index ef01a1f6..e587c072 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
@@ -15,12 +15,15 @@ public function execute($gateway, $dataHelper)
         $showPhoneField = false;
         $isPhoneRequired = get_option('mollie_wc_is_phone_required_flag');
         $phoneValue = false;
+        $birthValue = false;
 
         if (is_checkout_pay_page()) {
             $showBirthdateField = true;
             $showPhoneField = true;
             $order = $this->getOrderIdOnPayForOrderPage();
             $phoneValue = $order->get_billing_phone();
+            $birthValue = $order->get_meta('billing_birthdate');
+
         }
 
         if (is_checkout() && !is_checkout_pay_page() && !$isPhoneRequired) {
@@ -35,7 +38,7 @@ public function execute($gateway, $dataHelper)
         }
 
         if ($showBirthdateField) {
-            $this->dateOfBirth();
+            $this->dateOfBirth($birthValue);
         }
     }
 
@@ -46,15 +49,16 @@ protected function getOrderIdOnPayForOrderPage()
         return wc_get_order($orderId);
     }
 
-    protected function dateOfBirth()
+    protected function dateOfBirth($birthValue)
     {
+        $birthValue = $birthValue?: '';
         ?>
         <p class="form-row form-row-wide" id="billing_birthdate_field">
             <label for="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" class=""><?php echo esc_html__('Birthdate', 'mollie-payments-for-woocommerce'); ?>
             </label>
             <span class="woocommerce-input-wrapper">
                 <input type="date" class="input-text " name="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>"
-                       id="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" value=""
+                       id="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" value="<?php echo esc_attr($birthValue); ?>"
                        autocomplete="birthdate"></span>
         </p>
         <?php

From f6e113df20fed0f8e85e740d13f61dfb8c8f7b85 Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Thu, 12 Sep 2024 10:43:13 +0200
Subject: [PATCH 2/4] Fix cs PIWOO-521

---
 .../PaymentFieldsStrategies/In3FieldsStrategy.php              | 2 +-
 .../PaymentFieldsStrategies/RivertyFieldsStrategy.php          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
index 74d977f8..e8797705 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
@@ -50,7 +50,7 @@ protected function getOrderIdOnPayForOrderPage()
 
     protected function dateOfBirth($birthValue)
     {
-        $birthValue = $birthValue?: '';
+        $birthValue = $birthValue ?: '';
         ?>
         <p class="form-row form-row-wide" id="billing_birthdate_field">
             <label for="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" class=""><?php echo esc_html__('Birthdate', 'mollie-payments-for-woocommerce'); ?>
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
index e587c072..6eb042db 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
@@ -23,7 +23,6 @@ public function execute($gateway, $dataHelper)
             $order = $this->getOrderIdOnPayForOrderPage();
             $phoneValue = $order->get_billing_phone();
             $birthValue = $order->get_meta('billing_birthdate');
-
         }
 
         if (is_checkout() && !is_checkout_pay_page() && !$isPhoneRequired) {
@@ -51,7 +50,7 @@ protected function getOrderIdOnPayForOrderPage()
 
     protected function dateOfBirth($birthValue)
     {
-        $birthValue = $birthValue?: '';
+        $birthValue = $birthValue ?: '';
         ?>
         <p class="form-row form-row-wide" id="billing_birthdate_field">
             <label for="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" class=""><?php echo esc_html__('Birthdate', 'mollie-payments-for-woocommerce'); ?>

From 5eb596feb5404322cf66124d574842c024d84ccd Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Mon, 16 Sep 2024 10:22:46 +0200
Subject: [PATCH 3/4] Extract duplicated code into trait

---
 .../In3FieldsStrategy.php                     | 23 +--------------
 .../PaymentFieldsStrategiesTrait.php          | 28 +++++++++++++++++++
 .../RivertyFieldsStrategy.php                 | 23 +--------------
 3 files changed, 30 insertions(+), 44 deletions(-)
 create mode 100644 src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategiesTrait.php

diff --git a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
index e8797705..709f261c 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
@@ -6,6 +6,7 @@
 
 class In3FieldsStrategy implements PaymentFieldsStrategyI
 {
+    use PaymentFieldsStrategiesTrait;
     const FIELD_BIRTHDATE = "billing_birthdate";
     const FIELD_PHONE = "billing_phone_in3";
 
@@ -41,28 +42,6 @@ public function execute($gateway, $dataHelper)
         }
     }
 
-    protected function getOrderIdOnPayForOrderPage()
-    {
-        global $wp;
-        $orderId = absint($wp->query_vars['order-pay']);
-        return wc_get_order($orderId);
-    }
-
-    protected function dateOfBirth($birthValue)
-    {
-        $birthValue = $birthValue ?: '';
-        ?>
-        <p class="form-row form-row-wide" id="billing_birthdate_field">
-            <label for="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" class=""><?php echo esc_html__('Birthdate', 'mollie-payments-for-woocommerce'); ?>
-            </label>
-            <span class="woocommerce-input-wrapper">
-                <input type="date" class="input-text " name="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>"
-                       id="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" value="<?php echo esc_attr($birthValue); ?>"
-                       autocomplete="birthdate"></span>
-        </p>
-        <?php
-    }
-
     protected function phoneNumber($phoneValue)
     {
         $phoneValue = $phoneValue ?: '';
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategiesTrait.php b/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategiesTrait.php
new file mode 100644
index 00000000..b0e747c4
--- /dev/null
+++ b/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategiesTrait.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
+
+trait PaymentFieldsStrategiesTrait
+{
+    protected function getOrderIdOnPayForOrderPage()
+    {
+        global $wp;
+        $orderId = absint($wp->query_vars['order-pay']);
+        return wc_get_order($orderId);
+    }
+
+    protected function dateOfBirth($birthValue)
+    {
+        $birthValue = $birthValue ?: '';
+        ?>
+        <p class="form-row form-row-wide" id="billing_birthdate_field">
+            <label for="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" class=""><?php echo esc_html__('Birthdate', 'mollie-payments-for-woocommerce'); ?>
+            </label>
+            <span class="woocommerce-input-wrapper">
+                <input type="date" class="input-text " name="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>"
+                       id="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" value="<?php echo esc_attr($birthValue); ?>"
+                       autocomplete="birthdate"></span>
+        </p>
+        <?php
+    }
+}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
index 6eb042db..8b927ed7 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
@@ -6,6 +6,7 @@
 
 class RivertyFieldsStrategy implements PaymentFieldsStrategyI
 {
+    use PaymentFieldsStrategiesTrait;
     const FIELD_BIRTHDATE = "billing_birthdate";
     const FIELD_PHONE = "billing_phone_riverty";
 
@@ -41,28 +42,6 @@ public function execute($gateway, $dataHelper)
         }
     }
 
-    protected function getOrderIdOnPayForOrderPage()
-    {
-        global $wp;
-        $orderId = absint($wp->query_vars['order-pay']);
-        return wc_get_order($orderId);
-    }
-
-    protected function dateOfBirth($birthValue)
-    {
-        $birthValue = $birthValue ?: '';
-        ?>
-        <p class="form-row form-row-wide" id="billing_birthdate_field">
-            <label for="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" class=""><?php echo esc_html__('Birthdate', 'mollie-payments-for-woocommerce'); ?>
-            </label>
-            <span class="woocommerce-input-wrapper">
-                <input type="date" class="input-text " name="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>"
-                       id="<?php echo esc_attr(self::FIELD_BIRTHDATE); ?>" value="<?php echo esc_attr($birthValue); ?>"
-                       autocomplete="birthdate"></span>
-        </p>
-        <?php
-    }
-
     protected function phoneNumber($phoneValue)
     {
         $phoneValue = $phoneValue ?: '';

From 6cc2ad05ac193a8e75631418005c36ed2d2c1e38 Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Mon, 16 Sep 2024 10:26:47 +0200
Subject: [PATCH 4/4] Fix CS

---
 src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php | 1 +
 .../PaymentFieldsStrategies/RivertyFieldsStrategy.php            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
index 709f261c..1e5d551d 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
@@ -7,6 +7,7 @@
 class In3FieldsStrategy implements PaymentFieldsStrategyI
 {
     use PaymentFieldsStrategiesTrait;
+
     const FIELD_BIRTHDATE = "billing_birthdate";
     const FIELD_PHONE = "billing_phone_in3";
 
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
index 8b927ed7..c2138f24 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
@@ -7,6 +7,7 @@
 class RivertyFieldsStrategy implements PaymentFieldsStrategyI
 {
     use PaymentFieldsStrategiesTrait;
+
     const FIELD_BIRTHDATE = "billing_birthdate";
     const FIELD_PHONE = "billing_phone_riverty";