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 developement

Browse Source
This commit is contained in:
Manish Verma
2016-12-14 02:13:31 +05:30
parent 99177ec5c3 3f5e451a7b
commit 8884287b13
3 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Auth/AuthController.php
View File

@@ -392,14 +392,15 @@ class AuthController extends Controller
if ($request->input('referer')) { if ($request->input('referer')) {
return \Redirect::route($request->input('referer')); return \Redirect::route($request->input('referer'));
} }
return \Redirect::route('/'); return \Redirect::route('/');
} else { } else {
return redirect()->intended($this->redirectPath()); return redirect()->intended($this->redirectPath());
} }
} }
}
}
}
}
return redirect()->back() return redirect()->back()
->withInput($request->only('email', 'remember')) ->withInput($request->only('email', 'remember'))
->withErrors([ ->withErrors([

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

@@ -344,7 +344,7 @@ return [
'clipboard-copy-message' => 'Copied to clipboard.', 'clipboard-copy-message' => 'Copied to clipboard.',
'click' => 'Click here', 'click' => 'Click here',
'check-cron-set' => 'to check how to set cron jobs on your server.', 'check-cron-set' => 'to check how to set cron jobs on your server.',
'notification-email' => 'Email notifications', 'notification-email' => 'Daily Summary',
'click-url-copy' => 'Click here to copy URL', 'click-url-copy' => 'Click here to copy URL',
'job-scheduler-error' => 'Job scheduler can not be updated.', 'job-scheduler-error' => 'Job scheduler can not be updated.',
'job-scheduler-success' => 'Job scheduler updated successfully.', 'job-scheduler-success' => 'Job scheduler updated successfully.',

13
resources/views/themes/default1/agent/layout/agent.blade.php
View File

@@ -324,18 +324,7 @@
<small class="label pull-right bg-green">{{$overdue_ticket}}</small> <small class="label pull-right bg-green">{{$overdue_ticket}}</small>
</a> </a>
</li> </li>
<?php
$settings = App\Model\helpdesk\Settings\Approval::where('id','=',1)->first();
// dd($settings);
?>
{{--@if($settings->status == 1)
<li @yield('approval')>
<a href="{{url('ticket/approval/closed')}}" id="load-unassigned">
<i class="fa fa fa-bell"></i> <span>{!! Lang::get('lang.approval') !!}</span>
<small class="label pull-right bg-green">{{count($closingapproval)}}</small>
</a>
</li>
@endif--}}
<li @yield('trash')> <li @yield('trash')>
<a href="{{url('trash')}}"> <a href="{{url('trash')}}">
<i class="fa fa-trash-o"></i> <span>{!! Lang::get('lang.trash') !!}</span> <i class="fa fa-trash-o"></i> <span>{!! Lang::get('lang.trash') !!}</span>