From ac494f97ecb10efd0c101dfb44980bd760924048 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 14 Dec 2022 10:12:42 +0100 Subject: [PATCH] When changing order cycle selection, update date range selector value Date selector should change when selecting an order cycle in order to reflect the order cycle date range itself --- .../controllers/line_items_controller.js.coffee | 8 ++++++++ app/views/spree/admin/orders/bulk_management.html.haml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) 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 e66d2d1333..7738ba76ab 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 @@ -60,6 +60,14 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, 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 = -> RequestMonitor.load $scope.orders = Orders.index( diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 23a4f1364d..98fd1cfdde 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -40,7 +40,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' } } + %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()" } } .clearfix .actions.filter-actions %a.button.icon-search{'ng-click' => 'refreshData()'}