Merge branch 'develop' of https://github.com/Orange-Management/oms-Exchange into develop

Controller/ApiController.php

@@ -17,12 +17,12 @@ namespace Modules\Exchange\Controller;
 use Modules\Exchange\Models\InterfaceManager;
 use Modules\Exchange\Models\InterfaceManagerMapper;
 use Modules\Media\Models\UploadFile;
+use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\System\File\Local\Directory;
 use phpOMS\Model\Message\FormValidation;
-use phpOMS\Message\Http\RequestStatusCode;
+use phpOMS\System\File\Local\Directory;
 
 /**
  * Exchange controller class.

Interfaces/GSD/Importer.php

@@ -22,14 +22,30 @@ use Modules\Admin\Models\Account;
 use Modules\Admin\Models\Address;
 use Modules\ClientManagement\Models\Client;
 use Modules\ClientManagement\Models\ClientMapper;
+use Modules\Exchange\Interfaces\GSD\Model\GSDArticle;
 use Modules\Exchange\Interfaces\GSD\Model\GSDArticleMapper;
+use Modules\Exchange\Interfaces\GSD\Model\GSDCostCenter;
 use Modules\Exchange\Interfaces\GSD\Model\GSDCostCenterMapper;
+use Modules\Exchange\Interfaces\GSD\Model\GSDCostObject;
 use Modules\Exchange\Interfaces\GSD\Model\GSDCostObjectMapper;
+use Modules\Exchange\Interfaces\GSD\Model\GSDCustomer;
 use Modules\Exchange\Interfaces\GSD\Model\GSDCustomerMapper;
+use Modules\Exchange\Interfaces\GSD\Model\GSDSupplier;
 use Modules\Exchange\Interfaces\GSD\Model\GSDSupplierMapper;
 use Modules\Exchange\Models\ImporterAbstract;
 use Modules\ItemManagement\Models\Item;
+use Modules\ItemManagement\Models\ItemAttributeType;
+use Modules\ItemManagement\Models\ItemAttributeTypeL11n;
+use Modules\ItemManagement\Models\ItemAttributeTypeL11nMapper;
+use Modules\ItemManagement\Models\ItemAttributeTypeMapper;
+use Modules\ItemManagement\Models\ItemL11n;
+use Modules\ItemManagement\Models\ItemL11nType;
+use Modules\ItemManagement\Models\ItemL11nTypeMapper;
 use Modules\ItemManagement\Models\ItemMapper;
+use Modules\ItemManagement\Models\NullItemAttributeType;
+use Modules\ItemManagement\Models\NullItemL11nType;
+use Modules\Profile\Models\ContactElement;
+use Modules\Profile\Models\ContactType;
 use Modules\Profile\Models\Profile;
 use Modules\SupplierManagement\Models\Supplier;
 use Modules\SupplierManagement\Models\SupplierMapper;
@@ -37,27 +53,9 @@ use phpOMS\DataStorage\Database\Connection\ConnectionAbstract;
 use phpOMS\DataStorage\Database\Connection\ConnectionFactory;
 use phpOMS\DataStorage\Database\DatabaseStatus;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Localization\ISO639x1Enum;
-use Modules\Exchange\Interfaces\GSD\Model\GSDArticle;
-use Modules\Exchange\Interfaces\GSD\Model\GSDCostCenter;
-use Modules\Exchange\Interfaces\GSD\Model\GSDCostObject;
-use Modules\Exchange\Interfaces\GSD\Model\GSDCustomer;
-use Modules\Exchange\Interfaces\GSD\Model\GSDSupplier;
-use Modules\ItemManagement\Models\ItemAttributeTypeL11n;
-use Modules\ItemManagement\Models\ItemL11n;
-use Modules\ItemManagement\Models\ItemL11nType;
-use Modules\ItemManagement\Models\ItemL11nTypeMapper;
-use Modules\ItemManagement\Models\ItemAttributeType;
-use Modules\ItemManagement\Models\ItemAttributeTypeL11nMapper;
-use Modules\ItemManagement\Models\ItemAttributeTypeMapper;
-use Modules\ItemManagement\Models\NullItemAttributeType;
-use Modules\ItemManagement\Models\NullItemL11nType;
-use Modules\Profile\Models\ContactElement;
-use Modules\Profile\Models\ContactElementMapper;
-use Modules\Profile\Models\ProfileMapper;
 use phpOMS\Localization\ISO3166TwoEnum;
-use Modules\Profile\Models\ContactType;
+use phpOMS\Localization\ISO639x1Enum;
+use phpOMS\Message\RequestAbstract;
 
 /**
  * GSD import class

Interfaces/GSD/Model/GSDAddress.php

@@ -25,18 +25,31 @@ namespace Modules\Exchange\Interfaces\GSD\Model;
 class GSDAddress
 {
     public int $id = 0;
+
     public string $name1 = '';
+
     public string $name2 = '';
+
     public string $name3 = '';
+
     public string $city = '';
+
     public string $country = '';
+
     public string $zip = '';
+
     public string $street = '';
+
     public string $phone = '';
+
     public string $fax = '';
+
     public string $email = '';
+
     public string $website = '';
+
     public int $createdBy = 0;
+
     public \DateTimeImmutable $createdAt;
 
     /**

Interfaces/GSD/Model/GSDArticle.php

@@ -25,69 +25,111 @@ namespace Modules\Exchange\Interfaces\GSD\Model;
 class GSDArticle
 {
     public int $id = 0;
+
     public int $createdBy = 0;
+
     public \DateTimeImmutable $createdAt;
 
     public bool $isDiscontinued = false;
+
     public bool $isBlocked = false;
 
     public string $number = '';
+
     public string $infoSales = '';
+
     public string $infoPurchase = '';
+
     public string $infoWarehouse = '';
 
     public string $name1 = '';
+
     public string $name2 = '';
+
     public string $name1Eng = '';
+
     public string $name2Eng = '';
 
     public int $status = 0;
+
     public string $lotManagement = '';
+
     public bool $hasSN = false;
 
     public float $weight = 0.0;
+
     public float $height = 0.0;
+
     public float $length = 0.0;
+
     public float $volume = 0.0;
 
     public string $purchaseUnit = '';
+
     public bool $manualLotUse = true;
+
     public int $leadTimeWeeks = 0;
+
     public int $leadTimeDays = 0;
+
     public int $leadTime = 0;
+
     public float $minimalStock = 0.0;
+
     public bool $negativeStock = false;
 
     public string $customsId = '';
+
     public string $unnumber = '';
+
     public string $EUitemgroup = '';
+
     public string $inspectionDepartment = '';
+
     public string $medicinProductClass = '';
 
     public bool $exportItem = false;
+
     public bool $nonEUItem = false;
+
     public bool $dualUse = false;
+
     public int $inShop = 0;
 
     public string $sectionGroup = ''; // Sparte
+
     public string $salesGroup = ''; // Umsatzgruppe
+
     public string $segment = ''; // Segment
+
     public int $productGroup = 0;
 
     public string $earningsIndicator = '';
+
     public string $costsIndicator = '';
 
     public float $weightTinplate = 0.0; // Weissblech
+
     public float $weightOtherComposites = 0.0; // Sonstige Verbunde
+
     public float $weightOther = 0.0; // Sonstiges
+
     public float $weightPET = 0.0; // PET
+
     public float $weightPaper = 0.0;
+
     public float $weightNatureProducts = 0.0;
+
     public float $weightAcrylics = 0.0;
+
     public float $weightCarton = 0.0;
+
     public float $weightGlas = 0.0;
+
     public float $weightAluminium = 0.0;
+
     public float $weightGross = 0.0;
+
     public float $weightNet = 0.0;
 
     public array $prices = []; // @todo implement from [Preise] where ParentID = 1, 2, 4??? for sales price and ParentType = 2 for purchase price?

Interfaces/GSD/Model/GSDCustomer.php

@@ -31,40 +31,60 @@ class GSDCustomer
      * @since 1.0.0
      */
     public int $id = 0;
