Merge branch 'release/7.3.0'

mollie · Jul 26, 2022 · dc35d27 · dc35d27
2 parents 7c50453 + 04be659
commit dc35d27
Show file tree

Hide file tree

Showing 38 changed files with 417 additions and 357 deletions.
diff --git a/.ddev/docker-compose.wp-plugin.yaml b/.ddev/docker-compose.wp-plugin.yaml
@@ -1,5 +1,7 @@
 version: '3.6'
 services:
     web:
-        volumes:
-            - ../:/var/www/html/.ddev/wordpress/wp-content/plugins/mollie-payments-for-woocommerce:ro
+      volumes:
+        - source: ../
+          target: /var/www/html/.ddev/wordpress/wp-content/plugins/mollie-payments-for-woocommerce:ro
+          type: bind
diff --git a/composer.json b/composer.json
@@ -19,6 +19,7 @@
     "ext-intl": "*",
     "ext-json": "*",
     "mollie/mollie-api-php": "^v2.40",
+    "psr/log":"^1.1.4",
     "inpsyde/modularity": "^1.3.0"
   },
   "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/gulpfile.js b/gulpfile.js
@@ -31,7 +31,7 @@ const options = {
                 buildDir: `${__dirname}/build`,
                 distDir: `${__dirname}/dist`,
                 q: false,
-                depsVersionPhp: '5.6.39',
+                depsVersionPhp: '7.2.9',
             },
         }
     )
@@ -177,14 +177,6 @@ function _installPhp({buildDir, depsVersionPhp}) {
     }
 }
 
