Merge remote-tracking branch 'refs/remotes/origin/master' into manish-bug-fixes-and-updates

app/Http/Controllers/Auth/AuthController.php

@@ -309,9 +309,9 @@ 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, ]);
         }
 
@@ -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([

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.',

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>