+
     public int $createdBy = 0;
+
     public \DateTimeImmutable $createdAt;
+
     public bool $isBlocked = false;
+
     public bool $isDiscontinued = false;
+
     public bool $isLocked = false;
 
     public string $number = '';
+
     public string $customerType = '';
+
     public GSDAddress $addr;
+
     public string $info = '';
 
     public int $account = 0;
+
     public int $materialAccount = 0;
+
     public int $accountsReceivableAccount = 0;
+
     public string $earningsIndicator = '';
 
     public float $creditlimit = 0.0;
+
     public string $egustid = '';
+
     public string $taxid = '';
+
     public string $bic = '';
+
     public string $iban = '';
+
     public string $bankRef = '';
 
     public string $salesRep = '';
+
     public bool $isMonthlyInvoice = false;
+
     public bool $reminderBlock = false;
+
     public string $legalType = '';
 
     public array $partner = [];
 
     public array $paymentTerms = []; // @todo: implement model/mapper
-    public array $addresses = []; // @todo: implement
-    public array $prices = []; // @todo: implement
 
+    public array $addresses = []; // @todo: implement
+
+    public array $prices = []; // @todo: implement
 
     /**
      * Construct.

Interfaces/GSD/Model/GSDSupplier.php

@@ -24,16 +24,24 @@ namespace Modules\Exchange\Interfaces\GSD\Model;
  */
 class GSDSupplier
 {
-
     public int $id = 0;
+
     public $createdBy = 0;
+
     public \DateTimeImmutable $createdAt;
+
     public string $number = '';
+
     public string $info = '';
+
     public string $taxid = '';
+
     public string $bic = '';
+
     public string $iban = '';
+
     public GSDAddress $addr;
+
     public int $deliveryStatus = 0;
 
     /**