release: fixes

- Fixed broken product page layout with Collapse field in use
- Fixed issue with files can't be downloaded from the Order Received email
- Updated dependencies

Author: vytisbulkevicius

backend/settings-panel.class.php

@@ -98,7 +98,7 @@ function __construct() {
 
 		add_action( 'admin_enqueue_scripts', array( $this, 'load_scripts' ), 999 );
 
-		add_action( 'in_admin_header', array( $this, 'remove_admin_notices' ), 99 );
+		// add_action( 'in_admin_header', array( $this, 'remove_admin_notices' ), 99 );
 		// delete_option('ppom_settings_migration_done');
 	}
 

classes/form.class.php

@@ -182,6 +182,10 @@ function( $collapse_field ) {
 
 				$section_started = true;
 				$ppom_collapse_counter ++;
+
+				if ( count( $fields ) === $ppom_field_counter ) {
+					echo '</div>';
+				}
 			}
 
 			// skip collapse div
@@ -218,14 +222,14 @@ function( $collapse_field ) {
 
 			$field_html .= '</div>';
 
-			if ( count( $collapse_fields ) === $ppom_collapse_counter && $section_started ) {
-				$section_started = false;
-			}
-
 			// Filter: nmforms_input_htmls
 			// @TODO need to change with relevant name
 			echo apply_filters( 'nmforms_input_html', $field_html, $meta, $default_value );
 
+			if ( count( $fields ) === $ppom_field_counter && $section_started ) {
+				echo '</div>';
+				$section_started = false;
+			}
 		}
 	}
 

classes/plugin.class.php

@@ -322,7 +322,7 @@ function __construct() {
 		// NOTE: Debug only
 		// delete_option('ppom_demo_meta_installed');
 
-		add_action( 'in_admin_header', 'ppom_hooks_remove_admin_notices', 99 );
+		// add_action( 'in_admin_header', 'ppom_hooks_remove_admin_notices', 99 );
 
 		add_filter( 'woocommerce_order_again_cart_item_data', 'ppom_wc_order_again_compatibility', 10, 3 );
 		// Show description tooltip.

composer.lock

@@ -1863,6 +1863,14 @@ header.ppom-modal-header {
     text-decoration: none;
 }
 
-.ppom-banner:has(.tsdk-banner-cta) {
-    margin: 20px 0;
+div.ppom-banner .themeisle-sale {
+    margin: 0 0 10px 0;
 }
+
+.ppom-banner .themeisle-sale-title {
+    font-size: 14px;
+}
+
+.ppom-banner .themeisle-sale .themeisle-sale-action a {
+    text-decoration: none;
+}

css/ppom-admin.css

@@ -821,3 +821,47 @@ function ppom_admin_bar_menu() {
 		);
 	}
 }
+
+/**
+ * Set Black Friday data.
+ *
+ * @param array $configs The configuration array for the loaded products.
+ *
+ * @return array
+ */
+function ppom_add_black_friday_data( $configs ) {
+	$config = $configs['default'];
+
+	// translators: %1$s - HTML tag, %2$s - discount, %3$s - HTML tag, %4$s - product name.
+	$message_template = __( 'Our biggest sale of the year: %1$sup to %2$s OFF%3$s on %4$s. Don\'t miss this limited-time offer.', 'woocommerce-product-addon' );
+	$product_label    = 'PPOM';
+	$discount         = '70%';
+
+	$plan    = apply_filters( 'product_ppom_license_plan', 0 );
+	$license = apply_filters( 'product_ppom_license_key', false );
+	$is_pro  = 0 < $plan;
+
+	if ( $is_pro ) {
+		// translators: %1$s - HTML tag, %2$s - discount, %3$s - HTML tag, %4$s - product name.
+		$message_template = __( 'Get %1$sup to %2$s off%3$s when you upgrade your %4$s plan or renew early.', 'woocommerce-product-addon' );
+		$product_label    = 'PPOM Pro';
+		$discount         = '30%';
+	}
+	
+	$product_label = sprintf( '<strong>%s</strong>', $product_label );
+	$url_params    = array(
+		'utm_term' => $is_pro ? 'plan-' . $plan : 'free',
+		'lkey'     => ! empty( $license ) ? $license : false,
+	);
+	
+	$config['message']  = sprintf( $message_template, '<strong>', $discount, '</strong>', $product_label );
+	$config['sale_url'] = add_query_arg(
+		$url_params,
+		tsdk_translate_link( tsdk_utmify( 'https://themeisle.link/ppom-bf', 'bfcm', 'ppom' ) )
+	);
+
+	$configs[ PPOM_PRODUCT_SLUG ] = $config;
+
+	return $configs;
+}
+add_filter( 'themeisle_sdk_blackfriday_data', 'ppom_add_black_friday_data' );

images/black-friday.jpg

@@ -142,7 +142,8 @@ function ppom_create_thumb_for_meta( $file_name, $product_id, $cropped = false,
  * @return string The new file name.
  */
 function ppom_create_unique_file_name( $file_name, $file_ext ) {
-	return $file_name . "." . base64_encode( substr( wp_hash_password( $file_name ), 0, 8 ) ) . "." . $file_ext;
+    $seed = $file_name . microtime( true ) . mt_rand();
+    return $file_name . "." . wp_hash( $seed ) . "." . $file_ext;
 }
 
 final class UploadFileErrors {

inc/admin.php

@@ -1595,17 +1595,9 @@ function ppom_generate_html_for_files( $file_names, $input_type, $item ) {
 		$is_image_file       = ppom_is_file_image( $file_path );
 		$ppom_file_thumb_url = $is_image_file ? $file_path : PPOM_URL . '/images/file.png';
 		$order_html         .= '<tr><td class="ppom-files-display">';
-
-		if ( $is_image_file ) {
-			$order_html .= '<a target="_blank" href="' . esc_url( $ppom_file_url ) . '">';
-		}
-
-		$order_html .= '<img class="img-thumbnail" style="width:' . esc_attr( ppom_get_thumbs_size() ) . '" src="' . esc_url( $ppom_file_thumb_url ) . '">';
-
-		if ( $is_image_file ) {
-			$order_html .= '</a>';
-		}
-
+		$order_html         .= '<a target="_blank" href="' . esc_url( $ppom_file_url ) . '">';
+		$order_html         .= '<img class="img-thumbnail" style="width:' . esc_attr( ppom_get_thumbs_size() ) . '" src="' . esc_url( $ppom_file_thumb_url ) . '">';
+		$order_html         .= '</a>';
 
 		// Requested by Kevin, hiding downloading file button after order on thank you page
 		// @since version 16.6