Merge branch 'release/5.4.2'

mollie · Dec 9, 2019 · 9a19606 · 9a19606
2 parents fae343c + 958f20a
commit 9a19606
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 19 deletions.
diff --git a/assets/css/mollie-components.css b/assets/css/mollie-components.css
@@ -3,6 +3,10 @@
     flex-wrap: wrap;
 }
 
+.mollie-components-description svg {
+    display: inline !important;
+}
+
 .mollie-components .mollie-component-label {
     font-weight: 400;
 }
@@ -22,6 +26,7 @@
 
 .mollie-components .mollie-component iframe {
     border-radius: 6px;
+    margin: 0;
 }
 
 .mollie-components div {

diff --git a/assets/js/mollie-components.min.js b/assets/js/mollie-components.min.js
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,11 @@
 == Changelog ==
 
+= 5.4.2 - 09-12-2019 =
+
+* Fix - Mollie crash when WooCommerce plugin is not active
+* Fix - Checkout form does not submit the order at first click on Place Order button when payment method is not one which support Mollie Components
+* Fix - Minor styles issues for Mollie Components
+
 = 5.4.1 - 05-12-2019 =
 
 * Fix - Mollie Components request multiple times the merchant profile ID via API

diff --git a/inc/woocommerce.php b/inc/woocommerce.php
@@ -16,14 +16,6 @@ function is_order_received_page ()
     }
 }
 
-if (!function_exists('wc_date_format'))
-{
-    function wc_date_format ()
-    {
-        return apply_filters('woocommerce_date_format', get_option('date_format'));
-    }
-}
-
 if (!function_exists('untrailingslashit'))
 {
     /**

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: 5.4.1
+ * Version: 5.4.2
  * Author: Mollie
  * Author URI: https://www.mollie.com
  * Requires at least: 3.8
@@ -197,14 +197,14 @@ function () {
                     add_action('admin_notices', 'mollie_wc_plugin_inactive');
                     return;
                 }
-            }
-        );
 
-        add_action(
-            'init',
-            function () {
-                load_plugin_textdomain('mollie-payments-for-woocommerce');
-                Mollie_WC_Plugin::init();
+                add_action(
+                    'init',
+                    function () {
+                        load_plugin_textdomain('mollie-payments-for-woocommerce');
+                        Mollie_WC_Plugin::init();
+                    }
+                );
             }
         );
     },

diff --git a/resources/js/mollie-components.js b/resources/js/mollie-components.js
@@ -159,6 +159,7 @@ async function submitForm (evt)
   if (!isGatewaySelected(gateway)) {
     // Let other gateway to submit the form
     turnMollieComponentsSubmissionOff($form)
+    $form.submit()
     return
   }
 

diff --git a/src/Mollie/WC/Gateway/Abstract.php b/src/Mollie/WC/Gateway/Abstract.php
@@ -2055,7 +2055,7 @@ protected function mollieComponentsFields()
 
         ?>
         <div class="mollie-components"></div>
-        <p>
+        <p class="mollie-components-description">
             <?php
             echo $this->lockIcon();
             esc_html_e('Secure payments provided by ');

diff --git a/src/Mollie/WC/Plugin.php b/src/Mollie/WC/Plugin.php
@@ -8,7 +8,7 @@ class Mollie_WC_Plugin
 {
     const PLUGIN_ID      = 'mollie-payments-for-woocommerce';
     const PLUGIN_TITLE   = 'Mollie Payments for WooCommerce';
-    const PLUGIN_VERSION = '5.4.1';
+    const PLUGIN_VERSION = '5.4.2';
 
     const DB_VERSION     = '1.0';
     const DB_VERSION_PARAM_NAME = 'mollie-db-version';