Merge branch 'release/1.4.3'

wink-travel · Jan 31, 2024 · b376fb4 · b376fb4
2 parents 8b3b34e + 692ce5f
commit b376fb4
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 69 deletions.
diff --git a/README.txt b/README.txt
@@ -3,8 +3,8 @@ Contributors: MB-Jan, bjornharvold
 Tags: wink2travel, travel, hotel, booking, affiliate network
 Requires at least: 4.7
 Tested up to: 6.4
-Stable tag: 1.4.2
-Version: 1.4.2
+Stable tag: 1.4.3
+Version: 1.4.3
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

diff --git a/includes/elements/.DS_Store b/includes/elements/.DS_Store
diff --git a/includes/elements/avada/fusionElements.php b/includes/elements/avada/fusionElements.php
@@ -27,7 +27,7 @@ function initElements() {
                     "name" => $shortcodeData['name'],
                     "shortcode" => $shortcodeData['code'],
                     "class" => "",
-                    "category" => esc_html__( "Content", "wink"),
+                    "category" => esc_html__( "Content", "wink2travel"),
                     "icon" => 'fusion-module-icon fusiona-widget',
                     "params" => $params
                 ));

diff --git a/includes/elements/elementor/elementorControls.php b/includes/elements/elementor/elementorControls.php
@@ -9,10 +9,10 @@ public function get_type() {
 	public function content_template() {
 		?>
 		<div class="elementor-control-field">
-			<div class="elementor-control-input-wrapper"><b><?php esc_html_e( "This component does not require any configuration.", "wink" ); ?></b></div>
+			<div class="elementor-control-input-wrapper"><b><?php esc_html_e( "This component does not require any configuration.", "wink2travel" ); ?></b></div>
 		</div>
 		<div class="elementor-control-field">
-			<div class="elementor-control-input-wrapper"><?php esc_html_e( "Simply ensure that you have entered the correct Client-ID and Client-Secret ", "wink" ) . ' <a href="'.admin_url( '/customize.php?autofocus[section]=wink').'" title="'.esc_html__('WINK settings',"wink").'" target="_blank">'.esc_html(__('here',"wink")).'</a>'; ?> </div>
+			<div class="elementor-control-input-wrapper"><?php esc_html_e( "Simply ensure that you have entered the correct Client-ID and Client-Secret ", "wink2travel" ) . ' <a href="'.admin_url( '/customize.php?autofocus[section]=wink').'" title="'.esc_html__('WINK settings',"wink2travel").'" target="_blank">'.esc_html(__('here',"wink2travel")).'</a>'; ?> </div>
 		</div>
 		<?php
 	}

diff --git a/includes/elements/elementor/winkaccount.php b/includes/elements/elementor/winkaccount.php
@@ -6,7 +6,7 @@ public function get_name() {
 		return 'winkaccount';
 	}
 	public function get_title() {
-		return esc_html__( 'wink Account', "wink" );
+		return esc_html__( 'Wink Account', "wink2travel" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -19,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', "wink" )
+				'label' => esc_html__( 'Wink Options', "wink2travel" )
 			]
 		);
 

diff --git a/includes/elements/elementor/winkcontent.php b/includes/elements/elementor/winkcontent.php
@@ -6,7 +6,7 @@ public function get_name() {
 		return 'winkcontent';
 	}
 	public function get_title() {
-		return __( 'wink Content', "wink" );
+		return __( 'Wink Content', "wink2travel" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -19,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', "wink" )
+				'label' => esc_html__( 'Wink Options', "wink2travel" )
 			]
 		);
 		$shortcodes = array();
@@ -37,7 +37,7 @@ protected function _register_controls() {
 					'type' => \Elementor\Controls_Manager::SELECT,
 					'placeholder' => '',
 					'options' => $options,
-					'description' => esc_html__('Select any of your saved inventories. We strongly recommend to use this block only in full-width content areas and not in columns.', "wink" ),
+					'description' => esc_html__('Select any of your saved inventories. We strongly recommend to use this block only in full-width content areas and not in columns.', "wink2travel" ),
 				]
 			);
 		}

