show hardcoded gateway in checkout

mollie · Oct 6, 2021 · cd3cd34 · cd3cd34
1 parent f7eb497
commit cd3cd34
Show file tree

Hide file tree

Showing 29 changed files with 8,549 additions and 8,272 deletions.
diff --git a/.babelrc b/.babelrc
@@ -11,6 +11,18 @@
           ]
         }
       }
+    ],
+    [
+      "@babel/preset-react",
+      {
+        "useBuiltIns": "entry",
+        "targets": {
+          "browsers": [
+            "last 2 versions",
+            "ie 10"
+          ]
+        }
+      }
     ]
   ]
 }
diff --git a/inc/utils.php b/inc/utils.php
@@ -14,6 +14,10 @@
  */
 function mollieWooCommerceIsCheckoutContext()
 {
+    global $wp_query;
+    if(!isset($wp_query)){
+        return false;
+    }
     return is_checkout() || is_checkout_pay_page();
 }
 

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: 6.5.2
+ * Version: 6.7.0
  * Author: Mollie
  * Author URI: https://www.mollie.com
  * Requires at least: 5.0

diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
     "minimist": "^1.2.3",
     "node-sass": "^4.13.0",
     "pump": "^3.0.0",
+    "react": "^17.0.2",
     "sass-loader": "^7.0.1"
   },
   "scripts": {

diff --git a/resources/js/mollieBlockIndex.js b/resources/js/mollieBlockIndex.js
@@ -0,0 +1,37 @@
+
+(
+    function ({ mollieBlockData, wc, _}) {
+        console.log(mollieBlockData)
+        if (_.isEmpty(mollieBlockData)) {
+            return
+        }
+        const { registerPaymentMethod } = wc.wcBlocksRegistry;
+        console.log('register')
+        console.log(registerPaymentMethod)
+        const { gatewayData } = mollieBlockData;
+        console.log('gateway')
+        console.log(gatewayData)
+
+        gatewayData.forEach(item=>{
+            console.log('item')
+            console.log(item)
+            let paymentMethod = {
+                name: item.name,
+                label: <strong>{item.label}</strong>,
+                content:  <div>{item.content}</div>,
+                edit:  <div>{item.edit}</div>,
+                paymentMethodId: item.paymentMethodId,
+                canMakePayment: () => item.canMakePayment,
+                ariaLabel: item.ariaLabel,
+                supports: {
+                    features: item.supports,
+                },
+            };
+
+            registerPaymentMethod( paymentMethod );
+        })
+    }
+)
+(
+    window, wc
+)
diff --git a/src/Assets/AssetsModule.php b/src/Assets/AssetsModule.php
@@ -226,9 +226,9 @@ public function registerFrontendScripts()
         );
         wp_register_script(
             'mollie_paypalButton',
-            $this->getPluginUrl('/resources/js/paypalButton.js'),
+            $this->getPluginUrl('/public/js/paypalButton.min.js'),
             ['underscore', 'jquery'],
-            filemtime($this->getPluginPath('/resources/js/paypalButton.js')),
+            filemtime($this->getPluginPath('/public/js/paypalButton.min.js')),
             true
         );
         wp_register_script(
@@ -268,6 +268,13 @@ public function registerFrontendScripts()
             filemtime($this->getPluginPath('/public/js/gatewaySurcharge.min.js')),
             true
         );
+        wp_register_script(
+            'mollie_block_index',
+            $this->getPluginUrl('/public/js/mollieBlockIndex.min.js'),
+            ['wc-blocks-registry', 'underscore'],
+            filemtime($this->getPluginPath('/public/js/mollieBlockIndex.min.js')),
+            true
+        );
     }
 
     /**
@@ -277,6 +284,14 @@ public function registerFrontendScripts()
      */
     public function enqueueFrontendScripts()
     {
+        wp_enqueue_script('mollie_block_index');
+        wp_localize_script(
+            'mollie_block_index',
+            'mollieBlockData',
+            [
+                'gatewayData' => $this->gatewayDataForWCBlocks()
+            ]
+        );
         if (is_admin() || !mollieWooCommerceIsCheckoutContext()) {
             return;
         }
@@ -367,6 +382,22 @@ public function enqueueComponentsAssets()
         );
     }
 
