Merge remote-tracking branch 'origin/MC-40873' into 2.4-develop-pr54

Author: Serhii Balko

app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php

@@ -153,6 +153,7 @@ public function getCurrentProductData()
         $this->productRenderCollectorComposite
             ->collect($product, $productRender);
         $data = $this->hydrator->extract($productRender);
+        $data['is_available'] = $product->isAvailable();
 
         $currentProductData = [
             'items' => [

app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php

@@ -166,14 +166,14 @@ public function testGetCurrentProductDataWithNonEmptyProduct()
     {
         $productMock = $this->getMockBuilder(ProductInterface::class)
             ->disableOriginalConstructor()
+            ->addMethods(['isAvailable'])
             ->getMockForAbstractClass();
         $productRendererMock = $this->getMockBuilder(ProductRenderInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $storeMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->registryMock->expects($this->once())
             ->method('registry')
             ->with('product')

app/code/Magento/Catalog/view/base/web/js/product/addtocart-button.js

@@ -55,6 +55,16 @@ define([
             return row['is_salable'];
         },
 
+        /**
+         * Depends on this option, stock status text can be "In stock" or "Out Of Stock"
+         *
+         * @param {Object} row
+         * @returns {Boolean}
+         */
+        isAvailable: function (row) {
+            return row['is_available'];
+        },
+
         /**
          * Depends on this option, "Add to cart" button can be shown or hide. Depends on  backend configuration
          *

app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml

@@ -78,7 +78,7 @@
                                             </button>
                                         </form>
                                     <?php else :?>
-                                        <?php if ($item->getIsSalable()) :?>
+                                        <?php if ($item->isAvailable()) :?>
                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                         <?php else :?>
                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml

@@ -287,7 +287,7 @@ $_item = null;
                                                         </form>
                                                     <?php endif; ?>
                                                 <?php else:?>
-                                                    <?php if ($_item->getIsSalable()):?>
+                                                    <?php if ($_item->isAvailable()):?>
                                                         <div class="stock available">
                                                             <span><?= $block->escapeHtml(__('In stock')) ?></span>
                                                         </div>

app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml

@@ -63,7 +63,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                                     . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->escapeUrl($block->getAddToCartUrl($_product)) . '"} }\'>'
                                     . '<span>' . $block->escapeHtml(__('Add to Cart')) . '</span></button>';
                             } else {
-                                $info['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . $block->escapeHtml(__('In stock')) . '</span></div>' :
+                                $info['button'] = $_product->isAvailable() ?   '<div class="stock available"><span>' . $block->escapeHtml(__('In stock')) . '</span></div>' :
                                     '<div class="stock unavailable"><span>' . $block->escapeHtml(__('Out of stock')) . '</span></div>';
                             }
 

app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml

@@ -52,7 +52,7 @@
                                                 </button>
                                             <?php endif; ?>
                                         <?php else :?>
-                                            <?php if ($_product->getIsSalable()) :?>
+                                            <?php if ($_product->isAvailable()) :?>
                                                 <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
                                                     <span><?= $block->escapeHtml(__('In stock')) ?></span>
                                                 </div>

app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml

@@ -89,7 +89,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else :?>
-                                                    <?php if ($_item->getIsSalable()) :?>
+                                                    <?php if ($_item->isAvailable()) :?>
                                                         <div class="stock available">
                                                             <span><?= $block->escapeHtml(__('In stock')) ?></span>
                                                         </div>

app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml

@@ -88,7 +88,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else :?>
-                                                        <?php if ($_item->getIsSalable()) :?>
+                                                        <?php if ($_item->isAvailable()) :?>
                                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                                         <?php else :?>
                                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html

@@ -15,10 +15,10 @@
         </button>
     </if>
 
-    <ifnot args="isSalable($row())">
+    <if args="isAvailable($row()) === false">
         <div class="stock unavailable">
             <text args="$t('Availability')"/>
             <span translate="'Out of stock'"/>
         </div>
-    </ifnot>
+    </if>
 </if>