Merge branch 'developer' into production

app/code/Magento/Catalog/Block/ListProduct.php

+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Block;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Framework\Pricing\Render;
+
+class ListProduct extends \Magento\Catalog\Block\Product\AbstractProduct
+{
+    protected $_products;
+    protected $_type = '';
+
+    public function setProducts($products) {
+        $this->_products = $products;
+    }
+
+    public function getProducts() {
+        return $this->_products;
+    }
+
+    public function setType($type) {
+        $this->_type = $type;
+    }
+
+    public function getType() {
+        return $this->_type;
+    }
+
+    /**
+     * Filter wysiwyg Content
+     * @param $content
+     * @return string
+     * @throws \Exception
+     */
+    public function renderContent($content)
+    {
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $filterProvider = $objectManager->get('\Magento\Cms\Model\Template\FilterProvider');
+        return $filterProvider->getBlockFilter()->filter($content);
+    }
+
+    public function getCategoryAds(&$start, $isMobile=false) {
+        $itemCnt = $this->getRequest()->getParam('itemCnt') ?? 0;
+        $start = $itemCnt + 1;
+        $ads = array();
+        if ('catalog_category_view' == $this->getRequest()->getFullActionName()) {
+            $category = $this->_coreRegistry->registry('current_category');
+            if ($category) {
+                $type = ($isMobile ? 'mobile' : 'pc');
+                $content = $category->getData('cat_list_ads_' . $type);
+                if ($content) {
+                    $content = str_replace('，', ',', $content);
+                    $content = explode(PHP_EOL, $content);
+                    foreach ($content as $row) {
+                        $ad = explode(',', $row);
+                        if (count($ad) < 3) {
+                            continue;
+                        }
+                        $ads[trim($ad[0])] = array('image' => trim($this->renderContent($ad[1])), 'link' => trim($ad[2]));
+                    }
+                }
+            }
+        }
+        return $ads;
+    }
+
+    public function isThreeColumns() {
+        if ('catalog_category_view' == $this->getRequest()->getFullActionName()) {
+            $category = $this->_coreRegistry->registry('current_category');
+            if ($category) {
+                return $category->getData('is_three_columns');
+            }
+        }
+        return false;
+    }
+    public function getProductPrice(Product $product)
+    {
+        $priceRender = $this->getPriceRender();
+
+        $price = '';
+        if ($priceRender) {
+            $price = $priceRender->render(
+                FinalPrice::PRICE_CODE,
+                $product,
+                [
+                    'include_container' => true,
+                    'display_minimal_price' => true,
+                    'zone' => Render::ZONE_ITEM_LIST,
+                    'list_category_page' => true
+                ]
+            );
+        }
+
+        return $price;
+    }
+    protected function getPriceRender()
+    {
+        $priceRender = $this->getLayout()->getBlock('product.price.render.default');
+        if (!$priceRender) {
+            $priceRender = $this->getLayout()->createBlock(
+                \Magento\Framework\Pricing\Render::class,
+                'product.price.render.default',
+                ['data' => ['price_render_handle' => 'catalog_product_prices']]
+            );
+        }
+        return $priceRender;
+    }
+}

app/code/Magento/Catalog/Controller/Product/Recently.php

+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Controller\Product;
+use Magento\Framework\App\Action\Context;
+
+class Recently extends \Magento\Framework\App\Action\Action
+{
+    protected $_objectManager;
+
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        Context $context
+    ) {
+        $this->_objectManager = $objectManager;
+        parent::__construct($context);
+    }
+
+    public function execute()
+    {
+        $result = ['status' => 'fail'];
+        $request = $this->getRequest();
+        if ($request->isPost() && $request->isAjax()) {
+            $productIds = $request->getParam('ids');
+            if (substr($productIds, -1) == ',') {
+                $productIds = substr($productIds, 0, -1);
+            }
+            $in = explode(',', $productIds);
+
+            /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
+            $productCollection = $this->_objectManager->get('Magento\Catalog\Model\ResourceModel\Product\Collection');
+            $productCollection->addAttributeToSelect('*')
+                ->addFieldToFilter('status', 1)
+                ->addAttributeToFilter('entity_id', array( 'in' => $in));
+            $productCollection->getSelect()->order(sprintf("field(e.entity_id,%s)", $productIds));
+            /** @var \Magento\CatalogInventory\Helper\Stock $stockHelper */
+            $stockHelper = $this->_objectManager->get('Magento\CatalogInventory\Helper\Stock');
+            $stockHelper->addInStockFilterToCollection($productCollection);
+            if (count($productCollection) > 0) {
+                $result['status'] = 'success';
+                /** @var Magento\Catalog\Block\ListProduct $block */
+                $block = $this->_view->getLayout()->createBlock('Magento\Catalog\Block\ListProduct');
+                $block->setProducts($productCollection);
+                $block->setType('recently');
+                $block->setTemplate('Magento_Catalog::product/list-new.phtml');
+                $result['html'] = $block->toHtml();
+            }
+        }
+
+        return $this->getResponse()->representJson(json_encode($result));
+    }
+}
\ No newline at end of file

