diff --git a/application/Preorderlogistics/PreorderlogisticsController.php b/application/Preorderlogistics/PreorderlogisticsController.php index 3254f53e1..b39cfe0fb 100644 --- a/application/Preorderlogistics/PreorderlogisticsController.php +++ b/application/Preorderlogistics/PreorderlogisticsController.php @@ -337,6 +337,16 @@ class PreorderlogisticsController extends mfBaseController { } } + // Date filter for sent date (Versanddatum range) + if (!empty($filter['sent_date']) && is_array($filter['sent_date'])) { + if (!empty($filter['sent_date']['from'])) { + $new_filter['add-where'] .= " AND Preorderlogistics.sent >= " . intval($filter['sent_date']['from']); + } + if (!empty($filter['sent_date']['to'])) { + $new_filter['add-where'] .= " AND Preorderlogistics.sent <= " . intval($filter['sent_date']['to']); + } + } + $new_filter["status_code"] = 140; $new_filter["deleted"] = 0; $new_filter["unit_count<="] = 2; diff --git a/public/js/pages/PreorderLogistics/PreorderLogistics.css b/public/js/pages/PreorderLogistics/PreorderLogistics.css index 6678ffa59..5513bac12 100644 --- a/public/js/pages/PreorderLogistics/PreorderLogistics.css +++ b/public/js/pages/PreorderLogistics/PreorderLogistics.css @@ -10,4 +10,33 @@ .col-form-label { padding-top: 0 !important +} + +/* Filter panel styles */ +.filter-panel { + padding: 1rem !important; +} + +.filter-panel .header-title { + font-size: 1.1rem; + margin-bottom: 0.75rem !important; +} + +.filter-panel .row.g-2 > [class*="col-"] { + padding-left: 0.5rem; + padding-right: 0.5rem; +} + +.filter-panel .form-group { + margin-bottom: 0; +} + +.filter-actions { + display: flex; + gap: 0.5rem; + flex-wrap: wrap; +} + +.filter-actions .btn { + margin-right: 0; } \ No newline at end of file diff --git a/public/js/pages/PreorderLogistics/PreorderLogistics.js b/public/js/pages/PreorderLogistics/PreorderLogistics.js index 7bda1d003..41f82d9c6 100644 --- a/public/js/pages/PreorderLogistics/PreorderLogistics.js +++ b/public/js/pages/PreorderLogistics/PreorderLogistics.js @@ -2,35 +2,38 @@ Vue.component('preorder-logistics', { template: `
-
-

Filter

-
-
+
+

Filter

+
+
-
+
-
+
-
+
-
+
+
+ +
-
-
+
+
-
+
-
-
+
+