+    protected function gatewayDataForWCBlocks(): array
+    {
+        return [
+            [
+                'name' => 'mollie_wc_gateway_ideal',
+                'label' => 'ideal',
+                'content' => 'Ideal content',
+                'edit' => 'Ideal edit',
+                'paymentMethodId' => 'mollie_wc_gateway_ideal',
+                'canMakePayment' => true,
+                'ariaLabel' => 'Payment via Mollie',
+                'supports' => []
+            ]
+        ];
+    }
+
     protected function getPluginUrl(string $path = ''): string
     {
         return $this->pluginUrl . ltrim($path, '/');

diff --git a/src/Core/CoreModule.php b/src/Core/CoreModule.php
@@ -36,7 +36,7 @@ public function services(): array
             },
             'core.plugin_version' => function (): string {
                 //Get plugin version TODO handle with properties
-                return '6.6.0';
+                return '6.7.0';
             },
             'core.plugin_title' => function (): string {
                 //Get plugin version TODO handle with properties

diff --git a/src/Gateway/GatewayModule.php b/src/Gateway/GatewayModule.php
@@ -86,7 +86,7 @@ public function services(): array
                     'Belfius',
                     'Creditcard',
                     'DirectDebit',
-                    'EPS',
+                    'Eps',
                     'Giropay',
                     'Ideal',
                     'Kbc',

diff --git a/src/Payment/OrderInstructionsService.php b/src/Payment/OrderInstructionsService.php
@@ -5,7 +5,7 @@
 namespace Mollie\WooCommerce\Payment;
 
 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
-use Mollie\WooCommerce\PaymentMethods\DefaultInstructionStrategy;
+use Mollie\WooCommerce\PaymentMethods\InstructionStrategies\DefaultInstructionStrategy;
 
 class OrderInstructionsService
 {

diff --git a/src/Payment/PaymentCheckoutRedirectService.php b/src/Payment/PaymentCheckoutRedirectService.php
@@ -5,8 +5,8 @@
 namespace Mollie\WooCommerce\Payment;
 
 use Mollie\WooCommerce\Notice\NoticeInterface;
-use Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\DefaultRedirectStrategy;
-use Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentRedirectStrategyI;
+use Mollie\WooCommerce\PaymentMethods\PaymentRedirectStrategies\DefaultRedirectStrategy;
+use Mollie\WooCommerce\PaymentMethods\PaymentRedirectStrategies\PaymentRedirectStrategyI;
 use Mollie\WooCommerce\Utils\Data;
 use Psr\Log\LoggerInterface as Logger;
 use WC_Order;

diff --git a/src/Payment/PaymentModule.php b/src/Payment/PaymentModule.php
@@ -423,7 +423,8 @@ public function cancelOrderAtMollie($order_id)
 
     public function handleExpiryDateCancelation()
     {
-        if(!mollieWooCommercIsExpiryDateEnabled()){
+        //todo this doesnt work
+        /*if(!mollieWooCommercIsExpiryDateEnabled()){
             as_unschedule_action( 'mollie_woocommerce_cancel_unpaid_orders' );
             return;
         }
@@ -439,7 +440,7 @@ public function handleExpiryDateCancelation()
                 11,
                 2
             );
-        }
+        }*/
     }
 
     /**

diff --git a/src/Payment/PaymentService.php b/src/Payment/PaymentService.php
@@ -511,7 +511,7 @@ protected function processAsMollieOrder(
                     ? $data['orderNumber'] : ''
             ];
 
-            $this->logger->log( \WC_Log_Levels::DEBUG, $apiCallLog);
+            $this->logger->log( \WC_Log_Levels::DEBUG, json_encode($apiCallLog));
             $paymentOrder = $paymentObject;
             $paymentObject = $this->apiHelper->getApiClient($apiKey)->orders->create($data);
             $settingsHelper = $this->settingsHelper;

diff --git a/src/PaymentMethods/InstructionStrategies/ApplepayInstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/ApplepayInstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 class ApplepayInstructionStrategy implements InstructionStrategyI
 {

diff --git a/src/PaymentMethods/InstructionStrategies/BanktransferInstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/BanktransferInstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 use Mollie\WooCommerce\Plugin;
 

diff --git a/src/PaymentMethods/InstructionStrategies/CreditcardInstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/CreditcardInstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 class CreditcardInstructionStrategy implements InstructionStrategyI
 {

diff --git a/src/PaymentMethods/InstructionStrategies/DefaultInstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/DefaultInstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 class DefaultInstructionStrategy implements InstructionStrategyI
 {

diff --git a/src/PaymentMethods/InstructionStrategies/DirectdebitInstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/DirectdebitInstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 class DirectdebitInstructionStrategy implements InstructionStrategyI
 {

diff --git a/src/PaymentMethods/InstructionStrategies/IdealInstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/IdealInstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 class IdealInstructionStrategy implements InstructionStrategyI
 {

diff --git a/src/PaymentMethods/InstructionStrategies/InstructionStrategyI.php b/src/PaymentMethods/InstructionStrategies/InstructionStrategyI.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 interface InstructionStrategyI
 {

diff --git a/src/PaymentMethods/InstructionStrategies/MybankInstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/MybankInstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 class MybankInstructionStrategy implements InstructionStrategyI
 {

diff --git a/src/PaymentMethods/InstructionStrategies/PaypalInstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/PaypalInstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 class PaypalInstructionStrategy implements InstructionStrategyI
 {

diff --git a/src/PaymentMethods/InstructionStrategies/Przelewy24InstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/Przelewy24InstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 class Przelewy24InstructionStrategy implements InstructionStrategyI
 {

diff --git a/src/PaymentMethods/InstructionStrategies/SofortInstructionStrategy.php b/src/PaymentMethods/InstructionStrategies/SofortInstructionStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods;
+namespace Mollie\WooCommerce\PaymentMethods\InstructionStrategies;
 
 class SofortInstructionStrategy implements InstructionStrategyI
 {

diff --git a/src/PaymentMethods/PaymentRedirectStrategies/BanktransferRedirectStrategy.php b/src/PaymentMethods/PaymentRedirectStrategies/BanktransferRedirectStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
+namespace Mollie\WooCommerce\PaymentMethods\PaymentRedirectStrategies;
 
 use Mollie\WooCommerce\Payment\MollieObject;
 use Mollie\WooCommerce\Payment\MollieOrder;

diff --git a/src/PaymentMethods/PaymentRedirectStrategies/DefaultRedirectStrategy.php b/src/PaymentMethods/PaymentRedirectStrategies/DefaultRedirectStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
+namespace Mollie\WooCommerce\PaymentMethods\PaymentRedirectStrategies;
 
 use Mollie\WooCommerce\Payment\MollieOrder;
 use Mollie\WooCommerce\Payment\MolliePayment;

diff --git a/src/PaymentMethods/PaymentRedirectStrategies/PaymentRedirectStrategyI.php b/src/PaymentMethods/PaymentRedirectStrategies/PaymentRedirectStrategyI.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
+namespace Mollie\WooCommerce\PaymentMethods\PaymentRedirectStrategies;
 
 use Mollie\WooCommerce\Payment\MollieObject;
 use WC_Order;

diff --git a/src/Utils/Data.php b/src/Utils/Data.php
@@ -486,7 +486,7 @@ public function getOrderCurrency(\WC_Order $order)
     public function formatCurrencyValue($value, $currency)
     {
         // Only the Japanese Yen has no decimals in the currency
-        $value = $value;
+        $value = (int) $value;
 
         return $currency == "JPY" ? number_format($value, 0, '.', '') : number_format($value, 2, '.', '');
     }

diff --git a/webpack.config.js b/webpack.config.js
@@ -25,7 +25,8 @@ function configJavaScript ({ basePath })
     .addEntry('gatewaySettings.min', './resources/js/gatewaySettings.js')
     .addEntry('gatewaySurcharge.min', './resources/js/gatewaySurcharge.js')
     .addEntry('mollie-components.min', './resources/js/mollie-components.js')
-      .enableSourceMaps(!Encore.isProduction())
+    .addEntry('mollieBlockIndex.min', './resources/js/mollieBlockIndex.js')
+    .enableSourceMaps(!Encore.isProduction())
 
   return extractEncoreConfig('javascript-configuration')
 }