version 3.1.10 released

Author: manchumahara

README.txt

@@ -3,7 +3,7 @@ Contributors: codeboxr, manchumahara
 Tags: currency converter,currency conversion,currency exchange,currency calculator,bitcoin
 Requires at least: 5.3
 Tested up to: 6.8
-Stable tag: 3.1.9
+Stable tag: 3.1.10
 PHP:7.4.*
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -95,6 +95,9 @@ How to install the plugin and get it working.
 == Screenshots ==
 
 == Changelog ==
+= 3.1.10 =
+* [fixed] Visual Composer Widget fixed from previous two releases
+
 = 3.1.9 =
 * [fixed] Elementor widget bug fix from previous release V3.1.8
 
@@ -123,120 +126,4 @@ How to install the plugin and get it working.
 * [improvement] Security improvement
 
 = 3.1.0 =
-* [new] New shortcode introduced 'cbcurrencyconverter_rate'  for direct rate display
-
-= 3.0.9 =
-* [improvement] Calculator form layout style improved
-* [improvement] Added option to display country flag
-* [improvement] Added option to display currency symbol
-* [improvement] Helper classed got some new methods related with symbol
-* [new] Mobile app support in pro addon(To be release soon)
-* [new] exchangerate.host api now needs api key
-* [new] exchangerate.host api free(core plugin) and pro(pro addon) introduced
-
-= 3.0.8 =
-* [new] Setting field 'multiselect' is deprecated and now uses 'select' with 'multi' = 1
-* [new] exchangerate.host now needs api key, they have both free and pro
-
-= 3.0.6 =
-* [improvement] Minor improvement for plugin setting panel
-
-= 3.0.5 =
-* [fixed] Plugin activation error fixed
-* [improvement] Js and CSS enqueue names are now standard
-
-= 3.0.4 =
-* [fixed] Nonce checking security fixed
-* [improvement] Style improvement for currency converter dropdown field(make it work for dark back background)
-* [improvement] Dashboard setting improvements
-
-= 3.0.3 =
-* [improvement] Style improvement for currency converter dropdown field(make it work for dark back background)
-
-= 3.0.2 =
-* [improvement] Style improvement for currency converter dropdown field
-
-= 3.0.1 =
-* [improvement] Style improvement for currency converter input field
-
-= 3.0.0 =
-* [note] There are breaking changes in Core plugin v3.0.0 and pro addon 1.7.0. Core plugin V3.0.0 needs pro addon 1.7.0
-* [Removed] Removed support for WP eCommerce https://wordpress.org/plugins/wp-e-commerce/
-
-= 2.9.0 =
-* [note] Alphavantage no longer free for conversion
-* [new] Added some new currency api support in pro addon
-* [bug fix] Gutenberg multi select display
-* [new] Pro Addon - New REST API endpoint for currency conversion - for single currency
-* [new] Pro Addon - New REST API endpoint for currency conversion - for multi currencies
-
-= 2.8.4 =
-* [note] There is breaking changes in core version 2.8.4, if you have pro addon less than 1.6.9 then it will be automatically deactivated, please update pro addon to version 1.6.9 with core 2.8.4
-* [bug fix] Bug fixed in rates api, pro addon needed update to make that work with core. On upgrade if pro addon not 1.6.9 or latest then pro addon will be disabled
-* [bug fix] JS error fixed
-
-= 2.8.3 =
-* [improvement] Dashboard improvement & Pro addon compatibility fix
-* [new] Gutenberg blocks works in new WordPress 5.8 widget area that is block based
-
-= 2.8.2 =
-* [new] Added new currency XOF - West African CFA franc (Currency rates and support depends on rates api)
-* [new] Added  new currency XAF - Central African CFA franc (Currency rates and support depends on rates api)
-
-= 2.8.1 =
-* [new] New currency api for currencylayer.com(https://currencylayer.com) if base only USD - free subscription
-* [new] Pro Addon - New currency api for currencylayer.com(https://currencylayer.com) - pro account holder of https://currencylayer.com with at least "Basic Plan"
-
-
-= 2.8.0 =
-* [new] Easy way to add new api using new hooks(filter) 'cbcurrencyconverter_rates_apis', see documentation
-* [new] New currency api for openexchangerates(https://openexchangerates.org/) if base only USD
-* [new] Pro Addon - New currency api for Openexchangerates(https://openexchangerates.org/) - pro account holder of https://openexchangerates.org/ with at least "The Unlimited Plan"
-* [new] Pro Addon - New currency api for Exchangeratesapi(Exchangeratesapi.io) - pro account holder of https://Exchangeratesapi.io/ with at least "Basic Plan"
-
-= 2.7.12 =
-* [improvement] Dashboard improved
-* [new] CSS is now generated as scss files
-
-= 2.7.11 =
-* [new] Added Bahrain Dinar(BHD) as new currency
-* [improvement] Some minor adjustments and improvements
-
-= 2.7.10 =
-* [new] All Currency names are now translatable
-
-= 2.7.9 =
-* [new] New Currency (Kenya Shilling) Added
-
-= 2.7.8 =
-* [bug fix] Uninstall plugin(delete) now deletes properly the options created by this plugin
-* [new] Uninstall plugin(delete) now deletes currency rate caches
-
-= 2.7.7 =
-* [new] Backend Setting on click shortcode copy and Demo
-* [new] Admin notice for full reset
-* [new] Admin notice for rate api cache reset
-
-= 2.7.6 =
-* [new] WPBakery Widget
-
-= 2.7.5 =
-* [bug fix] Style fix for widget page, last release was messing with widgets page style and header style which is now restricted
-
-= 2.7.3 =
-
-* [bug fix] Elementor widget loading conflict issue fixed
-
-= 2.7.2 =
-
-* [improvement] Replaced chosen select js library with select2 js library
-* [new] Template system for layout for list, calculator and inline
-* [new] Elementor widget
-* Overall improvement
-
-= 2.7.1 =
-
-* [new] Changed version format to x.y.z
-* [new] Added Rate api caching enable/disable
-* [new] Added Rate api caching time, default 2
-* [improvement] Minor overall improvement, pro addon updated as well
+* [new] New shortcode introduced 'cbcurrencyconverter_rate'  for direct rate display

cbcurrencyconverter.php

@@ -8,7 +8,7 @@
  * Plugin Name:       CBX Currency Converter
  * Plugin URI:        https://codeboxr.com/product/cbx-currency-converter-for-wordpress/
  * Description:       Currency Converter and rate display
- * Version:           3.1.9
+ * Version:           3.1.10
  * Author:            codeboxr
  * Author URI:        https://codeboxr.com
  * License:           GPL-2.0+
@@ -24,7 +24,7 @@
 }
 
 defined( 'CBCURRENCYCONVERTER_NAME' ) or define( 'CBCURRENCYCONVERTER_NAME', 'cbcurrencyconverter' );
-defined( 'CBCURRENCYCONVERTER_VERSION' ) or define( 'CBCURRENCYCONVERTER_VERSION', '3.1.9' );
+defined( 'CBCURRENCYCONVERTER_VERSION' ) or define( 'CBCURRENCYCONVERTER_VERSION', '3.1.10' );
 defined( 'CBCURRENCYCONVERTER_ROOT_PATH' ) or define( 'CBCURRENCYCONVERTER_ROOT_PATH', plugin_dir_path( __FILE__ ) );
 defined( 'CBCURRENCYCONVERTER_ROOT_URL' ) or define( 'CBCURRENCYCONVERTER_ROOT_URL', plugin_dir_url( __FILE__ ) );
 defined( 'CBCURRENCYCONVERTER_BASE_NAME' ) or define( 'CBCURRENCYCONVERTER_BASE_NAME', plugin_basename( __FILE__ ) );

includes/CBCurrencyConverterAdmin.php

@@ -81,7 +81,7 @@ public function __construct( $plugin_name, $version ) {
 	 * @since    1.0.0
 	 */
 	public function enqueue_styles( $hook ) {
-		$version = $this->version;
+		$ver = $this->version;
 		$page    = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
 		$css_url_part     = CBCURRENCYCONVERTER_ROOT_URL . 'assets/css/';
@@ -95,23 +95,23 @@ public function enqueue_styles( $hook ) {
 
 		if ( $page == 'cbcurrencyconverter' ) {
 
-			wp_register_style( 'awesome-notifications', $vendors_url_part . 'awesome-notifications/style.css', [], $version );
-			wp_register_style( 'select2', $vendors_url_part . 'select2/css/select2.min.css', [], $version );
-			wp_register_style( 'pickr', $vendors_url_part . 'pickr/themes/classic.min.css', [], $version );
+			wp_register_style( 'awesome-notifications', $vendors_url_part . 'awesome-notifications/style.css', [], $ver );
+			wp_register_style( 'select2', $vendors_url_part . 'select2/css/select2.min.css', [], $ver );
+			wp_register_style( 'pickr', $vendors_url_part . 'pickr/themes/classic.min.css', [], $ver );
 
 
 			wp_enqueue_style( 'pickr' );
 
-			wp_register_style( 'cbcurrencyconverter-public', $css_url_part . 'cbcurrencyconverter-public.css', [ 'select2' ], $version, 'all' );
-			wp_register_style( 'cbcurrencyconverter-admin', $css_url_part . 'cbcurrencyconverter-admin.css', [], $version );
+			wp_register_style( 'cbcurrencyconverter-public', $css_url_part . 'cbcurrencyconverter-public.css', [ 'select2' ], $ver, 'all' );
+			wp_register_style( 'cbcurrencyconverter-admin', $css_url_part . 'cbcurrencyconverter-admin.css', [], $ver );
 
 			wp_register_style( 'cbcurrencyconverter-setting', $css_url_part . 'cbcurrencyconverter-setting.css', [
 				'pickr',
 				'select2',
 				'awesome-notifications',
 				'cbcurrencyconverter-public',
 				'cbcurrencyconverter-admin'
-			], $version );
+			], $ver );
 
 
 			wp_enqueue_style( 'select2' );
@@ -125,11 +125,11 @@ public function enqueue_styles( $hook ) {
 
 		//widgets pages
 		if ( $hook == 'widgets.php' ) {
-			wp_register_style( 'select2', $vendors_url_part . 'select2/css/select2.min.css', [], $version );
+			wp_register_style( 'select2', $vendors_url_part . 'select2/css/select2.min.css', [], $ver );
 
 			wp_register_style( 'cbcurrencyconverter-widget', $css_url_part . 'cbcurrencyconverter-widget.css', [
 				'select2'
-			], $version );
+			], $ver );
 
 			wp_enqueue_style( 'select2' );
 			wp_enqueue_style( 'cbcurrencyconverter-widget' );
@@ -142,7 +142,7 @@ public function enqueue_styles( $hook ) {
 	 * @since    1.0.0
 	 */
 	public function enqueue_scripts( $hook ) {
-		$version = $this->version;
+		$ver = $this->version;
 		$page    = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
 
@@ -159,15 +159,15 @@ public function enqueue_scripts( $hook ) {
 
 		//main setting page
 		if ( $page == 'cbcurrencyconverter' ) {
-			wp_register_script( 'awesome-notifications', $vendors_url_part . 'awesome-notifications/script.js', [], $version, true );
-			wp_register_script( 'select2', $vendors_url_part . 'select2/js/select2.full.min.js', [ 'jquery' ], $version, true );
-			wp_register_script( 'pickr', $vendors_url_part . 'pickr/pickr.min.js', [], $version, true );
+			wp_register_script( 'awesome-notifications', $vendors_url_part . 'awesome-notifications/script.js', [], $ver, true );
+			wp_register_script( 'select2', $vendors_url_part . 'select2/js/select2.full.min.js', [ 'jquery' ], $ver, true );
+			wp_register_script( 'pickr', $vendors_url_part . 'pickr/pickr.min.js', [], $ver, true );
 
 			wp_register_script( 'cbcurrencyconverter-public', $js_url_part . 'cbcurrencyconverter-public.js', [
 				'jquery',
 				'select2',
 				'awesome-notifications'
-			], $version, true );
+			], $ver, true );
 
 
 			$ajax_nonce = wp_create_nonce( 'cbcurrencyconverter_nonce' );
@@ -194,7 +194,7 @@ public function enqueue_scripts( $hook ) {
 					'pickr',
 					'select2',
 					'jquery',
-				], $version, true );
+				], $ver, true );
 
 			// Localize the script with new data
 			$translation_array = [
@@ -264,12 +264,12 @@ public function enqueue_scripts( $hook ) {
 		}
 
 		if ( $hook == 'widgets.php' ) {
-			wp_register_script( 'select2', $vendors_url_part . 'select2/js/select2.full.min.js', [ 'jquery' ], $version, true );
+			wp_register_script( 'select2', $vendors_url_part . 'select2/js/select2.full.min.js', [ 'jquery' ], $ver, true );
 
 			wp_register_script( 'cbcurrencyconverter-widget', $js_url_part . 'cbcurrencyconverter-widget.js', [
 				'jquery',
 				'select2'
-			], $version, true );
+			], $ver, true );
 			$translation_array = [
 				'please_select'  => esc_html__( 'Please Select', 'cbcurrencyconverter' ),
 				'upload_btn'     => esc_html__( 'Upload', 'cbcurrencyconverter' ),
@@ -391,7 +391,7 @@ public function plugin_row_meta( $links_array, $plugin_file_name, $plugin_data,
 				$links_array['pro'] = '<a style="color: #fb4e24; font-weight: bold;" href="https://codeboxr.com/product/cbx-currency-converter-for-wordpress/" target="_blank">' . esc_html__( 'Try Pro Addon', 'cbcurrencyconverter' ) . '</a>';
 			}
 
-			$links_array['documentation'] = '<a style="color: #fb4e24; font-weight: bold;" href="https://codeboxr.com/docs/documentation-for-cbx-currency-converter-for-wordpress/" target="_blank">' . esc_html__( 'Documentation', 'cbcurrencyconverter' ) . '</a>';
+			$links_array['documentation'] = '<a style="color: #fb4e24; font-weight: bold;" href="https://codeboxr.com/doc/cbcurrencyconverter-doc/" target="_blank">' . esc_html__( 'Documentation', 'cbcurrencyconverter' ) . '</a>';
 		}
 
 		return $links_array;
@@ -448,19 +448,23 @@ public function custom_message_after_plugin_row_proaddon( $plugin_file, $plugin_
 			return;
 		}
 
-		$pro_addon_version        = CBCurrencyConverterHelper::get_any_plugin_version( 'cbcurrencyconverteraddon/cbcurrencyconverteraddon.php' );
-		$pro_addon_version_latest = '1.7.7';
+		//$pro_addon_version        = CBCurrencyConverterHelper::get_any_plugin_version( 'cbcurrencyconverteraddon/cbcurrencyconverteraddon.php' );
+		//$pro_addon_version_latest = '1.7.9';
 
 
-		if ( $pro_addon_version != '' && version_compare( $pro_addon_version, '1.7.7', '<' ) ) {
+		//$pro_addon_version = CBXRBookingHelpers::get_any_plugin_version('cbxrbookingpro/cbxrbookingpro.php');
+		$pro_addon_version = isset( $plugin_data['Version'] ) ? $plugin_data['Version'] : '';
+		$required_version = '1.7.9';
+
+		if ( $pro_addon_version != '' && version_compare( $pro_addon_version, $required_version, '<' ) ) {
 			// Custom message to display
 
 			//$plugin_setting_url = admin_url( 'admin.php?page=cbxwpbookmark_settings#cbxwpbookmark_licences' );
 			$plugin_manual_update = 'https://codeboxr.com/manual-update-pro-addon/';
 
 			/* translators:translators: %s: plugin setting url for licence */
 			$custom_message = wp_kses( sprintf( __( '<strong>Note:</strong> CBX Currency Converter Pro Addon is custom plugin. This plugin can not be auto update from dashboard/plugin manager. For manual update please check <a target="_blank" href="%1$s">documentation</a>. <strong style="color: red;">It seems this plugin\'s current version is older than %2$s . To get the latest pro addon features, this plugin needs to upgrade to %2$s or later.</strong>', 'cbcurrencyconverter' ),
-				esc_url( $plugin_manual_update ), $pro_addon_version_latest ), [ 'strong' => [ 'style' => [] ], 'a' => [ 'href' => [], 'target' => [] ] ] );
+				esc_url( $plugin_manual_update ), $required_version ), [ 'strong' => [ 'style' => [] ], 'a' => [ 'href' => [], 'target' => [] ] ] );
 
 			// Output a row with custom content
 			echo '<tr class="plugin-update-tr">

includes/CBCurrencyConverterPublic.php

@@ -95,10 +95,10 @@ public function enqueue_styles() {
 		$js_path_part      = CBCURRENCYCONVERTER_ROOT_PATH . 'assets/js/';
 		$vendors_path_part = CBCURRENCYCONVERTER_ROOT_PATH . 'assets/vendors/';
 
-		$version = $this->version;
+		$ver = $this->version;
 
-		wp_register_style( 'select2', $vendors_url_part . 'select2/css/select2.min.css', [], $version );
-		wp_register_style( 'cbcurrencyconverter-public', $css_url_part . 'cbcurrencyconverter-public.css', [ 'select2' ], $version, 'all' );
+		wp_register_style( 'select2', $vendors_url_part . 'select2/css/select2.min.css', [], $ver );
+		wp_register_style( 'cbcurrencyconverter-public', $css_url_part . 'cbcurrencyconverter-public.css', [ 'select2' ], $ver, 'all' );
 
 		wp_enqueue_style( 'select2' );
 		wp_enqueue_style( 'cbcurrencyconverter-public' );
@@ -118,11 +118,11 @@ public function enqueue_scripts() {
 		$js_path_part      = CBCURRENCYCONVERTER_ROOT_PATH . 'assets/js/';
 		$vendors_path_part = CBCURRENCYCONVERTER_ROOT_PATH . 'assets/vendors/';
 
-		$version    = $this->version;
+		$ver    = $this->version;
 		$ajax_nonce = wp_create_nonce( "cbcurrencyconverter_nonce" );
 
-		wp_register_script( 'select2', $vendors_url_part . 'select2/js/select2.full.min.js', [ 'jquery' ], $version, true );
-		wp_register_script( 'cbcurrencyconverter-public', $js_url_part . 'cbcurrencyconverter-public.js', [ 'jquery', 'select2' ], $version, true );
+		wp_register_script( 'select2', $vendors_url_part . 'select2/js/select2.full.min.js', [ 'jquery' ], $ver, true );
+		wp_register_script( 'cbcurrencyconverter-public', $js_url_part . 'cbcurrencyconverter-public.js', [ 'jquery', 'select2' ], $ver, true );
 
 		wp_localize_script( 'cbcurrencyconverter-public',
 			'cbcurrencyconverter_public',
@@ -327,7 +327,7 @@ public function register_widgets() {
 	 * Load Elementor Custom Icon
 	 */
 	function elementor_icon_loader() {
-		$version = $this->version;
+		$ver = $this->version;
 
 		$css_url_part     = CBCURRENCYCONVERTER_ROOT_URL . 'assets/css/';
 		$js_url_part      = CBCURRENCYCONVERTER_ROOT_URL . 'assets/js/';
@@ -337,7 +337,7 @@ function elementor_icon_loader() {
 		$js_path_part      = CBCURRENCYCONVERTER_ROOT_PATH . 'assets/js/';
 		$vendors_path_part = CBCURRENCYCONVERTER_ROOT_PATH . 'assets/vendors/';
 
-		wp_register_style( 'cbcurrencyconverter-elementor', $css_url_part . 'cbcurrencyconverter-elementor.css', false, $version );
+		wp_register_style( 'cbcurrencyconverter-elementor', $css_url_part . 'cbcurrencyconverter-elementor.css', false, $ver );
 		wp_enqueue_style( 'cbcurrencyconverter-elementor' );
 	}//end elementor_icon_loader
 
@@ -404,6 +404,6 @@ public function vc_before_init_actions() {
 			require_once CBCURRENCYCONVERTER_ROOT_PATH . 'includes/Widgets/VisualComposer/CBCurrencyConverterWPBWidget.php';
 		}
 
-		new CBCurrencyConverter_WPBWidget();
+		new CBCurrencyConverterWPBWidget();
 	}//end method vc_before_init_actions
 }//end class CBCurrencyConverterPublic

includes/Widgets/VisualComposer/CBCurrencyConverterWPBWidget.php

@@ -148,4 +148,4 @@ public function bakery_shortcode_mapping() {
 			)
 		] );
 	}//end bakery_shortcode_mapping
-}//end class CBCurrencyConverter_WPBWidget
+}//end class CBCurrencyConverterWPBWidget