mirror of
https://github.com/Karaka-Management/oms-InvestmentManagement.git
synced 2026-02-16 12:18:41 +00:00
code fixes
This commit is contained in:
parent
dc08ab1343
commit
b2538e7e14
|
|
@ -24,12 +24,14 @@ use Modules\InvestmentManagement\Models\InvestmentMapper;
|
||||||
use Modules\InvestmentManagement\Models\InvestmentObject;
|
use Modules\InvestmentManagement\Models\InvestmentObject;
|
||||||
use Modules\InvestmentManagement\Models\InvestmentObjectMapper;
|
use Modules\InvestmentManagement\Models\InvestmentObjectMapper;
|
||||||
use Modules\InvestmentManagement\Models\InvestmentStatus;
|
use Modules\InvestmentManagement\Models\InvestmentStatus;
|
||||||
|
use Modules\ItemManagement\Models\NullItem;
|
||||||
use Modules\Media\Models\CollectionMapper;
|
use Modules\Media\Models\CollectionMapper;
|
||||||
use Modules\Media\Models\MediaMapper;
|
use Modules\Media\Models\MediaMapper;
|
||||||
use Modules\Media\Models\NullMedia;
|
use Modules\Media\Models\NullMedia;
|
||||||
use Modules\Media\Models\PathSettings;
|
use Modules\Media\Models\PathSettings;
|
||||||
use Modules\Media\Models\Reference;
|
use Modules\Media\Models\Reference;
|
||||||
use Modules\Media\Models\ReferenceMapper;
|
use Modules\Media\Models\ReferenceMapper;
|
||||||
|
use Modules\SupplierManagement\Models\NullSupplier;
|
||||||
use phpOMS\Localization\BaseStringL11n;
|
use phpOMS\Localization\BaseStringL11n;
|
||||||
use phpOMS\Localization\BaseStringL11nType;
|
use phpOMS\Localization\BaseStringL11nType;
|
||||||
use phpOMS\Localization\ISO639x1Enum;
|
use phpOMS\Localization\ISO639x1Enum;
|
||||||
|
|
@ -478,9 +480,9 @@ final class ApiController extends Controller
|
||||||
$investment->link = $request->getDataString('link') ?? '';
|
$investment->link = $request->getDataString('link') ?? '';
|
||||||
$investment->investment = (int) $request->getData('investment');
|
$investment->investment = (int) $request->getData('investment');
|
||||||
$investment->parent = $request->getDataInt('parent');
|
$investment->parent = $request->getDataInt('parent');
|
||||||
$investment->supplier = $request->getDataInt('supplier');
|
$investment->supplier = $request->hasData('supplier') ? new NullSupplier((int) $request->getData('supplier')) : null;
|
||||||
$investment->supplierName = $request->getDataString('suppliername') ?? '';
|
$investment->supplierName = $request->getDataString('suppliername') ?? '';
|
||||||
$investment->item = $request->getDataInt('item');
|
$investment->item = $request->hasData('item') ? new NullItem((int) $request->getData('item')) : null;
|
||||||
|
|
||||||
// @todo reconsider the following lines. This seems rather complicated.
|
// @todo reconsider the following lines. This seems rather complicated.
|
||||||
if ($request->hasData('amount')) {
|
if ($request->hasData('amount')) {
|
||||||
|
|
@ -586,7 +588,6 @@ final class ApiController extends Controller
|
||||||
pathSettings: PathSettings::FILE_PATH
|
pathSettings: PathSettings::FILE_PATH
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
foreach ($uploaded as $media) {
|
foreach ($uploaded as $media) {
|
||||||
$this->createModelRelation(
|
$this->createModelRelation(
|
||||||
$request->header->account,
|
$request->header->account,
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,13 @@ class AmountGroup
|
||||||
$this->type = new BaseStringL11nType();
|
$this->type = new BaseStringL11nType();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get sum of group
|
||||||
|
*
|
||||||
|
* @return FloatInt
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
*/
|
||||||
public function sum() : FloatInt
|
public function sum() : FloatInt
|
||||||
{
|
{
|
||||||
$sum = new FloatInt();
|
$sum = new FloatInt();
|
||||||
|
|
|
||||||
|
|
@ -57,6 +57,15 @@ class InvestmentObject
|
||||||
|
|
||||||
public ?Item $item = null;
|
public ?Item $item = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get amount group by type name
|
||||||
|
*
|
||||||
|
* @param string $type Type name
|
||||||
|
*
|
||||||
|
* @return AmountGroup
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
*/
|
||||||
public function getAmountByTypeName(string $type) : AmountGroup
|
public function getAmountByTypeName(string $type) : AmountGroup
|
||||||
{
|
{
|
||||||
foreach ($this->amountGroups as $group) {
|
foreach ($this->amountGroups as $group) {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Modules\InvestmentManagement\Models\InvestmentStatus;
|
|
||||||
use phpOMS\Uri\UriFactory;
|
use phpOMS\Uri\UriFactory;
|
||||||
|
|
||||||
/** @var \phpOMS\Views\View $this */
|
/** @var \phpOMS\Views\View $this */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user