From 6bc3b2e5f380715493aa0a63da20bd8810a46385 Mon Sep 17 00:00:00 2001
From: "shubhammehrotra.symfony@webkul.com"
 <shubhammehrotra.symfony@webkul.com>
Date: Fri, 3 Jan 2020 13:48:58 +0530
Subject: [PATCH] include with variable update

---
 .../publishable/assets/css/velocity.css       |  8 +---
 .../publishable/assets/js/velocity.js         |  2 +-
 .../Admin/ConfigurationController.php         |  1 +
 .../assets/js/UI/components/card-header.vue   |  2 +-
 .../Resources/assets/sass/components/app.scss |  4 +-
 .../assets/sass/components/footer.scss        |  2 -
 .../views/home/accessories.blade.php          | 29 ---------------
 .../Resources/views/home/category.blade.php   | 37 +++++++++++++++++++
 .../{ => in-progress}/categories.blade.php    |  0
 .../category-with-custom-option.blade.php     |  0
 .../customer-reviews.blade.php                |  0
 .../hot-categories.blade.php                  |  0
 .../popular-categories.blade.php              |  0
 .../popular-products.blade.php                |  0
 .../{ => in-progress}/product-modal.blade.php |  0
 .../product-policy.blade.php                  |  0
 .../recently-viewed-products.blade.php        |  0
 17 files changed, 44 insertions(+), 41 deletions(-)
 delete mode 100644 packages/Webkul/Velocity/src/Resources/views/home/accessories.blade.php
 create mode 100644 packages/Webkul/Velocity/src/Resources/views/home/category.blade.php
 rename packages/Webkul/Velocity/src/Resources/views/home/{ => in-progress}/categories.blade.php (100%)
 rename packages/Webkul/Velocity/src/Resources/views/home/{ => in-progress}/category-with-custom-option.blade.php (100%)
 rename packages/Webkul/Velocity/src/Resources/views/home/{ => in-progress}/customer-reviews.blade.php (100%)
 rename packages/Webkul/Velocity/src/Resources/views/home/{ => in-progress}/hot-categories.blade.php (100%)
 rename packages/Webkul/Velocity/src/Resources/views/home/{ => in-progress}/popular-categories.blade.php (100%)
 rename packages/Webkul/Velocity/src/Resources/views/home/{ => in-progress}/popular-products.blade.php (100%)
 rename packages/Webkul/Velocity/src/Resources/views/home/{ => in-progress}/product-modal.blade.php (100%)
 rename packages/Webkul/Velocity/src/Resources/views/home/{ => in-progress}/product-policy.blade.php (100%)
 rename packages/Webkul/Velocity/src/Resources/views/home/{ => in-progress}/recently-viewed-products.blade.php (100%)

diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
index 250eb699f..6cbc3857c 100644
--- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css
+++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
@@ -1795,12 +1795,12 @@
 }
 
 .product-price .regular-price {
-  font-weight: 600;
   margin-right: 10px;
+  text-decoration: line-through;
 }
 
 .product-price .special-price {
-  text-decoration: line-through;
+  font-weight: 600;
 }
 
 #app {
@@ -2901,10 +2901,6 @@ body::after {
   padding-right: 10%;
 }
 
