From d00e75de70821663fc4e8c8dfafd94f066768c1c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Fri, 3 Feb 2023 11:40:07 +0100 Subject: [PATCH] We should load orders that are linked to line_items displayed This should not be related to any pagination, search or whatever: actually we consolidate line_items with order additional info based on line_items.order.id. --- .../controllers/line_items_controller.js.coffee | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index 022e6be244..a817bbaaac 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -53,18 +53,8 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $scope.dereferenceLoadedData() $scope.loadOrders = -> - [formattedStartDate, formattedEndDate] = $scope.formatDates($scope.startDate, $scope.endDate) - RequestMonitor.load $scope.orders = Orders.index( - "q[state_not_eq]": "canceled", - "q[shipment_state_not_eq]": "shipped", - "q[completed_at_not_null]": "true", - "q[distributor_id_eq]": $scope.distributorFilter, - "q[order_cycle_id_eq]": $scope.orderCycleFilter, - "q[completed_at_gteq]": if formattedStartDate then formattedStartDate else undefined, - "q[completed_at_lt]": if formattedEndDate then formattedEndDate else undefined, - "page": $scope.page, - "per_page": $scope.per_page + "q[id_in][]": $scope.line_items.map((line_item) -> line_item.order.id) ) $scope.loadLineItems = ->