app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grids.phtml

+<?php
+/**
+ * @var $block \Magento\Ui\Block\Wrapper
+ */
+?>
+<div class="recently-viewed" style="display: none;">
+    <?php if ($titleBlockId = $block->getTitleBlockId()): ?>
+        <?php $titleBlock = $block->getLayout()->createBlock(Magento\Cms\Block\Block::class); ?>
+        <?php $titleBlock->setBlockId($titleBlockId); ?>
+        <?= $titleBlock->toHtml() ?>
+    <?php endif ?>
+    <div class="content"></div>
+</div>
+<script>
+    require(['jquery', 'jquery.owlCarousel'], function ($) {
+        var isMobile = window.matchMedia("(pointer:coarse)").matches;
+        var productIds = localStorage.getItem('recently_viewed') || '';
+        if (productIds != '') {
+            console.log('productIds',productIds)
+            $.ajax({
+                url: '/catalog/product/recently',
+                data: {ids: productIds},
+                type: 'post',
+                dataType: 'json',
+                success: function (result) {
+                    if (result.status == 'success') {
+                        $('.recently-viewed>.content').html(result.html);
+                        $('.recently-viewed').show();
+                        $('.recently-viewed .owl-carousel').owlCarousel({
+                            nav: true,
+                            dots: false,
+                            navText: [],
+                            margin: isMobile?10:20,
+                            items: isMobile?2:5,
+                            slideBy: isMobile?2:5
+                        });
+                    }
+                    if(isMobile)
+                    {
+                        $('.owl-nav .owl-prev').html('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.67 0l2.83 2.829-9.339 9.175 9.339 9.167-2.83 2.829-12.17-11.996z"></path></svg>')
+                        $('.owl-nav .owl-next').html('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 3l3.057-3 11.943 12-11.943 12-3.057-3 9-9z"></path></svg>')
+                    }
+                    else
+                    {
+                        $('.owl-nav .owl-prev').html('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.67 0l2.83 2.829-9.339 9.175 9.339 9.167-2.83 2.829-12.17-11.996z"></path></svg>')
+                        $('.owl-nav .owl-next').html('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 3l3.057-3 11.943 12-11.943 12-3.057-3 9-9z"></path></svg>')
+                    }
+                }
+            });
+        }
+    });
+</script>
\ No newline at end of file

app/code/Magento/Checkout/Block/Cart/Shipping.php

@@ -128,6 +128,10 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
     {
         return $this->jsonHexTagSerializer->serialize($this->getCheckoutConfig());
     }
+    public function getFreeShippingSubtotal()
+    {
+        return $this->_scopeConfigInterface->getValue('carriers/freeshipping/free_shipping_subtotal');
+    }
     public function getFlatratePrice()
     {
         return $this->_scopeConfigInterface->getValue('carriers/flatrate/price');

app/code/Magento/Checkout/Model/Cart.php

@@ -691,6 +691,15 @@ class Cart extends DataObject implements CartInterface
         return $this->getQuote()->getItemsQty() * 1;
     }
 