diff --git a/includes/elements/elementor/winkitinerary.php b/includes/elements/elementor/winkitinerary.php
@@ -6,7 +6,7 @@ public function get_name() {
 		return 'winkitinerary';
 	}
 	public function get_title() {
-		return esc_html__( 'wink Itinerary Button', "wink" );
+		return esc_html__( 'Wink Itinerary Button', "wink2travel" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -19,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', "wink" )
+				'label' => esc_html__( 'Wink Options', "wink2travel" )
 			]
 		);
 

diff --git a/includes/elements/elementor/winkitineraryform.php b/includes/elements/elementor/winkitineraryform.php
@@ -6,7 +6,7 @@ public function get_name() {
 		return 'winkitineraryform';
 	}
 	public function get_title() {
-		return esc_html__( 'wink Itinerary Form', "wink" );
+		return esc_html__( 'Wink Itinerary Form', "wink2travel" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -19,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', "wink" )
+				'label' => esc_html__( 'Wink Options', "wink2travel" )
 			]
 		);
 

diff --git a/includes/elements/elementor/winklookup.php b/includes/elements/elementor/winklookup.php
@@ -6,7 +6,7 @@ public function get_name() {
 		return 'winklookup';
 	}
 	public function get_title() {
-		return esc_html__( 'wink Lookup', "wink" );
+		return esc_html__( 'Wink Lookup', "wink2travel" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -19,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', "wink" )
+				'label' => esc_html__( 'Wink Options', "wink2travel" )
 			]
 		);
 

diff --git a/includes/elements/elementor/winksearch.php b/includes/elements/elementor/winksearch.php
@@ -6,7 +6,7 @@ public function get_name() {
 		return 'winksearch';
 	}
 	public function get_title() {
-		return esc_html__( 'wink Search', "wink" );
+		return esc_html__( 'Wink Search', "wink2travel" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -19,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', "wink" )
+				'label' => esc_html__( 'Wink Options', "wink2travel" )
 			]
 		);
 

diff --git a/includes/elements/winkaccount.php b/includes/elements/winkaccount.php
@@ -5,7 +5,7 @@ class winkAccount extends winkElements {
     function __construct() {
         parent::__construct();
         $this->blockCode = 'winkaccount';
-        $this->blockName = esc_html__( "wink Account", "wink" );
+        $this->blockName = esc_html__( "Wink Account", "wink2travel" );
         add_action('init', array( $this,'gutenbergBlockRegistration' ) ); // Adding Gutenberg Block
         add_shortcode( $this->blockCode, array( $this,'blockHandler') );
         add_filter('winkShortcodes',array( $this, 'shortcodeData') );
@@ -61,7 +61,7 @@ function gutenbergBlockRegistration() {
         );
 
         $jsData = array(
-            'blockCat'  => "wink".'-blocks',
+            'blockCat'  => "wink2travel".'-blocks',
             'imgURL'    => $this->imgURL,
             'mode'      => $this->environmentVal
         );
@@ -72,7 +72,7 @@ function gutenbergBlockRegistration() {
             'editor_script' => 'winkBlockRenderer_'.$this->blockCode,
             'render_callback' => array($this,'blockHandler'),
             'attributes' => [],
-            'category' => "wink".'-blocks'
+            'category' => "wink2travel".'-blocks'
         ));
     }
 }

