Merge branch 'master' of http://47.99.244.21:9999/root/joshine

app/code/Magento/Sales/Model/Order/Shipment/Validation/QuantityValidator.php

@@ -75,9 +75,9 @@ class QuantityValidator implements ValidatorInterface
                 $totalQuantity += $item->getQty();
             }
         }
-//        if ($totalQuantity <= 0) {
-//            $messages[] = __('You can\'t create a shipment , .');
-//        }
+        if ($totalQuantity <= 0) {
+            $messages[] = __('You can\'t create a shipment , .');
+        }
 
         return $messages;
     }

app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml

@@ -4,7 +4,28 @@
  * See COPYING.txt for license details.
  */
 ?>
-<style>
+    <div data-role="content" style="margin-top: 30px;margin-bottom: -23px;display: none;" id="home_search">
+        <form class="" id="home_search_form" action="/catalogsearch/result/" method="get">
+            <div class="field search">
+                <div class="control">
+                    <input id="new-search"
+                           data-mage-init='{"quickSearch":{
+                     "formSelector":"#new_search_form",
+                     "minSearchLength": 1,
+                     "url":"/search/ajax/suggest",
+                     "destinationSelector":"#search_results"}
+                    }'
+                           type="text"
+                           name="q"
+                           placeholder="<?= $block->escapeHtmlAttr(__('Search entire store here...')) ?>"
+                           class="input-text"/>
+                    <div id="search_results" class="search-autocomplete"></div>
+                </div>
+            </div>
+
+        </form>
+    </div>
+    <style>
    .banner1,.banner1 >.imgbox, .banner1 >.imgbox > a, .banner1 >.imgbox > a >img{
         height: 634px !important;
     }
@@ -28,6 +49,9 @@
     require([
         'jquery'
     ], function ($) {
+        $(".page-header .actions.search-dropdown").click(function () {
+           $("#home_search").toggle();
+        });
         $.fn.banner = function(options){
             var that = this;
             options = options || {};
@@ -192,7 +216,7 @@
 
         var img_arr =  ["/media/wysiwyg/202210281.png", "/media/wysiwyg/202210282.png"];
         if (isMobile()) {
-            img_arr =  ["/media/wysiwyg/2_M_1_.jpg", "/media/wysiwyg/1_M_1_.jpg"];
+            img_arr =  ["/media/wysiwyg/202210281-m.png", "/media/wysiwyg/202210282-m.png"];
         }
         $(".banner1").banner({
             img: img_arr,

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

@@ -996,10 +996,7 @@ footer{
   .page-header .header-top.header-fixed{
     margin-right: 20px;
   }
-  .page-header .actions.search-dropdown{
-    opacity: 0;
-    z-index: -1;
-  }
+
   .checkout-container{
     width: 81%;
   }
@@ -1017,10 +1014,6 @@ footer{
   .page-header .actions.wishlist-dropdown{
     display: none;
   }
-  .page-header .actions.search-dropdown{
-    opacity: 0;
-    z-index: -1;
-  }
   .navigation .subchildmenu li{
     line-height: 36px;
   }
@@ -2427,37 +2420,47 @@ span.swatch-attribute-selected-option{
     margin-left: 10%;
     width: 80%;
   }
+
+  .page-header .actions.search-dropdown{
+    opacity: 0;
+    z-index: -1;
+  }
 }
 
 @media (max-width: 1024px){
-  .select-element.section-before-footer.clearfix p {
-    font-weight: 200;
-    font-size: 12px;
-    color: #909090;
-    text-transform: none;
-  }
+.select-element.section-before-footer.clearfix p {
+font-weight: 200;
+font-size: 12px;
+color: #909090;
+text-transform: none;
+}
 }
 
 @media (max-width: 1024px) and (min-width: 768px){
-  .select-element.section-before-footer.clearfix p {
-    font-weight: 400;
-    font-size: 16px;
-    color: #909090;
-    text-transform: none;
-  }
+.select-element.section-before-footer.clearfix p {
+font-weight: 400;
+font-size: 16px;
+color: #909090;
+text-transform: none;
+}
 
-  .flash-sale-item{
+.flash-sale-item{
  width: 33.33%;
-  }
+}
 
-  .shopcatewpt{
-    width: 100%;
-  }
-  .shop-by-cata {
-    padding: 10px;
-    width: 50%;
-    float: left;
-  }
+.shopcatewpt{
+width: 100%;
+}
+.shop-by-cata {
+padding: 10px;
+width: 50%;
+float: left;
+}
+
+p.flashsale-title {
+font-size: 16px;
+font-weight: 400;
+}
 }