Merge pull request #198 from TycheSoftwares/revert-190-issue-150

Revert "issue-150"

Author: Shasvat7

woocommerce-delivery-notes/includes/wcdn-template-functions.php

@@ -640,4 +640,28 @@ function wcdn_print_extra_fields( $item ) {
 	}
 
 }
+
+/**
+ * Function to show the correct quantity on the frontend when Composite/Bundle products are there.
+ *
+ * @param int      $count Total Quantity.
+ * @param string   $type Item Type.
+ * @param WC_Order $order Order object.
+ */
+function wcdn_order_item_count( $count, $type, $order ) {
+	global $wp;
+	// Check that print button is been clicked or not.
+	if ( ! empty( $wp->query_vars['print-order'] ) ) {
+		if ( in_array( 'woocommerce-composite-products/woocommerce-composite-products.php', apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) ), true ) || in_array( 'woocommerce-product-bundles/woocommerce-product-bundles.php', apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) ), true ) ) {
+			if ( function_exists( 'is_account_page' ) && is_account_page() ) {
+				$count = 0;
+				foreach ( $order->get_items() as $item ) {
+					$count += $item->get_quantity();
+				}
+			}
+		}
+	}
+	return $count;
+}
+add_filter( 'woocommerce_get_item_count', 'wcdn_order_item_count', 20, 3 );
 ?>

woocommerce-delivery-notes/templates/print-order/print-content.php

@@ -228,62 +228,13 @@
 								<?php do_action( 'wcdn_order_item_after', $product, $order, $item ); ?>
 							</td>
 							<td class="product-item-price">
-								<span>
-								<?php
-								$product_meta_datas = $item->get_meta_data();
-								$price_individually = '';
-								$no_price           = false;
-								if ( is_array( $product_meta_datas ) ) {
-									foreach ( $product_meta_datas as $product_meta_data ) {
-										if ( isset( $product_meta_data->key ) ) {
-											if ( '_bundled_items' === $product_meta_data->key || '_composite_children' === $product_meta_data->key ) {
-													$no_price = true;
-											}
-											if ( '_bundled_item_priced_individually' === $product_meta_data->key || '_component_priced_individually' === $product_meta_data->key ) {
-												$price_individually = $product_meta_data->value;
-											}
-										}
-									}
-								}
-								if ( 'no' === $price_individually ) {
-									echo '';
-								} elseif ( true === $no_price ) {
-									echo wp_kses_post( $order->get_formatted_line_subtotal( $item ) );
-								} else {
-									echo wp_kses_post( wcdn_get_formatted_item_price( $order, $item ) );
-								}
-								?>
-								</span>
+								<span><?php echo wp_kses_post( wcdn_get_formatted_item_price( $order, $item ) ); ?></span>
 							</td>
 							<td class="product-quantity">
-								<span>
-								<?php
-								$product_meta_datas = $item->get_meta_data();
-								if ( is_array( $product_meta_datas ) ) {
-									foreach ( $product_meta_datas as $product_meta_data ) {
-										if ( isset( $product_meta_data->key ) ) {
-											if ( '_composite_children' === $product_meta_data->key || '_bundled_items' === $product_meta_data->key ) {
-												$item['qty'] = 0;
-											} else {
-												continue;
-											}
-										}
-									}
-								}
-								if ( 0 === $item['qty'] ) {
-									echo '';
-								} else {
-									echo esc_attr( apply_filters( 'wcdn_order_item_quantity', $item['qty'], $item ) );
-								}
-								?>
-								</span>
+								<span><?php echo esc_attr( apply_filters( 'wcdn_order_item_quantity', $item['qty'], $item ) ); ?></span>
 							</td>
 							<td class="product-price">
-								<span>
-								<?php
-								echo wp_kses_post( $order->get_formatted_line_subtotal( $item ) );
-								?>
-								</span>
+								<span><?php echo wp_kses_post( $order->get_formatted_line_subtotal( $item ) ); ?></span>
 							</td>
 						</tr>
 					<?php endforeach; ?>
@@ -302,7 +253,7 @@
 							<td class="total-item-price"></td>
 							<?php if ( 'Total' === $total['label'] ) { ?>
 							<td class="total-quantity"><?php echo wp_kses_post( $order->get_item_count() ); ?></td>
-							<?php } else { ?>
+							<?php } else {  ?>
 							<td class="total-quantity"></td>
 							<?php } ?>
 							<td class="total-price"><span><?php echo wp_kses_post( $total['value'] ); ?></span></td>