+ post_types ) ) {
- $potential_placeholder = get_post_meta( get_the_ID(), 'map' . $prefix . '_placeholder', true );
- if ( '' !== $potential_placeholder ) {
- $size = 'full';
- if ( false !== $mobile ) {
- $size = 'medium';
- }
- $potential_placeholder = wp_get_attachment_image_src( $potential_placeholder, 'full' );
- if ( is_array( $potential_placeholder ) && ! empty( $potential_placeholder ) ) {
- $image = $potential_placeholder[0];
- }
+ $excerpt = get_the_excerpt($connection);
+ if ( empty( $excerpt ) || '' === $excerpt ) {
+ $tooltip = apply_filters( 'get_the_excerpt', get_the_content() );
+ $tooltip = strip_tags( $tooltip );
+ echo wp_kses_post( wpautop( $tooltip ) );
+ } else {
+ echo wp_kses_post( $excerpt );
}
- }
- $image = apply_filters( 'lsx_to_map' . $prefix . '_placeholder_src', $image );
- return $image;
- }
+ ?>
+
+ ' +
@@ -460,7 +431,8 @@ var LSX_TO_Maps = {
},
watchMapTriggers: function() {
- jQuery(document).on( 'click', '.lsx-map-placeholder, .placeholder-text', function( event ) {
+ jQuery('.lsx-map-preview a').on( 'click', function( event ) {
+ event.preventDefault();
jQuery.getScript(lsx_to_maps_params.google_url,function() {
jQuery.getScript(lsx_to_maps_params.google_cluster_url);
LSX_TO_Maps.initThis();
@@ -470,12 +442,12 @@ var LSX_TO_Maps = {
};
jQuery(document).ready(function($) {
- //console.log( lsx_to_maps_params );
if ( jQuery('.lsx-map').length > 0 ) {
- if ( '' === lsx_to_maps_params.placeholder_enabled ) {
- LSX_TO_Maps.initThis();
- } else {
+ // If there is a placeholder image, then load the placeholder code.
+ if ( jQuery('.lsx-map').parents('.lsx-location-wrapper').find('.lsx-map-preview').length > 0 ) {
LSX_TO_Maps.watchMapTriggers();
+ } else {
+ LSX_TO_Maps.initThis();
}
}
});
diff --git a/changelog.md b/changelog.md
index 1a091c62..d9c96b08 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,23 @@
# Changelog
+## [[2.0.1]](https://github.com/lightspeeddevelopment/tour-operator/releases/tag/2.0.1) - 2025-01-24
+
+### Added
+- A "Parents Only" checkbox to the TO query block settings, allowing you to select only the parent items for a query. (the WordPress parent field does not accept a 0 value).
+- The Google Map, map block for Tour Operator, bringing back the various maps shows on the pages. [#477](https://github.com/lightspeedwp/tour-operator/pull/477)
+
+### Fixed
+- Fixes to the post relation fields and when they save, detected via the TO Reviews plugin.
+- Fixed the Slider not detecting the amount of columns set on the block. [a6e0ea](https://github.com/lightspeedwp/tour-operator/commit/a6e0eafb508532dc7c137aedc30a17c5856a0309)
+- Fixed the Related Content dection, we check to see if the posts exist before trying to display them [b20f879](https://github.com/lightspeedwp/tour-operator/commit/b20f879da7e9abfced7623f7e5348737af064db3)
+
+### Removed
+- Unused icons and placeholders from previous versions. [#477](https://github.com/lightspeedwp/tour-operator/pull/477)
+- Removed the SVG Uploader Code causing a security issue. [c972c84](https://github.com/lightspeedwp/tour-operator/commit/c972c84224e2b51564fddc04d547ea6d204a356d)
+
+### Integrations
+- Fixed the Destinations Facet dropdowns using the Fselect field. [8e4cfc](https://github.com/lightspeedwp/tour-operator/commit/8e4cfcb08333c342e9d41fd9fad3fe4f9c31e4c8)
+
## [[2.0.0]](https://github.com/lightspeeddevelopment/tour-operator/releases/tag/2.0.0) - 2025-01-10
### New Features
@@ -27,59 +45,45 @@
- **Wetu Map Embed Block**: Created a block to display Wetu maps in the Single Tour template. [#365](https://github.com/lightspeedwp/tour-operator/issues/365)
- **Simplified Wetu Importer Settings**: Reduced complexity in the Wetu Importer settings, added image controls, and improved UI based on Figma designs. [#173](https://github.com/lightspeedwp/wetu-importer/issues/173)
----
+### Compatibility & Integration
+- **Theme & Page Builder Compatibility:**
+ Increased compatibility with popular WordPress themes and page builders, minimizing styling conflicts and ensuring consistent front-end rendering. ([#229](https://github.com/lightspeedwp/tour-operator/pull/229), [#204](https://github.com/lightspeedwp/tour-operator/issues/204))
+- **Translation & Localization Updates:**
+ Added missing translation strings and updated `.pot` files, improving internationalization support and making it easier to localize the plugin. ([#217](https://github.com/lightspeedwp/tour-operator/pull/217))
-### Enhancements
+### Email & Notification Templates
+- **Email Template System Improvements:**
+ Integrated a refined email templating structure that supports dynamic placeholders for tour details, booking confirmations, and reminders. ([#240](https://github.com/lightspeedwp/tour-operator/pull/240))
+
+### Updates
- Defined consistent image sizes across single posts, featured images, and archive pages, with custom aspect ratios. [#392](https://github.com/lightspeedwp/tour-operator/issues/392)
- Updated plugin requirements to PHP 8.0 and WordPress 6.7 for improved compatibility and performance. [#406](https://github.com/lightspeedwp/tour-operator/issues/406)
- Registered custom fields for post types using JSON for better data handling and display. [#407](https://github.com/lightspeedwp/tour-operator/issues/407)
-
----
-
-### Bug Fixes
-- Fixed issues with setting featured images for custom taxonomies, ensuring proper saving and display. [#419](https://github.com/lightspeedwp/tour-operator/issues/419)
-- Resolved syncing issues in the Wetu Importer, addressing a PHP fatal error and spinner loading problem. [#444](https://github.com/lightspeedwp/tour-operator/issues/444)
-- Ensured blocks are hidden when related custom fields are empty, preventing display of incomplete content. [#372](https://github.com/lightspeedwp/tour-operator/issues/372)
-
----
-
-### Deprecations
-- Removed unused settings and legacy PHP code from the plugin to align with new block-based functionality. [#331](https://github.com/lightspeedwp/tour-operator/issues/331)
-
-
-## [[2.0.0]](https://github.com/lightspeeddevelopment/tour-operator/releases/tag/2.0.0) - 20-12-2024
-
-### Enhancements
- **Admin UI & UX Improvements:**
Refined the admin interface for managing tours, bookings, and availability. Updated field layouts, improved navigation, and clearer labeling for a more intuitive experience. ([#225](https://github.com/lightspeedwp/tour-operator/pull/225), [#237](https://github.com/lightspeedwp/tour-operator/issues/237))
- **Checkout & Payment Flow Adjustments:**
Enhanced integration with WooCommerce and other payment gateways, providing more reliable data handling and reducing the chance of failed booking entries at checkout. ([#231](https://github.com/lightspeedwp/tour-operator/pull/231))
- **Performance Optimizations:**
Further optimized database queries, improving load times on large tour catalogs and ensuring smoother browsing experiences. ([#215](https://github.com/lightspeedwp/tour-operator/pull/215))
-
-### Compatibility & Integration
-- **Theme & Page Builder Compatibility:**
- Increased compatibility with popular WordPress themes and page builders, minimizing styling conflicts and ensuring consistent front-end rendering. ([#229](https://github.com/lightspeedwp/tour-operator/pull/229), [#204](https://github.com/lightspeedwp/tour-operator/issues/204))
-- **Translation & Localization Updates:**
- Added missing translation strings and updated `.pot` files, improving internationalization support and making it easier to localize the plugin. ([#217](https://github.com/lightspeedwp/tour-operator/pull/217))
-
-### Email & Notification Templates
-- **Email Template System Improvements:**
- Integrated a refined email templating structure that supports dynamic placeholders for tour details, booking confirmations, and reminders. ([#240](https://github.com/lightspeedwp/tour-operator/pull/240))
+---
### Fixes
- **Resolved Seasonal Pricing Bugs:**
Addressed incorrect display of overlapping seasonal rates and ensured accurate calculation of discounted or peak-season prices. ([#199](https://github.com/lightspeedwp/tour-operator/issues/199))
- **Checkout Data Handling:**
Fixed issues where certain checkout fields failed to render or process correctly, ensuring customers’ booking details are recorded consistently. ([#203](https://github.com/lightspeedwp/tour-operator/issues/203))
-
-### Notes for Upgrading
-- **Backups & Settings Review:**
- Before upgrading, back up your site. After update, review and re-save your booking and pricing settings to ensure that seasonal rules and availability data are correctly applied.
+- Fixed issues with setting featured images for custom taxonomies, ensuring proper saving and display. [#419](https://github.com/lightspeedwp/tour-operator/issues/419)
+- Resolved syncing issues in the Wetu Importer, addressing a PHP fatal error and spinner loading problem. [#444](https://github.com/lightspeedwp/tour-operator/issues/444)
+- Ensured blocks are hidden when related custom fields are empty, preventing display of incomplete content. [#372](https://github.com/lightspeedwp/tour-operator/issues/372)
### Removed
- UIX vendor library handling the TO Settings and refactored the settings code - (PR #332)[https://github.com/lightspeedwp/tour-operator/pull/332]
- Various settings which are now handled by Block and Site Editor options. - (PR #332)[https://github.com/lightspeedwp/tour-operator/pull/332]
+- Removed unused settings and legacy PHP code from the plugin to align with new block-based functionality. [#331](https://github.com/lightspeedwp/tour-operator/issues/331)
+
+### Notes for Upgrading
+- **Backups & Settings Review:**
+ Before upgrading, back up your site. After update, review and re-save your booking and pricing settings to ensure that seasonal rules and availability data are correctly applied.
### Security
- General testing to ensure compatibility with latest WordPress version (6.7).
diff --git a/includes/classes/admin/class-settings.php b/includes/classes/admin/class-settings.php
index e6679cb4..bc998f44 100644
--- a/includes/classes/admin/class-settings.php
+++ b/includes/classes/admin/class-settings.php
@@ -240,6 +240,7 @@ public function fusion_table_settings( $tab = 'general' ) {
public function map_placeholder_settings( $tab = 'general' ) {
if ( 'placeholders' === $tab ) {
$settings = $this->get_settings_fields();
+
echo wp_kses_post( $this->output_fields( $settings['placeholder'] ) );
}
}
@@ -266,6 +267,10 @@ public function api_settings( $tab = 'general' ) {
public function post_type_map_settings( $tab, $post_type ) {
$settings = $this->get_settings_fields();
if ( 'placeholder' === $tab ) {
+ if ( ! in_array( $post_type, [ 'accommodation', 'destination', 'tour' ] ) ) {
+ unset( $settings['post_types']['placeholder']['map_placeholder_enabled'] );
+ unset( $settings['post_types']['placeholder']['map_placeholder'] );
+ }
echo wp_kses_post( $this->output_fields( $settings['post_types'][ $tab ], $post_type ) );
}
if ( 'template' === $tab ) {
diff --git a/includes/classes/blocks/class-bindings.php b/includes/classes/blocks/class-bindings.php
index 4387fe4c..74605c00 100644
--- a/includes/classes/blocks/class-bindings.php
+++ b/includes/classes/blocks/class-bindings.php
@@ -772,19 +772,29 @@ public function render_map_block( $block_content, $parsed_block, $block_obj ) {
$map = '';
switch ( $type ) {
case 'wetu':
+ $pattern = '/]*>(.*?)<\/figure>/s';
$wetu_id = get_post_meta( get_the_ID(), 'lsx_wetu_id', true );
if ( ! empty( $wetu_id ) ) {
$map = '';
}
+ $block_content = preg_replace( $pattern, $map, $block_content );
+ break;
+
+ case 'google':
+ preg_match('/class="([^"]*)"/', $block_content, $matches);
+ $class_string = $matches[1];
+
+ if ( lsx_to_has_map() ) {
+ $map = lsx_to_map( '', '', false );
+ $map = str_replace( 'class="lsx-map"', 'class="lsx-map ' . $class_string . '"', $map );
+ $block_content = $map;
+ }
break;
default:
break;
}
- $pattern = '/]*>(.*?)<\/figure>/s';
- $block_content = preg_replace( $pattern, $map, $block_content );
-
return $block_content;
}
diff --git a/includes/classes/blocks/class-registration.php b/includes/classes/blocks/class-registration.php
index c7f490e3..4fd71289 100644
--- a/includes/classes/blocks/class-registration.php
+++ b/includes/classes/blocks/class-registration.php
@@ -25,6 +25,13 @@ class Registration {
*/
protected $onsale = false;
+ /**
+ * True if the current query outputting needs only the parent outputs.
+ *
+ * @var boolean
+ */
+ protected $parents_only = false;
+
/**
* Initialize the plugin by setting localization, filters, and administration functions.
*
@@ -37,9 +44,8 @@ public function __construct() {
add_filter( 'query_loop_block_query_vars', array( $this, 'query_args_filter' ), 1, 2 );
add_filter( 'render_block', array( $this, 'maybe_hide_varitaion' ), 10, 3 );
+ add_filter( 'render_block_data', array( $this, 'save_checkbox_queries' ), 10, 1 );
add_filter( 'posts_pre_query', array( $this, 'posts_pre_query' ), 10, 2 );
-
- add_filter( 'render_block_data', array( $this, 'save_onsale_queries' ), 10, 1 );
}
/**
@@ -55,6 +61,7 @@ public function enqueue_block_variations_script() {
'accommodation' => array( 'wp-blocks', 'wp-dom-ready', 'wp-edit-post', 'lsx-to-block-general-variations' ),
'destination' => array( 'wp-blocks', 'wp-dom-ready', 'wp-edit-post', 'lsx-to-block-general-variations' ),
'query-loops' => array( 'wp-blocks', 'wp-dom-ready', 'wp-edit-post', 'lsx-to-block-general-variations' ),
+ 'maps' => array( 'wp-blocks', 'wp-dom-ready', 'wp-edit-post', 'lsx-to-block-general-variations' ),
];
$additional_scripts = [
@@ -108,11 +115,31 @@ public function enqueue_block_variations_script() {
public function query_args_filter( $query, $block ) {
$block = $block->parsed_block;
+ // These are for all query blocks.
+ if ( true === $this->onsale ) {
+ if ( isset( $query['meta_query']['relation'] ) ) {
+ $query['meta_query']['relation'] = 'AND';
+ }
+ $query['meta_query'][] = array(
+ 'key' => 'sale_price',
+ 'compare' => 'EXISTS',
+ );
+
+ // reset this to false for the next query.
+ $this->onsale = false;
+ }
+
+ if ( true === $this->parents_only ) {
+ $query['post_parent'] = 0;
+ }
+
+
// Determine if this is the custom block variation.
if ( ! isset( $block['attrs']['className'] ) ) {
return $query;
}
-
+
+ // Add our specific query args to the query for our variations.
$pattern = "/(lsx|facts)-(.*?)-query/";
preg_match( $pattern, $block['attrs']['className'], $matches );
@@ -179,18 +206,27 @@ public function query_args_filter( $query, $block ) {
$directions = explode( '-related-', $key );
$to = $directions[0];
$from = $directions[1];
+ $items = [];
+
+ do_action('qm/debug',$key);
// Get the current item IDS to exclude
if ( $to === $from ) {
$excluded_items = [ get_the_ID() ];
- } else {
- $excluded_items = get_post_meta( get_the_ID(), $to . '_to_' . $from, true );
- if ( ! empty( $excluded_items ) ) {
- if ( ! is_array( $excluded_items ) ) {
- $excluded_items = [ $excluded_items ];
- }
- } else {
- $excluded_items = [];
+ }
+
+
+ $found_items = get_post_meta( get_the_ID(), $to . '_to_' . $from, true );
+
+ if ( false !== $found_items && ! empty( $found_items ) ) {
+ if ( ! is_array( $found_items ) ) {
+ $found_items = [ $found_items ];
+ }
+
+ $found_items = $this->filter_existing_ids( $found_items );
+
+ if ( ! empty( $found_items ) ) {
+ $items = array_merge( $items, $found_items );
}
}
@@ -198,30 +234,35 @@ public function query_args_filter( $query, $block ) {
$destinations = get_post_meta( get_the_ID(), 'destination_to_' . $from, true );
if ( ! empty( $destinations ) ) {
- $items = [];
foreach ( $destinations as $destination ) {
+ if ( '' === $destination ) {
+ continue;
+ }
+
$found_items = get_post_meta( $destination, $to . '_to_destination', true );
if ( ! empty( $found_items ) ) {
if ( ! is_array( $found_items ) ) {
$found_items = [ $found_items ];
}
+ $found_items = $this->filter_existing_ids( $found_items );
$items = array_merge( $items, $found_items );
}
}
-
- if ( ! empty( $items ) ) {
- $items = array_unique( $items );
- $items = array_diff( $items, $excluded_items );
- $query['post__in'] = $items;
- }
}
+ if ( ! empty( $items ) ) {
+ $items = array_unique( $items );
+ $query['post__in'] = $items;
+ }
if ( ! isset( $query['post__in'] ) ) {
$this->disabled[ $key ] = true;
}
- // phpcs:ignore WordPressVIPMinimum.Performance.WPQueryParams.PostNotIn_post__not_in
- $query['post__not_in'] = $excluded_items;
+ if ( ! empty( $excluded_items ) ) {
+ // phpcs:ignore WordPressVIPMinimum.Performance.WPQueryParams.PostNotIn_post__not_in
+ $query['post__not_in'] = $excluded_items;
+
+ }
break;
@@ -246,7 +287,16 @@ public function query_args_filter( $query, $block ) {
if ( ! is_array( $found_items ) ) {
$found_items = [ $found_items ];
}
- $query['post__in'] = $found_items;
+
+ $found_items = $this->filter_existing_ids( $found_items );
+
+ if ( ! empty( $found_items ) ) {
+ $query['post__in'] = $found_items;
+ } else {
+ $this->disabled[ $key ] = true;
+ $query['post__in'] = [ get_the_ID() ];
+ }
+
} else {
$this->disabled[ $key ] = true;
$query['post__in'] = [ get_the_ID() ];
@@ -258,22 +308,6 @@ public function query_args_filter( $query, $block ) {
break;
}
- // Look for the "on sale" CSS class.
- if ( true === $this->onsale ) {
- if ( isset( $query['meta_query']['relation'] ) ) {
- $query['meta_query']['relation'] = 'AND';
- }
- $query['meta_query'][] = array(
- 'key' => 'sale_price',
- 'compare' => 'EXISTS',
- );
-
- // reset this to false for the next query.
- $this->onsale = false;
- }
-
- do_action( 'qm/debug', $query );
-
return $query;
}
@@ -310,8 +344,6 @@ public function maybe_hide_varitaion( $block_content, $parsed_block, $block_obj
return $block_content;
}
- do_action( 'qm/debug', $matches );
-
if ( in_array( 'travel-information', $matches ) ) {
return $block_content;
}
@@ -383,6 +415,15 @@ public function maybe_hide_varitaion( $block_content, $parsed_block, $block_obj
if ( empty( wp_get_post_terms( get_the_ID(), $key, $tax_args ) ) ) {
$block_content = '';
}
+ } else if ( 'location' === $key ) {
+ if ( ! lsx_to_has_map() ) {
+ $block_content = '';
+ }
+ } else if ( 'gallery' === $key ) {
+ $value = get_post_meta( get_the_ID(), $key, true );
+ if ( ! is_array( $value ) ) {
+ $block_content = '';
+ }
} else {
$key = str_replace( '-', '_', $key );
$key_array = [ $key ];
@@ -395,8 +436,6 @@ public function maybe_hide_varitaion( $block_content, $parsed_block, $block_obj
foreach ( $key_array as $meta_key ) {
$value = lsx_to_custom_field_query( $meta_key, '', '', false );
-
- do_action( 'qm/debug', $value );
// we need to see if the posts exist before we can use them
if ( stripos( $meta_key, '_to_' ) && 0 === $this->post_ids_exist( $value ) ) {
@@ -448,6 +487,21 @@ protected function post_ids_exist( $ids ) {
return $result;
}
+ protected function filter_existing_ids( $ids ) {
+ $ids = array_unique( $ids );
+ $new_ids = [];
+ foreach ( $ids as $key => $id ) {
+ if ( empty( $id ) ) {
+ continue;
+ }
+ if ( 0 === $this->post_ids_exist( $id ) ) {
+ continue;
+ }
+ $new_ids[] = $id;
+ }
+ return $new_ids;
+ }
+
/**
* This function will grab our Featured query so we dont have to redo that.
*
@@ -483,7 +537,7 @@ public function find_featured_items( $query ) {
* @param array $parsed_block
* @return array
*/
- public function save_onsale_queries( $parsed_block ) {
+ public function save_checkbox_queries( $parsed_block ) {
if ( ! isset( $parsed_block['blockName'] ) || ! isset( $parsed_block['attrs'] ) ) {
return $parsed_block;
}
@@ -494,15 +548,21 @@ public function save_onsale_queries( $parsed_block ) {
if ( ! in_array( $parsed_block['blockName'], $allowed_blocks, true ) ) {
return $parsed_block;
}
+
if ( ! isset( $parsed_block['attrs']['className'] ) || '' === $parsed_block['attrs']['className'] || false === $parsed_block['attrs']['className'] ) {
return $parsed_block;
}
$this->onsale = false;
-
if ( false !== stripos( $parsed_block['attrs']['className'], 'on-sale' ) ) {
$this->onsale = true;
}
+
+ $this->parents_only = false;
+ if ( false !== stripos( $parsed_block['attrs']['className'], 'parents-only' ) ) {
+ $this->parents_only = true;
+ }
+
return $parsed_block;
}
}
diff --git a/includes/classes/blocks/class-templates.php b/includes/classes/blocks/class-templates.php
index a7c14f27..21473379 100644
--- a/includes/classes/blocks/class-templates.php
+++ b/includes/classes/blocks/class-templates.php
@@ -81,23 +81,7 @@ public function register_post_type_templates() {
'search-results' => [
'title' => __( 'Search Results', 'tour-operator' ),
'description' => __( 'Displays when a visitor performs a search on your website.', 'tour-operator' ),
- ],
- 'index' => [
- 'title' => __( 'Index', 'tour-operator' ),
- 'description' => __( 'Used as a fallback template for all pages when a more specific template is not defined.', 'tour-operator' ),
- ],
- 'no-title' => [
- 'title' => __( 'No Title', 'tour-operator' ),
- 'description' => __( 'A generic page template with no page title displayed', 'tour-operator' ),
- ],
- 'pages' => [
- 'title' => __( 'Pages', 'tour-operator' ),
- 'description' => __( 'A generic page template with a page title displayed', 'tour-operator' ),
- ],
- 'archive' => [
- 'title' => __( 'All Archives', 'tour-operator' ),
- 'description' => __( 'Displays any archive, including posts by a single author, category, tag, taxonomy, custom post type, and date. This template will serve as a fallback when more specific templates (e.g., Category or Tag) cannot be found.', 'tour-operator' ),
- ],
+ ]
];
foreach ( $post_types as $key => $labels ) {
diff --git a/includes/classes/class-post-connections.php b/includes/classes/class-post-connections.php
index 13ab817d..bcc4f5e8 100644
--- a/includes/classes/class-post-connections.php
+++ b/includes/classes/class-post-connections.php
@@ -23,6 +23,15 @@ class Post_Connections {
*/
public $options = array();
+ public $sources = array(
+ 'cf/destination_to_accommodation',
+ 'cf/destination_to_tour',
+ 'cf/destination_to_special',
+ 'cf/destination_to_activity',
+ 'cf/destination_to_review',
+ 'cf/destination_to_vehicle',
+ );
+
/**
* Constructor
*/
@@ -31,6 +40,7 @@ public function __construct() {
add_filter( 'facetwp_indexer_row_data', array( $this, 'facetwp_index_row_data' ), 10, 2 );
add_filter( 'facetwp_index_row', array( $this, 'facetwp_index_row' ), 10, 2 );
add_filter( 'facetwp_facet_html', array( $this, 'destination_facet_html' ), 10, 2 );
+ add_filter( 'facetwp_facet_dropdown_show_counts', [ $this, 'disable_facet_count' ] , 10, 2 );
}
/**
@@ -73,6 +83,11 @@ public static function get_instance() {
* Alter the rows and include extra facets rows for the continents
*/
public function facetwp_index_row_data( $rows, $params ) {
+
+ if ( ! isset( $params['facet']['source'] ) ) {
+ return $rows;
+ }
+
switch ( $params['facet']['source'] ) {
case 'cf/destination_to_tour':
case 'cf/destination_to_accommodation':
@@ -242,15 +257,8 @@ public function facetwp_index_row( $params, $class ) {
* @return string
*/
public function destination_facet_html( $output, $params ) {
- $possible_keys = array(
- 'cf/destination_to_accommodation',
- 'cf/destination_to_tour',
- 'cf/destination_to_special',
- 'cf/destination_to_activity',
- 'cf/destination_to_review',
- 'cf/destination_to_vehicle',
- );
- if ( in_array( $params['facet']['source'], $possible_keys ) && 'checkboxes' === $params['facet']['type'] ) {
+
+ if ( in_array( $params['facet']['source'], $this->sources ) ) {
$output = $this->destination_facet_render( $params );
}
return $output;
@@ -262,15 +270,13 @@ public function destination_facet_html( $output, $params ) {
public function destination_facet_render( $params ) {
$facet = $params['facet'];
- if ( 'checkboxes' !== $params['facet']['type'] ) {
+ if ( 'checkboxes' !== $params['facet']['type'] && 'fselect' !== $params['facet']['type'] ) {
return;
}
$output = '';
$values = (array) $params['values'];
$selected_values = (array) $params['selected_values'];
- $soft_limit = empty( $facet['soft_limit'] ) ? 0 : (int) $facet['soft_limit'];
- $countries = array();
$continents = array();
$continent_terms = get_terms(
@@ -344,6 +350,9 @@ public function destination_facet_render( $params ) {
$continent_class = '';
$country_class = '';
+ // A variable to keep track if the current parent is checked, if so we will want to display those sub items.
+ $is_parent_selected = false;
+
// Run through each value and output the values.
foreach ( $values as $key => $facet ) {
$depth_type = '';
@@ -377,13 +386,17 @@ public function destination_facet_render( $params ) {
}
}
- if ( $facet['depth'] <= $current_depth ) {
+ // Check if this is a parent.
+ if ( 0 === (int) $facet['depth'] ) {
+ $is_parent_selected = in_array( $facet['facet_value'], $selected_values );
+ }
+
+ if ( ( $facet['depth'] <= $current_depth && $is_parent_selected ) || 0 === (int) $facet['depth'] ) {
if ( 'checkboxes' === $params['facet']['type'] ) {
$options[] = $this->format_checkbox_facet( $key, $facet, $selected_values, $depth_type );
} else if ( 'fselect' === $params['facet']['type'] ) {
$options[] = $this->format_fselect_facet( $key, $facet, $selected_values, $depth_type );
}
-
}
}
@@ -391,6 +404,10 @@ public function destination_facet_render( $params ) {
$output = implode( '', $options );
}
+ if ( 'fselect' === $params['facet']['type'] ) {
+ $output = '';
+ }
+
$output = '' . $output . '';
return $output;
@@ -448,15 +465,24 @@ public function format_checkbox_facet( $key, $result, $selected_values, $region
public function format_fselect_facet( $key, $result, $selected_values, $region = '' ) {
$temp_html = '';
- $selected = in_array( $result['facet_value'], $selected_values ) ? ' checked' : '';
- $selected .= ( 0 == $result['counter'] && '' == $selected ) ? ' disabled' : '';
+ $selected = in_array( $result['facet_value'], $selected_values ) ? ' selected' : '';
$selected .= ' ' . $region;
-
- $temp_html .= '
', ' ', $value ); + $value = str_replace( '
', ' ', $value ); + + if ( strlen( $value ) > $limit_chars ) { + $position = strpos( $value, ' ', $limit_chars ); + if ( false !== $position ) { + $value_output = substr( $value, 0, $position ); + } else { + $value_output = $value; + } + $value = trim( force_balance_tags( $value_output . '...' ) ); + } + + $html = trim( force_balance_tags( $value ) ); + } + return $html; + } + + public function output_modals() { + if ( ! empty( $this->modals ) ) { + foreach ( $this->modals as $key => $content ) { + $heading = '
';
+
+ $this->assets();
+
+ return $map;
+ }
+ }
+
+ /**
+ * Returns the map marker.
+ *
+ * @param boolean $post_id
+ * @return mixed
+ */
+ public function set_icon( $post_id = false ) {
+ $icon = tour_operator()->markers->default_marker;
+ if (false !== $post_id ) {
+ $connection_type = get_post_type($post_id);
+ $to_post_types = array_keys(lsx_to_get_post_types());
+ if ( in_array( $connection_type, $to_post_types ) && isset( tour_operator()->markers->post_types[ $connection_type ] ) ) {
+ $icon = tour_operator()->markers->post_types[ $connection_type ];
+ } else {
+ $icon = apply_filters('lsx_to_default_map_marker', tour_operator()->markers->default_marker);
+ }
+ }
+ return $icon;
+ }
+
+ /**
+ * Checking for bots on the maps.
+ *
+ * @package ctt-lsx-child
+ */
+ public function is_a_bot() {
+ $is_bot = false;
+ $user_agents = array(
+ 'Googlebot',
+ 'Googlebot-Mobile',
+ 'Googlebot-Image',
+ 'Googlebot-News',
+ 'Googlebot-Video',
+ 'AdsBot-Google',
+ 'AdsBot-Google-Mobile-Apps',
+ 'Feedfetcher-Google',
+ 'Mediapartners-Google',
+ 'APIs-Google',
+ 'GTmetrix',
+ 'Baiduspider',
+ 'ia_archiver',
+ 'R6_FeedFetcher',
+ 'NetcraftSurveyAgent',
+ 'Sogou web spider',
+ 'bingbot',
+ 'BingPreview',
+ 'slurp',
+ 'Yahoo! Slurp',
+ 'Ask Jeeves/Teoma',
+ 'facebookexternalhit',
+ 'PrintfulBot',
+ 'msnbot',
+ 'Twitterbot',
+ 'UnwindFetchor',
+ 'urlresolver',
+ 'Butterfly',
+ 'TweetmemeBot',
+ 'PaperLiBot',
+ 'MJ12bot',
+ 'AhrefsBot',
+ 'Exabot',
+ 'Ezooms',
+ 'YandexBot',
+ 'SearchmetricsBot',
+ 'picsearch',
+ 'TweetedTimes Bot',
+ 'QuerySeekerSpider',
+ 'ShowyouBot',
+ 'woriobot',
+ 'merlinkbot',
+ 'BazQuxBot',
+ 'Kraken',
+ 'SISTRIX Crawler',
+ 'R6_CommentReader',
+ 'magpie-crawler',
+ 'GrapeshotCrawler',
+ 'PercolateCrawler',
+ 'MaxPointCrawler',
+ 'R6_FeedFetcher',
+ 'NetSeer crawler',
+ 'grokkit-crawler',
+ 'SMXCrawler',
+ 'PulseCrawler',
+ 'Y!J-BRW',
+ '80legs.com/webcrawler',
+ 'Mediapartners-Google',
+ 'Spinn3r',
+ 'InAGist',
+ 'Python-urllib',
+ 'NING',
+ 'TencentTraveler',
+ 'Feedfetcher-Google',
+ 'mon.itor.us',
+ 'spbot',
+ 'Feedly',
+ 'bitlybot',
+ 'ADmantX Platform',
+ 'Niki-Bot',
+ 'Pinterest',
+ 'python-requests',
+ 'DotBot',
+ 'HTTP_Request2',
+ 'linkdexbot',
+ 'A6-Indexer',
+ 'Baiduspider',
+ 'TwitterFeed',
+ 'Microsoft Office',
+ 'Pingdom',
+ 'BTWebClient',
+ 'KatBot',
+ 'SiteCheck',
+ 'proximic',
+ 'Sleuth',
+ 'Abonti',
+ '(BOT for JCE)',
+ 'Baidu',
+ 'Tiny Tiny RSS',
+ 'newsblur',
+ 'updown_tester',
+ 'linkdex',
+ 'baidu',
+ 'searchmetrics',
+ 'genieo',
+ 'majestic12',
+ 'spinn3r',
+ 'profound',
+ 'domainappender',
+ 'VegeBot',
+ 'terrykyleseoagency.com',
+ 'CommonCrawler Node',
+ 'AdlesseBot',
+ 'metauri.com',
+ 'libwww-perl',
+ 'rogerbot-crawler',
+ 'MegaIndex.ru',
+ 'ltx71',
+ 'Qwantify',
+ 'Traackr.com',
+ 'Re-Animator Bot',
+ 'Pcore-HTTP',
+ 'BoardReader',
+ 'omgili',
+ 'okhttp',
+ 'CCBot',
+ 'Java/1.8',
+ 'semrush.com',
+ 'feedbot',
+ 'CommonCrawler',
+ 'AdlesseBot',
+ 'MetaURI',
+ 'ibwww-perl',
+ 'rogerbot',
+ 'MegaIndex',
+ 'BLEXBot',
+ 'FlipboardProxy',
+ 'techinfo@ubermetrics-technologies.com',
+ 'trendictionbot',
+ 'Mediatoolkitbot',
+ 'trendiction',
+ 'ubermetrics',
+ 'ScooperBot',
+ 'TrendsmapResolver',
+ 'Nuzzel',
+ 'Go-http-client',
+ 'Applebot',
+ 'LivelapBot',
+ 'GroupHigh',
+ 'SemrushBot',
+ 'ltx71',
+ 'commoncrawl',
+ 'istellabot',
+ 'DomainCrawler',
+ 'cs.daum.net',
+ 'StormCrawler',
+ 'GarlikCrawler',
+ 'The Knowledge AI',
+ 'getstream.io/winds',
+ 'YisouSpider',
+ 'archive.org_bot',
+ 'semantic-visions.com',
+ 'FemtosearchBot',
+ '360Spider',
+ 'linkfluence.com',
+ 'glutenfreepleasure.com',
+ 'Gluten Free Crawler',
+ 'YaK/1.0',
+ 'Cliqzbot',
+ 'app.hypefactors.com',
+ 'axios',
+ 'semantic-visions.com',
+ 'webdatastats.com',
+ 'schmorp.de',
+ 'SEOkicks',
+ 'DuckABot',
+ 'AOLBuild',
+ 'Barkrowler',
+ 'ZoominfoBot',
+ 'Linguee Bot',
+ 'Mail.RU_Bot',
+ 'OnalyticaBot',
+ 'Linguee Bot',
+ 'admantx-adform',
+ 'Buck/2.2',
+ 'Barkrowler',
+ 'Zombiebot',
+ 'Nutch',
+ 'SemanticScholarBot',
+ "Jetslid'e",
+ 'scalaj-http',
+ 'XoviBot',
+ 'sysomos.com',
+ 'PocketParser',
+ 'newspaper',
+ 'serpstatbot',
+ );
+ // @phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ if (isset($_GET['debug_bot']) ) {
+ // @phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ $user_agent = sanitize_text_field(wp_unslash($_GET['debug_bot']));
+ // @phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ } else if (isset($_GET['HTTP_USER_AGENT']) ) {
+ // @phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated
+ $user_agent = sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT']));
+ } else {
+ return false;
}
- }
- /**
- * Returns the map marker.
- *
- * @param boolean $post_id
- * @return mixed
- */
- public function set_icon( $post_id = false ) {
- $settings = tour_operator()->options;
- $icon = tour_operator()->markers->default_marker;
- if ( false !== $post_id ) {
- $connection_type = get_post_type( $post_id );
- $to_post_types = array_keys( lsx_to_get_post_types() );
- if ( in_array( $connection_type, $to_post_types ) ) {
- if ( isset( tour_operator()->markers->post_types[ $connection_type ] ) ) {
- $icon = tour_operator()->markers->post_types[ $connection_type ];
- }
- } else {
- $icon = apply_filters( 'lsx_to_default_map_marker', tour_operator()->markers->default_marker );
+ foreach ( $user_agents as $agent ) {
+ if (strtolower($agent) === strtolower($user_agent) ) {
+ $is_bot = true;
+ }
+ }
+ return $is_bot;
+ }
+
+ public function map_marker_html( $connection ) {
+ ?>
+
-
-
';
+ $temp_html .= '';
return $temp_html;
}
+
+ /**
+ * Disables the facet coun on the fselect facet.
+ *
+ * @param boolean $return
+ * @param array $params
+ * @return boolean
+ */
+ public function disable_facet_count( $return, $params ) {
+ if ( in_array( $params['facet']['source'], $this->sources ) && 'fselect' === $params['facet']['type'] ) {
+ return false;
+ }
+ return $return;
+ }
}
diff --git a/includes/classes/legacy/class-admin.php b/includes/classes/legacy/class-admin.php
index b9fdb34f..06bf5f6f 100644
--- a/includes/classes/legacy/class-admin.php
+++ b/includes/classes/legacy/class-admin.php
@@ -62,7 +62,6 @@ public function __construct() {
add_action( 'init', array( $this, 'init' ) );
add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_stylescripts' ), 999 );
- add_action( 'cmb_save_custom', array( $this, 'post_relations' ), 3, 20 );
}
/**
@@ -72,6 +71,8 @@ public function __construct() {
*/
public function init() {
if ( is_admin() ) {
+ add_action( 'cmb2_pre_save_field', array( $this, 'cpt_relations' ), 2, 20 );
+
$this->connections = $this->create_post_connections();
$this->single_fields = apply_filters( 'lsx_to_search_fields', array() );
$this->taxonomies = apply_filters( 'lsx_to_taxonomies', $this->taxonomies );
@@ -135,100 +136,101 @@ public function enqueue_admin_stylescripts( $hook ) {
}
/**
- * Sets up the "post relations"
+ * Fixes the CMB2 field relations
*
- * @return object
+ * @param string $field_id
+ * @param bool $status
+ * @param string $action
+ * @param object $field
+ * @return void
*/
- public function post_relations( $post_id, $field, $value ) {
- if ( 'group' === $field['type'] && isset( $this->single_fields ) && array_key_exists( $field['id'], $this->single_fields ) ) {
- $delete_counter = array();
-
- foreach ( $this->single_fields[ $field['id'] ] as $fields_to_save ) {
- $delete_counter[ $fields_to_save ] = 0;
+ public function cpt_relations( $field_id, $field ) {
+
+ if ( in_array( $field_id, $this->connections ) ) {
+ $connected_id = get_the_ID();
+ $previous_values = get_post_meta( $connected_id, $field_id, true );
+ $remote_key = $this->reverse_key( $field_id );
+
+ if ( isset( $field->data_to_save[ $field_id ] ) ) {
+ $new_values = $field->data_to_save[ $field_id ];
+ } else {
+ $new_values = array();
}
- //Loop through each group in case of repeatable fields
- $relations = false;
- $previous_relations = false;
-
- foreach ( $value as $group ) {
- //loop through each of the fields in the group that need to be saved and grab their values.
- foreach ( $this->single_fields[ $field['id'] ] as $fields_to_save ) {
- //Check if its an empty group
- if ( isset( $group[ $fields_to_save ] ) && ! empty( $group[ $fields_to_save ] ) ) {
- if ( $delete_counter[ $fields_to_save ] < 1 ) {
- //If this is a relation field, then we need to save the previous relations to remove any items if need be.
- if ( in_array( $fields_to_save, $this->connections ) ) {
- $previous_relations[ $fields_to_save ] = get_post_meta( $post_id, $fields_to_save, false );
- }
-
- delete_post_meta( $post_id, $fields_to_save );
- $delete_counter[ $fields_to_save ] ++;
- }
-
- //Run through each group
- foreach ( $group[ $fields_to_save ] as $field_value ) {
- if ( null !== $field_value ) {
- if ( 1 === $field_value ) {
- $field_value = true;
- }
-
- add_post_meta( $post_id, $fields_to_save, $field_value );
-
- //If its a related connection the save that
- if ( in_array( $fields_to_save, $this->connections ) ) {
- $relations[ $fields_to_save ][ $field_value ] = $field_value;
- }
- }
- }
+ //if the new values are empty, then we need to remove the previous values.
+ if ( empty( $new_values ) ) {
+ if ( ! empty( $previous_values ) ) {
+ foreach ( $previous_values as $remote_id ) {
+ $this->remove_connected_id( $remote_id, $connected_id, $remote_key );
}
}
- }//end of the repeatable group foreach
+ } else {
+
+ if ( ! is_array( $previous_values ) ) {
+ $previous_values = [ $previous_values ];
+ }
- //If we have relations, loop through them and save the meta
- if ( false !== $relations ) {
- foreach ( $relations as $relation_key => $relation_values ) {
- $temp_field = array(
- 'id' => $relation_key,
- );
+ // Now determine if we added or removed any values.
+ $is_removing = array_diff( $previous_values, $new_values );
+ $is_adding = array_diff( $new_values, $previous_values );
- $this->save_related_post( $post_id, $temp_field, $relation_values, $previous_relations[ $relation_key ] );
+ if ( ! empty( $is_removing ) ) {
+ foreach ( $is_removing as $remote_id ) {
+ $this->remove_connected_id( $remote_id, $connected_id, $remote_key );
+ }
+ }
+
+ if ( ! empty( $is_adding ) ) {
+ foreach ( $is_adding as $remote_id ) {
+ $this->add_connected_id( $remote_id, $connected_id, $remote_key );
+ }
}
- }
- } else {
- if ( in_array( $field['id'], $this->connections ) ) {
- $this->save_related_post( $post_id, $field, $value );
}
}
}
/**
- * Save the reverse post relation.
+ * Reverses the key for the remote_key slug.
*
- * @return null
+ * @param [type] $meta_key
+ * @return void
*/
- public function save_related_post( $post_id, $field, $value, $previous_values = false ) {
- $ids = explode( '_to_', $field['id'] );
- $relation = $ids[1] . '_to_' . $ids[0];
-
- if ( in_array( $relation, $this->connections ) ) {
- if ( false === $previous_values ) {
- $previous_values = get_post_meta( $post_id, $field['id'], false );
- }
+ public function reverse_key( $meta_key ) {
+ $ids = explode( '_to_', $meta_key );
+ return $ids[1] . '_to_' . $ids[0];
+ }
- if ( false !== $previous_values && ! empty( $previous_values ) ) {
- foreach ( $previous_values as $tr ) {
- delete_post_meta( $tr, $relation, $post_id );
- }
- }
+ /**
+ * Remove the connected ID from the serialized array.
+ *
+ * @param int $remote_id
+ * @param int $connected_id
+ * @param string $meta_key
+ * @return void
+ */
+ public function remove_connected_id( $remote_id, $connected_id, $meta_key ) {
+ $prev = get_post_meta( $remote_id, $meta_key, true );
+ if ( ! empty( $prev ) ) {
+ $diff = array_diff( $prev, array( $connected_id ) );
+ update_post_meta( $remote_id, $meta_key, $diff, $prev );
+ }
+ }
- if ( is_array( $value ) ) {
- foreach ( $value as $v ) {
- if ( '' !== $v && null !== $v && false !== $v ) {
- add_post_meta( $v, $relation, $post_id );
- }
- }
+ public function add_connected_id( $remote_id, $connected_id, $meta_key ) {
+ $prev = get_post_meta( $remote_id, $meta_key, true );
+ // No Previous items detected.
+ if ( false === $prev || empty( $prev ) ) {
+ delete_post_meta( $remote_id, $meta_key );
+ $test = add_post_meta( $remote_id, $meta_key, array( $connected_id ), true );
+ } else {
+ if ( ! is_array( $prev ) ) {
+ $new = array( $prev );
+ } else {
+ $new = $prev;
}
+ $new[] = $connected_id;
+ $new = array_unique( $new );
+ $updated = update_post_meta( $remote_id, $meta_key, $new, $prev );
}
}
diff --git a/includes/classes/legacy/class-destination.php b/includes/classes/legacy/class-destination.php
index 090fa15a..c26527bf 100644
--- a/includes/classes/legacy/class-destination.php
+++ b/includes/classes/legacy/class-destination.php
@@ -43,6 +43,8 @@ class Destination {
*/
protected $plugin_screen_hook_suffix = null;
+ public $modals = [];
+
/**
* Initialize the plugin by setting localization, filters, and
* administration functions.
@@ -56,6 +58,13 @@ private function __construct() {
add_action( 'lsx_to_map_meta', array( $this, 'content_meta' ) );
add_action( 'lsx_to_modal_meta', array( $this, 'content_meta' ) );
add_filter( 'lsx_to_parents_only', array( $this, 'filter_countries' ) );
+
+ add_filter( 'lsx_to_custom_field_query', array( $this, 'travel_information_excerpt' ), 5, 10 );
+ add_filter( 'facetwp_query_args', [ $this, 'facet_wp_filter' ] , 10, 2 );
+ add_action( 'pre_get_posts', [ $this, 'only_parent_destinations' ] );
+
+ add_action( 'wp_footer', array( $this, 'output_modals' ) );
+
}
/**
@@ -107,4 +116,88 @@ public function filter_countries( $countries = array() ) {
}
return $countries;
}
+
+ public function only_parent_destinations( $query ) {
+ // Only run on the front end and for the main query
+ if ( ! is_admin() && $query->is_main_query() && $query->is_post_type_archive( 'destination' ) ) {
+ // Show only top-level
+ $query->set( 'post_parent', 0 );
+
+ // Alphabetical by title
+ $query->set( 'orderby', 'title' );
+ $query->set( 'order', 'ASC' );
+
+ // Make sure pagination is not disabled
+ $query->set( 'posts_per_page', 12 ); // or your desired number
+ $query->set( 'paged', get_query_var( 'paged' ) );
+ $query->set( 'nopaging', false );
+ }
+ }
+
+ /**
+ * Sets the destination archive to only show top-level destinations
+ *
+ * @param array $args
+ * @param array $facet
+ * @return array
+ */
+ public function facet_wp_filter( $args, $facet ) {
+ if ( ! is_admin() && is_post_type_archive( 'destination' ) ) {
+ $args['post_parent'] = 0;
+ $args['orderby'] = 'title';
+ $args['order'] = 'ASC';
+ $args['posts_per_page'] = 12;
+ }
+ return $args;
+ }
+
+ /**
+ * Filter the travel information and return a shortened version.
+ */
+ public function travel_information_excerpt( $html = '', $meta_key = false, $value = false, $before = '', $after = '' ) {
+ $limit_chars = 150;
+ $ti_keys = [
+ 'electricity',
+ 'banking',
+ 'cuisine',
+ 'climate',
+ 'transport',
+ 'dress',
+ 'health',
+ 'safety',
+ 'visa',
+ 'additional_info',
+ ];
+
+ if ( get_post_type() === 'destination' && in_array( $meta_key, $ti_keys ) ) {
+ $this->modals[ $meta_key ] = $html;
+
+ $value = wp_trim_excerpt( wp_strip_all_tags( $html ) );
+ $value = str_replace( '' . $result['facet_display_value'] . ' (' . $result['counter'] . ')
- ', ' ', $value ); + $value = str_replace( '
', ' ', $value ); + + if ( strlen( $value ) > $limit_chars ) { + $position = strpos( $value, ' ', $limit_chars ); + if ( false !== $position ) { + $value_output = substr( $value, 0, $position ); + } else { + $value_output = $value; + } + $value = trim( force_balance_tags( $value_output . '...' ) ); + } + + $html = trim( force_balance_tags( $value ) ); + } + return $html; + } + + public function output_modals() { + if ( ! empty( $this->modals ) ) { + foreach ( $this->modals as $key => $content ) { + $heading = '
' . ucwords( $key ) . '
'; + $modal = '';
+ echo wp_kses_post( $modal );
+ }
+ }
+ }
}
diff --git a/includes/classes/legacy/class-frontend.php b/includes/classes/legacy/class-frontend.php
index 87b499e3..8450b6ae 100644
--- a/includes/classes/legacy/class-frontend.php
+++ b/includes/classes/legacy/class-frontend.php
@@ -57,11 +57,9 @@ public function __construct() {
if ( ! is_admin() ) {
add_filter( 'pre_get_posts', array( $this, 'travel_style_post_types' ), 10, 1 );
- add_filter( 'posts_orderby', array( $this, 'enable_continent_taxonomy_order' ), 10, 2 );
}
- // add_filter( 'the_terms', array( $this, 'links_new_window' ), 10, 2 );
- $this->maps = Maps::get_instance();
+ $this->maps = new Maps();
add_filter( 'get_the_archive_title', array( $this, 'get_the_archive_title' ), 100 );
@@ -97,39 +95,6 @@ public function enqueue_stylescripts() {
wp_enqueue_script( 'tour-operator-script', LSX_TO_URL . 'assets/js/' . $prefix . 'custom' . $suffix . '.js', array( 'jquery', 'slick', 'slick-lightbox'/*, 'fixto'*/ ), LSX_TO_VER, true );
- $param_array = array(
- 'slickSlider' => array(
- 'desktop' => array(
- 'draggable' => false,
- 'infinite' => true,
- 'swipe' => false,
- 'cssEase' => 'ease-out',
- 'dots' => true,
- 'slidesToShow' => 3,
- 'slidesToScroll' => 3,
- ),
- 'tablet' => array(
- 'slidesToShow' => 3,
- 'slidesToScroll' => 3,
- 'draggable' => true,
- 'arrows' => false,
- 'swipe' => true,
- 'breakpoint' => 992,
- ),
- 'mobile' => array(
- 'slidesToShow' => 1,
- 'slidesToScroll' => 1,
- 'draggable' => true,
- 'arrows' => false,
- 'swipe' => true,
- 'breakpoint' => 768,
- ),
- ),
- );
- $param_array = apply_filters( 'lsx_to_js_params', $param_array );
- wp_localize_script( 'tour-operator-script', 'lsx_to_params', $param_array );
-
-
if ( ! $has_slick ) {
wp_enqueue_style( 'slick', LSX_TO_URL . 'assets/css/vendor/slick.css', array(), LSX_TO_VER );
}
@@ -140,7 +105,6 @@ public function enqueue_stylescripts() {
wp_enqueue_style( 'tour-operator-style', LSX_TO_URL . 'assets/css/style.css', array(), LSX_TO_VER );
wp_style_add_data( 'tour-operator-style', 'rtl', 'replace' );
-
}
/**
@@ -154,32 +118,6 @@ public function travel_style_post_types( $query ) {
return $query;
}
- /**
- * Enable continent taxonomy order.
- */
- public function enable_continent_taxonomy_order( $orderby, $query ) {
- global $wpdb;
-
- if ( $query->is_main_query() && $query->is_post_type_archive( 'destination' ) ) {
- if ( isset( $this->options['destination'] ) && isset( $this->options['destination']['group_items_by_continent'] ) ) {
- $new_orderby = "(
- SELECT GROUP_CONCAT(lsx_to_term_order ORDER BY lsx_to_term_order ASC)
- FROM $wpdb->term_relationships
- INNER JOIN $wpdb->term_taxonomy USING (term_taxonomy_id)
- INNER JOIN $wpdb->terms USING (term_id)
- WHERE $wpdb->posts.ID = object_id
- AND taxonomy = 'continent'
- GROUP BY object_id
- ) ";
-
- $new_orderby .= ( 'ASC' == strtoupper( $query->get( 'order' ) ) ) ? 'ASC' : 'DESC';
- $orderby = $new_orderby . ', ' . $orderby;
- }
- }
-
- return $orderby;
- }
-
/**
* Add a some classes so we can style.
*/
diff --git a/includes/classes/legacy/class-maps.php b/includes/classes/legacy/class-maps.php
index 7ee277ce..f2822560 100644
--- a/includes/classes/legacy/class-maps.php
+++ b/includes/classes/legacy/class-maps.php
@@ -17,587 +17,519 @@
* @package Destination
* @author LightSpeed
*/
-class Maps {
-
- /**
- * Holds instances of the class
- *
- * @var object \lsx\legacy\Maps()
- */
- protected static $instance;
-
- /**
- * If the maps are enabled.
- *
- * @var bool
- */
- public $maps_enabled = false;
-
- /**
- * Holds the value of the current marker
- *
- * @var bool
- */
- public $current_marker = false;
-
- /**
- * If the map placeholder is enabled.
- *
- * @var bool
- */
- public $placeholder_enabled = false;
-
- /**
- * If the map should display in the destinations banner.
- *
- * @var bool
- */
- public $enable_banner_map = false;
-
- /**
- * The post types this post should work with
- *
- * @var array
- */
- public $post_types = array();
-
- /**
- * Constructor
- */
- public function __construct() {
- add_action( 'wp_enqueue_scripts', array( $this, 'assets' ), 1499 );
- $this->post_types = array(
+class Maps
+{
+
+ /**
+ * If the maps are enabled.
+ *
+ * @var bool
+ */
+ public $maps_enabled = false;
+
+ /**
+ * Holds the value of the current marker
+ *
+ * @var bool
+ */
+ public $current_marker = false;
+
+ /**
+ * If the map placeholder is enabled.
+ *
+ * @var bool
+ */
+ public $placeholder_enabled = false;
+
+ /**
+ * If the map should display in the destinations banner.
+ *
+ * @var bool
+ */
+ public $enable_banner_map = false;
+
+ /**
+ * The post types this post should work with
+ *
+ * @var array
+ */
+ public $post_types = array();
+
+ /**
+ * Constructor
+ */
+ public function __construct() {
+ $this->post_types = array(
'destination',
'accommodation',
'tour',
- );
- }
-
- /**
- * Return an instance of this class.
- *
- * @since 1.0.0
- * @return object A single instance of this class.
- */
- public static function get_instance() {
- // If the single instance hasn't been set, set it now.
- if ( is_null( self::$instance ) ) {
- self::$instance = new self();
- }
-
- return self::$instance;
- }
-
- /**
- * Enques the assets
- */
- public function assets() {
- if ( $this->is_a_bot() || ! lsx_to_has_map() || true === apply_filters( 'lsx_to_disable_map_js', false ) ) {
- return;
- }
- $settings = tour_operator()->options;
- $api_key = '';
- $preview_src = $this->get_map_preview_src();
-
- if ( isset( $settings['api']['googlemaps_key'] ) ) {
- $api_key = $settings['api']['googlemaps_key'];
- }
- if ( isset( $settings['destination'] ) && isset( $settings['destination']['enable_banner_map'] ) && 'on' === $settings['destination']['enable_banner_map'] ) {
- $this->enable_banner_map = apply_filters( 'lsx_to_has_destination_banner_map', true );
- }
-
- if ( isset( $settings['display'] ) && isset( $settings['display']['map_placeholder_enabled'] ) && 'on' === $settings['display']['map_placeholder_enabled'] ) {
- if ( ( is_post_type_archive( 'destination' ) || is_singular( 'destination' ) ) && true === $this->enable_banner_map ) {
- $this->placeholder_enabled = false;
- } elseif ( '' !== $preview_src ) {
- $this->placeholder_enabled = true;
- }
- }
- $this->placeholder_enabled = apply_filters( 'lsx_to_map_placeholder_enabled', $this->placeholder_enabled );
- if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
- $prefix = 'src/';
- $suffix = '';
- } else {
- $prefix = '';
- $suffix = '.min';
- }
-
- $dependacies = array( 'jquery', 'googlemaps_api', 'googlemaps_api_markercluster' );
- $google_url = 'https://maps.googleapis.com/maps/api/js?key=' . $api_key . '&libraries=places';
- $google_marker_cluster = LSX_TO_URL . 'assets/js/vendor/google-markerCluster.js';
-
- if ( true === $this->placeholder_enabled ) {
- $dependacies = array( 'jquery' );
- } else {
- wp_enqueue_script( 'googlemaps_api', $google_url, array( 'jquery' ), LSX_TO_VER, true );
- wp_enqueue_script( 'googlemaps_api_markercluster', $google_marker_cluster, array( 'googlemaps_api' ), LSX_TO_VER, true );
- }
-
- wp_enqueue_script(
- 'lsx_to_maps',
- LSX_TO_URL . 'assets/js/' . $prefix . 'maps' . $suffix . '.js',
- $dependacies,
- LSX_TO_VER,
- true
- );
- wp_localize_script(
- 'lsx_to_maps',
- 'lsx_to_maps_params',
- array(
- 'apiKey' => $api_key,
- 'start_marker' => tour_operator()->markers->start,
- 'end_marker' => tour_operator()->markers->end,
- 'placeholder_enabled' => $this->placeholder_enabled,
- 'enable_banner_map' => $this->enable_banner_map,
- 'google_url' => $google_url,
- 'google_cluster_url' => $google_marker_cluster,
- )
- );
- }
-
- /**
- * Output the Map
- *
- * @since 1.0.0
- *
- * @return null
- */
- public function map_output( $post_id = false, $args = array() ) {
- $defaults = array(
- 'latitude' => '-33.914482',
- 'longitude' => '18.3758789',
- 'zoom' => 14,
- 'width' => '100%',
- 'height' => '400px',
- 'type' => 'single',
- 'search' => '',
- 'connections' => false,
- 'link' => true,
- 'selector' => '.lsx-map-preview',
- 'icon' => false,
- 'content' => 'address',
- 'kml' => false,
- 'cluster_small' => tour_operator()->markers->cluster_small,
- 'cluster_medium' => tour_operator()->markers->cluster_medium,
- 'cluster_large' => tour_operator()->markers->cluster_large,
- 'fusion_tables' => false,
- 'fusion_tables_colour_border' => '#000000',
- 'fusion_tables_width_border' => '2',
- 'fusion_tables_colour_background' => '#000000',
- 'disable_cluster_js' => false,
- 'disable_auto_zoom' => false,
- );
-
- $args = wp_parse_args( $args, $defaults );
- $map_classes = array( 'lsx-map' );
- if ( true === $args['disable_auto_zoom'] ) {
- $map_classes[] = 'disable-auto-zoom';
- }
- if ( true === $this->placeholder_enabled ) {
- $map_classes[] = 'map-has-placeholder';
- }
-
- $thumbnail = '';
- if ( false === $args['icon'] ) {
- $icon = $this->set_icon( $post_id );
- }
-
- if ( ( '-33.914482' !== $args['latitude'] && '18.3758789' !== $args['longitude'] ) || false !== $args['search'] || 'cluster' === $args['type'] || 'route' === $args['type'] ) {
- $map = '
';
- if ( true === $this->placeholder_enabled ) {
- $map .= $this->get_map_preview_html( $args['width'], $args['height'] );
- }
- $map .= '
';
-
- $map .= '';
+ $map .= '
