Merge pull request #3432 from asif-webkul/newissue

fixed issue #3400 and #3399

packages/Webkul/Shop/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/shop.js": "/js/shop.js?id=b0ae98b46b290f0fca8b",
-    "/css/shop.css": "/css/shop.css?id=0664f52f2390473afc00"
+    "/js/shop.js": "/js/shop.js?id=d64fdfe9e3fe3e4b9ee4",
+    "/css/shop.css": "/css/shop.css?id=d5a7b8d843e219c2fa28"
 }

packages/Webkul/Shop/src/Resources/assets/sass/app.scss

@@ -815,7 +815,7 @@ section.slider-block {
                         img {
                             display: none;
                         }
-                        
+
                         input {
                             display: none;
                         }
@@ -4566,4 +4566,52 @@ section.review {
             }
         }
     }
+}
+
+//compare page
+body {
+    overflow-x: hidden;
+}
+
+.comparison-component {
+    width: 100%;
+    padding-top: 20px;
+}
+
+.comparison-component > h1 {
+    display: inline-block;
+}
+
+td {
+    padding: 15px;
+    min-width: 250px;
+    max-width: 250px;
+    line-height: 30px;
+    vertical-align: top;
+    word-break: break-word;
+}
+
+.icon.remove-product {
+    top: 5px;
+    float: right;
+    cursor: pointer;
+    position: relative;
+    background-color: black;
+}
+
+.action > div {
+    display: inline-block;
+}
+.cart-wish-wrap .btn.btn-lg {
+    padding: 5px 10px;
+}
+.cart-wish-wrap {
+    display: flex;
+}
+.white-cross-sm-icon {
+    width: 24px;
+    height:24px;
+}
+.add-to-wishlist {
+    margin-left: 15px;
 }

packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php

@@ -3,44 +3,6 @@
     $comparableAttributes = $attributeRepository->findByField('is_comparable', 1);
 @endphp
 
-@push('css')
-    <style>
-        body {
-            overflow-x: hidden;
-        }
-
-        .comparison-component {
-            width: 100%;
-            padding-top: 20px;
-        }
-
-        .comparison-component > h1 {
-            display: inline-block;
-        }
-
-        td {
-            padding: 15px;
-            min-width: 250px;
-            max-width: 250px;
-            line-height: 30px;
-            vertical-align: top;
-            word-break: break-word;
-        }
-
-        .icon.remove-product {
-            top: 15px;
-            float: right;
-            cursor: pointer;
-            position: relative;
-            background-color: black;
-        }
-
-        .action > div {
-            display: inline-block;
-        }
-    </style>
-@endpush
-
 @push('scripts')
     <script type="text/x-template" id="compare-product-template">
         <section class="comparison-component">

packages/Webkul/Velocity/src/Helpers/Helper.php

@@ -387,6 +387,7 @@ class Helper extends Review
                     $productMetaDetails['slug'] = $product->url_key;
                     $productMetaDetails['image'] = $formattedProduct['image'];
                     $productMetaDetails['priceHTML'] = $formattedProduct['priceHTML'];
+                    $productMetaDetails['new'] = $formattedProduct['new'];
                     $productMetaDetails['addToCartHtml'] = $formattedProduct['addToCartHtml'];
                     $productMetaDetails['galleryImages'] = $formattedProduct['galleryImages'];
                     $productMetaDetails['defaultAddToCart'] = $formattedProduct['defaultAddToCart'];
@@ -397,7 +398,7 @@ class Helper extends Review
                 }
             }
         }
-
+    
         return $productCollection;
     }
 }