Release version 1.2.11

channelengine · Oct 28, 2024 · d20881b · d20881b
1 parent 191c8ed
commit d20881b
Show file tree

Hide file tree

Showing 10 changed files with 291 additions and 48 deletions.
diff --git a/Controller/Adminhtml/Configuration/Save.php b/Controller/Adminhtml/Configuration/Save.php
@@ -85,9 +85,9 @@ class Save extends Action
      * @param ProductMetadataInterface $productMetadata
      */
     public function __construct(
-        Context               $context,
-        JsonFactory           $resultJsonFactory,
-        StoreManagerInterface $storeManager,
+        Context                  $context,
+        JsonFactory              $resultJsonFactory,
+        StoreManagerInterface    $storeManager,
         ProductMetadataInterface $productMetadata
     ) {
         parent::__construct($context);
@@ -146,8 +146,10 @@ public function execute()
                 $params['merchantOrderSync'] === '1',
                 $params['shipmentSync'] === '1',
                 $params['cancellationSync'] === '1',
+                $params['addressFormat'] ?? 'default',
                 $params['fulfilledFromDate'] ?? '',
-                isset($params['returnsSync']) && $params['returnsSync'] === '1'
+                isset($params['returnsSync']) && $params['returnsSync'] === '1',
+                $params['createReservationsEnabled'] === '1'
             );
 
             $this->saveOrderStatusMapping($params['orderStatusMappings'] ?? []);
