From 62db9126d33e22ac1e40a76853ef142eae3030d9 Mon Sep 17 00:00:00 2001
From: Antony Thorpe <1023740+AntonyThorpe@users.noreply.github.com>
Date: Wed, 17 Jan 2024 20:45:52 +1300
Subject: [PATCH 1/2] Update ShopPeriodReport.php (#815)
Set the setHTML5 function of the DateField to false when using custom date formats. Solves issue #764.
---
src/Reports/ShopPeriodReport.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Reports/ShopPeriodReport.php b/src/Reports/ShopPeriodReport.php
index b7e63771d..c5e2dc5eb 100644
--- a/src/Reports/ShopPeriodReport.php
+++ b/src/Reports/ShopPeriodReport.php
@@ -82,7 +82,9 @@ public function parameterFields()
// When using silverware/calendar package, setting the date format breaks the admin interface. Leave default
// behavior as was, but allow the date format not to be set as a config override
if ($this->config()->get('disable_set_date_format') != true) {
+ $start->setHTML5(false);
$start->setDateFormat($dateformat);
+ $end->setHTML5(false);
$end->setDateFormat($dateformat);
}
From f189f2c28ffbee90c70109d69ecdc3f3b56196aa Mon Sep 17 00:00:00 2001
From: Antony Thorpe <1023740+AntonyThorpe@users.noreply.github.com>
Date: Fri, 19 Jan 2024 20:15:41 +1300
Subject: [PATCH 2/2] Update CustomerReport.php (#816)
---
src/Reports/CustomerReport.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Reports/CustomerReport.php b/src/Reports/CustomerReport.php
index 026be0f51..e1eb3ed5e 100644
--- a/src/Reports/CustomerReport.php
+++ b/src/Reports/CustomerReport.php
@@ -32,7 +32,7 @@ public function columns()
'Orders' => 'Orders',
'edit' => [
'title' => 'Edit',
- 'formatting' => 'edit',
+ 'formatting' => 'edit',
],
];
}