Changeset 3198074

Timestamp:

11/27/2024 11:01:14 AM (15 months ago)

Author:

dillerapp

Message:

Fixes issue with inline scripts rendering between block-based and standard themes.

Location:

diller-loyalty/trunk

Files:

• README.txt (modified) (2 diffs)
• assets/css/diller-loyalty-bundle-public.css (modified) (2 diffs)
• diller-loyalty.php (modified) (4 diffs)
• includes/class-diller-loyalty-woocommerce.php (modified) (1 diff)
• includes/class-diller-loyalty.php (modified) (2 diffs)
• includes/forms/class-diller-enrollment-form.php (modified) (1 diff)
• includes/forms/class-diller-form.php (modified) (1 diff)
• includes/forms/class-diller-wc-enrollment-form.php (modified) (1 diff)
• includes/shortcodes/class-diller-enrollment-form-shortcode.php (modified) (1 diff)
• includes/shortcodes/class-diller-refer-friend-shortcode.php (modified) (1 diff)
• public/class-diller-loyalty-public.php (modified) (1 diff)

diller-loyalty/trunk/README.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Tested up to: 6.6.0
-Version: 2.4.5
-Stable tag: 2.4.5
+Version: 2.4.6
+Stable tag: 2.4.6
 Requires PHP: 7.3
 WC requires at least: 3.8.0
@@ -63 +63 @@
 
 == Changelog ==
+= 2.4.6 =
+* Resolves issue with inline scripts rendering between block-based and standard themes.
+
 = 2.4.5 =
 * Resolve incorrect WP_User/Diller Member association on order completion via REST API, when called by an external automation process.

diller-loyalty/trunk/assets/css/diller-loyalty-bundle-public.css

@@ -660 +660 @@
 /* FORMS */
 /*============================================================================================*/
+.diller-form input[type=tel] {
+  width: calc(100% - 10px - 10px);
+}
+.diller-form .iti > input[type=tel] {
+  width: 100%;
+}
 .diller-form input[type=text],
 .diller-form input[type=email],
@@ -666 +672 @@
 .diller-form input[type=number],
 .diller-form input[type=tel],
-.diller-form input[type=date],
-.diller-form input[type=month],
-.diller-form input[type=week],
-.diller-form input[type=time],
-.diller-form input[type=datetime],
-.diller-form input[type=datetime-local],
-.diller-form input[type=color],
-.diller-form textarea {
-  width: 100%;
-}
-.diller-form input[type=text],
-.diller-form input[type=email],
-.diller-form input[type=url],
-.diller-form input[type=password],
-.diller-form input[type=number],
 .diller-form select {
   padding: 10px;

diller-loyalty/trunk/diller-loyalty.php

@@ -6 +6 @@
  * Plugin URI:           https://diller.no/
  * Description:          Diller is a loyalty platform for businesses that is easy, affordable and profitable and integrates seamlessly with your WooCommerce shop.
- * Version:              2.4.5
+ * Version:              2.4.6
  * Author:               Diller AS
  * Author URI:           https://diller.no/kontakt/
@@ -13 +13 @@
  * Text Domain:          diller-loyalty
  * Domain Path:          /languages
- * Stable tag:           2.4.5
+ * Stable tag:           2.4.6
  * Requires at least:    4.7
  * Tested up to:         6.6.2
@@ -31 +31 @@
 // Start at version 2.0.0 and use SemVer - https://semver.org
 if ( ! defined( 'DILLER_LOYALTY_VERSION' ) ) {
-    define('DILLER_LOYALTY_VERSION', '2.4.5');
+    define('DILLER_LOYALTY_VERSION', '2.4.6');
 }
 
@@ -86 +86 @@
 }
 
+if ( ! defined( 'DILLER_LOYALTY_JS_BUNDLE_PUBLIC_HANDLE' ) ) {
+    define( 'DILLER_LOYALTY_JS_BUNDLE_PUBLIC_HANDLE', 'diller-loyalty-public-bundle');
+}
+
+if ( ! defined( 'DILLER_LOYALTY_INLINE_SCRIPTS_HANDLE' ) ) {
+    define( 'DILLER_LOYALTY_INLINE_SCRIPTS_HANDLE', 'diller-loyalty-inline-scripts');
+}
 
 // Load plugin Activation/Deactivation code only for admin

