diff --git a/app/Http/Controllers/HelpDeskController.php b/app/Http/Controllers/HelpDeskController.php index a45e8b44c..cc4627282 100644 --- a/app/Http/Controllers/HelpDeskController.php +++ b/app/Http/Controllers/HelpDeskController.php @@ -15,6 +15,7 @@ class HelpDeskController extends Controller * Display form to submit a new ticket */ public function displayNewTicket() { + //Return the view form to create a new ticket return view('helpdesk.newticket'); } @@ -26,7 +27,7 @@ class HelpDeskController extends Controller $ticket->subject = $request->subject; $ticket->body = $request->body; $ticket->save(); - + //Return the message the ticket has been submitted, and the main dashboard return redirect('/dashboard')->with('success', 'Ticket submitted.'); } @@ -34,13 +35,25 @@ class HelpDeskController extends Controller * Display current open tickets for the user */ public function displayMyTickets() { - + //Get the active tickets from the database + $tickets = HelpDeskTicket::where(['user_id' => auth()->user()->character_id, 'active' => 1])->get(); + + //Return the view with the tickets variable + return view('helpdesk.mytickets')->with('tickets', $tickets); } /** * Modify currently open ticket for the user */ public function editTicket(Request $request) { - + //Update the ticket + HelpDeskTicket::where(['user_id' => auth()->user()->character_id, 'active' => 1]) + ->update([ + 'department' => $request->department, + 'subject' => $request->subject, + 'body' => $request->body, + ]); + + return redirect('/dashboard')->with('success', 'Ticket modified.'); } } diff --git a/app/Http/Controllers/StructureController.php b/app/Http/Controllers/StructureController.php index 66fa0617e..d28c7bc0f 100644 --- a/app/Http/Controllers/StructureController.php +++ b/app/Http/Controllers/StructureController.php @@ -70,6 +70,7 @@ class StructureController extends Controller //Declare the structure tax helper class $sHelper = new StructureTaxHelper(); + //Get the dates we are working with $dates = $sHelper->GetTimeFrame(); diff --git a/app/Models/HelpDesk/HelpDeskTicket.php b/app/Models/HelpDesk/HelpDeskTicket.php index 34452707a..fec1deeee 100644 --- a/app/Models/HelpDesk/HelpDeskTicket.php +++ b/app/Models/HelpDesk/HelpDeskTicket.php @@ -27,5 +27,10 @@ class HelpDeskTicket extends Model 'department', 'subject', 'body', + 'active', ]; + + public function response() { + return $this->hasMany('App\Models\HelpDesk\HelpDeskTicketResponse', 'ticket_id'); + } } diff --git a/database/migrations/2018_12_24_010213_create_help_desk_tickets_table.php b/database/migrations/2018_12_24_010213_create_help_desk_tickets_table.php index 6233bb361..5cfb964c2 100644 --- a/database/migrations/2018_12_24_010213_create_help_desk_tickets_table.php +++ b/database/migrations/2018_12_24_010213_create_help_desk_tickets_table.php @@ -17,10 +17,11 @@ class CreateHelpDeskTicketsTable extends Migration Schema::create('help_desk_tickets', function(Blueprint $table) { $table->increments('ticket_id'); $table->string('user_id'); - $table->string('assigned_id'); + $table->string('assigned_id')->default(0); $table->string('department'); $table->string('subject'); $table->text('body'); + $table->boolean('active'); $table->timestamps(); }); }