From 91af3c3d4a7d98891aeb9475d8005e42baf55b64 Mon Sep 17 00:00:00 2001
From: Suraj Kashyap <suraj.kashyap370@webkul.in>
Date: Mon, 28 Jul 2025 11:53:32 +0530
Subject: [PATCH] Issue #2285 has been fixed.

---
 .../Admin/src/DataGrids/Lead/LeadDataGrid.php |  9 +++++
 .../Products/ProductController.php            |  4 +-
 .../Admin/src/Resources/lang/ar/app.php       |  2 +
 .../Admin/src/Resources/lang/en/app.php       |  2 +
 .../Admin/src/Resources/lang/es/app.php       |  2 +
 .../Admin/src/Resources/lang/fa/app.php       |  2 +
 .../Admin/src/Resources/lang/pt_BR/app.php    |  2 +
 .../Admin/src/Resources/lang/tr/app.php       |  2 +
 .../Admin/src/Resources/lang/vi/app.php       |  2 +
 .../attributes/edit/lookup.blade.php          |  2 +-
 .../views/leads/common/contact.blade.php      |  2 +-
 .../views/leads/common/products.blade.php     |  7 ++--
 .../src/Resources/views/leads/edit.blade.php  | 38 +++++++++----------
 13 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/Lead/LeadDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Lead/LeadDataGrid.php
index 21bccde1d..2f1b50b53 100644
--- a/packages/Webkul/Admin/src/DataGrids/Lead/LeadDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/Lead/LeadDataGrid.php
@@ -291,6 +291,15 @@ public function prepareActions(): void
             ]);
         }
 
