diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php
index a984d6ab7..adba3e508 100644
--- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php
+++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php
@@ -356,8 +356,8 @@ class SettingsController extends Controller
$workflow = $workflow->whereId('1')->first();
$cron_path = base_path('artisan');
- $command = ":- ***** php $cron_path schedule:run >> /dev/null 2>&1
";
- $shared = ":- /usr/bin/php-cli -q $cron_path schedule:run >> /dev/null 2>&1
";
+ $command = ":- ***** php $cron_path schedule:run > /dev/null 2>&1
";
+ $shared = ":- /usr/bin/php-cli -q $cron_path schedule:run > /dev/null 2>&1
";
$warn = '';
$condition = new \App\Model\MailJob\Condition();
$job = $condition->checkActiveJob();
diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php
index d71fda410..97c2b9205 100644
--- a/app/Http/Controllers/Agent/helpdesk/UserController.php
+++ b/app/Http/Controllers/Agent/helpdesk/UserController.php
@@ -242,8 +242,10 @@ class UserController extends Controller
}
// save user credentails
if ($user->save() == true) {
- $orgid = $request->input('org_id');
- $this->storeUserOrgRelation($user->id, $orgid);
+ if ($request->input('org_id') != '') {
+ $orgid = $request->input('org_id');
+ $this->storeUserOrgRelation($user->id, $orgid);
+ }
// fetch user credentails to send mail
$name = $user->first_name;
$email = $user->email;
@@ -491,7 +493,7 @@ class UserController extends Controller
$user = User::find($id);
$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)) {
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->fill($request->except('mobile'));
$users->save();
- $orgid = $request->input('org_id');
- $this->storeUserOrgRelation($users->id, $orgid);
+ if ($request->input('org_id') != '') {
+ $orgid = $request->input('org_id');
+ $this->storeUserOrgRelation($users->id, $orgid);
+ }
/* redirect to Index page with Success Message */
return redirect('user')->with('success', Lang::get('lang.User-profile-Updated-Successfully'));
} catch (Exception $e) {
@@ -748,7 +752,6 @@ class UserController extends Controller
public function UserAssignOrg($id)
{
$org_name = Input::get('org');
-
if ($org_name) {
$org = Organization::where('name', '=', $org_name)->lists('id')->first();
if ($org) {
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 2d7ee43db..66d24af99 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -1507,27 +1507,27 @@ return [
* User Module
* --------------------------------------------------------------------------------------------
*/
- 'agent_report' => 'Agent Report',
- 'assign_tickets' => 'Assign Tickets',
- 'delete_agent' => 'Delete Agent',
- 'delete_user' => 'Delete User',
- 'confirm_deletion' => 'Confirm Deletion',
- 'delete_all_content' => ' Delete all content',
- 'agent_profile' => 'Agent Profile',
- 'change_role_to_admin' => 'Change Role To Admin',
- 'change_role_to_user' => 'Change Role To User',
- 'change_role_to_agent' => 'Change Role To Agent',
- 'change_password' => 'Change Password',
- 'role_change' => 'Role Change',
- 'password_generator' => 'Password Generator',
- 'depertment' => 'Depertment',
- 'duetoday' => 'Due Today',
- 'today-due_tickets' => 'Today\'s due ticekts',
- 'password_change_successfully' => 'Password Change Successfully',
- 'role_change_successfully' => 'Role Change Successfully',
- 'user_delete_successfully' => 'User Delete Successfully',
- 'agent_delete_successfully' => 'Agent Delete Successfully',
- '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_report' => 'Agent Report',
+ 'assign_tickets' => 'Assign Tickets',
+ 'delete_agent' => 'Delete Agent',
+ 'delete_user' => 'Delete User',
+ 'confirm_deletion' => 'Confirm Deletion',
+ 'delete_all_content' => ' Delete all content',
+ 'agent_profile' => 'Agent Profile',
+ 'change_role_to_admin' => 'Change role to Admin',
+ 'change_role_to_user' => 'Change role to User',
+ 'change_role_to_agent' => 'Change role to Agent',
+ 'change_password' => 'Change Password',
+ 'role_change' => 'Role Change',
+ 'password_generator' => 'Password Generator',
+ 'depertment' => 'Depertment',
+ 'duetoday' => 'Due Today',
+ 'today-due_tickets' => 'Today\'s due ticekts',
+ 'password_change_successfully' => 'Password changed successfully',
+ 'role_change_successfully' => 'Role changed successfully',
+ 'user_delete_successfully' => 'User deleted successfully',
+ 'agent_delete_successfully' => 'Agent deleted successfully',
+ 'select_another_agent' => 'Select another agent',
+ 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent',
];