PIWOO-414 Add bancomat and fix in3, billie

mollie · Mar 6, 2024 · f3aa7b1 · f3aa7b1
1 parent c9d52ea
commit f3aa7b1
Show file tree

Hide file tree

Showing 12 changed files with 252 additions and 52 deletions.
diff --git a/mollie-payments-for-woocommerce.php b/mollie-payments-for-woocommerce.php
@@ -3,7 +3,7 @@
  * Plugin Name: Mollie Payments for WooCommerce
  * Plugin URI: https://www.mollie.com
  * Description: Accept payments in WooCommerce with the official Mollie plugin
- * Version: 7.5.1
+ * Version: 7.6.0
  * Author: Mollie
  * Author URI: https://www.mollie.com
  * Requires at least: 5.0

diff --git a/public/images/bancomatpay.svg b/public/images/bancomatpay.svg
diff --git a/resources/js/mollieBillie.js b/resources/js/mollieBillie.js
diff --git a/src/Assets/AssetsModule.php b/src/Assets/AssetsModule.php
@@ -276,13 +276,6 @@ protected function registerFrontendScripts(string $pluginUrl, string $pluginPath
             (string) filemtime($this->getPluginPath($pluginPath, '/public/js/gatewaySurcharge.min.js')),
             true
         );
-        wp_register_script(
-            'mollie-billie-classic-handles',
-            $this->getPluginUrl($pluginUrl, '/public/js/mollieBillie.min.js'),
-            ['underscore', 'jquery'],
-            (string) filemtime($this->getPluginPath($pluginPath, '/public/js/mollieBillie.min.js')),
-            true
-        );
     }
 
     public function registerBlockScripts(string $pluginUrl, string $pluginPath): void

diff --git a/src/Gateway/GatewayModule.php b/src/Gateway/GatewayModule.php
@@ -249,6 +249,11 @@ static function () {
                 11,
                 2
             );
+            add_action(
+                'woocommerce_checkout_posted_data',
+                [$this, 'switchFields'],
+                11
+            );
         }
         $isIn3Enabled = mollieWooCommerceIsGatewayEnabled('mollie_wc_gateway_in3_settings', 'enabled');
         if ($isIn3Enabled) {
@@ -263,6 +268,30 @@ static function () {
                 [$this, 'in3FieldsMandatoryPayForOrder'],
                 11
             );
+            add_action(
+                'woocommerce_checkout_posted_data',
+                [$this, 'switchFields'],
+                11
+            );
+        }
+        $isBancomatPayEnabled = mollieWooCommerceIsGatewayEnabled('mollie_wc_gateway_bancomatpay_settings', 'enabled');
+        if ($isBancomatPayEnabled) {
+            add_filter(
+                'woocommerce_after_checkout_validation',
+                [$this, 'bancomatpayFieldsMandatory'],
+                11,
+                2
+            );
+            add_action(
+                'woocommerce_before_pay_action',
+                [$this, 'bancomatpayFieldsMandatoryPayForOrder'],
+                11
+            );
+            add_action(
+                'woocommerce_checkout_posted_data',
+                [$this, 'switchFields'],
+                11
+            );
         }
         // Set order to paid and processed when eventually completed without Mollie
         add_action('woocommerce_payment_complete', [$this, 'setOrderPaidByOtherGateway'], 10, 1);
@@ -621,22 +650,31 @@ protected function instantiatePaymentMethods($container): array
     public function BillieFieldsMandatory($fields, $errors)
     {
         $gatewayName = "mollie_wc_gateway_billie";
-        $field = 'billing_company';
+        $field = 'billing_company_billie';
         $companyLabel = __('Company', 'mollie-payments-for-woocommerce');
         return $this->addPaymentMethodMandatoryFields($fields, $gatewayName, $field, $companyLabel, $errors);
     }
 
     public function in3FieldsMandatory($fields, $errors)
     {
         $gatewayName = "mollie_wc_gateway_in3";
-        $phoneField = 'billing_phone';
+        $phoneField = 'billing_phone_in3';
         $birthdateField = self::FIELD_IN3_BIRTHDATE;
         $phoneLabel = __('Phone', 'mollie-payments-for-woocommerce');
         $birthDateLabel = __('Birthdate', 'mollie-payments-for-woocommerce');
         $fields = $this->addPaymentMethodMandatoryFields($fields, $gatewayName, $phoneField, $phoneLabel, $errors);
         return $this->addPaymentMethodMandatoryFields($fields, $gatewayName, $birthdateField, $birthDateLabel, $errors);
     }
 
