magento
diff --git a/‎app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php
Copy file name to clipboard
+5-24Lines changed: 5 additions & 24 deletions b/‎app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php
Copy file name to clipboard
+5-24Lines changed: 5 additions & 24 deletions
diff --git a/‎app/code/Magento/Inventory/Model/OptionSource/CarrierSource.php
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions b/‎app/code/Magento/Inventory/Model/OptionSource/CarrierSource.php
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/‎app/code/Magento/Inventory/Model/OptionSource/RegionSource.php
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎app/code/Magento/Inventory/Model/OptionSource/RegionSource.php
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎app/code/Magento/Inventory/Model/OptionSource/SourceItemStatus.php
Copy file name to clipboard
+34Lines changed: 34 additions & 0 deletions b/‎app/code/Magento/Inventory/Model/OptionSource/SourceItemStatus.php
Copy file name to clipboard
+34Lines changed: 34 additions & 0 deletions
diff --git a/‎app/code/Magento/Inventory/Model/ResourceModel/Source.php
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎app/code/Magento/Inventory/Model/ResourceModel/Source.php
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎app/code/Magento/Inventory/Model/ResourceModel/Source/Collection.php
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎app/code/Magento/Inventory/Model/ResourceModel/Source/Collection.php
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎app/code/Magento/Inventory/Model/ResourceModel/SourceCarrierLink.php
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Inventory/Model/ResourceModel/SourceCarrierLink.php
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Inventory/Model/ResourceModel/SourceCarrierLink/Collection.php
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎app/code/Magento/Inventory/Model/ResourceModel/SourceCarrierLink/Collection.php
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎app/code/Magento/Inventory/Model/ResourceModel/SourceItem.php
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/‎app/code/Magento/Inventory/Model/ResourceModel/SourceItem.php
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
diff --git a/‎app/code/Magento/Inventory/Model/ResourceModel/SourceItem/Collection.php
Copy file name to clipboard
+26Lines changed: 26 additions & 0 deletions b/‎app/code/Magento/Inventory/Model/ResourceModel/SourceItem/Collection.php
Copy file name to clipboard
+26Lines changed: 26 additions & 0 deletions
@@ -11,7 +11,6 @@
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Registry;
 use Magento\InventoryApi\Api\Data\SourceInterface;
@@ -28,11 +27,6 @@ class Save extends Action
      */
     const ADMIN_RESOURCE = 'Magento_Inventory::source';
 
-    /**
-     * Registry source_id key
-     */
-    const REGISTRY_SOURCE_ID_KEY = 'source_id';
-
     /**
      * @var SourceInterfaceFactory
      */
@@ -48,11 +42,6 @@ class Save extends Action
      */
     private $dataObjectHelper;
 
-    /**
-     * @var Registry
-     */
-    private $registry;
-
     /**
      * @var CarrierRequestDataHydrator
      */
@@ -64,21 +53,18 @@ class Save extends Action
      * @param SourceRepositoryInterface $sourceRepository
      * @param DataObjectHelper $dataObjectHelper
      * @param CarrierRequestDataHydrator $carrierRequestDataHydrator
-     * @param Registry $registry
      */
     public function __construct(
         Context $context,
         SourceInterfaceFactory $sourceFactory,
         SourceRepositoryInterface $sourceRepository,
         DataObjectHelper $dataObjectHelper,
-        Registry $registry,
         CarrierRequestDataHydrator $carrierRequestDataHydrator
     ) {
         parent::__construct($context);
         $this->sourceFactory = $sourceFactory;
         $this->sourceRepository = $sourceRepository;
         $this->dataObjectHelper = $dataObjectHelper;
-        $this->registry = $registry;
         $this->carrierRequestDataHydrator = $carrierRequestDataHydrator;
     }
 
