diff --git a/packages/Webkul/Admin/src/Resources/views/contacts/persons/view/organization.blade.php b/packages/Webkul/Admin/src/Resources/views/contacts/persons/view/organization.blade.php
index 623a6d393..14a3727b0 100644
--- a/packages/Webkul/Admin/src/Resources/views/contacts/persons/view/organization.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/contacts/persons/view/organization.blade.php
@@ -3,14 +3,13 @@
@if ($person?->organization)
- About Organization
+ @lang('admin::app.contacts.persons.view.about-organization')
-
-
+ >
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php
deleted file mode 100644
index 8cb9ff15e..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('admin::errors.illustrated-layout')
-
-@section('title', __('Unauthorized'))
-@section('code', '401')
-@section('message', __('You don\'t have necessary permissions to perform this action.'))
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php
deleted file mode 100644
index 9d75719be..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('admin::errors.illustrated-layout')
-
-@section('title', __('Forbidden'))
-@section('code', '403')
-@section('message', __($exception->getMessage() ?: 'You are forbidden to do this action.'))
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
deleted file mode 100644
index f0f35bf55..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('admin::errors.illustrated-layout')
-
-@section('title', __('Page Not Found'))
-@section('code', '404')
-@section('message', __('We were not able to find the page you are looking for.'))
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/419.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/419.blade.php
deleted file mode 100644
index 9c8c64d1f..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/419.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('admin::errors.illustrated-layout')
-
-@section('title', __('Page Expired'))
-@section('code', '419')
-@section('message', __('This page is expired.'))
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/429.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/429.blade.php
deleted file mode 100644
index ed03e02af..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/429.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('admin::errors.illustrated-layout')
-
-@section('title', __('Too Many Requests'))
-@section('code', '429')
-@section('message', __('You have too many requests.'))
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php
deleted file mode 100644
index 7b73b9c22..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('admin::errors.illustrated-layout')
-
-@section('title', __('Server Error'))
-@section('code', '500')
-@section('message', __('Something went wrong, please try again later.'))
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
deleted file mode 100644
index 9bef44f02..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('admin::errors.illustrated-layout')
-
-@section('title', __('Service Unavailable'))
-@section('code', '503')
-@section('message', __('Service is currently unavailable, please try again later.'))
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/illustrated-layout.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/illustrated-layout.blade.php
deleted file mode 100644
index a7c7c0b49..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/illustrated-layout.blade.php
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
-
-
-
@yield('title')
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@yield('code') - @yield('title')
-
-
@yield('message')
-
-
-
-
{{ __('Few of the links which may help you to get back on the track -') }}
-
-
-
-
-
. . .
-
-
© Copyright 2021 Krayin, All right reserved.
-
-
-
-
-
-
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/index.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/index.blade.php
new file mode 100644
index 000000000..3dbc17e80
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/errors/index.blade.php
@@ -0,0 +1,70 @@
+
+
+
+ @lang("admin::app.errors.{$errorCode}.title")
+
+
+
+
+
+
+
+
+
+ {{ $errorCode }}
+
+
+
+ @lang("admin::app.errors.{$errorCode}.description")
+
+
+
+
+
+ @lang('admin::app.errors.support', [
+ 'link' => 'mailto:support@example.com',
+ 'email' => 'support@example.com',
+ 'class' => 'font-semibold text-blue-600 transition-all hover:underline',
+ ])
+
+
+
+
+
+
+
+
+
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/layout.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/layout.blade.php
deleted file mode 100644
index 3543ddaef..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/layout.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
@yield('title')
-
-
-
-
-
-
-
-
-
-
-
-
-
- @yield('message')
-
-
-
-
-
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/minimal.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/minimal.blade.php
deleted file mode 100644
index 047bde2c8..000000000
--- a/packages/Webkul/Admin/src/Resources/views/errors/minimal.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
@yield('title')
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @yield('code')
-
-
-
- @yield('message')
-
-
-
-
-
-
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 1015b993a..c5e3e3256 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
@@ -67,12 +67,15 @@
{!! view_render_event('admin.leads.create.products.form_controls.table.after') !!}
-
- + @lang('admin::app.leads.common.products.add-more')
-
+
+
+ @lang('admin::app.leads.common.products.add-more')
+
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/index/kanban.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/index/kanban.blade.php
index 140f45d28..ae76edaed 100644
--- a/packages/Webkul/Admin/src/Resources/views/leads/index/kanban.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/leads/index/kanban.blade.php
@@ -289,8 +289,8 @@ class="rounded-xl bg-gray-200 px-2 py-1 text-xs font-medium dark:bg-gray-800"
this.get()
.then(response => {
- for (let [stageId, data] of Object.entries(response.data)) {
- this.stageLeads[stageId] = data;
+ for (let [sortOrder, data] of Object.entries(response.data)) {
+ this.stageLeads[sortOrder] = data;
}
});
@@ -299,9 +299,9 @@ class="rounded-xl bg-gray-200 px-2 py-1 text-xs font-medium dark:bg-gray-800"
}
this.get()
- .then(response => {
- for (let [stageId, data] of Object.entries(response.data)) {
- this.stageLeads[stageId] = data;
+ .then(response => {
+ for (let [sortOrder, data] of Object.entries(response.data)) {
+ this.stageLeads[sortOrder] = data;
}
});
},
@@ -377,8 +377,8 @@ class="rounded-xl bg-gray-200 px-2 py-1 text-xs font-medium dark:bg-gray-800"
this.get()
.then(response => {
- for (let [stageId, data] of Object.entries(response.data)) {
- this.stageLeads[stageId] = data;
+ for (let [sortOrder, data] of Object.entries(response.data)) {
+ this.stageLeads[sortOrder] = data;
}
});
},
@@ -397,8 +397,8 @@ class="rounded-xl bg-gray-200 px-2 py-1 text-xs font-medium dark:bg-gray-800"
this.get()
.then(response => {
- for (let [stageId, data] of Object.entries(response.data)) {
- this.stageLeads[stageId] = data;
+ for (let [sortOrder, data] of Object.entries(response.data)) {
+ this.stageLeads[sortOrder] = data;
}
});
},
@@ -412,13 +412,13 @@ class="rounded-xl bg-gray-200 px-2 py-1 text-xs font-medium dark:bg-gray-800"
append(params) {
this.get(params)
.then(response => {
- for (let [stageId, data] of Object.entries(response.data)) {
- if (! this.stageLeads[stageId]) {
- this.stageLeads[stageId] = data;
+ for (let [sortOrder, data] of Object.entries(response.data)) {
+ if (! this.stageLeads[sortOrder]) {
+ this.stageLeads[sortOrder] = data;
} else {
- this.stageLeads[stageId].leads.data = this.stageLeads[stageId].leads.data.concat(data.leads.data);
+ this.stageLeads[sortOrder].leads.data = this.stageLeads[sortOrder].leads.data.concat(data.leads.data);
- this.stageLeads[stageId].leads.meta = data.leads.meta;
+ this.stageLeads[sortOrder].leads.meta = data.leads.meta;
}
}
});
@@ -432,17 +432,21 @@ class="rounded-xl bg-gray-200 px-2 py-1 text-xs font-medium dark:bg-gray-800"
* @returns {void}
*/
updateStage: function (stage, event) {
+ if (event.moved) {
+ return;
+ }
+
if (event.removed) {
stage.lead_value = parseFloat(stage.lead_value) - parseFloat(event.removed.element.lead_value);
- this.stageLeads[stage.id].leads.meta.total = this.stageLeads[stage.id].leads.meta.total - 1;
+ this.stageLeads[stage.sort_order].leads.meta.total = this.stageLeads[stage.sort_order].leads.meta.total - 1;
return;
}
stage.lead_value = parseFloat(stage.lead_value) + parseFloat(event.added.element.lead_value);
- this.stageLeads[stage.id].leads.meta.total = this.stageLeads[stage.id].leads.meta.total + 1;
+ this.stageLeads[stage.sort_order].leads.meta.total = this.stageLeads[stage.sort_order].leads.meta.total + 1;
this.$axios
.put("{{ route('admin.leads.stage.update', 'replace') }}".replace('replace', event.added.element.id), {
@@ -464,20 +468,20 @@ class="rounded-xl bg-gray-200 px-2 py-1 text-xs font-medium dark:bg-gray-800"
* @returns {void}
*/
handleScroll(stage, event) {
- const bottom = event.target.scrollHeight - event.target.scrollTop === event.target.clientHeight
+ const bottom = event.target.scrollHeight - event.target.scrollTop === event.target.clientHeight;
if (! bottom) {
return;
}
- if (this.stageLeads[stage.id].leads.meta.current_page == this.stageLeads[stage.id].leads.meta.last_page) {
+ if (this.stageLeads[stage.sort_order].leads.meta.current_page == this.stageLeads[stage.sort_order].leads.meta.last_page) {
return;
}
this.append({
pipeline_stage_id: stage.id,
pipeline_id: stage.lead_pipeline_id,
- page: this.stageLeads[stage.id].leads.meta.current_page + 1,
+ page: this.stageLeads[stage.sort_order].leads.meta.current_page + 1,
limit: 10,
});
},
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/index/kanban/filter.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/index/kanban/filter.blade.php
index 8862a0966..a45c31cdd 100644
--- a/packages/Webkul/Admin/src/Resources/views/leads/index/kanban/filter.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/leads/index/kanban/filter.blade.php
@@ -188,7 +188,7 @@ class="cursor-pointer rounded-md border px-3 py-2 text-center text-sm font-mediu
type="date"
:name="`${column.index}[from]`"
value=""
- class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400"
+ class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 ltr:pr-8 rtl:pl-8"
:placeholder="column.label"
:ref="`${column.index}[from]`"
@change="addFilter(
@@ -204,7 +204,7 @@ class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-60
type="date"
:name="`${column.index}[to]`"
value=""
- class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400"
+ class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 ltr:pr-8 rtl:pl-8"
:placeholder="column.label"
:ref="`${column.index}[from]`"
@change="addFilter(
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php
index a0e9ebbd8..451d62016 100644
--- a/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php
@@ -8,7 +8,7 @@
{!! view_render_event('admin.leads.view.left.before', ['lead' => $lead]) !!}
-
+
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view/products.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view/products.blade.php
index 217a4044e..354528b47 100644
--- a/packages/Webkul/Admin/src/Resources/views/leads/view/products.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/leads/view/products.blade.php
@@ -65,12 +65,15 @@
-
- + @lang('admin::app.leads.view.products.add-more')
-
+
+
+ @lang('admin::app.leads.view.products.add-more')
+
{!! view_render_event('admin.leads.view.products.table.add_more.after', ['lead' => $lead]) !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/mail/index.blade.php b/packages/Webkul/Admin/src/Resources/views/mail/index.blade.php
index 9f7264290..5ad4fdbbc 100644
--- a/packages/Webkul/Admin/src/Resources/views/mail/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/mail/index.blade.php
@@ -28,7 +28,7 @@
- {!! view_render_event('admin.mail.create.breadcrumbs.before') !!}
+ {!! view_render_event('admin.mail.create.compose_mail_btn.before') !!}
@if (bouncer()->hasPermission('mail.compose'))
@@ -41,7 +41,7 @@ class="primary-button"
@endif
- {!! view_render_event('admin.mail.create.breadcrumbs.after') !!}
+ {!! view_render_event('admin.mail.create.compose_mail_btn.after') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/mail/view.blade.php b/packages/Webkul/Admin/src/Resources/views/mail/view.blade.php
index c4f8cb9ac..b1dcb1eff 100644
--- a/packages/Webkul/Admin/src/Resources/views/mail/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/mail/view.blade.php
@@ -329,7 +329,7 @@ class="flex cursor-pointer items-center gap-2 text-brandColor"
{!! view_render_event('admin.mail.view.form.before', ['email' => $email]) !!}
-
+
-
+
@lang('admin::app.mail.view.cc')
@lang('admin::app.mail.view.bcc')
@@ -446,13 +446,13 @@ class="cursor-pointer font-medium hover:underline"
-
+ {{--
--}}
@@ -634,12 +650,15 @@ class="px-4 py-2 text-gray-800 dark:text-gray-300"
@if (bouncer()->hasPermission('contacts.persons.create'))
-
- + @lang('admin::app.mail.view.add-new-contact')
-
+
+
+ @lang('admin::app.mail.view.add-new-contact')
+
@endif
@@ -658,7 +677,7 @@ class="flex cursor-pointer items-center gap-2 border-t border-gray-200 p-2 text-
-
+
@if (bouncer()->hasPermission('leads.create'))
-
- + @lang('admin::app.mail.view.add-new-lead')
-
+
+
+ @lang('admin::app.mail.view.add-new-lead')
+
@endif
@@ -872,46 +894,48 @@ class="flex cursor-pointer items-center gap-2 border-t border-gray-200 p-2 text-
>
{!! view_render_event('admin.mail.view.contact_form.before', ['email' => $email]) !!}
-
-
-
+
+
+
+
+
+ @lang('admin::app.mail.view.create-new-contact')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{!! view_render_event('admin.mail.view.contact_form.after', ['email' => $email]) !!}
@@ -922,179 +946,189 @@ class="primary-button"
>
{!! view_render_event('admin.mail.view.lead_form.before', ['email' => $email]) !!}
-
-