release: fixes

- Fixed showing PPOM fields in WC PDF invoices
- Fixed missing tooltips on some fields
- Fixed issue with uploaded files not showing in the order details

Author: vytisbulkevicius

classes/plugin.class.php

@@ -171,12 +171,11 @@ function __construct() {
 		add_filter( 'woocommerce_order_item_display_meta_key', 'ppom_woocommerce_order_key', 10, 3 );
 
 		// when email improvements feature enabled in woocommerce.
+		add_filter( 'woocommerce_order_item_display_meta_value', 'ppom_woocommerce_order_value', 10, 3 );
 		if ( ppom_wc_email_improvements_enabled() ) {
-			add_action( 'woocommerce_order_item_meta_end', 'ppom_woocommerce_order_item_meta_html', 10, 4 );
+			add_action( 'woocommerce_order_item_meta_end', 'ppom_woocommerce_order_item_meta_html', 10, 2 );
 			add_filter( 'woocommerce_display_item_meta', '__return_empty_string' );
-		} else {
-			// Few inputs like file/crop/image need to show meta value in tags
-			add_filter( 'woocommerce_order_item_display_meta_value', 'ppom_woocommerce_order_value', 10, 3 );
+			add_filter( 'wpo_ips_display_item_meta_html', 'ppom_invoice_packing_slips_html', 10, 3 );
 		}
 		// Hiding some additional field like ppom_has_quantities
 		add_filter( 'woocommerce_order_item_get_formatted_meta_data', 'ppom_woocommerce_hide_order_meta', 10, 2 );

composer.lock

@@ -37,7 +37,7 @@ function ppom_esc_html( $content ) {
 		'onclick'    => array(),
 		'onchange'   => array(),
 		'onkeyup'    => array(),
-		'data-*'     => array(),
+		'data-*'     => true, // allows all data-* attributes
 		'style'      => array(),
 	);
 	$allowedposttags['form']     = $allowed_atts;

inc/validation.php

@@ -1428,19 +1428,19 @@ function ppom_woocommerce_order_item_meta_html( $item_id, $item ) {
 	$meta_item_html = '';
 	$output_args = apply_filters( 'ppom_woocommerce_item_meta_args',
 		array(
-			'before'       => '<div>',
-			'after'        => '</div>',
-			'separator'    => '<br>',
-			'label_before' => '<span style="float: left;">',
-			'label_after'  => ':</span> ',
+			'before'       => '<ul class="wc-item-meta"><li>',
+			'after'        => '</li></ul>',
+			'separator'    => '</li><li>',
+			'label_before' => '<strong class="wc-item-meta-label">',
+			'label_after'  => ':</strong> ',
 		)
 	);
 	foreach ( $formatted_meta as $meta ) {
-		$strings[] = $output_args['before'] . $output_args['label_before'] . wp_kses_post( $meta->display_key ) . $output_args['label_after'] . ppom_woocommerce_order_value( $meta->display_value, $meta, $item ) . $output_args['after'];
+		$strings[] = $output_args['label_before'] . wp_kses_post( $meta->display_key ) . $output_args['label_after'] . ppom_woocommerce_order_value( $meta->display_value, $meta, $item );
 	}
 
 	if ( $strings ) {
-		$meta_item_html = implode( $output_args['separator'], $strings );
+		$meta_item_html = $output_args['before'] . implode( $output_args['separator'], $strings ) . $output_args['after'];
 	}
 	echo wp_kses_post( $meta_item_html );
 }
@@ -1452,4 +1452,39 @@ function ppom_woocommerce_order_item_meta_html( $item_id, $item ) {
  */
 function ppom_wc_email_improvements_enabled() {
 	return 'yes' === get_option( 'woocommerce_feature_email_improvements_enabled', 'no' );
+}
+
+/**
+ * Outputs the formatted meta data for invoice or packing slips.
+ *
+ * @param string $html HTML of the item meta data 
+ * @param \WC_Order_Item_Product $item The order item object.
+ * @param array $args arguments for display the html.
+ */
+function ppom_invoice_packing_slips_html( $html, $item, $args = array() ) {
+	$strings = array();
+	$args    = wp_parse_args(
+		$args,
+		array(
+			'before'       => '<ul class="wc-item-meta"><li>',
+			'after'        => '</li></ul>',
+			'separator'    => '</li><li>',
+			'echo'         => true,
+			'autop'        => false,
+			'label_before' => '<strong class="wc-item-meta-label">',
+			'label_after'  => ':</strong> ',
+		)
+	);
+
+	foreach ( $item->get_all_formatted_meta_data() as $meta_id => $meta ) {
+		$meta_value = ppom_woocommerce_order_value( $meta->display_value, $meta, $item );
+		$value      = $args['autop'] ? wp_kses_post( $meta_value ) : wp_kses_post( make_clickable( trim( $meta_value ) ) );
+		$strings[]  = $args['label_before'] . wp_kses_post( $meta->display_key ) . $args['label_after'] . $value;
+	}
+
+	if ( $strings ) {
+		$html = $args['before'] . implode( $args['separator'], $strings ) . $args['after'];
+	}
+
+	return $html;
 }