Merge branch 'release/2.5.8'

nedmas · May 20, 2021 · c3519db · c3519db
2 parents 8e6b403 + 303db11
commit c3519db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ## Unreleased
 
 
+## 2.5.8 - 2021-05-20
+
+### Fixed
+- Fixed an issue where Feed Me stopped working with Commerce products that had unlimited stock set to null - now the API that Feed Me uses returns 0 or 1 as strings which seem to work.
+
+
 ## 2.5.7 - 2021-04-09
 
 ### Fixed

diff --git a/src/controllers/ProductsController.php b/src/controllers/ProductsController.php
@@ -434,7 +434,7 @@ private function _rawProductEntryToVariantArray(Entry $rawProduct, $default = fa
             'optionValueOrName' => $formattedOptionValues ?: $rawProduct->vendProductVariantName,
             'parentProductId' => $rawProduct->vendProductVariantParentId,
             'default' => $default,
-            'hasUnlimitedStock' => !$productJson['has_inventory'],
+            'hasUnlimitedStock' => ($productJson['has_inventory'] ? '0' : '1'),
             'inventory' => $rawProduct->vendInventoryCount,
             'formattedOptionNames' => $formattedOptionNames,
             'formattedOptionValues' => $formattedOptionValues,
@@ -503,4 +503,4 @@ private function _updateInventoryInline(Entry $entry)
         }
     }
 
-}
+}