From 5603d1e308b57f76ed76648cd421b8a5b3fa73ff Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 17 Apr 2024 17:45:07 +0000 Subject: [PATCH] fix templates --- Controller/BackendController.php | 26 ++------------------------ Theme/Backend/client-view.tpl.php | 6 +++--- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 92dfb09..9273b7d 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -30,7 +30,6 @@ use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\DataStorage\Database\Query\OrderType; -use phpOMS\DataStorage\Database\Query\Where; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Utils\StringUtils; @@ -334,9 +333,7 @@ final class BackendController extends Controller 'segment', 'section', 'sales_group', 'product_group', 'product_type', 'sales_tax_code', 'purchase_tax_code', ], 'IN') - ->where('defaults/l11n', (new Where($this->app->dbPool->get())) - ->where(ClientAttributeValueL11nMapper::getColumnByMember('ref') ?? '', '=', null) - ->orWhere(ClientAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language)) + ->where('defaults/l11n/language', [$response->header->l11n->language, null]) ->executeGetArray(); $defaultAttributeTypes = []; @@ -354,9 +351,7 @@ final class BackendController extends Controller 'segment', 'section', 'client_group', 'client_type', 'sales_tax_code', ], 'IN') - ->where('defaults/l11n', (new Where($this->app->dbPool->get())) - ->where(ClientAttributeValueL11nMapper::getColumnByMember('ref') ?? '', '=', null) - ->orWhere(ClientAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language)) + ->where('defaults/l11n/language', [$response->header->l11n->language, null]) ->executeGetArray(); $clientSegmentationTypes = []; @@ -402,23 +397,6 @@ final class BackendController extends Controller return $view; } - /** - * Routing end-point for application behavior. - * - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * @param array $data Generic data - * - * @return RenderableInterface - * - * @since 1.0.0 - * @codeCoverageIgnore - */ - public function viewClientManagementClientAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface - { - return new View($this->app->l11nManager, $request, $response); - } - /** * Routing end-point for application behavior. * diff --git a/Theme/Backend/client-view.tpl.php b/Theme/Backend/client-view.tpl.php index 4d594b5..e33de14 100644 --- a/Theme/Backend/client-view.tpl.php +++ b/Theme/Backend/client-view.tpl.php @@ -241,7 +241,7 @@ echo $this->data['nav']->render();
- +
@@ -1291,7 +1291,7 @@ echo $this->data['nav']->render();
-
+
getHtml('Logs', 'Auditor'); ?>download
@@ -1344,7 +1344,7 @@ echo $this->data['nav']->render(); getHtml('Next', '0', '0'); ?> --> - +