Merge pull request #4050 from devansh-webkul/category_issue

Fixed category height overflow issue #4044

packages/Webkul/Category/src/Database/Seeders/CategoryBulkTableSeeder.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Webkul\Category\Database\Seeders;
+
+use Faker\Generator as Faker;
+use Illuminate\Database\Seeder;
+use Webkul\Category\Repositories\CategoryRepository;
+
+/*
+ * CategoryBulkTableSeeder
+ *
+ * Command: php artisan db:seed --class=Webkul\\Category\\Database\\Seeders\\CategoryBulkTableSeeder
+ *
+ * This seeder has not included anywhere just for development purpose.
+ */
+class CategoryBulkTableSeeder extends Seeder
+{
+    private $numberOfParentCategories = 10;
+
+    private $numberOfChildCategories = 50;
+
+    public function __construct(
+        Faker $faker,
+        CategoryRepository $categoryRepository
+    )
+    {
+        $this->faker = $faker;
+        $this->categoryRepository = $categoryRepository;
+    }
+
+    public function run()
+    {
+        for ($i = 0; $i < $this->numberOfParentCategories; ++$i) {
+            $createdCategory = $this->categoryRepository->create([
+                'slug'        => $this->faker->slug,
+                'name'        => $this->faker->firstName,
+                'description' => $this->faker->text(),
+                'parent_id'   => 1,
+                'status'      => 1,
+            ]);
+
+            if ($createdCategory) {
+                for ($j = 0; $j < $this->numberOfChildCategories; ++$j) {
+
+                    $this->categoryRepository->create([
+                        'slug'        => $this->faker->slug,
+                        'name'        => $this->faker->firstName,
+                        'description' => $this->faker->text(),
+                        'parent_id'   => $createdCategory->id,
+                        'status'      => 1
+                    ]);
+                }
+            }
+        }
+    }
+}

packages/Webkul/Product/src/Helpers/View.php

@@ -27,7 +27,7 @@ class View extends AbstractProduct
 
             if ($attribute->type == 'boolean') {
                 $value = $value ? 'Yes' : 'No';
-            } elseif ($value) {
+            } elseif($value) {
                 if ($attribute->type == 'select') {
                     $attributeOption = $attributeOptionReposotory->find($value);
 
@@ -37,8 +37,6 @@ class View extends AbstractProduct
                         if (! $value) {
                             continue;
                         }
-                    } else {
-                        continue;
                     }
                 } elseif ($attribute->type == 'multiselect' || $attribute->type == 'checkbox') {
                     $lables = [];

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

@@ -1,5 +1,5 @@
 {
     "/js/velocity.js": "/js/velocity.js?id=4f93a5fcaa9e170dd72f",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
-    "/css/velocity.css": "/css/velocity.css?id=ef3e2ae913e88dcaa09d"
+    "/css/velocity.css": "/css/velocity.css?id=3bb07d73ad7958ec9a21"
 }

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

@@ -1861,6 +1861,7 @@
         background: $light-color;
         border-left: 1px solid $border-common;
         box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
+        overflow-y: auto;
 
         li:nth-last-of-type(1) {
             margin-bottom: 10px;