-function _installPhar({buildDir}) {
-    return function installPhar(done) {
-        chain([
-            (done) => { return exec('phive', ['install', '--force-accept-unsigned', '--copy'], {cwd: buildDir}, done)},
-        ], done);
-    }
-}
-
 function _installJs({buildDir}) {
     return function installJs(done) {
         chain([
@@ -256,6 +248,7 @@ function _archive({baseDir, buildDir, distDir, packageVersion, packageName}) {
                             '!**/webpack.config.js',
                             '!**/.github',
                             '!**/.git',
+                            '!**/.ddev',
                             '!**/.gitignore',
                             '!**/.gitattributes',
                             '!**/Makefile',
@@ -298,10 +291,6 @@ exports.installPhp = series(
     _installPhp(options)
 )
 
-exports.installPhar = series(
-    _installPhar(options)
-)
-
 exports.installJs = series(
     _installJs(options)
 )
@@ -316,8 +305,7 @@ exports.archive = series(
 
 exports.install = parallel(
     exports.installJs,
-    exports.installPhp,
-    exports.installPhar,
+    exports.installPhp
 )
 
 exports.process = series(

diff --git a/languages/mollie-payments-for-woocommerce-nl_BE.mo b/languages/mollie-payments-for-woocommerce-nl_BE.mo
diff --git a/languages/mollie-payments-for-woocommerce-nl_BE.po b/languages/mollie-payments-for-woocommerce-nl_BE.po
@@ -2592,7 +2592,7 @@ msgstr "Lege WooCommerce-bestelartikelen of Mollie-bestellijnen."
 #: src/Mollie/WC/Payment/Payment.php:132
 msgctxt "Payment description for {orderNumber}"
 msgid "Order {orderNumber}"
-msgstr "Bestelling {bestelnummer}"
+msgstr "Bestelling {orderNumber}"
 
 #. translators: Placeholder 1: store name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:127
@@ -2601,7 +2601,7 @@ msgstr "Bestelling {bestelnummer}"
 #: src/Mollie/WC/Payment/Payment.php:143
 msgctxt "Payment description for {storeName}"
 msgid "StoreName {storeName}"
-msgstr "Winkelnaam {winkelnaam}"
+msgstr "Winkelnaam {storeName}"
 
 #. translators: Placeholder 1: customer first name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:138
@@ -2610,7 +2610,7 @@ msgstr "Winkelnaam {winkelnaam}"
 #: src/Mollie/WC/Payment/Payment.php:154
 msgctxt "Payment description for {customer.firstname}"
 msgid "Customer Firstname {customer.firstname}"
-msgstr "Voornaam Klant {voornaam.klant}"
+msgstr "Voornaam Klant {customer.firstname}"
 
 #. translators: Placeholder 1: customer last name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:149
@@ -2619,7 +2619,7 @@ msgstr "Voornaam Klant {voornaam.klant}"
 #: src/Mollie/WC/Payment/Payment.php:165
 msgctxt "Payment description for {customer.lastname}"
 msgid "Customer Lastname {customer.lastname}"
-msgstr "Achternaam Klant {achternaam.klant}"
+msgstr "Achternaam Klant {customer.lastname}"
 
 #. translators: Placeholder 1: customer company name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:160
@@ -2628,7 +2628,7 @@ msgstr "Achternaam Klant {achternaam.klant}"
 #: src/Mollie/WC/Payment/Payment.php:176
 msgctxt "Payment description for {customer.company}"
 msgid "Customer Company {customer.company}"
-msgstr "Bedrijf Klant {bedrijf.klant}"
+msgstr "Bedrijf Klant {customer.company}"
 
 #. translators: Placeholder 1: payment method title, placeholder 2: payment ID
 #: build/src/Mollie/WC/Payment/Payment.php:334

diff --git a/languages/mollie-payments-for-woocommerce-nl_BE_formal.mo b/languages/mollie-payments-for-woocommerce-nl_BE_formal.mo
diff --git a/languages/mollie-payments-for-woocommerce-nl_BE_formal.po b/languages/mollie-payments-for-woocommerce-nl_BE_formal.po
@@ -2589,7 +2589,7 @@ msgstr "Lege WooCommerce-bestelartikelen of Mollie-bestelregels."
 #: src/Mollie/WC/Payment/Payment.php:132
 msgctxt "Payment description for {orderNumber}"
 msgid "Order {orderNumber}"
-msgstr "Bestelling {bestelnummer}"
+msgstr "Bestelling {orderNumber}"
 
 #. translators: Placeholder 1: store name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:127
@@ -2598,7 +2598,7 @@ msgstr "Bestelling {bestelnummer}"
 #: src/Mollie/WC/Payment/Payment.php:143
 msgctxt "Payment description for {storeName}"
 msgid "StoreName {storeName}"
-msgstr "Winkelnaam {winkelnaam}"
+msgstr "Winkelnaam {storeName}"
 
 #. translators: Placeholder 1: customer first name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:138
@@ -2607,7 +2607,7 @@ msgstr "Winkelnaam {winkelnaam}"
 #: src/Mollie/WC/Payment/Payment.php:154
 msgctxt "Payment description for {customer.firstname}"
 msgid "Customer Firstname {customer.firstname}"
-msgstr "Voornaam Klant {voornaam.klant}"
+msgstr "Voornaam Klant {customer.firstname}"
 
 #. translators: Placeholder 1: customer last name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:149
@@ -2616,7 +2616,7 @@ msgstr "Voornaam Klant {voornaam.klant}"
 #: src/Mollie/WC/Payment/Payment.php:165
 msgctxt "Payment description for {customer.lastname}"
 msgid "Customer Lastname {customer.lastname}"
-msgstr "Achternaam Klant {achternaam.klant}"
+msgstr "Achternaam Klant {customer.lastname}"
 
 #. translators: Placeholder 1: customer company name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:160
@@ -2625,7 +2625,7 @@ msgstr "Achternaam Klant {achternaam.klant}"
 #: src/Mollie/WC/Payment/Payment.php:176
 msgctxt "Payment description for {customer.company}"
 msgid "Customer Company {customer.company}"
-msgstr "Bedrijf Klant {bedrijf.klant}"
+msgstr "Bedrijf Klant {customer.company}"
 
 #. translators: Placeholder 1: payment method title, placeholder 2: payment ID
 #: build/src/Mollie/WC/Payment/Payment.php:334

diff --git a/languages/mollie-payments-for-woocommerce-nl_NL.mo b/languages/mollie-payments-for-woocommerce-nl_NL.mo
diff --git a/languages/mollie-payments-for-woocommerce-nl_NL.po b/languages/mollie-payments-for-woocommerce-nl_NL.po
@@ -2594,7 +2594,7 @@ msgstr "Lege WooCommerce bestelartikelen of Mollie-bestellijnen."
 #: src/Mollie/WC/Payment/Payment.php:132
 msgctxt "Payment description for {orderNumber}"
 msgid "Order {orderNumber}"
-msgstr "Bestelling {bestelnummer}"
+msgstr "Bestelling {orderNumber}"
 
 #. translators: Placeholder 1: store name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:127
@@ -2603,7 +2603,7 @@ msgstr "Bestelling {bestelnummer}"
 #: src/Mollie/WC/Payment/Payment.php:143
 msgctxt "Payment description for {storeName}"
 msgid "StoreName {storeName}"
-msgstr "WinkelNaam {winkelNaam}"
+msgstr "WinkelNaam {storeName}"
 
 #. translators: Placeholder 1: customer first name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:138
@@ -2612,7 +2612,7 @@ msgstr "WinkelNaam {winkelNaam}"
 #: src/Mollie/WC/Payment/Payment.php:154
 msgctxt "Payment description for {customer.firstname}"
 msgid "Customer Firstname {customer.firstname}"
-msgstr "Klant voornaam {klant.voornaam}"
+msgstr "Klant voornaam {customer.firstname}"
 
 #. translators: Placeholder 1: customer last name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:149
@@ -2621,7 +2621,7 @@ msgstr "Klant voornaam {klant.voornaam}"
 #: src/Mollie/WC/Payment/Payment.php:165
 msgctxt "Payment description for {customer.lastname}"
 msgid "Customer Lastname {customer.lastname}"
-msgstr "Klant achternaam {klant.achternaam}"
+msgstr "Klant achternaam {customer.lastname}"
 
 #. translators: Placeholder 1: customer company name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:160
@@ -2630,7 +2630,7 @@ msgstr "Klant achternaam {klant.achternaam}"
 #: src/Mollie/WC/Payment/Payment.php:176
 msgctxt "Payment description for {customer.company}"
 msgid "Customer Company {customer.company}"
-msgstr "Klant bedrijf {klant.bedrijf}"
+msgstr "Klant bedrijf {customer.company}"
 
 #. translators: Placeholder 1: payment method title, placeholder 2: payment ID
 #: build/src/Mollie/WC/Payment/Payment.php:334

diff --git a/languages/mollie-payments-for-woocommerce-nl_NL_formal.mo b/languages/mollie-payments-for-woocommerce-nl_NL_formal.mo
diff --git a/languages/mollie-payments-for-woocommerce-nl_NL_formal.po b/languages/mollie-payments-for-woocommerce-nl_NL_formal.po
@@ -2606,7 +2606,7 @@ msgstr "Lege WooCommerce bestelartikelen of Mollie-bestelregels."
 #: src/Mollie/WC/Payment/Payment.php:132
 msgctxt "Payment description for {orderNumber}"
 msgid "Order {orderNumber}"
-msgstr "Bestelling {bestelnummer}"
+msgstr "Bestelling {orderNumber}"
 
 #. translators: Placeholder 1: store name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:127
@@ -2615,7 +2615,7 @@ msgstr "Bestelling {bestelnummer}"
 #: src/Mollie/WC/Payment/Payment.php:143
 msgctxt "Payment description for {storeName}"
 msgid "StoreName {storeName}"
-msgstr "WinkelNaam {winkelNaam}"
+msgstr "WinkelNaam {storeName}"
 
 #. translators: Placeholder 1: customer first name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:138
@@ -2624,7 +2624,7 @@ msgstr "WinkelNaam {winkelNaam}"
 #: src/Mollie/WC/Payment/Payment.php:154
 msgctxt "Payment description for {customer.firstname}"
 msgid "Customer Firstname {customer.firstname}"
-msgstr "Klant voornaam {klant.voornaam}"
+msgstr "Klant voornaam {customer.firstname}"
 
 #. translators: Placeholder 1: customer last name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:149
@@ -2633,7 +2633,7 @@ msgstr "Klant voornaam {klant.voornaam}"
 #: src/Mollie/WC/Payment/Payment.php:165
 msgctxt "Payment description for {customer.lastname}"
 msgid "Customer Lastname {customer.lastname}"
-msgstr "Klant achternaam {klant.achternaam}"
+msgstr "Klant achternaam {customer.lastname}"
 
 #. translators: Placeholder 1: customer company name
 #: build/src/Mollie/WC/Gateway/AbstractSubscription.php:160
@@ -2642,7 +2642,7 @@ msgstr "Klant achternaam {klant.achternaam}"
 #: src/Mollie/WC/Payment/Payment.php:176
 msgctxt "Payment description for {customer.company}"
 msgid "Customer Company {customer.company}"
-msgstr "Klant bedrijf {klant.bedrijf}"
+msgstr "Klant bedrijf {customer.company}"
 
 #. translators: Placeholder 1: payment method title, placeholder 2: payment ID
 #: build/src/Mollie/WC/Payment/Payment.php:334

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.2.0
+ * Version: 7.3.0-beta1
  * Author: Mollie
  * Author URI: https://www.mollie.com
  * Requires at least: 5.0
@@ -145,7 +145,7 @@ function initialize()
         $properties = PluginProperties::new(__FILE__);
         $bootstrap = Package::new($properties);
         $modules = [
-            new ActivationModule(__FILE__),
+            new ActivationModule(__FILE__, $properties->version()),
             new LogModule('mollie-payments-for-woocommerce-'),
             new NoticeModule(),
             new SharedModule(),
@@ -155,7 +155,7 @@ function initialize()
             new GatewayModule(),
             new VoucherModule(),
             new PaymentModule(),
-            new UninstallModule()
+            new UninstallModule(),
         ];
         $modules = apply_filters('mollie_wc_plugin_modules', $modules);
         $bootstrap->boot(...$modules);

diff --git a/package.json b/package.json
@@ -34,8 +34,6 @@
     "@symfony/webpack-encore": "^0.28.2",
     "@woocommerce/dependency-extraction-webpack-plugin": "^1.7.0",
     "@wordpress/element": "^4.0.4",
-    "cypress": "^9.2.0",
-    "cypress-woocommerce": "^0.1.1",
     "date-and-time": "^0.14.0",
     "del": "^3.0.0",
     "gulp": "^4.0.0",
@@ -47,16 +45,13 @@
     "minimist": "^1.2.3",
     "sass": "^1.52.1",
     "pump": "^3.0.0",
-    "sass-loader": "^7.0.1"
+    "sass-loader": "^7.0.1", 
+    "@woocommerce/e2e-utils": "^0.1.6",
+    "@wordpress/data": "^6.1.5"
   },
   "scripts": {
     "watch": "webpack --watch",
     "build": "node_modules/.bin/encore dev --env.basePath=.",
-    "setup": "gulp setup",
-    "cypress:open": "cypress open"
-  },
-  "dependencies": {
-    "@woocommerce/e2e-utils": "^0.1.6",
-    "@wordpress/data": "^6.1.5"
+    "setup": "gulp setup"
   }
 }
diff --git a/resources/js/blocks/molliePaymentMethod.js b/resources/js/blocks/molliePaymentMethod.js
@@ -72,7 +72,7 @@ const MollieComponent = (props) => {
             method: 'POST',
             data: {
                 action: 'mollie_checkout_blocks_surchage',
-                method: activePaymentMethod
+                payment_method: activePaymentMethod
             },
             complete: (jqXHR, textStatus) => {
             },