From c1b9e1ad3c1a93ef5ccbafc2a94d582fa5117e68 Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Mon, 8 Feb 2021 22:03:16 +0000 Subject: [PATCH] Automated formatting changes --- Controller/ApiController.php | 10 +++--- Controller/BackendController.php | 43 ++++++++++++------------ Models/Item.php | 5 +-- Models/ItemAttributeTypeL11n.php | 6 ++-- Models/ItemMapper.php | 8 ++--- Theme/Backend/sales-item-profile.tpl.php | 16 ++++----- 6 files changed, 45 insertions(+), 43 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index f883a35..d283fff 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -33,13 +33,13 @@ use Modules\ItemManagement\Models\NullItemAttributeType; use Modules\ItemManagement\Models\NullItemAttributeValue; use Modules\ItemManagement\Models\NullItemL11nType; use Modules\Media\Models\PathSettings; +use phpOMS\Localization\Money; use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; -use phpOMS\Localization\Money; /** * ItemManagement class. @@ -89,11 +89,11 @@ final class ApiController extends Controller */ private function createItemFromRequest(RequestAbstract $request) : Item { - $item = new Item(); - $item->number = $request->getData('number') ?? ''; - $item->salesPrice = new Money($request->getData('salesprice', 'int') ?? 0); + $item = new Item(); + $item->number = $request->getData('number') ?? ''; + $item->salesPrice = new Money($request->getData('salesprice', 'int') ?? 0); $item->purchasePrice = new Money($request->getData('purchaseprice', 'int') ?? 0); - $item->info = $request->getData('info') ?? ''; + $item->info = $request->getData('info') ?? ''; return $item; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index c39ade5..2b14b0f 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -17,18 +17,17 @@ namespace Modules\ItemManagement\Controller; use Model\SettingsEnum; use Modules\Admin\Models\LocalizationMapper; 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 phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; +use phpOMS\Localization\Money; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Views\View; use phpOMS\Stdlib\Base\SmartDateTime; -use phpOMS\Localization\Money; -use phpOMS\Asset\AssetType; -use Modules\ItemManagement\Models\ItemL11nMapper; -use Modules\ItemManagement\Models\ItemAttributeMapper; -use Modules\Billing\Models\BillTypeL11n; +use phpOMS\Views\View; /** * ItemManagement controller class. @@ -214,25 +213,25 @@ final class BackendController extends Controller // stats if ($this->app->moduleManager->isActive('Billing')) { - $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')); - $avg = BillMapper::getAvgSalesPriceByItemId($item->getId(), (new SmartDateTime('now'))->smartModify(-1), 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')); + $avg = BillMapper::getAvgSalesPriceByItemId($item->getId(), (new SmartDateTime('now'))->smartModify(-1), new SmartDateTime('now')); $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) - $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); - $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); + $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); + $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); $monthlySalesCosts = BillMapper::getItemMonthlySalesCosts($item->getId(), (new SmartDateTime('now'))->createModify(-1), new SmartDateTime('now')); } else { - $ytd = new Money(); - $mtd = new Money(); - $avg = new Money(); - $lastOrder = null; - $newestInvoices = []; - $topCustomers = []; - $regionSales = []; - $countrySales = []; + $ytd = new Money(); + $mtd = new Money(); + $avg = new Money(); + $lastOrder = null; + $newestInvoices = []; + $topCustomers = []; + $regionSales = []; + $countrySales = []; $monthlySalesCosts = []; } diff --git a/Models/Item.php b/Models/Item.php index 067ec2f..668ff18 100644 --- a/Models/Item.php +++ b/Models/Item.php @@ -49,6 +49,7 @@ class Item private int $type = 0; public Money $salesPrice; + public Money $purchasePrice; /** @@ -98,8 +99,8 @@ class Item */ public function __construct() { - $this->createdAt = new \DateTimeImmutable('now'); - $this->salesPrice = new Money(); + $this->createdAt = new \DateTimeImmutable('now'); + $this->salesPrice = new Money(); $this->purchasePrice = new Money(); } diff --git a/Models/ItemAttributeTypeL11n.php b/Models/ItemAttributeTypeL11n.php index b716474..558392d 100644 --- a/Models/ItemAttributeTypeL11n.php +++ b/Models/ItemAttributeTypeL11n.php @@ -41,7 +41,9 @@ class ItemAttributeTypeL11n implements \JsonSerializable, ArrayableInterface * @var int|ItemL11nType * @since 1.0.0 */ - protected int|ItemL11nType $type = 0; + protected int | + +ItemL11nType $type = 0; /** * Language. @@ -68,7 +70,7 @@ class ItemAttributeTypeL11n implements \JsonSerializable, ArrayableInterface * * @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->title = $title; diff --git a/Models/ItemMapper.php b/Models/ItemMapper.php index 560c79e..3deeaa3 100644 --- a/Models/ItemMapper.php +++ b/Models/ItemMapper.php @@ -34,10 +34,10 @@ final class ItemMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - '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_info' => ['name' => 'itemmgmt_item_info', 'type' => 'string', 'internal' => 'info'], - 'itemmgmt_item_salesprice' => ['name' => 'itemmgmt_item_salesprice', 'type' => 'Serializable', 'internal' => 'salesPrice'], + '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_info' => ['name' => 'itemmgmt_item_info', 'type' => 'string', 'internal' => 'info'], + 'itemmgmt_item_salesprice' => ['name' => 'itemmgmt_item_salesprice', 'type' => 'Serializable', 'internal' => 'salesPrice'], 'itemmgmt_item_purchaseprice' => ['name' => 'itemmgmt_item_purchaseprice', 'type' => 'Serializable', 'internal' => 'purchasePrice'], ]; diff --git a/Theme/Backend/sales-item-profile.tpl.php b/Theme/Backend/sales-item-profile.tpl.php index fca95ec..4bdbd7d 100644 --- a/Theme/Backend/sales-item-profile.tpl.php +++ b/Theme/Backend/sales-item-profile.tpl.php @@ -13,22 +13,22 @@ declare(strict_types=1); use Modules\Media\Models\NullMedia; +use phpOMS\Localization\ISO639Enum; +use phpOMS\Localization\Money; use phpOMS\Localization\NullLocalization; use phpOMS\Uri\UriFactory; -use phpOMS\Localization\Money; -use phpOMS\Localization\ISO639Enum; /** * @var \Modules\ItemManagement\Models\Item $item */ -$item = $this->getData('item'); -$itemL11n = $this->getData('itemL11n'); +$item = $this->getData('item'); +$itemL11n = $this->getData('itemL11n'); $itemAttribute = $this->getData('itemAttribute'); -$newestInvoices = $this->getData('newestInvoices') ?? []; -$topCustomers = $this->getData('topCustomers') ?? []; -$regionSales = $this->getData('regionSales') ?? []; -$countrySales = $this->getData('countrySales') ?? []; +$newestInvoices = $this->getData('newestInvoices') ?? []; +$topCustomers = $this->getData('topCustomers') ?? []; +$regionSales = $this->getData('regionSales') ?? []; +$countrySales = $this->getData('countrySales') ?? []; $monthlySalesCosts = $this->getData('monthlySalesCosts') ?? []; $languages = ISO639Enum::getConstants();