Jingga/oms-ItemManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ItemManagement.git synced 2026-02-05 14:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add nav lang

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-04-04 17:54:19 +02:00
commit c6a3320aed
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Controller/BackendController.php
View File

@ -15,15 +15,16 @@ declare(strict_types=1);
namespace Modules\ItemManagement\Controller;
use Model\SettingsEnum;
use Modules\Media\Models\Media;
use Modules\Admin\Models\LocalizationMapper;
use Modules\Billing\Models\BillTypeL11n;
use Modules\Billing\Models\SalesBillMapper;
use Modules\ItemManagement\Models\ItemAttributeMapper;
use Modules\ItemManagement\Models\ItemAttributeTypeMapper;
use Modules\ItemManagement\Models\ItemAttributeValueMapper;
use Modules\ItemManagement\Models\ItemL11nMapper;
use Modules\ItemManagement\Models\ItemL11nType;
use Modules\ItemManagement\Models\ItemMapper;
use Modules\Media\Models\Media;
use phpOMS\Asset\AssetType;
use phpOMS\Contract\RenderableInterface;
use phpOMS\Localization\Money;
@ -31,7 +32,6 @@ use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Stdlib\Base\SmartDateTime;
use phpOMS\Views\View;
use Modules\ItemManagement\Models\ItemAttributeValueMapper;
/**
* ItemManagement controller class.
@ -43,7 +43,6 @@ use Modules\ItemManagement\Models\ItemAttributeValueMapper;
*/
final class BackendController extends Controller
{
/**
* Routing end-point for application behaviour.
*
@ -341,7 +340,7 @@ final class BackendController extends Controller
// @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::with('language', $response->getLanguage(), [BillTypeL11n::class])::getNewestItemInvoices($item->getId(), 5);
$topCustomers = SalesBillMapper::getItemTopCustomers($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5);
$allInvoices = SalesBillMapper::getItemBills($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'));
$allInvoices = SalesBillMapper::getItemBills($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);
$monthlySalesCosts = SalesBillMapper::getItemMonthlySalesCosts($item->getId(), (new SmartDateTime('now'))->createModify(-1), new SmartDateTime('now'));

4
Models/ItemAttributeType.php
View File

@ -68,7 +68,9 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface
*
* @var ItemAttributeTypeL11n
*/
protected string | ItemAttributeTypeL11n $l11n;
protected string |
ItemAttributeTypeL11n $l11n;
/**
* Possible default attribute values

4
Models/ItemAttributeTypeL11n.php
View File

@ -65,8 +65,8 @@ ItemAttributeType $type = 0;
* Constructor.
*
* @param int|ItemAttributeType $type Attribute type
* @param string $title Localized title
* @param string $language Language
* @param string $title Localized title
* @param string $language Language
*
* @since 1.0.0
*/

10
Models/ItemAttributeTypeMapper.php
View File

@ -33,11 +33,11 @@ final class ItemAttributeTypeMapper extends DataMapperAbstract
* @since 1.0.0
*/
protected static array $columns = [
'itemmgmt_attr_type_id' => ['name' => 'itemmgmt_attr_type_id', 'type' => 'int', 'internal' => 'id'],
'itemmgmt_attr_type_name' => ['name' => 'itemmgmt_attr_type_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true],
'itemmgmt_attr_type_fields' => ['name' => 'itemmgmt_attr_type_fields', 'type' => 'int', 'internal' => 'fields'],
'itemmgmt_attr_type_custom' => ['name' => 'itemmgmt_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'],
'itemmgmt_attr_type_pattern' => ['name' => 'itemmgmt_attr_type_pattern', 'type' => 'bool', 'internal' => 'validationPattern'],
'itemmgmt_attr_type_id' => ['name' => 'itemmgmt_attr_type_id', 'type' => 'int', 'internal' => 'id'],
'itemmgmt_attr_type_name' => ['name' => 'itemmgmt_attr_type_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true],
'itemmgmt_attr_type_fields' => ['name' => 'itemmgmt_attr_type_fields', 'type' => 'int', 'internal' => 'fields'],
'itemmgmt_attr_type_custom' => ['name' => 'itemmgmt_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'],
'itemmgmt_attr_type_pattern' => ['name' => 'itemmgmt_attr_type_pattern', 'type' => 'bool', 'internal' => 'validationPattern'],
'itemmgmt_attr_type_required' => ['name' => 'itemmgmt_attr_type_required', 'type' => 'bool', 'internal' => 'isRequired'],
];

9
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -13,6 +13,7 @@
declare(strict_types=1);
return ['Navigation' => [
<<<<<<< HEAD
'Article' => 'Article',
'Analyze' => 'Analyze',
'Attributes' => 'Attributes',
@ -20,5 +21,13 @@ return ['Navigation' => [
'Values' => 'Values',
'Create' => 'Create',
'List' => 'List',
=======
'Analyze' => 'Analyze',
'Attributes' => 'Attributes',
'Types' => 'Types',
'Values' => 'Values',
'Create' => 'Create',
'List' => 'List',
>>>>>>> 48bc5fa4026129886716af1344890676e9c02540
'ItemManagement' => 'Item Management',
]];

1
Theme/Backend/attribute-type-list.tpl.php
View File

@ -12,7 +12,6 @@
*/
declare(strict_types=1);
use Modules\Media\Models\NullMedia;
use phpOMS\Uri\UriFactory;
/** @var \phpOMS\Views\View $this */