fix: file conflicts

Author: girishpanchal30

.releaserc.yml

@@ -9,7 +9,7 @@ plugins:
   - - "@semantic-release/release-notes-generator"
     - preset: simple-preset
   - - "@semantic-release/exec"
-    - prepareCmd: "export nextReleaseNotes="${nextRelease.notes}" && node bin/update-changelog.js"
+    - prepareCmd: "export nextReleaseNotes=\"${nextRelease.notes}\" && node bin/update-changelog.js"
   - - "@semantic-release/exec"
     - prepareCmd: grunt version::${nextRelease.version} && grunt wp_readme_to_markdown
   - - "semantic-release-slack-bot"

CHANGELOG.md

@@ -1,3 +1,10 @@
+##### [Version 33.0.9](https://github.com/Codeinwp/woocommerce-product-addon/compare/v33.0.8...v33.0.9) (2025-01-08)
+
+- Improved tooltip style in the dashboard
+- Enhanced security
+- Improved translatable strings
+- Fixed conditional field display issue with a select option
+
 ##### [Version 33.0.8](https://github.com/Codeinwp/woocommerce-product-addon/compare/v33.0.7...v33.0.8) (2024-11-08)
 
 - Fixed issue with multiple checked options not displaying as checked by default

classes/fields.class.php

@@ -990,6 +990,8 @@ function render_all_input_types( $name, $data, $fields_type, $field_index, $valu
 					$html_input .= '</div>';
 
 					$html_input .= '<div class="col-md-3 col-sm-3">';
+					$html_input .= '<select name="ppom[' . esc_attr( $field_index ) . '][conditions][rules][0][element_values]" class="form-control ppom-conditional-keys ppom-hide-element" data-metatype="element_values">';
+					$html_input .= '</select>';
 					$html_input .= '<input name="ppom[' . esc_attr( $field_index ) . '][conditions][rules][0][element_constant]" class="form-control ppom-conditional-keys ppom-hide-element" data-metatype="element_constant"  >';
 
 					$html_input .= '<div class="ppom-between-input-container ppom-hide-element"> ';

classes/frontend-scripts.class.php

@@ -444,6 +444,9 @@ public static function load_scripts_by_product_id( $product_id, $ppom_id = null,
 								break;
 						}
 
+						if ( ! empty( $fields_meta['description'] ) ) {
+							$fields_meta['description'] = wp_strip_all_tags( html_entity_decode( $fields_meta['description'] ) );
+						}
 						$inputs_meta_updated[] = $fields_meta;
 
 						// Conditional fields

classes/input-meta.class.php

@@ -155,7 +155,7 @@ function field_label( $tooltip = true, $desc = true, $asterisk = true ) {
 
 		$asterisk_symbol = ( ! empty( $this->required() ) && $this->title() != '' ) ? '<span class="show_required"> *</span>' : '';
 
-		$show_desc = ( ! empty( $this->desc() ) ) ? '<span class="show_description ppom-input-desc">' . $this->desc() . '</span>' : '';
+		$show_desc = ( ! empty( $this->desc() ) ) ? '<span class="show_description ppom-input-desc">' . wp_strip_all_tags( html_entity_decode( $this->desc() ) ) . '</span>' : '';
 
 		if ( $desc ) {
 			$show_desc = apply_filters( 'ppom_field_description', $show_desc, self::$input_meta );

classes/plugin.class.php

@@ -974,6 +974,7 @@ function add_ppom_meta_panel() {
 	public function show_tooltip( $description, $meta ) {
 		$input_desc = ! empty( $meta['description'] ) ? $meta['description'] : '';
 		$input_desc = apply_filters( 'ppom_description_content', stripslashes( $input_desc ), $meta );
+		$input_desc = wp_strip_all_tags( html_entity_decode( $input_desc ) );
 
 		// Check if the tooltip is enabled.
 		if ( isset( $meta['desc_tooltip'] ) && 'on' === $meta['desc_tooltip'] ) {

composer.lock

@@ -1563,8 +1563,6 @@ header.ppom-modal-header {
     flex-direction: column;
     gap: 30px;
     max-height: 600px;
-    overflow-y: auto;
-    overflow-x: hidden;
     scrollbar-color: #D8D8D8 white;
     padding-right: 20px;
 }
@@ -1631,6 +1629,8 @@ header.ppom-modal-header {
 
 .ppom-fields:has(.ppom-fields-sections) {
     padding: 10px 10px 20px 40px;
+    overflow-y: auto;
+    overflow-x: hidden;
 }
 
 .ppom-search-container input::placeholder {