-.footer .top-brands .top-brands-body {
-  padding: 15px;
-}
-
 .footer .top-brands .top-brands-body ul {
   width: 85%;
   display: inline-block;
diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
index 53a471532..0fce33f97 100644
--- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js
+++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
@@ -36487,7 +36487,7 @@ var render = function() {
                   ]
                 : _vm._e(),
               _vm._v(" "),
-              !(_vm.viewAll == "false" || _vm.viewAll == "") && false
+              !(_vm.viewAll == "false" || _vm.viewAll == "")
                 ? [
                     _c("div", { staticClass: "mr15" }, [
                       _c(
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
index 1298f0cdc..b8282ec2c 100644
--- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
@@ -69,6 +69,7 @@ class ConfigurationController extends Controller
         }
 
         $params['advertisement'] = json_encode($params['advertisement']);
+        $params['home_page_content'] = str_replace('=&gt;', '=>', $params['home_page_content']);
 
         unset($params['images']);
         unset($params['slides']);
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue
index daae2ca71..ef46c3a23 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue
@@ -39,7 +39,7 @@
                     </div>
                 </template>
 
-                <template v-if="(! (viewAll == 'false' || viewAll == '')) && false">
+                <template v-if="(! (viewAll == 'false' || viewAll == ''))">
                     <div class="mr15">
                         <a :href="viewAll" :title="`View all ${headerHeading}`" class="default">
                             <h2 class="fs14 fw6 cursor-pointer tab">View All</h2>
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
index 037c85d0f..d60a53b51 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
@@ -1056,12 +1056,12 @@
     }
 
     .regular-price {
-        font-weight: 600;
         margin-right: 10px;
+        text-decoration: line-through;
     }
 
     .special-price {
-        text-decoration: line-through;
+        font-weight: 600;
     }
 }
 
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss
index c618a2bc1..21f255229 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss
@@ -156,8 +156,6 @@
         padding-right: 10%;
 
         .top-brands-body {
-            padding: 15px;
-
             ul {
                 width: 85%;
                 display: inline-block;
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/accessories.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/accessories.blade.php
deleted file mode 100644
index f34738816..000000000
--- a/packages/Webkul/Velocity/src/Resources/views/home/accessories.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-@php
-    $newProducts = app('Webkul\Product\Repositories\ProductRepository')->getNewProducts(6)->items();
-
-    $products = array_merge(array_merge($newProducts, $newProducts), $newProducts);
-@endphp
-
-<div class="container-fluid accessories">
-    <card-list-header
-        heading="Accessories"
-        scrollable="accessories-carousel"
-    ></card-list-header>
-
-    <div class="row flex-nowrap">
-        <carousel-component
-            :slides-count="{{ sizeof($products) }}"
-            slides-per-page="6"
-            id="accessories-carousel">
-
-            @foreach ($products as $index => $product)
-
-                <slide slot="slide-{{ $index }}">
-                    @include ('shop::products.list.card', ['product' => $product])
-                </slide>
-
-            @endforeach
-
-        </carousel-component>
-    </div>
-</div>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php
new file mode 100644
index 000000000..bcb284c94
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Resources/views/home/category.blade.php
@@ -0,0 +1,37 @@
+@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
+
+@php
+    $categoryDetails = app('Webkul\Category\Repositories\CategoryRepository')->findByPath($category);
+@endphp
+
+@if ($categoryDetails)
+    @php
+        $products = $productRepository->getAll($categoryDetails->id);
+    @endphp
+
+    @if ($products->count())
+        <div class="container-fluid accessories">
+            <card-list-header
+                view-all="{{ route('shop.productOrCategory.index', ['slug' => $categoryDetails->slug]) }}"
+                heading="{{ $categoryDetails->name }}">
+            </card-list-header>
+
+            <div class="row flex-nowrap">
+                <carousel-component
+                    :slides-count="{{ sizeof($products) }}"
+                    slides-per-page="6"
+                    id="accessories-carousel">
+
+                    @foreach ($products as $index => $product)
+
+                        <slide slot="slide-{{ $index }}">
+                            @include ('shop::products.list.card', ['product' => $product])
+                        </slide>
+
+                    @endforeach
+
+                </carousel-component>
+            </div>
+        </div>
+    @endif
+@endif
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/categories.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/categories.blade.php
similarity index 100%
rename from packages/Webkul/Velocity/src/Resources/views/home/categories.blade.php
rename to packages/Webkul/Velocity/src/Resources/views/home/in-progress/categories.blade.php
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/category-with-custom-option.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/category-with-custom-option.blade.php
similarity index 100%
rename from packages/Webkul/Velocity/src/Resources/views/home/category-with-custom-option.blade.php
rename to packages/Webkul/Velocity/src/Resources/views/home/in-progress/category-with-custom-option.blade.php
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/customer-reviews.blade.php
similarity index 100%
rename from packages/Webkul/Velocity/src/Resources/views/home/customer-reviews.blade.php
rename to packages/Webkul/Velocity/src/Resources/views/home/in-progress/customer-reviews.blade.php
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/hot-categories.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/hot-categories.blade.php
similarity index 100%
rename from packages/Webkul/Velocity/src/Resources/views/home/hot-categories.blade.php
rename to packages/Webkul/Velocity/src/Resources/views/home/in-progress/hot-categories.blade.php
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/popular-categories.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/popular-categories.blade.php
similarity index 100%
rename from packages/Webkul/Velocity/src/Resources/views/home/popular-categories.blade.php
rename to packages/Webkul/Velocity/src/Resources/views/home/in-progress/popular-categories.blade.php
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/popular-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/popular-products.blade.php
similarity index 100%
rename from packages/Webkul/Velocity/src/Resources/views/home/popular-products.blade.php
rename to packages/Webkul/Velocity/src/Resources/views/home/in-progress/popular-products.blade.php
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/product-modal.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-modal.blade.php
similarity index 100%
rename from packages/Webkul/Velocity/src/Resources/views/home/product-modal.blade.php
rename to packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-modal.blade.php
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/product-policy.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-policy.blade.php
similarity index 100%
rename from packages/Webkul/Velocity/src/Resources/views/home/product-policy.blade.php
rename to packages/Webkul/Velocity/src/Resources/views/home/in-progress/product-policy.blade.php
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/recently-viewed-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php
similarity index 100%
rename from packages/Webkul/Velocity/src/Resources/views/home/recently-viewed-products.blade.php
rename to packages/Webkul/Velocity/src/Resources/views/home/in-progress/recently-viewed-products.blade.php