From 448a10353a6d735a246193452f4ebc7fcd4de255 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 2 Apr 2024 21:40:48 +0000 Subject: [PATCH] template fixes + bug fixes + style fixes --- Admin/Install/Navigation.install.json | 15 --------------- Controller/BackendController.php | 2 +- Controller/CliController.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/analysis-dashboard.tpl.php | 18 ------------------ 5 files changed, 3 insertions(+), 36 deletions(-) delete mode 100755 Theme/Backend/analysis-dashboard.tpl.php diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index e6273e7..df18ab6 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -58,21 +58,6 @@ "children": [] } ] - }, - { - "id": 1002106001, - "pid": "/", - "type": 2, - "subtype": 1, - "name": "Analysis", - "uri": "{/base}/purchase/analysis?{?}", - "target": "self", - "icon": null, - "order": 15, - "from": "Purchase", - "permission": { "permission": 2, "category": null, "element": null }, - "parent": 1002101001, - "children": [] } ] } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index b725045..029c00e 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -228,7 +228,7 @@ final class BackendController extends Controller ->with('createdBy') ->with('elements') ->sort('createdAt', OrderType::DESC) - ->execute(); + ->executeGetArray(); return $view; } diff --git a/Controller/CliController.php b/Controller/CliController.php index 640b4c8..4fac9cc 100644 --- a/Controller/CliController.php +++ b/Controller/CliController.php @@ -127,7 +127,7 @@ final class CliController extends Controller 'order_suggestion_comparison_duration_type', 'segment', 'section', 'sales_group', 'product_group', 'product_type', ], 'IN') - ->execute(); + ->executeGetArray(); // @todo check for supplier of item if set // @todo check for product type of item if set diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index ad371d4..dbc302a 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -50,6 +50,6 @@ return ['Purchase' => [ 'ProductGroup' => 'Product Group', 'MinRange' => 'Min. Range', 'OrderSuggestions' => 'Order Suggestions', - 'OrderSuggestion' => 'Order Suggestion', + 'OrderSuggestion' => 'Order Suggestion', 'Suggestions' => 'Suggestions', ]]; diff --git a/Theme/Backend/analysis-dashboard.tpl.php b/Theme/Backend/analysis-dashboard.tpl.php deleted file mode 100755 index 4db811a..0000000 --- a/Theme/Backend/analysis-dashboard.tpl.php +++ /dev/null @@ -1,18 +0,0 @@ -data['nav']->render();