diff --git a/.env b/.env index 3c457365c..4a8b4e0e4 100644 --- a/.env +++ b/.env @@ -1,9 +1,9 @@ APP_ENV=local APP_DEBUG=false APP_KEY=SomeRandomString -DB_HOST= -DB_DATABASE= -DB_USERNAME= +DB_HOST=localhost +DB_DATABASE=faveocombine +DB_USERNAME=root DB_PASSWORD= CACHE_DRIVER=file SESSION_DRIVER=file @@ -13,5 +13,5 @@ MAIL_HOST=mailtrap.io MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null -DB_TYPE= +DB_TYPE=mysql DB_PORT= diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 3defbbacd..88fc4f3da 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2220,4 +2220,110 @@ class TicketController extends Controller { } } + + /** + * function to Change owner + * @param type $id + * @return type bool + */ + public function changeOwner($id) { + $action = Input::get('action'); + $email = Input::get('email'); + $ticket_id = Input::get('ticket_id'); + $send_mail = Input::get('send-mail'); + + if($action === 'change-add-owner'){ + $name = Input::get('name'); + $returnValue = $this->changeOwnerAdd($email,$name,$ticket_id); + if($returnValue === 0) { + return 4;//'

Alert!

This user already Exists
'; + } elseif ($returnValue === 2) { + return 5;//'

Alert!

Enter valid email address.
'; + } else{ + //do nothing + } + } + $user = User::where('email','=',$email)->first(); + $count = count($user); + if($count === 1) { + + $user_id = $user->id; + $ticket = Tickets::where('id', '=', $id)->first(); + $ticket_number = $ticket->ticket_number; + $ticket->user_id = $user_id; + $ticket->save(); + $ticket_thread = Ticket_Thread::where('ticket_id','=',$id)->first(); + $ticket_subject = $ticket_thread->title; + $thread = New Ticket_Thread; + $thread->ticket_id = $ticket->id; + $thread->user_id = Auth::user()->id; + $thread->is_internal = 1; + $thread->body = "This ticket now belongs to " . $user->user_name; + $thread->save(); + + //mail functionality + $company = $this->company(); + $system = $this->system(); + + $agent = $user->first_name; + $agent_email = $user->email; + + $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 . ']'); + }); + } + + return 1; + } else { + return 0; + } + } + + /** + * useradd + * @param type Image $image + * @return type json + */ + public function changeOwnerAdd($email,$name,$ticket_id) + { + $name = $name; + $email = $email; + $ticket_id = $ticket_id; + $validator = \Validator::make( + ['email' => $email, + 'name' => $name,], + ['email' => 'required|email', + ]); + $user = User::where('email','=',$email)->first(); + $count = count($user); + if($count === 1) { + return 0;//'

Alert!

This user already Exists
'; + } elseif($validator->fails()){ + return 2;//'

Alert!

Enter valid email address. Exists
'; + + } else { + $company = $this->company(); + $user = new User; + $user->user_name = $name; + $user->email = $email; + $password = $this->generateRandomString(); + $user->password = \Hash::make($password); + $user->role = 'user'; + if ($user->save()) { + $user_id = $user->id; + try { + $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]); + } catch (\Exception $e) { + dd($e); + } + } + return 1;// '

'.$user->user_name.'

'.$user->email.'
'; + } + // return '

'.$data->user_name.'

'.$data->email.'
'; + } + + } diff --git a/app/Http/routes.php b/app/Http/routes.php index a1005eb66..f609353f6 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -32,8 +32,6 @@ $router->get('getmail/{token}', 'Auth\AuthController@getMail'); // Route::get('/system-config',['as'=>'database-config','uses'=>'Api\v1\InstallerApiController@config_system']); // }); - - /* |------------------------------------------------------------------------------- | Admin Routes @@ -175,6 +173,7 @@ Route::group(['middleware' => 'roles', 'middleware' => 'auth'], function () { //Routes for language file upload form-----------You may want to use csrf protection for these route-------------- Route::post('language/add', 'Admin\helpdesk\LanguageController@postForm'); + Route::get('language/add', array('as' => 'add-language', 'uses' => 'Admin\helpdesk\LanguageController@getForm')); //Routes for delete language package @@ -340,9 +339,11 @@ Route::group(['middleware' => 'role.agent', 'middleware' => 'auth'], function () Route::post('rating/{id}/{rating}', ['as' => 'ticket.rating', 'uses' => 'Agent\helpdesk\TicketController@rating']); /* Get overall Ratings */ Route::post('rating2/{id}/{rating}', ['as' => 'ticket.rating2', 'uses' => 'Agent\helpdesk\TicketController@ratingReply']); /* Get reply Ratings */ - // To check and lock tickets Route::get('check/lock/{id}', ['as' => 'lock', 'uses' => 'Agent\helpdesk\TicketController@checkLock']); + + Route::patch('/change-owner/{id}', ['as' => 'change.owner.ticket', 'uses' => 'Agent\helpdesk\TicketController@changeOwner']); /* change owner */ + }); /* @@ -697,4 +698,4 @@ Route::group(['prefix' => 'api/v1'], function() { Route::get('generate/token', 'Api\v1\TestController@generateToken'); Route::get('get/user', 'Api\v1\TestController@getAuthUser'); -}); +}); \ No newline at end of file diff --git a/config/app.php b/config/app.php index e0e159147..76ddb5cdc 100644 --- a/config/app.php +++ b/config/app.php @@ -38,7 +38,7 @@ return [ | */ - 'version' => 'COMMUNITY 1.0.6', + 'version' => 'Community 1.0.6.1', /* |-------------------------------------------------------------------------- diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 76f6f9183..000000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,7 +0,0 @@ -include.path=${php.global.include.path} -php.version=PHP_56 -source.encoding=UTF-8 -src.dir=. -tags.asp=false -tags.short=false -web.root=. diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 63fbc12ef..000000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - org.netbeans.modules.php.project - - - faveo-github - - - diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 1c69b2b99..cb01277f4 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -201,6 +201,10 @@ return array( 'date_time' => 'Date And Time Format', 'day_date_time' => 'Day,Date And Time Format', 'timezone' => 'Default Time Zone', + 'api' => 'Api', + 'api_key' => 'Api Key', + 'api_configurations' => 'Api Configurations', + 'generate_key' => 'Generate key', /* |-------------------------------------- | Email Settings Page @@ -703,6 +707,8 @@ return array( 'access-ticket' => 'Alert! This ticket has been locked by you for next ', 'minutes' => ' minutes', 'in_minutes' => 'In minutes', + 'add_another_owner' => 'Add another owner', + 'search_user' => 'Search user', /* |------------------------------------------------ |Tools Page diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 0a0b6b49b..b06573dca 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -42,7 +42,7 @@
diff --git a/resources/views/themes/default1/admin/helpdesk/emails/emails/index.blade.php b/resources/views/themes/default1/admin/helpdesk/emails/emails/index.blade.php index 893e9bc3a..aa165bd71 100644 --- a/resources/views/themes/default1/admin/helpdesk/emails/emails/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/emails/emails/index.blade.php @@ -32,7 +32,7 @@ class="active"
-

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

{{Lang::get('lang.create_email')}}
+

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

{{Lang::get('lang.create_email')}}
diff --git a/resources/views/themes/default1/admin/helpdesk/setting.blade.php b/resources/views/themes/default1/admin/helpdesk/setting.blade.php index 7220f6cd0..28fab2361 100644 --- a/resources/views/themes/default1/admin/helpdesk/setting.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/setting.blade.php @@ -101,7 +101,7 @@
-
{!! Lang::get('lang.incoming_emails') !!}
+
{!! Lang::get('lang.emails') !!}
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 1dba795cc..12e4c3902 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -842,50 +842,102 @@ $data = $ConvDate[0]; - +