cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bugg

Browse Source
This commit is contained in:
Manish Verma
2016-10-28 12:18:49 +05:30
parent f7030a1ecd 6509303974
commit 5ecafc2188
3 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/helpdesk/SettingsController.php
View File

@@ -356,8 +356,8 @@ class SettingsController extends Controller
$workflow = $workflow->whereId('1')->first(); $workflow = $workflow->whereId('1')->first();
$cron_path = base_path('artisan'); $cron_path = base_path('artisan');
$command = ":- <pre>***** php $cron_path schedule:run >> /dev/null 2>&1</pre>"; $command = ":- <pre>***** php $cron_path schedule:run > /dev/null 2>&1</pre>";
$shared = ":- <pre>/usr/bin/php-cli -q $cron_path schedule:run >> /dev/null 2>&1</pre>"; $shared = ":- <pre>/usr/bin/php-cli -q $cron_path schedule:run > /dev/null 2>&1</pre>";
$warn = ''; $warn = '';
$condition = new \App\Model\MailJob\Condition(); $condition = new \App\Model\MailJob\Condition();
$job = $condition->checkActiveJob(); $job = $condition->checkActiveJob();

7
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -242,8 +242,10 @@ class UserController extends Controller
} }
// save user credentails // save user credentails
if ($user->save() == true) { if ($user->save() == true) {
if ($request->input('org_id') != '') {
$orgid = $request->input('org_id'); $orgid = $request->input('org_id');
$this->storeUserOrgRelation($user->id, $orgid); $this->storeUserOrgRelation($user->id, $orgid);
}
// fetch user credentails to send mail // fetch user credentails to send mail
$name = $user->first_name; $name = $user->first_name;
$email = $user->email; $email = $user->email;
@@ -491,7 +493,7 @@ class UserController extends Controller
$user = User::find($id); $user = User::find($id);
$user->delete(); $user->delete();
return redirect('user')->with('success', Lang::get('lang.agent_delete_successfully_and_ticket_assign_to_another_user')); return redirect('user')->with('success', Lang::get('lang.agent_delete_successfully_and_ticket_assign_to_another_agent'));
} }
if (User_org::where('user_id', '=', $id)) { if (User_org::where('user_id', '=', $id)) {
DB::table('user_assign_organization')->where('user_id', '=', $id)->delete(); DB::table('user_assign_organization')->where('user_id', '=', $id)->delete();
@@ -613,8 +615,10 @@ class UserController extends Controller
$users->mobile = ($request->input('mobile') == '') ? null : $request->input('mobile'); $users->mobile = ($request->input('mobile') == '') ? null : $request->input('mobile');
$users->fill($request->except('mobile')); $users->fill($request->except('mobile'));
$users->save(); $users->save();
if ($request->input('org_id') != '') {
$orgid = $request->input('org_id'); $orgid = $request->input('org_id');
$this->storeUserOrgRelation($users->id, $orgid); $this->storeUserOrgRelation($users->id, $orgid);
}
/* redirect to Index page with Success Message */ /* redirect to Index page with Success Message */
return redirect('user')->with('success', Lang::get('lang.User-profile-Updated-Successfully')); return redirect('user')->with('success', Lang::get('lang.User-profile-Updated-Successfully'));
} catch (Exception $e) { } catch (Exception $e) {
@@ -748,7 +752,6 @@ class UserController extends Controller
public function UserAssignOrg($id) public function UserAssignOrg($id)
{ {
$org_name = Input::get('org'); $org_name = Input::get('org');
if ($org_name) { if ($org_name) {
$org = Organization::where('name', '=', $org_name)->lists('id')->first(); $org = Organization::where('name', '=', $org_name)->lists('id')->first();
if ($org) { if ($org) {

18
resources/lang/en/lang.php
View File

@@ -1514,20 +1514,20 @@ return [
'confirm_deletion' => 'Confirm Deletion', 'confirm_deletion' => 'Confirm Deletion',
'delete_all_content' => ' Delete all content', 'delete_all_content' => ' Delete all content',
'agent_profile' => 'Agent Profile', 'agent_profile' => 'Agent Profile',
'change_role_to_admin' => 'Change Role To Admin', 'change_role_to_admin' => 'Change role to Admin',
'change_role_to_user' => 'Change Role To User', 'change_role_to_user' => 'Change role to User',
'change_role_to_agent' => 'Change Role To Agent', 'change_role_to_agent' => 'Change role to Agent',
'change_password' => 'Change Password', 'change_password' => 'Change Password',
'role_change' => 'Role Change', 'role_change' => 'Role Change',
'password_generator' => 'Password Generator', 'password_generator' => 'Password Generator',
'depertment' => 'Depertment', 'depertment' => 'Depertment',
'duetoday' => 'Due Today', 'duetoday' => 'Due Today',
'today-due_tickets' => 'Today\'s due ticekts', 'today-due_tickets' => 'Today\'s due ticekts',
'password_change_successfully' => 'Password Change Successfully', 'password_change_successfully' => 'Password changed successfully',
'role_change_successfully' => 'Role Change Successfully', 'role_change_successfully' => 'Role changed successfully',
'user_delete_successfully' => 'User Delete Successfully', 'user_delete_successfully' => 'User deleted successfully',
'agent_delete_successfully' => 'Agent Delete Successfully', 'agent_delete_successfully' => 'Agent deleted successfully',
'select_another_agent' => 'Select Another Agent', 'select_another_agent' => 'Select another agent',
'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent Delete Successfully And Ticket Assign TO Another Agent', 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent',
]; ];