From 2c5f68a6f0754aacaaafdb73c556b74ab97bbdaa Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 19 Nov 2022 11:41:20 +0500 Subject: [PATCH] application status draft --- .../Admin/ApplicationCrudController.php | 5 +- lang/en/app.php | 13 +- .../views/admin/application_preview.blade.php | 282 +++++++++--------- 3 files changed, 158 insertions(+), 142 deletions(-) diff --git a/app/Http/Controllers/Admin/ApplicationCrudController.php b/app/Http/Controllers/Admin/ApplicationCrudController.php index 5dcf6b12..cc424c75 100755 --- a/app/Http/Controllers/Admin/ApplicationCrudController.php +++ b/app/Http/Controllers/Admin/ApplicationCrudController.php @@ -138,8 +138,9 @@ protected function setupListOperation() } public function accept($id){ - $entry = Application::find($id); - $entry->accepted_by = backpack_user()->email; + $entry = Application::findOrfail($id); + $entry->accepted_by = backpack_user()->name; + $entry->state = 'accepted'; $entry->accepted_date = Carbon::now(); $entry->save(); return redirect()->back(); diff --git a/lang/en/app.php b/lang/en/app.php index 346a6019..51515302 100755 --- a/lang/en/app.php +++ b/lang/en/app.php @@ -63,9 +63,18 @@ 'upload_success' => 'Uploaded successfully', 'upload_failure' => 'File upload failed', 'upload_max_size' => 'Max size exceeded', - 'created_at' => 'Created at' + 'created_at' => 'Created at', + + 'accept_application' => 'Accepted application', + 'approve' => 'Approve', + 'accepted' => 'Accepted', + 'attachments' => 'Attachments', + 'name' => 'Name', + 'size' => 'Size (kb)', + 'type' => 'Type', ], 'dashboard' => [ + 'title' => 'Dashboard', 'total_tickets' => "Total tickets", 'open_tickets' => "Open tickets", 'closed_tickets' => "Closed tickets", @@ -126,6 +135,8 @@ 'application_id' => 'Application id', 'category' => 'Category', 'last_sender' => 'Last sender', + + 'create' => 'Create ticket' ], 'contract' => [ 'title' => 'Contract', diff --git a/resources/views/admin/application_preview.blade.php b/resources/views/admin/application_preview.blade.php index 1cd360f9..cb0bfc10 100644 --- a/resources/views/admin/application_preview.blade.php +++ b/resources/views/admin/application_preview.blade.php @@ -18,162 +18,166 @@ -
-
-
-
- @if ($application->state == 'new') -
- @csrf - -
- @elseif ($application->state == 'accepted') +
+ @if ($application->state == 'new') +
+ @csrf -