Changeset 2447492

Timestamp:

12/29/2020 04:30:18 PM (5 years ago)

Author:

webmarcello

Message:

Send phone number to JS through wp_localize

Location:

wp-phone-message/trunk

Files:

• includes/WpPhoneMessageModel.php (modified) (1 diff)
• includes/WpPhoneMessageShortcode.php (modified) (2 diffs)
• js/shortcode.js (modified) (2 diffs)
• js/shortcode.min.js (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• views/shortcode-form.php (modified) (1 diff)
• views/widget-form.php (modified) (1 diff)
• wp-phone-message.php (modified) (1 diff)

wp-phone-message/trunk/includes/WpPhoneMessageModel.php

@@ -61 +61 @@
         }
 
+        public function getFullPhoneNumber(){
+            return get_option( 'wp-phone-message-full-phone-number' );
+        }
     }
 }

wp-phone-message/trunk/includes/WpPhoneMessageShortcode.php

@@ -4 +4 @@
     class WpPhoneMessageShortcode {
 
+        private $pluginModel;
+
         public function __construct(){
             add_action( 'init', array( $this, 'registerShortcode' ));
             add_action( 'wp_enqueue_scripts', array( $this, 'shortcodeStyle' ) );
+
+            $this->pluginModel = new WpPhoneMessageModel;
         }
 
@@ -21 +25 @@
             wp_enqueue_style('wp-phone-message-shortcode', PLUGIN_WPM_URL . 'css/shortcode.min.css', array(), null, 'all' );
             wp_enqueue_script('wp-phone-message-shortcode', PLUGIN_WPM_URL . 'js/shortcode.min.js', array( 'jquery' ), '1.0.0', true );
+            wp_localize_script( 'wp-phone-message-shortcode', 'wp_phone_message_data',
+                array( 
+                    'fullPhoneNumber' => $this->pluginModel->getFullPhoneNumber() ,
+                )
+            );
         }
     }

wp-phone-message/trunk/js/shortcode.js

