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

bug-fix patch1

Browse Source
This commit is contained in:
Manish Verma
2016-09-28 13:27:37 +05:30
parent 88e37f6b27
commit 6f1831e58b
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ class AgentController extends Controller
$departments = $department->get(); $departments = $department->get();
// list all the teams in a single variable // list all the teams in a single variable
$teams = $team->lists('id', 'name')->toArray(); $teams = $team->lists('id', 'name')->toArray();
$location = GeoIP::getLocation(''); $location = GeoIP::getLocation();
$phonecode = $code->where('iso', '=', $location['isoCode'])->first(); $phonecode = $code->where('iso', '=', $location['isoCode'])->first();
// returns to the page with all the variables and their datas // returns to the page with all the variables and their datas
return view('themes.default1.admin.helpdesk.agent.agents.create', compact('assign', 'teams', 'agents', 'timezones', 'groups', 'departments', 'team'))->with('phonecode', $phonecode->phonecode); return view('themes.default1.admin.helpdesk.agent.agents.create', compact('assign', 'teams', 'agents', 'timezones', 'groups', 'departments', 'team'))->with('phonecode', $phonecode->phonecode);
@@ -172,7 +172,7 @@ class AgentController extends Controller
public function edit($id, User $user, Assign_team_agent $team_assign_agent, Timezones $timezone, Groups $group, Department $department, Teams $team, CountryCode $code) public function edit($id, User $user, Assign_team_agent $team_assign_agent, Timezones $timezone, Groups $group, Department $department, Teams $team, CountryCode $code)
{ {
try { try {
$location = GeoIP::getLocation(''); $location = GeoIP::getLocation();
$phonecode = $code->where('iso', '=', $location['isoCode'])->first(); $phonecode = $code->where('iso', '=', $location['isoCode'])->first();
$user = $user->whereId($id)->first(); $user = $user->whereId($id)->first();
$team = $team->get(); $team = $team->get();

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

@@ -159,7 +159,7 @@ class UserController extends Controller
public function create(CountryCode $code) public function create(CountryCode $code)
{ {
try { try {
$location = GeoIP::getLocation(''); $location = GeoIP::getLocation();
$phonecode = $code->where('iso', '=', $location['isoCode'])->first(); $phonecode = $code->where('iso', '=', $location['isoCode'])->first();
return view('themes.default1.agent.helpdesk.user.create')->with('phonecode', $phonecode->phonecode); return view('themes.default1.agent.helpdesk.user.create')->with('phonecode', $phonecode->phonecode);
@@ -263,7 +263,7 @@ class UserController extends Controller
$user = new User(); $user = new User();
/* select the field where id = $id(request Id) */ /* select the field where id = $id(request Id) */
$users = $user->whereId($id)->first(); $users = $user->whereId($id)->first();
$location = GeoIP::getLocation(''); $location = GeoIP::getLocation();
$phonecode = $code->where('iso', '=', $location['isoCode'])->first(); $phonecode = $code->where('iso', '=', $location['isoCode'])->first();
return view('themes.default1.agent.helpdesk.user.edit', compact('users'))->with('phonecode', $phonecode->phonecode); return view('themes.default1.agent.helpdesk.user.edit', compact('users'))->with('phonecode', $phonecode->phonecode);
@@ -333,7 +333,7 @@ class UserController extends Controller
public function getProfileedit(CountryCode $code) public function getProfileedit(CountryCode $code)
{ {
$user = Auth::user(); $user = Auth::user();
$location = GeoIP::getLocation(''); $location = GeoIP::getLocation();
$phonecode = $code->where('iso', '=', $location['isoCode'])->first(); $phonecode = $code->where('iso', '=', $location['isoCode'])->first();
try { try {
return view('themes.default1.agent.helpdesk.user.profile-edit', compact('user'))->with('phonecode', $phonecode->phonecode); return view('themes.default1.agent.helpdesk.user.profile-edit', compact('user'))->with('phonecode', $phonecode->phonecode);

2
app/Http/Controllers/Client/helpdesk/FormController.php
View File

@@ -61,7 +61,7 @@ class FormController extends Controller
if (\Config::get('database.install') == '%0%') { if (\Config::get('database.install') == '%0%') {
return \Redirect::route('licence'); return \Redirect::route('licence');
} }
$location = GeoIP::getLocation(''); $location = GeoIP::getLocation();
$phonecode = $code->where('iso', '=', $location['isoCode'])->first(); $phonecode = $code->where('iso', '=', $location['isoCode'])->first();
if (System::first()->status == 1) { if (System::first()->status == 1) {
$topics = $topic->get(); $topics = $topic->get();

2
app/Http/Controllers/Client/helpdesk/GuestController.php
View File

@@ -55,7 +55,7 @@ class GuestController extends Controller
public function getProfile(CountryCode $code) public function getProfile(CountryCode $code)
{ {
$user = Auth::user(); $user = Auth::user();
$location = GeoIP::getLocation(''); $location = GeoIP::getLocation();
$phonecode = $code->where('iso', '=', $location['isoCode'])->first(); $phonecode = $code->where('iso', '=', $location['isoCode'])->first();
return view('themes.default1.client.helpdesk.profile', compact('user'))->with('phonecode', $phonecode->phonecode); return view('themes.default1.client.helpdesk.profile', compact('user'))->with('phonecode', $phonecode->phonecode);