Merge pull request #815 from lightspeedwp/feature/unit-blocks

Feature: Unit Blocks – merge into 2.1-trunk

Author: krugazul

build/blocks/best-time-to-visit/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-i18n'), 'version' => '9ba000a8a02a2bb9a226');
+<?php return array('dependencies' => array('wp-i18n'), 'version' => 'c99848e4f2a2d6c84956');

build/blocks/best-time-to-visit/index.js

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-i18n'), 'version' => '8d09f715be4f181bbfe6');
+<?php return array('dependencies' => array('wp-i18n'), 'version' => 'aac926357ff1bfa1b40c');

build/blocks/destination-to-tour/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '606577136053e22dca6d');
+<?php return array('dependencies' => array(), 'version' => 'df0054a1a528af11bb7b');

build/blocks/destination-to-tour/index.js

@@ -34,6 +34,7 @@
 - **Sticky Menu Block** - Added sticky navigation menu block with desktop and mobile navigation support for single post templates, includes anchor support and section group functionality - [#684](https://github.com/lightspeedwp/tour-operator/pull/684), Issue [#496](https://github.com/lightspeedwp/tour-operator/issues/496)
 - **TO Videos Block** - Added YouTube video gallery block for displaying videos on tours, accommodation, and destination templates in a professional gallery layout - [#598](https://github.com/lightspeedwp/tour-operator/pull/598), Issue [#397](https://github.com/lightspeedwp/tour-operator/issues/397)
 - **Check-in/Checkout Time Icon Blocks** - Added icon-based blocks (replacing images) for check-in and checkout times with filters to display only on relevant post types (accommodation) and related templates - [#645](https://github.com/lightspeedwp/tour-operator/pull/645)
+- **Unit Blocks** - Added comprehensive unit blocks functionality with refined assets and WordPress coding standards alignment - [#815](https://github.com/lightspeedwp/tour-operator/pull/815)
 
 #### Features & Integrations
 

build/paragraph-prefix.asset.php

@@ -308,15 +308,18 @@ public function render_itinerary_block( $block_content, $parsed_block, $block_ob
 			return $block_content;
 		}
 
-		$pattern = $block_content;
-		$group   = array();
+		$build_template = $block_content;
+		$group          = array();
+
+		//$pattern_registry = \WP_Block_Patterns_Registry::get_instance();
+		//$pattern_registry->get_registered();
 
 		// Iterate through and build our itinerary from the block content template.
 		if ( lsx_to_has_itinerary() ) {
 			$itinerary_count = 1;
 			while ( lsx_to_itinerary_loop() ) {
 				lsx_to_itinerary_loop_item();
-				$build = $pattern;
+				$build = $build_template;
 
 				foreach ( $this->itinerary_fields as $field ) {
 					$build = $this->build_itinerary_field( $build, $field, $itinerary_count );
@@ -343,6 +346,7 @@ public function render_itinerary_block( $block_content, $parsed_block, $block_ob
 	public function build_itinerary_field( $build = '', $field = '', $count = 1 ) {
 		$pattern = '';
 		$value   = '';
+		$prefix  = '';
 
 		switch ( $field ) {
 			case 'title':
@@ -366,26 +370,31 @@ public function build_itinerary_field( $build = '', $field = '', $count = 1 ) {
 			case 'location':
 				$value   = lsx_to_itinerary_destinations( '', '', false );
 				$pattern = '/(<p\s+[^>]*\bclass="[^"]*\bitinerary-location\b[^"]*"[^>]*>).*?(<\/p>)/is';
+				$prefix  = $this->maybe_get_prefix( 'itinerary-location', $build );
 				break;
 
 			case 'accommodation':
 				$value   = lsx_to_itinerary_accommodation( '', '', false );
 				$pattern = '/(<p\s+[^>]*\bclass="[^"]*\bitinerary-accommodation\b[^"]*"[^>]*>).*?(<\/p>)/is';
+				$prefix  = $this->maybe_get_prefix( 'itinerary-accommodation', $build );
 				break;
 
 			case 'type':
 				$value   = lsx_to_itinerary_accommodation_type( '', '', false );
 				$pattern = '/(<p\s+[^>]*\bclass="[^"]*\bitinerary-type\b[^"]*"[^>]*>).*?(<\/p>)/is';
+				$prefix  = $this->maybe_get_prefix( 'itinerary-type', $build );
 				break;
 
 			case 'drinks':
 				$value   = lsx_to_itinerary_drinks_basis( '', '', false );
 				$pattern = '/(<p\s+[^>]*\bclass="[^"]*\bitinerary-drinks\b[^"]*"[^>]*>).*?(<\/p>)/is';
+				$prefix  = $this->maybe_get_prefix( 'itinerary-drinks', $build );
 				break;
 
 			case 'room':
 				$value   = lsx_to_itinerary_room_basis( '', '', false );
 				$pattern = '/(<p\s+[^>]*\bclass="[^"]*\bitinerary-room\b[^"]*"[^>]*>).*?(<\/p>)/is';
+				$prefix  = $this->maybe_get_prefix( 'itinerary-room', $build );
 				break;
 
 			case 'included':
@@ -408,6 +417,9 @@ public function build_itinerary_field( $build = '', $field = '', $count = 1 ) {
 		if ( '' === $value || false === $value || empty( $value ) ) {
 			$pattern = '/\bitin-' . $field . '-wrapper\b/';
 			$value   = 'hidden itin-' . $field . '-wrapper';
+		} else {
+			// Or set the prefix.
+			$value = $prefix . $value;
 		}
 
 		$replacement = '$1' . $value . '$2';
@@ -416,6 +428,14 @@ public function build_itinerary_field( $build = '', $field = '', $count = 1 ) {
 		return $build;
 	}
 
+	public function maybe_get_prefix( $key, $build ) {
+		$pattern = '/<p\s+[^>]*\bclass="[^"]*\b' . esc_attr( $key ) . '\b[^"]*"[^>]*>(.*?)<\/p>/is';
+		if ( preg_match( $pattern, $build, $matches ) ) {
+			return str_replace( 'Card Link', '', $matches[1] );
+		}
+		return '';
+	}
+
 	/**
 	 * Modifies the HTML content by updating the innerHTML of any heading tag (h1-h6)
 	 * that has the class "itinerary-title" with the result of the lsx_to_itinerary_title function.