From 7809bdbc1cc0e12ab0c491421e217c81a046ce79 Mon Sep 17 00:00:00 2001
From: Lukas Jankauskas <as@lukasjankauskas.com>
Date: Sat, 3 Dec 2016 20:31:34 +0000
Subject: [PATCH 1/3] E-mail notification != Daily Summary

Call it what it is.
---
 resources/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 1f50760d8..fb3853242 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -344,7 +344,7 @@ return [
     'clipboard-copy-message'              => 'Copied to clipboard.',
     'click'                               => 'Click here',
     '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',
     'job-scheduler-error'                 => 'Job scheduler can not be updated.',
     'job-scheduler-success'               => 'Job scheduler updated successfully.',

From 25a34655a6c85952c01640b4babae4dd1b938a7a Mon Sep 17 00:00:00 2001
From: Manish Verma <manish.verma@ladybirdweb.com>
Date: Tue, 13 Dec 2016 14:40:24 +0530
Subject: [PATCH 2/3] updates

---
 .../themes/default1/agent/layout/agent.blade.php    | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php
index f6b038195..719548c81 100644
--- a/resources/views/themes/default1/agent/layout/agent.blade.php
+++ b/resources/views/themes/default1/agent/layout/agent.blade.php
@@ -324,18 +324,7 @@
                                 <small class="label pull-right bg-green">{{$overdue_ticket}}</small>
                             </a>
                         </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')>
                              <a href="{{url('trash')}}">
                                 <i class="fa fa-trash-o"></i> <span>{!! Lang::get('lang.trash') !!}</span>

From ea3f4bc15faf701f5d7ae7dcf3acbd843f1c09ad Mon Sep 17 00:00:00 2001
From: Manish Verma <mverma16@outlook.com>
Date: Tue, 13 Dec 2016 09:12:33 +0000
Subject: [PATCH 3/3] Apply fixes from StyleCI

---
 app/Http/Controllers/Auth/AuthController.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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