Changeset 3198223

Timestamp:

11/27/2024 02:38:09 PM (15 months ago)

Author:

ndijkstra

Message:

Preparing for 2.7.11 release

Location:

mollie-forms/trunk

Files:

• classes/Admin.php (modified) (1 diff)
• classes/FormBuilder.php (modified) (5 diffs)
• classes/MollieForms.php (modified) (1 diff)
• mollie-forms.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

mollie-forms/trunk/classes/Admin.php

@@ -401 +401 @@
                         'resource'       => $api_type,
                         'includeWallets' => 'applepay',
+                        'amount'         => ['value' => '1.00', 'currency' => $currency],
                 ]);
 

mollie-forms/trunk/classes/FormBuilder.php

@@ -196 +196 @@
         $variable  = get_post_meta($post, '_rfmp_payment_method_variable', true);
         $display   = get_post_meta($post, '_rfmp_payment_methods_display', true);
+        $currency  = get_post_meta($post, '_rfmp_currency', true) ?: 'EUR';
         $formValue = isset($_POST['rfmp_payment_method']) ? sanitize_text_field($_POST['rfmp_payment_method']) : '';
 
@@ -208 +209 @@
             $script = '';
             $rcur   = [];
-            foreach ($mollie->all('methods', ['sequenceType' => 'first']) as $method) {
+            foreach ($mollie->all('methods', ['sequenceType' => 'first', 'amount' => ['value' => '1.00', 'currency' => $currency]]) as $method) {
                 if (isset($active[$method->id]) && $active[$method->id]) {
                     $rcur[] = $method->id;
@@ -215 +216 @@
                 }
             }
-            foreach ($mollie->all('methods', ['locale'         => $locale,
-                                              'resource'       => $apiType,
-                                              'includeWallets' => 'applepay',
-            ]) as $method) {
+            foreach ($mollie->all('methods', ['locale' => $locale, 'resource' => $apiType, 'amount' => ['value' => '1.00', 'currency' => $currency], 'includeWallets' => 'applepay']) as $method) {
                 if (isset($active[$method->id]) && $active[$method->id] && !in_array($method->id, $rcur)) {
                     $script .= 'if (document.getElementById("rfmp_pm_' . $method->id . '_' . $post . '") !== null){' .
@@ -286 +284 @@
             </script>';
 
-            $currency = get_post_meta($post, '_rfmp_currency', true) ?: 'EUR';
-            $symbol   = $this->helpers->getCurrencySymbol($currency);
-
+            $symbol = $this->helpers->getCurrencySymbol($currency);
 
             if ($display != 'dropdown') {
@@ -302 +298 @@
 
             // loop through all payment methods
-            foreach ($mollie->all('methods', ['locale'         => $locale,
-                                              'resource'       => $apiType,
-                                              'includeWallets' => 'applepay',
-            ]) as $method) {
+            foreach ($mollie->all('methods', ['locale' => $locale, 'resource' => $apiType, 'includeWallets' => 'applepay', 'amount' => ['value' => '1.00', 'currency' => $currency]]) as $method) {
                 // check if method is enabled in form
                 if (isset($active[$method->id]) && $active[$method->id]) {

mollie-forms/trunk/classes/MollieForms.php

@@ -10 +10 @@
      * Plugin version number
      */
-    const PLUGIN_VERSION = '2.7.10';
+    const PLUGIN_VERSION = '2.7.11';
 
     /**

mollie-forms/trunk/mollie-forms.php

@@ -4 +4 @@
 Plugin Name: Mollie Forms
 Description: Create registration forms with payment methods of Mollie. One-time and recurring payments are possible.
-Version: 2.7.10
+Version: 2.7.11
 Author: Wobbie.nl
 Author URI: https://wobbie.nl

mollie-forms/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 7.0
 Tested up to: 6.7
-Stable tag: 2.7.10
+Stable tag: 2.7.11
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -82 +82 @@
 == Changelog ==
 
+= 2.7.11 - 27/11/2024 =
+* Fix to use selected currency for retrieving payment methods
+
 = 2.7.10 - 25/11/2024 =
 * Send correct User-Agent for Mollie API requests