From 4270cbcfb30205995c8507e7e766267a47a4a34a Mon Sep 17 00:00:00 2001 From: sujitprasad Date: Wed, 24 Feb 2016 20:38:42 +0530 Subject: [PATCH] Update v1.0.6.4 --- .env | 2 +- README.md | 21 +- app/Exceptions/Handler.php | 69 +++--- .../Admin/helpdesk/EmailsController.php | 8 +- .../Admin/helpdesk/SettingsController.php | 12 + .../Agent/helpdesk/TicketController.php | 209 +++++++++++------- .../Controllers/Common/PhpMailController.php | 6 +- .../Installer/helpdesk/InstallController.php | 11 +- app/Http/routes.php | 2 + app/Model/kb/Footer.php | 11 + app/Model/kb/Footer2.php | 11 + app/Model/kb/Footer3.php | 11 + app/Model/kb/Footer4.php | 11 + config/app.php | 50 ++++- config/database.php | 2 +- config/lfm.php | 2 +- index.html | 6 + public/lb-faveo/js/angular2.js | 58 +++++ resources/views/auth/login.blade.php | 2 +- resources/views/auth/password.blade.php | 20 +- resources/views/auth/register.blade.php | 4 +- .../admin/helpdesk/settings/email.blade.php | 2 +- .../admin/helpdesk/settings/system.blade.php | 95 +++++++- .../agent/helpdesk/ticket/timeline.blade.php | 79 +++---- .../default1/client/helpdesk/form.blade.php | 1 - .../installer/helpdesk/serialkey.blade.php | 73 ++++++ .../installer/helpdesk/view3.blade.php | 44 +++- .../installer/helpdesk/view4.blade.php | 9 + .../installer/helpdesk/view5.blade.php | 67 +++++- 29 files changed, 700 insertions(+), 198 deletions(-) create mode 100644 app/Model/kb/Footer.php create mode 100644 app/Model/kb/Footer2.php create mode 100644 app/Model/kb/Footer3.php create mode 100644 app/Model/kb/Footer4.php create mode 100644 index.html create mode 100644 public/lb-faveo/js/angular2.js create mode 100644 resources/views/themes/default1/installer/helpdesk/serialkey.blade.php diff --git a/.env b/.env index 4a8b4e0e4..64b0e2233 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ APP_ENV=local APP_DEBUG=false APP_KEY=SomeRandomString DB_HOST=localhost -DB_DATABASE=faveocombine +DB_DATABASE=faveo-dev DB_USERNAME=root DB_PASSWORD= CACHE_DRIVER=file diff --git a/README.md b/README.md index 0c7ba6150..4f9a802c2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -

About Faveo

-
   StyleCI
+

About Faveo

+
   StyleCI

Headquartered in Bangalore, Faveo HELPDESK provides Businesses with an automated Helpdesk system to manage customer support.

The word Faveo comes from Latin which means to be favourable. Which truly highlights vision and the scope as well as the functionality of the product that Faveo is. It is specifically designed to cater the needs of startups and SME’s empowering them with state of art, ticket based support system. In today’s competitive startup scenario customer retention is one of the major challenges. Handling client query diligently is all the difference between retaining or losing a long lasting relationship. The company is driven with passion of providing tools for managing consumer queries for strategic insights and helping companies take those decisive decisions. @@ -22,9 +22,11 @@ Faveo is designed & developed by Requirements

To run Faveo your host just needs a couple of things:

Faveo Web Hosting

@@ -41,9 +43,16 @@ Faveo is designed & developed by Click here

-

Road Map for Community Edition:

Click here

+

Faveo Probe:

+

Helps verify whether your server can run Faveo or not. +Download here

+ +

Faveo Community:

+

Join Faveo discussion group and stay tuned to latest updates. +Join here

+

Don't panic if you come across bugs

