From fa3bf14d73a55233d7dc268578be0df01c2899d7 Mon Sep 17 00:00:00 2001 From: Sinisa Nedeljkovic Date: Tue, 12 Dec 2017 15:18:44 +0100 Subject: [PATCH] Modified synchronization plugins --- ...gInventoryStockItemByDefaultSourceItem.php | 22 +++++++------- ...nventoryStockStatusByDefaultSourceItem.php | 22 +++++++------- ...gInventoryStockItemByDefaultSourceItem.php | 28 ++++++++--------- ...nventoryStockStatusByDefaultSourceItem.php | 30 ++++++++----------- 4 files changed, 45 insertions(+), 57 deletions(-) diff --git a/app/code/Magento/InventoryCatalog/Model/Command/DeleteCatalogInventoryStockItemByDefaultSourceItem.php b/app/code/Magento/InventoryCatalog/Model/Command/DeleteCatalogInventoryStockItemByDefaultSourceItem.php index ac55c7ec8b81..7aefb1c0a03c 100644 --- a/app/code/Magento/InventoryCatalog/Model/Command/DeleteCatalogInventoryStockItemByDefaultSourceItem.php +++ b/app/code/Magento/InventoryCatalog/Model/Command/DeleteCatalogInventoryStockItemByDefaultSourceItem.php @@ -51,18 +51,16 @@ public function execute(SourceItemInterface $sourceItem) $productIds = $this->idLocator->retrieveProductIdsBySkus([$sourceItem->getSku()]); $productId = isset($productIds[$sourceItem->getSku()]) ? key($productIds[$sourceItem->getSku()]) : false; - if (!$productId) { - throw new NoSuchEntityException(__('Product with SKU "%1" does not exist', $sourceItem->getSku())); + if ($productId) { + $connection = $this->resourceConnection->getConnection(); + $connection->delete( + $connection->getTableName('cataloginventory_stock_item'), + [ + StockItemInterface::PRODUCT_ID . ' = ?' => $productId, + StockItemInterface::STOCK_ID . ' = ?' => Stock::DEFAULT_STOCK_ID, + Stock::WEBSITE_ID . ' = ?' => 0 + ] + ); } - - $connection = $this->resourceConnection->getConnection(); - $connection->delete( - $connection->getTableName('cataloginventory_stock_item'), - [ - StockItemInterface::PRODUCT_ID . ' = ?' => $productId, - StockItemInterface::STOCK_ID . ' = ?' => Stock::DEFAULT_STOCK_ID, - Stock::WEBSITE_ID . ' = ?' => 0 - ] - ); } } diff --git a/app/code/Magento/InventoryCatalog/Model/Command/DeleteCatalogInventoryStockStatusByDefaultSourceItem.php b/app/code/Magento/InventoryCatalog/Model/Command/DeleteCatalogInventoryStockStatusByDefaultSourceItem.php index c22ed9b5eb4f..08272d2ce7a6 100644 --- a/app/code/Magento/InventoryCatalog/Model/Command/DeleteCatalogInventoryStockStatusByDefaultSourceItem.php +++ b/app/code/Magento/InventoryCatalog/Model/Command/DeleteCatalogInventoryStockStatusByDefaultSourceItem.php @@ -52,18 +52,16 @@ public function execute(SourceItemInterface $sourceItem) $productIds = $this->idLocator->retrieveProductIdsBySkus([$sourceItem->getSku()]); $productId = isset($productIds[$sourceItem->getSku()]) ? key($productIds[$sourceItem->getSku()]) : false; - if (!$productId) { - throw new NoSuchEntityException(__('Product with SKU "%1" does not exist', $sourceItem->getSku())); + if ($productId) { + $connection = $this->resourceConnection->getConnection(); + $connection->delete( + $connection->getTableName('cataloginventory_stock_status'), + [ + StockStatusInterface::PRODUCT_ID . ' = ?' => $productId, + StockItemInterface::STOCK_ID . ' = ?' => Stock::DEFAULT_STOCK_ID, + Stock::WEBSITE_ID . ' = ?' => 0 + ] + ); } - - $connection = $this->resourceConnection->getConnection(); - $connection->delete( - $connection->getTableName('cataloginventory_stock_status'), - [ - StockStatusInterface::PRODUCT_ID . ' = ?' => $productId, - StockItemInterface::STOCK_ID . ' = ?' => Stock::DEFAULT_STOCK_ID, - Stock::WEBSITE_ID . ' = ?' => 0 - ] - ); } } diff --git a/app/code/Magento/InventoryCatalog/Model/Command/UpdateCatalogInventoryStockItemByDefaultSourceItem.php b/app/code/Magento/InventoryCatalog/Model/Command/UpdateCatalogInventoryStockItemByDefaultSourceItem.php index aba24a5dfd86..8eb58c367169 100644 --- a/app/code/Magento/InventoryCatalog/Model/Command/UpdateCatalogInventoryStockItemByDefaultSourceItem.php +++ b/app/code/Magento/InventoryCatalog/Model/Command/UpdateCatalogInventoryStockItemByDefaultSourceItem.php @@ -71,23 +71,19 @@ public function execute(SourceItemInterface $sourceItem) $productIds = $this->productIdLocator->retrieveProductIdsBySkus([$sourceItem->getSku()]); $productId = isset($productIds[$sourceItem->getSku()]) ? key($productIds[$sourceItem->getSku()]) : false; - if (!$productId) { - throw new NoSuchEntityException( - __('Product with SKU "%1" does not exist', $sourceItem->getSku()) + if ($productId) { + $connection = $this->resourceConnection->getConnection(); + $connection->update( + $connection->getTableName('cataloginventory_stock_item'), + [ + StockItemInterface::QTY => $sourceItem->getQuantity(), + ], + [ + StockItemInterface::STOCK_ID . ' = ?' => $this->defaultStockProvider->getId(), + StockItemInterface::PRODUCT_ID . ' = ?' => $productId, + 'website_id = ?' => 0 + ] ); } - - $connection = $this->resourceConnection->getConnection(); - $connection->update( - $connection->getTableName('cataloginventory_stock_item'), - [ - StockItemInterface::QTY => $sourceItem->getQuantity(), - ], - [ - StockItemInterface::STOCK_ID . ' = ?' => $this->defaultStockProvider->getId(), - StockItemInterface::PRODUCT_ID . ' = ?' => $productId, - 'website_id = ?' => 0 - ] - ); } } diff --git a/app/code/Magento/InventoryCatalog/Model/Command/UpdateCatalogInventoryStockStatusByDefaultSourceItem.php b/app/code/Magento/InventoryCatalog/Model/Command/UpdateCatalogInventoryStockStatusByDefaultSourceItem.php index fb5be79611af..3b3cb3dbc8a3 100644 --- a/app/code/Magento/InventoryCatalog/Model/Command/UpdateCatalogInventoryStockStatusByDefaultSourceItem.php +++ b/app/code/Magento/InventoryCatalog/Model/Command/UpdateCatalogInventoryStockStatusByDefaultSourceItem.php @@ -71,24 +71,20 @@ public function execute(SourceItemInterface $sourceItem) $productIds = $this->productIdLocator->retrieveProductIdsBySkus([$sourceItem->getSku()]); $productId = isset($productIds[$sourceItem->getSku()]) ? key($productIds[$sourceItem->getSku()]) : false; - if (!$productId) { - throw new NoSuchEntityException( - __('Product with SKU "%1" does not exist', $sourceItem->getSku()) + if ($productId) { + $connection = $this->resourceConnection->getConnection(); + $connection->update( + $connection->getTableName('cataloginventory_stock_status'), + [ + StockStatusInterface::QTY => $sourceItem->getQuantity(), + StockStatusInterface::STOCK_STATUS => $sourceItem->getStatus() + ], + [ + StockStatusInterface::STOCK_ID . ' = ?' => $this->defaultStockProvider->getId(), + StockStatusInterface::PRODUCT_ID . ' = ?' => $productId, + 'website_id = ?' => 0 + ] ); } - - $connection = $this->resourceConnection->getConnection(); - $connection->update( - $connection->getTableName('cataloginventory_stock_status'), - [ - StockStatusInterface::QTY => $sourceItem->getQuantity(), - StockStatusInterface::STOCK_STATUS => $sourceItem->getStatus() - ], - [ - StockStatusInterface::STOCK_ID . ' = ?' => $this->defaultStockProvider->getId(), - StockStatusInterface::PRODUCT_ID . ' = ?' => $productId, - 'website_id = ?' => 0 - ] - ); } }