fix templates

This commit is contained in:
Dennis Eichhorn 2024-04-17 17:45:07 +00:00
parent 83bc0ae976
commit c2bb47409f
4 changed files with 19 additions and 14 deletions

View File

@ -104,6 +104,7 @@
"from": "SupplierManagement", "from": "SupplierManagement",
"permission": { "permission": 2, "category": null, "element": null }, "permission": { "permission": 2, "category": null, "element": null },
"parent": 1002106001, "parent": 1002106001,
"children": [] "children": [],
"status": 3
} }
] ]

View File

@ -14,6 +14,7 @@ declare(strict_types=1);
namespace Modules\SupplierManagement\Controller; namespace Modules\SupplierManagement\Controller;
use Modules\Attribute\Models\NullAttributeValue;
use Modules\Auditor\Models\AuditMapper; use Modules\Auditor\Models\AuditMapper;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\MediaTypeMapper; use Modules\Media\Models\MediaTypeMapper;
@ -29,7 +30,6 @@ use phpOMS\Asset\AssetType;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\DataStorage\Database\Query\Builder;
use phpOMS\DataStorage\Database\Query\OrderType; use phpOMS\DataStorage\Database\Query\OrderType;
use phpOMS\DataStorage\Database\Query\Where;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Utils\StringUtils; use phpOMS\Utils\StringUtils;
@ -132,7 +132,7 @@ final class BackendController extends Controller
->where('ref', $view->attribute->id) ->where('ref', $view->attribute->id)
->executeGetArray(); ->executeGetArray();
$view->path = 'purchase/supplier'; $view->path = 'purchase/supplier';
return $view; return $view;
} }
@ -332,9 +332,7 @@ final class BackendController extends Controller
'segment', 'section', 'sales_group', 'product_group', 'product_type', 'segment', 'section', 'sales_group', 'product_group', 'product_type',
'sales_tax_code', 'purchase_tax_code', 'sales_tax_code', 'purchase_tax_code',
], 'IN') ], 'IN')
->where('defaults/l11n', (new Where($this->app->dbPool->get())) ->where('defaults/l11n/language', [$response->header->l11n->language, null])
->where(SupplierAttributeValueL11nMapper::getColumnByMember('ref') ?? '', '=', null)
->orWhere(SupplierAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language))
->executeGetArray(); ->executeGetArray();
$defaultAttributeTypes = []; $defaultAttributeTypes = [];
@ -352,9 +350,7 @@ final class BackendController extends Controller
'segment', 'section', 'supplier_group', 'supplier_type', 'segment', 'section', 'supplier_group', 'supplier_type',
'sales_tax_code', 'sales_tax_code',
], 'IN') ], 'IN')
->where('defaults/l11n', (new Where($this->app->dbPool->get())) ->where('defaults/l11n/language', [$response->header->l11n->language, null])
->where(SupplierAttributeValueL11nMapper::getColumnByMember('ref') ?? '', '=', null)
->orWhere(SupplierAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language))
->executeGetArray(); ->executeGetArray();
$supplierSegmentationTypes = []; $supplierSegmentationTypes = [];
@ -412,8 +408,16 @@ final class BackendController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @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;
} }
} }

View File

@ -20,7 +20,7 @@ $bills = $this->data['newestInvoices'] ?? [];
<div class="row"> <div class="row">
<div class="col-xs-12"> <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> <div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="g-icon download btn end-xs">download</i></div>
<table id="billList" class="default sticky"> <table id="billList" class="default sticky">
<thead> <thead>
@ -189,6 +189,6 @@ $bills = $this->data['newestInvoices'] ?? [];
<tr><td colspan="12" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?> <tr><td colspan="12" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </section>
</div> </div>
</div> </div>

View File

@ -237,7 +237,7 @@ echo $this->data['nav']->render();
<section class="portlet hl-4"> <section class="portlet hl-4">
<div class="portlet-body"> <div class="portlet-body">
<textarea class="undecorated"><?= $this->printHtml($supplier->info); ?></textarea> <textarea class="undecorated"><?= $this->printTextarea($supplier->info); ?></textarea>
</div> </div>
</section> </section>
<?php endif; ?> <?php endif; ?>