merge all changes from release 6.4.0 until now

mollie · Sep 28, 2021 · f7eb497 · f7eb497
2 parents 90c5ad8 + b2022d1
commit f7eb497
Show file tree

Hide file tree

Showing 37 changed files with 7,753 additions and 2,583 deletions.
diff --git a/inc/settings/mollie_advanced_settings.php b/inc/settings/mollie_advanced_settings.php
@@ -134,6 +134,22 @@
             '</p>'
         )
     ],
+    [
+        'id' => $pluginName . '_' . 'gatewayFeeLabel',
+        'title' => __(
+            'Surcharge gateway fee label',
+            'mollie-payments-for-woocommerce'
+        ),
+        'type' => 'text',
+        'custom_attributes'=>['maxlength'=>'30'],
+        'default' => __('Gateway Fee', 'mollie-payments-for-woocommerce'),
+        'desc' => sprintf(
+            __(
+                'This is the label will appear in frontend when the surcharge applies',
+                'mollie-payments-for-woocommerce'
+            )
+        )
+    ],
     [
         'id'   => $pluginName . '_' .'sectionend',
         'type' => 'sectionend',

diff --git a/inc/utils.php b/inc/utils.php
@@ -162,4 +162,22 @@ function mollieWooCommerceIsMollieGateway($gateway)
     return false;
 }
 
+function mollieWooCommercIsExpiryDateEnabled()
+{
+    global $wpdb;
+    $option = 'mollie_wc_gateway_%_settings';
+    $gatewaySettings = $wpdb->get_results($wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name LIKE %s", $option));
+    $expiryDateEnabled = false;
+    foreach($gatewaySettings as $gatewaySetting){
+        $values = unserialize($gatewaySetting->option_value);
+        if($values['enabled'] !== 'yes'){
+            continue;
+        }
+        if (!empty($values["activate_expiry_days_setting"]) && $values["activate_expiry_days_setting"] === 'yes'){
+            $expiryDateEnabled = true;
+        }
+    }
+    return $expiryDateEnabled;
+}
+
 
diff --git a/languages/mollie-payments-for-woocommerce-de_DE.mo b/languages/mollie-payments-for-woocommerce-de_DE.mo
diff --git a/languages/mollie-payments-for-woocommerce-de_DE.po b/languages/mollie-payments-for-woocommerce-de_DE.po
diff --git a/languages/mollie-payments-for-woocommerce-de_DE_formal.mo b/languages/mollie-payments-for-woocommerce-de_DE_formal.mo
diff --git a/languages/mollie-payments-for-woocommerce-de_DE_formal.po b/languages/mollie-payments-for-woocommerce-de_DE_formal.po
diff --git a/languages/mollie-payments-for-woocommerce-es_ES.mo b/languages/mollie-payments-for-woocommerce-es_ES.mo
diff --git a/languages/mollie-payments-for-woocommerce-es_ES.po b/languages/mollie-payments-for-woocommerce-es_ES.po
diff --git a/languages/mollie-payments-for-woocommerce-fr_FR.mo b/languages/mollie-payments-for-woocommerce-fr_FR.mo