From c2bb47409f37b2f5c55d1afdedaff78ccd6ff56e Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Wed, 17 Apr 2024 17:45:07 +0000
Subject: [PATCH] fix templates

---
 Admin/Install/Navigation.install.json        |  3 ++-
 Controller/BackendController.php             | 24 ++++++++++++--------
 Theme/Backend/supplier-profile-bills.tpl.php |  4 ++--
 Theme/Backend/supplier-view.tpl.php          |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 134cce3..5ae59bf 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -104,6 +104,7 @@
         "from": "SupplierManagement",
         "permission": { "permission": 2, "category": null, "element": null },
         "parent": 1002106001,
-        "children": []
+        "children": [],
+        "status": 3
     }
 ]
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 3382119..70114c7 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\SupplierManagement\Controller;
 
+use Modules\Attribute\Models\NullAttributeValue;
 use Modules\Auditor\Models\AuditMapper;
 use Modules\Media\Models\MediaMapper;
 use Modules\Media\Models\MediaTypeMapper;
@@ -29,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;
@@ -132,7 +132,7 @@ final class BackendController extends Controller
             ->where('ref', $view->attribute->id)
             ->executeGetArray();
 
-            $view->path = 'purchase/supplier';
+        $view->path = 'purchase/supplier';
 
         return $view;
     }
@@ -332,9 +332,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(SupplierAttributeValueL11nMapper::getColumnByMember('ref') ?? '', '=', null)
-            ->orWhere(SupplierAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language))
+        ->where('defaults/l11n/language', [$response->header->l11n->language, null])
         ->executeGetArray();
 
         $defaultAttributeTypes = [];
@@ -352,9 +350,7 @@ final class BackendController extends Controller
             'segment', 'section', 'supplier_group', 'supplier_type',
             'sales_tax_code',
         ], 'IN')
-        ->where('defaults/l11n', (new Where($this->app->dbPool->get()))
-            ->where(SupplierAttributeValueL11nMapper::getColumnByMember('ref') ?? '', '=', null)
-            ->orWhere(SupplierAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language))
+        ->where('defaults/l11n/language', [$response->header->l11n->language, null])
         ->executeGetArray();
 
         $supplierSegmentationTypes = [];
@@ -412,8 +408,16 @@ final class BackendController extends Controller
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public function viewSupplierManagementSupplierAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
+    public function viewSupplierManagementAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
     {
-        return new View($this->app->l11nManager, $request, $response);
+        $view              = new \Modules\Attribute\Theme\Backend\Components\AttributeValueView($this->app->l11nManager, $request, $response);
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003203001, $request, $response);
+
+        $view->type      = SupplierAttributeTypeMapper::get()->where('id', (int) $request->getData('type'))->execute();
+        $view->attribute = new NullAttributeValue();
+
+        $view->path = 'purchase/supplier';
+
+        return $view;
     }
 }
diff --git a/Theme/Backend/supplier-profile-bills.tpl.php b/Theme/Backend/supplier-profile-bills.tpl.php
index da1e412..65436ca 100644
--- a/Theme/Backend/supplier-profile-bills.tpl.php
+++ b/Theme/Backend/supplier-profile-bills.tpl.php
@@ -20,7 +20,7 @@ $bills = $this->data['newestInvoices'] ?? [];
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="g-icon download btn end-xs">download</i></div>
             <table id="billList" class="default sticky">
                 <thead>
@@ -189,6 +189,6 @@ $bills = $this->data['newestInvoices'] ?? [];
                     <tr><td colspan="12" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                 <?php endif; ?>
             </table>
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/supplier-view.tpl.php b/Theme/Backend/supplier-view.tpl.php
index b90b3f7..95cea2e 100644
--- a/Theme/Backend/supplier-view.tpl.php
+++ b/Theme/Backend/supplier-view.tpl.php
@@ -237,7 +237,7 @@ echo $this->data['nav']->render();
 
                     <section class="portlet hl-4">
                         <div class="portlet-body">
-                            <textarea class="undecorated"><?= $this->printHtml($supplier->info); ?></textarea>
+                            <textarea class="undecorated"><?= $this->printTextarea($supplier->info); ?></textarea>
                         </div>
                     </section>
                     <?php endif; ?>