Jingga/oms-ItemManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ItemManagement.git synced 2026-02-16 20:28:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

draft ::with() function for models

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-03-11 21:23:41 +01:00
parent 5d92530dcf
commit 6fd3f145d4
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Controller/BackendController.php
View File

@ -57,7 +57,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/ItemManagement/Theme/Backend/sales-item-list'); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/sales-item-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004805001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004805001, $request, $response));
$items = ItemMapper::withConditional('language', $response->getLanguage())::getAfterPivot(0, null, 25); $items = ItemMapper::with('language', $response->getLanguage())::getAfterPivot(0, null, 25);
$view->addData('items', $items); $view->addData('items', $items);
return $view; return $view;
@ -81,7 +81,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/ItemManagement/Theme/Backend/purchase-item-list'); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/purchase-item-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004806001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004806001, $request, $response));
$items = ItemMapper::withConditional('language', $response->getLanguage())::getAfterPivot(0, null, 25); $items = ItemMapper::with('language', $response->getLanguage())::getAfterPivot(0, null, 25);
$view->addData('items', $items); $view->addData('items', $items);
return $view; return $view;
@ -105,7 +105,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/ItemManagement/Theme/Backend/stock-list'); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/stock-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004807001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004807001, $request, $response));
$items = ItemMapper::withConditional('language', $response->getLanguage())::getAfterPivot(0, null, 25); $items = ItemMapper::with('language', $response->getLanguage())::getAfterPivot(0, null, 25);
$view->addData('items', $items); $view->addData('items', $items);
return $view; return $view;
@ -197,7 +197,10 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/ItemManagement/Theme/Backend/sales-item-profile'); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/sales-item-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004805001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004805001, $request, $response));
$item = ItemMapper::withConditional('language', $response->getLanguage())::get((int) $request->getData('id')); $item = ItemMapper::with('language', $response->getLanguage())
::with('files', limit: 5, orderBy: 'createdAt', sortOrder: 'ASC')
::with('notes', limit: 5, orderBy: 'id', sortOrder: 'ASC')
::get((int) $request->getData('id'));
$view->addData('item', $item); $view->addData('item', $item);
$settings = $this->app->appSettings->get(null, [ $settings = $this->app->appSettings->get(null, [
@ -206,12 +209,12 @@ final class BackendController extends Controller
$view->setData('defaultlocalization', LocalizationMapper::get((int) $settings['id'])); $view->setData('defaultlocalization', LocalizationMapper::get((int) $settings['id']));
$itemL11n = ItemL11nMapper::withConditional('language', $response->getLanguage()) $itemL11n = ItemL11nMapper::with('language', $response->getLanguage())
::withConditional('item', $item->getId())::getAll(); ::with('item', $item->getId())::getAll();
$view->addData('itemL11n', $itemL11n); $view->addData('itemL11n', $itemL11n);
$itemAttribute = ItemAttributeMapper::withConditional('language', $response->getLanguage()) $itemAttribute = ItemAttributeMapper::with('language', $response->getLanguage())
::withConditional('item', $item->getId())::getAll(); ::with('item', $item->getId())::getAll();
$view->addData('itemAttribute', $itemAttribute); $view->addData('itemAttribute', $itemAttribute);
// stats // stats
@ -221,7 +224,7 @@ final class BackendController extends Controller
$avg = SalesBillMapper::getAvgSalesPriceByItemId($item->getId(), (new SmartDateTime('now'))->smartModify(-1), new SmartDateTime('now')); $avg = SalesBillMapper::getAvgSalesPriceByItemId($item->getId(), (new SmartDateTime('now'))->smartModify(-1), new SmartDateTime('now'));
$lastOrder = SalesBillMapper::getLastOrderDateByItemId($item->getId()); $lastOrder = SalesBillMapper::getLastOrderDateByItemId($item->getId());
// @todo: why is the conditional array necessary, shouldn't the mapper realize when it mustn't use the conditional (when the field doesn't exist in the mapper) // @todo: why is the conditional array necessary, shouldn't the mapper realize when it mustn't use the conditional (when the field doesn't exist in the mapper)
$newestInvoices = SalesBillMapper::withConditional('language', $response->getLanguage(), [BillTypeL11n::class])::getNewestItemInvoices($item->getId(), 5); $newestInvoices = SalesBillMapper::with('language', $response->getLanguage(), [BillTypeL11n::class])::getNewestItemInvoices($item->getId(), 5);
$topCustomers = SalesBillMapper::getItemTopCustomers($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5); $topCustomers = SalesBillMapper::getItemTopCustomers($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5);
$regionSales = SalesBillMapper::getItemRegionSales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now')); $regionSales = SalesBillMapper::getItemRegionSales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'));
$countrySales = SalesBillMapper::getItemCountrySales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5); $countrySales = SalesBillMapper::getItemCountrySales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5);

4
Theme/Backend/Lang/en.lang.php
View File

@ -31,7 +31,7 @@ return ['ItemManagement' => [
'Countries' => 'Countries', 'Countries' => 'Countries',
'Country' => 'Country', 'Country' => 'Country',
'Created' => 'Created', 'Created' => 'Created',
'CreatedAt' => '', 'CreatedAt' => 'Created',
'Customer' => 'Customer', 'Customer' => 'Customer',
'CustomerGroup' => 'Customer Group', 'CustomerGroup' => 'Customer Group',
'CustomsID' => 'Customs ID', 'CustomsID' => 'Customs ID',
@ -120,7 +120,7 @@ return ['ItemManagement' => [
'Tax' => 'Tax', 'Tax' => 'Tax',
'Text' => 'Text', 'Text' => 'Text',
'TimeUnit' => 'Unit of time', 'TimeUnit' => 'Unit of time',
'Title' => '', 'Title' => 'Title',
'Tracking' => 'Tracking', 'Tracking' => 'Tracking',
'TradingUnit' => 'Trading Unit', 'TradingUnit' => 'Trading Unit',
'Translation' => 'Translation', 'Translation' => 'Translation',

4
Theme/Backend/sales-item-profile.tpl.php
View File

@ -201,11 +201,12 @@ echo $this->getData('nav')->render();
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<section class="portlet"> <section class="portlet">
<div class="portlet-head">Recent Invoices</div> <div class="portlet-head"><?= $this->getHtml('RecentInvoices'); ?></div>
<table id="iSalesItemList" class="default"> <table id="iSalesItemList" class="default">
<thead> <thead>
<tr> <tr>
<td><?= $this->getHtml('Number'); ?> <td><?= $this->getHtml('Number'); ?>
<td><?= $this->getHtml('Type'); ?>
<td class="wf-100"><?= $this->getHtml('Name'); ?> <td class="wf-100"><?= $this->getHtml('Name'); ?>
<td><?= $this->getHtml('Net'); ?> <td><?= $this->getHtml('Net'); ?>
<td><?= $this->getHtml('Date'); ?> <td><?= $this->getHtml('Date'); ?>
@ -215,6 +216,7 @@ echo $this->getData('nav')->render();
?> ?>
<tr data-href="<?= $url; ?>"> <tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $invoice->getNumber(); ?></a> <td><a href="<?= $url; ?>"><?= $invoice->getNumber(); ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->type->getL11n(); ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->billTo; ?></a> <td><a href="<?= $url; ?>"><?= $invoice->billTo; ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->net->getCurrency(); ?></a> <td><a href="<?= $url; ?>"><?= $invoice->net->getCurrency(); ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->createdAt->format('Y-m-d'); ?></a> <td><a href="<?= $url; ?>"><?= $invoice->createdAt->format('Y-m-d'); ?></a>