@@ -88,15 +74,13 @@ public function __construct(
     public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
-        $requestData = $this->getRequest()->getParam('general');
-        if ($this->getRequest()->isPost() && $requestData) {
+        $requestData = $this->getRequest()->getParams();
+        if ($this->getRequest()->isPost() && !empty($requestData['general'])) {
             try {
-                $sourceId = !empty($requestData[SourceInterface::SOURCE_ID])
-                    ? $requestData[SourceInterface::SOURCE_ID] : null;
+                $sourceId = !empty($requestData['general'][SourceInterface::SOURCE_ID])
+                    ? $requestData['general'][SourceInterface::SOURCE_ID] : null;
 
                 $sourceId = $this->processSave($sourceId, $requestData);
-                // Keep data for plugins on Save controller. Now we can not call separate services from one form.
-                $this->registry->register(self::REGISTRY_SOURCE_ID_KEY, $sourceId);
 
                 $this->messageManager->addSuccessMessage(__('The Source has been saved.'));
                 $this->processRedirectAfterSuccessSave($resultRedirect, $sourceId);
@@ -107,9 +91,6 @@ public function execute()
             } catch (CouldNotSaveException $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
                 $this->processRedirectAfterFailureSave($resultRedirect, $sourceId);
-            } catch (InputException $e) {
-                $this->messageManager->addErrorMessage($e->getMessage());
-                $this->processRedirectAfterFailureSave($resultRedirect, $sourceId);
             } catch (Exception $e) {
                 $this->messageManager->addErrorMessage(__('Could not save source'));
                 $this->processRedirectAfterFailureSave($resultRedirect, $sourceId);
@@ -134,7 +115,7 @@ private function processSave($sourceId, array $requestData)
             /** @var SourceInterface $source */
             $source = $this->sourceFactory->create();
         }
-        $this->dataObjectHelper->populateWithArray($source, $requestData, SourceInterface::class);
+        $this->dataObjectHelper->populateWithArray($source, $requestData['general'], SourceInterface::class);
         $source = $this->carrierRequestDataHydrator->hydrate($source, $requestData);
 
         $sourceId = $this->sourceRepository->save($source);
 
@@ -9,7 +9,9 @@
 use Magento\Shipping\Model\Config;
 
 /**
- * Class CarrierSource
+ * Provide option values for UI
+ *
+ * @api
  */
 class CarrierSource implements OptionSourceInterface
 {
@@ -38,7 +40,7 @@ public function __construct(Config $shippingConfig)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function toOptionArray()
     {
 
@@ -9,7 +9,9 @@
 use Magento\Framework\Data\OptionSourceInterface;
 
 /**
- * Class RegionSource
+ * Provide option values for UI
+ *
+ * @api
  */
 class RegionSource implements OptionSourceInterface
 {
 
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Inventory\Model\OptionSource;
+
+use Magento\Framework\Data\OptionSourceInterface;
+use Magento\InventoryApi\Api\Data\SourceItemInterface;
+
+/**
+ * Provide option values for UI
+ *
+ * @api
+ */
+class SourceItemStatus implements OptionSourceInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => SourceItemInterface::STATUS_IN_STOCK,
+                'label' => __('In Stock'),
+            ],
+            [
+                'value' => SourceItemInterface::STATUS_OUT_OF_STOCK,
+                'label' => __('Out of Stock'),
+            ],
+        ];
+    }
+}
@@ -13,6 +13,9 @@
 use Magento\Inventory\Setup\InstallSchema;
 use Magento\InventoryApi\Api\Data\SourceInterface;
 
+/**
+ * Implementation of basic operations for Source entity for specific db layer
+ */
 class Source extends AbstractDb
 {
     /**
 
@@ -16,6 +16,11 @@
 use Magento\InventoryApi\Api\Data\SourceInterface;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Resource Collection of Sources entities
+ *
+ * @api
+ */
 class Collection extends AbstractCollection
 {
     /**
 
@@ -9,7 +9,7 @@
 use Magento\Inventory\Setup\InstallSchema;
 
 /**
- * This class is needed only for collection working
+ * This class needed for service internal purposes only, to make collection work properly
  */
 class SourceCarrierLink extends AbstractDb
 {
 
@@ -10,6 +10,10 @@
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Inventory\Model\SourceCarrierLink as SourceCarrierLinkModel;
 
+/**
+ * Resource Collection of SourceCarrierLink entities
+ * It is not an API because SourceCarrierLink must be loaded via Source entity only
+ */
 class Collection extends AbstractCollection
 {
     /**
 
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Inventory\Model\ResourceModel;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Inventory\Setup\InstallSchema;
+use Magento\InventoryApi\Api\Data\SourceItemInterface;
+
+/**
+ * Implementation of basic operations for Source Item entity for specific db layer
+ */
+class SourceItem extends AbstractDb
+{
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init(InstallSchema::TABLE_NAME_SOURCE_ITEM, SourceItemInterface::SOURCE_ITEM_ID);
+    }
+}
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Inventory\Model\ResourceModel\SourceItem;
+
+use Magento\Inventory\Model\ResourceModel\SourceItem as ResourceSource;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Inventory\Model\SourceItem as SourceItemModel;
+
+/**
+ * Resource Collection of Source Items entity
+ *
+ * @api
+ */
+class Collection extends AbstractCollection
+{
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init(SourceItemModel::class, ResourceSource::class);
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@`
`9`	`9`	`use Magento\Shipping\Model\Config;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * Class CarrierSource`
	`12`	`+ * Provide option values for UI`
	`13`	`+ *`
	`14`	`+ * @api`
`13`	`15`	`*/`
`14`	`16`	`class CarrierSource implements OptionSourceInterface`
`15`	`17`	`{`
`@@ -38,7 +40,7 @@ public function __construct(Config $shippingConfig)`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`/**`
`41`		`- * {@inheritdoc}`
	`43`	`+ * @inheritdoc`
`42`	`44`	`*/`
`43`	`45`	`public function toOptionArray()`
`44`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`	`use Magento\Inventory\Setup\InstallSchema;`
`14`	`14`	`use Magento\InventoryApi\Api\Data\SourceInterface;`
`15`	`15`
	`16`	`+/**`
	`17`	`+ * Implementation of basic operations for Source entity for specific db layer`
	`18`	`+ */`
`16`	`19`	`class Source extends AbstractDb`
`17`	`20`	`{`
`18`	`21`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Magento\Inventory\Setup\InstallSchema;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * This class is needed only for collection working`
	`12`	`+ * This class needed for service internal purposes only, to make collection work properly`
`13`	`13`	`*/`
`14`	`14`	`class SourceCarrierLink extends AbstractDb`
`15`	`15`	`{`