@@ -1 +1 @@
 jQuery(document).ready(function ($) {
+
+    var fullTelephone = wp_phone_message_data.fullPhoneNumber;
 
     $("#whatapp-form").submit(function (e) {
         e.preventDefault();
-        var fullTelephone = $('#wp-phone-message-full-phone-number').val();
         var message = $('#wp-phone-message-message').val();
         var name = $('#wp-phone-message-name').val();
@@ -22 +23 @@
     $("#whatapp-widget-form").submit(function (e) {
         e.preventDefault();
-        var fullTelephone = $('#wp-phone-message-widget-full-phone-number').val();
         var message = $('#wp-phone-message-widget-message').val();
         var name = $('#wp-phone-message-widget-name').val();

wp-phone-message/trunk/js/shortcode.min.js

@@ -1 @@
-jQuery(document).ready((function($){function popupwindow(url,title,w,h){var left=screen.width/2-w/2,top=screen.height/2-h/2;return window.open(url,title,"toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width="+w+", height="+h+", top="+top+", left="+left)}function whatappValidation(fullTelephone,errorTarget){return fullTelephone&&"0"!=fullTelephone?(whatappErrorMessage(" ",errorTarget),!0):(whatappErrorMessage("Telephone number is not set or not valid.",errorTarget),!1)}function whatappErrorMessage(errorMessage,errorTarget){$("#"+errorTarget).text(errorMessage)}function whatappCreateFinalMessage(name,address,phone,email,message){return final_message="",void 0!==name&&(final_message+=name+" %0a"),void 0!==address&&(final_message+=address+" %0a"),void 0!==phone&&(final_message+=phone+" %0a"),void 0!==email&&(final_message+=email+" %0a"),final_message+=message.replace(/[\r\n]/g," %0a"),final_message}$("#whatapp-form").submit((function(e){e.preventDefault();var fullTelephone=$("#wp-phone-message-full-phone-number").val(),message=$("#wp-phone-message-message").val(),name=$("#wp-phone-message-name").val(),address=$("#wp-phone-message-address").val(),phone=$("#wp-phone-message-phone").val(),email=$("#wp-phone-message-email").val(),title=$("#wp-phone-message-title").val(),whatappUrl;whatappValidation(fullTelephone,"whatapp-error")&&(final_message=whatappCreateFinalMessage(name,address,phone,email,message),popupwindow("https://wa.me/"+fullTelephone+"?text="+final_message,title,1e3,700));return!1})),$("#whatapp-widget-form").submit((function(e){e.preventDefault();var fullTelephone=$("#wp-phone-message-widget-full-phone-number").val(),message=$("#wp-phone-message-widget-message").val(),name=$("#wp-phone-message-widget-name").val(),address=$("#wp-phone-message-widget-address").val(),phone=$("#wp-phone-message-widget-phone").val(),email=$("#wp-phone-message-widget-email").val(),whatappUrl;whatappValidation(fullTelephone,"whatapp-widget-error")&&(final_message=whatappCreateFinalMessage(name,address,phone,email,message),popupwindow("https://wa.me/"+fullTelephone+"?text="+final_message,"Whatsapp Me",1e3,700));return!1}))}));
+jQuery(document).ready((function($){var fullTelephone=wp_phone_message_data.fullPhoneNumber;function popupwindow(url,title,w,h){var left=screen.width/2-w/2,top=screen.height/2-h/2;return window.open(url,title,"toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width="+w+", height="+h+", top="+top+", left="+left)}function whatappValidation(fullTelephone,errorTarget){return fullTelephone&&"0"!=fullTelephone?(whatappErrorMessage(" ",errorTarget),!0):(whatappErrorMessage("Telephone number is not set or not valid.",errorTarget),!1)}function whatappErrorMessage(errorMessage,errorTarget){$("#"+errorTarget).text(errorMessage)}function whatappCreateFinalMessage(name,address,phone,email,message){return final_message="",void 0!==name&&(final_message+=name+" %0a"),void 0!==address&&(final_message+=address+" %0a"),void 0!==phone&&(final_message+=phone+" %0a"),void 0!==email&&(final_message+=email+" %0a"),final_message+=message.replace(/[\r\n]/g," %0a"),final_message}$("#whatapp-form").submit((function(e){e.preventDefault();var message=$("#wp-phone-message-message").val(),name=$("#wp-phone-message-name").val(),address=$("#wp-phone-message-address").val(),phone=$("#wp-phone-message-phone").val(),email=$("#wp-phone-message-email").val(),title=$("#wp-phone-message-title").val(),whatappUrl;whatappValidation(fullTelephone,"whatapp-error")&&(final_message=whatappCreateFinalMessage(name,address,phone,email,message),popupwindow("https://wa.me/"+fullTelephone+"?text="+final_message,title,1e3,700));return!1})),$("#whatapp-widget-form").submit((function(e){e.preventDefault();var message=$("#wp-phone-message-widget-message").val(),name=$("#wp-phone-message-widget-name").val(),address=$("#wp-phone-message-widget-address").val(),phone=$("#wp-phone-message-widget-phone").val(),email=$("#wp-phone-message-widget-email").val(),whatappUrl;whatappValidation(fullTelephone,"whatapp-widget-error")&&(final_message=whatappCreateFinalMessage(name,address,phone,email,message),popupwindow("https://wa.me/"+fullTelephone+"?text="+final_message,"Whatsapp Me",1e3,700));return!1}))}));

wp-phone-message/trunk/readme.txt

@@ -1 +1 @@
 === WP Phone Message ===
 Contributors: webmarcello
-Tags: message, form, whatsapp, shortcode, widget
+Tags: message, form, whatsapp, shortcode, widget, phone, text
 Requires at least: 4.5.13
-Tested up to: 5.5.3
+Tested up to: 5.6
 Stable tag: trunk
 Requires PHP: 5.6
@@ -90 +90 @@
 == Changelog ==
 
+= 1.0.7 =
+* Send phone number to JS through wp_localize
+
 = 1.0.6 =
 * Cleaning phone number and international prefix

wp-phone-message/trunk/views/shortcode-form.php

@@ -20 +20 @@
 $shortcode_form .= '<textarea class="wp-phone-message-message" id="wp-phone-message-message" placeholder="' . get_option('wp-phone-message-textarea') . '" required ></textarea>';
 $shortcode_form .= '<p class="whatapp-error" id="whatapp-error" ></p>';
-$shortcode_form .= '<input hidden="text" id="wp-phone-message-full-phone-number" value="' . get_option('wp-phone-message-full-phone-number') . '" />';
 $shortcode_form .= '<input type="submit" class="wp-phone-message-button" id="wp-phone-message-button" value="' . get_option('wp-phone-message-button') . '" />';
 $shortcode_form .= '</form>';

wp-phone-message/trunk/views/widget-form.php

@@ -18 +18 @@
         <textarea class="wp-phone-message-message" id="wp-phone-message-widget-message" placeholder="<?= get_option('wp-phone-message-textarea'); ?>" required></textarea>
         <p class="whatapp-error" id="whatapp-widget-error" ></p>
-        <input hidden="text" id="wp-phone-message-widget-full-phone-number" value="<?= get_option('wp-phone-message-full-phone-number'); ?>" />
         <input type="submit" class="wp-phone-message-button" id="wp-phone-message-widget-button" value="<?= get_option('wp-phone-message-button'); ?>" />
     </form>

wp-phone-message/trunk/wp-phone-message.php

@@ -22 +22 @@
     function wp_phone_message_loader(){
         if( is_admin() ){
-            $WpPhoneMessageAdmin = new WpPhoneMessageAdmin;
+            new WpPhoneMessageAdmin;
         }
-        $WpPhoneMessageShortcode = new WpPhoneMessageShortcode;
+        new WpPhoneMessageShortcode;
     }
     add_action('plugins_loaded', 'wp_phone_message_loader');