Sort by order_date desc for line_items in BOM

+ update spec to have different order time
This commit is contained in:
Jean-Baptiste Bellet
2023-05-25 17:00:49 +02:00
parent a785b4d5e0
commit ccb183d60b
3 changed files with 5 additions and 4 deletions

View File

@@ -9,6 +9,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
$scope.sharedResource = false
$scope.columns = Columns.columns
$scope.sorting = SortOptions
$scope.sorting.toggle("order_date")
$scope.pagination = LineItems.pagination
$scope.per_page_options = [
{id: 15, name: t('js.admin.orders.index.per_page', results: 15)},
@@ -79,6 +80,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
"q[order_order_cycle_id_eq]": $scope.orderCycleFilter,
"q[order_completed_at_gteq]": if formattedStartDate then formattedStartDate else undefined,
"q[order_completed_at_lt]": if formattedEndDate then formattedEndDate else undefined,
"q[s]": "order_completed_at desc",
"page": $scope.page,
"per_page": $scope.per_page
)

View File

@@ -12,8 +12,7 @@ module Admin
@line_items = order_permissions.
editable_line_items.where(order_id: orders).
includes(:variant).
ransack(params[:q]).result.
reorder('spree_line_items.order_id ASC, spree_line_items.id ASC')
ransack(params[:q]).result
@pagy, @line_items = pagy(@line_items) if pagination_required?

View File

@@ -83,11 +83,11 @@ describe '
}
let!(:o2) {
create(:order_with_distributor, state: 'complete', shipment_state: 'ready',
completed_at: Time.zone.now )
completed_at: Time.zone.yesterday )
}
let!(:o3) {
create(:order_with_distributor, state: 'complete', shipment_state: 'ready',
completed_at: Time.zone.now )
completed_at: Time.zone.yesterday - 1.day )
}
let!(:product) {
create(:simple_product)