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 manish-bug-fixes-and-updates

Browse Source
This commit is contained in:
Manish Verma
2016-12-13 15:23:21 +05:30
parent f28de20e95 3f5e451a7b
commit 789247acb2
3 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,7 +296,7 @@ class AuthController extends Controller
} }
$field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name'; $field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
$result = $this->confirmIPAddress($value, $usernameinput); $result = $this->confirmIPAddress($value, $usernameinput);
// If attempts > 3 and time < 30 minutes // If attempts > 3 and time < 30 minutes
$security = Security::whereId('1')->first(); $security = Security::whereId('1')->first();
if ($result == 1) { if ($result == 1) {
@@ -309,15 +309,15 @@ class AuthController extends Controller
return redirect()->back() return redirect()->back()
->withInput($request->only('email', 'remember')) ->withInput($request->only('email', 'remember'))
->withErrors([ ->withErrors([
'email' => $this->getFailedLoginMessage(), 'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.not-registered'), ])->with(['error' => Lang::get('lang.not-registered'),
'referer' => $referer, ]); 'referer' => $referer, ]);
} }
//if user exists //if user exists
$settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first(); $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first();
if ($settings->status == '1' || $settings->status == 1) { // check for otp verification setting if ($settings->status == '1' || $settings->status == 1) { // check for otp verification setting
// setting is enabled // setting is enabled
$sms = Plugin::select('status')->where('name', '=', 'SMS')->first(); $sms = Plugin::select('status')->where('name', '=', 'SMS')->first();
@@ -328,7 +328,7 @@ class AuthController extends Controller
if (!$check_active->active) { //check account is active or not if (!$check_active->active) { //check account is active or not
// account is not active show verify otp window // account is not active show verify otp window
if ($check_active->mobile) { //check user has mobile or not if ($check_active->mobile) { //check user has mobile or not
// user has mobile number return verify OTP screen // user has mobile number return verify OTP screen
return \Redirect::route('otp-verification') return \Redirect::route('otp-verification')
->withInput($request->input()) ->withInput($request->input())
->with(['values' => $request->input(), ->with(['values' => $request->input(),
@@ -337,7 +337,7 @@ class AuthController extends Controller
'number' => $check_active->mobile, 'number' => $check_active->mobile,
'code' => $check_active->country_code, ]); 'code' => $check_active->country_code, ]);
} else { } else {
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
} }
} else { } else {
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
@@ -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>