From 040634e7461497c89c640484e677277b9d051e20 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 22 Nov 2022 16:19:33 +0500 Subject: [PATCH 1/4] chat --- .../business.blade.php | 0 .../{application => account}/company.blade.php | 0 .../views/admin/application_preview.blade.php | 2 +- resources/views/admin/messages.blade.php | 18 ++++++++++-------- resources/views/admin/preview.blade.php | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) rename resources/views/admin/{application => account}/business.blade.php (100%) rename resources/views/admin/{application => account}/company.blade.php (100%) diff --git a/resources/views/admin/application/business.blade.php b/resources/views/admin/account/business.blade.php similarity index 100% rename from resources/views/admin/application/business.blade.php rename to resources/views/admin/account/business.blade.php diff --git a/resources/views/admin/application/company.blade.php b/resources/views/admin/account/company.blade.php similarity index 100% rename from resources/views/admin/application/company.blade.php rename to resources/views/admin/account/company.blade.php diff --git a/resources/views/admin/application_preview.blade.php b/resources/views/admin/application_preview.blade.php index b158fae9..cdd5609e 100644 --- a/resources/views/admin/application_preview.blade.php +++ b/resources/views/admin/application_preview.blade.php @@ -273,7 +273,7 @@ class="bi bi-ticket-perforated" viewBox="0 0 16 16">
- @include('admin.application.'.$application->account->type,['account'=>$application->account]) + @include('admin.account.'.$application->account->type,['account'=>$application->account])
diff --git a/resources/views/admin/messages.blade.php b/resources/views/admin/messages.blade.php index b903b548..59421b05 100755 --- a/resources/views/admin/messages.blade.php +++ b/resources/views/admin/messages.blade.php @@ -59,14 +59,16 @@ font-weight: bold; } +
- +
@@ -78,7 +80,7 @@
- {{ trans('app.last_updates.back') }} +
diff --git a/resources/views/admin/preview.blade.php b/resources/views/admin/preview.blade.php index 008773fd..af1c4c32 100644 --- a/resources/views/admin/preview.blade.php +++ b/resources/views/admin/preview.blade.php @@ -20,7 +20,7 @@
- @include('admin.application.'.$account->type) + @include('admin.account.'.$account->type)
From fae5062fd29dd3b4776ba2570b78948d3d3861e6 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 22 Nov 2022 16:33:24 +0500 Subject: [PATCH 2/4] chat --- resources/views/admin/messages.blade.php | 35 ++++++++++-------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/resources/views/admin/messages.blade.php b/resources/views/admin/messages.blade.php index 59421b05..0399b41b 100755 --- a/resources/views/admin/messages.blade.php +++ b/resources/views/admin/messages.blade.php @@ -65,31 +65,24 @@ - {{ trans('app.last_updates.back') }} -
- -
-
-
-
{{ trans('app.last_updates.topic') }}: {{ $ticket->title }}
-
{{ trans('app.ticket.category') }}: {{ $ticket->category->name ?? 'N/A' }}
+
+
+
+
{{ trans('app.last_updates.topic') }}: {{ $ticket->title }}
+
{{ trans('app.ticket.category') }}: {{ $ticket->category->name ?? 'N/A' }}
+
+
+
-
-
-
-
-
- - - -
- -
- +
+
+ +
+
-
+
From dee8a0ebf8e4609a92a4493a19ca62a083e1b0ec Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 22 Nov 2022 16:49:51 +0500 Subject: [PATCH 3/4] chat --- resources/views/vendor/backpack/crud/columns/badge.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/vendor/backpack/crud/columns/badge.blade.php b/resources/views/vendor/backpack/crud/columns/badge.blade.php index aba425a8..e1c27d27 100644 --- a/resources/views/vendor/backpack/crud/columns/badge.blade.php +++ b/resources/views/vendor/backpack/crud/columns/badge.blade.php @@ -7,6 +7,8 @@ {{ trans('app.application.approved') }} @elseif($entry['state'] == 'archive') {{ trans('app.application.archived') }} + @elseif($entry['state'] == 'refine') + {{ trans('app.application.refine') }} @elseif($entry['state'] == 'draft') {{ trans('app.application.draft') }} @endif From cbb2d14a39de7083f93fb0c932f77a903b622238 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 22 Nov 2022 16:53:11 +0500 Subject: [PATCH 4/4] chat --- .../vendor/backpack/base/dashboard.blade.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/views/vendor/backpack/base/dashboard.blade.php b/resources/views/vendor/backpack/base/dashboard.blade.php index 08c8e8e9..7b8f3d6a 100644 --- a/resources/views/vendor/backpack/base/dashboard.blade.php +++ b/resources/views/vendor/backpack/base/dashboard.blade.php @@ -18,7 +18,7 @@