Merge pull request #34 from daanrijpkemacb/1.3.31

1.3.31: Rewrite rule fixes

Author: DaanRijpkema

bluem-integrations.php

@@ -231,9 +231,6 @@ function bluem_woocommerce_integration_wpcf7_ajax()
                 $preferences = get_option('bluem_woocommerce_options');
 
                 // Convert UTF-8 to ISO
-                // if (!empty($bluem_mandate_reason)) {
-                // $bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
-                // } else
                 if (!empty($bluem_config->eMandateReason)) {
                     $bluem_config->eMandateReason = mb_convert_encoding($bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8');
                 } else {

bluem.php

@@ -2,7 +2,7 @@
 
 /**
  * Plugin Name: Bluem ePayments, iDIN, eMandates services and integration for WooCommerce
- * Version: 1.3.30
+ * Version: 1.3.31
  * Plugin URI: https://bluem.nl/en/
  * Description: Bluem integration for WordPress and WooCommerce for Payments, eMandates, iDIN identity verification and more
  * Author: Bluem Payment Services
@@ -146,10 +146,21 @@ function bluem_is_permalinks_enabled(): bool
 }
 
 // Plug-in activation
-function bluem_woocommerce_plugin_activate()
+function bluem_woocommerce_plugin_activate(): void
 {
     update_option('bluem_plugin_registration', false);
 
+    bluem_add_rewrites();
+    // Flush the rules after adding them
+    flush_rewrite_rules();
+}
+
+register_activation_hook(__FILE__, 'bluem_woocommerce_plugin_activate');
+
+
+function bluem_add_rewrites(): void
+{
+
     // Rewrite rules:
     add_rewrite_rule('^bluem-woocommerce/idin_execute/?$', 'index.php?bluem_idin_shortcode_execute=1', 'top');
     add_rewrite_rule('^bluem-woocommerce/idin_shortcode_callback/?$', 'index.php?bluem_idin_shortcode_callback=1', 'top');
@@ -174,11 +185,9 @@ function bluem_woocommerce_plugin_activate()
     add_rewrite_rule('^bluem-woocommerce/bluem-integrations/gform_callback?$', 'index.php?bluem_woocommerce_integration_gform_callback=1', 'top');
     add_rewrite_rule('^bluem-woocommerce/bluem-integrations/gform_callback/?$', 'index.php?bluem_woocommerce_integration_gform_callback=1', 'top');
 
-    // Flush the rules after adding them
-    flush_rewrite_rules();
-}
 
-register_activation_hook(__FILE__, 'bluem_woocommerce_plugin_activate');
+}
+add_action('init', 'bluem_add_rewrites');
 
 add_filter('query_vars', function ($vars) {
     $bluem_vars = [

build.env

@@ -1 +1 @@
-PLUGIN_VERSION=1.3.30
+PLUGIN_VERSION=1.3.31

readme.txt

@@ -4,7 +4,7 @@ Tags: Bluem,Payments,iDIN,iDEAL,eMandates
 Requires at least: 5.0
 Tested up to: 6.6
 Requires PHP: 8.0
-Stable tag: 1.3.30
+Stable tag: 1.3.31
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -77,6 +77,7 @@ Shortcode: `[bluem_identificatieformulier]`
 It is possible to programmatically block display and functionality on your site based on the verification status. Please contact us if you are interested in developing this in your site.
 
 == Changelog ==
+- 1.3.31: Ensure rewrite rules are registered on init
 - 1.3.30: Fixed eMandates return bug; improved error messages in UI
 - 1.3.29: Callback URL fix for iDIN shortcode
 - 1.3.28: Refactor SNS to ASN and update BIC list

views/status.php

@@ -125,6 +125,36 @@ function bluem_display_woocommerce_logs(): string
                                                                           style="color: #4F800D;"></span></li>
                 <?php } ?>
             </ul>
+
+            <div class="wrap">
+                <h2><?php esc_html_e('Refresh rewrite rules','bluem'); ?></h2>
+                <p><?php esc_html_e('Zijn er problemen met het tonen/leveren van pagina\'s van de plug-in in je site? Klik dan hieronder om de Bluem pagina opnieuw te registreren. Dit zorgt er doorgaans voor dat de website de modernere vorm van pagina\'s kan tonen. ' ,'bluem'); ?></p>
+
+                <form method="post" action="">
+                    <?php wp_nonce_field('flush_rewrite_rules_nonce', 'flush_rewrite_rules_nonce'); ?>
+                    <input type="submit" name="flush_rewrite_rules" class="button button-primary" value="<?php esc_html_e('Refresh rewrite rules','bluem'); ?>">
+                </form>
+            </div>
+            <?php
+            if (isset($_POST['flush_rewrite_rules']) && check_admin_referer('flush_rewrite_rules_nonce', 'flush_rewrite_rules_nonce')) {
+                flush_rewrite_rules();
+                echo '<div class="updated"><p>
+'. esc_html("Refreshed rewrite rules successfully","bluem").'
+        </p>';
+                echo '</div>';
+            } ?>
+
+            <h3>Available Bluem rules</h3>
+            <ul><?php
+            $rules = get_option( 'rewrite_rules' );
+            foreach ($rules as $key => $value) {
+                if(str_contains($key, 'bluem')) {
+                    $key = str_replace(['^bluem-woocommerce/','','$'], '', $key);
+                    echo '<li>✅ <strong>'.esc_html($key).'</strong></li>';
+                }
+            }
+            ?>
+            </ul>
         </div>
 
         <div id="logs" class="tab-content">
@@ -140,23 +170,7 @@ function bluem_display_woocommerce_logs(): string
             <?php echo wp_kses_post(bluem_display_woocommerce_logs()); ?>
         </div>
 
-        <div class="wrap">
-        <h2><?php esc_html_e('Refresh rewrite rules','bluem'); ?></h2>
-        <p><?php esc_html_e('Zijn er problemen met het tonen/leveren van pagina\'s van de plug-in in je site? Klik dan hieronder om de Bluem pagina opnieuw te registreren. Dit zorgt er doorgaans voor dat de website de modernere vorm van pagina\'s kan tonen. ' ,'bluem'); ?></p>
 
-            <form method="post" action="">
-                <?php wp_nonce_field('flush_rewrite_rules_nonce', 'flush_rewrite_rules_nonce'); ?>
-                <input type="submit" name="flush_rewrite_rules" class="button button-primary" value="<?php esc_html_e('Refresh rewrite rules','bluem'); ?>">
-            </form>
-        </div>
-        <?php
-
-    if (isset($_POST['flush_rewrite_rules']) && check_admin_referer('flush_rewrite_rules_nonce', 'flush_rewrite_rules_nonce')) {
-        flush_rewrite_rules();
-        echo '<div class="updated"><p>
-'. esc_html("Refreshed rewrite rules successfully","bluem").'
-        </p></div>';
-    } ?>
     </div>
 
     <?php bluem_render_footer(); ?>