Release version 2.0.20

ISSUE: CS-4605

Author: ivan-logeecom

Controller/Adminhtml/AutoConnect/AutoGenerateApiUser.php

@@ -5,7 +5,6 @@
 use SendCloud\SendCloud\Logger\SendCloudLogger;
 use Magento\Authorization\Model\RoleFactory;
 use Magento\Authorization\Model\RulesFactory;
-use Magento\Setup\Exception;
 use Magento\User\Model\UserFactory;
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
 use Magento\Authorization\Model\UserContextInterface;
@@ -74,7 +73,7 @@ public function __construct(
      * @param $password
      * @param int|null $store
      * @return array|false
-     * @throws Exception
+     * @throws \Exception
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getApiUser($password, $store)
@@ -95,7 +94,7 @@ public function getApiUser($password, $store)
             $apiUser->save();
         } catch (\Exception $ex) {
             $this->logger->debug($ex->getMessage());
-            throw new Exception($ex->getMessage());
+            throw new \Exception($ex->getMessage());
         }
 
         $apiUserArray = [
@@ -161,7 +160,7 @@ public function createApiUser($password, $store)
      * Create Api Role
      *
      * @return \Magento\Authorization\Model\Role
-     * @throws Exception
+     * @throws \Exception
      */
     private function generateApiRole()
     {
@@ -186,7 +185,7 @@ private function generateApiRole()
             $role->save();
         } catch (\Exception $ex) {
             $this->logger->debug($ex->getMessage());
-            throw new Exception($ex->getMessage());
+            throw new \Exception($ex->getMessage());
         }
 
         $this->rulesFactory->create()

Controller/Adminhtml/AutoConnect/Connector.php

@@ -70,7 +70,7 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
-     * @throws \Magento\Setup\Exception
+     * @throws \Exception
      */
     public function execute()
     {

Controller/Adminhtml/Configuration/Save.php

@@ -43,13 +43,13 @@ public function execute()
             $this->writer->save('sendcloud/general/enable', $data['is_active']);
             $this->scopeConfig->reinit();
 
-            $this->_redirect('sendcloud/configuration/index/store/');
+            return $this->_redirect('sendcloud/configuration/index/store/');
+        }
 
-        } else {
-            $this->writer->save('sendcloud/general/enable', $data['is_active'], ScopeInterface::SCOPE_STORES, (int)$data['store_id']);
-            $this->scopeConfig->reinit();
+        $this->writer->save('sendcloud/general/enable', $data['is_active'], ScopeInterface::SCOPE_STORES, (int)$data['store_id']);
+        $this->scopeConfig->reinit();
+
+        return $this->_redirect("sendcloud/configuration/index/store/$storeId");
 
-            $this->_redirect("sendcloud/configuration/index/store/$storeId");
-        }
     }
 }

Model/CheckoutConfiguration.php

@@ -103,7 +103,7 @@ public function update($store_view_id, $checkout_configuration)
                 \Magento\Framework\Webapi\Exception::HTTP_BAD_REQUEST,
                 $this->formatErrorData($e->getValidationErrors())
             );
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->logger->error(('Failed to update checkout configuration: ' . $e->getMessage()));
             throw new \Magento\Framework\Webapi\Exception(
                 __('Invalid checkout payload.'),
@@ -142,7 +142,7 @@ public function delete($store_view_id)
                 $store_view_id
             );
             $this->scopeConfig->reinit();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->logger->error('Failed to delete checkout configuration: ' . $e->getMessage());
             throw new \Magento\Framework\Webapi\Exception(
                 __('Failed to delete checkout configuration.'),
@@ -171,7 +171,7 @@ public function deleteIntegration($store_view_id)
                 $store_view_id
             );
             $this->scopeConfig->reinit();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->logger->error('Failed to delete integration: ' . $e->getMessage());
             throw new \Magento\Framework\Webapi\Exception(
                 __('Failed to delete integration.'),

Model/ResourceModel/SendcloudDeliveryMethod/Collection.php

@@ -15,6 +15,10 @@
  */
 class Collection extends AbstractCollection implements SearchResultInterface
 {
+    /**
+     * @var AggregationInterface
+     */
+    private $aggregations;
 
     /**
      * Define resource model

Model/ResourceModel/SendcloudDeliveryZone/Collection.php

@@ -15,6 +15,10 @@
  */
 class Collection extends AbstractCollection implements SearchResultInterface
 {
+    /**
+     * @var AggregationInterface
+     */
+    private $aggregations;
 
     /**
      * Define resource model

Plugin/Order/CheckoutOrderRepository.php

@@ -7,6 +7,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderSearchResultInterface;
 use Magento\Sales\Model\OrderRepository as MagentoOrderRepository;
+use SendCloud\SendCloud\Logger\SendCloudLogger;
 
 /**
  * Class OrderRepository
@@ -16,13 +17,18 @@ class CheckoutOrderRepository
     /** @var OrderExtensionFactory */
     private $orderExtensionFactory;
 
+    /** @var SendCloudLogger */
+    private $logger;
+
     /**
      * OrderRepository constructor.
      * @param OrderExtensionFactory $orderExtensionFactory
+     * @param SendCloudLogger $logger
      */
-    public function __construct(OrderExtensionFactory $orderExtensionFactory)
+    public function __construct(OrderExtensionFactory $orderExtensionFactory, SendCloudLogger $logger)
     {
         $this->orderExtensionFactory = $orderExtensionFactory;
+        $this->logger = $logger;
     }
 
     /**

Plugin/Order/OrderRepository.php

@@ -7,6 +7,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderSearchResultInterface;
 use Magento\Sales\Model\OrderRepository as MagentoOrderRepository;
+use SendCloud\SendCloud\Logger\SendCloudLogger;
 
 /**
  * Class OrderRepository
@@ -16,13 +17,18 @@ class OrderRepository
     /** @var OrderExtensionFactory */
     private $orderExtensionFactory;
 
+    /** @var SendCloudLogger */
+    private $logger;
+
     /**
      * OrderRepository constructor.
      * @param OrderExtensionFactory $orderExtensionFactory
+     * @param SendCloudLogger $logger
      */
-    public function __construct(OrderExtensionFactory $orderExtensionFactory)
+    public function __construct(OrderExtensionFactory $orderExtensionFactory, SendCloudLogger $logger)
     {
         $this->orderExtensionFactory = $orderExtensionFactory;
+        $this->logger = $logger;
     }
 
     /**

Setup/Patch/Data/UpdateInternationalShipping.php

@@ -99,6 +99,8 @@ public function apply()
         $this->moduleDataSetup->getConnection()->endSetup();
 
         $connection->endSetup();
+
+        return $this;
     }
 
     /**

Setup/Patch/Data/UpdateServicePoint.php

@@ -103,6 +103,8 @@ public function apply()
         $this->moduleDataSetup->getConnection()->endSetup();
 
         $connection->endSetup();
+
+        return $this;
     }
 
     /**