Faveo is very very new in the market, the product is fully working and is production worthy but it definitely will have some bugs like any software. We fully support Faveo whether free or pro edition, incase you come across any bugs, email us through the contact form. We want to make your experience of using Faveo as memorable as possible, so help us make Faveo a World, top class helpdesk application. Do check out our roadmap to stayed tuned with future releases

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 4e904dbe5..47c03dd0d 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,12 +2,12 @@ namespace App\Exceptions; +// controller +use App\Http\Controllers\Common\PhpMailController; + use Exception; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -// use App\Http\Controllers\Common\SettingsController; -//use App\Model\helpdesk\Email\Smtp; - class Handler extends ExceptionHandler { /** @@ -19,14 +19,18 @@ class Handler extends ExceptionHandler 'Symfony\Component\HttpKernel\Exception\HttpException', ]; + /** * Create a new controller instance. - * - * @return type response + * constructor to check + * 1. php mailer + * @return void */ - // public function __construct() { - // SettingsController::smtp(); - // } + public function __construct(PhpMailController $PhpMailController) + { + $this->PhpMailController = $PhpMailController; + } + /** * Report or log an exception. @@ -46,7 +50,7 @@ class Handler extends ExceptionHandler * Render an exception into an HTTP response. * * @param \Illuminate\Http\Request $request - * @param \Exception $e + * @param \Exception $e * * @return \Illuminate\Http\Response */ @@ -54,39 +58,50 @@ class Handler extends ExceptionHandler { if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) { return response()->json(['message' => $e->getMessage(), 'code' => $e->getStatusCode()]); - //dd($e); + } elseif ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) { return response()->json(['message' => $e->getMessage(), 'code' => $e->getStatusCode()]); } - - // if (config('app.debug') == false) { - // if ($this->isHttpException($e) && $e->getStatusCode() == 404) { - // return response()->view('errors.404', []); - // } else { - // if (\Config::get('database.install') == 1) { - // // if(\Config::get('app.ErrorLog') == '%1%') { - // // \App\Http\Controllers\Common\SettingsController::smtp(); - // // $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => '', 'email' => ''], $message = ['subject' => '', 'scenario'=>'error-report'], $template_variables = ['e' =>$e ]); - // // } - // } - // return response()->view('errors.500', []); - // } - // } - // return parent::render($request, $e); - + // This is to check if the debug is true or false + if (config('app.debug') == false) { + // checking if the error is actually an error page or if its an system error page + if ($this->isHttpException($e) && $e->getStatusCode() == 404) { + return response()->view('errors.404', []); + } else { + // checking if the application is installed + if (\Config::get('database.install') == 1) { + // checking if the error log send to Ladybirdweb is enabled or not + if(\Config::get('app.ErrorLog') == '%1%') { + $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => 'faveo logger', 'email' => 'faveoerrorlogger@gmail.com'], $message = ['subject' => 'Faveo downloaded from github has occured error', 'scenario'=>'error-report'], $template_variables = ['e' => $e]); + } + } + return response()->view('errors.500', []); + } + } + // returns non oops error message + return parent::render($request, $e); + // checking if the error is related to http error i.e. page not found if ($this->isHttpException($e)) { + // returns error for page not found return $this->renderHttpException($e); } - + // checking if the config app sebug is enabled or not if (config('app.debug')) { + // returns oops error page i.e. colour full error page return $this->renderExceptionWithWhoops($e); } return parent::render($request, $e); } + /** + * function to generate oops error page + * @param \Exception $e + * @return \Illuminate\Http\Response + */ protected function renderExceptionWithWhoops(Exception $e) { + // new instance of whoops class to display customized error page $whoops = new \Whoops\Run(); $whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler()); diff --git a/app/Http/Controllers/Admin/helpdesk/EmailsController.php b/app/Http/Controllers/Admin/helpdesk/EmailsController.php index a4a10f8ab..d518e352a 100644 --- a/app/Http/Controllers/Admin/helpdesk/EmailsController.php +++ b/app/Http/Controllers/Admin/helpdesk/EmailsController.php @@ -114,6 +114,10 @@ class EmailsController extends Controller $email->password = $encrypted; $email->save(); + $email_settings = Email::where('id', '=', '1')->first(); + $email_settings->sys_email = $email->id; + $email_settings->save(); + return redirect('emails')->with('success', 'Email Created sucessfully'); } else { return redirect('emails')->with('fails', 'Email can not Create'); @@ -217,8 +221,8 @@ class EmailsController extends Controller public function destroy($id, Emails $email) { $default_system_email = Email::where('id', '=', '1')->first(); - if ($default_system_email->id) { - if ($id == $default_system_email->id) { + if ($default_system_email->sys_email) { + if ($id == $default_system_email->sys_email) { return redirect('emails')->with('fails', 'You cannot delete system default Email'); } } diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 674d27f78..33ccf9136 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -513,4 +513,16 @@ class SettingsController extends Controller return redirect()->back()->with('success', 'Successfully Deleted'); } + + /** + * Generate Api key. + * + * @return type json + */ + public function generateApiKey() + { + $key = str_random(32); + + return $key; + } } diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index f71c1ea6d..93edaf7bc 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Agent\helpdesk; // controllers use App\Http\Controllers\Common\PhpMailController; -use App\Http\Controllers\Common\SettingsController; use App\Http\Controllers\Controller; // requests use App\Http\Requests\helpdesk\CreateTicketRequest; @@ -15,7 +14,7 @@ use App\Model\helpdesk\Agent\Teams; use App\Model\helpdesk\Email\Emails; use App\Model\helpdesk\Form\Fields; use App\Model\helpdesk\Manage\Help_topic; -use App\Model\Helpdesk\Manage\Sla_plan; +use App\Model\helpdesk\Manage\Sla_plan; use App\Model\helpdesk\Settings\Alert; use App\Model\helpdesk\Settings\Company; use App\Model\helpdesk\Settings\Email; @@ -33,6 +32,7 @@ use App\Model\helpdesk\Utility\Timezones; use App\User; use Auth; use DB; +use UTC; // classes use Exception; use Hash; @@ -44,7 +44,7 @@ use PDF; /** * TicketController. * - * @author Ladybird + * @author Ladybird */ class TicketController extends Controller { @@ -56,7 +56,6 @@ class TicketController extends Controller public function __construct(PhpMailController $PhpMailController) { $this->PhpMailController = $PhpMailController; - SettingsController::smtp(); $this->middleware('auth'); } @@ -85,10 +84,14 @@ class TicketController extends Controller }) ->addColumn('subject', function ($ticket) { $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first(); - $string = $subject->title; - if (strlen($string) > 20) { - $stringCut = substr($string, 0, 30); - $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + if (isset($subject->title)) { + $string = $subject->title; + if (strlen($string) > 20) { + $stringCut = substr($string, 0, 30); + $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + } + } else { + $string = "(no subject)"; } //collabrations $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get(); @@ -158,7 +161,7 @@ class TicketController extends Controller $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id'); $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first(); - return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + return UTC::usertimezone($TicketDatarow->updated_at); }) ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority') ->orderColumns('subject', 'from', 'assigned_to', 'Last Replier', 'ticket_number', 'priority', 'Last') @@ -188,17 +191,20 @@ class TicketController extends Controller $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first(); $tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', 0)->where('dept_id', '=', $dept->id)->get(); } - return \Datatable::collection(new Collection($tickets)) ->addColumn('id', function ($ticket) { return ""; }) ->addColumn('subject', function ($ticket) { $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first(); - $string = $subject->title; - if (strlen($string) > 20) { - $stringCut = substr($string, 0, 30); - $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + if (isset($subject->title)) { + $string = $subject->title; + if (strlen($string) > 20) { + $stringCut = substr($string, 0, 30); + $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + } + } else { + $string = "(no subject)"; } //collabrations $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get(); @@ -265,7 +271,8 @@ class TicketController extends Controller $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id'); $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first(); - return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + // return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + return UTC::usertimezone($TicketDatarow->updated_at); }) ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority') ->orderColumns('subject', 'from', 'assigned_to', 'Last Replier', 'ticket_number', 'priority', 'Last') @@ -302,10 +309,14 @@ class TicketController extends Controller }) ->addColumn('subject', function ($ticket) { $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first(); - $string = $subject->title; - if (strlen($string) > 20) { - $stringCut = substr($string, 0, 30); - $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + if (isset($subject->title)) { + $string = $subject->title; + if (strlen($string) > 20) { + $stringCut = substr($string, 0, 30); + $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + } + } else { + $string = "(no subject)"; } //collabrations $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get(); @@ -372,7 +383,8 @@ class TicketController extends Controller $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id'); $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first(); - return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + // return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + return UTC::usertimezone($TicketDatarow->updated_at); }) ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority') ->orderColumns('subject', 'from', 'assigned_to', 'Last Replier', 'ticket_number', 'priority', 'Last') @@ -404,10 +416,14 @@ class TicketController extends Controller }) ->addColumn('subject', function ($ticket) { $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first(); - $string = $subject->title; - if (strlen($string) > 20) { - $stringCut = substr($string, 0, 30); - $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + if (isset($subject->title)) { + $string = $subject->title; + if (strlen($string) > 20) { + $stringCut = substr($string, 0, 30); + $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + } + } else { + $string = "(no subject)"; } //collabrations $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get(); @@ -474,7 +490,8 @@ class TicketController extends Controller $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id'); $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first(); - return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + // return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + return UTC::usertimezone($TicketDatarow->updated_at); }) ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority') ->orderColumns('subject', 'from', 'assigned_to', 'Last Replier', 'ticket_number', 'priority', 'Last') @@ -516,10 +533,14 @@ class TicketController extends Controller }) ->addColumn('subject', function ($ticket) { $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first(); - $string = $subject->title; - if (strlen($string) > 20) { - $stringCut = substr($string, 0, 30); - $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + if (isset($subject->title)) { + $string = $subject->title; + if (strlen($string) > 20) { + $stringCut = substr($string, 0, 30); + $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + } + } else { + $string = "(no subject)"; } //collabrations $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get(); @@ -585,7 +606,8 @@ class TicketController extends Controller $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id'); $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first(); - return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + // return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + return UTC::usertimezone($TicketDatarow->updated_at); }) ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority') ->orderColumns('subject', 'from', 'assigned_to', 'Last Replier', 'ticket_number', 'priority', 'Last') @@ -617,10 +639,14 @@ class TicketController extends Controller }) ->addColumn('subject', function ($ticket) { $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first(); - $string = $subject->title; - if (strlen($string) > 20) { - $stringCut = substr($string, 0, 30); - $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + if (isset($subject->title)) { + $string = $subject->title; + if (strlen($string) > 20) { + $stringCut = substr($string, 0, 30); + $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + } + } else { + $string = "(no subject)"; } //collabrations $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get(); @@ -687,7 +713,8 @@ class TicketController extends Controller $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id'); $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first(); - return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + // return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + return UTC::usertimezone($TicketDatarow->updated_at); }) ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority') ->orderColumns('subject', 'from', 'assigned_to', 'Last Replier', 'ticket_number', 'priority', 'Last') @@ -1009,7 +1036,8 @@ class TicketController extends Controller * @param type $emailadd * @param type $username * @param type $subject - * @param type $body + * + @param type $body * @param type $phone * @param type $helptopic * @param type $sla @@ -1051,14 +1079,13 @@ class TicketController extends Controller // Event fire \Event::fire(new \App\Events\ReadMailEvent($user_id, $password)); // if (Mail::send('emails.pass', ['password' => $password, 'name' => $username, 'from'=>$company,'emailadd' => $emailadd], function ($message) use ($emailadd, $username,$company) { - // $message->to($emailadd, $username)->subject('Welcome to '.$company.' helpdesk'); + // $message->to($emailadd, $username)->subject('Welcome to '.$company.' helpdesk'); // })) { - // try { - + try { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => 'Welcome to '.$company.' helpdesk', 'scenario' => 'registration-notification'], $template_variables = ['user' => $username, 'email_address' => $emailadd, 'user_password' => $password]); - // } catch (\Exception $e) { + } catch (\Exception $e) { // return 0; - // } + } // $message->to($emailadd, $username)->subject('Welcome to '.$company.' helpdesk'); // })) { // need to do something here.... @@ -1094,7 +1121,7 @@ class TicketController extends Controller if ($source == 3) { // Mail::send('emails.Ticket_Create', ['sign'=>$sign, 'content' => $body, 'name' => $username, 'ticket_number' => $ticket_number2, 'system' => $system], function ($message) use ($emailadd, $username, $ticket_number2, $updated_subject) { - // $message->to($emailadd, $username)->subject($updated_subject); + // $message->to($emailadd, $username)->subject($updated_subject); // }); // dd($body); try { @@ -1104,7 +1131,7 @@ class TicketController extends Controller } else { $body2 = null; // Mail::send('emails.Ticket_Create', ['sign'=>$sign, 'content' => $body2, 'name' => $username, 'ticket_number' => $ticket_number2, 'system' => $system], function ($message) use ($emailadd, $username, $ticket_number2, $updated_subject) { - // $message->to($emailadd, $username)->subject($updated_subject); + // $message->to($emailadd, $username)->subject($updated_subject); // }); try { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'], $template_variables = ['user' => $username, 'ticket_number' => $ticket_number2, 'department_sign' => '']); @@ -1122,7 +1149,7 @@ class TicketController extends Controller $admin_email = $admin->email; $admin_user = $admin->first_name; // Mail::send('emails.'.$mail, ['agent' => $admin_user,'content'=>$body, 'ticket_number' => $ticket_number2, 'from'=>$company, 'email' => $emailadd, 'name' => $ticket_creator, 'system' => $system], function ($message) use ($admin_email, $admin_user, $ticket_number2, $updated_subject) { - // $message->to($admin_email, $admin_user)->subject($updated_subject); + // $message->to($admin_email, $admin_user)->subject($updated_subject); // }); try { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $admin_user, 'email' => $admin_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $admin_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]); @@ -1143,7 +1170,7 @@ class TicketController extends Controller $agent_email = $agent->email; $agent_user = $agent->first_name; // Mail::send('emails.'.$mail, ['agent' => $agent_user ,'content'=>$body , 'ticket_number' => $ticket_number2, 'from'=>$company, 'email' => $emailadd, 'name' => $ticket_creator, 'system' => $system], function ($message) use ($agent_email, $agent_user, $ticket_number2, $updated_subject) { - // $message->to($agent_email, $agent_user)->subject($updated_subject); + // $message->to($agent_email, $agent_user)->subject($updated_subject); // }); try { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $agent_user, 'email' => $agent_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $agent_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]); @@ -1425,7 +1452,7 @@ class TicketController extends Controller $system_from = $this->company(); // Mail::send('emails.close_ticket', ['ticket_number' => $ticket_number, 'from'=>$company], function ($message) use ($email, $user_name, $ticket_number, $ticket_subject) { - // $message->to($email, $user_name)->subject($ticket_subject.'[#' . $ticket_number . ']'); + // $message->to($email, $user_name)->subject($ticket_subject.'[#' . $ticket_number . ']'); // }); $sending_emails = Emails::where('department', '=', $ticket_status->dept_id)->first(); @@ -1586,10 +1613,10 @@ class TicketController extends Controller // $master = Auth::user()->first_name . " " . Auth::user()->last_name; // if(Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) { - // // ticket assigned send mail - // Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from'=>$company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) { - // $message->to($agent_email, $agent)->subject($ticket_subject.'[#' . $ticket_number . ']'); - // }); + // // ticket assigned send mail + // Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from'=>$company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) { + // $message->to($agent_email, $agent)->subject($ticket_subject.'[#' . $ticket_number . ']'); + // }); // } } elseif ($assign_to[0] == 'user') { $ticket->assigned_to = $assign_to[1]; @@ -1619,8 +1646,8 @@ class TicketController extends Controller // if(Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) { // ticket assigned send mail // Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from'=>$company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) { - // $message->to($agent_email, $agent)->subject($ticket_subject.'[#' . $ticket_number . ']'); - // }); + // $message->to($agent_email, $agent)->subject($ticket_subject.'[#' . $ticket_number . ']'); + // }); // $sending_emails = Emails::where('department', '=', $ticket->dept_id)->first(); // if($sending_emails == null) { // $from_email = $this->system_mail(); @@ -1761,7 +1788,7 @@ class TicketController extends Controller $user_id = $create_user->id; // Mail::send('emails.pass', ['password' => $password, 'name' => $name, 'from'=>$company,'emailadd' => $email], function ($message) use ($email, $name) { - // $message->to($email, $name)->subject('password'); + // $message->to($email, $name)->subject('password'); // }); // $sending_emails = Emails::where('department', '=', $ticket_status->dept_id)->first(); // if($sending_emails == null) { @@ -1829,28 +1856,28 @@ class TicketController extends Controller * @return type */ // public function search() { - // $product = Input::get('type'); - // $word = Input::get('name_startsWith'); - // if ($product == 'product') { - // $starts_with = strtoupper($word); - // $rows = DB::table('users')->select('user_name')->where('name', 'LIKE', $starts_with . '%')->get(); - // $data = array(); - // foreach ($rows as $row) { - // array_push($data, $row->name); - // } - // print_r(json_encode($data)); - // } - // if ($product == 'product_table') { - // $row_num = Input::get('row_num'); - // $starts_with = strtoupper($word); - // $rows = DB::table('product')->select('name', 'description', 'cost_price')->where('name', 'LIKE', $starts_with . '%')->get(); - // $data = array(); - // foreach ($rows as $row) { - // $name = $row->name . '|' . $row->description . '|' . $row->cost_price . '|' . $row_num; - // array_push($data, $name); - // } - // print_r(json_encode($data)); - // } + // $product = Input::get('type'); + // $word = Input::get('name_startsWith'); + // if ($product == 'product') { + // $starts_with = strtoupper($word); + // $rows = DB::table('users')->select('user_name')->where('name', 'LIKE', $starts_with . '%')->get(); + // $data = array(); + // foreach ($rows as $row) { + // array_push($data, $row->name); + // } + // print_r(json_encode($data)); + // } + // if ($product == 'product_table') { + // $row_num = Input::get('row_num'); + // $starts_with = strtoupper($word); + // $rows = DB::table('product')->select('name', 'description', 'cost_price')->where('name', 'LIKE', $starts_with . '%')->get(); + // $data = array(); + // foreach ($rows as $row) { + // $name = $row->name . '|' . $row->description . '|' . $row->cost_price . '|' . $row_num; + // array_push($data, $name); + // } + // print_r(json_encode($data)); + // } // } /** @@ -1887,10 +1914,14 @@ class TicketController extends Controller }) ->addColumn('subject', function ($ticket) { $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first(); - $string = $subject->title; - if (strlen($string) > 20) { - $stringCut = substr($string, 0, 30); - $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + if (isset($subject->title)) { + $string = $subject->title; + if (strlen($string) > 20) { + $stringCut = substr($string, 0, 30); + $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + } + } else { + $string = "(no subject)"; } //collabrations $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get(); @@ -1957,7 +1988,8 @@ class TicketController extends Controller $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id'); $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first(); - return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + // return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + return UTC::usertimezone($TicketDatarow->updated_at); }) ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority') ->orderColumns('subject', 'from', 'assigned_to', 'Last Replier', 'ticket_number', 'priority', 'Last') @@ -1994,10 +2026,14 @@ class TicketController extends Controller }) ->addColumn('subject', function ($ticket) { $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first(); - $string = $subject->title; - if (strlen($string) > 20) { - $stringCut = substr($string, 0, 30); - $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + if (isset($subject->title)) { + $string = $subject->title; + if (strlen($string) > 20) { + $stringCut = substr($string, 0, 30); + $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; + } + } else { + $string = "(no subject)"; } //collabrations $collaborators = DB::table('ticket_collaborator')->where('ticket_id', '=', $ticket->id)->get(); @@ -2064,7 +2100,8 @@ class TicketController extends Controller $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id'); $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first(); - return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + // return date('d F Y, H:i:s', strtotime($TicketDatarow->updated_at)); + return UTC::usertimezone($TicketDatarow->updated_at); }) ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority') ->orderColumns('subject', 'from', 'assigned_to', 'Last Replier', 'ticket_number', 'priority', 'Last') @@ -2181,7 +2218,7 @@ class TicketController extends Controller $user_id = $user->id; // Mail::send('emails.pass', ['password' => $password, 'name' => $name, 'from'=>$company,'emailadd'=>$email], function ($message) use ($email, $name) { - // $message->to($email, $name)->subject('password'); + // $message->to($email, $name)->subject('password'); // }); // $sending_emails = Emails::where('department', '=', $ticket_status->dept_id)->first(); // if($sending_emails == null) { diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index 8309ac289..24b766079 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -245,10 +245,10 @@ class PhpMailController extends Controller // $mail->AltBody = $altbody; if (!$mail->send()) { - echo 'Message could not be sent.'; - echo 'Mailer Error: '.$mail->ErrorInfo; + // echo 'Message could not be sent.'; + // echo 'Mailer Error: '.$mail->ErrorInfo; } else { - echo 'Message has been sent'; + // echo 'Message has been sent'; } } diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index dacf7fe39..e5c1e63bf 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -278,11 +278,20 @@ class InstallController extends Controller */ public function accountcheck(InstallerRequest $request) { + // checking is the installation was done previously + try { + $check_for_pre_installation = System::all(); + if($check_for_pre_installation) { + return redirect()->back()->with('fails', 'The data in database already exist. Please provide fresh database'); + } + } catch (Exception $e) { + + } + // migrate database Artisan::call('migrate', ['--force' => true]); Artisan::call('db:seed', ['--force' => true]); - // create user $firstname = $request->input('firstname'); $lastname = $request->input('Lastname'); diff --git a/app/Http/routes.php b/app/Http/routes.php index 68b14a9f2..e86c036d1 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -178,6 +178,8 @@ Route::group(['middleware' => 'roles', 'middleware' => 'auth'], function () { //Routes for delete language package Route::get('delete-language/{lang}', ['as' => 'lang.delete', 'uses' => 'Admin\helpdesk\LanguageController@deleteLanguage']); + + Route::get('generate-api-key', 'Admin\helpdesk\SettingsController@GenerateApiKey'); // route to generate api key }); /* diff --git a/app/Model/kb/Footer.php b/app/Model/kb/Footer.php new file mode 100644 index 000000000..2d7db4be7 --- /dev/null +++ b/app/Model/kb/Footer.php @@ -0,0 +1,11 @@ + 'Community 1.0.6.2', + 'version' => 'Community 1.0.6.4', /* |-------------------------------------------------------------------------- @@ -143,6 +143,52 @@ return [ // + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /* * Laravel Framework Service Providers... */ @@ -245,7 +291,7 @@ return [ 'SMTPS' => 'App\Http\Controllers\HomeController', 'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade', 'Zipper' => 'Chumper\Zipper\Zipper', - 'Image' => Intervention\Image\Facades\Image::class, + 'Image' => Intervention\Image\Facades\Image::class, 'JWTAuth' => 'Tymon\JWTAuth\Facades\JWTAuth', 'JWTFactory' => 'Tymon\JWTAuth\Facades\JWTFactory', diff --git a/config/database.php b/config/database.php index a53ea36ce..a2fa2be0e 100644 --- a/config/database.php +++ b/config/database.php @@ -101,7 +101,7 @@ return [ | installed or not. | */ - 'install' => '%0%', + 'install' => '1', /* |-------------------------------------------------------------------------- | Redis Databases diff --git a/config/lfm.php b/config/lfm.php index 3e94eb37d..0a30cf6ca 100644 --- a/config/lfm.php +++ b/config/lfm.php @@ -9,7 +9,7 @@ return [ 'shared_folder_name' => 'shares', 'thumb_folder_name' => 'thumbs', 'images_dir' => 'public/photos/', - 'images_url' => '%url%', + 'images_url' => url('photos').'/', 'files_dir' => 'public/files/', 'files_url' => '/files/', 'file_type_array' => [ diff --git a/index.html b/index.html new file mode 100644 index 000000000..2a6b9fdd8 --- /dev/null +++ b/index.html @@ -0,0 +1,6 @@ + + + Faveo HELPDESK + + + \ No newline at end of file diff --git a/public/lb-faveo/js/angular2.js b/public/lb-faveo/js/angular2.js new file mode 100644 index 000000000..820ca4e4b --- /dev/null +++ b/public/lb-faveo/js/angular2.js @@ -0,0 +1,58 @@ +var myApp = angular.module('myApp', []); + +myApp.controller('MainController', ['$http', '$scope', + function($http, $scope) { + // $http.get('url').success(function(data) { + // + // }); + + //titile and content for page 3 + $scope.Databasetitle = 'Database Type'; + $scope.Databasecontent = 'Faveo supports 3 databases, choose anyone which your server supports'; + + $scope.Hosttitle = 'Database Host'; + $scope.Hostcontent = 'You should be able to get this info from your web host, if localhost doesn’t work'; + + $scope.Porttitle = 'Database Port number'; + $scope.Portcontent = 'This is an optional field, by default port no wil be default port no of the database choosen, enter this field only if your database is not running on default port no'; + + $scope.Databasenametitle = 'Database Name'; + $scope.Databasenamecontent = 'The name of the database you want to run Faveo in'; + + $scope.Usertitle = 'Database Username'; + $scope.Usercontent = 'Your Database username'; + + $scope.Passwordtitle = 'Database Password'; + $scope.Passwordcontent = 'Your Database user password'; + + //titile and content for page 4 + + $scope.Nametitle = 'First Name'; + $scope.Namecontent = 'System administrator first name'; + + $scope.Lasttitle = 'Last Name'; + $scope.Lastcontent = 'System administrator last name'; + + $scope.Emailtitle = 'Email'; + $scope.Emailcontent = 'Email Double-check your email address before continuing'; + + $scope.UserNametitle = 'User Name'; + $scope.UserNamecontent = 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.'; + + $scope.Passtitle = 'Password'; + $scope.Passcontent = 'Important: You will need this password to log in. Please store it in a secure location.'; + + $scope.Confirmtitle = 'Confirm Password'; + $scope.Confirmcontent = 'Type the same password as above'; + + $scope.Languagetitle = 'Faveo Language'; + $scope.Languagecontent = 'The language you want to run Faveo in'; + + $scope.Timezonetitle = 'Time Zone'; + $scope.Timezonecontent = 'Faveo default time zone'; + + $scope.Datetimetitle = 'Faveo Date & Time format'; + $scope.Datetimecontent = 'What format you want to display date & time in Faveo'; + + } +]); diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index b06573dca..664bde428 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -53,6 +53,6 @@ {!! Lang::get("lang.iforgot") !!}
-{!! Lang::get("lang.reg_new_member") !!} +{!! Lang::get("lang.register") !!} @stop diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php index ff595727f..ef36cea90 100644 --- a/resources/views/auth/password.blade.php +++ b/resources/views/auth/password.blade.php @@ -22,12 +22,26 @@ -
+ +
- +
+ + +
+
+ + {!! Lang::get('lang.i_know_my_password') !!} +
+
+ +
+
+
+ -{!! Lang::get('lang.i_know_my_password') !!} + @stop \ No newline at end of file diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index db1a9a2b5..90b39fcd3 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -58,7 +58,7 @@
@@ -67,7 +67,7 @@
-{!! Lang::get('lang.i_already_have_a_membership') !!} + {!! Form::close()!!} @stop diff --git a/resources/views/themes/default1/admin/helpdesk/settings/email.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/email.blade.php index 3746216e1..75f7ee851 100644 --- a/resources/views/themes/default1/admin/helpdesk/settings/email.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/settings/email.blade.php @@ -81,7 +81,7 @@ class="active"
{!! Form::label('sys_email',Lang::get('lang.default_system_email')) !!} {!! $errors->first('sys_email', ':message') !!} - {!!Form::select('sys_email', $emails1->lists('email_name','id'),null,['class'=>'form-control']) !!} + {!!Form::select('sys_email', [ 'Select an Email', 'Emails' => $emails1->lists('email_name','id')],null,['class'=>'form-control']) !!}
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php index 78605a9e3..21721b47a 100644 --- a/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php @@ -132,26 +132,97 @@ class="active" {!! Form::select('date_time_format',[''=>'Select a date Time Format','Date Time Formats'=>$date_time->lists('format','id')],null,['class' => 'form-control']) !!} - +
+

