From a480ca97c77e75c0232f8fa5c66d8c9096f4dadd Mon Sep 17 00:00:00 2001 From: Bjorn Harvold Date: Mon, 16 May 2022 15:41:48 +0700 Subject: [PATCH 1/3] docs: :memo: removed console.log statement --- includes/silent-refresh.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/silent-refresh.html b/includes/silent-refresh.html index d47bd33..47f8f1f 100644 --- a/includes/silent-refresh.html +++ b/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 From e4b1f7a96832ca5566aab1b30919cb6e32011c9e Mon Sep 17 00:00:00 2001 From: Jan Rohweder Date: Thu, 19 May 2022 09:21:08 +0700 Subject: [PATCH 2/3] Multiple fixes + New Notice --- README.txt | 7 +++++-- ikoTravel.php | 17 +++++++++++++++-- includes/.DS_Store | Bin 6148 -> 6148 bytes includes/elementHandler.php | 2 +- includes/elements/.DS_Store | Bin 6148 -> 6148 bytes includes/elements/ikocontent.php | 2 +- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/README.txt b/README.txt index 225a352..630c72e 100644 --- a/README.txt +++ b/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. diff --git a/ikoTravel.php b/ikoTravel.php index b8f80c2..dddc797 100644 --- a/ikoTravel.php +++ b/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() { '.

'; } + } else if (is_admin() && empty(get_option('permalink_structure'))) { + echo '
+ '.esc_html__('iko.travel logo',$this->namespace).'

'. + esc_html__('Attention!', $this->namespace). + ' '. + esc_html__('the iko.travel plugin requires permalinks. Please disable plain permalinks',$this->namespace). + ' '. + esc_html__('here',$this->namespace). + ' '. + esc_html__('and start using the plugin.',$this->namespace). + '.

+
'; } } 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(); diff --git a/includes/.DS_Store b/includes/.DS_Store index 2b57585b34118ec41e34fcf9f29be3352c4f3d36..bc2e4f747e04ade2c667ed24f3c8ca865ffc9309 100644 GIT binary patch delta 29 lcmZoMXffEJ$H??}^JD|YBF2Qx8yUmcCN}VGX6N|J4*;873MBvl delta 29 lcmZoMXffEJ$H?^3WwHTd5o5vTjf`Pz6C3z8vvd6A2LO}~3CsWh diff --git a/includes/elementHandler.php b/includes/elementHandler.php index 3c2ca5e..5be56b7 100644 --- a/includes/elementHandler.php +++ b/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() { diff --git a/includes/elements/.DS_Store b/includes/elements/.DS_Store index cb253bffd2f43f243c6337e9a53481414080ba84..6326c6ae389bf3a93690c9f93d192c692e89bd46 100644 GIT binary patch delta 36 scmZoMXffEJ$-=mEvKGrXrdXNDKCBXxtyteMaY|1PU=!PH$97B*0Mcg)-v9sr delta 36 scmZoMXffEJ$-=mCvKGrXrkL)@KCBXxtyteMaeST}z$UiYj_sHr0OIis8~^|S diff --git a/includes/elements/ikocontent.php b/includes/elements/ikocontent.php index 05776c6..f7ed4a0 100644 --- a/includes/elements/ikocontent.php +++ b/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(); From e6ea41f75f727788065d9ebfd4b8829f451a4c92 Mon Sep 17 00:00:00 2001 From: Bjorn Harvold Date: Thu, 19 May 2022 09:33:16 +0700 Subject: [PATCH 3/3] build: bookmark: merge to master Version bump to v1.2.17 registered Ops: crash --- CHANGELOG.md | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0944657..cdeaa91 100644 --- a/CHANGELOG.md +++ b/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