Merge remote-tracking branch 'upstream/master' into issue-4698

packages/Webkul/Theme/src/ThemeViewFinder.php

@@ -20,7 +20,7 @@ class ThemeViewFinder extends FileViewFinder
         // Extract the $view and the $namespace parts
         list($namespace, $view) = $this->parseNamespaceSegments($name);
 
-        if (request()->route() !== null && ! Str::contains(request()->route()->uri, 'admin/')) {
+        if (request()->route() !== null && ! Str::contains(request()->route()->uri, config('app.admin_url') . '/')) {
             $paths = $this->addThemeNamespacePaths($namespace);
 
             try {

packages/Webkul/Theme/src/Themes.php

@@ -43,7 +43,7 @@ class Themes
      */
     public function __construct()
     {
-        if (request()->route() !== null && Str::contains(request()->route()->uri, 'admin/')) {
+        if (request()->route() !== null && Str::contains(request()->route()->uri, config('app.admin_url') . '/')) {
             $this->defaultThemeCode = Config::get('themes.admin-default', null);
         } else {
             $this->defaultThemeCode = Config::get('themes.default', null);

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

@@ -1,5 +1,5 @@
 {
-    "/js/velocity.js": "/js/velocity.js?id=88772f0049a360a2c02e",
+    "/js/velocity.js": "/js/velocity.js?id=7f7a5e0de640a40550e1",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
-    "/css/velocity.css": "/css/velocity.css?id=ab692d526032812a7666"
+    "/css/velocity.css": "/css/velocity.css?id=0625cac8a65cc7c4a9e2"
 }

packages/Webkul/Velocity/src/Resources/assets/js/UI/components/image-magnifier.vue

@@ -25,6 +25,8 @@
 
     @media only screen and (max-width: 992px) {
         .image-container {
+            margin: 0 auto;
+
             .magnifier {
                 > img {
                     height: 100%;

packages/Webkul/Velocity/src/Resources/assets/js/UI/components/product-collections.vue

@@ -11,7 +11,7 @@
             <div class="row" :class="localeDirection">
                 <div
                     class="col-md-12 no-padding carousel-products"
-                    :class="showRecentlyViewed ? 'with-recent-viewed col-lg-9' : 'without-recent-viewed col-lg-12'">
+                    :class="showRecentlyViewed === 'true' ? 'with-recent-viewed col-lg-9' : 'without-recent-viewed col-lg-12'">
                     <carousel-component
                         :slides-per-page="slidesPerPage"
                         navigation-enabled="hide"
@@ -39,7 +39,7 @@
                     :add-class="`col-lg-3 col-md-12 ${localeDirection}`"
                     quantity="3"
                     add-class-wrapper=""
-                    v-if="showRecentlyViewed">
+                    v-if="showRecentlyViewed === 'true'">
                 </recently-viewed>
             </div>
         </template>
@@ -50,7 +50,7 @@
     export default {
         props: {
             count: {
-                type: Number,
+                type: String,
                 default: 10
             },
             productId: {
@@ -61,8 +61,8 @@
             productRoute: String,
             localeDirection: String,
             showRecentlyViewed: {
-                type: Boolean,
-                default: false
+                type: String,
+                default: 'false'
             },
             recentlyViewedTitle: String,
             noDataText: String,
@@ -145,7 +145,9 @@
 
             /* get window class */
             getWindowClass: function () {
-                return this.showRecentlyViewed ? '.with-recent-viewed' : '.without-recent-viewed';
+                return this.showRecentlyViewed === 'true'
+                    ? '.with-recent-viewed'
+                    : '.without-recent-viewed';
             },
 
             /* on resize set window width */

packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss

@@ -75,6 +75,10 @@
         top: -48px;
     }
 
+    .sticky-header {
+        display: none !important;
+    }
+
     .vc-full-screen {
         display: none !important;
     }

packages/Webkul/Velocity/src/Resources/views/shop/home/new-products.blade.php

@@ -12,7 +12,7 @@
     product-title="{{ __('shop::app.home.new-products') }}"
     product-route="{{ route('velocity.category.details', ['category-slug' => 'new-products', 'count' => $count]) }}"
     locale-direction="{{ $direction }}"
-    show-recently-viewed="{{ (Boolean) $showRecentlyViewed }}"
+    show-recently-viewed="{{ (Boolean) $showRecentlyViewed ? 'true' : 'false' }}"
     recently-viewed-title="{{ __('velocity::app.products.recently-viewed') }}"
     no-data-text="{{ __('velocity::app.products.not-available') }}">
 </product-collections>