Merge branch 'main' of github.com:silvershop/silvershop-core

HelloBetterLTD · Mar 13, 2024 · b7b4662 · b7b4662
2 parents 2d21327 + f189f2c
commit b7b4662
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Reports/CustomerReport.php b/src/Reports/CustomerReport.php
@@ -32,7 +32,7 @@ public function columns()
             'Orders' => 'Orders',
             'edit' => [
                 'title' => 'Edit',
-                'formatting' => '<a href=\"admin/security/EditForm/field/Members/item/$ID/edit\" target=\"_new\">edit</a>',
+                'formatting' => '<a href=\"admin/security/users/EditForm/field/users/item/$ID/edit\" target=\"_new\">edit</a>',
             ],
         ];
     }

diff --git 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);
         }