Improved msi fallback (#313)

* Improved MSI fallback

* added missing desc

Author: zlik

app/code/Meta/BusinessExtension/Model/System/Config.php

@@ -72,8 +72,6 @@ class Config
     public const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ACCESS_TOKEN = 'facebook/business_extension/access_token';
     public const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PAGE_ACCESS_TOKEN =
         'facebook/business_extension/page_access_token';
-    private const XML_PATH_FACEBOOK_USE_MULTI_SOURCE_INVENTORY =
-        'facebook/catalog_management/use_multi_source_inventory';
     private const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_OUT_OF_STOCK_THRESHOLD =
         'facebook/catalog_management/out_of_stock_threshold';
 
@@ -321,18 +319,6 @@ public function getStoreId()
         return $this->storeManager->getStore()->getId();
     }
 
-    /**
-     * Use multi source inventory
-     *
-     * @param int $scopeId
-     * @param int $scope
-     * @return bool
-     */
-    public function useMultiSourceInventory($scopeId = null, $scope = null): bool
-    {
-        return (bool)$this->getConfig(self::XML_PATH_FACEBOOK_USE_MULTI_SOURCE_INVENTORY, $scopeId, $scope);
-    }
-
     /**
      * Get out of stock threshold
      *

app/code/Meta/Catalog/Model/Product/Feed/Builder.php

@@ -499,9 +499,7 @@ public function getUnitPrice($product)
     private function getInventory(Product $product): InventoryInterface
     {
         if ($this->inventory === null) {
-            $this->inventory = $this->builderTools->getInventoryObject(
-                $this->systemConfig->useMultiSourceInventory($this->storeId)
-            );
+            $this->inventory = $this->builderTools->getInventoryObject();
         }
         $this->inventory->initInventoryForProduct($product);
         return $this->inventory;

app/code/Meta/Catalog/Model/Product/Feed/Builder/Tools.php

@@ -23,6 +23,7 @@
 use Exception;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Currency;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Escaper;
@@ -56,6 +57,11 @@ class Tools
      */
     private $catalogHelper;
 
+    /**
+     * @var ModuleManager
+     */
+    private ModuleManager $moduleManager;
+
     /**
      * Tools constructor
      *
@@ -64,19 +70,22 @@ class Tools
      * @param Escaper $escaper
      * @param SystemConfig $systemConfig
      * @param CatalogHelper $catalogHelper
+     * @param ModuleManager $moduleManager
      */
     public function __construct(
         PriceCurrencyInterface $priceCurrency,
         ObjectManagerInterface $objectManager,
         Escaper $escaper,
         SystemConfig $systemConfig,
-        CatalogHelper $catalogHelper
+        CatalogHelper $catalogHelper,
+        ModuleManager $moduleManager
     ) {
         $this->priceCurrency = $priceCurrency;
         $this->objectManager = $objectManager;
         $this->escaper = $escaper;
         $this->systemConfig = $systemConfig;
         $this->catalogHelper = $catalogHelper;
+        $this->moduleManager = $moduleManager;
     }
 
     /**
@@ -240,13 +249,13 @@ public function getProductSalePriceEffectiveDate(Product $product)
     /**
      * Get inventory object
      *
-     * @param bool $useMultiSource
      * @return InventoryInterface
      */
-    public function getInventoryObject(bool $useMultiSource = true): InventoryInterface
+    public function getInventoryObject(): InventoryInterface
     {
+        // Fallback to Magento_CatalogInventory in case Magento MSI modules are disabled
         //phpcs:disable Magento2.PHP.LiteralNamespaces
-        return $useMultiSource
+        return $this->moduleManager->isEnabled('Magento_InventorySalesApi')
             ? $this->objectManager->get('Meta\Catalog\Model\Product\Feed\Builder\MultiSourceInventory')
             : $this->objectManager->get('Meta\Catalog\Model\Product\Feed\Builder\Inventory');
         //phpcs:enable Magento2.PHP.LiteralNamespaces

app/code/Meta/Catalog/etc/adminhtml/system.xml

@@ -21,12 +21,6 @@
                     </depends>
                     <frontend_model>Meta\Catalog\Block\Adminhtml\System\Config\ProductFeed</frontend_model>
                 </field>
-                <field id="use_multi_source_inventory" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="1">
-                    <label>Use Multi Source Inventory</label>
-                    <config_path>facebook/catalog_management/use_multi_source_inventory</config_path>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Set to 'Yes' if you'd like to use Magento's Multi Source Inventory (MSI) for products sold on Meta</comment>
-                </field>
                 <field id="price_incl_tax" translate="label comment" type="select" sortOrder="60" showInDefault="0" showInWebsite="0" showInStore="0">
                     <label>Price Including Tax</label>
                     <depends>

app/code/Meta/Catalog/etc/config.xml

@@ -7,7 +7,6 @@
                 <price_incl_tax>0</price_incl_tax>
                 <collections_sync>0</collections_sync>
                 <out_of_stock_threshold>0</out_of_stock_threshold>
-                <use_multi_source_inventory>1</use_multi_source_inventory>
             </catalog_management>
         </facebook>
     </default>