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

Automated formatting changes

Browse Source
This commit is contained in:
Formatter Bot 2021-02-08 22:03:16 +00:00
parent 62a1994d36
commit c1b9e1ad3c
6 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Controller/ApiController.php
View File

@ -33,13 +33,13 @@ use Modules\ItemManagement\Models\NullItemAttributeType;
use Modules\ItemManagement\Models\NullItemAttributeValue; use Modules\ItemManagement\Models\NullItemAttributeValue;
use Modules\ItemManagement\Models\NullItemL11nType; use Modules\ItemManagement\Models\NullItemL11nType;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use phpOMS\Localization\Money;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\Localization\Money;
/** /**
* ItemManagement class. * ItemManagement class.
@ -89,11 +89,11 @@ final class ApiController extends Controller
*/ */
private function createItemFromRequest(RequestAbstract $request) : Item private function createItemFromRequest(RequestAbstract $request) : Item
{ {
$item = new Item(); $item = new Item();
$item->number = $request->getData('number') ?? ''; $item->number = $request->getData('number') ?? '';
$item->salesPrice = new Money($request->getData('salesprice', 'int') ?? 0); $item->salesPrice = new Money($request->getData('salesprice', 'int') ?? 0);
$item->purchasePrice = new Money($request->getData('purchaseprice', 'int') ?? 0); $item->purchasePrice = new Money($request->getData('purchaseprice', 'int') ?? 0);
$item->info = $request->getData('info') ?? ''; $item->info = $request->getData('info') ?? '';
return $item; return $item;
} }

43
Controller/BackendController.php
View File

@ -17,18 +17,17 @@ namespace Modules\ItemManagement\Controller;
use Model\SettingsEnum; use Model\SettingsEnum;
use Modules\Admin\Models\LocalizationMapper; use Modules\Admin\Models\LocalizationMapper;
use Modules\Billing\Models\BillMapper; use Modules\Billing\Models\BillMapper;
use Modules\ItemManagement\Models\ItemL11nTypeMapper; use Modules\Billing\Models\BillTypeL11n;
use Modules\ItemManagement\Models\ItemAttributeMapper;
use Modules\ItemManagement\Models\ItemL11nMapper;
use Modules\ItemManagement\Models\ItemMapper; use Modules\ItemManagement\Models\ItemMapper;
use phpOMS\Asset\AssetType;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\Localization\Money;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
use phpOMS\Stdlib\Base\SmartDateTime; use phpOMS\Stdlib\Base\SmartDateTime;
use phpOMS\Localization\Money; use phpOMS\Views\View;
use phpOMS\Asset\AssetType;
use Modules\ItemManagement\Models\ItemL11nMapper;
use Modules\ItemManagement\Models\ItemAttributeMapper;
use Modules\Billing\Models\BillTypeL11n;
/** /**
* ItemManagement controller class. * ItemManagement controller class.
@ -214,25 +213,25 @@ final class BackendController extends Controller
// stats // stats
if ($this->app->moduleManager->isActive('Billing')) { if ($this->app->moduleManager->isActive('Billing')) {
$ytd = BillMapper::getSalesByItemId($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now')); $ytd = BillMapper::getSalesByItemId($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'));
$mtd = BillMapper::getSalesByItemId($item->getId(), new SmartDateTime('Y-m-01'), new SmartDateTime('now')); $mtd = BillMapper::getSalesByItemId($item->getId(), new SmartDateTime('Y-m-01'), new SmartDateTime('now'));
$avg = BillMapper::getAvgSalesPriceByItemId($item->getId(), (new SmartDateTime('now'))->smartModify(-1), new SmartDateTime('now')); $avg = BillMapper::getAvgSalesPriceByItemId($item->getId(), (new SmartDateTime('now'))->smartModify(-1), new SmartDateTime('now'));
$lastOrder = BillMapper::getLastOrderDateByItemId($item->getId()); $lastOrder = BillMapper::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 = BillMapper::withConditional('language', $response->getLanguage(), [BillTypeL11n::class])::getNewestItemInvoices($item->getId(), 5); $newestInvoices = BillMapper::withConditional('language', $response->getLanguage(), [BillTypeL11n::class])::getNewestItemInvoices($item->getId(), 5);
$topCustomers = BillMapper::getItemTopCustomers($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5); $topCustomers = BillMapper::getItemTopCustomers($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5);
$regionSales = BillMapper::getItemRegionSales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now')); $regionSales = BillMapper::getItemRegionSales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'));
$countrySales = BillMapper::getItemCountrySales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5); $countrySales = BillMapper::getItemCountrySales($item->getId(), new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5);
$monthlySalesCosts = BillMapper::getItemMonthlySalesCosts($item->getId(), (new SmartDateTime('now'))->createModify(-1), new SmartDateTime('now')); $monthlySalesCosts = BillMapper::getItemMonthlySalesCosts($item->getId(), (new SmartDateTime('now'))->createModify(-1), new SmartDateTime('now'));
} else { } else {
$ytd = new Money(); $ytd = new Money();
$mtd = new Money(); $mtd = new Money();
$avg = new Money(); $avg = new Money();
$lastOrder = null; $lastOrder = null;
$newestInvoices = []; $newestInvoices = [];
$topCustomers = []; $topCustomers = [];
$regionSales = []; $regionSales = [];
$countrySales = []; $countrySales = [];
$monthlySalesCosts = []; $monthlySalesCosts = [];
} }

5
Models/Item.php
View File

@ -49,6 +49,7 @@ class Item
private int $type = 0; private int $type = 0;
public Money $salesPrice; public Money $salesPrice;
public Money $purchasePrice; public Money $purchasePrice;
/** /**
@ -98,8 +99,8 @@ class Item
*/ */
public function __construct() public function __construct()
{ {
$this->createdAt = new \DateTimeImmutable('now'); $this->createdAt = new \DateTimeImmutable('now');
$this->salesPrice = new Money(); $this->salesPrice = new Money();
$this->purchasePrice = new Money(); $this->purchasePrice = new Money();
} }

