Dynamic menu loading

app/Http/Controllers/AllowancesController.php

@@ -2,15 +2,17 @@
 
 namespace App\Http\Controllers;
 
-use App\Ranges;
-use App\Allowance;
-use App\ListItems;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Request;
 
 class AllowancesController extends Controller
 {
 
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     public function index(){
         $allowances = DB::table('allowance_config')->get();
         $list_items = DB::table('list_items')->get();
@@ -28,7 +30,6 @@ class AllowancesController extends Controller
         return view('Allowances.create', compact(['ranges', 'list_items']));
     }
 
-
     public function store(Request $request)
     {
         $this->validate($request, [

app/Http/Controllers/Auth/LoginController.php

@@ -25,7 +25,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/employees';
 
     /**
      * Create a new controller instance.

app/Http/Controllers/DashboardController.php

-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class DashboardController extends Controller
-{
-    public function index(){
-        return view('Dashboard.dashboard');
-    }
-}

app/Http/Controllers/DeductionsController.php

@@ -7,6 +7,12 @@ use Illuminate\Http\Request;
 
 class DeductionsController extends Controller
 {
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     /**
      * Display a listing of the resource.
      *

app/Http/Controllers/DependantController.php

@@ -7,6 +7,11 @@ use App\Dependants;
 
 class DependantController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     /**
      * Display a listing of the resource.
      *

app/Http/Controllers/EmployeesController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Constants;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use App\Imports\Employee_detailsImport;
@@ -10,100 +11,205 @@ use Maatwebsite\Excel\Facades\Excel;
 use Maatwebsite\Excel\HeadingRowImport;
 use Illuminate\Support\Facades\Input;
 use App\EmployeeTest;
+use App\Dependants;
+use App\Imports;
 
 
 class EmployeesController extends Controller
 {
-    
-    public function index(){
-        Return View('Employees.index');
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $users = DB::table('main_users AS mu')
+                ->join('business_units AS bu', 'bu.id', '=', 'mu.business_unit')
+                ->join('departments AS dp', 'dp.id', '=', 'mu.department')
+                ->join('main_users AS mu_', 'mu_.id', '=', 'mu.reporting_manager')
+                ->select('mu.id', 'mu.employee_id', 'mu.first_name', 'mu.last_name', 'mu.email_address', 'bu.business_unit', 'dp.department_name', 'mu.is_active', 'mu.work_phone', 'mu.job_title', 'mu_.first_name AS reporting_manager', 'mu.personal_phone', 'mu.employee_type', 'mu.role')
+                ->paginate(Constants::RESULTS_PER_PAGE);
+        return View('Employees.index', compact(['users']));
     }
-    //exportation function
-    public function export() 
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        $departments = DB::table('departments')->get();
+        $businessunits = DB::table('business_units')->get();
+        $emergency = DB::table('emergency_contacts')->get();
+        $dependants = DB::table('dependants')->get();
+        return view('Employees.Registration', compact(['departments','businessunits','emergency','dependants']));
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+    public function export()
     {
         try {
             $export=Excel::download(new Employee_detailsExport, 'Employees.xls');
             return $export;
         } catch (\Exception $e) {
             return redirect('/employees')->with('error','Something wrong happened');
-            
+
         }
-        
+
     }
     //importation function
-    public function import(Request $request) 
+    public function import(Request $request)
     {
-        
-        $this->validate($request, array(
-            'file'      => 'required'
-        ));
-        try {
-            if ($request -> hasFile('file')) {
-                $extension = $request ->file ->getClientOriginalExtension();
-                if ($extension == "xlsx" || $extension == "xls" || $extension == "csv" || $extension == "xlsm") {
-                    $name = $request->file->getClientOriginalName();  
-                     
-                    $import = Excel::import(new Employee_detailsImport, request()->file('file'));
-                      dd($import);
-                     return redirect('/employees')->with('success','File has been successfully imported');
-                }
-                else {                 
-                    return redirect('/employees')->with('error','File is a '.$extension.' file.!! Please upload a valid xls/csv file..!!'); 
-                }
-            }
-            
-        }
-        catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
-
-            $failures = $e->failures();  
-            // dd($failures);       
-                            
-            foreach ($failures as $failure) {
-                $failure->row(); // row that went wrong
-                
-                $failure->attribute(); //  column index
-                
-                $failure->errors(); // Actual error messages from Laravel validator 
-                
-                 return redirect('/employees')->withErrors($failures);                                  
-            }                          
-        }           
-        catch(\Exception $e){
+        $import = Excel::import(new Imports, request()->file('file'));
+        dd($import);
+        return redirect('/employees')->with('success','File has been successfully imported');
+
+        /*   $this->validate($request, array(
+              'file'      => 'required'
+          ));
+          try {
+              if ($request -> hasFile('file')) {
+                  $extension = $request ->file ->getClientOriginalExtension();
+                  if ($extension == "xlsx" || $extension == "xls" || $extension == "csv" || $extension == "xlsm" || $extension == "xlsx") {
+                      $name = $request->file->getClientOriginalName();
+
+                      $import = Excel::import(new Employee_detailsImport, request()->file('file'));
+                        dd($import);
+                       return redirect('/employees')->with('success','File has been successfully imported');
+                  }
+                  else {
+                      return redirect('/employees')->with('error','File is a '.$extension.' file.!! Please upload a valid xls/csv file..!!');
+                  }
+              }
+
+          }
+          catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+
+              $failures = $e->failures();
+              // dd($failures);
+
+              foreach ($failures as $failure) {
+                  $failure->row(); // row that went wrong
+
+                  $failure->attribute(); //  column index
+
+                  $failure->errors(); // Actual error messages from Laravel validator
+
+                   return redirect('/employees')->withErrors($failures);
+              }
+          }            */
+        /* catch(\Exception $e){
             return redirect('/employees')->with('error','Something wrong happened');
-        }
-        
-    } 
-    //
-    public function form(){
-        $departments = DB::table('departments')->get();
-        $businessunits = DB::table('business_units')->get();
-        return view('Employees.Registration', compact(['departments','businessunits']));
-        // Return View('Employees.Registration');
-    } 
-    //storing form attributes
-    public function store()
+        } */
+
+    }
+    public function personalinfo(Request $request)
+    {
+        $request->validate([
+            'name'=>'required',
+            'dateofBirth' =>'required',
+            'relation'=>'required',
+
+        ]);
+        $dependant = new Dependants([
+            'name' => $request->get('name'),
+            'dateofBirth'=> $request->get('dateofBirth'),
+            'relation'=> $request->get('relation'),
+
+        ]);
+        $dependant->save();
+        return redirect('/employees/create')->with('success', 'Dependant has been added');
+
+    }
+    public function dependantedit($id){
+        $dependant = Dependants::find($id);
+        return redirect('/employees/create', compact('dependant'));
+    }
+    public function updateDependant(Request $request, $id)
     {
-        $this->validate(request(), [
-            'InputFirstname' => 'required',
-            'InputLastname' => 'required',
-            'InputEmail' => 'required|distinct',
-            'InputGender' => 'required',
-            'InputDate' => 'required',
-            'InputYearsofExperience' => 'required',
+        $request->validate([
+            'name'=>'required',
+            'dateofBirth'   => 'required',
+            'relation'=>'required',
         ]);
-        
-            $form = new EmployeeTest;
-            
-            //$form->employeid = request('employeid');
-            $form->FirstName = request('InputFirstname');
-            $form->LastName = request('InputLastname');
-            $form->Email = request('InputEmail');
-            $form->Gender = request('gender');
-            $form->DateofJoining = request('InputDate');
-            $form->YearsofExperience = request('InputYearsofExperience');
-            $form->save();
-          
-            return redirect('/registration')->with('success','Employee has successfully been added');
-    } 
-   
+
+        $dependant = Dependants::find($id);
+        $dependant->name = $request->get('name');
+        $dependant->dateofBirth = $request->get('dateofBirth');
+        $dependant->relation = $request->get('relation');
+        $dependant->save();
+
+        return redirect('/employees/create')->with('success', 'Dependant has been updated');
+    }
+    public function dependantdestroy($id)
+    {
+        $dependant = Dependants::find($id);
+        dd($dependant);
+        $dependant->delete();
+
+        return redirect('/employees/create')->with('success', 'Dependant has been deleted successfully');
+    }
+
 }

app/Http/Controllers/HomeController.php

@@ -23,15 +23,16 @@ class HomeController extends Controller
      */
     public function index()
     {
-       
-            return view('home');
-        }
-        public function admin()
-        {
-            return view('Employees.index');
-        }
-        public function manager()
-        {
-            return view('Payslip.index');
-        }
+        return view('Home.index');
+    }
+
+    public function admin()
+    {
+        return view('Employees.index');
+    }
+
+    public function manager()
+    {
+        return view('Payslip.index');
+    }
 }

app/Http/Controllers/PayfrequencyController.php

@@ -6,6 +6,12 @@ use Illuminate\Http\Request;
 
 class PayfrequencyController extends Controller
 {
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     /**
      * Display a listing of the resource.
      *

app/Http/Controllers/PayslipController.php

@@ -8,6 +8,11 @@ use Illuminate\Support\Facades\DB;
 class PayslipController extends Controller
 {
 
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     public function index(){
         Return view('Payslip.index');
     }

app/Http/Controllers/ProcessPayrollController.php

@@ -9,6 +9,11 @@ use Illuminate\Support\Arr;
 class ProcessPayrollController extends Controller
 {
 
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     public function index(){
         $business_units = DB::table('business_units')
             ->select('id', 'business_unit')
@@ -456,10 +461,14 @@ class ProcessPayrollController extends Controller
                 }
 
                 ############################################################################################
-                #4. Calculate net pay
+                #4. Calculate gross/taxable/pay after tax/net pay
                 ############################################################################################
                 #Get a list of all the users
                 $users = DB::table('payslips')
+                    ->where([
+                        ['payslips.month', $month],
+                        ['payslips.year', $year]
+                    ])
                     ->join('main_users', 'main_users.id', '=', 'payslips.user_id')
                     ->join('employee_salary_details', 'employee_salary_details.user_id', '=', 'payslips.user_id')
                     ->select(DB::raw('distinct payslips.user_id'), 'employee_salary_details.salary')
@@ -469,7 +478,11 @@ class ProcessPayrollController extends Controller
                 foreach($users as $user){
                     #Get all the details of employee
                     $user_details = DB::table('payslips')
-                        ->where('user_id', $user->user_id)
+                        ->where([
+                            ['user_id', $user->user_id],
+                            ['month', $month],
+                            ['year', $year]
+                        ])
                         ->get();
 
                     $basic_salary = $user->salary;
@@ -482,12 +495,9 @@ class ProcessPayrollController extends Controller
                         if ($user_detail->item == 1){
                             #Allowances
                             $allowances += $user_detail->item_amount;
-                        }else if ($user_detail->item == 2 && $user_detail->tax_option == 1){
+                        }else if ($user_detail->item == 2 && $user_detail->tax_option == 2){
                             #Non-taxable deductions
                             $non_taxable_deductions += $user_detail->item_amount;
-                        /*}else if($user_detail->item == 2 && $user_detail->paye == 1){
-                            #PAYE
-                            $paye += $user_detail->item_amount;*/
                         }else if($user_detail->item == 2 && $user_detail->tax_option == 1){
                             #Taxable deductions
                             $taxable_deductions += $user_detail->item_amount;
@@ -514,18 +524,18 @@ class ProcessPayrollController extends Controller
                     #Add all the allowances to the basic pay to get gross pay
                     $gross_pay = $basic_salary + $allowances;
 
-                    #Start calculating net pay
-                    $net_pay = $gross_pay;
+                    # Get taxable pay
+                    $taxable_pay = $gross_pay - $non_taxable_deductions;
 
-                    #Remove all the non-taxable deductions
-                    $net_pay -= $non_taxable_deductions;
+                    #Start calculating net pay
+                    $net_pay = $taxable_pay;
 
                     #Calculate PAYE here;
                     $paye = 0;
                     $count = 0;
                     foreach ($paye_details as $paye_detail){
-                        if ($paye_detail->lower_limit <= $basic_salary && $paye_detail->upper_limit >= $basic_salary){
-                            $paye_amount = round(($basic_salary - $paye_detail->lower_limit + 1) * round($paye_detail->rate/100, 2), 2);
+                        if ($paye_detail->lower_limit <= $taxable_pay && $paye_detail->upper_limit >= $taxable_pay){
+                            $paye_amount = round(($taxable_pay - $paye_detail->lower_limit + 1) * round($paye_detail->rate/100, 2), 2);
 
                             $paye = $paye + $paye_amount;
                             $count += 1;
@@ -545,15 +555,42 @@ class ProcessPayrollController extends Controller
                     #Remove PAYE
                     $net_pay = $net_pay - $paye;
 
-                    #Remove all taxable deductions
-                    $net_pay = $net_pay - $taxable_deductions;
+                    # Pay After Tax
+                    $pay_after_tax = $net_pay;
 
                     #Add all the reliefs
                     $net_pay = $net_pay + $relief;
 
-                    #Save the paye, gross pay and net pay
+                    #Remove all taxable deductions
+                    $net_pay = $net_pay - $taxable_deductions;
+
+                    #Save the paye, taxable_pay, gross pay and net pay
                     DB::table('payslips')
                         ->insert([
+                            ['user_id' => $user->user_id,
+                                'month' => $month,
+                                'year' => $year,
+                                'item' => 2,
+                                'tax_option' => 1,
+                                'item_name' => 'Pay after tax',
+                                'item_amount' => round($pay_after_tax, 2),
+                                'paye' => 0,
+                                'gross' => 0,
+                                'created_by' => 1,
+                                'created_at' => DB::raw('NOW()')],
+
+                            ['user_id' => $user->user_id,
+                                'month' => $month,
+                                'year' => $year,
+                                'item' => 2,
+                                'tax_option' => 1,
+                                'item_name' => 'Taxable pay',
+                                'item_amount' => round($taxable_pay, 2),
+                                'paye' => 0,
+                                'gross' => 0,
+                                'created_by' => 1,
+                                'created_at' => DB::raw('NOW()')],
+
                             ['user_id' => $user->user_id,
                                 'month' => $month,
                                 'year' => $year,
@@ -561,34 +598,34 @@ class ProcessPayrollController extends Controller
                                 'tax_option' => 1,
                                 'item_name' => 'PAYE',
                                 'item_amount' => round($paye, 2),
-                                'paye' => 0,
+                                'paye' => 1,
                                 'gross' => 0,
                                 'created_by' => 1,
                                 'created_at' => DB::raw('NOW()')],
 
                             ['user_id' => $user->user_id,
-                            'month' => $month,
-                            'year' => $year,
-                            'item' => 2,
-                            'tax_option' => 1,
-                            'item_name' => 'Net pay',
-                            'item_amount' => round($net_pay, 2),
-                            'paye' => 0,
-                            'gross' => 0,
-                            'created_by' => 1,
-                            'created_at' => DB::raw('NOW()')],
+                                'month' => $month,
+                                'year' => $year,
+                                'item' => 2,
+                                'tax_option' => 1,
+                                'item_name' => 'Net pay',
+                                'item_amount' => round($net_pay, 2),
+                                'paye' => 0,
+                                'gross' => 0,
+                                'created_by' => 1,
+                                'created_at' => DB::raw('NOW()')],
 
                             ['user_id' => $user->user_id,
-                            'month' => $month,
-                            'year' => $year,
-                            'item' => 1,
-                            'tax_option' => 1,
-                            'item_name' => 'Gross pay',
-                            'item_amount' => round($gross_pay, 2),
-                            'paye' => 0,
-                            'gross' => 1,
-                            'created_by' => 1,
-                            'created_at' => DB::raw('NOW()')]
+                                'month' => $month,
+                                'year' => $year,
+                                'item' => 1,
+                                'tax_option' => 1,
+                                'item_name' => 'Gross pay',
+                                'item_amount' => round($gross_pay, 2),
+                                'paye' => 0,
+                                'gross' => 1,
+                                'created_by' => 1,
+                                'created_at' => DB::raw('NOW()')]
                         ]);
                 }
 

app/Http/Controllers/RangesController.php

@@ -11,6 +11,11 @@ use phpDocumentor\Reflection\Types\Integer;
 class RangesController extends Controller
 {
 
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     public function index()
     {
         $ranges = DB::table('ranges')->get();

app/Http/Controllers/ReliefController.php

@@ -7,6 +7,12 @@ use Illuminate\Http\Request;
 
 class ReliefController extends Controller
 {
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     /**
      * Display a listing of the resource.
      *

app/Http/Controllers/ReportController.php

@@ -2,83 +2,55 @@
 
 namespace App\Http\Controllers;
 
+use App\Constants;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class ReportController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        //
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
 
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
+    public function __construct()
     {
-        //
+        $this->middleware('auth');
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
+    public function payroll_report(){
+        $month = 1;
+        $year = 2019;
+        $departments_array = [1,2,3,4,5];
+        $business_units_array = [1];
+
+        $departments = implode(',', $departments_array);
+        $business_units = implode(',', $business_units_array);
+
+        # Check whether requested payroll is available
+        $payroll_status = DB::table('processed_payroll')
+            ->where([
+                ['month', $month],
+                ['year', $year],
+                ['departments', $departments],
+                ['business_units', $business_units]
+            ])
+            ->get();
+
+        # Get the titles required for this report
+        $columns = DB::table('payslips')
+            ->where([
+                ['month', $month],
+                ['year', $year]
+            ])
+            ->groupBy('item_name')
+            ->select('item_name', 'item', 'tax_option', 'gross', 'paye')
+            ->orderBy('item')
+            ->get();
+
+        $users = DB::table('main_users')
+            ->whereIn('main_users.department', $departments_array)
+            ->whereIn('main_users.business_unit', $business_units_array)
+            ->join('employee_salary_details', 'employee_salary_details.user_id', '=', 'main_users.id')
+            ->select('main_users.id', 'main_users.department', 'main_users.business_unit', 'main_users.employee_id', 'main_users.first_name', 'main_users.last_name', 'employee_salary_details.salary')
+            ->paginate(Constants::RESULTS_PER_PAGE);
+
+        return view('Report.payroll_report', compact(['payroll_status', 'users', 'columns', 'month', 'year', 'pages']));
     }
 }

app/Http/Middleware/Admin.php

@@ -15,15 +15,13 @@ class Admin
      */
     public function handle($request, Closure $next)
     {
-        if(auth()->user()->isAdmin ==1){
+        if(auth()->user()->isAdmin == 1) {
             return $next($request);
+        }elseif (auth()->user()->isAdmin == 2) {
+            return $next($request);
+        }else{
+            return redirect('home')->with('error','You have no admin access');
         }
-       elseif (auth()->user()->isAdmin==2) {
-        return $next($request);
-       }
-       else{
-        return redirect('home')->with('error','You have no admin access');
-       }     
         
     }
 }

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return redirect('/');
         }
 
         return $next($request);

composer.json

@@ -21,6 +21,9 @@
         "phpunit/phpunit": "^7.0"
     },
     "autoload": {
+        "files": [
+            "app/helpers.php"
+        ],
         "classmap": [
             "database/seeds",
             "database/factories"

config/app.php

@@ -210,6 +210,7 @@ return [
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
         'Excel' => Maatwebsite\Excel\Facades\Excel::class,
+        'Constants' => App\Constants::class
 
     ],
 

config/database.php

@@ -43,14 +43,14 @@ return [
             'driver' => 'mysql',
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
+            'database' => env('DB_DATABASE', 'kinetic'),
+            'username' => env('DB_USERNAME', 'root'),
             'password' => env('DB_PASSWORD', ''),
             'unix_socket' => env('DB_SOCKET', ''),
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
-            'strict' => true,
+            'strict' => false,
             'engine' => null,
         ],
 

resources/lang/en/validation.php

@@ -125,6 +125,9 @@ return [
         'range-rate[].required' => 'Provide a rate for the range',
         'range.required' => 'Select a range',
         'relief-name.required' => 'Provide a relief name',
+        'menu-name.required' => 'Provide a menu name',
+        'url.required' => 'Provide a URL',
+
     ],
 
     /*

resources/views/Dashboard/dashboard.blade.php

-<!doctype html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>Laravel</title>
-
-        <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: 'Nunito', sans-serif;
-                font-weight: 200;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .top-right {
-                position: absolute;
-                right: 10px;
-                top: 18px;
-            }
-
-            .content {
-                text-align: center;
-            }
-
-            .title {
-                font-size: 84px;
-            }
-
-            .links > a {
-                color: #636b6f;
-                padding: 0 25px;
-                font-size: 13px;
-                font-weight: 600;
-                letter-spacing: .1rem;
-                text-decoration: none;
-                text-transform: uppercase;
-            }
-
-            .m-b-md {
-                margin-bottom: 30px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            @if (Route::has('login'))
-                <div class="top-right links">
-                    @auth
-                        <a href="{{ url('/home') }}">Home</a>
-                    @else
-                        <a href="{{ route('login') }}">Login</a>
-
-                        @if (Route::has('register'))
-                            <a href="{{ route('register') }}">Register</a>
-                        @endif
-                    @endauth
-                </div>
-            @endif
-
-            
-            </div>
-        </div>
-    </body>
-</html>

resources/views/Employees/JobtitleConfig.blade.php

@@ -2,23 +2,43 @@
 
 @section('title', 'Employees')
 <style>
-.choose_file {
-    position: relative;
-    display: inline-block;   
-    font: normal 14px Myriad Pro, Verdana, Geneva, sans-serif;
-    color: #7f7f7f;
-    margin-top: 2px;
-    background: white
+form {
+  border-radius: 5px; 
+  width:100%;   
+  background-color: #FFFFFF;
+  overflow: hidden;
+}
+
+p span {
+  color: #F00;
+}
+
+p {
+  margin: 0px;
+  font-weight: 500;
+  line-height: 2;
+  color:#333;
+}
+
+a {
+  text-decoration:inherit
 }
-#import_file{
-    -webkit-appearance:none; 
-    position:absolute;
-    top:0;
-    left:0;
-    opacity:0;
-    width: 100%;
-    height: 100%;
+
+
+.form-group {
+  overflow: hidden;
+  clear: both;
 }
+ .form-control {
+    
+    position:relative;
+    clear: both;    
+    margin-top: 2px;
+    display:inline-block;    
+    margin-right: 10px;
+ }
+
+
 </style>
 
 @section('content')
@@ -26,7 +46,7 @@
             <section class="scrollable padder">
                 <ul class="breadcrumb no-border no-radius b-b b-light pull-in">
                     <li><a href="."><i class="fa fa-home"></i> Home</a></li>                    
-                    <li class="active">Pay Frequency</li>
+                    <li class="active">Job Title</li>
                 </ul>              
                
         @if ( session('success') )
@@ -61,9 +81,9 @@
 @endif
 <div class=container-fluid>
 <div class=row>
-    <legend style="padding:25px 5px 5px 10px">Pay Frequency</legend>
+    <legend style="padding:25px 5px 5px 10px">Job Title</legend>
     <div class="pull-right" style="margin:5px 20px 5px 10px;">
-                <a href="" class="btn btn-info btn-sm"><i class="fa fa-plus"></i></a>
+                <a href="" class="btn btn-info btn-sm" data-toggle="modal" data-target="#createJobtitle"><i class="fa fa-plus"></i>Add Job Title</a>
     </div>
 </div>
     <div class=row style="padding:0px 5px 5px 10px">
@@ -98,6 +118,50 @@
     </div>
 </div>
 </section>
+</section>
+
+<!-- Modal -->
+<div class="modal fade" id="createJobtitle" role="dialog">
+    <div class="modal-dialog">
+    
+      <!-- Modal content-->
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal">&times;</button>
+          <h4 class="modal-title">Pay Frequency</h4>
+        </div>
+        <div class="modal-body">
+            <form method="post" action="" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;"> 
+            <div class=form-group style="padding-left:20px">     
+            <p>Pay Frequency<span>*</span></p>	
+                <input name="payfrequency" type="text" class="form-control" id="payfrequency" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
+                          required>
+            </div>
+            <div class=form-group style="padding-left:20px">     
+            <p>Short Code <span>*</span></p>	
+                <input name="shortcode" type="text" class="form-control" id="shortcode" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
+                          required>
+            </div>
+            <div class=form-group style="padding-left:20px">     
+            <p>Description <span>*</span></p>	
+                <input name="description" type="text" class="form-control" id="description" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
+                          required>            </div>
+            </form> 
+        </div>
+        <div class="modal-footer">
+        <button type="button" onclick="form_submit()" class="btn btn-primary">Save changes</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
+      </div>
+      
+    </div>
+  </div>
+  
+<script type="text/javascript">
+function form_submit() {
+  document.getElementById("my_form").submit();
+ }
+</script>
   
  @endsection
  @section('footer-include')

resources/views/Employees/PayfrequencyConfig.blade.php

-@extends('Layout.Employeesmaster')
-
-@section('title', 'Employees')
-<style>
-form {
-  border-radius: 5px; 
-  width:100%;   
-  background-color: #FFFFFF;
-  overflow: hidden;
-}
-
-p span {
-  color: #F00;
-}
-
-p {
-  margin: 0px;
-  font-weight: 500;
-  line-height: 2;
-  color:#333;
-}
-
-a {
-  text-decoration:inherit
-}
-
-
-.form-group {
-  overflow: hidden;
-  clear: both;
-}
- .form-control {
-    
-    position:relative;
-    clear: both;    
-    margin-top: 2px;
-    display:inline-block;    
-    margin-right: 10px;
- }
-
-
-</style>
-
-@section('content')
-    <section id="content">    
-            <section class="scrollable padder">
-                <ul class="breadcrumb no-border no-radius b-b b-light pull-in">
-                    <li><a href="."><i class="fa fa-home"></i> Home</a></li>                    
-                    <li class="active">Pay Frequency</li>
-                </ul>              
-               
-        @if ( session('success') )
-        <div class="alert alert-success alert-dismissible" role="alert">
-          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">×</span>
-            <span class="sr-only">Close</span>
-        </button>
-        <strong>{{ session('success') }}</strong>
-    </div>
-    @endif
- 
-    @if (session('error'))
-    <div class="alert alert-danger alert-dismissible" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">×</span>
-            <span class="sr-only">Close</span>
-        </button>
-        <strong>{{ session('error') }}</strong>
-    </div>
-    @endif
- 
-    @if (count($errors) > 0)
-    <div class="alert alert-danger">
-      <a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
-      <div>
-        @foreach ($errors->all() as $error)
-        <p>{{ $error }}</p>
-        @endforeach
-    </div>
-</div>
-@endif
-<div class=container-fluid>
-<div class=row>
-    <legend style="padding:25px 5px 5px 10px">Pay Frequency</legend>
-    <div class="pull-right" style="margin:5px 20px 5px 10px;">
-                <a href="" class="btn btn-info btn-sm" data-toggle="modal" data-target="#createPayfrequency"><i class="fa fa-plus"></i></a>
-    </div>
-</div>
-    <div class=row style="padding:0px 5px 5px 10px">
-        <div class="table-responsive" style="padding:0px 5px 5px 10px">
-            <table class="table table-striped m-b-sm datagrid">
-                <thead>
-                   <tr>
-                    <th>Action</th>
-                    <th>Pay Frequency</th>
-                    <th>Short Code</th>
-                    <th>Description</th>
-                   </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td>
-                        <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-eye no-margin"></i></span></a>
-                        <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-edit no-margin"></i></span></a>   
-                        <a href=""><span class="btn btn-danger btn-sm"><i class="fa fa-trash no-margin"></i></span></a>                     
-                    </td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                </tr>                               
-                <tr>
-                   <td colspan="2" class="text-center">Nothing to display</td>
-                </tr>
-                </tbody>
-            </table>
-        </div>                
-    </div>
-</div>
-</section>
-</section>
-
-<!-- Modal -->
-<div class="modal fade" id="createPayfrequency" role="dialog">
-    <div class="modal-dialog">
-    
-      <!-- Modal content-->
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">&times;</button>
-          <h4 class="modal-title">Pay Frequency</h4>
-        </div>
-        <div class="modal-body">
-            <form method="post" action="" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;"> 
-            <div class=form-group style="padding-left:20px">     
-            <p>Pay Frequency<span>*</span></p>	
-                <input name="payfrequency" type="text" class="form-control" id="payfrequency" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
-                          required>
-            </div>
-            <div class=form-group style="padding-left:20px">     
-            <p>Short Code <span>*</span></p>	
-                <input name="shortcode" type="text" class="form-control" id="shortcode" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
-                          required>
-            </div>
-            <div class=form-group style="padding-left:20px">     
-            <p>Description <span>*</span></p>	
-                <input name="description" type="text" class="form-control" id="description" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
-                          required>            </div>
-            </form> 
-        </div>
-        <div class="modal-footer">
-        <button type="button" onclick="form_submit()" class="btn btn-primary">Save changes</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-      </div>
-      
-    </div>
-  </div>
-  
-<script type="text/javascript">
-function form_submit() {
-  document.getElementById("my_form").submit();
- }
-</script>
-  
- @endsection
- @section('footer-include')
-    <!-- fuelux -->
-    <script src="/js/libs/underscore-min.js"></script>
-    <script src="/js/fuelux/fuelux.js"></script>
-    {{--<script src="js/fuelux/demo.datagrid.js"></script>--}}
-    <!-- select2 -->
-@endsection
-
-@section('j-script')
-    <!-- Jquery -->
-    <script>
-        $(document).on('ready', function(){
-
-        });
-       
-    </script>
-
-@endsection
\ No newline at end of file

resources/views/Layout/master.blade.php

+<?php
+
+?>
 <!DOCTYPE html>
 <html lang="en" class="app">
 <head>
     <meta charset="utf-8" />
-    <title>@yield('title', 'Kinetic HRM')</title>
+    <title>@yield('title', \App\Constants::APP_NAME)</title>
     <meta name="description" content="" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
     <meta name="csrf-token" content="{{ csrf_token() }}">
@@ -97,7 +100,7 @@
             <span class="thumb-sm avatar pull-left">
               <img src="/images/avatar.jpg">
             </span>
-                    Michael Jackson
+                    {{ \Illuminate\Support\Facades\Auth::user()->name}}
                     <b class="caret"></b>
                 </a>
                 <ul class="dropdown-menu animated fadeInRight">
@@ -119,11 +122,14 @@
                     </li>
                     <li class="divider"></li>
                     <li>
-                        <a href="modal.lockme.html" data-toggle="ajaxModal" >Logout</a>
+                        <a href="{{ route('logout') }}" onclick="event.preventDefault();document.getElementById('logout-form').submit()">Logout</a>
                     </li>
                 </ul>
             </li>
         </ul>
+        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+            @csrf
+        </form>
     </header>
     <section>
         <section class="hbox stretch">
@@ -132,15 +138,14 @@
                 <section class="vbox">
                     <header class="header bg-warning lter text-center clearfix">
                         <div class="btn-group">
-                            <button type="button" class="btn btn-sm btn-dark btn-icon" title="New project"><i class="fa fa-plus"></i></button>
                             <div class="btn-group hidden-nav-xs">
                                 <button type="button" class="btn btn-sm btn-success dropdown-toggle" data-toggle="dropdown">
-                                    Switch Project
+                                    {{-- Display the current active module here --}}
+                                    Select another module here
                                     <span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu text-left">
-                                    <li><a href="allowances">Payroll</a></li>
-                                    <li><a href="employees">Employees</a></li>
+                                    <?php echo h_get_main_modules() ?>
                                 </ul>
                             </div>
                         </div>
@@ -151,97 +156,9 @@
                             <!-- nav -->
                             <nav class="nav-primary hidden-xs">
                                 <ul class="nav">
-                                    <li>
-                                        <a href=".">
-                                            <i class="fa fa-dashboard icon">
-                                                <b class="bg-danger"></b>
-                                            </i>
-                                            <span>Dashboard</span>
-                                        </a>
-                                    </li>
                                     <li  class="active">
-                                        <a href="." class="active">
-                                            <i class="fa fa-folder icon">
-                                                <b class="bg-danger"></b>
-                                            </i>
-                                            <span class="pull-right">
-                                              <i class="fa fa-angle-down text"></i>
-                                              <i class="fa fa-angle-up text-active"></i>
-                                            </span>
-                                            <span>Payroll</span>
-                                        </a>
                                         <ul class="nav lt">
-                                            <li class="active">
-                                                <a href="#" class="active">
-                                                    <i class="fa fa-angle-down text"></i>
-                                                    <i class="fa fa-angle-up text-active"></i>
-                                                    <span>Payroll items</span>
-                                                </a>
-                                                <ul class="nav bg">
-                                                    <li>
-                                                        <a href="/allowances">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Allowances</span>
-                                                        </a>
-                                                    </li>
-                                                    <li>
-                                                        <a href="/deductions">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Deductions</span>
-                                                        </a>
-                                                    </li>
-                                                    <li>
-                                                        <a href="/relief">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Relief</span>
-                                                        </a>
-                                                    </li>
-                                                    <li>
-                                                        <a href="/ranges">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Range manager</span>
-                                                        </a>
-                                                    </li>
-                                                </ul>
-                                            </li>
-                                            <li>
-                                                <a href="#">
-                                                    <i class="fa fa-angle-right"></i>
-                                                    <span>Process payroll</span>
-                                                </a>
-                                                <ul class="nav bg">
-                                                    {{--<li>
-                                                        <a href="/processing_options">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Processing options</span>
-                                                        </a>
-                                                    </li>
-                                                    <li>
-                                                        <a href="/payslip_structure">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Payslip structure</span>
-                                                        </a>
-                                                    </li>--}}
-                                                    <li>
-                                                        <a href="/process_payroll/">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Process payroll</span>
-                                                        </a>
-                                                    </li>
-                                                </ul>
-                                            </li>
-                                            <li>
-                                                <a href="#">
-                                                    <i class="fa fa-angle-right"></i>
-                                                    <span>Payslip</span>
-                                                </a>
-                                            </li>
-                                            <li>
-                                                <a href="#">
-                                                    <i class="fa fa-angle-right"></i>
-                                                    <span>Reports</span>
-                                                </a>
-                                            </li>
+                                            <?php echo h_load_main_menu(); ?>
                                         </ul>
                                     </li>
                                 </ul>
@@ -308,6 +225,26 @@
     });
 
     let errorMessage = "Something went wrong. Contact system administrator.";
+
+    $(document).on('click', '.module-shifter', function(){
+        let data = 'module_id=' + $(this).data('moduleId');
+
+        let changeModuleRequest = $.ajax({
+            type:'POST',
+            url:'menus/change_module',
+            data:data,
+            timeout:10000,
+            success:function(){
+                window.location = $(this).attr('href');
+            },
+            error(x,t,m){
+                if (t === "timeout"){
+                    changeModuleRequest.abort();
+                    console.log('Request time out');
+                }
+            }
+        })
+    });
 </script>
 @yield('j-script')
 </body>

resources/views/ProcessPayroll/index.blade.php

-@extends('Layout.Payslipmaster')
+@extends('Layout.master')
 
 @section('title', 'Process payroll')
 
@@ -99,7 +99,7 @@
                                                 <td>1/5</td>
                                                 <td>
                                                     <span class="btn btn-default btn-sm"><i class="fa fa-eye no-margin"></i></span>
-                                                    <span class="btn btn-info btn-sm">Re-Run</span>
+                                                    <span class="btn btn-info btn-sm" data-year="" data-month="">Re-Run</span>
                                                     <span class="btn btn-danger btn-sm"><i class="fa fa-trash no-margin"></i></span>
                                                 </td>
                                             </tr>

resources/views/auth/login.blade.php

-@extends('layouts.app')
+<!DOCTYPE html>
+<html lang="en" class="bg-dark">
+<head>
+    <meta charset="utf-8"/>
+    <!-- CSRF Token -->
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    <title>{{ \App\Constants::APP_NAME }}&emsp;&middot;&emsp;Login</title>
+    <meta name="description" content="app, web app, responsive, admin dashboard, admin, flat, flat ui, ui kit, off screen nav" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+    <link rel="stylesheet" href="/css/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="/css/animate.css" type="text/css" />
+    <link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
+    <link rel="stylesheet" href="/css/font.css" type="text/css" />
+    <link rel="stylesheet" href="/css/app.css" type="text/css" />
+    <!--[if lt IE 9]>
+    <script src="/js/ie/html5shiv.js"></script>
+    <script src="/js/ie/respond.min.js"></script>
+    <script src="/js/ie/excanvas.js"></script>
+    <![endif]-->
+</head>
+<style>
+    .logo{
+        width:150px;
+    }
+</style>
+<body class="">
+<section id="content" class="m-t-lg wrapper-md animated fadeInUp">
+    <div class="container aside-xxl">
+        <img class="logo" src="/images/kinetic.png" alt="{{ \App\Constants::APP_NAME }} Logo">
+        <section class="panel panel-default bg-white m-t-lg">
+            <header class="panel-heading text-center">
+                <strong>Sign in</strong>
+            </header>
+            <form method="POST" action="{{ route('login') }}" class="panel-body wrapper-lg">
+                @csrf
 
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Login') }}</div>
+                <div class="form-group">
+                    <label class="control-label">{{ __('E-Mail Address') }}</label>
+                    <input id="email" type="email" placeholder="test@example.com" class="form-control {{ $errors->has('email') ? ' input-danger' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
 
-                <div class="card-body">
-                    <form method="POST" action="{{ route('login') }}">
-                        @csrf
-
-                        <div class="form-group row">
-                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
-
-                                @if ($errors->has('email'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('email') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
-
-                                @if ($errors->has('password'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('password') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <div class="col-md-6 offset-md-4">
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
-
-                                    <label class="form-check-label" for="remember">
-                                        {{ __('Remember Me') }}
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="form-group row mb-0">
-                            <div class="col-md-8 offset-md-4">
-                                <button type="submit" class="btn btn-primary">
-                                    {{ __('Login') }}
-                                </button>
+                    @if ($errors->has('email'))
+                        <span class="error text-danger" role="alert">
+                            <strong>{{ $errors->first('email') }}</strong>
+                        </span>
+                    @endif
+                </div>
+                <div class="form-group">
+                    <label class="control-label">{{ __('Password') }}</label>
+                    <input id="password" type="password" placeholder="Password" class="form-control {{ $errors->has('password') ? ' input-danger' : '' }}" name="password" required>
 
-                                @if (Route::has('password.request'))
-                                    <a class="btn btn-link" href="{{ route('password.request') }}">
-                                        {{ __('Forgot Your Password?') }}
-                                    </a>
-                                @endif
-                            </div>
-                        </div>
-                    </form>
+                    @if ($errors->has('password'))
+                        <span class="error text-danger" role="alert">
+                            <strong>{{ $errors->first('password') }}</strong>
+                        </span>
+                    @endif
+                </div>
+                <div class="form-group">
+                    <div class="checkbox">
+                        <label for="remember">
+                            <input type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
+                            {{ __('Remember Me') }}
+                        </label>
+                    </div>
                 </div>
-            </div>
-        </div>
+                @if (Route::has('password.request'))
+                    <a href="{{ route('password.request') }}" class="m-t-xs">
+                        <small>{{ __('Forgot Your Password?') }}</small>
+                    </a>
+                @endif
+                <button type="submit" class="btn btn-success pull-right">{{ __('Login') }}</button>
+            </form>
+        </section>
+    </div>
+</section>
+<!-- footer -->
+<footer id="footer">
+    <div class="text-center padder">
+        <p>
+            <small>{{ \App\Constants::APP_NAME }}<br>&copy; {{ @date('Y') }}</small>
+        </p>
     </div>
-</div>
-@endsection
+</footer>
+<!-- / footer -->
+<script src="/js/jquery.min.js"></script>
+<!-- Popper JS -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+<!-- Bootstrap -->
+<script src="/js/bootstrap.js"></script>
+<!-- App -->
+<script src="/js/app.js"></script>
+<script src="/js/slimscroll/jquery.slimscroll.min.js"></script>
+<script src="/js/app.plugin.js"></script>
+</body>
+</html>
\ No newline at end of file

resources/views/home.blade.php

-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">Dashboard</div>
-                <?php if(auth()->user()->isAdmin == 1)
-                {?>
-                <div class="panel-body">
-                <a href="{{url('admin/routes')}}">Admin</a>
-                </div>
-                <?php } 
-                elseif(auth()->user()->isAdmin == 2)
-                {?>
-                <div class="panel-body">
-                <a href="{{url('manager/routes')}}">Manager</a>
-                </div>
-                <?php } 
-                elseif(auth()->user()->isAdmin == 3)
-                {?>
-                <div class="panel-body">
-                <a href="{{url('manager/routes')}}">Manager</a>
-                </div>
-                <?php } 
-                else echo '<div class="panel-heading">Normal User</div>';?>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection
-

resources/views/layouts/app.blade.php

@@ -58,8 +58,7 @@
 
                                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
                                     <a class="dropdown-item" href="{{ route('logout') }}"
-                                       onclick="event.preventDefault();
-                                                     document.getElementById('logout-form').submit();">
+                                       onclick="event.preventDefault();document.getElementById('logout-form').submit();">
                                         {{ __('Logout') }}
                                     </a>
 

resources/views/welcome.blade.php

-<!doctype html>
-<html lang="{{ app()->getLocale() }}">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>Laravel</title>
-
-        <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: 'Nunito', sans-serif;
-                font-weight: 200;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .top-right {
-                position: absolute;
-                right: 10px;
-                top: 18px;
-            }
-
-            .content {
-                text-align: center;
-            }
-
-            .title {
-                font-size: 84px;
-            }
-
-            .links > a {
-                color: #636b6f;
-                padding: 0 25px;
-                font-size: 12px;
-                font-weight: 600;
-                letter-spacing: .1rem;
-                text-decoration: none;
-                text-transform: uppercase;
-            }
-
-            .m-b-md {
-                margin-bottom: 30px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            @if (Route::has('login'))
-                <div class="top-right links">
-                    @auth
-                        <a href="{{ url('/home') }}">Home</a>
-                    @else
-                        <a href="{{ route('login') }}">Login</a>
-                        <a href="{{ route('register') }}">Register</a>
-                    @endauth
-                </div>
-            @endif
-
-            <div class="content">
-                <div class="title m-b-md">
-                    Laravel
-                </div>
-
-                <div class="links">
-                    <a href="https://laravel.com/docs">Documentation</a>
-                    <a href="https://laracasts.com">Laracasts</a>
-                    <a href="https://laravel-news.com">News</a>
-                    <a href="https://nova.laravel.com">Nova</a>
-                    <a href="https://forge.laravel.com">Forge</a>
-                    <a href="https://github.com/laravel/laravel">GitHub</a>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>

routes/web.php

@@ -11,10 +11,23 @@
 |
 */
 
-#Dashboard
-Route::get('/', 'DashboardController@index');
-Route::get('/dashboard', 'DashboardController@index');
+########################################################################################################################
+# Authentication #######################################################################################################
+########################################################################################################################
+Auth::routes();
+
+# Home (Dashboard)
+Route::get('/', 'HomeController@index');
+
+Route::get('admin/routes', 'HomeController@admin')->middleware('admin');
+Route::get('manager/routes', 'HomeController@manager')->middleware('admin');
+
 
+
+
+########################################################################################################################
+# Payroll ##############################################################################################################
+########################################################################################################################
 /**********************- To be shared by all 3 payroll items -********************/
 
 Route::post('/allowances/employees/save_selected_employees', 'AllowancesController@save_selected_employees');
@@ -24,60 +37,71 @@ Route::post('/allowances/employees/delete_group', 'AllowancesController@delete_g
 
 /**********************- To be shared by all 3 payroll items -********************/
 
-#Allowances
+# Allowances
 Route::get('/allowances/edit_group/{group_id}', 'AllowancesController@edit_group');
 Route::get('/allowances/employees/{allowance}', 'AllowancesController@add_employees');
 Route::resource('/allowances', 'AllowancesController');
 Route::post('/allowances/destroy', 'AllowancesController@destroy');
 
-#Range
+# Range
 Route::get('/ranges/edit/{range_id}', 'RangesController@edit');
 Route::resource('/ranges', 'RangesController');
 Route::post('/ranges/destroy', 'RangesController@destroy');
 
-#Relief
+# Relief
 Route::get('/relief/edit_group/{group_id}', 'ReliefController@edit_group');
 Route::get('/relief/employees/{relief}', 'ReliefController@add_employees');
 Route::resource('/relief', 'ReliefController');
 Route::post('/relief/destroy', 'ReliefController@destroy');
 
-#Deductions
+# Deductions
 Route::get('/deductions/edit_group/{group_id}', 'DeductionsController@edit_group');
 Route::get('/deductions/employees/{deduction}', 'DeductionsController@add_employees');
 Route::resource('/deductions', 'DeductionsController');
 Route::post('/deductions/destroy', 'DeductionsController@destroy');
 
-#Dashboard
-Route::get('/dashboard', 'DashboardController@index');
-
-#ProcessPayrollController
+# ProcessPayrollController
 Route::post('/process_payroll/process', 'ProcessPayrollController@process_payroll');
 Route::resource('/process_payroll', 'ProcessPayrollController');
 
-#PayslipController
+# PayslipController
 Route::get('/payslip', 'PayslipController@index');
 Route::get('/payslip/view_payslip', 'PayslipController@view_payslip');
 
-#EmployeesController
+
+
+
+########################################################################################################################
+# Employees ############################################################################################################
+########################################################################################################################
+# EmployeesController
 Route::resource('/employees','EmployeesController');
 Route::get('/employees/export', 'EmployeesController@export')->name('export');
 Route::post('/employees/import', 'EmployeesController@import')->name('import');
 
-/* Route::post('/employees/create/dependants', 'EmployeeController@dependantstore')->name('dependantstore');
-Route::post('/employees/dependantsupdate', 'EmployeeController@updateDependant')->name('updateDependant');
-Route::get('/employees/create/dependants{id}', 'EmployeeController@dependantdestroy')->name('dependantdelete'); */
-
-#PayfrequencyController
+# PayfrequencyController
 Route::resource('/payfrequency', 'PayfrequencyController');
 
-#EmergencyController
+# EmergencyController
 Route::resource('/employees/create/emergency','EmergencyController');
 Route::resource('/employees/create/dependants','DependantController');
 
-Auth::routes();
 
-Route::get('/home', 'HomeController@index')->name('home');
-Route::get('admin/routes', 'HomeController@admin')->middleware('admin');
-Route::get('manager/routes', 'HomeController@manager')->middleware('admin');
 
 
+########################################################################################################################
+# Reports ##############################################################################################################
+########################################################################################################################
+
+# Payroll report
+Route::get('/report/payroll_report', 'ReportController@payroll_report');
+
+
+
+
+########################################################################################################################
+# Menu manager #########################################################################################################
+########################################################################################################################
+# Resource link generator
+Route::resource('/menus', 'MenusController');
+Route::get('/menus/change_menu', 'MenusController@change_menu');
\ No newline at end of file

vendor/composer/ClassLoader.php

@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
     }
 
     /**
@@ -377,7 +377,7 @@ class ClassLoader
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
                     $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {

vendor/composer/autoload_classmap.php

@@ -8,8 +8,7 @@ $baseDir = dirname($vendorDir);
 return array(
     'App\\Allowance' => $baseDir . '/app/Allowance.php',
     'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
-    'App\\Dependants' => $baseDir . '/app/Dependants.php',
-    'App\\EmergencyContact' => $baseDir . '/app/EmergencyContact.php',
+    'App\\Constants' => $baseDir . '/app/Constants.php',
     'App\\EmployeeTest' => $baseDir . '/app/EmployeeTest.php',
     'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php',
     'App\\Exports\\Employee_detailsExport' => $baseDir . '/app/Exports/Employee_detailsExport.php',
@@ -22,14 +21,17 @@ return array(
     'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
     'App\\Http\\Controllers\\DashboardController' => $baseDir . '/app/Http/Controllers/DashboardController.php',
     'App\\Http\\Controllers\\DeductionsController' => $baseDir . '/app/Http/Controllers/DeductionsController.php',
+    'App\\Http\\Controllers\\DependantController' => $baseDir . '/app/Http/Controllers/DependantController.php',
     'App\\Http\\Controllers\\EmergencyController' => $baseDir . '/app/Http/Controllers/EmergencyController.php',
-    'App\\Http\\Controllers\\EmployeeController' => $baseDir . '/app/Http/Controllers/EmployeeController.php',
+    'App\\Http\\Controllers\\EmployeesController' => $baseDir . '/app/Http/Controllers/EmployeesController.php',
     'App\\Http\\Controllers\\HomeController' => $baseDir . '/app/Http/Controllers/HomeController.php',
+    'App\\Http\\Controllers\\MenusController' => $baseDir . '/app/Http/Controllers/MenusController.php',
     'App\\Http\\Controllers\\PayfrequencyController' => $baseDir . '/app/Http/Controllers/PayfrequencyController.php',
     'App\\Http\\Controllers\\PayslipController' => $baseDir . '/app/Http/Controllers/PayslipController.php',
     'App\\Http\\Controllers\\ProcessPayrollController' => $baseDir . '/app/Http/Controllers/ProcessPayrollController.php',
     'App\\Http\\Controllers\\RangesController' => $baseDir . '/app/Http/Controllers/RangesController.php',
     'App\\Http\\Controllers\\ReliefController' => $baseDir . '/app/Http/Controllers/ReliefController.php',
+    'App\\Http\\Controllers\\ReportController' => $baseDir . '/app/Http/Controllers/ReportController.php',
     'App\\Http\\Kernel' => $baseDir . '/app/Http/Kernel.php',
     'App\\Http\\Middleware\\Admin' => $baseDir . '/app/Http/Middleware/Admin.php',
     'App\\Http\\Middleware\\Authenticate' => $baseDir . '/app/Http/Middleware/Authenticate.php',
@@ -41,7 +43,6 @@ return array(
     'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php',
     'App\\Imports\\Employee_detailsImport' => $baseDir . '/app/Imports/Employee_detailsImport.php',
     'App\\ListItems' => $baseDir . '/app/ListItems.php',
-    'App\\PayFrequency' => $baseDir . '/app/PayFrequency.php',
     'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php',
     'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php',
     'App\\Providers\\BroadcastServiceProvider' => $baseDir . '/app/Providers/BroadcastServiceProvider.php',
@@ -2590,7 +2591,7 @@ return array(
     'PHPUnit\\Util\\Configuration' => $vendorDir . '/phpunit/phpunit/src/Util/Configuration.php',
     'PHPUnit\\Util\\ConfigurationGenerator' => $vendorDir . '/phpunit/phpunit/src/Util/ConfigurationGenerator.php',
     'PHPUnit\\Util\\ErrorHandler' => $vendorDir . '/phpunit/phpunit/src/Util/ErrorHandler.php',
-    'PHPUnit\\Util\\FileLoader' => $vendorDir . '/phpunit/phpunit/src/Util/FileLoader.php',
+    'PHPUnit\\Util\\FileLoader' => $vendorDir . '/phpunit/phpunit/src/Util/Fileloader.php',
     'PHPUnit\\Util\\Filesystem' => $vendorDir . '/phpunit/phpunit/src/Util/Filesystem.php',
     'PHPUnit\\Util\\Filter' => $vendorDir . '/phpunit/phpunit/src/Util/Filter.php',
     'PHPUnit\\Util\\Getopt' => $vendorDir . '/phpunit/phpunit/src/Util/Getopt.php',
@@ -2615,7 +2616,7 @@ return array(
     'PHPUnit\\Util\\TextTestListRenderer' => $vendorDir . '/phpunit/phpunit/src/Util/TextTestListRenderer.php',
     'PHPUnit\\Util\\Type' => $vendorDir . '/phpunit/phpunit/src/Util/Type.php',
     'PHPUnit\\Util\\XdebugFilterScriptGenerator' => $vendorDir . '/phpunit/phpunit/src/Util/XdebugFilterScriptGenerator.php',
-    'PHPUnit\\Util\\Xml' => $vendorDir . '/phpunit/phpunit/src/Util/Xml.php',
+    'PHPUnit\\Util\\Xml' => $vendorDir . '/phpunit/phpunit/src/Util/XML.php',
     'PHPUnit\\Util\\XmlTestListRenderer' => $vendorDir . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
     'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
     'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',

vendor/composer/autoload_files.php

@@ -87,4 +87,5 @@ return array(
     '58571171fd5812e6e447dce228f52f4d' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
     '801c31d8ed748cfa537fa45402288c95' => $vendorDir . '/psy/psysh/src/functions.php',
     '0d8253363903f0ac7b0978dcde4e28a0' => $vendorDir . '/beyondcode/laravel-dump-server/helpers.php',
+    'b4e3f29b106af37a2bb239f73cdf68c7' => $baseDir . '/app/helpers.php',
 );

vendor/composer/autoload_static.php

@@ -88,6 +88,7 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         '58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php',
         '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
         '0d8253363903f0ac7b0978dcde4e28a0' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/helpers.php',
+        'b4e3f29b106af37a2bb239f73cdf68c7' => __DIR__ . '/../..' . '/app/helpers.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -531,8 +532,7 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
     public static $classMap = array (
         'App\\Allowance' => __DIR__ . '/../..' . '/app/Allowance.php',
         'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
-        'App\\Dependants' => __DIR__ . '/../..' . '/app/Dependants.php',
-        'App\\EmergencyContact' => __DIR__ . '/../..' . '/app/EmergencyContact.php',
+        'App\\Constants' => __DIR__ . '/../..' . '/app/Constants.php',
         'App\\EmployeeTest' => __DIR__ . '/../..' . '/app/EmployeeTest.php',
         'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
         'App\\Exports\\Employee_detailsExport' => __DIR__ . '/../..' . '/app/Exports/Employee_detailsExport.php',
@@ -545,14 +545,17 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
         'App\\Http\\Controllers\\DashboardController' => __DIR__ . '/../..' . '/app/Http/Controllers/DashboardController.php',
         'App\\Http\\Controllers\\DeductionsController' => __DIR__ . '/../..' . '/app/Http/Controllers/DeductionsController.php',
+        'App\\Http\\Controllers\\DependantController' => __DIR__ . '/../..' . '/app/Http/Controllers/DependantController.php',
         'App\\Http\\Controllers\\EmergencyController' => __DIR__ . '/../..' . '/app/Http/Controllers/EmergencyController.php',
-        'App\\Http\\Controllers\\EmployeeController' => __DIR__ . '/../..' . '/app/Http/Controllers/EmployeeController.php',
+        'App\\Http\\Controllers\\EmployeesController' => __DIR__ . '/../..' . '/app/Http/Controllers/EmployeesController.php',
         'App\\Http\\Controllers\\HomeController' => __DIR__ . '/../..' . '/app/Http/Controllers/HomeController.php',
+        'App\\Http\\Controllers\\MenusController' => __DIR__ . '/../..' . '/app/Http/Controllers/MenusController.php',
         'App\\Http\\Controllers\\PayfrequencyController' => __DIR__ . '/../..' . '/app/Http/Controllers/PayfrequencyController.php',
         'App\\Http\\Controllers\\PayslipController' => __DIR__ . '/../..' . '/app/Http/Controllers/PayslipController.php',
         'App\\Http\\Controllers\\ProcessPayrollController' => __DIR__ . '/../..' . '/app/Http/Controllers/ProcessPayrollController.php',
         'App\\Http\\Controllers\\RangesController' => __DIR__ . '/../..' . '/app/Http/Controllers/RangesController.php',
         'App\\Http\\Controllers\\ReliefController' => __DIR__ . '/../..' . '/app/Http/Controllers/ReliefController.php',
+        'App\\Http\\Controllers\\ReportController' => __DIR__ . '/../..' . '/app/Http/Controllers/ReportController.php',
         'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php',
         'App\\Http\\Middleware\\Admin' => __DIR__ . '/../..' . '/app/Http/Middleware/Admin.php',
         'App\\Http\\Middleware\\Authenticate' => __DIR__ . '/../..' . '/app/Http/Middleware/Authenticate.php',
@@ -564,7 +567,6 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php',
         'App\\Imports\\Employee_detailsImport' => __DIR__ . '/../..' . '/app/Imports/Employee_detailsImport.php',
         'App\\ListItems' => __DIR__ . '/../..' . '/app/ListItems.php',
-        'App\\PayFrequency' => __DIR__ . '/../..' . '/app/PayFrequency.php',
         'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php',
         'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php',
         'App\\Providers\\BroadcastServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BroadcastServiceProvider.php',
@@ -3113,7 +3115,7 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         'PHPUnit\\Util\\Configuration' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Configuration.php',
         'PHPUnit\\Util\\ConfigurationGenerator' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/ConfigurationGenerator.php',
         'PHPUnit\\Util\\ErrorHandler' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/ErrorHandler.php',
-        'PHPUnit\\Util\\FileLoader' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/FileLoader.php',
+        'PHPUnit\\Util\\FileLoader' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Fileloader.php',
         'PHPUnit\\Util\\Filesystem' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Filesystem.php',
         'PHPUnit\\Util\\Filter' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Filter.php',
         'PHPUnit\\Util\\Getopt' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Getopt.php',
@@ -3138,7 +3140,7 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         'PHPUnit\\Util\\TextTestListRenderer' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/TextTestListRenderer.php',
         'PHPUnit\\Util\\Type' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Type.php',
         'PHPUnit\\Util\\XdebugFilterScriptGenerator' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/XdebugFilterScriptGenerator.php',
-        'PHPUnit\\Util\\Xml' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Xml.php',
+        'PHPUnit\\Util\\Xml' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/XML.php',
         'PHPUnit\\Util\\XmlTestListRenderer' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
         'PHPUnit_Framework_MockObject_MockObject' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
         'PHP_Token' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',