Merge remote-tracking branch '36949/venchiarutti-patch-1' into community_prs_march

Author: Indrani Sonawane

app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Query/OrderFilter.php

@@ -25,6 +25,8 @@ class OrderFilter
      */
     private $fieldTranslatorArray = [
         'number' => 'increment_id',
+        'order_date' => 'created_at',
+        'grand_total' => 'base_grand_total',
     ];
 
     /**
@@ -73,6 +75,7 @@ public function createFilterGroups(
         array $storeIds
     ): array {
         $filterGroups = [];
+        $filter = [];
         $this->filterGroupBuilder->setFilters(
             [$this->filterBuilder->setField('customer_id')->setValue($userId)->setConditionType('eq')->create()]
         );
@@ -85,7 +88,6 @@ public function createFilterGroups(
         $filterGroups[] = $this->filterGroupBuilder->create();
 
         if (isset($args['filter'])) {
-            $filters = [];
             foreach ($args['filter'] as $field => $cond) {
                 if (isset($this->fieldTranslatorArray[$field])) {
                     $field = $this->fieldTranslatorArray[$field];
@@ -96,21 +98,21 @@ public function createFilterGroups(
                             throw new InputException(__('Invalid match filter'));
                         }
                         $searchValue = $value !== null ? str_replace('%', '', $value) : '';
-                        $filters[] = $this->filterBuilder->setField($field)
+                        $filter = $this->filterBuilder->setField($field)
                             ->setValue("%{$searchValue}%")
                             ->setConditionType('like')
                             ->create();
                     } else {
-                        $filters[] = $this->filterBuilder->setField($field)
+                        $filter = $this->filterBuilder->setField($field)
                             ->setValue($value)
                             ->setConditionType($condType)
                             ->create();
                     }
                 }
-            }
 
-            $this->filterGroupBuilder->setFilters($filters);
-            $filterGroups[] = $this->filterGroupBuilder->create();
+                $this->filterGroupBuilder->setFilters([$filter]);
+                $filterGroups[] = $this->filterGroupBuilder->create();
+            }
         }
         return $filterGroups;
     }

app/code/Magento/SalesGraphQl/etc/schema.graphqls

@@ -33,7 +33,10 @@ type Customer {
 }
 
 input CustomerOrdersFilterInput @doc(description: "Identifies the filter to use for filtering orders.") {
+    order_date: FilterRangeTypeInput @doc(description: "Filters by order created_at time.")
+    status: FilterEqualTypeInput @doc(description: "Filters by order status.")
     number: FilterStringTypeInput @doc(description: "Filters by order number.")
+    grand_total: FilterRangeTypeInput @doc(description: "Filters by order base grand total value.")
 }
 
 input CustomerOrderSortInput @doc(description: "CustomerOrderSortInput specifies the field to use for sorting search results and indicates whether the results are sorted in ascending or descending order.") {