From 366876e8e139137e41cdf2edf2bb0b30baa5264c Mon Sep 17 00:00:00 2001 From: mohd asif Date: Mon, 6 Jul 2020 16:56:53 +0530 Subject: [PATCH 1/4] fixed compare page ui issue #3400 --- config/elastic.scout_driver.php | 5 +++++ .../guest/compare/compare-products.blade.php | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 config/elastic.scout_driver.php diff --git a/config/elastic.scout_driver.php b/config/elastic.scout_driver.php new file mode 100644 index 000000000..b28fe35a3 --- /dev/null +++ b/config/elastic.scout_driver.php @@ -0,0 +1,5 @@ + env('ELASTIC_SCOUT_DRIVER_REFRESH_DOCUMENTS', false) +]; diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php index 79b138c7c..7a800237c 100644 --- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php @@ -28,7 +28,7 @@ } .icon.remove-product { - top: 15px; + top: 5px; float: right; cursor: pointer; position: relative; @@ -38,6 +38,19 @@ .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; + } @endpush From e73442017419b01138dc281101563bb1c8e9bc29 Mon Sep 17 00:00:00 2001 From: mohammad asif Date: Mon, 6 Jul 2020 21:14:03 +0530 Subject: [PATCH 2/4] fixed issue #3399 --- packages/Webkul/Velocity/src/Helpers/Helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php index 8f89fd91f..79c3e0977 100644 --- a/packages/Webkul/Velocity/src/Helpers/Helper.php +++ b/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; } } From f81e56ce2f884afe092cb441cdb53d62b3bca5d8 Mon Sep 17 00:00:00 2001 From: mohd asif Date: Thu, 9 Jul 2020 09:57:25 +0530 Subject: [PATCH 3/4] moved css to sass --- .../Shop/src/Resources/assets/sass/app.scss | 50 +++++++++++++++++- .../guest/compare/compare-products.blade.php | 51 ------------------- 2 files changed, 49 insertions(+), 52 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 7b4c326cd..ca3b7ddf4 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/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; } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php index 7a800237c..11d356005 100644 --- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php @@ -3,57 +3,6 @@ $comparableAttributes = $attributeRepository->findByField('is_comparable', 1); @endphp -@push('css') - -@endpush - @push('scripts')