+    public function bancomatpayFieldsMandatory($fields, $errors)
+    {
+        $gatewayName = "mollie_wc_gateway_bancomatpay";
+        $phoneField = 'billing_phone_bancomatpay';
+        $phoneLabel = __('Phone', 'mollie-payments-for-woocommerce');
+        return $this->addPaymentMethodMandatoryFields($fields, $gatewayName, $phoneField, $phoneLabel, $errors);
+    }
+
+
     /**
      * @param $order
      */
@@ -662,6 +700,31 @@ public function in3FieldsMandatoryPayForOrder($order)
         }
     }
 
+    /**
+     * @param $order
+     */
+    public function bancomatpayFieldsMandatoryPayForOrder($order)
+    {
+        $paymentMethod = filter_input(INPUT_POST, 'payment_method', FILTER_SANITIZE_SPECIAL_CHARS) ?? false;
+
+        if ($paymentMethod !== 'mollie_wc_gateway_bancomatpay') {
+            return;
+        }
+
+        $phoneValue = filter_input(INPUT_POST, 'billing_phone_bancomatpay', FILTER_SANITIZE_SPECIAL_CHARS) ?? false;
+        $phoneLabel = __('Phone', 'mollie-payments-for-woocommerce');
+
+        if (!$phoneValue) {
+            wc_add_notice(
+                sprintf(
+                    __('%s is a required field.', 'woocommerce'),
+                    "<strong>$phoneLabel</strong>"
+                ),
+                'error'
+            );
+        }
+    }
+
     /**
      * @param string $id
      * @param IconFactory $iconFactory
@@ -722,4 +785,28 @@ public function addPaymentMethodMandatoryFields($fields, string $gatewayName, st
 
         return $fields;
     }
+
+
+    public function switchFields($data)
+    {
+        if (isset($data['payment_method']) && $data['payment_method'] === 'mollie_wc_gateway_in3') {
+            $fieldPosted = filter_input(INPUT_POST, 'billing_phone_in3', FILTER_SANITIZE_SPECIAL_CHARS) ?? false;
+            if ($fieldPosted) {
+                $data['billing_phone'] = !empty($fieldPosted) ? $fieldPosted : $data['billing_phone'];
+            }
+        }
+        if (isset($data['payment_method']) && $data['payment_method'] === 'mollie_wc_gateway_bancomatpay') {
+            $fieldPosted = filter_input(INPUT_POST, 'billing_phone_bancomatpay', FILTER_SANITIZE_SPECIAL_CHARS) ?? false;
+            if ($fieldPosted) {
+                $data['billing_phone'] = !empty($fieldPosted) ? $fieldPosted : $data['billing_phone'];
+            }
+        }
+        if (isset($data['payment_method']) && $data['payment_method'] === 'mollie_wc_gateway_billie') {
+            $fieldPosted = filter_input(INPUT_POST, 'billing_company_billie', FILTER_SANITIZE_SPECIAL_CHARS) ?? false;
+            if ($fieldPosted) {
+                $data['billing_company'] = !empty($fieldPosted) ? $fieldPosted : $data['billing_company'];
+            }
+        }
+        return $data;
+    }
 }
diff --git a/src/PaymentMethods/Bancomatpay.php b/src/PaymentMethods/Bancomatpay.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\PaymentMethods;
+
+class Bancomatpay extends AbstractPaymentMethod implements PaymentMethodI
+{
+    public function getConfig(): array
+    {
+        return [
+            'id' => 'bancomatpay',
+            'defaultTitle' => __('Bancomat Pay', 'mollie-payments-for-woocommerce'),
+            'settingsDescription' => '',
+            'defaultDescription' => '',
+            'paymentFields' => true,
+            'instructions' => false,
+            'supports' => [
+                'products',
+                'refunds',
+            ],
+            'filtersOnBuild' => false,
+            'confirmationDelayed' => false,
+            'errorMessage' => __(
+                'Required field is empty. Phone field is required.',
+                'mollie-payments-for-woocommerce'
+            ),
+            'phonePlaceholder' => __('Please enter your phone here. +00..', 'mollie-payments-for-woocommerce'),
+        ];
+    }
+
+    public function getFormFields($generalFormFields): array
+    {
+        return $generalFormFields;
+    }
+}
diff --git a/src/PaymentMethods/Billie.php b/src/PaymentMethods/Billie.php
@@ -16,7 +16,7 @@ protected function getConfig(): array
                 'mollie-payments-for-woocommerce'
             ),
             'defaultDescription' => '',
-            'paymentFields' => false,
+            'paymentFields' => true,
             'instructions' => false,
             'supports' => [
                 'products',

diff --git a/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
+
+class BancomatpayFieldsStrategy implements PaymentFieldsStrategyI
+{
+    const FIELD_PHONE = "billing_phone_bancomatpay";
+
+    public function execute($gateway, $dataHelper)
+    {
+        $showPhoneField = false;
+
+        if (is_checkout_pay_page()) {
+            $order = $this->getOrderIdOnPayForOrderPage();
+            $showPhoneField = empty($order->get_billing_phone());
+        }
+
+        if (is_checkout() && !is_checkout_pay_page()) {
+                $showPhoneField = true;
+        }
+
+        if ($showPhoneField) {
+            $this->phoneNumber();
+        }
+    }
+
+    protected function getOrderIdOnPayForOrderPage()
+    {
+        global $wp;
+        $orderId = absint($wp->query_vars['order-pay']);
+        return wc_get_order($orderId);
+    }
+
+    protected function phoneNumber()
+    {
+        ?>
+        <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'); ?>
+                <abbr class="required" title="required">*</abbr>
+            </label>
+            <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">
+        </span>
+        </p>
+        <?php
+    }
+
+    public function getFieldMarkup($gateway, $dataHelper)
+    {
+        return "";
+    }
+}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
+
+class BillieFieldsStrategy implements PaymentFieldsStrategyI
+{
+    const FIELD_COMPANY = "billing_company_billie";
+
+    public function execute($gateway, $dataHelper)
+    {
+        $showCompanyField = false;
+
+        if (is_checkout_pay_page()) {
+            $order = $this->getOrderIdOnPayForOrderPage();
+            $showCompanyField = empty($order->get_billing_company());
+        }
+
+        if (is_checkout() && !is_checkout_pay_page()) {
+            $showCompanyField = true;
+        }
+
+        if ($showCompanyField) {
+            $this->company();
+        }
+    }
+
+    protected function getOrderIdOnPayForOrderPage()
+    {
+        global $wp;
+        $orderId = absint($wp->query_vars['order-pay']);
+        return wc_get_order($orderId);
+    }
+
+    protected function company()
+    {
+        ?>
+        <p class="form-row form-row-wide" id="billing_company_field">
+            <label for="<?= esc_attr(self::FIELD_COMPANY); ?>" class=""><?= esc_html__('Company', 'mollie-payments-for-woocommerce'); ?>
+                <abbr class="required" title="required">*</abbr>
+            </label>
+            <span class="woocommerce-input-wrapper">
+        <input type="tel" class="input-text " name="<?= esc_attr(self::FIELD_COMPANY); ?>" id="<?= esc_attr(self::FIELD_COMPANY); ?>"
+               placeholder="Company name"
+               value="" autocomplete="organization">
+        </span>
+        </p>
+        <?php
+    }
+
+    public function getFieldMarkup($gateway, $dataHelper)
+    {
+        return "";
+    }
+}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
@@ -7,7 +7,7 @@
 class In3FieldsStrategy implements PaymentFieldsStrategyI
 {
     const FIELD_BIRTHDATE = "billing_birthdate";
-    const FIELD_PHONE = "billing_phone";
+    const FIELD_PHONE = "billing_phone_in3";
 
     public function execute($gateway, $dataHelper)
     {
@@ -21,15 +21,8 @@ public function execute($gateway, $dataHelper)
         }
 
         if (is_checkout() && !is_checkout_pay_page()) {
-            $checkoutFields = WC()->checkout()->get_checkout_fields();
-
-            if (!isset($checkoutFields["billing"][self::FIELD_PHONE])) {
                 $showPhoneField = true;
-            }
-
-            if (!isset($checkoutFields["billing"][self::FIELD_BIRTHDATE])) {
                 $showBirthdateField = true;
-            }
         }
 
         if ($showPhoneField) {

diff --git a/src/Shared/SharedDataDictionary.php b/src/Shared/SharedDataDictionary.php
@@ -33,6 +33,7 @@ class SharedDataDictionary
         'Mollie_WC_Gateway_Directdebit',
         'Mollie_WC_Gateway_Blik',
         'Mollie_WC_Gateway_Twint',
+        'Mollie_WC_Gateway_Bancomatpay',
     ];
 
     public const MOLLIE_OPTIONS_NAMES = [