diff --git a/includes/elements/winkcontent.php b/includes/elements/winkcontent.php
@@ -5,7 +5,7 @@ class winkContent extends winkElements {
     function __construct() {
         parent::__construct();
         $this->blockCode = 'winkcontent';
-        $this->blockName = esc_html__( "wink Content", "wink" );
+        $this->blockName = esc_html__( "wink Content", "wink2travel" );
         $this->attributes = [
             'layout' => [
                 'default' => '',
@@ -27,7 +27,7 @@ function __construct() {
     function shortcodeData($shortcodes) {
         $winkContentData = $this->getwinkBearerToken();
         $values = array(
-            esc_html__( 'Select...',  "wink"  ) => ''
+            esc_html__( 'Select...',  "wink2travel"  ) => ''
 
         );
         foreach($winkContentData as $key => $localValue) {
@@ -41,10 +41,10 @@ function shortcodeData($shortcodes) {
                     "type" => "dropdown",
                     "holder" => "div",
                     "class" => "",
-                    "heading" => __( "Inventory", "wink" ),
+                    "heading" => __( "Inventory", "wink2travel" ),
                     "param_name" => "layoutid",
                     'value' => $values,
-                    "description" => __('Select any of your saved layouts. We strongly recommend to use this block only in full-width content areas and not in columns.', "wink" )
+                    "description" => __('Select any of your saved layouts. We strongly recommend to use this block only in full-width content areas and not in columns.', "wink2travel" )
                 ),
             )
         );
@@ -96,10 +96,9 @@ function winkElement($atts) {
                 $config['layout'] = "HOTEL";
             }
         }
-        $jsonConfig = json_encode($config);
         ob_start();
         ?>
-        <wink-content-loader config='<?php echo trim($jsonConfig); ?>'></wink-content-loader>
+        <wink-content-loader config='<?php echo trim(json_encode($config)); ?>'></wink-content-loader>
         <?php
         $content = ob_get_contents();
         ob_end_clean();
@@ -267,7 +266,7 @@ function gutenbergBlockRegistration()
         );
 
         $jsData = array(
-            'blockCat' => "wink" . '-blocks',
+            'blockCat' => "wink2travel" . '-blocks',
             'imgURL' => $this->imgURL,
             'mode' => $this->environmentVal
         );
@@ -282,7 +281,7 @@ function gutenbergBlockRegistration()
             'editor_script' => 'winkBlockRenderer_' . $this->blockCode,
             'render_callback' => array($this, 'blockHandler'),
             'attributes' => $this->attributes,
-            'category' => "wink" . '-blocks'
+            'category' => "wink2travel" . '-blocks'
         ));
     }
 }

diff --git a/includes/elements/winkitinerary.php b/includes/elements/winkitinerary.php
@@ -5,7 +5,7 @@ class winkItinerary extends winkElements {
     function __construct() {
         parent::__construct();
         $this->blockCode = 'winkitinerary';
-        $this->blockName = esc_html__( "wink Itinerary Button", "wink" );
+        $this->blockName = esc_html__( "wink Itinerary Button", "wink2travel" );
         add_action('init', array( $this,'gutenbergBlockRegistration' ) ); // Adding Gutenberg Block
         add_shortcode( $this->blockCode, array( $this,'blockHandler') );
         add_filter('winkShortcodes',array( $this, 'shortcodeData') );
@@ -61,7 +61,7 @@ function gutenbergBlockRegistration() {
         );
 
         $jsData = array(
-            'blockCat'  => "wink".'-blocks',
+            'blockCat'  => "wink2travel".'-blocks',
             'imgURL'    => $this->imgURL,
             'mode'      => $this->environmentVal
         );
@@ -77,7 +77,7 @@ function gutenbergBlockRegistration() {
                 //     'type' => 'string'
                 // ]
             ],
-            'category' => "wink".'-blocks'
+            'category' => "wink2travel".'-blocks'
         ));
     }
 }

diff --git a/includes/elements/winkitineraryform.php b/includes/elements/winkitineraryform.php
@@ -5,7 +5,7 @@ class winkItineraryForm extends winkElements {
     function __construct() {
         parent::__construct();
         $this->blockCode = 'winkitineraryform';
-        $this->blockName = esc_html__( "wink Itinerary Form", "wink" );
+        $this->blockName = esc_html__( "wink Itinerary Form", "wink2travel" );
         add_action('init', array( $this,'gutenbergBlockRegistration' ) ); // Adding Gutenberg Block
         add_shortcode( $this->blockCode, array( $this,'blockHandler') );
         add_filter('winkShortcodes',array( $this, 'shortcodeData') );
@@ -61,7 +61,7 @@ function gutenbergBlockRegistration() {
         );
 
         $jsData = array(
-            'blockCat'  => "wink".'-blocks',
+            'blockCat'  => "wink2travel".'-blocks',
             'imgURL'    => $this->imgURL,
             'mode'      => $this->environmentVal
         );
@@ -77,7 +77,7 @@ function gutenbergBlockRegistration() {
                 //     'type' => 'string'
                 // ]
             ],
-            'category' => "wink".'-blocks'
+            'category' => "wink2travel".'-blocks'
         ));
     }
 }

