diff --git a/Inventory/composer.json b/Inventory/composer.json index 0b299dacaf09..d11e2ce80c1b 100644 --- a/Inventory/composer.json +++ b/Inventory/composer.json @@ -1,16 +1,17 @@ { "name": "magento/module-inventory", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*", - "magento/module-inventory-api": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.2.2", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*", + "magento/module-inventory-api": "1.2.*" + }, "autoload": { "files": [ "registration.php" @@ -20,3 +21,4 @@ } } } + diff --git a/InventoryAdminUi/composer.json b/InventoryAdminUi/composer.json index d624e27737bb..162d9c0c4930 100644 --- a/InventoryAdminUi/composer.json +++ b/InventoryAdminUi/composer.json @@ -1,21 +1,22 @@ { "name": "magento/module-inventory-admin-ui", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2-p1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-inventory": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-catalog-api": "*", + "magento/module-inventory": "1.2.*", + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", "magento/module-backend": "*", "magento/module-directory": "*", "magento/module-ui": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -25,3 +26,4 @@ } } } + diff --git a/InventoryAdminUi/view/adminhtml/ui_component/inventory_source_listing.xml b/InventoryAdminUi/view/adminhtml/ui_component/inventory_source_listing.xml index d0b3ecf7f932..e5df8b68d7c7 100644 --- a/InventoryAdminUi/view/adminhtml/ui_component/inventory_source_listing.xml +++ b/InventoryAdminUi/view/adminhtml/ui_component/inventory_source_listing.xml @@ -17,6 +17,7 @@ primary + Magento_InventoryApi::source_edit inventory_source_listing_columns diff --git a/InventoryAdvancedCheckout/composer.json b/InventoryAdvancedCheckout/composer.json index f5974dcee1bd..ca41b2faacb9 100644 --- a/InventoryAdvancedCheckout/composer.json +++ b/InventoryAdvancedCheckout/composer.json @@ -1,21 +1,22 @@ { "name": "magento/module-inventory-advanced-checkout", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-store": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-sales-api": "*" + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-sales-api": "1.2.*" }, "suggest": { "magento/module-advanced-checkout": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -25,3 +26,4 @@ } } } + diff --git a/InventoryApi/composer.json b/InventoryApi/composer.json index 9593e82588b6..d718035419d7 100644 --- a/InventoryApi/composer.json +++ b/InventoryApi/composer.json @@ -1,15 +1,16 @@ { "name": "magento/module-inventory-api", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.2.2-p1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*" + }, "autoload": { "files": [ "registration.php" @@ -19,3 +20,4 @@ } } } + diff --git a/InventoryApi/etc/acl.xml b/InventoryApi/etc/acl.xml index 767852666e56..287de1965149 100644 --- a/InventoryApi/etc/acl.xml +++ b/InventoryApi/etc/acl.xml @@ -13,11 +13,13 @@ + + diff --git a/InventoryApi/etc/webapi.xml b/InventoryApi/etc/webapi.xml index 01fc750704bf..6f8b1fc93e26 100644 --- a/InventoryApi/etc/webapi.xml +++ b/InventoryApi/etc/webapi.xml @@ -98,13 +98,13 @@ - + - + diff --git a/InventoryBundleImportExport/composer.json b/InventoryBundleImportExport/composer.json index 4306139e6d3b..a9d71a7e6b06 100644 --- a/InventoryBundleImportExport/composer.json +++ b/InventoryBundleImportExport/composer.json @@ -1,19 +1,20 @@ { "name": "magento/module-inventory-bundle-import-export", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.1.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-bundle-import-export": "*", - "magento/module-inventory-catalog-api": "*", + "magento/module-inventory-catalog-api": "1.3.*", "magento/module-bundle": "*", "magento/module-catalog-import-export": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -23,3 +24,4 @@ } } } + diff --git a/InventoryBundleProduct/composer.json b/InventoryBundleProduct/composer.json index f6811e9dc9bc..bbc79a8effd8 100644 --- a/InventoryBundleProduct/composer.json +++ b/InventoryBundleProduct/composer.json @@ -1,25 +1,26 @@ { "name": "magento/module-inventory-bundle-product", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-bundle": "*", "magento/module-catalog": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-configuration-api": "*", - "magento/module-inventory-sales-api": "*", + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-configuration-api": "1.2.*", + "magento/module-inventory-sales-api": "1.2.*", "magento/module-store": "*" }, "suggest": { "magento/module-catalog-inventory": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -29,3 +30,4 @@ } } } + diff --git a/InventoryBundleProductAdminUi/composer.json b/InventoryBundleProductAdminUi/composer.json index 8349ceb5a5d8..bb52cb68bd63 100644 --- a/InventoryBundleProductAdminUi/composer.json +++ b/InventoryBundleProductAdminUi/composer.json @@ -1,23 +1,24 @@ { "name": "magento/module-inventory-bundle-product-admin-ui", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-bundle": "*", "magento/module-catalog": "*", "magento/module-ui": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-catalog-admin-ui": "*" + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-catalog-admin-ui": "1.2.*" }, "suggest": { - "magento/module-inventory-configuration-api": "*" + "magento/module-inventory-configuration-api": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -27,3 +28,4 @@ } } } + diff --git a/InventoryBundleProductIndexer/composer.json b/InventoryBundleProductIndexer/composer.json index 7bd0f8433974..9d15161825c5 100644 --- a/InventoryBundleProductIndexer/composer.json +++ b/InventoryBundleProductIndexer/composer.json @@ -1,24 +1,25 @@ { "name": "magento/module-inventory-bundle-product-indexer", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.1.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-bundle": "*", "magento/module-catalog": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-indexer": "*", - "magento/module-inventory-multi-dimensional-indexer-api": "*" + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-indexer": "2.1.*", + "magento/module-inventory-multi-dimensional-indexer-api": "1.2.*" }, "suggest": { - "magento/module-inventory": "*" + "magento/module-inventory": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -28,3 +29,4 @@ } } } + diff --git a/InventoryCache/composer.json b/InventoryCache/composer.json index 5abc2c3515f3..04f37338858d 100644 --- a/InventoryCache/composer.json +++ b/InventoryCache/composer.json @@ -1,20 +1,21 @@ { "name": "magento/module-inventory-cache", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-indexer": "*" + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-indexer": "2.1.*" }, "suggest": { "magento/module-catalog": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -24,3 +25,4 @@ } } } + diff --git a/InventoryCatalog/Plugin/CatalogInventory/Helper/Stock/AdaptAssignStatusToProductPlugin.php b/InventoryCatalog/Plugin/CatalogInventory/Helper/Stock/AdaptAssignStatusToProductPlugin.php index efc90a54218e..40730e8e7e8d 100644 --- a/InventoryCatalog/Plugin/CatalogInventory/Helper/Stock/AdaptAssignStatusToProductPlugin.php +++ b/InventoryCatalog/Plugin/CatalogInventory/Helper/Stock/AdaptAssignStatusToProductPlugin.php @@ -14,6 +14,8 @@ use Magento\InventoryCatalogApi\Api\DefaultStockProviderInterface; use Magento\InventoryCatalogApi\Model\GetProductIdsBySkusInterface; use Magento\InventorySalesApi\Api\AreProductsSalableInterface; +use Magento\InventoryIndexer\Model\GetStockItemData\CacheStorage as StockItemDataCacheStorage; +use Magento\CatalogInventory\Model\Stock as StockModel; /** * Adapt assignStatusToProduct for multi stocks. @@ -40,22 +42,30 @@ class AdaptAssignStatusToProductPlugin */ private $getProductIdsBySkus; + /** + * @var StockItemDataCacheStorage + */ + private $stockItemDataCacheStorage; + /** * @param GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite * @param AreProductsSalableInterface $areProductsSalable * @param DefaultStockProviderInterface $defaultStockProvider * @param GetProductIdsBySkusInterface $getProductIdsBySkus + * @param StockItemDataCacheStorage $stockItemDataCacheStorage */ public function __construct( GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite, AreProductsSalableInterface $areProductsSalable, DefaultStockProviderInterface $defaultStockProvider, - GetProductIdsBySkusInterface $getProductIdsBySkus + GetProductIdsBySkusInterface $getProductIdsBySkus, + StockItemDataCacheStorage $stockItemDataCacheStorage ) { $this->getStockIdForCurrentWebsite = $getStockIdForCurrentWebsite; $this->areProductsSalable = $areProductsSalable; $this->defaultStockProvider = $defaultStockProvider; $this->getProductIdsBySkus = $getProductIdsBySkus; + $this->stockItemDataCacheStorage = $stockItemDataCacheStorage; } /** @@ -78,6 +88,7 @@ public function beforeAssignStatusToProduct( } try { + $this->stockItemDataCacheStorage->delete(StockModel::DEFAULT_STOCK_ID, $product->getSku()); $this->getProductIdsBySkus->execute([$product->getSku()]); if (null === $status) { $stockId = $this->getStockIdForCurrentWebsite->execute(); diff --git a/InventoryCatalog/composer.json b/InventoryCatalog/composer.json index 00f430a5310b..3d8b1bbfa0ae 100644 --- a/InventoryCatalog/composer.json +++ b/InventoryCatalog/composer.json @@ -1,28 +1,29 @@ { "name": "magento/module-inventory-catalog", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2-p3", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog": "*", "magento/module-catalog-inventory": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-catalog-api": "*", + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", "magento/module-store": "*", - "magento/module-inventory": "*", - "magento/module-inventory-configuration-api": "*", - "magento/module-inventory-indexer": "*", - "magento/module-inventory-sales-api": "*", - "magento/module-inventory-configuration": "*" + "magento/module-inventory": "1.2.*", + "magento/module-inventory-configuration-api": "1.2.*", + "magento/module-inventory-indexer": "2.1.*", + "magento/module-inventory-sales-api": "1.2.*", + "magento/module-inventory-configuration": "1.2.*" }, "suggest": { - "magento/module-inventory-reservations-api": "*" + "magento/module-inventory-reservations-api": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -32,3 +33,4 @@ } } } + diff --git a/InventoryCatalogAdminUi/Controller/Adminhtml/Inventory/BulkTransfer.php b/InventoryCatalogAdminUi/Controller/Adminhtml/Inventory/BulkTransfer.php index 3c406e0d769e..08b22bcec452 100644 --- a/InventoryCatalogAdminUi/Controller/Adminhtml/Inventory/BulkTransfer.php +++ b/InventoryCatalogAdminUi/Controller/Adminhtml/Inventory/BulkTransfer.php @@ -8,6 +8,7 @@ namespace Magento\InventoryCatalogAdminUi\Controller\Adminhtml\Inventory; use Magento\Backend\App\Action; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\App\ResponseInterface; use Magento\Framework\Controller\ResultInterface; use Magento\InventoryCatalogAdminUi\Controller\Adminhtml\Bulk\BulkPageProcessor; @@ -15,12 +16,12 @@ /** * Mass transfer sources between products. */ -class BulkTransfer extends Action +class BulkTransfer extends Action implements HttpPostActionInterface { /** * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Catalog::products'; + public const ADMIN_RESOURCE = 'Magento_Catalog::products'; /** * @var BulkPageProcessor @@ -41,6 +42,8 @@ public function __construct( } /** + * Bulk Inventory Transfer + * * @return ResponseInterface|ResultInterface */ public function execute() diff --git a/InventoryCatalogAdminUi/Controller/Adminhtml/Inventory/BulkTransferPost.php b/InventoryCatalogAdminUi/Controller/Adminhtml/Inventory/BulkTransferPost.php index dd0fb70ac242..9ac9fec35a72 100644 --- a/InventoryCatalogAdminUi/Controller/Adminhtml/Inventory/BulkTransferPost.php +++ b/InventoryCatalogAdminUi/Controller/Adminhtml/Inventory/BulkTransferPost.php @@ -10,6 +10,7 @@ use Magento\AsynchronousOperations\Model\MassSchedule; use Magento\Backend\App\Action; use Magento\Backend\Model\Auth; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; use Magento\Framework\Validation\ValidationException; use Magento\InventoryCatalogAdminUi\Model\BulkOperationsConfig; @@ -17,12 +18,15 @@ use Magento\InventoryCatalogApi\Api\BulkInventoryTransferInterface; use Psr\Log\LoggerInterface; -class BulkTransferPost extends Action +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ +class BulkTransferPost extends Action implements HttpPostActionInterface { /** * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Catalog::products'; + public const ADMIN_RESOURCE = 'Magento_Catalog::products'; /** * @var BulkSessionProductsStorage @@ -82,6 +86,8 @@ public function __construct( } /** + * Synchronous operation for bulk transfer + * * @param array $skus * @param string $originSource * @param string $destinationSource @@ -102,6 +108,8 @@ private function runSynchronousOperation( } /** + * Asynchronous operation for bulk transfer + * * @param array $skus * @param string $originSource * @param string $destinationSource @@ -141,6 +149,8 @@ private function runAsynchronousOperation( } /** + * Bulk Inventory Transfer post + * * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface */ public function execute() diff --git a/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssign.php b/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssign.php index 74ba2b8c53a1..df6299ea097b 100644 --- a/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssign.php +++ b/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssign.php @@ -8,6 +8,7 @@ namespace Magento\InventoryCatalogAdminUi\Controller\Adminhtml\Source; use Magento\Backend\App\Action; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\App\ResponseInterface; use Magento\Framework\Controller\ResultInterface; use Magento\InventoryCatalogAdminUi\Controller\Adminhtml\Bulk\BulkPageProcessor; @@ -15,12 +16,12 @@ /** * Mass assign sources to products. */ -class BulkAssign extends Action +class BulkAssign extends Action implements HttpPostActionInterface { /** * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Catalog::products'; + public const ADMIN_RESOURCE = 'Magento_Catalog::products'; /** * @var BulkPageProcessor @@ -41,6 +42,8 @@ public function __construct( } /** + * Bulk source assignment + * * @return ResponseInterface|ResultInterface */ public function execute() diff --git a/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssignPost.php b/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssignPost.php index 57f97e9324d5..c0be20116b0e 100644 --- a/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssignPost.php +++ b/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssignPost.php @@ -10,6 +10,7 @@ use Magento\AsynchronousOperations\Model\MassSchedule; use Magento\Backend\App\Action; use Magento\Backend\Model\Auth; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; use Magento\Framework\Exception\BulkException; use Magento\Framework\Exception\LocalizedException; @@ -19,12 +20,15 @@ use Magento\InventoryCatalogApi\Api\BulkSourceAssignInterface; use Psr\Log\LoggerInterface; -class BulkAssignPost extends Action +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ +class BulkAssignPost extends Action implements HttpPostActionInterface { /** * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Catalog::products'; + public const ADMIN_RESOURCE = 'Magento_Catalog::products'; /** * @var BulkSessionProductsStorage @@ -84,6 +88,8 @@ public function __construct( } /** + * Synchronous operation for bulk assign + * * @param array $skus * @param array $sourceCodes * @return void @@ -98,6 +104,8 @@ private function runSynchronousOperation(array $skus, array $sourceCodes): void } /** + * Asynchronous operation for bulk assign + * * @param array $skus * @param array $sourceCodes * @return void @@ -129,6 +137,8 @@ private function runAsynchronousOperation(array $skus, array $sourceCodes): void } /** + * Bulk Inventory assignment + * * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface */ public function execute() diff --git a/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkUnassign.php b/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkUnassign.php index 5c4dc754b015..1c12bee59611 100644 --- a/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkUnassign.php +++ b/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkUnassign.php @@ -8,6 +8,7 @@ namespace Magento\InventoryCatalogAdminUi\Controller\Adminhtml\Source; use Magento\Backend\App\Action; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\App\ResponseInterface; use Magento\Framework\Controller\ResultInterface; use Magento\InventoryCatalogAdminUi\Controller\Adminhtml\Bulk\BulkPageProcessor; @@ -15,12 +16,12 @@ /** * Mass unassign sources from products. */ -class BulkUnassign extends Action +class BulkUnassign extends Action implements HttpPostActionInterface { /** * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Catalog::products'; + public const ADMIN_RESOURCE = 'Magento_Catalog::products'; /** * @var BulkPageProcessor @@ -41,6 +42,8 @@ public function __construct( } /** + * Bulk source un-assignment + * * @return ResponseInterface|ResultInterface */ public function execute() diff --git a/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkUnassignPost.php b/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkUnassignPost.php index 43fd193caa29..c52e1315f6f0 100644 --- a/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkUnassignPost.php +++ b/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkUnassignPost.php @@ -10,6 +10,7 @@ use Magento\AsynchronousOperations\Model\MassSchedule; use Magento\Backend\App\Action; use Magento\Backend\Model\Auth; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\Controller\ResultFactory; use Magento\Framework\Exception\BulkException; use Magento\Framework\Exception\LocalizedException; @@ -19,12 +20,15 @@ use Magento\InventoryCatalogApi\Api\BulkSourceUnassignInterface; use Psr\Log\LoggerInterface; -class BulkUnassignPost extends Action +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ +class BulkUnassignPost extends Action implements HttpPostActionInterface { /** * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Catalog::products'; + public const ADMIN_RESOURCE = 'Magento_Catalog::products'; /** * @var BulkSessionProductsStorage @@ -84,6 +88,8 @@ public function __construct( } /** + * Synchronous operation for bulk un-assign + * * @param array $skus * @param array $sourceCodes * @return void @@ -98,6 +104,8 @@ private function runSynchronousOperation(array $skus, array $sourceCodes): void } /** + * Synchronous operation for bulk un-assign + * * @param array $skus * @param array $sourceCodes * @return void @@ -129,6 +137,8 @@ private function runAsynchronousOperation(array $skus, array $sourceCodes): void } /** + * Bulk Inventory assignment + * * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface */ public function execute() diff --git a/InventoryCatalogAdminUi/composer.json b/InventoryCatalogAdminUi/composer.json index aee6ed408677..b49f003addc2 100644 --- a/InventoryCatalogAdminUi/composer.json +++ b/InventoryCatalogAdminUi/composer.json @@ -1,27 +1,28 @@ { "name": "magento/module-inventory-catalog-admin-ui", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2-p1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog": "*", "magento/module-catalog-inventory": "*", "magento/module-backend": "*", - "magento/module-inventory-api": "*", + "magento/module-inventory-api": "1.2.*", "magento/module-ui": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-configuration-api": "*", - "magento/module-inventory-indexer": "*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-configuration-api": "1.2.*", + "magento/module-inventory-indexer": "2.1.*", "magento/module-asynchronous-operations": "*" }, "suggest": { - "magento/module-inventory-admin-ui": "*" + "magento/module-inventory-admin-ui": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -31,3 +32,4 @@ } } } + diff --git a/InventoryCatalogApi/composer.json b/InventoryCatalogApi/composer.json index c7cdc9334809..7164720436a4 100644 --- a/InventoryCatalogApi/composer.json +++ b/InventoryCatalogApi/composer.json @@ -1,15 +1,16 @@ { "name": "magento/module-inventory-catalog-api", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.3.2", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*" + }, "autoload": { "files": [ "registration.php" @@ -19,3 +20,4 @@ } } } + diff --git a/InventoryCatalogFrontendUi/composer.json b/InventoryCatalogFrontendUi/composer.json index 42395bc591bf..d20c556e988b 100644 --- a/InventoryCatalogFrontendUi/composer.json +++ b/InventoryCatalogFrontendUi/composer.json @@ -1,21 +1,22 @@ { "name": "magento/module-inventory-catalog-frontend-ui", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.0.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-inventory-sales-api": "*", - "magento/module-inventory-configuration-api": "*" + "magento/module-inventory-sales-api": "1.2.*", + "magento/module-inventory-configuration-api": "1.2.*" }, "suggest": { - "magento/module-inventory-catalog": "*", - "magento/module-inventory-catalog-api": "*" + "magento/module-inventory-catalog": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -25,3 +26,4 @@ } } } + diff --git a/InventoryCatalogSearch/composer.json b/InventoryCatalogSearch/composer.json index 5182c732c1bf..23fe7c4783c1 100644 --- a/InventoryCatalogSearch/composer.json +++ b/InventoryCatalogSearch/composer.json @@ -1,21 +1,22 @@ { "name": "magento/module-inventory-catalog-search", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog-inventory": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-indexer": "*", - "magento/module-inventory-sales-api": "*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-indexer": "2.1.*", + "magento/module-inventory-sales-api": "1.2.*", "magento/module-store": "*", "magento/module-catalog-search": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -25,3 +26,4 @@ } } } + diff --git a/InventoryCatalogSearchBundleProduct/composer.json b/InventoryCatalogSearchBundleProduct/composer.json index 8cb368a84afa..e133b4df70a4 100644 --- a/InventoryCatalogSearchBundleProduct/composer.json +++ b/InventoryCatalogSearchBundleProduct/composer.json @@ -1,19 +1,20 @@ { "name": "magento/module-inventory-catalog-search-bundle-product", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.0.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-bundle": "*", "magento/module-catalog": "*", "magento/module-eav": "*", - "magento/module-inventory-catalog-search": "*" + "magento/module-inventory-catalog-search": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -23,3 +24,4 @@ } } } + diff --git a/InventoryCatalogSearchConfigurableProduct/composer.json b/InventoryCatalogSearchConfigurableProduct/composer.json index 33970e735c0d..a0c6aa3fc2a0 100644 --- a/InventoryCatalogSearchConfigurableProduct/composer.json +++ b/InventoryCatalogSearchConfigurableProduct/composer.json @@ -1,19 +1,20 @@ { "name": "magento/module-inventory-catalog-search-configurable-product", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.0.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog": "*", "magento/module-configurable-product": "*", "magento/module-eav": "*", - "magento/module-inventory-catalog-search": "*" + "magento/module-inventory-catalog-search": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -23,3 +24,4 @@ } } } + diff --git a/InventoryConfigurableProduct/composer.json b/InventoryConfigurableProduct/composer.json index e2cad07f97e5..3855b9d6d113 100644 --- a/InventoryConfigurableProduct/composer.json +++ b/InventoryConfigurableProduct/composer.json @@ -1,27 +1,28 @@ { "name": "magento/module-inventory-configurable-product", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog": "*", - "magento/module-inventory-sales-api": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-indexer": "*", + "magento/module-inventory-sales-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-indexer": "2.1.*", "magento/module-store": "*", "magento/module-catalog-inventory": "*", "magento/module-sales": "*", "magento/module-configurable-product": "*" }, "suggest": { - "magento/module-inventory": "*", - "magento/module-inventory-api": "*" + "magento/module-inventory": "1.2.*", + "magento/module-inventory-api": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -31,3 +32,4 @@ } } } + diff --git a/InventoryConfigurableProductAdminUi/composer.json b/InventoryConfigurableProductAdminUi/composer.json index f091550f680f..7afec4c17b12 100644 --- a/InventoryConfigurableProductAdminUi/composer.json +++ b/InventoryConfigurableProductAdminUi/composer.json @@ -1,20 +1,21 @@ { "name": "magento/module-inventory-configurable-product-admin-ui", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2-p1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog": "*", "magento/module-configurable-product": "*", "magento/module-ui": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-catalog-api": "*" + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -24,3 +25,4 @@ } } } + diff --git a/InventoryConfigurableProductAdminUi/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml b/InventoryConfigurableProductAdminUi/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml index 150fdbfd9ac4..6c0b4a1df043 100644 --- a/InventoryConfigurableProductAdminUi/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml +++ b/InventoryConfigurableProductAdminUi/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml @@ -71,7 +71,7 @@
escapeHtmlAttr( $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes()) ) ?>" > @@ -94,10 +94,10 @@ getImageTypes() as $typeData): ?> - + value="escapeHtmlAttr($typeData['value']) ?>"/> @@ -141,7 +141,7 @@
@@ -158,9 +158,9 @@ getMediaAttributes() as $attribute): ?> -
  • escapeHtmlAttr( $attribute->getAttributeCode() - ) ?>" class="item-role item-role-escapeHtml( + ) ?>" class="item-role item-role-escapeHtmlAttr( $attribute->getAttributeCode() ) ?>"> getFrontendLabel() ?> @@ -185,7 +185,7 @@ @@ -243,7 +243,7 @@ escapeHtmlAttr( $attribute->getAttributeCode() ) ?>" /> @@ -265,7 +265,7 @@ __('Image Size') ); ?> -
    • @@ -276,7 +276,7 @@ __('Image Resolution') ); ?> -
    @@ -322,7 +322,7 @@ options: $parent.attributes, optionsText: 'label', value: attribute, - optionsCaption: 'escapeHtml( + optionsCaption: 'escapeHtmlAttr( __("Select") ); ?>' "> @@ -341,7 +341,7 @@
    escapeHtmlAttr( $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes()) ) ?>" > @@ -368,10 +368,10 @@ getImageTypes() as $typeData): ?> - + value="escapeHtmlAttr($typeData['value']) ?>"/> @@ -417,7 +417,7 @@
    @@ -522,7 +522,7 @@ escapeHtmlAttr( $attribute->getAttributeCode() ) ?>" /> @@ -544,7 +544,7 @@ __('Image Size') ); ?> -
    @@ -555,7 +555,7 @@ __('Image Resolution') ); ?> -
    diff --git a/InventoryConfigurableProductFrontendUi/composer.json b/InventoryConfigurableProductFrontendUi/composer.json index 213a52e1891e..2b52581e6190 100644 --- a/InventoryConfigurableProductFrontendUi/composer.json +++ b/InventoryConfigurableProductFrontendUi/composer.json @@ -1,22 +1,23 @@ { "name": "magento/module-inventory-configurable-product-frontend-ui", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.0.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-inventory-sales-api": "*", + "magento/module-inventory-sales-api": "1.2.*", "magento/module-store": "*", "magento/module-configurable-product": "*" }, "suggest": { - "magento/module-inventory-catalog": "*", - "magento/module-inventory-configurable-product": "*" + "magento/module-inventory-catalog": "1.2.*", + "magento/module-inventory-configurable-product": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -26,3 +27,4 @@ } } } + diff --git a/InventoryConfigurableProductIndexer/composer.json b/InventoryConfigurableProductIndexer/composer.json index e93f35311257..ef485674a40b 100644 --- a/InventoryConfigurableProductIndexer/composer.json +++ b/InventoryConfigurableProductIndexer/composer.json @@ -1,23 +1,24 @@ { "name": "magento/module-inventory-configurable-product-indexer", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-indexer": "*", - "magento/module-inventory-multi-dimensional-indexer-api": "*" + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-indexer": "2.1.*", + "magento/module-inventory-multi-dimensional-indexer-api": "1.2.*" }, "suggest": { - "magento/module-inventory": "*" + "magento/module-inventory": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -27,3 +28,4 @@ } } } + diff --git a/InventoryConfiguration/composer.json b/InventoryConfiguration/composer.json index 745e2d1304c1..6bcb08ac34f9 100644 --- a/InventoryConfiguration/composer.json +++ b/InventoryConfiguration/composer.json @@ -1,20 +1,21 @@ { "name": "magento/module-inventory-configuration", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog-inventory": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-configuration-api": "*", + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-configuration-api": "1.2.*", "magento/module-store": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -24,3 +25,4 @@ } } } + diff --git a/InventoryConfigurationApi/composer.json b/InventoryConfigurationApi/composer.json index 0fd5d93f3a59..e153ebbaba1e 100644 --- a/InventoryConfigurationApi/composer.json +++ b/InventoryConfigurationApi/composer.json @@ -1,15 +1,16 @@ { "name": "magento/module-inventory-configuration-api", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.2.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*" + }, "autoload": { "files": [ "registration.php" @@ -19,3 +20,4 @@ } } } + diff --git a/InventoryDistanceBasedSourceSelection/composer.json b/InventoryDistanceBasedSourceSelection/composer.json index afdd9aed8276..20e73bd4fb03 100644 --- a/InventoryDistanceBasedSourceSelection/composer.json +++ b/InventoryDistanceBasedSourceSelection/composer.json @@ -1,19 +1,20 @@ { "name": "magento/module-inventory-distance-based-source-selection", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*", - "magento/module-inventory-distance-based-source-selection-api": "*", - "magento/module-inventory-source-selection-api": "*", - "magento/module-inventory-api": "*", - "magento/module-config": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.2.2", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*", + "magento/module-inventory-distance-based-source-selection-api": "1.2.*", + "magento/module-inventory-source-selection-api": "1.4.*", + "magento/module-inventory-api": "1.2.*", + "magento/module-config": "*" + }, "autoload": { "files": [ "registration.php" @@ -23,3 +24,4 @@ } } } + diff --git a/InventoryDistanceBasedSourceSelectionAdminUi/composer.json b/InventoryDistanceBasedSourceSelectionAdminUi/composer.json index 766d01a3fa66..e5674aef2ec7 100644 --- a/InventoryDistanceBasedSourceSelectionAdminUi/composer.json +++ b/InventoryDistanceBasedSourceSelectionAdminUi/composer.json @@ -1,15 +1,16 @@ { "name": "magento/module-inventory-distance-based-source-selection-admin-ui", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.2.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*" + }, "autoload": { "files": [ "registration.php" @@ -19,3 +20,4 @@ } } } + diff --git a/InventoryDistanceBasedSourceSelectionApi/composer.json b/InventoryDistanceBasedSourceSelectionApi/composer.json index 38bfc9e2ce55..9b8ff40b4cf1 100644 --- a/InventoryDistanceBasedSourceSelectionApi/composer.json +++ b/InventoryDistanceBasedSourceSelectionApi/composer.json @@ -1,16 +1,17 @@ { "name": "magento/module-inventory-distance-based-source-selection-api", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*", - "magento/module-inventory-source-selection-api": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.2.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*", + "magento/module-inventory-source-selection-api": "1.4.*" + }, "autoload": { "files": [ "registration.php" @@ -20,3 +21,4 @@ } } } + diff --git a/InventoryElasticsearch/composer.json b/InventoryElasticsearch/composer.json index c2b46333271c..4d81379b7c20 100644 --- a/InventoryElasticsearch/composer.json +++ b/InventoryElasticsearch/composer.json @@ -1,21 +1,22 @@ { "name": "magento/module-inventory-elasticsearch", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog-inventory": "*", "magento/module-catalog-search": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-indexer": "*", - "magento/module-inventory-sales-api": "*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-indexer": "2.1.*", + "magento/module-inventory-sales-api": "1.2.*", "magento/module-store": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -25,3 +26,4 @@ } } } + diff --git a/InventoryExportStock/composer.json b/InventoryExportStock/composer.json index 34b0c8799c69..9c64e2e413e1 100644 --- a/InventoryExportStock/composer.json +++ b/InventoryExportStock/composer.json @@ -1,26 +1,27 @@ { "name": "magento/module-inventory-export-stock", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-export-stock-api": "*", - "magento/module-inventory-sales-api": "*", - "magento/module-inventory-sales": "*", + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-export-stock-api": "1.2.*", + "magento/module-inventory-sales-api": "1.2.*", + "magento/module-inventory-sales": "1.2.*", "magento/module-catalog": "*", "magento/module-catalog-inventory": "*", - "magento/module-inventory-indexer": "*", - "magento/module-inventory-configuration": "*", - "magento/module-inventory-configuration-api": "*", + "magento/module-inventory-indexer": "2.1.*", + "magento/module-inventory-configuration": "1.2.*", + "magento/module-inventory-configuration-api": "1.2.*", "magento/module-configurable-product": "*", "magento/module-grouped-product": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -30,3 +31,4 @@ } } } + diff --git a/InventoryExportStockApi/composer.json b/InventoryExportStockApi/composer.json index 8d4c5c1047ff..0cd9425f5b85 100644 --- a/InventoryExportStockApi/composer.json +++ b/InventoryExportStockApi/composer.json @@ -1,16 +1,17 @@ { "name": "magento/module-inventory-export-stock-api", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*", - "magento/module-inventory-sales-api": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.2.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*", + "magento/module-inventory-sales-api": "1.2.*" + }, "autoload": { "files": [ "registration.php" @@ -20,3 +21,4 @@ } } } + diff --git a/InventoryGraphQl/composer.json b/InventoryGraphQl/composer.json index deb6e8a78b31..f93d33486660 100644 --- a/InventoryGraphQl/composer.json +++ b/InventoryGraphQl/composer.json @@ -2,18 +2,19 @@ "name": "magento/module-inventory-graph-ql", "description": "N/A", "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog": "*", - "magento/module-inventory-catalog": "*", - "magento/module-inventory-configuration-api": "*", - "magento/module-inventory-sales-api": "*" + "magento/module-inventory-catalog": "1.2.*", + "magento/module-inventory-configuration-api": "1.2.*", + "magento/module-inventory-sales-api": "1.2.*" }, - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -23,3 +24,4 @@ } } } + diff --git a/InventoryGroupedProduct/composer.json b/InventoryGroupedProduct/composer.json index 5f4be516ca13..7d2b7e23b802 100644 --- a/InventoryGroupedProduct/composer.json +++ b/InventoryGroupedProduct/composer.json @@ -1,21 +1,22 @@ { "name": "magento/module-inventory-grouped-product", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-grouped-product": "*" }, "suggest": { - "magento/module-inventory-configuration-api": "*", - "magento/module-inventory-catalog": "*", - "magento/module-inventory-catalog-api": "*" + "magento/module-inventory-configuration-api": "1.2.*", + "magento/module-inventory-catalog": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -25,3 +26,4 @@ } } } + diff --git a/InventoryGroupedProductAdminUi/composer.json b/InventoryGroupedProductAdminUi/composer.json index 6e5c22281775..2ac813a15cf5 100644 --- a/InventoryGroupedProductAdminUi/composer.json +++ b/InventoryGroupedProductAdminUi/composer.json @@ -1,24 +1,25 @@ { "name": "magento/module-inventory-grouped-product-admin-ui", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog": "*", "magento/module-grouped-product": "*", "magento/module-ui": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-catalog-admin-ui": "*" + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-catalog-admin-ui": "1.2.*" }, "suggest": { - "magento/module-inventory-configuration-api": "*" + "magento/module-inventory-configuration-api": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -28,3 +29,4 @@ } } } + diff --git a/InventoryGroupedProductIndexer/composer.json b/InventoryGroupedProductIndexer/composer.json index c8c8f66dabc8..a62ff7df511c 100644 --- a/InventoryGroupedProductIndexer/composer.json +++ b/InventoryGroupedProductIndexer/composer.json @@ -1,24 +1,25 @@ { "name": "magento/module-inventory-grouped-product-indexer", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-catalog": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-indexer": "*", - "magento/module-inventory-multi-dimensional-indexer-api": "*", + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-indexer": "2.1.*", + "magento/module-inventory-multi-dimensional-indexer-api": "1.2.*", "magento/module-grouped-product": "*" }, "suggest": { - "magento/module-inventory": "*" + "magento/module-inventory": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -28,3 +29,4 @@ } } } + diff --git a/InventoryImportExport/composer.json b/InventoryImportExport/composer.json index cf9d43fe3e4f..22c7d445a0fd 100644 --- a/InventoryImportExport/composer.json +++ b/InventoryImportExport/composer.json @@ -1,25 +1,26 @@ { "name": "magento/module-inventory-import-export", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.2.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-eav": "*", "magento/module-import-export": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory": "*", - "magento/module-inventory-catalog-api": "*", + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", "magento/module-store": "*", "magento/module-configurable-product": "*" }, "suggest": { "magento/module-catalog-import-export": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -29,3 +30,4 @@ } } } + diff --git a/InventoryInStorePickup/composer.json b/InventoryInStorePickup/composer.json index 440235a20e6f..48d3a000d846 100644 --- a/InventoryInStorePickup/composer.json +++ b/InventoryInStorePickup/composer.json @@ -1,23 +1,24 @@ { "name": "magento/module-inventory-in-store-pickup", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*", - "magento/module-inventory-in-store-pickup-api": "*", - "magento/module-inventory-distance-based-source-selection-api": "*", - "magento/module-inventory-api": "*", - "magento/module-inventory-source-selection-api": "*", - "magento/module-inventory-sales-api": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-directory": "*", - "magento/module-inventory": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.1.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*", + "magento/module-inventory-in-store-pickup-api": "1.1.*", + "magento/module-inventory-distance-based-source-selection-api": "1.2.*", + "magento/module-inventory-api": "1.2.*", + "magento/module-inventory-source-selection-api": "1.4.*", + "magento/module-inventory-sales-api": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-directory": "*", + "magento/module-inventory": "1.2.*" + }, "autoload": { "files": [ "registration.php" @@ -27,3 +28,4 @@ } } } + diff --git a/InventoryInStorePickupAdminUi/composer.json b/InventoryInStorePickupAdminUi/composer.json index 667d6f37d84a..c489a687fd90 100644 --- a/InventoryInStorePickupAdminUi/composer.json +++ b/InventoryInStorePickupAdminUi/composer.json @@ -1,20 +1,21 @@ { "name": "magento/module-inventory-in-store-pickup-admin-ui", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*", - "magento/module-ui": "*", - "magento/module-inventory-in-store-pickup-api": "*", - "magento/module-inventory-admin-ui": "*", - "magento/module-inventory-catalog-api": "*", - "magento/module-inventory-api": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.1.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*", + "magento/module-ui": "*", + "magento/module-inventory-in-store-pickup-api": "1.1.*", + "magento/module-inventory-admin-ui": "1.2.*", + "magento/module-inventory-catalog-api": "1.3.*", + "magento/module-inventory-api": "1.2.*" + }, "autoload": { "files": [ "registration.php" @@ -24,3 +25,4 @@ } } } + diff --git a/InventoryInStorePickupApi/composer.json b/InventoryInStorePickupApi/composer.json index b26509ee41df..98ce00079409 100644 --- a/InventoryInStorePickupApi/composer.json +++ b/InventoryInStorePickupApi/composer.json @@ -1,16 +1,17 @@ { "name": "magento/module-inventory-in-store-pickup-api", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*", - "magento/module-inventory-api": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.1.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*", + "magento/module-inventory-api": "1.2.*" + }, "autoload": { "files": [ "registration.php" @@ -20,3 +21,4 @@ } } } + diff --git a/InventoryInStorePickupFrontend/composer.json b/InventoryInStorePickupFrontend/composer.json index 90e5cca7c8ef..99e1a4ada541 100644 --- a/InventoryInStorePickupFrontend/composer.json +++ b/InventoryInStorePickupFrontend/composer.json @@ -1,20 +1,21 @@ { "name": "magento/module-inventory-in-store-pickup-frontend", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.1.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", "magento/module-checkout": "*", - "magento/module-inventory-in-store-pickup-api": "*", - "magento/module-inventory-in-store-pickup-sales-api": "*", - "magento/module-inventory-in-store-pickup-shipping-api": "*", + "magento/module-inventory-in-store-pickup-api": "1.1.*", + "magento/module-inventory-in-store-pickup-sales-api": "1.1.*", + "magento/module-inventory-in-store-pickup-shipping-api": "1.1.*", "magento/module-store": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -24,3 +25,4 @@ } } } + diff --git a/InventoryInStorePickupGraphQl/composer.json b/InventoryInStorePickupGraphQl/composer.json index d78d082c56cf..f285ea2fd588 100644 --- a/InventoryInStorePickupGraphQl/composer.json +++ b/InventoryInStorePickupGraphQl/composer.json @@ -1,18 +1,19 @@ { "name": "magento/module-inventory-in-store-pickup-graph-ql", "description": "N/A", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*", - "magento/module-inventory-in-store-pickup-api": "*", - "magento/module-inventory-api": "*", - "magento/module-store": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.1.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*", + "magento/module-inventory-in-store-pickup-api": "1.1.*", + "magento/module-inventory-api": "1.2.*", + "magento/module-store": "*" + }, "autoload": { "files": [ "registration.php" @@ -22,3 +23,4 @@ } } } + diff --git a/InventoryInStorePickupMultishipping/composer.json b/InventoryInStorePickupMultishipping/composer.json index b02d50e4b1cc..fddec51d1e36 100644 --- a/InventoryInStorePickupMultishipping/composer.json +++ b/InventoryInStorePickupMultishipping/composer.json @@ -1,18 +1,19 @@ { "name": "magento/module-inventory-in-store-pickup-multishipping", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.1.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-inventory-in-store-pickup-shipping-api": "*", + "magento/module-inventory-in-store-pickup-shipping-api": "1.1.*", "magento/module-checkout": "*", "magento/module-quote": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -22,3 +23,4 @@ } } } + diff --git a/InventoryInStorePickupQuote/composer.json b/InventoryInStorePickupQuote/composer.json index 12c4f1081312..74336325f520 100644 --- a/InventoryInStorePickupQuote/composer.json +++ b/InventoryInStorePickupQuote/composer.json @@ -1,21 +1,22 @@ { "name": "magento/module-inventory-in-store-pickup-quote", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.1.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-inventory-in-store-pickup": "*", - "magento/module-inventory-in-store-pickup-api": "*", + "magento/module-inventory-in-store-pickup": "1.1.*", + "magento/module-inventory-in-store-pickup-api": "1.1.*", "magento/module-quote": "*", - "magento/module-inventory-in-store-pickup-shipping-api": "*", + "magento/module-inventory-in-store-pickup-shipping-api": "1.1.*", "magento/module-store": "*", - "magento/module-inventory-sales-api": "*" + "magento/module-inventory-sales-api": "1.2.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -25,3 +26,4 @@ } } } + diff --git a/InventoryInStorePickupQuoteGraphQl/composer.json b/InventoryInStorePickupQuoteGraphQl/composer.json index e8b82d8a1542..5978976785c6 100644 --- a/InventoryInStorePickupQuoteGraphQl/composer.json +++ b/InventoryInStorePickupQuoteGraphQl/composer.json @@ -1,6 +1,12 @@ { "name": "magento/module-inventory-in-store-pickup-quote-graph-ql", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.1.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", @@ -8,11 +14,6 @@ "magento/module-quote": "*", "magento/module-graph-ql": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -22,3 +23,4 @@ } } } + diff --git a/InventoryInStorePickupSales/composer.json b/InventoryInStorePickupSales/composer.json index 31b47cff3c5d..06878dd70cd1 100644 --- a/InventoryInStorePickupSales/composer.json +++ b/InventoryInStorePickupSales/composer.json @@ -1,21 +1,22 @@ { "name": "magento/module-inventory-in-store-pickup-sales", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.1.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-inventory-in-store-pickup-sales-api": "*", - "magento/module-inventory-in-store-pickup-api": "*", - "magento/module-inventory-api": "*", + "magento/module-inventory-in-store-pickup-sales-api": "1.1.*", + "magento/module-inventory-in-store-pickup-api": "1.1.*", + "magento/module-inventory-api": "1.2.*", "magento/module-sales": "*", "magento/module-store": "*", - "magento/module-inventory-source-selection-api": "*" + "magento/module-inventory-source-selection-api": "1.4.*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -25,3 +26,4 @@ } } } + diff --git a/InventoryInStorePickupSalesAdminUi/composer.json b/InventoryInStorePickupSalesAdminUi/composer.json index e4062aadfc13..4894eaaa6969 100644 --- a/InventoryInStorePickupSalesAdminUi/composer.json +++ b/InventoryInStorePickupSalesAdminUi/composer.json @@ -1,24 +1,25 @@ { "name": "magento/module-inventory-in-store-pickup-sales-admin-ui", "description": "N/A", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.1.2-p1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-inventory-in-store-pickup-sales-api": "*", - "magento/module-inventory-in-store-pickup-sales": "*", - "magento/module-inventory-in-store-pickup-shipping-api": "*", - "magento/module-inventory-in-store-pickup-quote": "*", - "magento/module-inventory-sales-api": "*", - "magento/module-inventory-api": "*", + "magento/module-inventory-in-store-pickup-sales-api": "1.1.*", + "magento/module-inventory-in-store-pickup-sales": "1.1.*", + "magento/module-inventory-in-store-pickup-shipping-api": "1.1.*", + "magento/module-inventory-in-store-pickup-quote": "1.1.*", + "magento/module-inventory-sales-api": "1.2.*", + "magento/module-inventory-api": "1.2.*", "magento/module-sales": "*", "magento/module-quote": "*", "magento/module-backend": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -28,3 +29,4 @@ } } } + diff --git a/InventoryInStorePickupSalesAdminUi/view/adminhtml/templates/order/create/shipping/method/sources_form.phtml b/InventoryInStorePickupSalesAdminUi/view/adminhtml/templates/order/create/shipping/method/sources_form.phtml index d40a60c7c5b4..969ce96da1ed 100644 --- a/InventoryInStorePickupSalesAdminUi/view/adminhtml/templates/order/create/shipping/method/sources_form.phtml +++ b/InventoryInStorePickupSalesAdminUi/view/adminhtml/templates/order/create/shipping/method/sources_form.phtml @@ -31,7 +31,7 @@ if (empty($sources)) {