PES-564: order grid fix (#134)

* PES-564: order grid fix

* PES-564: order grid fix - request usage

* PES-564: order grid fix - Honza CR

* PES-564: order grid fix - readme update

Co-authored-by: Filip Jiskra <[email protected]>

Author: FJiskra

packetery/readme.txt

@@ -74,6 +74,7 @@ Please contact us at [email protected] .
 = 1.0.7 =
 * Fixed: the label print page displays a message to the user if no suitable orders are selected
 * Fixed: Some environments caused error due PHPDocs being removed by OPCache.
+* Fixed: Order list filters can now be combined.
 
 = 1.0.6 =
 * Updated: carrier settings page errors highlighted

packetery/src/Packetery/Module/Order/GridExtender.php

@@ -86,10 +86,12 @@ public function addFilterLinks( array $var ): array {
 		$latteParams = [
 			'link'       => add_query_arg(
 				[
-					'post_status'         => false,
+					'post_type'           => 'shop_order',
+					'filter_action'       => 'packetery_filter_link',
 					'packetery_to_submit' => '1',
 					'packetery_to_print'  => false,
-				]
+				],
+				admin_url( 'edit.php' )
 			),
 			'title'      => __( 'packetaOrdersToSubmit', 'packetery' ),
 			'orderCount' => count( $orders ),
@@ -106,10 +108,12 @@ public function addFilterLinks( array $var ): array {
 		$latteParams = [
 			'link'       => add_query_arg(
 				[
-					'post_status'         => false,
+					'post_type'           => 'shop_order',
+					'filter_action'       => 'packetery_filter_link',
 					'packetery_to_submit' => false,
 					'packetery_to_print'  => '1',
-				]
+				],
+				admin_url( 'edit.php' )
 			),
 			'title'      => __( 'packetaOrdersToPrint', 'packetery' ),
 			'orderCount' => count( $orders ),
@@ -124,16 +128,27 @@ public function addFilterLinks( array $var ): array {
 	 * Adds select to order grid.
 	 */
 	public function renderOrderTypeSelect(): void {
+		$linkFilters = [];
+
+		if ( null !== $this->httpRequest->getQuery( 'packetery_to_submit' ) ) {
+			$linkFilters['packetery_to_submit'] = '1';
+		}
+
+		if ( null !== $this->httpRequest->getQuery( 'packetery_to_print' ) ) {
+			$linkFilters['packetery_to_print'] = '1';
+		}
+
 		$this->latteEngine->render(
 			PACKETERY_PLUGIN_DIR . '/template/order/type-select.latte',
 			[
 				'packeteryOrderType' => $this->httpRequest->getQuery( 'packetery_order_type' ),
+				'linkFilters'        => $linkFilters,
 			]
 		);
 	}
 
 	/**
-	 * Adds query vars to order list request.
+	 * Adds query vars to request query vars.
 	 *
 	 * @param array $queryVars Query vars.
 	 *
@@ -143,7 +158,31 @@ public function addQueryVarsToRequest( array $queryVars ): array {
 		global $typenow;
 
 		if ( in_array( $typenow, wc_get_order_types( 'order-meta-boxes' ), true ) ) {
-			$queryVars = $this->addQueryVars( $queryVars, $this->httpRequest->getQuery() );
+			$metaVars = $this->addQueryVars( ( $queryVars['meta_query'] ?? [] ), $this->httpRequest->getQuery() );
+			if ( $metaVars ) {
+				// @codingStandardsIgnoreStart
+				$queryVars['meta_query'] = $metaVars;
+				// @codingStandardsIgnoreEnd
+			}
+		}
+
+		return $queryVars;
+	}
+
+	/**
+	 * Transforms custom query var. There are two custom variables: "packetery_to_submit" and "packetery_to_print".
+	 *
+	 * @param array $queryVars Query vars.
+	 * @param array $get       Input values.
+	 *
+	 * @return array
+	 */
+	public function handleCustomQueryVar( array $queryVars, array $get ): array {
+		$metaQuery = $this->addQueryVars( ( $queryVars['meta_query'] ?? [] ), $get );
+		if ( $metaQuery ) {
+			// @codingStandardsIgnoreStart
+			$queryVars['meta_query'] = $metaQuery;
+			// @codingStandardsIgnoreEnd
 		}
 
 		return $queryVars;
@@ -159,7 +198,7 @@ public function addQueryVarsToRequest( array $queryVars ): array {
 	 */
 	public function addQueryVars( array $queryVars, array $get ): array {
 		if ( ! empty( $get[ Entity::META_CARRIER_ID ] ) ) {
-			$queryVars['meta_query'] = [
+			$queryVars[] = [
 				[
 					'key'     => Entity::META_CARRIER_ID,
 					'value'   => $get[ Entity::META_CARRIER_ID ],
@@ -169,41 +208,35 @@ public function addQueryVars( array $queryVars, array $get ): array {
 		}
 
 		if ( ! empty( $get['packetery_to_submit'] ) ) {
-			$queryVars['meta_query'] = [
-				'relation' => 'AND',
-				[
-					'key'     => Entity::META_CARRIER_ID,
-					'value'   => '',
-					'compare' => '!=',
-				],
-				[
-					'key'     => Entity::META_IS_EXPORTED,
-					'compare' => 'NOT EXISTS',
-				],
+			$queryVars[] = [
+				'key'     => Entity::META_CARRIER_ID,
+				'value'   => '',
+				'compare' => '!=',
+			];
+
+			$queryVars[] = [
+				'key'     => Entity::META_IS_EXPORTED,
+				'compare' => 'NOT EXISTS',
 			];
 		}
 
 		if ( ! empty( $get['packetery_to_print'] ) ) {
-			$queryVars['meta_query'] = [
-				'relation' => 'AND',
-				[
-					'key'     => Entity::META_PACKET_ID,
-					'compare' => 'EXISTS',
-				],
-				[
-					'key'     => Entity::META_IS_LABEL_PRINTED,
-					'compare' => 'NOT EXISTS',
-				],
+			$queryVars[] = [
+				'key'     => Entity::META_PACKET_ID,
+				'compare' => 'EXISTS',
+			];
+
+			$queryVars[] = [
+				'key'     => Entity::META_IS_LABEL_PRINTED,
+				'compare' => 'NOT EXISTS',
 			];
 		}
 
 		if ( ! empty( $get['packetery_order_type'] ) ) {
-			$queryVars['meta_query'] = [
-				[
-					'key'     => Entity::META_CARRIER_ID,
-					'value'   => Repository::INTERNAL_PICKUP_POINTS_ID,
-					'compare' => ( Repository::INTERNAL_PICKUP_POINTS_ID === $get['packetery_order_type'] ? '=' : '!=' ),
-				],
+			$queryVars[] = [
+				'key'     => Entity::META_CARRIER_ID,
+				'value'   => Repository::INTERNAL_PICKUP_POINTS_ID,
+				'compare' => ( Repository::INTERNAL_PICKUP_POINTS_ID === $get['packetery_order_type'] ? '=' : '!=' ),
 			];
 		}
 

packetery/src/Packetery/Module/Plugin.php

@@ -240,10 +240,10 @@ static function () {
 
 		add_filter( 'views_edit-shop_order', [ $this->gridExtender, 'addFilterLinks' ] );
 		add_action( 'restrict_manage_posts', [ $this->gridExtender, 'renderOrderTypeSelect' ] );
-		add_filter( 'request', [ $this->gridExtender, 'addQueryVarsToRequest' ] );
+		add_filter( 'request', [ $this->gridExtender, 'addQueryVarsToRequest' ], PHP_INT_MAX );
 		add_filter( 'manage_edit-shop_order_columns', [ $this->gridExtender, 'addOrderListColumns' ] );
 		add_action( 'manage_shop_order_posts_custom_column', [ $this->gridExtender, 'fillCustomOrderListColumns' ] );
-		add_filter( 'woocommerce_order_data_store_cpt_get_orders_query', [ $this->gridExtender, 'addQueryVars' ], 10, 2 );
+		add_filter( 'woocommerce_order_data_store_cpt_get_orders_query', [ $this->gridExtender, 'handleCustomQueryVar' ], 10, 2 );
 
 		add_action( 'admin_menu', array( $this, 'add_menu_pages' ) );
 		add_action( 'admin_head', array( $this->labelPrint, 'hideFromMenus' ) );

packetery/template/order/type-select.latte

@@ -4,3 +4,6 @@
 	<option value="packeta"{if $packeteryOrderType === Packetery\Module\Carrier\Repository::INTERNAL_PICKUP_POINTS_ID}
 		selected="selected"{/if}>{__( 'packetaPickupPointPackets', 'packetery' )}</option>
 </select>
+{foreach $linkFilters as $name => $value}
+	<input type="hidden" name="{$name}" value="{$value}">
+{/foreach}