diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php index 5c1162ebc..7c4534b78 100644 --- a/app/Http/Controllers/Client/helpdesk/FormController.php +++ b/app/Http/Controllers/Client/helpdesk/FormController.php @@ -93,7 +93,10 @@ class FormController extends Controller * @return type string */ public function postForm($id, Help_topic $topic) + + { + if ($id != 0) { $helptopic = $topic->where('id', '=', $id)->first(); $custom_form = $helptopic->custom_form; @@ -146,6 +149,7 @@ class FormController extends Controller */ public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source, Ticket_attachments $ta, CountryCode $code) { + $form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code'); $name = $request->input('Name'); $phone = $request->input('Phone'); diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 44d09fd9a..37934fa52 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -278,7 +278,7 @@ class DatabaseSeeder extends Seeder Company::create(['id' => '1']); Email::create(['id' => '1', 'template' => 'default', 'email_fetching' => '1', 'notification_cron' => '1', 'all_emails' => '1', 'email_collaborator' => '1', 'attachment' => '1']); Responder::create(['id' => '1', 'new_ticket' => '1', 'agent_new_ticket' => '1']); - // System::create(array('id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32')); + System::create(array('id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32')); Ticket::create(['num_format' => '$$$$-####-####', 'num_sequence' => 'sequence', 'collision_avoid' => '2', 'priority' => '1', 'sla' => '2', 'help_topic' => '1', 'status' => '1']); /* Ticket source */ Ticket_source::create(['name' => 'web', 'value' => 'Web']); @@ -2025,12 +2025,12 @@ class DatabaseSeeder extends Seeder /* * All the common settings will be listed here */ - CommonSettings::create(['id' => '1', 'option_name' => 'ticket_token_time_duration', 'option_value' => '1']); - CommonSettings::create(['id' => '2', 'option_name' => 'enable_rtl', 'option_value' => '']); - CommonSettings::create(['id' => '3', 'option_name' => 'user_set_ticket_status', 'status' => 1]); - CommonSettings::create(['id' => '4', 'option_name' => 'send_otp', 'status' => 0]); - CommonSettings::create(['id' => '5', 'option_name' => 'email_mandatory', 'status' => 1]); - CommonSettings::create(['id' => '6', 'option_name' => 'user_priority', 'status' => 0]); + CommonSettings::create([ 'option_name' => 'ticket_token_time_duration', 'option_value' => '1']); + CommonSettings::create(['option_name' => 'enable_rtl', 'option_value' => '']); + CommonSettings::create(['option_name' => 'user_set_ticket_status', 'status' => 1]); + CommonSettings::create(['option_name' => 'send_otp', 'status' => 0]); + CommonSettings::create(['option_name' => 'email_mandatory', 'status' => 1]); + CommonSettings::create(['option_name' => 'user_priority', 'status' => 0]); /* * Ratings diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php index c016f11f8..28dbf070d 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -721,7 +721,7 @@ if ($thread->title != "") { @if(isset($ticket_form_datas))
- +
@foreach($ticket_form_datas as $ticket_form_data) @@ -729,7 +729,9 @@ if ($thread->title != "") { @endforeach - + + + @endif @endif diff --git a/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php b/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php index c87fd0d75..08ffb3b63 100644 --- a/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php +++ b/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php @@ -89,7 +89,8 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp priority_id)->first(); ?> -
+
+
{!! Lang::get('lang.priority') !!}: priority_id)->first(); ?> - @if($priority->priority_id == 1) - {{$priority->priority_desc}} + + {{$priority->priority}} + {!! Lang::get('lang.department') !!}: diff --git a/resources/views/themes/default1/client/helpdesk/form.blade.php b/resources/views/themes/default1/client/helpdesk/form.blade.php index fcc268d9f..495a6b7c3 100644 --- a/resources/views/themes/default1/client/helpdesk/form.blade.php +++ b/resources/views/themes/default1/client/helpdesk/form.blade.php @@ -174,8 +174,12 @@ class = "active" $user_Priority=$Priority->status; ?> - @if($user_Priority == 1) - @if(Auth::user()->active == '1') + @if(Auth::user()) + + @if(Auth::user()->active == 1) + @if($user_Priority == 1) + +
@@ -188,7 +192,7 @@ class = "active"
@endif - + @endif @endif
{!! Form::label('Subject',Lang::get('lang.subject')) !!} *