+        if (bouncer()->hasPermission('leads.edit')) {
+            $this->addAction([
+                'icon'   => 'icon-edit',
+                'title'  => trans('admin::app.leads.index.datagrid.edit'),
+                'method' => 'GET',
+                'url'    => fn ($row) => route('admin.leads.edit', $row->id),
+            ]);
+        }
+
         if (bouncer()->hasPermission('leads.delete')) {
             $this->addAction([
                 'icon'   => 'icon-delete',
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Products/ProductController.php b/packages/Webkul/Admin/src/Http/Controllers/Products/ProductController.php
index 58edcf208..4104a2e43 100644
--- a/packages/Webkul/Admin/src/Http/Controllers/Products/ProductController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Products/ProductController.php
@@ -153,9 +153,7 @@ public function search(): JsonResource
     {
         $products = $this->productRepository
             ->pushCriteria(app(RequestCriteria::class))
-            ->orderBy('created_at', 'desc')
-            ->take(5)
-            ->get();
+            ->all();
 
         return ProductResource::collection($products);
     }
diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 294eadd0c..104e9c767 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1938,6 +1938,8 @@
                 'created-at'          => 'تم الإنشاء في',
                 'no'                  => 'لا',
                 'yes'                 => 'نعم',
+                'view'                => 'عرض',
+                'edit'                => 'تعديل',
                 'delete'              => 'حذف',
                 'mass-delete'         => 'حذف جماعي',
                 'mass-update'         => 'تحديث جماعي',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 9f958c278..c8ff93506 100644
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1943,6 +1943,8 @@
                 'created-at'          => 'Created At',
                 'no'                  => 'No',
                 'yes'                 => 'Yes',
+                'view'                => 'View',
+                'edit'                => 'Edit',
                 'delete'              => 'Delete',
                 'mass-delete'         => 'Mass Delete',
                 'mass-update'         => 'Mass Update',
diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php
index ffce5c167..d9c27a0c7 100644
--- a/packages/Webkul/Admin/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@@ -1943,6 +1943,8 @@
                 'created-at'          => 'Creado En',
                 'no'                  => 'No',
                 'yes'                 => 'Sí',
+                'view'                => 'Ver',
+                'edit'                => 'Editar',
                 'delete'              => 'Eliminar',
                 'mass-delete'         => 'Eliminar en Masa',
                 'mass-update'         => 'Actualizar en Masa',
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index fd8232240..8e15b863d 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -1945,6 +1945,8 @@
                 'created-at'          => 'تاریخ ایجاد',
                 'no'                  => 'خیر',
                 'yes'                 => 'بله',
+                'view'                => 'مشاهده',
+                'edit'                => 'ویرایش',
                 'delete'              => 'حذف',
                 'mass-delete'         => 'حذف گروهی',
                 'mass-update'         => 'به‌روزرسانی گروهی',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index ac6cbde13..f173a14f7 100644
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -1829,6 +1829,8 @@
                 'created-at'          => 'Criado em',
                 'no'                  => 'Não',
                 'yes'                 => 'Sim',
+                'view'                => 'Visualizar',
+                'edit'                => 'Editar',
                 'delete'              => 'Excluir',
                 'mass-delete'         => 'Excluir em Massa',
                 'mass-update'         => 'Atualizar em Massa',
diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
index 065f2048a..03e04b694 100644
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -1944,6 +1944,8 @@
                 'created-at'          => 'Oluşturulma Tarihi',
                 'no'                  => 'Hayır',
                 'yes'                 => 'Evet',
+                'view'                => 'Görüntüle',
+                'edit'                => 'Düzenle',
                 'delete'              => 'Sil',
                 'mass-delete'         => 'Toplu Sil',
                 'mass-update'         => 'Toplu Güncelle',
diff --git a/packages/Webkul/Admin/src/Resources/lang/vi/app.php b/packages/Webkul/Admin/src/Resources/lang/vi/app.php
index 610813644..0acbbdd10 100644
--- a/packages/Webkul/Admin/src/Resources/lang/vi/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/vi/app.php
@@ -1839,6 +1839,8 @@
                 'stage'               => 'Giai Đoạn',
                 'subject'             => 'Chủ Đề',
                 'tag-name'            => 'Tên Thẻ',
+                'view'                => 'Xem',
+                'edit'                => 'Chỉnh sửa',
                 'yes'                 => 'Có',
             ],
 
diff --git a/packages/Webkul/Admin/src/Resources/views/components/attributes/edit/lookup.blade.php b/packages/Webkul/Admin/src/Resources/views/components/attributes/edit/lookup.blade.php
index f24aa27fe..d0ae8a9e6 100644
--- a/packages/Webkul/Admin/src/Resources/views/components/attributes/edit/lookup.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/components/attributes/edit/lookup.blade.php
@@ -41,7 +41,7 @@ class="relative inline-block w-full"
             >
                 <!-- Input Container -->
                 <div
-                    class="relative flex items-center justify-between rounded border border-gray-200 p-2 hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:text-gray-300"
+                    class="relative flex items-center justify-between rounded border border-gray-200 p-2 hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300"
                     :class="{
                         'bg-gray-50': isDisabled,
                     }"
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/common/contact.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/common/contact.blade.php
index 6f89f8d3b..7ab239454 100644
--- a/packages/Webkul/Admin/src/Resources/views/leads/common/contact.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/leads/common/contact.blade.php
@@ -138,4 +138,4 @@
             }
         });
     </script>
-@endPushOnce
\ No newline at end of file
+@endPushOnce
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/common/products.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/common/products.blade.php
index 9e08493f0..e13e49abc 100644
--- a/packages/Webkul/Admin/src/Resources/views/leads/common/products.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/leads/common/products.blade.php
@@ -12,7 +12,7 @@
         <div class="flex flex-col gap-4">
             {!! view_render_event('admin.leads.create.products.form_controls.table.before') !!}
 
-            <div class="block w-full overflow-x-auto">
+            <div class="block w-full">
                 <!-- Table -->
                 <x-admin::table>
                     {!! view_render_event('admin.leads.create.products.form_controls.table.head.before') !!}
@@ -93,6 +93,7 @@ class="flex max-w-max items-center gap-2 text-brandColor"
                         ::src="src"
                         ::name="`${inputName}[name]`"
                         ::params="params"
+                        :preload="false"
                         :placeholder="trans('admin::app.leads.common.products.product-name')"
                         @on-selected="(product) => addProduct(product)"
                         ::value="{ id: product.product_id, name: product.name }"
@@ -250,7 +251,7 @@ class="icon-delete cursor-pointer text-2xl"
 
                     this.product.name = result.name;
 
