Merge branch 'release/v1.2.17'

CHANGELOG.md

@@ -2,6 +2,69 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.17] - 2022-05-19
+
+### Documentation
+
+- :memo: removed console.log statement
+
+## [1.2.16] - 2022-05-16
+
+### Build
+
+- Bookmark: merge to master
+- :construction_worker: bumped version
+- :construction_worker: disabled sslverify in dev env for layout call
+
+## [1.2.15] - 2022-05-16
+
+### Build
+
+- Bookmark: merge to master
+- :construction_worker: bumped version numbers
+- :construction_worker: changed git cliff tag name to fit the actual tag
+
+## [1.2.14] - 2022-05-16
+
+### Build
+
+- Bookmark: merge to master
+- :construction_worker: bumped version number everywhere
+
+## [1.2.13] - 2022-05-16
+
+### Build
+
+- Bookmark: merge to master
+- :construction_worker: bumped correct version number in ikotravel.php
+
+## [1.2.12] - 2022-05-16
+
+### Styling
+
+- :lipstick: added square brand icon
+
+### Build
+
+- Bookmark: merge to master
+
+## [1.2.11] - 2022-05-16
+
+### Bug Fixes
+
+- :bug: fixed local development
+
+### Build
+
+- Bookmark: merge to master
+
+## [1.2.10] - 2022-05-16
+
+### Build
+
+- Bookmark: merge to master
+- :construction_worker: bumped version number correctly
+
 ## [1.2.16] - 2022-05-16
 
 ### Bug Fixes

README.txt

@@ -3,8 +3,8 @@ Contributors: MB-Jan, ikotravel
 Tags: travel, iko, booking
 Requires at least: 4.7
 Tested up to: 6.0
-Stable tag: 1.2.16
-Version: 1.2.16
+Stable tag: 1.2.17
+Version: 1.2.17
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -49,6 +49,9 @@ If you notice any issues, please contact us.
 
 == Changelog ==
 
+= 1.2.17 =
+* Includes multiple fixes + notice if permalinks have not been set in WordPress.
+
 = 1.2.16 =
 * Disabled sslverify in development environment.
 

ikoTravel.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: iko.travel Affiliate
  * Description: This plugin integrates your iko.travel affiliate account with WordPress. It integrates with Gutenberg, Elementor, Avada, WPBakery and as shortcodes.
- * Version:     1.2.16
+ * Version:     1.2.17
  * Author:      iko.travel
  * Author URI:  https://iko.travel/
  * License:     GPL-3.0
@@ -31,7 +31,7 @@ function __construct() {
         $this->clientIdKey = 'ikoTravelClientId';
         $this->clientSecretKey = 'ikoTravelSecret';
         $this->environment = 'ikoEnvironment';
-        $this->environmentVal = get_option($this->environment, false);
+        $this->environmentVal = get_option($this->environment, 'production');
         $this->pluginURL = trailingslashit( plugin_dir_url( __FILE__ ) );
         $this->settingsURL = admin_url( '/customize.php?autofocus[section]='.$this->section);
         add_action( 'customize_register', array( $this,'addSettings' ) ); // adding plugin settings to WP Customizer
@@ -102,6 +102,18 @@ function adminNotice() {
                 '.</p>
                 </div>';
             }
+        } else if (is_admin() && empty(get_option('permalink_structure'))) {
+            echo '<div class="notice notice-info">
+            <img src="'.$this->pluginURL.'img/logo.png" alt="'.esc_html__('iko.travel logo',$this->namespace).'" width="100" style="margin-top: 10px;"><p><b>'.
+            esc_html__('Attention!', $this->namespace).
+            '</b> '.
+            esc_html__('the iko.travel plugin requires permalinks. Please disable plain permalinks',$this->namespace).
+            ' <a href="'.admin_url('options-permalink.php').'" title="'.esc_html__('Edit Permalinks',$this->namespace).'">'.
+            esc_html__('here',$this->namespace).
+            '</a> '.
+            esc_html__('and start using the plugin.',$this->namespace).
+            '.</p>
+            </div>';
         }
     }
     function addSettings( $wp_customize ) {
@@ -240,6 +252,7 @@ function ikoRenderSilentRefresh( $atts ){
 add_action( 'parse_query', 'ikoRenderSilentRefresh' );
 
 register_activation_hook( __FILE__, 'ikoActivationRewrite' );
+add_action( 'init' , 'ikoAddRewriteRules', 10, 2 );
 
 function ikoActivationRewrite() {
     ikoAddRewriteRules();

includes/elementHandler.php

@@ -13,7 +13,7 @@ function __construct() {
         // $this->namespace = 'iko-travel';
         $this->pluginURL = trailingslashit( plugin_dir_url( __FILE__ ) );
         $this->imgURL = trailingslashit( dirname( plugin_dir_url( __FILE__ ) ) ) . 'img/';
-        $this->environmentVal = get_option('ikoEnvironment', false);
+        $this->environmentVal = get_option('ikoEnvironment', 'production');
     }
 
     function coreFunction() {

includes/elements/ikocontent.php

@@ -65,7 +65,7 @@ function ikoTravelElement($atts) {
             $atts['layoutId'] = $atts['layoutid']; // WPB Fallback
         }
 
-        if (!empty($atts['layoutid'])) {
+        if (!empty($atts['layoutId'])) {
             $config['id'] = esc_html($atts['layoutId']);
             if (empty($atts['layout'])) {
                 $ikoContentData = $this->getIkoBearerToken();

includes/silent-refresh.html

@@ -20,7 +20,7 @@
         ? location.hash
         : '#' + location.search;
 
-      console.log('message', message);
+      // console.log('message', message);
 
       if (window.parent && window.parent !== window) {
           // if loaded as an iframe during silent refresh