resolved conflicts.

krayin · Nov 7, 2024 · b442ace · b442ace
2 parents 4848b68 + 108e423
commit b442ace
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 13 deletions.
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Lead/LeadController.php b/packages/Webkul/Admin/src/Http/Controllers/Lead/LeadController.php
@@ -362,11 +362,9 @@ public function massUpdate(MassUpdateRequest $massUpdateRequest): JsonResponse
             foreach ($leads as $lead) {
                 Event::dispatch('lead.update.before', $lead->id);
 
-                $this->leadRepository->update(
-                    ['lead_pipeline_stage_id' => $massUpdateRequest->input('value')],
-                    $lead->id,
-                    ['lead_pipeline_stage_id']
-                );
+                $lead = $this->leadRepository->find($lead->id);
+
+                $lead?->update(['lead_pipeline_stage_id' => $massUpdateRequest->input('value')]);
 
                 Event::dispatch('lead.update.before', $lead->id);
             }
@@ -376,7 +374,7 @@ public function massUpdate(MassUpdateRequest $massUpdateRequest): JsonResponse
             ]);
         } catch (\Exception $th) {
             return response()->json([
-                'message' => trans('admin::app.leads.destroy-failed'),
+                'message' => trans('admin::app.leads.update-failed'),
             ], 400);
         }
     }

diff --git a/packages/Webkul/Admin/src/Resources/assets/css/app.css b/packages/Webkul/Admin/src/Resources/assets/css/app.css
@@ -622,3 +622,11 @@
 .tox .tox-toolbar__group:last-child button[aria-disabled="true"] {
     @apply cursor-not-allowed opacity-50;
 }
+
+.tox .tox-toolbar__group:last-child button {
+    @apply !bg-transparent;
+}
+
+.tox .tox-toolbar__group:last-child button:hover {
+    @apply border-0 !bg-[#3389ec] text-white shadow-none;
+}
diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1654,6 +1654,7 @@
     'leads' => [
         'create-success'    => 'تم إنشاء العميل المحتمل بنجاح.',
         'update-success'    => 'تم تحديث العميل المحتمل بنجاح.',
+        'update-failed'     => 'Leads can not be deleted.',
         'destroy-success'   => 'تم حذف العميل المحتمل بنجاح.',
         'destroy-failed'    => 'لا يمكن حذف العميل المحتمل.',
 

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1653,7 +1653,8 @@
 
     'leads' => [
         'create-success'    => 'Lead created successfully.',
-        'update-success'    => 'Lead updated successfully.',
+        'update-success'    => 'Leads updated successfully.',
+        'update-failed'     => 'Leads can not be deleted.',
         'destroy-success'   => 'Lead deleted successfully.',
         'destroy-failed'    => 'Lead can not be deleted.',
 

diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@@ -1654,6 +1654,7 @@
     'leads' => [
         'create-success'    => 'Lead creado exitosamente.',
         'update-success'    => 'Lead actualizado exitosamente.',
+        'update-failed'     => 'No se pueden eliminar los clientes potenciales.',
         'destroy-success'   => 'Lead eliminado exitosamente.',
         'destroy-failed'    => 'No se puede eliminar el lead.',
 

diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -1654,6 +1654,7 @@
     'leads' => [
         'create-success'    => 'سرنخ با موفقیت ایجاد شد.',
         'update-success'    => 'سرنخ با موفقیت به‌روزرسانی شد.',
+        'update-failed'     => 'سرنخ‌ها قابل حذف نیستند.',
         'destroy-success'   => 'سرنخ با موفقیت حذف شد.',
         'destroy-failed'    => 'سرنخ قابل حذف نیست.',
 

diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -1654,6 +1654,7 @@
     'leads' => [
         'create-success'    => 'Lead başarıyla oluşturuldu.',
         'update-success'    => 'Lead başarıyla güncellendi.',
+        'update-failed'     => 'Potansiyel müşteriler silinemez.',
         'destroy-success'   => 'Lead başarıyla silindi.',
         'destroy-failed'    => 'Lead silinemedi.',
 

diff --git a/packages/Webkul/Admin/src/Resources/views/activities/index.blade.php b/packages/Webkul/Admin/src/Resources/views/activities/index.blade.php
@@ -306,7 +306,7 @@ class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200
 
                 data() {
                     return {
-                        viewType: (new URLSearchParams(window.location.search))?.get('view-type') || 'table',
+                        viewType: '{{ request('view-type') }}' || 'table',
                     };
                 },
 

diff --git a/packages/Webkul/Admin/src/Resources/views/components/layouts/sidebar/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/layouts/sidebar/index.blade.php
@@ -1,6 +1,6 @@
 <div
     ref="sidebar"
-    class="duration-80 fixed top-[60px] z-[10002] h-full w-[200px] border-r border-gray-200 bg-white pt-4 transition-all group-[.sidebar-collapsed]/container:w-[70px] dark:border-gray-800 dark:bg-gray-900 max-lg:hidden"
+    class="duration-80 fixed top-[60px] z-[10002] h-full w-[200px] border-gray-200 bg-white pt-4 transition-all group-[.sidebar-collapsed]/container:w-[70px] dark:border-gray-800 dark:bg-gray-900 max-lg:hidden ltr:border-r rtl:border-l"
     @mouseover="handleMouseOver"
     @mouseleave="handleMouseLeave"
 >
@@ -36,7 +36,7 @@ class="flex gap-2 p-1.5 items-center cursor-pointer hover:rounded-lg {{ $menuIte
                             class="absolute top-0 hidden flex-col bg-gray-100 ltr:left-[200px] rtl:right-[199px]"
                             :class="[isMenuActive && (hoveringMenu == '{{$menuItem->getKey()}}') ? '!flex' : 'hidden']"
                         >
-                            <div class="sidebar-rounded fixed z-[1000] h-full min-w-[140px] max-w-max border-r bg-white pt-4 after:-right-[30px] dark:border-gray-800 dark:bg-gray-900 max-lg:hidden">
+                            <div class="sidebar-rounded fixed z-[1000] h-full min-w-[140px] max-w-max bg-white pt-4 after:-right-[30px] dark:border-gray-800 dark:bg-gray-900 max-lg:hidden ltr:border-r rtl:border-x">
                                 <div class="journal-scroll h-[calc(100vh-100px)] overflow-hidden">
                                     <nav class="grid w-full gap-2">
                                         @foreach ($menuItem->getChildren() as $subMenuItem)
@@ -60,4 +60,4 @@ class="flex gap-2.5 p-2 items-center cursor-pointer hover:rounded-lg {{ $subMenu
             @endforeach
         </nav>
     </div>
-</div>
+</div>
diff --git a/public/admin/build/assets/app-1b23879e.css b/public/admin/build/assets/app-1b23879e.css
diff --git a/public/admin/build/assets/app-62037ade.css b/public/admin/build/assets/app-62037ade.css
diff --git a/public/admin/build/manifest.json b/public/admin/build/manifest.json
@@ -220,7 +220,7 @@
     "src": "node_modules/vue-cal/dist/i18n/zh-hk.es.js"
   },
   "src/Resources/assets/css/app.css": {
-    "file": "assets/app-1b23879e.css",
+    "file": "assets/app-62037ade.css",
     "isEntry": true,
     "src": "src/Resources/assets/css/app.css"
   },