From 4b57bb33bac50973d7c593cc8fe110162a66f00a Mon Sep 17 00:00:00 2001
From: Shivendra <shivendra.gupta423@webkul.in>
Date: Fri, 29 Nov 2024 12:32:35 +0530
Subject: [PATCH] Fixed Boolean type attribute and attribute listing in product
 view

---
 .../controls/inline/boolean.blade.php         | 13 ++++---
 .../views/products/view/attributes.blade.php  | 35 +++++++++++++------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/boolean.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/boolean.blade.php
index 706bfa4ae..6f5a8b25f 100644
--- a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/boolean.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/boolean.blade.php
@@ -32,14 +32,19 @@ class="flex h-[34px] items-center rounded border border-transparent transition-a
                     v-model="inputValue"
                 />
 
-                <span class="cursor-pointer truncate rounded">
-                    @{{ valueLabel ? valueLabel : selectedValue?.name }}
-                </span>
+                <div
+                    class="group relative h-[18px] !w-full pl-2.5"
+                    :style="{ 'text-align': position }"
+                >
+                    <span class="cursor-pointer truncate rounded">
+                        @{{ valueLabel ? valueLabel : options[inputValue].name }}
+                    </span>
+                </div>
 
                 <template v-if="allowEdit">
                     <i
                         @click="toggle"
-                        class="icon-edit cursor-pointer rounded text-2xl opacity-0 hover:bg-gray-200 group-hover:opacity-100 dark:hover:bg-gray-950"
+                        class="icon-edit cursor-pointer rounded p-0.5 text-2xl opacity-0 hover:bg-gray-200 group-hover:opacity-100 dark:hover:bg-gray-950 ltr:mr-1 rtl:ml-1"
                     ></i>
                 </template>
             </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/products/view/attributes.blade.php b/packages/Webkul/Admin/src/Resources/views/products/view/attributes.blade.php
index 4d6bc443e..aa7cb6fdf 100644
--- a/packages/Webkul/Admin/src/Resources/views/products/view/attributes.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/products/view/attributes.blade.php
@@ -6,17 +6,32 @@
     </h4>
 
     {!! view_render_event('admin.products.view.attributes.view.before', ['product' => $product]) !!}
+    
+    <!-- Attributes Listing -->
+    <div>
+        <!-- Default Attributes --> 
+        <x-admin::attributes.view
+            :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
+                'entity_type' => 'products',
+                ['code', 'IN', ['SKU', 'price', 'quantity', 'status']]
+            ])->sortBy('sort_order')"
+            :entity="$product"
+            :url="route('admin.products.update', $product->id)"   
+            :allow-edit="true"
+        />
 
-    <x-admin::attributes.view
-        :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
-            'entity_type' => 'products',
-            ['code', 'IN', ['SKU', 'price', 'quantity', 'status']]
-        ])->sortBy('sort_order')"
-        :entity="$product"
-        :url="route('admin.products.update', $product->id)"   
-        :allow-edit="true"
-    />
-
+        <!-- Custom Attributes --> 
+        <x-admin::attributes.view
+            :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
+                'entity_type' => 'products',
+                ['code', 'NOTIN', ['SKU', 'price', 'quantity', 'status']]
+            ])->sortBy('sort_order')"
+            :entity="$product"
+            :url="route('admin.products.update', $product->id)"   
+            :allow-edit="true"
+        />
+    </div>
+    
     {!! view_render_event('admin.products.view.attributes.view.after', ['product' => $product]) !!}
 </div>