+    public function getSubtotal()
+    {
+        return $this->getQuote()->getSubtotal();
+    }
+    public function getGrandTotal()
+    {
+        return $this->getQuote()->getGrandTotal();
+    }
+
     /**
      * Update item in shopping cart (quote)
      * $requestInfo - either qty (int) or buyRequest in form of array or \Magento\Framework\DataObject

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -22,10 +22,106 @@ if (count($_items) > 0) {
         $priceSum += $value->getPrice() * $value->getQty();
     }
 }
+$subtotal = $_cart->getSubtotal();
+$_shipping = $objectManager->get('\Magento\Checkout\Block\Cart\Shipping');
+$free_shipping_subtotal = $_shipping->getFreeShippingSubtotal();
 
+$is_free_shipping = false;
+$difference_price = 0;
+if($subtotal >= $free_shipping_subtotal)
+{
+    $is_free_shipping = true;
+}
+else
+{
+    $difference_price = $free_shipping_subtotal - $subtotal;
+}
 ?>
+<style>
+    .free_message{
+        margin-left: .7rem;
+        text-align: left;
+    }
+    .free_message.tddiv{
+        margin-left: 1.3rem;
+    }
+    .free-shipping-area .cart-icon{
+        float: left;
+    }
+    .free-shipping-area .content-wrap{
+        float: left;
+    }
+    .free-shipping-area{
+        width:100%!important;
+        order:-3;
+        padding: 15px;
+        background-color: #FFFFFF;
+        color:#000;
+    }
+    @media(min-width:768px){
+        .free-shipping-area{
+            padding: 10px 10px 10px 20px;
+        }
+        .area-blk-notitle{
+            display:none;
+        }
+    }
+    @media(max-width:768px){
+        .free-shipping-area{
+            padding: 0px;
+        }
+        .free-shipping-area .content-wrap{
+            padding: 10px 0px;background-color: #f2f2f2;
+            width:100%;
+        }
+        .area-blk{
+            display:none;
+        }
+        .area-fix {
+            position: fixed;
+            left: 0;
+            z-index: 1;
+            border-top: 1px solid #fff;
+        }
+    }
+</style>
 <?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
 <?= $block->getChildHtml('form_before') ?>
+
+<?php if (!$is_free_shipping): ?>
+    <div class="free-shipping-area area-blk">
+        <img alt="" class="cart-icon" src="/media/wysiwyg/free-shipping-cart.png">
+        <div class="content-wrap">
+            <div class="free_message">
+                <div class="msg-title">
+                    <p style="font-weight: bold;">Shipping Fee</p>
+                </div>
+                <div class="msg-content">
+                    Spend <span style="color:#EB001B;font-size: 16px;font-weight: bold;"><?= $block->escapeHtml(
+                            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($difference_price),
+                            ['span']
+                        )  ?></span> more and get <span style="font-weight: bold;">FREE SHIPPING</span>!
+                </div>
+            </div>
+        </div>
+    </div>
+<?php endif ?>
+
+<?php if (!$is_free_shipping): ?>
+    <div class="free-shipping-area area-blk-notitle">
+        <div class="content-wrap">
+            <div class="free_message">
+                <div class="msg-content">
+                    Spend <span style="color:#EB001B;font-size: 16px;"><?= $block->escapeHtml(
+                            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($difference_price),
+                            ['span']
+                        )  ?></span> more and get FREE SHIPPING!
+                </div>
+            </div>
+        </div>
+    </div>
+<?php endif ?>
+
 <form action="<?= $block->escapeUrl($block->getUrl('checkout/cart/updatePost')) ?>"
           method="post"
           id="form-validate"
@@ -35,6 +131,7 @@ if (count($_items) > 0) {
           }'
           class="form form-cart">
     <?= $block->getBlockHtml('formkey') ?>
+
     <div class="cart table-wrapper<?= $mergedCells == 2 ? ' detailed' : '' ?>">
         <?php if ($block->getPagerHtml()): ?>
             <div class="cart-products-toolbar cart-products-toolbar-top toolbar"
@@ -119,6 +216,41 @@ require(['jquery'], function ($) {
             return false;
         }
     });
+    var isMobile = window.matchMedia("(pointer:coarse)").matches;
+    if (isMobile) {
+        var fixHeight = $('.area-blk-notitle').height();
+        $(window).scroll(function () {
+            if(!$('#checkout-step-shipping').is(":visible")) {
+                $(window).scroll(function () {
+
+                    var scrollTop = $(document).scrollTop();
+                    var fixTop = $('.area-blk-notitle').offset().top;
+                    var tableTop = $('#shopping-cart-table').offset().top;
+                    var tableHeight = $('#shopping-cart-table').height();
+                    var headerHeight = $('.page-header').height();
+                    if(scrollTop >= fixTop - headerHeight)
+                    {
+                        if(scrollTop < tableTop + tableHeight - fixHeight)
+                        {
+                            $('.area-blk-notitle .content-wrap').addClass("area-fix");
+                            $('.area-blk-notitle .content-wrap').css({ "top": headerHeight});
+                        }
+                        else
+                        {
+                            $('.area-blk-notitle .content-wrap').removeClass("area-fix");
+                        }
+                    }
+                    else {
+                        $('.area-blk-notitle .content-wrap').removeClass("area-fix");
+                    }
+                });
+            }
+        });
+
+    }
+
+
+
 });
 </script>
 <script>

app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js

@@ -70,7 +70,7 @@ define([
         },
         isSaveShowed: function () {
             var price =  this.totals()['shipping_amount'];
-            if(price != 0)
+            if(price != 0 || quote.shippingSaveMethod() == null)
             {
                 return false;
             }

app/design/frontend/Joshine/breeze/Magento_Catalog/layout/catalog_product_view.xml

@@ -9,5 +9,15 @@
     <body>
         <referenceBlock name="product.info.description" remove="true" />
         <referenceBlock name="product.attributes" remove="true" />
+        <referenceContainer name="content">
+            <block class="Magento\Catalog\Block\Product\View" name="product.recently_viewed.collector" template="Magento_Catalog::product/view/recently_viewed/collector.phtml" after="product.info.details"/>
+        </referenceContainer>
+        <referenceContainer name="content.aside">
+            <block class="Magento\Cms\Block\Block" name="checkout.cart.empty.recently" before="catalog.product.related">
+                <arguments>
+                    <argument name="block_id" xsi:type="string">recently_viewed</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
     </body>
 </page>

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list-new.phtml

+<?php
+/**
+ * Product list template
+ *
+ * @var $block \Magento\Catalog\Block\ListProduct
+ */
+$templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
+$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+$pr = $objectManager->create('Magento\Catalog\Model\ProductRepository');
+$blocklist = $objectManager->get('\Magento\Catalog\Block\ListProduct');
+$imageHelper = $objectManager->get( 'Magento\Catalog\Helper\Image' );
+$products = $block->getProducts();
+$type = $block->getType();
+?>
+<style>
+@media(max-width: 768px){
+    .products-title h2{
+        text-transform:uppercase;
+        font-size: 16px;
+        font-weight: bold;
+        color: #000000;
+        margin: 0px;
+        padding: 1rem;
+        text-align: center;
+    }
+    .catalog-product-view .products-title h2{
+        text-transform:capitalize;
+    }
+}
+@media(min-width: 768px){
+    .products-list{
+        max-width:1600px;
+    }
+    .products-list .products_item{
+        border:1px solid #fff;
+    }
+    .products-list .products_item a{
+        padding:0;
+        background: none;
+        color:#000;
+        font-size: 1rem;
+    }
+    .products-list .products_item:hover{
+        border-radius: ;
+    }
+    .products-title h2{
+        text-transform:uppercase;
+        font-size: 24px;
+        font-weight: bold;
+        color: #000000;
+        margin: 0px;
+        padding: 1rem;
+        text-align: center;
+    }
+    .catalog-product-view .products-title h2{
+        font-size: 16px;
+        text-transform:capitalize;
+    }
+}
+
+</style>
+<div class="products-title">
+    <h2><?= $type ?> Products</h2>
+</div>
+<div class="products-list items product-items owl-carousel owl-theme  <?= $type ?>" >
+<?php
+foreach($products as $_product):
+    $id = $_product->getId();
+    $product = $pr->getById($id);
+    if(!$product) continue;
+    $productImage = $imageHelper->init( $product, 'category_page_list' )  ->getUrl();
+    ?>
+    <div class="products_item">
+        <a href="<?php echo $product->getProductUrl()?>" >
+            <img src="<?php echo $productImage;?>" loading="lazy" />
+        </a>
+        <div class="flash-sale-info">
+            <a class="product-name" href="<?php echo $product->getProductUrl()?>"><?php echo $product->getName();?></a>
+            <?= /* @noEscape */ $blocklist->getProductPrice($product) ?>
+        </div>
+    </div>
+<?php
+endforeach;
+?>
+</div>

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/recently_viewed/collector.phtml