diller-loyalty/trunk/includes/class-diller-loyalty-woocommerce.php

@@ -751 +751 @@
         $js_params->form->validationRulesTexts->phonenumber = esc_html__("You must enter a valid mobile number", "diller-loyalty");
 
-        wp_add_inline_script(DILLER_LOYALTY_JS_VENDORS_BUNDLE_HANDLE, "window.Diller_Loyalty = Object.assign({}, window.Diller_Loyalty, " . json_encode($js_params) .");", 'before' );
+
+        // For classic themes (e.g. Twenty Twenty-One)
+        if(!wp_is_block_theme()){
+            wp_add_inline_script(DILLER_LOYALTY_JS_VENDORS_BUNDLE_HANDLE, "window.Diller_Loyalty = Object.assign({}, window.Diller_Loyalty, " . json_encode($js_params) .");", 'before' );
+            return $fields;
+        }
+
+        // For "Full-site-editing (FSE) / Block" theme (e.g. Twenty Twenty-Two, Twenty Twenty-Four, etc)
+        wp_register_script( DILLER_LOYALTY_INLINE_SCRIPTS_HANDLE, false );
+        wp_enqueue_script( DILLER_LOYALTY_INLINE_SCRIPTS_HANDLE, false, array(DILLER_LOYALTY_JS_BUNDLE_PUBLIC_HANDLE) );
+        wp_add_inline_script(DILLER_LOYALTY_INLINE_SCRIPTS_HANDLE, "window.Diller_Loyalty = Object.assign({}, window.Diller_Loyalty, " . json_encode($js_params) .");", 'before' );
 
         return $fields;

diller-loyalty/trunk/includes/class-diller-loyalty.php

