raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-24 05:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

When selecting an OC, do not pre-fill date range with OC date range

Browse Source 
+ update specs as well
This commit is contained in:
Jean-Baptiste Bellet
2023-01-05 15:09:53 +01:00
parent 121a4a08af
commit 85a748af99
3 changed files with 1 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
View File

@@ -38,21 +38,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
$scope.dereferenceLoadedData()
$scope.setOrderCycleDateRange = ->
start_date = OrderCycles.byID[$scope.orderCycleFilter].orders_open_at
end_date = OrderCycles.byID[$scope.orderCycleFilter].orders_close_at
format = "YYYY-MM-DD HH:mm:ss Z"
$scope.startDate = moment(start_date, format).format('YYYY-MM-DD')
$scope.endDate = moment(end_date, format).startOf('day').format('YYYY-MM-DD')
# throw a flatpickr:change event to change the date back in the datepicker
event = new CustomEvent('flatpickr:change', {
detail: {
startDate: $scope.startDate,
endDate: $scope.endDate
}
})
window.dispatchEvent(event)
$scope.loadOrders = ->
[formattedStartDate, formattedEndDate] = $scope.formatDates($scope.startDate, $scope.endDate)

2
app/views/spree/admin/orders/bulk_management.html.haml
View File

@@ -32,7 +32,7 @@
%label{ :for => 'order_cycle_filter' }
= t("admin.order_cycle")
%br
%input#order_cycle_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'orderCycles', placeholder: "#{t(:all)}", blank: "{ id: '', name: '#{t(:all)}' }", on: { selecting: "confirmRefresh" }, ng: { model: 'orderCycleFilter', change: "setOrderCycleDateRange()" } }
%input#order_cycle_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'orderCycles', placeholder: "#{t(:all)}", blank: "{ id: '', name: '#{t(:all)}' }", on: { selecting: "confirmRefresh" }, ng: { model: 'orderCycleFilter' } }
.date_filter{class: "four columns"}
%label
= t("date_range")

32
spec/system/admin/bulk_order_management_spec.rb
View File

@@ -466,38 +466,6 @@ describe '
page.find('.filter-actions .button.icon-search').click
displays_default_orders
end
it "selecting an OC pre-selects the date range from that OC" do
displays_default_orders
click_on_select2 oc3.name, from: "order_cycle_filter"
expect(find("input.datepicker").value).to eq "#{oc3.orders_open_at.strftime('%F')} to #{oc3.orders_close_at.strftime('%F')}"
displays_default_orders
click_on_select2 oc1.name, from: "order_cycle_filter"
displays_default_orders
expect(find("input.datepicker").value).to eq "#{oc1.orders_open_at.strftime('%F')} to #{oc1.orders_close_at.strftime('%F')}"
# only filters results after clicking the 'Filter Results' button
displays_default_orders
page.find('.filter-actions .button.icon-search').click
expect(page).to have_selector "tr#li_#{li1.id}"
expect(page).to_not have_selector "tr#li_#{li2.id}"
# only filters results after clicking the 'Clear Filters' button resets to display the default results
page.find("#clear_filters_button").click
displays_default_orders
end
xit "allows combining the order cycle and the pre-selected date with a custom date" do
# pending (#10192)
click_on_select2 oc3.name, from: "order_cycle_filter"
expect(find("input.datepicker").value).to eq "#{oc3.orders_open_at.strftime('%F')} to #{oc3.orders_close_at.strftime('%F')}"
page.find('.filter-actions .button.icon-search').click
expect(page).to have_selector "tr#li_#{li3.id}"
expect(page).to have_selector "tr#li_#{li4.id}"
find("input.datepicker").click # selecting a date range, within oc3
select_dates_from_daterangepicker(o4.completed_at - 1.day, o4.completed_at + 1.day)
page.find('.filter-actions .button.icon-search').click
expect(page).to have_selector "tr#li_#{li4.id}"
expect(page).to_not have_selector "tr#li_#{li3.id}"
end
end
context "combination of filters" do