6
Models/ItemAttributeTypeL11n.php
View File

@ -41,7 +41,9 @@ class ItemAttributeTypeL11n implements \JsonSerializable, ArrayableInterface
* @var int|ItemL11nType * @var int|ItemL11nType
* @since 1.0.0 * @since 1.0.0
*/ */
protected int|ItemL11nType $type = 0; protected int |
ItemL11nType $type = 0;
/** /**
* Language. * Language.
@ -68,7 +70,7 @@ class ItemAttributeTypeL11n implements \JsonSerializable, ArrayableInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function __construct(int|ItemL11nType $type = 0, string $title = '', string $language = ISO639x1Enum::_EN) public function __construct(int | ItemL11nType $type = 0, string $title = '', string $language = ISO639x1Enum::_EN)
{ {
$this->type = $type; $this->type = $type;
$this->title = $title; $this->title = $title;

8
Models/ItemMapper.php
View File

@ -34,10 +34,10 @@ final class ItemMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ protected static array $columns = [
'itemmgmt_item_id' => ['name' => 'itemmgmt_item_id', 'type' => 'int', 'internal' => 'id'], 'itemmgmt_item_id' => ['name' => 'itemmgmt_item_id', 'type' => 'int', 'internal' => 'id'],
'itemmgmt_item_no' => ['name' => 'itemmgmt_item_no', 'type' => 'string', 'internal' => 'number', 'autocomplete' => true], 'itemmgmt_item_no' => ['name' => 'itemmgmt_item_no', 'type' => 'string', 'internal' => 'number', 'autocomplete' => true],
'itemmgmt_item_info' => ['name' => 'itemmgmt_item_info', 'type' => 'string', 'internal' => 'info'], 'itemmgmt_item_info' => ['name' => 'itemmgmt_item_info', 'type' => 'string', 'internal' => 'info'],
'itemmgmt_item_salesprice' => ['name' => 'itemmgmt_item_salesprice', 'type' => 'Serializable', 'internal' => 'salesPrice'], 'itemmgmt_item_salesprice' => ['name' => 'itemmgmt_item_salesprice', 'type' => 'Serializable', 'internal' => 'salesPrice'],
'itemmgmt_item_purchaseprice' => ['name' => 'itemmgmt_item_purchaseprice', 'type' => 'Serializable', 'internal' => 'purchasePrice'], 'itemmgmt_item_purchaseprice' => ['name' => 'itemmgmt_item_purchaseprice', 'type' => 'Serializable', 'internal' => 'purchasePrice'],
]; ];

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

@ -13,22 +13,22 @@
declare(strict_types=1); declare(strict_types=1);
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use phpOMS\Localization\ISO639Enum;
use phpOMS\Localization\Money;
use phpOMS\Localization\NullLocalization; use phpOMS\Localization\NullLocalization;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
use phpOMS\Localization\Money;
use phpOMS\Localization\ISO639Enum;
/** /**
* @var \Modules\ItemManagement\Models\Item $item * @var \Modules\ItemManagement\Models\Item $item
*/ */
$item = $this->getData('item'); $item = $this->getData('item');
$itemL11n = $this->getData('itemL11n'); $itemL11n = $this->getData('itemL11n');
$itemAttribute = $this->getData('itemAttribute'); $itemAttribute = $this->getData('itemAttribute');
$newestInvoices = $this->getData('newestInvoices') ?? []; $newestInvoices = $this->getData('newestInvoices') ?? [];
$topCustomers = $this->getData('topCustomers') ?? []; $topCustomers = $this->getData('topCustomers') ?? [];
$regionSales = $this->getData('regionSales') ?? []; $regionSales = $this->getData('regionSales') ?? [];
$countrySales = $this->getData('countrySales') ?? []; $countrySales = $this->getData('countrySales') ?? [];
$monthlySalesCosts = $this->getData('monthlySalesCosts') ?? []; $monthlySalesCosts = $this->getData('monthlySalesCosts') ?? [];
$languages = ISO639Enum::getConstants(); $languages = ISO639Enum::getConstants();