Skip to content

Commit

Permalink
Version 1.2.4-p5
Browse files Browse the repository at this point in the history
  • Loading branch information
magento packaging service committed Aug 4, 2023
1 parent dc3fc54 commit 389d5ae
Show file tree
Hide file tree
Showing 91 changed files with 1,009 additions and 666 deletions.
12 changes: 7 additions & 5 deletions Inventory/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -20,3 +21,4 @@
}
}
}

18 changes: 10 additions & 8 deletions InventoryAdminUi/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -25,3 +26,4 @@
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<url path="*/*/new"/>
<class>primary</class>
<label translate="true">Add New Source</label>
<aclResource>Magento_InventoryApi::source_edit</aclResource>
</button>
</buttons>
<spinner>inventory_source_listing_columns</spinner>
Expand Down
16 changes: 9 additions & 7 deletions InventoryAdvancedCheckout/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -25,3 +26,4 @@
}
}
}

10 changes: 6 additions & 4 deletions InventoryApi/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -19,3 +20,4 @@
}
}
}

2 changes: 2 additions & 0 deletions InventoryApi/etc/acl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
<resource id="Magento_InventoryApi::inventory" title="Inventory" translate="title" sortOrder="10">
<resource id="Magento_InventoryApi::source" title="Sources" translate="title" sortOrder="10">
<resource id="Magento_InventoryApi::source_edit" title="Edit Sources" translate="title" sortOrder="10" />
<resource id="Magento_InventoryApi::ship_source_selection" title="Shipping Source Selection" translate="title" sortOrder="20" />
</resource>
<resource id="Magento_InventoryApi::stock" title="Stocks" translate="title" sortOrder="20">
<resource id="Magento_InventoryApi::stock_edit" title="Edit Stocks" translate="title" sortOrder="10" />
<resource id="Magento_InventoryApi::stock_delete" title="Delete Stocks" translate="title" sortOrder="20" />
<resource id="Magento_InventoryApi::stock_source_link" title="Source to Stock Assigning" translate="title" sortOrder="30" />
<resource id="Magento_InventoryApi::stock_source_item_assign" title="Source Item Assigning" translate="title" sortOrder="40" />
</resource>
</resource>
</resource>
Expand Down
4 changes: 2 additions & 2 deletions InventoryApi/etc/webapi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@
<route url="/V1/inventory/source-items" method="POST">
<service class="Magento\InventoryApi\Api\SourceItemsSaveInterface" method="execute"/>
<resources>
<resource ref="Magento_InventoryApi::source"/>
<resource ref="Magento_InventoryApi::stock_source_item_assign"/>
</resources>
</route>
<route url="/V1/inventory/source-items-delete" method="POST">
<service class="Magento\InventoryApi\Api\SourceItemsDeleteInterface" method="execute"/>
<resources>
<resource ref="Magento_InventoryApi::source"/>
<resource ref="Magento_InventoryApi::stock_source_item_assign"/>
</resources>
</route>
</routes>
14 changes: 8 additions & 6 deletions InventoryBundleImportExport/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -23,3 +24,4 @@
}
}
}

20 changes: 11 additions & 9 deletions InventoryBundleProduct/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -29,3 +30,4 @@
}
}
}

18 changes: 10 additions & 8 deletions InventoryBundleProductAdminUi/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -27,3 +28,4 @@
}
}
}

22 changes: 12 additions & 10 deletions InventoryBundleProductIndexer/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -28,3 +29,4 @@
}
}
}

16 changes: 9 additions & 7 deletions InventoryCache/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -24,3 +25,4 @@
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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;
}

/**
Expand All @@ -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();
Expand Down
Loading

0 comments on commit 389d5ae

Please sign in to comment.