@@ -610 +610 @@
 
     /**
-     * Register all of the shortcodes related to the public-facing functionality
+     * Register all the shortcodes related to the public-facing functionality
      * of the plugin.
      *
@@ -626 +626 @@
         }
 
-        foreach ($short_code_forms as $index => $sc_form){
+        foreach ($short_code_forms as $sc_form){
             $this->loader->register_shortcode( $sc_form->short_code_name, $sc_form, 'render' );
 
-            // Enqueues scripts and styles.
-            $this->loader->add_action( 'wp_enqueue_scripts', $sc_form, 'enqueue_styles');
-            $this->loader->add_action( 'wp_enqueue_scripts', $sc_form, 'enqueue_scripts');
-        }
-    }
-
-
-    /**
-     * Register all of the hooks related to the public-facing functionality
+            // Enqueue scripts and styles based on the type of the theme
+            // Ref: https://core.trac.wordpress.org/ticket/54958#comment:9
+            if(wp_is_block_theme()){
+                // "Full-site-editing (FSE) / Block" theme (e.g. Twenty Twenty-Two, Twenty Twenty-Four, etc)
+                add_action('wp_enqueue_scripts', function() use ($sc_form){
+                    $sc_form->enqueue_scripts();
+                    $sc_form->enqueue_styles();
+                });
+            }
+            else{
+                // Enqueues scripts and styles for Classic themes
+                $this->loader->add_action( 'wp_enqueue_scripts', $sc_form, 'enqueue_styles');
+                $this->loader->add_action( 'wp_enqueue_scripts', $sc_form, 'enqueue_scripts');
+            }
+        }
+    }
+
+
+    /**
+     * Register all the hooks related to the public-facing functionality
      * of the plugin.
      *

diller-loyalty/trunk/includes/forms/class-diller-enrollment-form.php

@@ -525 +525 @@
     }
 
-
-    // Implements the abstract function from the trait, by calling
-    public function get_inline_javascript_params() {
-        return parent::get_inline_javascript_params();
-    }
-
     /**
      * Checks for values passed in via query string that match 1 or more segments

diller-loyalty/trunk/includes/forms/class-diller-form.php

@@ -135 +135 @@
 
         if(sizeof($this->inline_scripts) > 0){
-            // Handle arg. defines where will the inline scripts be placed
-            //wp_register_script( 'diller-loyalty-scripts', false );
-            //wp_enqueue_script( 'diller-loyalty-scripts' );
-            wp_add_inline_script(DILLER_LOYALTY_JS_VENDORS_BUNDLE_HANDLE, join(PHP_EOL, $this->inline_scripts), 'before' );
+
+            // For classic themes (e.g. Twenty Twenty-One)
+            if(!wp_is_block_theme()){
+                wp_add_inline_script(DILLER_LOYALTY_JS_BUNDLE_PUBLIC_HANDLE, join(PHP_EOL, $this->inline_scripts), 'before' );
+                return;
+            }
+
+            // For "Full-site-editing (FSE) / Block" theme (e.g. Twenty Twenty-Two, Twenty Twenty-Four, etc)
+            wp_register_script( DILLER_LOYALTY_INLINE_SCRIPTS_HANDLE, false );
+            wp_enqueue_script( DILLER_LOYALTY_INLINE_SCRIPTS_HANDLE, false, array(DILLER_LOYALTY_JS_BUNDLE_PUBLIC_HANDLE) );
+            wp_add_inline_script(DILLER_LOYALTY_INLINE_SCRIPTS_HANDLE, join(PHP_EOL, $this->inline_scripts), 'before' );
         }
     }

diller-loyalty/trunk/includes/forms/class-diller-wc-enrollment-form.php

@@ -189 +189 @@
         $this->inline_scripts[] = "window.Diller_Loyalty.modal = " . json_encode($modal_params) .";";
     }
-
-
-    // Overrides the parents function
-    public function get_inline_javascript_params() {
-        return parent::get_inline_javascript_params();
-    }
 }

diller-loyalty/trunk/includes/shortcodes/class-diller-enrollment-form-shortcode.php

@@ -36 +36 @@
 
             if ($this->form->was_submitted() && $this->form->request_validated() && $this->form->save()) {
-                DillerLoyalty()->display_notices( $this->form->get_id(), false );
-                return;
+                return DillerLoyalty()->display_notices( $this->form->get_id(), true );
             }
+
+            // Use ob_start() to Control Output Timing and preventing from printing the content too early
+            ob_start();
             $this->form->render();
+            return ob_get_clean();
 
         endif;

diller-loyalty/trunk/includes/shortcodes/class-diller-refer-friend-shortcode.php

@@ -19 +19 @@
         $this->form->build_fields();
 
-        if ($this->form->was_submitted() && $this->form->request_validated()):
-            $this->form->save()
-                ? DillerLoyalty()->display_notices($this->form->get_id(), false)
-                : $this->form->render();
-        else:
-            $this->form->render();
+        if ($this->form->was_submitted() && $this->form->request_validated() && $this->form->save()):
+            return DillerLoyalty()->display_notices($this->form->get_id(), false);
         endif;
+
+        // Use ob_start() to Control Output Timing and preventing from printing the content too early
+        ob_start();
+        $this->form->render();
+        return ob_get_clean();
     }
 

diller-loyalty/trunk/public/class-diller-loyalty-public.php

@@ -59 +59 @@
         // Enqueues all the necessary 3rd party scripts bundles into a single file. This matches all the dependency files added via npm command
         wp_enqueue_script( DILLER_LOYALTY_JS_VENDORS_BUNDLE_HANDLE, trailingslashit( DILLER_LOYALTY_URL ) . 'assets/js/vendors-bundle.js', array( 'jquery' ), DillerLoyalty()->get_version("assets"), true );
-        wp_enqueue_script( 'diller-loyalty-public-bundle', trailingslashit( DILLER_LOYALTY_URL ) . 'assets/js/diller-loyalty-public-bundle.js', array( DILLER_LOYALTY_JS_VENDORS_BUNDLE_HANDLE), DillerLoyalty()->get_version("assets"), true );
+        wp_enqueue_script( DILLER_LOYALTY_JS_BUNDLE_PUBLIC_HANDLE, trailingslashit( DILLER_LOYALTY_URL ) . 'assets/js/diller-loyalty-public-bundle.js', array( DILLER_LOYALTY_JS_VENDORS_BUNDLE_HANDLE), DillerLoyalty()->get_version("assets"), true );
     }