Product salability improvements fork

InventoryBundleProduct/Plugin/InventorySales/IsBundleProductSalable.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\InventoryBundleProduct\Plugin\InventorySales;
+
+use Magento\Bundle\Model\Product\Type;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\InventoryBundleProduct\Model\GetBundleProductStockStatus;
+use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
+use Magento\InventorySales\Model\IsProductSalableCondition\IsProductSalableConditionChain;
+
+/**
+ * Check if bundle product is salable with bundle options.
+ */
+class IsBundleProductSalable
+{
+    /**
+     * @var Type
+     */
+    private $bundleProductType;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var GetBundleProductStockStatus
+     */
+    private $getBundleProductStockStatus;
+
+    /**
+     * @var GetProductTypesBySkusInterface
+     */
+    private $getProductTypesBySkus;
+
+    /**
+     * @param Type $type
+     * @param ProductRepositoryInterface $repository
+     * @param GetBundleProductStockStatus $getBundleProductStockStatus
+     * @param GetProductTypesBySkusInterface $getProductTypesBySkus
+     */
+    public function __construct(
+        Type $type,
+        ProductRepositoryInterface $repository,
+        GetBundleProductStockStatus $getBundleProductStockStatus,
+        GetProductTypesBySkusInterface $getProductTypesBySkus
+    ) {
+        $this->bundleProductType = $type;
+        $this->productRepository = $repository;
+        $this->getBundleProductStockStatus = $getBundleProductStockStatus;
+        $this->getProductTypesBySkus = $getProductTypesBySkus;
+    }
+
+    /**
+     * Get bundle product status based on child statuses.
+     *
+     * @param IsProductSalableConditionChain $subject
+     * @param \Closure $proceed
+     * @param string $sku
+     * @param int $stockId
+     *
+     * @return bool
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundExecute(
+        IsProductSalableConditionChain $subject,
+        \Closure $proceed,
+        string $sku,
+        int $stockId
+    ): bool {
+        try {
+            $types = $this->getProductTypesBySkus->execute([$sku]);
+
+            $isProductSalable = $proceed($sku, $stockId);
+            if (!isset($types[$sku]) || $types[$sku] !== Type::TYPE_CODE || !$isProductSalable) {
+                return $isProductSalable;
+            }
+
+            $product = $this->productRepository->get($sku);
+
+            if ($product->hasData('all_items_salable')) {
+                return $product->getData('all_items_salable');
+            }
+
+            /** @noinspection PhpParamsInspection */
+            $options = $this->bundleProductType->getOptionsCollection($product);
+            $status = $this->getBundleProductStockStatus->execute(
+                $product,
+                $options->getItems(),
+                $stockId
+            );
+            $product->setData('all_items_salable', $status);
+        } catch (LocalizedException $e) {
+            $status = false;
+        }
+
+        return $status;
+    }
+}

InventoryBundleProduct/composer.json

@@ -13,7 +13,9 @@
         "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-catalog-inventory": "*"
+        "magento/module-catalog-inventory": "*",
+        "magento/module-inventory-sales": "*",
+        "magento/module-inventory-catalog": "*"
     },
     "type": "magento2-module",
     "license": [

InventoryBundleProduct/etc/di.xml

@@ -26,7 +26,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\CatalogInventory\Helper\Stock">
-        <plugin name="adapt_assign_stock_status_to_bundle_product" type="Magento\InventoryBundleProduct\Plugin\CatalogInventory\Helper\Stock\AdaptAssignStatusToProductPlugin"/>
+    <type name="Magento\InventorySales\Model\IsProductSalableCondition\IsProductSalableConditionChain">
+        <plugin name="is_bundle_product_salable" type="Magento\InventoryBundleProduct\Plugin\InventorySales\IsBundleProductSalable" />
     </type>
 </config>

InventoryCatalog/Model/IsProductSalable.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Model;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\InventorySalesApi\Api\AreProductsSalableInterface;
+
+/**
+ * Get salable product status service.
+ */
+class IsProductSalable
+{
+    /**
+     * @var GetStockIdForCurrentWebsite
+     */
+    private $getStockIdForCurrentWebsite;
+
+    /**
+     * @var AreProductsSalableInterface
+     */
+    private $areProductsSalable;
+
+    /**
+     * @param GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite
+     * @param AreProductsSalableInterface $areProductsSalable
+     */
+    public function __construct(
+        GetStockIdForCurrentWebsite $getStockIdForCurrentWebsite,
+        AreProductsSalableInterface $areProductsSalable
+    ) {
+        $this->getStockIdForCurrentWebsite = $getStockIdForCurrentWebsite;
+        $this->areProductsSalable = $areProductsSalable;
+    }
+
+    /**
+     * Verify product salable status.
+     *
+     * @param Product $product
+     * @return bool
+     */
+    public function execute(Product $product): bool
+    {
+        if (null === $product->getSku() || !((int)$product->getStatus() === Status::STATUS_ENABLED)) {
+            return false;
+        }
+        if ($product->hasData('is_salable')) {
+            return (bool)$product->getData('is_salable');
+        }
+        $stockId = $this->getStockIdForCurrentWebsite->execute();
+        $result = current($this->areProductsSalable->execute([$product->getData(Product::SKU)], $stockId));
+        $isSalable = $result->isSalable();
+        $product->setData('is_salable', $isSalable);
+
+        return $isSalable;
+    }
+}

InventoryCatalog/Plugin/Catalog/Model/Product/IsAvailablePlugin.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Plugin\Catalog\Model\Product;
+
+use Magento\Catalog\Model\Product;
+use Magento\InventoryCatalog\Model\IsProductSalable;
+
+/**
+ * Is product available in multi stock environment plugin.
+ */
+class IsAvailablePlugin
+{
+    /**
+     * @var IsProductSalable
+     */
+    private $isProductSalable;
+
+    /**
+     * @param IsProductSalable $isProductSalable
+     */
+    public function __construct(
+        IsProductSalable $isProductSalable
+    ) {
+        $this->isProductSalable = $isProductSalable;
+    }
+
+    /**
+     * Fetches is salable status from multi-stock and sets it to product is_salable flag.
+     *
+     * @param Product $product
+     *
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeIsAvailable(Product $product): void
+    {
+        $product->setData('is_salable', $this->isProductSalable->execute($product));
+    }
+}