@@ -213,12 +215,13 @@ private function saveAccountData(string $apiKey, string $accountName, string $st
      * @throws QueryFilterInvalidParamException
      */
     private function savePriceSettings(
-        bool $exportProducts,
+        bool   $exportProducts,
         int    $groupPricing,
         string $priceAttribute,
         string $customerGroup = '',
         int    $quantity = 0
-    ): void {
+    ): void
+    {
         if (!$exportProducts) {
             return;
         }
@@ -254,11 +257,11 @@ private function savePriceSettings(
      * @throws QueryFilterInvalidParamException
      */
     private function saveStockSettings(
-        bool $exportProducts,
-        bool $enableStockSync,
+        bool  $exportProducts,
+        bool  $enableStockSync,
         array $inventories,
-        int $quantity,
-        bool $enableMSI
+        int   $quantity,
+        bool  $enableMSI
     ): void
     {
         if (!$exportProducts) {
@@ -402,13 +405,16 @@ private function saveAttributeMappings(bool $exportProducts, array $attributeMap
      */
     private function saveOrderSyncSettings(
         string $unknownLinesHandling,
-        bool $importFulfilledOrders,
-        bool $merchantFulfilledOrdersSync,
-        bool $shipmentSync,
-        bool $cancellationsSync,
+        bool   $importFulfilledOrders,
+        bool   $merchantFulfilledOrdersSync,
+        bool   $shipmentSync,
+        bool   $cancellationsSync,
+        string $addressFormat,
         string $fulfilledFromDate,
-        bool $returnsSync
-    ): void {
+        bool  $returnsSync,
+        bool  $createReservationsEnabled
+    ): void
+    {
         if (!$this->validateOrderSyncSettings(
             $unknownLinesHandling,
             $importFulfilledOrders,
@@ -428,6 +434,8 @@ private function saveOrderSyncSettings(
             $orderSettings->setEnableOrderCancellationSync($cancellationsSync);
             $orderSettings->setFromDate($fulfilledFromDate);
             $orderSettings->setEnableReturnsSync($returnsSync);
+            $orderSettings->setCreateReservationsEnabled($createReservationsEnabled);
+            $orderSettings->setAddressFormat($addressFormat);
 
             $this->getOrderSettingsService()->saveOrderSyncConfig($orderSettings);
             $this->getStateService()->setOrderConfigured(true);

diff --git a/Controller/Adminhtml/Onboarding/OrderSettings.php b/Controller/Adminhtml/Onboarding/OrderSettings.php
@@ -54,10 +54,11 @@ class OrderSettings extends Action
      * @param ProductMetadataInterface $productMetadata
      */
     public function __construct(
-        Context $context,
-        JsonFactory $resultJsonFactory,
+        Context                  $context,
+        JsonFactory              $resultJsonFactory,
         ProductMetadataInterface $productMetadata
-    ) {
+    )
+    {
         parent::__construct($context);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->productMetadata = $productMetadata;
@@ -77,13 +78,15 @@ public function execute()
 
         $postParams = $this->getPostParams();
         $unknownLinesHandling = $postParams['unknownLinesHandling'] ?? '';
+        $createReservationsEnabled = $postParams['createReservationsEnabled'] === '1';
         $importFulfilledOrders = $postParams['importFulfilledOrders'] === '1';
         $fulfilledFromDate = $postParams['fulfilledFromDate'] ?? '';
         $defaultCondition = $postParams['defaultCondition'] ?? '';
         $defaultResolution = $postParams['defaultResolution'] ?? '';
         $merchantFulfilledOrdersSync = $postParams['merchantOrderSync'] === '1';
         $shipmentSync = $postParams['shipmentSync'] === '1';
         $cancellationsSync = $postParams['cancellationSync'] === '1';
+        $addressFormat = $postParams['addressFormat'] ?? 'default';
         $returnsImport = $postParams['returnsEnabled'] === '1';
         $returnsSync = $postParams['returnsSync'] === '1';
         $orderStatusMappings = $postParams['orderStatusMappings'] ?? [];
@@ -112,6 +115,8 @@ public function execute()
         $orderSettings->setEnableOrderCancellationSync($cancellationsSync);
         $orderSettings->setFromDate($fulfilledFromDate);
         $orderSettings->setEnableReturnsSync($returnsSync);
+        $orderSettings->setCreateReservationsEnabled($createReservationsEnabled);
+        $orderSettings->setAddressFormat($addressFormat);
 
         $this->getOrderSettingsService()->saveOrderSyncConfig($orderSettings);
         $this->getStateService()->setOrderConfigured(true);
@@ -135,7 +140,13 @@ public function execute()
      *
      * @return bool
      */
-    private function validateRequest($unknownLinesHandling, $importFulfilledOrders, $defaultCondition, $defaultResolution, $returnsImport): bool
+    private function validateRequest(
+        $unknownLinesHandling,
+        $importFulfilledOrders,
+        $defaultCondition,
+        $defaultResolution,
+        $returnsImport
+    ): bool
     {
         $returnsValid = true;
 

diff --git a/IntegrationCore/BusinessLogic/Orders/Configuration/OrderSyncConfig.php b/IntegrationCore/BusinessLogic/Orders/Configuration/OrderSyncConfig.php
@@ -27,7 +27,9 @@ class OrderSyncConfig extends Entity
         'enableReduceStock',
         'unknownLinesHandling',
         'fromDate',
-        'enableReturnsSync'
+        'enableReturnsSync',
+        'createReservationsEnabled',
+        'addressFormat'
     ];
     /**
      * @var string
@@ -74,6 +76,16 @@ class OrderSyncConfig extends Entity
      */
     protected $enableReturnsSync;
 
+    /**
+     * @var bool
+     */
+    protected $createReservationsEnabled = true;
+
+    /**
+     * @var string
+     */
+    protected $addressFormat = 'default';
+
     /**
      * @return string
      */
@@ -242,4 +254,36 @@ public function getConfig()
     {
         return new EntityConfiguration(new IndexMap(), 'OrderSyncConfig');
     }
+
+    /**
+     * @return bool
+     */
+    public function isCreateReservationsEnabled()
+    {
+        return $this->createReservationsEnabled;
+    }
+
+    /**
+     * @param bool $createReservationsEnabled
+     */
+    public function setCreateReservationsEnabled($createReservationsEnabled)
+    {
+        $this->createReservationsEnabled = $createReservationsEnabled;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAddressFormat()
+    {
+        return $this->addressFormat;
+    }
+
+    /**
+     * @param string $addressFormat
+     */
+    public function setAddressFormat($addressFormat)
+    {
+        $this->addressFormat = $addressFormat;
+    }
 }