From 23bda74ecba4e4d4dba7ea8c6239bd7b13e9da47 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Thu, 15 Nov 2018 18:24:02 +0100 Subject: [PATCH] Match name of filter and db column for consistency --- .../admin/orders/controllers/orders_controller.js.coffee | 4 ++-- app/views/spree/admin/orders/_filters.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee index fa3da41519..338ec21f0b 100644 --- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee @@ -18,8 +18,8 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, $scope.fetchResults = (page=1) -> Orders.index({ - 'q[completed_at_lt]': $scope['q']['created_at_lt'], - 'q[completed_at_gt]': $scope['q']['created_at_gt'], + 'q[completed_at_lt]': $scope['q']['completed_at_lt'], + 'q[completed_at_gt]': $scope['q']['completed_at_gt'], 'q[state_eq]': $scope['q']['state_eq'], 'q[number_cont]': $scope['q']['number_cont'], 'q[email_cont]': $scope['q']['email_cont'], diff --git a/app/views/spree/admin/orders/_filters.html.haml b/app/views/spree/admin/orders/_filters.html.haml index 29b16b19a0..1fa1c2fe90 100644 --- a/app/views/spree/admin/orders/_filters.html.haml +++ b/app/views/spree/admin/orders/_filters.html.haml @@ -4,10 +4,10 @@ .date-range-filter.field = label_tag nil, t(:date_range) .date-range-fields - = text_field_tag "q[created_at_gt]", nil, class: 'datepicker', datepicker: 'q.created_at_gt', 'ng-model' => 'q.created_at_gt', :placeholder => t(:start) + = text_field_tag "q[completed_at_gt]", nil, class: 'datepicker', datepicker: 'q.completed_at_gt', 'ng-model' => 'q.completed_at_gt', :placeholder => t(:start) %span.range-divider %i.icon-arrow-right - = text_field_tag "q[created_at_lt]", nil, class: 'datepicker', datepicker: 'q.created_at_lt', 'ng-model' => 'q.created_at_lt', :placeholder => t(:stop) + = text_field_tag "q[completed_at_lt]", nil, class: 'datepicker', datepicker: 'q.completed_at_lt', 'ng-model' => 'q.completed_at_lt', :placeholder => t(:stop) .field = label_tag nil, t(:status) = select_tag("q[state_eq]",