Merge remote-tracking branch 'origin/MC-33230' into 2.4-develop-pr23

Author: serhii-balko

app/code/Magento/Checkout/CustomerData/DefaultItem.php

@@ -10,7 +10,7 @@
 use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
- * Default item
+ * Default cart item
  */
 class DefaultItem extends AbstractItem
 {
@@ -78,7 +78,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function doGetItemData()
     {
@@ -106,6 +106,7 @@ protected function doGetItemData()
             ],
             'canApplyMsrp' => $this->msrpHelper->isShowBeforeOrderConfirm($this->item->getProduct())
                 && $this->msrpHelper->isMinimalPriceLessMsrp($this->item->getProduct()),
+            'message' => $this->item->getMessage(),
         ];
     }
 
@@ -121,6 +122,8 @@ protected function getOptionList()
     }
 
     /**
+     * Returns product for thumbnail.
+     *
      * @return \Magento\Catalog\Model\Product
      * @codeCoverageIgnore
      */
@@ -130,6 +133,8 @@ protected function getProductForThumbnail()
     }
 
     /**
+     * Returns product.
+     *
      * @return \Magento\Catalog\Model\Product
      * @codeCoverageIgnore
      */

app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Checkout\Test\Unit\CustomerData;
 
 use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class DefaultItemTest extends \PHPUnit\Framework\TestCase
 {
@@ -25,7 +26,7 @@ class DefaultItemTest extends \PHPUnit\Framework\TestCase
     private $configurationPool;
 
     /**
-     * @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ItemResolverInterface|MockObject
      */
     private $itemResolver;
 
@@ -102,5 +103,6 @@ public function testGetItemData()
         $this->assertArrayHasKey('product_price_value', $itemData);
         $this->assertArrayHasKey('product_image', $itemData);
         $this->assertArrayHasKey('canApplyMsrp', $itemData);
+        $this->assertArrayHasKey('message', $itemData);
     }
 }

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -112,4 +112,7 @@
             </div>
         </div>
     </div>
+    <div class="message notice" if="message">
+        <div data-bind="text: message"></div>
+    </div>
 </li>

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less

@@ -246,6 +246,11 @@
             margin-bottom: @indent__xs;
         }
 
+        .message {
+            margin-bottom: 0;
+            margin-top: 10px;
+        }
+
         .product {
             > .product-item-photo,
             > .product-image-container {

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less

@@ -264,6 +264,11 @@
             margin-bottom: @indent__xs;
         }
 
+        .message {
+            margin-bottom: 0;
+            margin-top: 10px;
+        }
+
         .product-item-name {
             font-weight: @font-weight__regular;
             margin: 0 0 @indent__s;