diff --git a/includes/elements/winklookup.php b/includes/elements/winklookup.php
@@ -5,7 +5,7 @@ class winkLookup extends winkElements {
     function __construct() {
         parent::__construct();
         $this->blockCode = 'winklookup';
-        $this->blockName = esc_html__( "wink Lookup", "wink" );
+        $this->blockName = esc_html__( "Wink Lookup", "wink2travel" );
         add_action('init', array( $this,'gutenbergBlockRegistration' ) ); // Adding Gutenberg Block
         add_shortcode( $this->blockCode, array( $this,'blockHandler') );
         add_filter('winkShortcodes',array( $this, 'shortcodeData') );
@@ -61,7 +61,7 @@ function gutenbergBlockRegistration() {
         );
 
         $jsData = array(
-            'blockCat'  => "wink".'-blocks',
+            'blockCat'  => "wink2travel".'-blocks',
             'imgURL'    => $this->imgURL,
             'mode'      => $this->environmentVal
         );
@@ -77,7 +77,7 @@ function gutenbergBlockRegistration() {
                 //     'type' => 'string'
                 // ]
             ],
-            'category' => "wink".'-blocks'
+            'category' => "wink2travel".'-blocks'
         ));
     }
 }

diff --git a/includes/elements/winksearch.php b/includes/elements/winksearch.php
@@ -5,7 +5,7 @@ class winkSearch extends winkElements {
     function __construct() {
         parent::__construct();
         $this->blockCode = 'winksearch';
-        $this->blockName = esc_html__( "wink Search", "wink" );
+        $this->blockName = esc_html__( "Wink Search", "wink2travel" );
         add_action('init', array( $this,'gutenbergBlockRegistration' ) ); // Adding Gutenberg Block
         add_shortcode( $this->blockCode, array( $this,'blockHandler') );
         add_filter('winkShortcodes',array( $this, 'shortcodeData') );
@@ -62,7 +62,7 @@ function gutenbergBlockRegistration() {
 
 
         $jsData = array(
-            'blockCat'  => "wink".'-blocks',
+            'blockCat'  => "wink2travel".'-blocks',
             'imgURL'    => $this->imgURL,
             'mode'      => $this->environmentVal
         );
@@ -80,7 +80,7 @@ function gutenbergBlockRegistration() {
                 //     'type' => 'string'
                 // ]
             ],
-            'category' => "wink".'-blocks'
+            'category' => "wink2travel".'-blocks'
         ));
     }
 }

diff --git a/includes/elements/wpbakery/vcElements.php b/includes/elements/wpbakery/vcElements.php
@@ -33,17 +33,17 @@ function initElements() {
                             "class" => "",
                             "param_name" => "placeholder",
                             "value" => 1,
-                            "heading" => esc_html__( "This component does not require any configuration.", "wink" ),
-                            "description" => esc_html__( "Simply ensure that you have entered the correct Client-ID and Client-Secret ", "wink" ) . ' <a href="'.admin_url( '/customize.php?autofocus[section]=wink').'" title="'.esc_html__('WINK settings',"wink").'" target="_blank">'.
-                            esc_html__('here',"wink").'</a> '
+                            "heading" => esc_html__( "This component does not require any configuration.", "wink2travel" ),
+                            "description" => esc_html__( "Simply ensure that you have entered the correct Client-ID and Client-Secret ", "wink2travel" ) . ' <a href="'.admin_url( '/customize.php?autofocus[section]=wink').'" title="'.esc_html__('Wink Settings',"wink2travel").'" target="_blank">'.
+                            esc_html__('here',"wink2travel").'</a> '
                         )
                     );
                 }
                 vc_map( array(
                     "name" => $shortcodeData['name'],
                     "base" => $shortcodeData['code'],
                     "class" => "",
-                    "category" => esc_html__( "Content", "wink"),
+                    "category" => esc_html__( "Content", "wink2travel"),
                     "icon" => $this->imgURL.'logo.png',
                     "params" => $params
                 ));