Merge remote-tracking branch 'refs/remotes/origin/arindam-bug-priority'

# Conflicts:

#	resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php

app/Http/Controllers/Admin/helpdesk/EmailsController.php

@@ -76,8 +76,8 @@ class EmailsController extends Controller
             $departments = $department->get();
             // fetch all the helptopics from the helptopic table
             $helps = $help->get();
-            // fetch all the types of priority from the ticket_priority table
-            $priority = $ticket_priority->get();
+            // fetch all the types of active priority from the ticket_priority table
+            $priority = $ticket_priority->where('status', '=', 1)->get();
             // fetch all the types of mailbox protocols from the mailbox_protocols table
             $mailbox_protocols = $mailbox_protocol->get();
 
@@ -319,8 +319,8 @@ class EmailsController extends Controller
             $count = $email->count();
             // get all the helptopic
             $helps = $help->get();
-            // get all the priority
-            $priority = $ticket_priority->get();
+            // get all active the priority
+              $priority = $ticket_priority->where('status', '=', 1)->get();
             // get all the mailbox protocols
             $mailbox_protocols = $mailbox_protocol->get();
 

app/Http/Controllers/Client/helpdesk/FormController.php

@@ -180,7 +180,7 @@ class FormController extends Controller
          // $priority = $ticket_settings->first()->priority;
          $default_priority = Ticket_Priority::where('is_default', '=', 1)->first();
         $user_priority = CommonSettings::where('id', '=', 6)->first();
-        if ($user_priority->status == 0) {
+        if (!($request->input('priority'))) {
             $priority = $default_priority->priority_id;
         } else {
             $priority = $request->input('priority');

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(['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

resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php

@@ -55,8 +55,9 @@ class="active"
 
 
 <!-- <li><a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="Tooltip on right"> sss</a></li> -->
-<a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="{{Lang::get('lang.active_user_can_select_the_priority_while_creating_ticket')}}">
     <div class="box-header with-border">
+    <a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="{{Lang::get('lang.active_user_can_select_the_priority_while_creating_ticket')}}">
+
         <span class="lead border-right" >{!! Lang::get('lang.current') !!}{!! Lang::get('lang.user_priority_status') !!}</span>
        
            </a>
@@ -88,10 +89,10 @@ class="active"
     <div class="box-footer">
     </div>
 </div>
-<script type="text/javascript">
+<!-- <script type="text/javascript">
     $('a').tooltip()
 </script>
-
+ -->
 <script>
     function confirmDelete(priority_id) {
         var r = confirm('Are you sure?');
@@ -106,7 +107,7 @@ class="active"
 </script>
 <script>
     $('#toggle_event_editing button').click(function () {
-
+        
         var user_settings_priority=1;
          var user_settings_priority=0;
         if ($(this).hasClass('locked_active') ) {

resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php

@@ -671,7 +671,9 @@ if ($thread->title != "") {
                                                         <td>{!! $ticket_form_data->content !!}</td>
                                                     </tr>
                                                     @endforeach
-                                                </tbody></table>
+                                                </tbody>
+
+                                                </table>
                                         
                                         @endif
                                         @endif

resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php

@@ -89,7 +89,8 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
                     <?php
                     $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first();
                     ?>
-                    <div class="callout callout-default ">
+                    <div class="callout callout-{{$priority->priority_color}}" style = 'background-color:{{$priority->priority_color}}; color:#F9F9F9'>
+                    <!-- <div class="callout callout-default "> -->
                         <div class="row">
                             <div class="col-md-3"> 
                                 <?php
@@ -135,13 +136,15 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
 
                         <tr><td><b>{!! Lang::get('lang.priority') !!}:</b></td>     <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first(); ?>
 
-                            @if($priority->priority_id == 1)
-                            <td title="{{$priority->priority_desc}}" style="color:green">{{$priority->priority_desc}}</td>
+                       <!-- {{$priority->priority}} -->
+                             <td title="{{$priority->priority}}">{{$priority->priority}}</td>
+                        <!--     @if($priority->priority_id == 1)
+                            <td title="{{$priority->priority_color}}"style = 'background-color:{{$priority->priority_color}}; color:#F9F9F9'></td>
                             @elseif($priority->priority_id == 2)
                             <td title="{{$priority->priority_desc}}" style="color:orange">{{$priority->priority_desc}}</td>
                             @elseif($priority->priority_id == 3)
                             <td title="{{$priority->priority_desc}}" style="color:red">{{$priority->priority_desc}}</td>
-                            @endif
+                            @endif -->
 
                         </tr>
                         <tr><td><b>{!! Lang::get('lang.department') !!}:</b></td>   

resources/views/themes/default1/client/helpdesk/form.blade.php

@@ -174,7 +174,12 @@ class = "active"
              $user_Priority=$Priority->status;
             ?>
              
-             @if($user_Priority == 1)
+             @if(Auth::user())
+
+             @if(Auth::user()->active == 1)
+            @if($user_Priority == 1)
+             
+
              <div class="col-md-12 form-group">
                 <div class="row">
                     <div class="col-md-1">
@@ -186,8 +191,8 @@ class = "active"
                     </div>
                  </div>
             </div>
-            @else
-
+           @endif
+            @endif
             @endif
             <div class="col-md-12 form-group {{ $errors->has('Subject') ? 'has-error' : '' }}">
                 {!! Form::label('Subject',Lang::get('lang.subject')) !!}<span class="text-red"> *</span>