{!! Lang::get('lang.api_configurations') !!}

+
+ +
+
+ {!! Form::label('api',Lang::get('lang.api')) !!} + {!! $errors->first('api_enable', ':message') !!} +
+
+ {!! Form::radio('api_enable','1',true) !!} {{Lang::get('lang.enable')}} +
+
+ {!! Form::radio('api_enable','0') !!} {{Lang::get('lang.disable')}} +
+
+
+
+ + + +
+
+ + {!! Form::label('api_key',Lang::get('lang.api_key')) !!} + {!! $errors->first('api_key', ':message') !!} + {!! Form::text('api_key',$systems->api_key,['class' => 'form-control']) !!} + +
+
+ +
+
+ {!! Lang::get('lang.generate_key') !!} +
- - - - + + + + + @stop 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 22637131b..eb4857ec4 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -190,13 +190,15 @@ echo UTC::usertimezone(date_format($time, 'Y-m-d H:i:s'));
- - status)->first();?> - priority_id)->first();?> - help_topic_id)->first();?> - - @if($user->ban > 0) @endif +
{!! Lang::get('lang.status') !!}: {{$status->name}}
{!! Lang::get('lang.priority') !!}: {{$priority->priority_desc}}
{!! Lang::get('lang.department') !!}: {{$help_topic->topic}}
{!! Lang::get('lang.email') !!}: {{$user->email}}
- {!! Lang::get('lang.this_ticket_is_under_banned_user')!!}
+
+
status)->first();?> + priority_id)->first();?> + help_topic_id)->first();?> + + @if($user->ban > 0) @endif +
{!! Lang::get('lang.status') !!}: {{$status->name}}
{!! Lang::get('lang.priority') !!}: {{$priority->priority_desc}}
{!! Lang::get('lang.department') !!}: {{$help_topic->topic}}
{!! Lang::get('lang.email') !!}: {{$user->email}}
+ {!! Lang::get('lang.this_ticket_is_under_banned_user')!!}
@@ -221,14 +223,16 @@ echo UTC::usertimezone(date_format($time, 'Y-m-d H:i:s')); $ticket_source = $tickets->source; ?> +
- @if($user->phone_number !=null)
@endif - @if($user->mobile !=null)@endif - - help_topic_id)->first();?> - - - + @if($user->phone_number !=null)@endif + @if($user->mobile !=null)@endif + + help_topic_id)->first();?> + + + +
Phone: {{$user->phone_number}}
Phone: {{$user->ext . $user->phone_number}}
{!! Lang::get('lang.source') !!}: {{$ticket_source}}
{!! Lang::get('lang.help_topic') !!}: {{$help_topic->topic}}
{!! Lang::get('lang.last_message') !!}: {{$username}}
Phone: {{$user->phone_number}}
Phone: {{$user->ext . $user->phone_number}}
{!! Lang::get('lang.source') !!}: {{$ticket_source}}
{!! Lang::get('lang.help_topic') !!}: {{$help_topic->topic}}
{!! Lang::get('lang.last_message') !!}: {{$username}}
@@ -237,6 +241,9 @@ echo UTC::usertimezone(date_format($time, 'Y-m-d H:i:s')); {{-- Event fire --}} +
+
+
@@ -290,15 +297,17 @@ echo UTC::usertimezone(date_format($time, 'Y-m-d H:i:s')); {!! Form::label('To', Lang::get('lang.to').':') !!}
- {!! Form::text('To',$user->email,['disabled'=>'disabled','id'=>'email','class'=>'form-control','style'=>'width:55%'])!!} - {!! $errors->first('To', ':message') !!} - {!! Lang::get('lang.add_cc') !!} -
- id)->get(); - $count_collaborator = count($Collaborator);?> - @if($count_collaborator > 0) - ({!! $count_collaborator !!}) {!! Lang::get('lang.recepients') !!} - @endif +
+ {!! Form::text('To',$user->email,['disabled'=>'disabled','id'=>'email','class'=>'form-control','style'=>'width:55%'])!!} + {!! $errors->first('To', ':message') !!} + {!! Lang::get('lang.add_cc') !!} +
+ id)->get(); + $count_collaborator = count($Collaborator);?> + @if($count_collaborator > 0) + ({!! $count_collaborator !!}) {!! Lang::get('lang.recepients') !!} + @endif +
@@ -349,7 +358,9 @@ $canneds = App\Model\helpdesk\Agent_panel\Canned::where('user_id','=',Auth::user
- +
+ +
@@ -1454,7 +1465,7 @@ $(document).ready(function () { $("#refresh").load("../thread/{{$tickets->id}} #refresh"); $("#refresh1").load("../thread/{{$tickets->id}} #refresh1"); $("#refresh3").load("../thread/{{$tickets->id}} #refresh3"); - $("#t1").load("../thread/{{$tickets->id}} #t1"); + $("#refreshTo").load("../thread/{{$tickets->id}} #refreshTo"); var message = "Success! owner has been changed for this ticket."; $("#alert11").show(); $('#message-success1').html(message); @@ -1486,7 +1497,7 @@ $(document).ready(function () { $("#refresh").load("../thread/{{$tickets->id}} #refresh"); $("#refresh1").load("../thread/{{$tickets->id}} #refresh1"); $("#refresh3").load("../thread/{{$tickets->id}} #refresh3"); - $("#t1").load("../thread/{{$tickets->id}} #t1"); + $("#refreshTo").load("../thread/{{$tickets->id}} #refreshTo"); var message = "Success! owner has been changed for this ticket."; $("#alert11").show(); $('#message-success1').html(message); @@ -1717,10 +1728,7 @@ $(document).ready(function () { return false; } - - $(document).ready(function() { - var locktime = 'collision_avoid;?>'*60*1000; lockAjaxCall(locktime); setInterval(function() {// to call ajax for ticket lock repeatedly after defined lock time interval @@ -1737,7 +1745,6 @@ function lockAjaxCall(locktime){ data: $(this).serialize(), success: function(response) { if(response == 0) { - var message = "{{Lang::get('lang.locked-ticket')}}"; $("#alert22").show(); $('#message-warning2').html(message); @@ -1747,7 +1754,11 @@ function lockAjaxCall(locktime){ // alert(response); // var message = "{{Lang::get('lang.access-ticket')}}"+locktime/(60*1000) // +"{{Lang::get('lang.minutes')}}"; - // $("#alert22").hide(); + $("#alert22").hide(); + $("#refresh").load("../thread/{{$tickets->id}} #refresh"); + $("#refresh1").load("../thread/{{$tickets->id}} #refresh1"); + $("#refresh3").load("../thread/{{$tickets->id}} #refresh3"); + $("#t5").load("../thread/{{$tickets->id}} #t5"); // $("#alert21").show(); // $('#message-success2').html(message); $('#replybtn').attr('disabled', false); @@ -1772,12 +1783,6 @@ function lockAjaxCall(locktime){ $(this).html($('').width(Math.max(0, (Math.min(5, parseFloat($(this).html())))) * 16)); }); } - - - - - - @stop \ No newline at end of file diff --git a/resources/views/themes/default1/client/helpdesk/form.blade.php b/resources/views/themes/default1/client/helpdesk/form.blade.php index 38f5d1bf7..b4f17f111 100644 --- a/resources/views/themes/default1/client/helpdesk/form.blade.php +++ b/resources/views/themes/default1/client/helpdesk/form.blade.php @@ -86,7 +86,6 @@ $helptopic = App\Model\helpdesk\Manage\Help_topic::get(); } ?> - @foreach($helptopic as $topic) @endforeach diff --git a/resources/views/themes/default1/installer/helpdesk/serialkey.blade.php b/resources/views/themes/default1/installer/helpdesk/serialkey.blade.php new file mode 100644 index 000000000..2f5718b96 --- /dev/null +++ b/resources/views/themes/default1/installer/helpdesk/serialkey.blade.php @@ -0,0 +1,73 @@ +@extends('themes.default1.installer.layout.installer') +@section('serial') +active +@stop +@section('content') +
+

Faveo HELPDESK Serial Key

+

Please enter your serial key for Faveo HELPDESK PRO

+ @if(Session::has('success')) +
+
+
+ {{Session::get('success')}}

+
+
+
+ @endif + + @if(Session::has('fails')) +
+
+
+ {{Session::get('fails')}}

+
+
+
+ @endif +
+ + + + +
+ +

+
+ + + + + + + + +
+ +

+ 		+ {!! $errors->first('order_no', ':message') !!} + +

+
+ + + {!! $errors->first('serial', ':message') !!} +  - +  - +  - + +
+
+

+ +

+
+
+ + + + +@stop \ No newline at end of file diff --git a/resources/views/themes/default1/installer/helpdesk/view3.blade.php b/resources/views/themes/default1/installer/helpdesk/view3.blade.php index 282563be3..2da18d0e6 100644 --- a/resources/views/themes/default1/installer/helpdesk/view3.blade.php +++ b/resources/views/themes/default1/installer/helpdesk/view3.blade.php @@ -13,11 +13,23 @@ active @stop @section('content') - +
+ @if(Session::has('fails')) +
+
+
+ {!! Lang::get('lang.fails') !!}! {{Session::get('fails')}}

+
+
+
+ @endif +

Database Setup

+

Below you should enter your database connection details. If you’re not sure about these, contact your host.

+ {!! Form::open(['url'=> '/step4post']) !!} - +
+ + + + + +
+ +
@@ -44,6 +59,10 @@ active + +
@@ -52,6 +71,10 @@ active + +
@@ -61,6 +84,10 @@ active + +
@@ -70,6 +97,10 @@ active + +
@@ -78,6 +109,10 @@ active + +

@@ -88,4 +123,7 @@ active
+ + +
@stop \ No newline at end of file diff --git a/resources/views/themes/default1/installer/helpdesk/view4.blade.php b/resources/views/themes/default1/installer/helpdesk/view4.blade.php index 777d21119..25819de7f 100644 --- a/resources/views/themes/default1/installer/helpdesk/view4.blade.php +++ b/resources/views/themes/default1/installer/helpdesk/view4.blade.php @@ -195,6 +195,15 @@ $(document).ready(function () {

Database connection unsuccessful. This system does not meet Faveo system requirements

+

This either means that the username and password information is incorrect or we can’t contact the database server. This could mean your host’s database server is down.

+
    +
  • Are you sure you have the correct username and password?
    • +
  • Are you sure that you have typed the correct hostname?
    • +
  • Are you sure that the database server is running?
    • +
+

If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the Faveo Support .

+ +

diff --git a/resources/views/themes/default1/installer/helpdesk/view5.blade.php b/resources/views/themes/default1/installer/helpdesk/view5.blade.php index 07e03d519..c3b37b0cd 100644 --- a/resources/views/themes/default1/installer/helpdesk/view5.blade.php +++ b/resources/views/themes/default1/installer/helpdesk/view5.blade.php @@ -17,11 +17,12 @@ active @stop @section('content') - -

+

Locale Information

{!! Form::open(['url'=>route('postaccount')]) !!} + + @if($errors->first('firstname')||$errors->first('Lastname')||$errors->first('email')||$errors->first('username')||$errors->first('password')||$errors->first('confirmpassword'))
@@ -46,10 +47,24 @@ active
@endif -
-
+ + + @if(Session::has('fails')) +
+
+ {{Session::get('fails')}}

+
+
+ @endif + +
-

Personal Information

+ +

Welcome to the five-minute Faveo installation process! Just fill in the information below.

+ +

Personal Information

+

Please provide the following information. Don’t worry, you can always change these settings later.

+
+ + + @@ -96,6 +123,10 @@ active + + +
@@ -59,6 +74,10 @@ active {!! Form::text('firstname',null,['style' =>'margin-left:250px']) !!} + +
@@ -68,6 +87,10 @@ active {!! Form::text('Lastname',null,['style' =>'margin-left:250px']) !!} + +
@@ -77,6 +100,10 @@ active {!! Form::text('email',null,['style' =>'margin-left:250px']) !!} + +
{!! Form::text('username',null,['style' =>'margin-left:195px']) !!} + +
@@ -106,6 +137,10 @@ active + +
@@ -116,6 +151,10 @@ active + +
@@ -130,7 +169,6 @@ active
- @@ -264,6 +305,10 @@ active
+ + + @@ -278,12 +323,15 @@ active ?>
+ + +
@@ -296,4 +344,7 @@ active

+ + +
@stop \ No newline at end of file