-                    this.product.price = result.price;
+                    this.product.price = result.price ?? 0;
 
                     this.product.quantity = result.quantity ?? 1;
                 },
@@ -266,4 +267,4 @@ class="icon-delete cursor-pointer text-2xl"
             }
         });
     </script>
-@endPushOnce
\ No newline at end of file
+@endPushOnce
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/edit.blade.php
index 43b1d56af..4e2e9a193 100644
--- a/packages/Webkul/Admin/src/Resources/views/leads/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/leads/edit.blade.php
@@ -7,15 +7,15 @@
     {!! view_render_event('admin.leads.edit.form_controls.before', ['lead' => $lead]) !!}
 
     <!-- Edit Lead Form -->
-    <x-admin::form         
+    <x-admin::form
         :action="route('admin.leads.update', $lead->id)"
         method="PUT"
     >
         <div class="flex flex-col gap-4">
             <div class="flex items-center justify-between rounded-lg border border-gray-200 bg-white px-4 py-2 text-sm dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300">
                 <div class="flex flex-col gap-2">
-                    <x-admin::breadcrumbs 
-                        name="leads.edit" 
+                    <x-admin::breadcrumbs
+                        name="leads.edit"
                         :entity="$lead"
                     />
 
@@ -57,7 +57,7 @@ class="primary-button"
     {!! view_render_event('admin.leads.edit.form_controls.after', ['lead' => $lead]) !!}
 
     @pushOnce('scripts')
-        <script 
+        <script
             type="text/x-template"
             id="v-lead-edit-template"
         >
@@ -87,8 +87,8 @@ class="primary-button"
                     {!! view_render_event('admin.leads.edit.lead_details.before', ['lead' => $lead]) !!}
 
                     <!-- Details section -->
-                    <div 
-                        class="flex flex-col gap-4" 
+                    <div
+                        class="flex flex-col gap-4"
                         id="lead-details"
                     >
                         <div class="flex flex-col gap-1">
@@ -138,7 +138,7 @@ class="flex flex-col gap-4"
                                         :entity="$lead"
                                     />
                                 </div>
-                                    
+
                                 <div class="w-full">
                                     <x-admin::attributes
                                         :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
@@ -166,8 +166,8 @@ class="flex flex-col gap-4"
                     {!! view_render_event('admin.leads.edit.contact_person.before', ['lead' => $lead]) !!}
 
                     <!-- Contact Person -->
-                    <div 
-                        class="flex flex-col gap-4" 
+                    <div
+                        class="flex flex-col gap-4"
                         id="contact-person"
                     >
                         <div class="flex flex-col gap-1">
@@ -191,8 +191,8 @@ class="flex flex-col gap-4"
                     {!! view_render_event('admin.leads.edit.contact_person.products.before', ['lead' => $lead]) !!}
 
                     <!-- Product Section -->
-                    <div 
-                        class="flex flex-col gap-4" 
+                    <div
+                        class="flex flex-col gap-4"
                         id="products"
                     >
                         <div class="flex flex-col gap-1">
@@ -213,7 +213,7 @@ class="flex flex-col gap-4"
 
                     {!! view_render_event('admin.leads.edit.contact_person.products.after', ['lead' => $lead]) !!}
                 </div>
-                
+
                 {!! view_render_event('admin.leads.form_controls.after') !!}
             </div>
         </script>
@@ -225,10 +225,10 @@ class="flex flex-col gap-4"
                 data() {
                     return {
                         activeTab: 'lead-details',
-                        
-                        lead:  @json($lead),  
 
-                        person:  @json($lead->person),  
+                        lead:  @json($lead),
+
+                        person:  @json($lead->person),
 
                         products: @json($lead->products),
 
@@ -243,9 +243,9 @@ class="flex flex-col gap-4"
                 methods: {
                     /**
                      * Scroll to the section.
-                     * 
+                     *
                      * @param {String} tabId
-                     * 
+                     *
                      * @returns {void}
                      */
                     scrollToSection(tabId) {
@@ -266,5 +266,5 @@ class="flex flex-col gap-4"
                 scroll-behavior: smooth;
             }
         </style>
-    @endPushOnce    
-</x-admin::layouts>
\ No newline at end of file
+    @endPushOnce
+</x-admin::layouts>