mirror of
https://github.com/Karaka-Management/oms-ItemManagement.git
synced 2026-02-17 12:48:42 +00:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
86fd042589
|
|
@ -18,7 +18,6 @@ use Modules\ItemManagement\Models\Item;
|
||||||
use Modules\ItemManagement\Models\ItemAttribute;
|
use Modules\ItemManagement\Models\ItemAttribute;
|
||||||
use Modules\ItemManagement\Models\ItemAttributeMapper;
|
use Modules\ItemManagement\Models\ItemAttributeMapper;
|
||||||
use Modules\ItemManagement\Models\ItemAttributeType;
|
use Modules\ItemManagement\Models\ItemAttributeType;
|
||||||
use phpOMS\Localization\BaseStringL11n;
|
|
||||||
use Modules\ItemManagement\Models\ItemAttributeTypeL11nMapper;
|
use Modules\ItemManagement\Models\ItemAttributeTypeL11nMapper;
|
||||||
use Modules\ItemManagement\Models\ItemAttributeTypeMapper;
|
use Modules\ItemManagement\Models\ItemAttributeTypeMapper;
|
||||||
use Modules\ItemManagement\Models\ItemAttributeValue;
|
use Modules\ItemManagement\Models\ItemAttributeValue;
|
||||||
|
|
@ -28,15 +27,16 @@ use Modules\ItemManagement\Models\ItemL11n;
|
||||||
use Modules\ItemManagement\Models\ItemL11nMapper;
|
use Modules\ItemManagement\Models\ItemL11nMapper;
|
||||||
use Modules\ItemManagement\Models\ItemL11nType;
|
use Modules\ItemManagement\Models\ItemL11nType;
|
||||||
use Modules\ItemManagement\Models\ItemL11nTypeMapper;
|
use Modules\ItemManagement\Models\ItemL11nTypeMapper;
|
||||||
use Modules\ItemManagement\Models\ItemRelationType;
|
|
||||||
use Modules\ItemManagement\Models\ItemRelationTypeMapper;
|
|
||||||
use Modules\ItemManagement\Models\ItemMapper;
|
use Modules\ItemManagement\Models\ItemMapper;
|
||||||
use Modules\ItemManagement\Models\ItemPrice;
|
use Modules\ItemManagement\Models\ItemPrice;
|
||||||
use Modules\ItemManagement\Models\ItemPriceStatus;
|
use Modules\ItemManagement\Models\ItemPriceStatus;
|
||||||
|
use Modules\ItemManagement\Models\ItemRelationType;
|
||||||
|
use Modules\ItemManagement\Models\ItemRelationTypeMapper;
|
||||||
use Modules\ItemManagement\Models\NullItemAttributeType;
|
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\BaseStringL11n;
|
||||||
use phpOMS\Localization\ISO4217CharEnum;
|
use phpOMS\Localization\ISO4217CharEnum;
|
||||||
use phpOMS\Localization\ISO639x1Enum;
|
use phpOMS\Localization\ISO639x1Enum;
|
||||||
use phpOMS\Localization\Money;
|
use phpOMS\Localization\Money;
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Modules\ItemManagement\Models;
|
namespace Modules\ItemManagement\Models;
|
||||||
|
|
||||||
use phpOMS\Localization\ISO639x1Enum;
|
|
||||||
use phpOMS\Localization\BaseStringL11n;
|
use phpOMS\Localization\BaseStringL11n;
|
||||||
|
use phpOMS\Localization\ISO639x1Enum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Item Attribute Type class.
|
* Item Attribute Type class.
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Modules\ItemManagement\Models;
|
namespace Modules\ItemManagement\Models;
|
||||||
|
|
||||||
use phpOMS\Localization\ISO639x1Enum;
|
|
||||||
use phpOMS\Localization\BaseStringL11n;
|
use phpOMS\Localization\BaseStringL11n;
|
||||||
|
use phpOMS\Localization\ISO639x1Enum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Item attribute value class.
|
* Item attribute value class.
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Modules\ItemManagement\tests\Models;
|
namespace Modules\ItemManagement\tests\Models;
|
||||||
|
|
||||||
use Modules\ItemManagement\Models\ItemAttributeValue;
|
|
||||||
use Modules\ItemManagement\Models\AttributeValueType;
|
use Modules\ItemManagement\Models\AttributeValueType;
|
||||||
|
use Modules\ItemManagement\Models\ItemAttributeValue;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @internal
|
* @internal
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user