+<?php
+/** @var \Magento\Catalog\Block\Product\View $block */
+?>
+<script type="text/javascript">
+    require(['jquery'], function ($) {
+        var id = <?= $block->getProduct()->getId() ?>;
+        var recentlyViewed = localStorage.getItem('recently_viewed') || '';
+        if (recentlyViewed != '') {
+            recentlyViewed = recentlyViewed.replace(id + ',', '');
+            if (recentlyViewed.split(',').length - 1 == 10) {
+                recentlyViewed = recentlyViewed.replace(/[\d]*,$/, '')
+            }
+        }
+        recentlyViewed = id + ',' + recentlyViewed;
+        localStorage.setItem('recently_viewed', recentlyViewed);
+    });
+</script>

app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_cart_index.xml

@@ -53,6 +53,12 @@
                 </argument>
             </arguments>
         </referenceBlock>
-
+        <referenceContainer name="checkout.cart.noitems">
+            <block class="Magento\Cms\Block\Block" name="checkout.cart.empty.recently">
+                <arguments>
+                    <argument name="block_id" xsi:type="string">recently_viewed</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
     </body>
 </page>

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/footer.phtml

@@ -6,59 +6,7 @@ $copyrightBlock = $block->getLayout()->createBlock('Magento\Theme\Block\Html\Foo
         <div class="choose-us">
             WHY CHOOSE US
         </div>
-        <div class="why-choose-us">
-            <div class="why_joshine">
-                <div class="choose-us-fi">
-                    <div class="item">
-                        <span class="us-icon return-icon"></span>
-                        <span class="label">
-                            <span class="title">15-Day</span>
-                            <span>Returns</span>
-                        </span>
-                    </div>
-                    <div class="item">
-                        <span class="us-icon warranty-icon"></span>
-                        <span class="label">
-                            <span class="title">10%-OFF</span>
-                            <span>SITEWIDE</span>
-                        </span>
-                    </div>
-                    <div class="item">
-                        <span class="us-icon flexible-icon"></span>
-                        <span class="label">
-                            <span class="title">Flexible </span>
-                            <span>Financing</span>
-                        </span>
-                    </div>
-                </div>
-                <div class="choose-us-se">
-                    <div class="item">
-                        <span class="us-icon shopping-icon"></span>
-                        <span class="label">
-                            <span class="title">Secure</span>
-                            <span>Shopping</span>
-                        </span>
-                    </div>
-                    <div class="item">
-                        <span class="us-icon reviews-icon"></span>
-                        <span class="label">
-                            <span class="title">Great</span>
-                            <span>Reviews</span>
-                        </span>
-                    </div>
-                    <div class="item">
-                        <span class="us-icon quality-icon"></span>
-                        <span class="label">
-                            <span class="title">High</span>
-                            <span>Quality</span>
-                        </span>
-                    </div>
-                </div>
-
-
-            </div>
-        </div>
-    </div>
+        <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('why_choose_us')->toHtml();?>
     <div class="footer-mini-copyright-content"><?= $block->escapeHtml($copyrightBlock->getCopyright()) ?></div>
 </footer>
 <script>

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -799,6 +799,9 @@ p.shopbycate-title {
   .checkout-cart-index .cart-container .cart.actions {
     border-top:none;
   }
+  .checkout-cart-index .recently-viewed {
+      margin-bottom: 2rem;
+  }
   .checkout-cart-index .cart-container .checkout-methods-items .checkout-now button{
     height: 50px;
   }
@@ -2244,15 +2247,16 @@ button.action.submit.primary {
   height: 40px;
   background-clip: content-box!important;
   padding: 5px;
-  margin-left: 3%;
+  margin-left: 3%!important;
+  border: 1px solid rgba(23,23,23,0.3);
 }
 
 .swatch-option.color.selected{
-  border: 2px solid black;
+  border: 2px solid black!important;
 }
 
 .swatch-option.image.selected{
-  border: 2px solid black;
+  border: 2px solid black!important;
 }
 
 .swatch-option.text{
@@ -2323,7 +2327,7 @@ button.action.submit.primary {
   .swatch-option.text
   {
     width: auto !important;
-    line-height: 13px!important;
+    line-height: 10px!important;
     height: 30px !important;
     min-width: 30px;
   }