lubusIN / laravel-gymie

app/Http/Controllers/AclController.php

Indentation +149 added lines, -149 removed lines

@@ -18,7 +18,7 @@ 
 
 class AclController extends Controller
 {
-	public function __construct()
+    public function __construct()
     {
         $this->middleware('auth');
     }
@@ -29,57 +29,57 @@ 
 
     public function userIndex()
     {
-    	$users = User::excludeArchive()->paginate(10);
+        $users = User::excludeArchive()->paginate(10);
 
-    	return view('user.userIndex',compact('users'));
+        return view('user.userIndex',compact('users'));
     }
 
     public function createUser()
     {
-    	return view('user.createUser');
+        return view('user.createUser');
     }
 
     public function storeUser(Request $request)
     {
-    	$this->validate($request, ['name' => 'required|max:255',
-						           'email' => 'required|email|max:255|unique:mst_users',
-						           'password' => 'required|confirmed|min:6']);
+        $this->validate($request, ['name' => 'required|max:255',
+                                    'email' => 'required|email|max:255|unique:mst_users',
+                                    'password' => 'required|confirmed|min:6']);
 
-    	$user = User::create(['name' => $request['name'],
-                      		  'email' => $request['email'],
-                      		  'password' => bcrypt($request['password']),
-                			  'status'=> $request->status]);
+        $user = User::create(['name' => $request['name'],
+                                'email' => $request['email'],
+                                'password' => bcrypt($request['password']),
+                                'status'=> $request->status]);
 
         $user->save();
 
         // Adding Photo
         if($request->hasFile('photo'))
         {
-          $user->addMedia($request->file('photo'))->usingFileName('staff_'.$user->id.$request->photo->getClientOriginalExtension())->toCollection('staff');
+            $user->addMedia($request->file('photo'))->usingFileName('staff_'.$user->id.$request->photo->getClientOriginalExtension())->toCollection('staff');
         }
         $user->save();
 
-    	$user->attachRole($request->role_id);
+        $user->attachRole($request->role_id);
 
-    	flash()->success('User was successfully created');
-    	return redirect('user');
+        flash()->success('User was successfully created');
+        return redirect('user');
     }
 
     public function editUser($id)
     {
-    	$user = User::findOrFail($id);
+        $user = User::findOrFail($id);
 
-    	return view('user.editUser', compact('user'));
+        return view('user.editUser', compact('user'));
     }
 
     public function updateUser($id, Request $request)
     {
-    	$user = User::findOrFail($id);
+        $user = User::findOrFail($id);
 
-    	$user->name = $request->name;
-    	$user->email = $request->email;
+        $user->name = $request->name;
+        $user->email = $request->email;
 
-    	if(!empty($request->password))
+        if(!empty($request->password))
         {
             $this->validate($request, ['password' => 'required|string|min:6|confirmed']);
             $user->password = bcrypt($request->password);
@@ -91,8 +91,8 @@ 
 
         if($request->hasFile('photo'))
         {
-          $user->clearMediaCollection('staff');
-          $user->addMedia($request->file('photo'))->usingFileName('staff_'.$user->id.$request->photo->getClientOriginalExtension())->toCollection('staff');
+            $user->clearMediaCollection('staff');
+            $user->addMedia($request->file('photo'))->usingFileName('staff_'.$user->id.$request->photo->getClientOriginalExtension())->toCollection('staff');
         }
         $user->save();
 
@@ -102,31 +102,31 @@ 
             $user->attachRole($request->role_id);
         }
     	
-    	flash()->success('User details were successfully updated');
-    	return redirect('user');
+        flash()->success('User details were successfully updated');
+        return redirect('user');
     }
 
     public function deleteUser($id)
     {
-    	DB::beginTransaction();
-    	try 
-    	{
-    		Role_user::where('user_id',$id)->delete();
-    		$user = User::findOrFail($id);
+        DB::beginTransaction();
+        try 
+        {
+            Role_user::where('user_id',$id)->delete();
+            $user = User::findOrFail($id);
             $user->clearMediaCollection('staff');
             $user->status = \constStatus::Archive;
             $user->save();
 
-    		DB::commit();
-    		flash()->success('User was successfully deleted');
-    		return redirect('user');
-    	} 
-    	catch (Exception $e) 
-    	{
-    		DB::rollback();
-    		flash()->error('User was not deleted');
-    		return redirect('user');
-    	}
+            DB::commit();
+            flash()->success('User was successfully deleted');
+            return redirect('user');
+        } 
+        catch (Exception $e) 
+        {
+            DB::rollback();
+            flash()->error('User was not deleted');
+            return redirect('user');
+        }
     }
 
 
@@ -136,117 +136,117 @@ 
 
     public function roleIndex()
     {
-    	$roles = Role::excludeGymie()->get();
+        $roles = Role::excludeGymie()->get();
 
-    	return view('user.roleIndex',compact('roles'));
+        return view('user.roleIndex',compact('roles'));
     }
 
     public function createRole()
     {
-    	$permissions = Permission::all();
+        $permissions = Permission::all();
 
-    	return view('user.createRole',compact('permissions'));
+        return view('user.createRole',compact('permissions'));
     }
 
     public function storeRole(Request $request)
     {
-    	DB::beginTransaction();
-    	try 
-    	{
-    		$role = Role::create(['name' => $request->name,
-		    					  'display_name' => $request->display_name,
-		    					  'description' => $request->description,
-    					 		 ]);
-
-    		if ($request->has('permissions')) 
-    		{
-    			$role->attachPermissions($request->permissions);
-    		}
-
-    		DB::commit();
-    		flash()->success('Role was successfully created');
-    		return redirect('role');
-    	} 
-    	catch (Exception $e) 
-    	{
-    		DB::rollback();
-    		flash()->error('Role was not created');
-    		return redirect('role');
-    	}
+        DB::beginTransaction();
+        try 
+        {
+            $role = Role::create(['name' => $request->name,
+                                    'display_name' => $request->display_name,
+                                    'description' => $request->description,
+                                    ]);
+
+            if ($request->has('permissions')) 
+            {
+                $role->attachPermissions($request->permissions);
+            }
+
+            DB::commit();
+            flash()->success('Role was successfully created');
+            return redirect('role');
+        } 
+        catch (Exception $e) 
+        {
+            DB::rollback();
+            flash()->error('Role was not created');
+            return redirect('role');
+        }
     }
 
     public function editRole($id)
     {
-    	$role = Role::findOrFail($id);
-    	$permissions = Permission::all();
-    	$permission_role = Permission_role::where('role_id',$id)->get();
+        $role = Role::findOrFail($id);
+        $permissions = Permission::all();
+        $permission_role = Permission_role::where('role_id',$id)->get();
 
-    	return view('user.editRole', compact('role','permissions','permission_role'));
+        return view('user.editRole', compact('role','permissions','permission_role'));
     }
 
     public function updateRole($id, Request $request)
     {
-    	DB::beginTransaction();
-    	try 
-    	{
-    		//Updating Role
-    		$role = Role::findOrFail($id);
+        DB::beginTransaction();
+        try 
+        {
+            //Updating Role
+            $role = Role::findOrFail($id);
     		
-    		$role->update(['name' => $request->name,
-    					   'display_name' => $request->display_name,
-    					   'description' => $request->description,
-				 		  ]);
-
-    		//Updating permissions for the role
-    		$DBpermissions = Permission_role::where('role_id',$id)->select('permission_id')->lists('permission_id');
-    		$ClientPermissions = collect($request->permissions);
+            $role->update(['name' => $request->name,
+                            'display_name' => $request->display_name,
+                            'description' => $request->description,
+                            ]);
+
+            //Updating permissions for the role
+            $DBpermissions = Permission_role::where('role_id',$id)->select('permission_id')->lists('permission_id');
+            $ClientPermissions = collect($request->permissions);
     
-    		$addPermissions = $ClientPermissions->diff($DBpermissions);
-    		$deletePermissions = $DBpermissions->diff($ClientPermissions);
-
-    		if ($addPermissions->count()) 
-    		{
-    			$role->attachPermissions($addPermissions);
-    		}
-
-    		if ($deletePermissions->count()) 
-    		{
-    			foreach ($deletePermissions as $deletePermission) 
-    			{
-    				Permission_role::where('role_id',$id)->where('permission_id',$deletePermission)->delete();
-    			}
-    		}
+            $addPermissions = $ClientPermissions->diff($DBpermissions);
+            $deletePermissions = $DBpermissions->diff($ClientPermissions);
+
+            if ($addPermissions->count()) 
+            {
+                $role->attachPermissions($addPermissions);
+            }
+
+            if ($deletePermissions->count()) 
+            {
+                foreach ($deletePermissions as $deletePermission) 
+                {
+                    Permission_role::where('role_id',$id)->where('permission_id',$deletePermission)->delete();
+                }
+            }
     		    		    		
-    		DB::commit();
-    		flash()->success('Role was successfully updated');
-    		return redirect('role');
-    	} 
-    	catch (Exception $e) 
-    	{
-    		DB::rollback();
-    		flash()->error('Role was not updated');
-    		return redirect('role');
-    	}
+            DB::commit();
+            flash()->success('Role was successfully updated');
+            return redirect('role');
+        } 
+        catch (Exception $e) 
+        {
+            DB::rollback();
+            flash()->error('Role was not updated');
+            return redirect('role');
+        }
     }
 
     public function deleteRole($id)
     {
-    	DB::beginTransaction();
-    	try 
-    	{
-    		Permission_role::where('role_id',$id)->delete();
-    		Role::where('id',$id)->delete();
-
-    		DB::commit();
-    		flash()->success('Role was successfully deleted');
-    		return redirect('role');
-    	} 
-    	catch (Exception $e) 
-    	{
-    		DB::rollback();
-    		flash()->error('Role was not deleted');
-    		return redirect('role');
-    	}
+        DB::beginTransaction();
+        try 
+        {
+            Permission_role::where('role_id',$id)->delete();
+            Role::where('id',$id)->delete();
+
+            DB::commit();
+            flash()->success('Role was successfully deleted');
+            return redirect('role');
+        } 
+        catch (Exception $e) 
+        {
+            DB::rollback();
+            flash()->error('Role was not deleted');
+            return redirect('role');
+        }
     }
 
     /**
@@ -255,54 +255,54 @@ 
 
     public function permissionIndex()
     {
-    	$permissions = Permission::all();
+        $permissions = Permission::all();
 
-    	return view('user.permissionIndex',compact('permissions'));
+        return view('user.permissionIndex',compact('permissions'));
     }
 
     public function createPermission()
     {
-    	return view('user.createPermission');
+        return view('user.createPermission');
     }
 
     public function storePermission(Request $request)
     {
-    	Permission::create(['name' => $request->name,
-						    'display_name' => $request->display_name,
-						    'description' => $request->description,
-						    'group_key' => $request->group_key,
-				 		   ]);
-
-    	flash()->success('Permission was successfully created');
-    	return redirect('permission');
+        Permission::create(['name' => $request->name,
+                            'display_name' => $request->display_name,
+                            'description' => $request->description,
+                            'group_key' => $request->group_key,
+                            ]);
+
+        flash()->success('Permission was successfully created');
+        return redirect('permission');
     }
 
     public function editPermission($id)
     {
-    	$permission = Permission::findOrFail($id);
+        $permission = Permission::findOrFail($id);
 
-    	return view('user.editPermission', compact('permission'));
+        return view('user.editPermission', compact('permission'));
     }
 
     public function updatePermission($id, Request $request)
     {
-    	$permission = Permission::findOrFail($id);
+        $permission = Permission::findOrFail($id);
 
-    	$permission->update(['name' => $request->name,
-						    'display_name' => $request->display_name,
-						    'description' => $request->description,
-						    'group_key' => $request->group_key,
-						    ]);
+        $permission->update(['name' => $request->name,
+                            'display_name' => $request->display_name,
+                            'description' => $request->description,
+                            'group_key' => $request->group_key,
+                            ]);
 
-    	flash()->success('Permission was successfully updated');
-    	return redirect('permission');
+        flash()->success('Permission was successfully updated');
+        return redirect('permission');
     }
 
     public function deletePermission($id)
     {
-    	Permission::findOrFail($id)->delete();
+        Permission::findOrFail($id)->delete();
 
-    	flash()->success('Permission was successfully deleted');
-    	return redirect('permission');
+        flash()->success('Permission was successfully deleted');
+        return redirect('permission');
     }
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
     {
     	$users = User::excludeArchive()->paginate(10);
 
-    	return view('user.userIndex',compact('users'));
+    	return view('user.userIndex', compact('users'));
     }
 
     public function createUser()
@@ -53,7 +53,7 @@ 
         $user->save();
 
         // Adding Photo
-        if($request->hasFile('photo'))
+        if ($request->hasFile('photo'))
         {
           $user->addMedia($request->file('photo'))->usingFileName('staff_'.$user->id.$request->photo->getClientOriginalExtension())->toCollection('staff');
         }
@@ -79,7 +79,7 @@ 
     	$user->name = $request->name;
     	$user->email = $request->email;
 
-    	if(!empty($request->password))
+    	if (!empty($request->password))
         {
             $this->validate($request, ['password' => 'required|string|min:6|confirmed']);
             $user->password = bcrypt($request->password);
@@ -89,7 +89,7 @@ 
 
         $user->update();
 
-        if($request->hasFile('photo'))
+        if ($request->hasFile('photo'))
         {
           $user->clearMediaCollection('staff');
           $user->addMedia($request->file('photo'))->usingFileName('staff_'.$user->id.$request->photo->getClientOriginalExtension())->toCollection('staff');
@@ -98,7 +98,7 @@ 
 
         if ($user->role_user->role->id != $request->role_id) 
         {
-            Role_user::where('user_id',$user->id)->where('role_id',$user->role_user->role_id)->delete();
+            Role_user::where('user_id', $user->id)->where('role_id', $user->role_user->role_id)->delete();
             $user->attachRole($request->role_id);
         }
     	
@@ -111,7 +111,7 @@ 
     	DB::beginTransaction();
     	try 
     	{
-    		Role_user::where('user_id',$id)->delete();
+    		Role_user::where('user_id', $id)->delete();
     		$user = User::findOrFail($id);
             $user->clearMediaCollection('staff');
             $user->status = \constStatus::Archive;
@@ -138,14 +138,14 @@ 
     {
     	$roles = Role::excludeGymie()->get();
 
-    	return view('user.roleIndex',compact('roles'));
+    	return view('user.roleIndex', compact('roles'));
     }
 
     public function createRole()
     {
     	$permissions = Permission::all();
 
-    	return view('user.createRole',compact('permissions'));
+    	return view('user.createRole', compact('permissions'));
     }
 
     public function storeRole(Request $request)
@@ -179,9 +179,9 @@ 
     {
     	$role = Role::findOrFail($id);
     	$permissions = Permission::all();
-    	$permission_role = Permission_role::where('role_id',$id)->get();
+    	$permission_role = Permission_role::where('role_id', $id)->get();
 
-    	return view('user.editRole', compact('role','permissions','permission_role'));
+    	return view('user.editRole', compact('role', 'permissions', 'permission_role'));
     }
 
     public function updateRole($id, Request $request)
@@ -198,7 +198,7 @@ 
 				 		  ]);
 
     		//Updating permissions for the role
-    		$DBpermissions = Permission_role::where('role_id',$id)->select('permission_id')->lists('permission_id');
+    		$DBpermissions = Permission_role::where('role_id', $id)->select('permission_id')->lists('permission_id');
     		$ClientPermissions = collect($request->permissions);
     
     		$addPermissions = $ClientPermissions->diff($DBpermissions);
@@ -213,7 +213,7 @@ 
     		{
     			foreach ($deletePermissions as $deletePermission) 
     			{
-    				Permission_role::where('role_id',$id)->where('permission_id',$deletePermission)->delete();
+    				Permission_role::where('role_id', $id)->where('permission_id', $deletePermission)->delete();
     			}
     		}
     		    		    		
@@ -234,8 +234,8 @@ 
     	DB::beginTransaction();
     	try 
     	{
-    		Permission_role::where('role_id',$id)->delete();
-    		Role::where('id',$id)->delete();
+    		Permission_role::where('role_id', $id)->delete();
+    		Role::where('id', $id)->delete();
 
     		DB::commit();
     		flash()->success('Role was successfully deleted');
@@ -257,7 +257,7 @@ 
     {
     	$permissions = Permission::all();
 
-    	return view('user.permissionIndex',compact('permissions'));
+    	return view('user.permissionIndex', compact('permissions'));
     }
 
     public function createPermission()

Braces +4 added lines, -8 removed lines

@@ -120,8 +120,7 @@ 
     		DB::commit();
     		flash()->success('User was successfully deleted');
     		return redirect('user');
-    	} 
-    	catch (Exception $e) 
+    	} catch (Exception $e) 
     	{
     		DB::rollback();
     		flash()->error('User was not deleted');
@@ -166,8 +165,7 @@ 
     		DB::commit();
     		flash()->success('Role was successfully created');
     		return redirect('role');
-    	} 
-    	catch (Exception $e) 
+    	} catch (Exception $e) 
     	{
     		DB::rollback();
     		flash()->error('Role was not created');
@@ -220,8 +218,7 @@ 
     		DB::commit();
     		flash()->success('Role was successfully updated');
     		return redirect('role');
-    	} 
-    	catch (Exception $e) 
+    	} catch (Exception $e) 
     	{
     		DB::rollback();
     		flash()->error('Role was not updated');
@@ -240,8 +237,7 @@ 
     		DB::commit();
     		flash()->success('Role was successfully deleted');
     		return redirect('role');
-    	} 
-    	catch (Exception $e) 
+    	} catch (Exception $e) 
     	{
     		DB::rollback();
     		flash()->error('Role was not deleted');

app/Http/Controllers/FollowupsController.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
         flash()->success('Follow Up was successfully created');
 
-    	return redirect (action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
+        return redirect (action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
     }    
 
     public function update($id, Request $request)

Spacing +3 added lines, -3 removed lines

@@ -27,19 +27,19 @@
 
         flash()->success('Follow Up was successfully created');
 
-    	return redirect (action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
+    	return redirect(action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
     }    
 
     public function update($id, Request $request)
     {
 
-        $followup=Followup::findOrFail($id);
+        $followup = Followup::findOrFail($id);
         $followup->update($request->all());
         $followup->updatedBy()->associate(Auth::user());
         $followup->save();
 
         flash()->success('Follow Up details were successfully updated');
 
-        return redirect (action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
+        return redirect(action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
     }
 }
\ No newline at end of file

app/Http/Controllers/PlansController.php

Indentation +24 added lines, -24 removed lines

@@ -15,53 +15,53 @@ 
     {
         $this->middleware('auth');
     }
-	/**
+    /**
      * Display a listing of the resource.
      *
      * @return Response
      */
-     public function index(Request $request)
+        public function index(Request $request)
     {
         $plans = Plan::excludeArchive()->search('"'.$request->input('search').'"')->paginate(10);
         $planTotal = Plan::excludeArchive()->search('"'.$request->input('search').'"')->get();
         $count = $planTotal->count();
         
-    	return view('plans.index', compact('plans','count'));
+        return view('plans.index', compact('plans','count'));
     }
 
-     /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return Response
-     */
+        /**
+         * Display the specified resource.
+         *
+         * @param  int  $id
+         * @return Response
+         */
     public function show()
     {
-    	$plan = Plan::findOrFail($id);
+        $plan = Plan::findOrFail($id);
 
-    	return view('plans.show', compact('plan'));
+        return view('plans.show', compact('plan'));
     }
 
-     /**
-     * Show the form for creating a new resource.
-     *
-     * @return Response
-     */
+        /**
+         * Show the form for creating a new resource.
+         *
+         * @return Response
+         */
     public function create()
     {
-    	return view('plans.create');
+        return view('plans.create');
     }
     
-     /**
-     * Store a newly created resource in storage.
-     *
-     * @return Response
-     */
+        /**
+         * Store a newly created resource in storage.
+         *
+         * @return Response
+         */
     public function store(Request $request)
     {
         //Model Validation
         $this->validate($request, ['plan_code' => 'unique:mst_plans,plan_code',
-                                   'plan_name' => 'unique:mst_plans,plan_name']);
+                                    'plan_name' => 'unique:mst_plans,plan_name']);
 
         $plan = new Plan($request->all());
 
@@ -72,7 +72,7 @@ 
 
         flash()->success('Plan was successfully created');
 
-    	return redirect('plans'); 
+        return redirect('plans'); 
     }
 
     public function edit($id)

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
         $planTotal = Plan::excludeArchive()->search('"'.$request->input('search').'"')->get();
         $count = $planTotal->count();
         
-    	return view('plans.index', compact('plans','count'));
+    	return view('plans.index', compact('plans', 'count'));
     }
 
      /**
@@ -77,7 +77,7 @@ 
 
     public function edit($id)
     {
-        $plan=Plan::findOrFail($id);
+        $plan = Plan::findOrFail($id);
 
         return view('plans.edit', compact('plan'));
     }
@@ -85,7 +85,7 @@ 
     public function update($id, Request $request)
     {
 
-        $plan=Plan::findOrFail($id);
+        $plan = Plan::findOrFail($id);
 
         $plan->update($request->all());
         $plan->updatedBy()->associate(Auth::user());

app/Http/Controllers/ReportsController.php

Indentation +12 added lines, -12 removed lines

@@ -34,32 +34,32 @@ 
 
     public function gymMemberCharts()
     {
-    	return view('reports.members.charts');
+        return view('reports.members.charts');
     }
 
     public function enquiryCharts()
     {
-    	return view('reports.enquiries.charts');
+        return view('reports.enquiries.charts');
     }
 
     public function subscriptionCharts()
     {
-    	return view('reports.subscriptions.charts');
+        return view('reports.subscriptions.charts');
     }
 
     public function paymentCharts()
     {
-    	return view('reports.payments.charts');
+        return view('reports.payments.charts');
     }
 
     public function expenseCharts()
     {
-    	return view('reports.expenses.charts');
+        return view('reports.expenses.charts');
     }
 
     public function invoiceCharts()
     {
-    	return view('reports.invoices.charts');
+        return view('reports.invoices.charts');
     }
 
 
@@ -68,31 +68,31 @@ 
 
     public function gymMemberData(Request $request)
     {
-    	return view('reports.members.data');
+        return view('reports.members.data');
     }
 
     public function enquiryData()
     {
-    	return view('reports.enquiries.data');
+        return view('reports.enquiries.data');
     }
 
     public function subscriptionData()
     {
-    	return view('reports.subscriptions.data');
+        return view('reports.subscriptions.data');
     }
 
     public function paymentData()
     {
-    	return view('reports.payments.data');
+        return view('reports.payments.data');
     }
 
     public function expenseData()
     {
-    	return view('reports.expenses.data');
+        return view('reports.expenses.data');
     }
 
     public function invoiceData()
     {
-    	return view('reports.invoices.data');
+        return view('reports.invoices.data');
     }
 }
\ No newline at end of file

app/Http/Controllers/ServicesController.php

Indentation +25 added lines, -25 removed lines

@@ -15,48 +15,48 @@ 
     {
         $this->middleware('auth');
     }
-	/**
+    /**
      * Display a listing of the resource.
      *
      * @return Response
      */
-     public function index(Request $request)
-     {
+        public function index(Request $request)
+        {
         $services = Service::search('"'.$request->input('search').'"')->paginate(10);
         $serviceTotal = Service::search('"'.$request->input('search').'"')->get();
         $count = $serviceTotal->count();
 
-    	return view('services.index', compact('services','count'));
-     }
+        return view('services.index', compact('services','count'));
+        }
 
-     /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return Response
-     */
+        /**
+         * Display the specified resource.
+         *
+         * @param  int  $id
+         * @return Response
+         */
     public function show()
     {
-    	$service = Service::findOrFail($id);
+        $service = Service::findOrFail($id);
 
-    	return view('services.show', compact('service'));
+        return view('services.show', compact('service'));
     }
 
-     /**
-     * Show the form for creating a new resource.
-     *
-     * @return Response
-     */
+        /**
+         * Show the form for creating a new resource.
+         *
+         * @return Response
+         */
     public function create()
     {
-    	return view('services.create');
+        return view('services.create');
     }
     
-     /**
-     * Store a newly created resource in storage.
-     *
-     * @return Response
-     */
+        /**
+         * Store a newly created resource in storage.
+         *
+         * @return Response
+         */
     public function store(Request $request)
     {
         //Model Validation
@@ -71,7 +71,7 @@ 
 
         flash()->success('Service was successfully created');
 
-    	return redirect('plans/services/all'); 
+        return redirect('plans/services/all'); 
     }
 
     public function edit($id)

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         $serviceTotal = Service::search('"'.$request->input('search').'"')->get();
         $count = $serviceTotal->count();
 
-    	return view('services.index', compact('services','count'));
+    	return view('services.index', compact('services', 'count'));
      }
 
      /**

app/Http/Controllers/DashboardController.php

Indentation +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 
 class DashboardController extends Controller
 {
-	public function __construct()
+    public function __construct()
     {
         $this->middleware('auth');
     }
@@ -58,7 +58,7 @@ 
         $bouncedChequesCount = $bouncedCheques->count();
         $membersPerPlan =  json_decode(\Utilities::membersPerPlan());
 
-		return view('dashboard.index',compact('expirings','allExpired','birthdays','recents','enquiries','reminders','dues','outstandings','smsRequestSetting','smslogs','expiringCount','expiredCount','birthdayCount','reminderCount','recievedCheques','recievedChequesCount','depositedCheques','depositedChequesCount','bouncedCheques','bouncedChequesCount','membersPerPlan'));
+        return view('dashboard.index',compact('expirings','allExpired','birthdays','recents','enquiries','reminders','dues','outstandings','smsRequestSetting','smslogs','expiringCount','expiredCount','birthdayCount','reminderCount','recievedCheques','recievedChequesCount','depositedCheques','depositedChequesCount','bouncedCheques','bouncedChequesCount','membersPerPlan'));
     }
 
     public function smsRequest(Request $request)

Spacing +7 added lines, -7 removed lines

@@ -50,15 +50,15 @@ 
         $outstandings = Expense::outstandingAlerts()->get();
         $smsRequestSetting = \Utilities::getSetting('sms_request');
         $smslogs = Sms_log::dashboardLogs()->get();
-        $recievedCheques = Cheque_detail::where('status',\constChequeStatus::Recieved)->get();
+        $recievedCheques = Cheque_detail::where('status', \constChequeStatus::Recieved)->get();
         $recievedChequesCount = $recievedCheques->count();
-        $depositedCheques = Cheque_detail::where('status',\constChequeStatus::Deposited)->get();
+        $depositedCheques = Cheque_detail::where('status', \constChequeStatus::Deposited)->get();
         $depositedChequesCount = $depositedCheques->count();
-        $bouncedCheques = Cheque_detail::where('status',\constChequeStatus::Bounced)->get();
+        $bouncedCheques = Cheque_detail::where('status', \constChequeStatus::Bounced)->get();
         $bouncedChequesCount = $bouncedCheques->count();
-        $membersPerPlan =  json_decode(\Utilities::membersPerPlan());
+        $membersPerPlan = json_decode(\Utilities::membersPerPlan());
 
-		return view('dashboard.index',compact('expirings','allExpired','birthdays','recents','enquiries','reminders','dues','outstandings','smsRequestSetting','smslogs','expiringCount','expiredCount','birthdayCount','reminderCount','recievedCheques','recievedChequesCount','depositedCheques','depositedChequesCount','bouncedCheques','bouncedChequesCount','membersPerPlan'));
+		return view('dashboard.index', compact('expirings', 'allExpired', 'birthdays', 'recents', 'enquiries', 'reminders', 'dues', 'outstandings', 'smsRequestSetting', 'smslogs', 'expiringCount', 'expiredCount', 'birthdayCount', 'reminderCount', 'recievedCheques', 'recievedChequesCount', 'depositedCheques', 'depositedChequesCount', 'bouncedCheques', 'bouncedChequesCount', 'membersPerPlan'));
     }
 
     public function smsRequest(Request $request)
@@ -66,9 +66,9 @@ 
         $contact = 9820461665;
         $sms_text = "A request for ".$request->smsCount." sms has came from ".\Utilities::getSetting('gym_name')." by ".Auth::user()->name;
         $sms_status = 1;
-        \Utilities::Sms($contact,$sms_text,$sms_status);
+        \Utilities::Sms($contact, $sms_text, $sms_status);
 
-        Setting::where('key', '=','sms_request')->update(['value' => 1]);
+        Setting::where('key', '=', 'sms_request')->update(['value' => 1]);
 
         flash()->success('Request has been successfully sent, a confirmation call will be made soon');
         return redirect('/dashboard');

app/Http/Controllers/DataMigrationController.php

Indentation +26 added lines, -26 removed lines

@@ -146,16 +146,16 @@ 
                 $payment_amount = $invoice_total - (int) $pending;
 
                 if ($payment_amount == $invoice_total) {
-                  $paymentStatus = \constPaymentStatus::Paid;
+                    $paymentStatus = \constPaymentStatus::Paid;
                 } 
                 elseif($payment_amount > 0 && $payment_amount < $invoice_total) {
-                  $paymentStatus = \constPaymentStatus::Partial;
+                    $paymentStatus = \constPaymentStatus::Partial;
                 }
                 elseif($payment_amount == 0) {
-                  $paymentStatus = \constPaymentStatus::Unpaid;
+                    $paymentStatus = \constPaymentStatus::Unpaid;
                 }
                 else {
-                  $paymentStatus = \constPaymentStatus::Overpaid;
+                    $paymentStatus = \constPaymentStatus::Overpaid;
                 }
 
                 if(empty($line->discount_percent) && !empty($line->discount_amount)) {
@@ -169,18 +169,18 @@ 
                 }
 
                 $invoice = Invoice::create(['invoice_number'=> $invoice_number,
-                                             'member_id'=> $member->id,
-                                             'total'=> $invoice_total,
-                                             'status'=> $paymentStatus,
-                                             'pending_amount'=> $pending,
-                                             'discount_amount'=> $discount,
-                                             'discount_percent'=> $discountPercent,
-                                             'discount_note'=> null,
-                                             'tax'=> ($tax_percent / 100) * $invoice_total,
-                                             'additional_fees'=> '0',
-                                             'note'=> null,
-                                             'created_by'=> Auth::user()->id,
-                                             'updated_by'=> Auth::user()->id
+                                                'member_id'=> $member->id,
+                                                'total'=> $invoice_total,
+                                                'status'=> $paymentStatus,
+                                                'pending_amount'=> $pending,
+                                                'discount_amount'=> $discount,
+                                                'discount_percent'=> $discountPercent,
+                                                'discount_note'=> null,
+                                                'tax'=> ($tax_percent / 100) * $invoice_total,
+                                                'additional_fees'=> '0',
+                                                'note'=> null,
+                                                'created_by'=> Auth::user()->id,
+                                                'updated_by'=> Auth::user()->id
                                             ]);
 
                 $start_date = Carbon::createFromFormat('d/m/Y', $line->get('start_date'));
@@ -218,19 +218,19 @@ 
                                                     ]);
 
                 $invoiceDetail = Invoice_detail::create(['invoice_id'=> $invoice->id,
-                                                       'plan_id'=> (int) $planId,
-                                                       'item_amount'=> $line->get('total_amount'),
-                                                       'item_amount'=> $line->get('total_amount'),
-                                                       'created_by'=> Auth::user()->id,
-                                                       'updated_by'=> Auth::user()->id
+                                                        'plan_id'=> (int) $planId,
+                                                        'item_amount'=> $line->get('total_amount'),
+                                                        'item_amount'=> $line->get('total_amount'),
+                                                        'created_by'=> Auth::user()->id,
+                                                        'updated_by'=> Auth::user()->id
                                                         ]);
 
                 $paymentDetail = Payment_detail::create(['invoice_id'=> $invoice->id,
-                                                         'payment_amount'=> $payment_amount,
-                                                         'mode'=> '1',
-                                                         'note'=> ' ',
-                                                         'created_by'=> Auth::user()->id,
-                                                         'updated_by'=> Auth::user()->id
+                                                            'payment_amount'=> $payment_amount,
+                                                            'mode'=> '1',
+                                                            'note'=> ' ',
+                                                            'created_by'=> Auth::user()->id,
+                                                            'updated_by'=> Auth::user()->id
                                                         ]);
 
                 Setting::where('key', '=','invoice_last_number')->update(['value' => $invoiceCounter]);

Spacing +14 added lines, -14 removed lines

@@ -116,7 +116,7 @@ 
                 $dob = Carbon::createFromFormat('d/m/Y', $line->get('dob'))->toDateString();
                 $gender = ($line->get('gender') == 'male' ? 'm' : 'f');
                 // $explodedName = explode(" ", $line->get('name'));
-                $email = $member_code . "@evolvegym.in";
+                $email = $member_code."@evolvegym.in";
 
                 $address = (empty($line->get('address')) ? 'Naigaon east' : $line->get('address'));
 
@@ -148,23 +148,23 @@ 
                 if ($payment_amount == $invoice_total) {
                   $paymentStatus = \constPaymentStatus::Paid;
                 } 
-                elseif($payment_amount > 0 && $payment_amount < $invoice_total) {
+                elseif ($payment_amount > 0 && $payment_amount < $invoice_total) {
                   $paymentStatus = \constPaymentStatus::Partial;
                 }
-                elseif($payment_amount == 0) {
+                elseif ($payment_amount == 0) {
                   $paymentStatus = \constPaymentStatus::Unpaid;
                 }
                 else {
                   $paymentStatus = \constPaymentStatus::Overpaid;
                 }
 
-                if(empty($line->discount_percent) && !empty($line->discount_amount)) {
+                if (empty($line->discount_percent) && !empty($line->discount_amount)) {
                     $discountPercent = 'custom';
                 }
-                elseif(empty($line->discount_percent) && empty($line->discount_amount)) {
+                elseif (empty($line->discount_percent) && empty($line->discount_amount)) {
                     $discountPercent = '0';
                 }
-                elseif(!empty($line->discount_percent)) {
+                elseif (!empty($line->discount_percent)) {
                     $discountPercent = str_replace("%", "", $line->discount_percent);
                 }
 
@@ -186,20 +186,20 @@ 
                 $start_date = Carbon::createFromFormat('d/m/Y', $line->get('start_date'));
                 $planId = $line->get('plan');
 
-                if($planId == 3) {
+                if ($planId == 3) {
                     $end_date = $start_date->copy()->addMonth();
                 }
-                elseif($planId == 4) {
+                elseif ($planId == 4) {
                     $end_date = $start_date->copy()->addMonths(3);
                 }
-                elseif($planId == 5) {
+                elseif ($planId == 5) {
                     $end_date = $start_date->copy()->addMonths(6);
                 }
-                elseif($planId == 6) {
+                elseif ($planId == 6) {
                     $end_date = $start_date->copy()->addMonths(12);
                 }
 
-                if($end_date->lt(Carbon::today())) {
+                if ($end_date->lt(Carbon::today())) {
                     $subscription_status = \constSubscription::Expired;
                 }
                 else {
@@ -233,13 +233,13 @@ 
                                                          'updated_by'=> Auth::user()->id
                                                         ]);
 
-                Setting::where('key', '=','invoice_last_number')->update(['value' => $invoiceCounter]);
-                Setting::where('key', '=','member_last_number')->update(['value' => $memberCounter]);
+                Setting::where('key', '=', 'invoice_last_number')->update(['value' => $invoiceCounter]);
+                Setting::where('key', '=', 'member_last_number')->update(['value' => $memberCounter]);
             }
             DB::commit();
         }
 
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             DB::rollback();
             dd($e);
         }

Braces +10 added lines, -21 removed lines

@@ -147,24 +147,19 @@ 
 
                 if ($payment_amount == $invoice_total) {
                   $paymentStatus = \constPaymentStatus::Paid;
-                } 
-                elseif($payment_amount > 0 && $payment_amount < $invoice_total) {
+                } elseif($payment_amount > 0 && $payment_amount < $invoice_total) {
                   $paymentStatus = \constPaymentStatus::Partial;
-                }
-                elseif($payment_amount == 0) {
+                } elseif($payment_amount == 0) {
                   $paymentStatus = \constPaymentStatus::Unpaid;
-                }
-                else {
+                } else {
                   $paymentStatus = \constPaymentStatus::Overpaid;
                 }
 
                 if(empty($line->discount_percent) && !empty($line->discount_amount)) {
                     $discountPercent = 'custom';
-                }
-                elseif(empty($line->discount_percent) && empty($line->discount_amount)) {
+                } elseif(empty($line->discount_percent) && empty($line->discount_amount)) {
                     $discountPercent = '0';
-                }
-                elseif(!empty($line->discount_percent)) {
+                } elseif(!empty($line->discount_percent)) {
                     $discountPercent = str_replace("%", "", $line->discount_percent);
                 }
 
@@ -188,21 +183,17 @@ 
 
                 if($planId == 3) {
                     $end_date = $start_date->copy()->addMonth();
-                }
-                elseif($planId == 4) {
+                } elseif($planId == 4) {
                     $end_date = $start_date->copy()->addMonths(3);
-                }
-                elseif($planId == 5) {
+                } elseif($planId == 5) {
                     $end_date = $start_date->copy()->addMonths(6);
-                }
-                elseif($planId == 6) {
+                } elseif($planId == 6) {
                     $end_date = $start_date->copy()->addMonths(12);
                 }
 
                 if($end_date->lt(Carbon::today())) {
                     $subscription_status = \constSubscription::Expired;
-                }
-                else {
+                } else {
                     $subscription_status = \constSubscription::onGoing;
                 }
 
@@ -237,9 +228,7 @@ 
                 Setting::where('key', '=','member_last_number')->update(['value' => $memberCounter]);
             }
             DB::commit();
-        }
-
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
             DB::rollback();
             dd($e);
         }

app/Http/Controllers/EnquiriesController.php

Indentation +65 added lines, -65 removed lines

@@ -27,52 +27,52 @@ 
 
     public function index(Request $request)
     {
-      $enquiries = Enquiry::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $enquiriesTotal = Enquiry::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
-      $count = $enquiriesTotal->count();
+        $enquiries = Enquiry::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+        $enquiriesTotal = Enquiry::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+        $count = $enquiriesTotal->count();
      
  
-      if (!$request->has('drp_start') or !$request->has('drp_end')) 
-      {
+        if (!$request->has('drp_start') or !$request->has('drp_end')) 
+        {
         $drp_placeholder = "Select daterange filter";
-      }
-      else
-      {
+        }
+        else
+        {
         $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
-      }
+        }
 
-      $request->flash();
+        $request->flash();
       
-      return view('enquiries.index', compact('enquiries','count','drp_placeholder'));
+        return view('enquiries.index', compact('enquiries','count','drp_placeholder'));
       
     }
 
     public function show($id)
     {
-      $enquiry = Enquiry::findOrFail($id);
+        $enquiry = Enquiry::findOrFail($id);
 
-      $followups = $enquiry->followups->sortByDesc('updated_at');
+        $followups = $enquiry->followups->sortByDesc('updated_at');
 
-      return view('enquiries.show', compact('enquiry','followups'));
+        return view('enquiries.show', compact('enquiry','followups'));
     }
 
     public function create()
     {
-    	return view('enquiries.create');
+        return view('enquiries.create');
     }
 
     public function store(Request $request)
     {
-     // unique values check
-     $this->validate($request, ['email' => 'unique:mst_enquiries,email',
+        // unique values check
+        $this->validate($request, ['email' => 'unique:mst_enquiries,email',
                                 'contact' => 'unique:mst_enquiries,contact']);
 
-     // Start Transaction
+        // Start Transaction
         DB::beginTransaction();
 
         try {
                 // store enquiries details
-               $enquiryData = array('name'=>$request->name,
+                $enquiryData = array('name'=>$request->name,
                                     'DOB'=> $request->DOB,
                                     'gender'=> $request->gender,
                                     'contact'=> $request->contact,
@@ -86,37 +86,37 @@ 
                                     'aim'=> $request->aim , 
                                     'source'=> $request->source);
 
-              $enquiry  = new Enquiry($enquiryData);
-              $enquiry->createdBy()->associate(Auth::user());
-              $enquiry->updatedBy()->associate(Auth::user());
-              $enquiry->save();
-
-              //Store the followup details
-              $followupData = array('enquiry_id'=>$enquiry->id,
-                                     'followup_by'=>$request->followup_by,
-                                     'due_date'=>$request->due_date,
-                                     'status'=> \constFollowUpStatus::Pending,
-                                     'outcome'=>'');
-
-              $followup = new Followup($followupData);
-              $followup->createdBy()->associate(Auth::user());
-              $followup->updatedBy()->associate(Auth::user());
-              $followup->save();
-
-              // SMS Trigger
-              $gym_name = \Utilities::getSetting('gym_name');
-              $sender_id = \Utilities::getSetting('sms_sender_id');
-
-              $sms_trigger = Sms_trigger::where('alias','=','enquiry_placement')->first();
-              $message = $sms_trigger->message;
-              $sms_text = sprintf($message,$enquiry->name,$gym_name);
-              $sms_status = $sms_trigger->status;
-
-              \Utilities::Sms($sender_id,$enquiry->contact,$sms_text,$sms_status);
-
-              DB::commit();    
-              flash()->success('Enquiry was successfully created');                         
-              return redirect (action('EnquiriesController@show', ['id' => $enquiry->id]));
+                $enquiry  = new Enquiry($enquiryData);
+                $enquiry->createdBy()->associate(Auth::user());
+                $enquiry->updatedBy()->associate(Auth::user());
+                $enquiry->save();
+
+                //Store the followup details
+                $followupData = array('enquiry_id'=>$enquiry->id,
+                                        'followup_by'=>$request->followup_by,
+                                        'due_date'=>$request->due_date,
+                                        'status'=> \constFollowUpStatus::Pending,
+                                        'outcome'=>'');
+
+                $followup = new Followup($followupData);
+                $followup->createdBy()->associate(Auth::user());
+                $followup->updatedBy()->associate(Auth::user());
+                $followup->save();
+
+                // SMS Trigger
+                $gym_name = \Utilities::getSetting('gym_name');
+                $sender_id = \Utilities::getSetting('sms_sender_id');
+
+                $sms_trigger = Sms_trigger::where('alias','=','enquiry_placement')->first();
+                $message = $sms_trigger->message;
+                $sms_text = sprintf($message,$enquiry->name,$gym_name);
+                $sms_status = $sms_trigger->status;
+
+                \Utilities::Sms($sender_id,$enquiry->contact,$sms_text,$sms_status);
+
+                DB::commit();    
+                flash()->success('Enquiry was successfully created');                         
+                return redirect (action('EnquiriesController@show', ['id' => $enquiry->id]));
             } 
 
             catch (\Exception $e) 
@@ -128,11 +128,11 @@ 
 
     } //End of store method
 
-  	public function edit($id)
+        public function edit($id)
     {
-      $enquiry=Enquiry::findOrFail($id);
+        $enquiry=Enquiry::findOrFail($id);
 
-      return view('enquiries.edit', compact('enquiry'));
+        return view('enquiries.edit', compact('enquiry'));
     }
 
     public function update($id, Request $request)
@@ -162,26 +162,26 @@ 
 
     public function lost($id)
     {
-      $enquiry=Enquiry::findOrFail($id);
+        $enquiry=Enquiry::findOrFail($id);
 
-      $enquiry->status = \constEnquiryStatus::Lost;
-      $enquiry->updatedBy()->associate(Auth::user());
-      $enquiry->update();
+        $enquiry->status = \constEnquiryStatus::Lost;
+        $enquiry->updatedBy()->associate(Auth::user());
+        $enquiry->update();
 
-      flash()->success('Enquiry was marked as lost');
-      return redirect('enquiries/all');
+        flash()->success('Enquiry was marked as lost');
+        return redirect('enquiries/all');
     }
 
     public function markMember($id)
     {
-      $enquiry=Enquiry::findOrFail($id);
+        $enquiry=Enquiry::findOrFail($id);
 
-      $enquiry->status = \constEnquiryStatus::Member;
-      $enquiry->updatedBy()->associate(Auth::user());
-      $enquiry->update();
+        $enquiry->status = \constEnquiryStatus::Member;
+        $enquiry->updatedBy()->associate(Auth::user());
+        $enquiry->update();
 
-      flash()->success('Enquiry was marked as member');
-      return redirect('enquiries/all');
+        flash()->success('Enquiry was marked as member');
+        return redirect('enquiries/all');
     }
 
 }
\ No newline at end of file

Spacing +33 added lines, -33 removed lines

@@ -27,8 +27,8 @@ 
 
     public function index(Request $request)
     {
-      $enquiries = Enquiry::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $enquiriesTotal = Enquiry::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+      $enquiries = Enquiry::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+      $enquiriesTotal = Enquiry::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
       $count = $enquiriesTotal->count();
      
  
@@ -38,12 +38,12 @@ 
       }
       else
       {
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
       }
 
       $request->flash();
       
-      return view('enquiries.index', compact('enquiries','count','drp_placeholder'));
+      return view('enquiries.index', compact('enquiries', 'count', 'drp_placeholder'));
       
     }
 
@@ -53,7 +53,7 @@ 
 
       $followups = $enquiry->followups->sortByDesc('updated_at');
 
-      return view('enquiries.show', compact('enquiry','followups'));
+      return view('enquiries.show', compact('enquiry', 'followups'));
     }
 
     public function create()
@@ -78,15 +78,15 @@ 
                                     'contact'=> $request->contact,
                                     'email'=> $request->email,
                                     'address'=> $request->address,
-                                    'status'=> \constEnquiryStatus::Lead , 
-                                    'pin_code'=> $request->pin_code , 
-                                    'occupation'=> $request->occupation , 
-                                    'start_by'=> $request->start_by , 
-                                    'interested_in'=> implode(',',$request->interested_in), 
-                                    'aim'=> $request->aim , 
+                                    'status'=> \constEnquiryStatus::Lead, 
+                                    'pin_code'=> $request->pin_code, 
+                                    'occupation'=> $request->occupation, 
+                                    'start_by'=> $request->start_by, 
+                                    'interested_in'=> implode(',', $request->interested_in), 
+                                    'aim'=> $request->aim, 
                                     'source'=> $request->source);
 
-              $enquiry  = new Enquiry($enquiryData);
+              $enquiry = new Enquiry($enquiryData);
               $enquiry->createdBy()->associate(Auth::user());
               $enquiry->updatedBy()->associate(Auth::user());
               $enquiry->save();
@@ -107,62 +107,62 @@ 
               $gym_name = \Utilities::getSetting('gym_name');
               $sender_id = \Utilities::getSetting('sms_sender_id');
 
-              $sms_trigger = Sms_trigger::where('alias','=','enquiry_placement')->first();
+              $sms_trigger = Sms_trigger::where('alias', '=', 'enquiry_placement')->first();
               $message = $sms_trigger->message;
-              $sms_text = sprintf($message,$enquiry->name,$gym_name);
+              $sms_text = sprintf($message, $enquiry->name, $gym_name);
               $sms_status = $sms_trigger->status;
 
-              \Utilities::Sms($sender_id,$enquiry->contact,$sms_text,$sms_status);
+              \Utilities::Sms($sender_id, $enquiry->contact, $sms_text, $sms_status);
 
               DB::commit();    
               flash()->success('Enquiry was successfully created');                         
-              return redirect (action('EnquiriesController@show', ['id' => $enquiry->id]));
+              return redirect(action('EnquiriesController@show', ['id' => $enquiry->id]));
             } 
 
             catch (\Exception $e) 
             {
                 DB::rollback();
                 flash()->error('Error while creating the Enquiry');
-                return redirect (action('EnquiriesController@index'));
+                return redirect(action('EnquiriesController@index'));
             }
 
     } //End of store method
 
   	public function edit($id)
     {
-      $enquiry=Enquiry::findOrFail($id);
+      $enquiry = Enquiry::findOrFail($id);
 
       return view('enquiries.edit', compact('enquiry'));
     }
 
     public function update($id, Request $request)
     {
-        $enquiry=Enquiry::findOrFail($id);
+        $enquiry = Enquiry::findOrFail($id);
 
         $enquiry->name = $request->name;
-        $enquiry->DOB =  $request->DOB;
-        $enquiry->gender =  $request->gender;
-        $enquiry->contact =  $request->contact;
-        $enquiry->email =  $request->email;
-        $enquiry->address =  $request->address;
-        $enquiry->pin_code =  $request->pin_code; 
-        $enquiry->occupation =  $request->occupation; 
-        $enquiry->start_by =  $request->start_by; 
-        $enquiry->interested_in =  implode(',',$request->interested_in); 
-        $enquiry->aim =  $request->aim; 
-        $enquiry->source =  $request->source;
+        $enquiry->DOB = $request->DOB;
+        $enquiry->gender = $request->gender;
+        $enquiry->contact = $request->contact;
+        $enquiry->email = $request->email;
+        $enquiry->address = $request->address;
+        $enquiry->pin_code = $request->pin_code; 
+        $enquiry->occupation = $request->occupation; 
+        $enquiry->start_by = $request->start_by; 
+        $enquiry->interested_in = implode(',', $request->interested_in); 
+        $enquiry->aim = $request->aim; 
+        $enquiry->source = $request->source;
         $enquiry->createdBy()->associate(Auth::user());
         $enquiry->updatedBy()->associate(Auth::user());
         $enquiry->update();
 
         flash()->success('Enquiry details were successfully updated');
 
-        return redirect (action('EnquiriesController@show', ['id' => $enquiry->id]));
+        return redirect(action('EnquiriesController@show', ['id' => $enquiry->id]));
     }
 
     public function lost($id)
     {
-      $enquiry=Enquiry::findOrFail($id);
+      $enquiry = Enquiry::findOrFail($id);
 
       $enquiry->status = \constEnquiryStatus::Lost;
       $enquiry->updatedBy()->associate(Auth::user());
@@ -174,7 +174,7 @@ 
 
     public function markMember($id)
     {
-      $enquiry=Enquiry::findOrFail($id);
+      $enquiry = Enquiry::findOrFail($id);
 
       $enquiry->status = \constEnquiryStatus::Member;
       $enquiry->updatedBy()->associate(Auth::user());

Braces +2 added lines, -5 removed lines

@@ -35,8 +35,7 @@ 
       if (!$request->has('drp_start') or !$request->has('drp_end')) 
       {
         $drp_placeholder = "Select daterange filter";
-      }
-      else
+      } else
       {
         $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
       }
@@ -117,9 +116,7 @@ 
               DB::commit();    
               flash()->success('Enquiry was successfully created');                         
               return redirect (action('EnquiriesController@show', ['id' => $enquiry->id]));
-            } 
-
-            catch (\Exception $e) 
+            } catch (\Exception $e) 
             {
                 DB::rollback();
                 flash()->error('Error while creating the Enquiry');

app/Http/routes.php

Indentation +165 added lines, -165 removed lines

@@ -27,37 +27,37 @@ 
 Route::post('api/token','Api\AuthenticateController@authenticate');
 
 Route::group(['prefix' => 'api','middleware' => ['jwt.auth']], function() {	
-	Route::get('dashboard','Api\DashboardController@index');
-	Route::get('members','Api\MembersController@index');
-	Route::get('subscriptions','Api\SubscriptionsController@index');
-	Route::get('payments','Api\PaymentsController@index');
-	Route::get('invoices','Api\InvoicesController@index');
-	Route::get('invoices/paid','Api\InvoicesController@paid');
-	Route::get('invoices/unpaid','Api\InvoicesController@unpaid');
-	Route::get('invoices/partial','Api\InvoicesController@partial');
-	Route::get('invoices/overpaid','Api\InvoicesController@overpaid');
-	Route::get('enquiries','Api\EnquiriesController@index');
-	Route::get('settings','Api\SettingsController@index');
-	Route::get('plans','Api\PlansController@index');
-	Route::get('expenseCategories','Api\ExpenseCategoriesController@index');
-	Route::get('expenses','Api\ExpensesController@index');
-	Route::get('subscriptions/expiring','Api\SubscriptionsController@expiring');
-	Route::get('subscriptions/expired','Api\SubscriptionsController@expired');
-	Route::get('members/{id}','Api\MembersController@show');
-	Route::get('subscriptions/{id}','Api\SubscriptionsController@show');
-	Route::get('payments/{id}','Api\PaymentsController@show');
-	Route::get('invoices/{id}','Api\InvoicesController@show');
-	Route::get('enquiries/{id}','Api\EnquiriesController@show');
-	Route::get('plans/{id}','Api\PlansController@show');
-	Route::get('expenseCategories/{id}','Api\ExpenseCategoriesController@show');
-	Route::get('expenses/{id}','Api\ExpensesController@show');
+    Route::get('dashboard','Api\DashboardController@index');
+    Route::get('members','Api\MembersController@index');
+    Route::get('subscriptions','Api\SubscriptionsController@index');
+    Route::get('payments','Api\PaymentsController@index');
+    Route::get('invoices','Api\InvoicesController@index');
+    Route::get('invoices/paid','Api\InvoicesController@paid');
+    Route::get('invoices/unpaid','Api\InvoicesController@unpaid');
+    Route::get('invoices/partial','Api\InvoicesController@partial');
+    Route::get('invoices/overpaid','Api\InvoicesController@overpaid');
+    Route::get('enquiries','Api\EnquiriesController@index');
+    Route::get('settings','Api\SettingsController@index');
+    Route::get('plans','Api\PlansController@index');
+    Route::get('expenseCategories','Api\ExpenseCategoriesController@index');
+    Route::get('expenses','Api\ExpensesController@index');
+    Route::get('subscriptions/expiring','Api\SubscriptionsController@expiring');
+    Route::get('subscriptions/expired','Api\SubscriptionsController@expired');
+    Route::get('members/{id}','Api\MembersController@show');
+    Route::get('subscriptions/{id}','Api\SubscriptionsController@show');
+    Route::get('payments/{id}','Api\PaymentsController@show');
+    Route::get('invoices/{id}','Api\InvoicesController@show');
+    Route::get('enquiries/{id}','Api\EnquiriesController@show');
+    Route::get('plans/{id}','Api\PlansController@show');
+    Route::get('expenseCategories/{id}','Api\ExpenseCategoriesController@show');
+    Route::get('expenses/{id}','Api\ExpensesController@show');
 });
 
 //Auth routes
 Route::group(['prefix' => 'auth'], function() {
-	Route::get('login', 'Auth\AuthController@getLogin');
-	Route::post('login', 'Auth\AuthController@postLogin');
-	Route::get('logout', 'Auth\AuthController@getLogout');
+    Route::get('login', 'Auth\AuthController@getLogin');
+    Route::post('login', 'Auth\AuthController@postLogin');
+    Route::get('logout', 'Auth\AuthController@getLogout');
 });
 
 //dashboard 
@@ -69,87 +69,87 @@ 
 
 //MembersController
 Route::group(['prefix' => 'members','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@index']);
-	Route::get('active',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@active']);
-	Route::get('inactive',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@inactive']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-members|add-member'],'uses' => 'MembersController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-members|add-member'],'uses' => 'MembersController@store']);
-	Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@show']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-members|edit-member'],'uses' => 'MembersController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-members|edit-member'],'uses' => 'MembersController@update']);
-	Route::post('{id}/archive',['middleware' => ['permission:manage-gymie|manage-members|delete-member'],'uses' => 'MembersController@archive']);
-	Route::get('{id}/transfer',['middleware' => ['permission:manage-gymie|manage-enquiries|transfer-enquiry'],'uses' => 'MembersController@transfer']);
+    Route::get('/',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@index']);
+    Route::get('all',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@index']);
+    Route::get('active',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@active']);
+    Route::get('inactive',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@inactive']);
+    Route::get('create',['middleware' => ['permission:manage-gymie|manage-members|add-member'],'uses' => 'MembersController@create']);
+    Route::post('/',['middleware' => ['permission:manage-gymie|manage-members|add-member'],'uses' => 'MembersController@store']);
+    Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@show']);
+    Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-members|edit-member'],'uses' => 'MembersController@edit']);
+    Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-members|edit-member'],'uses' => 'MembersController@update']);
+    Route::post('{id}/archive',['middleware' => ['permission:manage-gymie|manage-members|delete-member'],'uses' => 'MembersController@archive']);
+    Route::get('{id}/transfer',['middleware' => ['permission:manage-gymie|manage-enquiries|transfer-enquiry'],'uses' => 'MembersController@transfer']);
 });
 
 //ReportsController
 Route::group(['prefix' => 'reports','middleware' => ['auth']], function() {
-	Route::get('members/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@gymMemberCharts']);
-	Route::get('members/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@gymMemberData']);
-	Route::get('enquiries/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@enquiryCharts']);
-	Route::get('enquiries/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@enquiryData']);
-	Route::get('subscriptions/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@subscriptionCharts']);
-	Route::get('subscriptions/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@subscriptionData']);
-	Route::get('payments/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@paymentCharts']);
-	Route::get('payments/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@paymentData']);
-	Route::get('expenses/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@expenseCharts']);
-	Route::get('expenses/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@expenseData']);
-	Route::get('invoices/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@invoiceCharts']);
-	Route::get('invoices/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@invoiceData']);
+    Route::get('members/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@gymMemberCharts']);
+    Route::get('members/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@gymMemberData']);
+    Route::get('enquiries/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@enquiryCharts']);
+    Route::get('enquiries/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@enquiryData']);
+    Route::get('subscriptions/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@subscriptionCharts']);
+    Route::get('subscriptions/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@subscriptionData']);
+    Route::get('payments/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@paymentCharts']);
+    Route::get('payments/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@paymentData']);
+    Route::get('expenses/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@expenseCharts']);
+    Route::get('expenses/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@expenseData']);
+    Route::get('invoices/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@invoiceCharts']);
+    Route::get('invoices/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@invoiceData']);
 });
 
 //SmsController
 Route::group(['prefix' => 'sms','middleware' => ['auth']], function() {
-	Route::get('triggers',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@triggersIndex']);
-	Route::post('triggers/update',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@triggerUpdate']);
-	Route::get('events',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@eventsIndex']);
-	Route::get('events/create',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@createEvent']);
-	Route::post('events',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@storeEvent']);
-	Route::get('events/{id}/edit',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@editEvent']);
-	Route::post('events/{id}/update',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@updateEvent']);
-	Route::post('events/{id}/destroy',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@destroyEvent']);
-	Route::get('send',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@send']);
-	Route::post('shoot',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@shoot']);
-	Route::get('log',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@logIndex']);
-	Route::get('log/refresh',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@logRefresh']);
+    Route::get('triggers',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@triggersIndex']);
+    Route::post('triggers/update',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@triggerUpdate']);
+    Route::get('events',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@eventsIndex']);
+    Route::get('events/create',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@createEvent']);
+    Route::post('events',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@storeEvent']);
+    Route::get('events/{id}/edit',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@editEvent']);
+    Route::post('events/{id}/update',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@updateEvent']);
+    Route::post('events/{id}/destroy',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@destroyEvent']);
+    Route::get('send',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@send']);
+    Route::post('shoot',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@shoot']);
+    Route::get('log',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@logIndex']);
+    Route::get('log/refresh',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@logRefresh']);
 });
 
 //enquiries
 Route::group(['prefix' => 'enquiries','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@index']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'],'uses' => 'EnquiriesController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'],'uses' => 'EnquiriesController@store']);
-	Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@show']);
-	Route::post('{id}/lost',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@lost']);
-	Route::post('{id}/markMember',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@markMember']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry'],'uses' => 'EnquiriesController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry'],'uses' => 'EnquiriesController@update']);
+    Route::get('/',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@index']);
+    Route::get('all',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@index']);
+    Route::get('create',['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'],'uses' => 'EnquiriesController@create']);
+    Route::post('/',['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'],'uses' => 'EnquiriesController@store']);
+    Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@show']);
+    Route::post('{id}/lost',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@lost']);
+    Route::post('{id}/markMember',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@markMember']);
+    Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry'],'uses' => 'EnquiriesController@edit']);
+    Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry'],'uses' => 'EnquiriesController@update']);
 });
 
 //followups
 Route::group(['prefix' => 'enquiry','middleware' => ['auth']], function() {
-	Route::post('followups',['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry-followup'],'uses' => 'FollowupsController@store']);
-	Route::post('followups/{id}/update',['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry-followup'],'uses' => 'FollowupsController@update']);
+    Route::post('followups',['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry-followup'],'uses' => 'FollowupsController@store']);
+    Route::post('followups/{id}/update',['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry-followup'],'uses' => 'FollowupsController@update']);
 });
 
 //plans
 Route::group(['prefix' => 'plans','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-plans|view-plan'],'uses' => 'PlansController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-plans|view-plan'],'uses' => 'PlansController@index']);
-	Route::get('show',['middleware' => ['permission:manage-gymie|manage-plans|view-plan'],'uses' => 'PlansController@show']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-plans|add-plan'],'uses' => 'PlansController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-plans|add-plan'],'uses' => 'PlansController@store']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-plans|edit-plan'],'uses' => 'PlansController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-plans|edit-plan'],'uses' => 'PlansController@update']);
-	Route::post('{id}/archive',['middleware' => ['permission:manage-gymie|manage-plans|delete-plan'],'uses' => 'PlansController@archive']);
-	Route::get('/services',['middleware' => ['permission:manage-gymie|manage-services|view-service'],'uses' => 'ServicesController@index']);
-	Route::get('services/all',['middleware' => ['permission:manage-gymie|manage-services|view-service'],'uses' => 'ServicesController@index']);
-	Route::get('services/create',['middleware' => ['permission:manage-gymie|manage-services|add-service'],'uses' => 'ServicesController@create']);
-	Route::post('/services',['middleware' => ['permission:manage-gymie|manage-services|add-service'],'uses' => 'ServicesController@store']);
-	Route::get('services/{id}/edit',['middleware' => ['permission:manage-gymie|manage-services|edit-service'],'uses' => 'ServicesController@edit']);
-	Route::post('services/{id}/update',['middleware' => ['permission:manage-gymie|manage-services|edit-service'],'uses' => 'ServicesController@update']);
-	Route::post('services/{id}/delete',['middleware' => ['permission:manage-gymie|manage-services|delete-service'],'uses' => 'ServicesController@delete']);
+    Route::get('/',['middleware' => ['permission:manage-gymie|manage-plans|view-plan'],'uses' => 'PlansController@index']);
+    Route::get('all',['middleware' => ['permission:manage-gymie|manage-plans|view-plan'],'uses' => 'PlansController@index']);
+    Route::get('show',['middleware' => ['permission:manage-gymie|manage-plans|view-plan'],'uses' => 'PlansController@show']);
+    Route::get('create',['middleware' => ['permission:manage-gymie|manage-plans|add-plan'],'uses' => 'PlansController@create']);
+    Route::post('/',['middleware' => ['permission:manage-gymie|manage-plans|add-plan'],'uses' => 'PlansController@store']);
+    Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-plans|edit-plan'],'uses' => 'PlansController@edit']);
+    Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-plans|edit-plan'],'uses' => 'PlansController@update']);
+    Route::post('{id}/archive',['middleware' => ['permission:manage-gymie|manage-plans|delete-plan'],'uses' => 'PlansController@archive']);
+    Route::get('/services',['middleware' => ['permission:manage-gymie|manage-services|view-service'],'uses' => 'ServicesController@index']);
+    Route::get('services/all',['middleware' => ['permission:manage-gymie|manage-services|view-service'],'uses' => 'ServicesController@index']);
+    Route::get('services/create',['middleware' => ['permission:manage-gymie|manage-services|add-service'],'uses' => 'ServicesController@create']);
+    Route::post('/services',['middleware' => ['permission:manage-gymie|manage-services|add-service'],'uses' => 'ServicesController@store']);
+    Route::get('services/{id}/edit',['middleware' => ['permission:manage-gymie|manage-services|edit-service'],'uses' => 'ServicesController@edit']);
+    Route::post('services/{id}/update',['middleware' => ['permission:manage-gymie|manage-services|edit-service'],'uses' => 'ServicesController@update']);
+    Route::post('services/{id}/delete',['middleware' => ['permission:manage-gymie|manage-services|delete-service'],'uses' => 'ServicesController@delete']);
 });
 
 //services
@@ -164,35 +164,35 @@ 
 
 //subsciptions
 Route::group(['prefix' => 'subscriptions','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@index']);
-	Route::get('expiring',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@expiring']);
-	Route::get('expired',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@expired']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-subscriptions|add-subscription'],'uses' => 'SubscriptionsController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-subscriptions|add-subscription'],'uses' => 'SubscriptionsController@store']);
-	Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@show']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-subscriptions|edit-subscription'],'uses' => 'SubscriptionsController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-subscriptions|edit-subscription'],'uses' => 'SubscriptionsController@update']);
-	Route::get('{id}/change',['middleware' => ['permission:manage-gymie|manage-subscriptions|change-subscription'],'uses' => 'SubscriptionsController@change']);
-	Route::post('{id}/modify',['middleware' => ['permission:manage-gymie|manage-subscriptions|change-subscription'],'uses' => 'SubscriptionsController@modify']);
-	Route::get('{id}/renew',['middleware' => ['permission:manage-gymie|manage-subscriptions|renew-subscription'],'uses' => 'SubscriptionsController@renew']);
-	Route::post('{id}/cancelSubscription',['middleware' => ['permission:manage-gymie|manage-subscriptions|cancel-subscription'],'uses' => 'SubscriptionsController@cancelSubscription']);
-	Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-subscriptions|delete-subscription'],'uses' => 'SubscriptionsController@delete']);
+    Route::get('/',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@index']);
+    Route::get('all',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@index']);
+    Route::get('expiring',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@expiring']);
+    Route::get('expired',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@expired']);
+    Route::get('create',['middleware' => ['permission:manage-gymie|manage-subscriptions|add-subscription'],'uses' => 'SubscriptionsController@create']);
+    Route::post('/',['middleware' => ['permission:manage-gymie|manage-subscriptions|add-subscription'],'uses' => 'SubscriptionsController@store']);
+    Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@show']);
+    Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-subscriptions|edit-subscription'],'uses' => 'SubscriptionsController@edit']);
+    Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-subscriptions|edit-subscription'],'uses' => 'SubscriptionsController@update']);
+    Route::get('{id}/change',['middleware' => ['permission:manage-gymie|manage-subscriptions|change-subscription'],'uses' => 'SubscriptionsController@change']);
+    Route::post('{id}/modify',['middleware' => ['permission:manage-gymie|manage-subscriptions|change-subscription'],'uses' => 'SubscriptionsController@modify']);
+    Route::get('{id}/renew',['middleware' => ['permission:manage-gymie|manage-subscriptions|renew-subscription'],'uses' => 'SubscriptionsController@renew']);
+    Route::post('{id}/cancelSubscription',['middleware' => ['permission:manage-gymie|manage-subscriptions|cancel-subscription'],'uses' => 'SubscriptionsController@cancelSubscription']);
+    Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-subscriptions|delete-subscription'],'uses' => 'SubscriptionsController@delete']);
 });
 
 //invoices
 Route::group(['prefix' => 'invoices','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@index']);
-	Route::get('paid',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@paid']);
-	Route::get('unpaid',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@unpaid']);
-	Route::get('partial',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@partial']);
-	Route::get('overpaid',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@overpaid']);
-	Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@show']);
-	Route::get('{id}/payment',['middleware' => ['permission:manage-gymie|manage-invoices|add-payment'],'uses' => 'InvoicesController@createPayment']);
-	Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-invoices|delete-invoice'],'uses' => 'InvoicesController@delete']);
-	Route::get('{id}/discount',['middleware' => ['permission:manage-gymie|manage-invoices|add-discount'],'uses' => 'InvoicesController@discount']);
-	Route::post('{id}/applyDiscount',['middleware' => ['permission:manage-gymie|manage-invoices|add-discount'],'uses' => 'InvoicesController@applyDiscount']);
+    Route::get('/',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@index']);
+    Route::get('all',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@index']);
+    Route::get('paid',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@paid']);
+    Route::get('unpaid',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@unpaid']);
+    Route::get('partial',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@partial']);
+    Route::get('overpaid',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@overpaid']);
+    Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@show']);
+    Route::get('{id}/payment',['middleware' => ['permission:manage-gymie|manage-invoices|add-payment'],'uses' => 'InvoicesController@createPayment']);
+    Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-invoices|delete-invoice'],'uses' => 'InvoicesController@delete']);
+    Route::get('{id}/discount',['middleware' => ['permission:manage-gymie|manage-invoices|add-discount'],'uses' => 'InvoicesController@discount']);
+    Route::post('{id}/applyDiscount',['middleware' => ['permission:manage-gymie|manage-invoices|add-discount'],'uses' => 'InvoicesController@applyDiscount']);
 });
 
 //activities
@@ -202,18 +202,18 @@ 
 
 //payments
 Route::group(['prefix' => 'payments','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-payments|view-payment'],'uses' => 'PaymentsController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-payments|view-payment'],'uses' => 'PaymentsController@index']);
-	Route::get('show',['middleware' => ['permission:manage-gymie|manage-payments|view-payment'],'uses' => 'PaymentsController@show']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-payments|add-payment'],'uses' => 'PaymentsController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-payments|add-payment'],'uses' => 'PaymentsController@store']);	
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@edit']);
-	Route::get('{id}/clearCheque',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@clearCheque']);
-	Route::get('{id}/depositCheque',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@depositCheque']);
-	Route::get('{id}/chequeBounce',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@chequeBounce']);
-	Route::get('{id}/chequeReissue',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@chequeReissue']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@update']);
-	Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-payments|delete-payment'],'uses' => 'PaymentsController@delete']);
+    Route::get('/',['middleware' => ['permission:manage-gymie|manage-payments|view-payment'],'uses' => 'PaymentsController@index']);
+    Route::get('all',['middleware' => ['permission:manage-gymie|manage-payments|view-payment'],'uses' => 'PaymentsController@index']);
+    Route::get('show',['middleware' => ['permission:manage-gymie|manage-payments|view-payment'],'uses' => 'PaymentsController@show']);
+    Route::get('create',['middleware' => ['permission:manage-gymie|manage-payments|add-payment'],'uses' => 'PaymentsController@create']);
+    Route::post('/',['middleware' => ['permission:manage-gymie|manage-payments|add-payment'],'uses' => 'PaymentsController@store']);	
+    Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@edit']);
+    Route::get('{id}/clearCheque',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@clearCheque']);
+    Route::get('{id}/depositCheque',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@depositCheque']);
+    Route::get('{id}/chequeBounce',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@chequeBounce']);
+    Route::get('{id}/chequeReissue',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@chequeReissue']);
+    Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@update']);
+    Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-payments|delete-payment'],'uses' => 'PaymentsController@delete']);
 });
 
 //expense Categories
@@ -230,60 +230,60 @@ 
 
 //expenses
 Route::group(['prefix' => 'expenses','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'],'uses' => 'ExpensesController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'],'uses' => 'ExpensesController@index']);
-	Route::get('show',['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'],'uses' => 'ExpensesController@show']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-expenses|add-expense'],'uses' => 'ExpensesController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-expenses|add-expense'],'uses' => 'ExpensesController@store']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'],'uses' => 'ExpensesController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'],'uses' => 'ExpensesController@update']);
-	Route::get('{id}/paid',['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'],'uses' => 'ExpensesController@paid']);
-	Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-expenses|delete-expense'],'uses' => 'ExpensesController@delete']);
-	Route::get('/categories',['middleware' => ['permission:manage-gymie|manage-expenseCategories|view-expenseCategory'],'uses' => 'ExpenseCategoriesController@index']);
-	Route::get('categories/all',['middleware' => ['permission:manage-gymie|manage-expenseCategories|view-expenseCategory'],'uses' => 'ExpenseCategoriesController@index']);
-	Route::get('categories/create',['middleware' => ['permission:manage-gymie|manage-expenseCategories|add-expenseCategory'],'uses' => 'ExpenseCategoriesController@create']);
-	Route::post('/categories',['middleware' => ['permission:manage-gymie|manage-expenseCategories|add-expenseCategory'],'uses' => 'ExpenseCategoriesController@store']);
-	Route::get('categories/{id}/edit',['middleware' => ['permission:manage-gymie|manage-expenseCategories|edit-expenseCategory'],'uses' => 'ExpenseCategoriesController@edit']);
-	Route::post('categories/{id}/update',['middleware' => ['permission:manage-gymie|manage-expenseCategories|edit-expenseCategory'],'uses' => 'ExpenseCategoriesController@update']);
-	Route::post('categories/{id}/archive',['middleware' => ['permission:manage-gymie|manage-expenseCategories|delete-expenseCategory'],'uses' => 'ExpenseCategoriesController@archive']);
+    Route::get('/',['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'],'uses' => 'ExpensesController@index']);
+    Route::get('all',['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'],'uses' => 'ExpensesController@index']);
+    Route::get('show',['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'],'uses' => 'ExpensesController@show']);
+    Route::get('create',['middleware' => ['permission:manage-gymie|manage-expenses|add-expense'],'uses' => 'ExpensesController@create']);
+    Route::post('/',['middleware' => ['permission:manage-gymie|manage-expenses|add-expense'],'uses' => 'ExpensesController@store']);
+    Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'],'uses' => 'ExpensesController@edit']);
+    Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'],'uses' => 'ExpensesController@update']);
+    Route::get('{id}/paid',['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'],'uses' => 'ExpensesController@paid']);
+    Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-expenses|delete-expense'],'uses' => 'ExpensesController@delete']);
+    Route::get('/categories',['middleware' => ['permission:manage-gymie|manage-expenseCategories|view-expenseCategory'],'uses' => 'ExpenseCategoriesController@index']);
+    Route::get('categories/all',['middleware' => ['permission:manage-gymie|manage-expenseCategories|view-expenseCategory'],'uses' => 'ExpenseCategoriesController@index']);
+    Route::get('categories/create',['middleware' => ['permission:manage-gymie|manage-expenseCategories|add-expenseCategory'],'uses' => 'ExpenseCategoriesController@create']);
+    Route::post('/categories',['middleware' => ['permission:manage-gymie|manage-expenseCategories|add-expenseCategory'],'uses' => 'ExpenseCategoriesController@store']);
+    Route::get('categories/{id}/edit',['middleware' => ['permission:manage-gymie|manage-expenseCategories|edit-expenseCategory'],'uses' => 'ExpenseCategoriesController@edit']);
+    Route::post('categories/{id}/update',['middleware' => ['permission:manage-gymie|manage-expenseCategories|edit-expenseCategory'],'uses' => 'ExpenseCategoriesController@update']);
+    Route::post('categories/{id}/archive',['middleware' => ['permission:manage-gymie|manage-expenseCategories|delete-expenseCategory'],'uses' => 'ExpenseCategoriesController@archive']);
 });
 
 //settings
 Route::group(['prefix' => 'settings','middleware' => ['permission:manage-gymie|manage-settings','auth']], function() {
-	Route::get('/','SettingsController@show');
-	Route::get('edit','SettingsController@edit');
-	Route::post('save','SettingsController@save');
+    Route::get('/','SettingsController@show');
+    Route::get('edit','SettingsController@edit');
+    Route::post('save','SettingsController@save');
 });
 
 //User Module with roles & permissions
 Route::group(['prefix' => 'user','middleware' => ['permission:manage-gymie|manage-users','auth']], function() {
-	//User
-	Route::get('/','AclController@userIndex');
-	Route::get('create','AclController@createUser');
-	Route::post('/','AclController@storeUser');
-	Route::get('{id}/edit','AclController@editUser');
-	Route::post('{id}/update','AclController@updateUser');
-	Route::post('{id}/delete','AclController@deleteUser');
+    //User
+    Route::get('/','AclController@userIndex');
+    Route::get('create','AclController@createUser');
+    Route::post('/','AclController@storeUser');
+    Route::get('{id}/edit','AclController@editUser');
+    Route::post('{id}/update','AclController@updateUser');
+    Route::post('{id}/delete','AclController@deleteUser');
 
 });
 
 Route::group(['prefix' => 'user/role','middleware' => ['permission:manage-gymie|manage-users','auth']], function() {
-	//Roles
-	Route::get('/','AclController@roleIndex');
-	Route::get('create','AclController@createRole');
-	Route::post('/','AclController@storeRole');
-	Route::get('{id}/edit','AclController@editRole');
-	Route::post('{id}/update','AclController@updateRole');
-	Route::post('{id}/delete','AclController@deleteRole');
+    //Roles
+    Route::get('/','AclController@roleIndex');
+    Route::get('create','AclController@createRole');
+    Route::post('/','AclController@storeRole');
+    Route::get('{id}/edit','AclController@editRole');
+    Route::post('{id}/update','AclController@updateRole');
+    Route::post('{id}/delete','AclController@deleteRole');
 
 });
 
 Route::group(['prefix' => 'user/permission','middleware' => ['auth','role:Gymie']], function() {
-	//Permissions
-	Route::get('/','AclController@permissionIndex');
-	Route::get('create','AclController@createPermission');
-	Route::post('/','AclController@storePermission');
-	Route::get('{id}/edit','AclController@editPermission');
-	Route::post('{id}/update','AclController@updatePermission');
-	Route::post('{id}/delete','AclController@deletePermission');
+    //Permissions
+    Route::get('/','AclController@permissionIndex');
+    Route::get('create','AclController@createPermission');
+    Route::post('/','AclController@storePermission');
+    Route::get('{id}/edit','AclController@editPermission');
+    Route::post('{id}/update','AclController@updatePermission');
+    Route::post('{id}/delete','AclController@deletePermission');
 });
\ No newline at end of file

Spacing +183 added lines, -183 removed lines

@@ -13,44 +13,44 @@ 
 
 
 // Log viewer route
-Route::get('logs',['middleware' => ['auth','role:Gymie'],'uses' => '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index']);
+Route::get('logs', ['middleware' => ['auth', 'role:Gymie'], 'uses' => '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index']);
 
 //Data Migration
-Route::get('data/migration',['middleware' => ['auth','role:Gymie'],'uses' => 'DataMigrationController@migrate']);
-Route::get('data/media/migration',['middleware' => ['auth','role:Gymie'],'uses' => 'DataMigrationController@migrateMedia']);
-Route::get('excel/migration',['middleware' => ['auth','role:Gymie'],'uses' => 'DataMigrationController@migrateExcel']);
+Route::get('data/migration', ['middleware' => ['auth', 'role:Gymie'], 'uses' => 'DataMigrationController@migrate']);
+Route::get('data/media/migration', ['middleware' => ['auth', 'role:Gymie'], 'uses' => 'DataMigrationController@migrateMedia']);
+Route::get('excel/migration', ['middleware' => ['auth', 'role:Gymie'], 'uses' => 'DataMigrationController@migrateExcel']);
 
 //Report DATA
-Route::get('reportData/members','ReportData\MembersController@details');
+Route::get('reportData/members', 'ReportData\MembersController@details');
 
 //API routes
-Route::post('api/token','Api\AuthenticateController@authenticate');
+Route::post('api/token', 'Api\AuthenticateController@authenticate');
 
-Route::group(['prefix' => 'api','middleware' => ['jwt.auth']], function() {	
-	Route::get('dashboard','Api\DashboardController@index');
-	Route::get('members','Api\MembersController@index');
-	Route::get('subscriptions','Api\SubscriptionsController@index');
-	Route::get('payments','Api\PaymentsController@index');
-	Route::get('invoices','Api\InvoicesController@index');
-	Route::get('invoices/paid','Api\InvoicesController@paid');
-	Route::get('invoices/unpaid','Api\InvoicesController@unpaid');
-	Route::get('invoices/partial','Api\InvoicesController@partial');
-	Route::get('invoices/overpaid','Api\InvoicesController@overpaid');
-	Route::get('enquiries','Api\EnquiriesController@index');
-	Route::get('settings','Api\SettingsController@index');
-	Route::get('plans','Api\PlansController@index');
-	Route::get('expenseCategories','Api\ExpenseCategoriesController@index');
-	Route::get('expenses','Api\ExpensesController@index');
-	Route::get('subscriptions/expiring','Api\SubscriptionsController@expiring');
-	Route::get('subscriptions/expired','Api\SubscriptionsController@expired');
-	Route::get('members/{id}','Api\MembersController@show');
-	Route::get('subscriptions/{id}','Api\SubscriptionsController@show');
-	Route::get('payments/{id}','Api\PaymentsController@show');
-	Route::get('invoices/{id}','Api\InvoicesController@show');
-	Route::get('enquiries/{id}','Api\EnquiriesController@show');
-	Route::get('plans/{id}','Api\PlansController@show');
-	Route::get('expenseCategories/{id}','Api\ExpenseCategoriesController@show');
-	Route::get('expenses/{id}','Api\ExpensesController@show');
+Route::group(['prefix' => 'api', 'middleware' => ['jwt.auth']], function() {	
+	Route::get('dashboard', 'Api\DashboardController@index');
+	Route::get('members', 'Api\MembersController@index');
+	Route::get('subscriptions', 'Api\SubscriptionsController@index');
+	Route::get('payments', 'Api\PaymentsController@index');
+	Route::get('invoices', 'Api\InvoicesController@index');
+	Route::get('invoices/paid', 'Api\InvoicesController@paid');
+	Route::get('invoices/unpaid', 'Api\InvoicesController@unpaid');
+	Route::get('invoices/partial', 'Api\InvoicesController@partial');
+	Route::get('invoices/overpaid', 'Api\InvoicesController@overpaid');
+	Route::get('enquiries', 'Api\EnquiriesController@index');
+	Route::get('settings', 'Api\SettingsController@index');
+	Route::get('plans', 'Api\PlansController@index');
+	Route::get('expenseCategories', 'Api\ExpenseCategoriesController@index');
+	Route::get('expenses', 'Api\ExpensesController@index');
+	Route::get('subscriptions/expiring', 'Api\SubscriptionsController@expiring');
+	Route::get('subscriptions/expired', 'Api\SubscriptionsController@expired');
+	Route::get('members/{id}', 'Api\MembersController@show');
+	Route::get('subscriptions/{id}', 'Api\SubscriptionsController@show');
+	Route::get('payments/{id}', 'Api\PaymentsController@show');
+	Route::get('invoices/{id}', 'Api\InvoicesController@show');
+	Route::get('enquiries/{id}', 'Api\EnquiriesController@show');
+	Route::get('plans/{id}', 'Api\PlansController@show');
+	Route::get('expenseCategories/{id}', 'Api\ExpenseCategoriesController@show');
+	Route::get('expenses/{id}', 'Api\ExpensesController@show');
 });
 
 //Auth routes
@@ -62,94 +62,94 @@ 
 
 //dashboard 
 Route::group(['middleware' => ['auth']], function() {
-Route::get('/','DashboardController@index');
-Route::get('/dashboard','DashboardController@index');
-Route::post('/dashboard/smsRequest','DashboardController@smsRequest');
+Route::get('/', 'DashboardController@index');
+Route::get('/dashboard', 'DashboardController@index');
+Route::post('/dashboard/smsRequest', 'DashboardController@smsRequest');
 });
 
 //MembersController
-Route::group(['prefix' => 'members','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@index']);
-	Route::get('active',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@active']);
-	Route::get('inactive',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@inactive']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-members|add-member'],'uses' => 'MembersController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-members|add-member'],'uses' => 'MembersController@store']);
-	Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-members|view-member'],'uses' => 'MembersController@show']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-members|edit-member'],'uses' => 'MembersController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-members|edit-member'],'uses' => 'MembersController@update']);
-	Route::post('{id}/archive',['middleware' => ['permission:manage-gymie|manage-members|delete-member'],'uses' => 'MembersController@archive']);
-	Route::get('{id}/transfer',['middleware' => ['permission:manage-gymie|manage-enquiries|transfer-enquiry'],'uses' => 'MembersController@transfer']);
+Route::group(['prefix' => 'members', 'middleware' => ['auth']], function() {
+	Route::get('/', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@index']);
+	Route::get('all', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@index']);
+	Route::get('active', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@active']);
+	Route::get('inactive', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@inactive']);
+	Route::get('create', ['middleware' => ['permission:manage-gymie|manage-members|add-member'], 'uses' => 'MembersController@create']);
+	Route::post('/', ['middleware' => ['permission:manage-gymie|manage-members|add-member'], 'uses' => 'MembersController@store']);
+	Route::get('{id}/show', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@show']);
+	Route::get('{id}/edit', ['middleware' => ['permission:manage-gymie|manage-members|edit-member'], 'uses' => 'MembersController@edit']);
+	Route::post('{id}/update', ['middleware' => ['permission:manage-gymie|manage-members|edit-member'], 'uses' => 'MembersController@update']);
+	Route::post('{id}/archive', ['middleware' => ['permission:manage-gymie|manage-members|delete-member'], 'uses' => 'MembersController@archive']);
+	Route::get('{id}/transfer', ['middleware' => ['permission:manage-gymie|manage-enquiries|transfer-enquiry'], 'uses' => 'MembersController@transfer']);
 });
 
 //ReportsController
-Route::group(['prefix' => 'reports','middleware' => ['auth']], function() {
-	Route::get('members/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@gymMemberCharts']);
-	Route::get('members/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@gymMemberData']);
-	Route::get('enquiries/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@enquiryCharts']);
-	Route::get('enquiries/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@enquiryData']);
-	Route::get('subscriptions/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@subscriptionCharts']);
-	Route::get('subscriptions/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@subscriptionData']);
-	Route::get('payments/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@paymentCharts']);
-	Route::get('payments/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@paymentData']);
-	Route::get('expenses/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@expenseCharts']);
-	Route::get('expenses/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@expenseData']);
-	Route::get('invoices/charts',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@invoiceCharts']);
-	Route::get('invoices/data',['middleware' => ['permission:manage-gymie|manage-reports|view-report'],'uses' => 'ReportsController@invoiceData']);
+Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function() {
+	Route::get('members/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@gymMemberCharts']);
+	Route::get('members/data', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@gymMemberData']);
+	Route::get('enquiries/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@enquiryCharts']);
+	Route::get('enquiries/data', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@enquiryData']);
+	Route::get('subscriptions/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@subscriptionCharts']);
+	Route::get('subscriptions/data', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@subscriptionData']);
+	Route::get('payments/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@paymentCharts']);
+	Route::get('payments/data', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@paymentData']);
+	Route::get('expenses/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@expenseCharts']);
+	Route::get('expenses/data', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@expenseData']);
+	Route::get('invoices/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@invoiceCharts']);
+	Route::get('invoices/data', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@invoiceData']);
 });
 
 //SmsController
-Route::group(['prefix' => 'sms','middleware' => ['auth']], function() {
-	Route::get('triggers',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@triggersIndex']);
-	Route::post('triggers/update',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@triggerUpdate']);
-	Route::get('events',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@eventsIndex']);
-	Route::get('events/create',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@createEvent']);
-	Route::post('events',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@storeEvent']);
-	Route::get('events/{id}/edit',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@editEvent']);
-	Route::post('events/{id}/update',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@updateEvent']);
-	Route::post('events/{id}/destroy',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@destroyEvent']);
-	Route::get('send',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@send']);
-	Route::post('shoot',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@shoot']);
-	Route::get('log',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@logIndex']);
-	Route::get('log/refresh',['middleware' => ['permission:manage-gymie|manage-sms'],'uses' => 'SmsController@logRefresh']);
+Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function() {
+	Route::get('triggers', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggersIndex']);
+	Route::post('triggers/update', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggerUpdate']);
+	Route::get('events', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@eventsIndex']);
+	Route::get('events/create', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@createEvent']);
+	Route::post('events', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@storeEvent']);
+	Route::get('events/{id}/edit', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@editEvent']);
+	Route::post('events/{id}/update', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@updateEvent']);
+	Route::post('events/{id}/destroy', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@destroyEvent']);
+	Route::get('send', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@send']);
+	Route::post('shoot', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@shoot']);
+	Route::get('log', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@logIndex']);
+	Route::get('log/refresh', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@logRefresh']);
 });
 
 //enquiries
-Route::group(['prefix' => 'enquiries','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@index']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'],'uses' => 'EnquiriesController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'],'uses' => 'EnquiriesController@store']);
-	Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@show']);
-	Route::post('{id}/lost',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@lost']);
-	Route::post('{id}/markMember',['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'],'uses' => 'EnquiriesController@markMember']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry'],'uses' => 'EnquiriesController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry'],'uses' => 'EnquiriesController@update']);
+Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function() {
+	Route::get('/', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']);
+	Route::get('all', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']);
+	Route::get('create', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'], 'uses' => 'EnquiriesController@create']);
+	Route::post('/', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'], 'uses' => 'EnquiriesController@store']);
+	Route::get('{id}/show', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@show']);
+	Route::post('{id}/lost', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@lost']);
+	Route::post('{id}/markMember', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@markMember']);
+	Route::get('{id}/edit', ['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry'], 'uses' => 'EnquiriesController@edit']);
+	Route::post('{id}/update', ['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry'], 'uses' => 'EnquiriesController@update']);
 });
 
 //followups
-Route::group(['prefix' => 'enquiry','middleware' => ['auth']], function() {
-	Route::post('followups',['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry-followup'],'uses' => 'FollowupsController@store']);
-	Route::post('followups/{id}/update',['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry-followup'],'uses' => 'FollowupsController@update']);
+Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function() {
+	Route::post('followups', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry-followup'], 'uses' => 'FollowupsController@store']);
+	Route::post('followups/{id}/update', ['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry-followup'], 'uses' => 'FollowupsController@update']);
 });
 
 //plans
-Route::group(['prefix' => 'plans','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-plans|view-plan'],'uses' => 'PlansController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-plans|view-plan'],'uses' => 'PlansController@index']);
-	Route::get('show',['middleware' => ['permission:manage-gymie|manage-plans|view-plan'],'uses' => 'PlansController@show']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-plans|add-plan'],'uses' => 'PlansController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-plans|add-plan'],'uses' => 'PlansController@store']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-plans|edit-plan'],'uses' => 'PlansController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-plans|edit-plan'],'uses' => 'PlansController@update']);
-	Route::post('{id}/archive',['middleware' => ['permission:manage-gymie|manage-plans|delete-plan'],'uses' => 'PlansController@archive']);
-	Route::get('/services',['middleware' => ['permission:manage-gymie|manage-services|view-service'],'uses' => 'ServicesController@index']);
-	Route::get('services/all',['middleware' => ['permission:manage-gymie|manage-services|view-service'],'uses' => 'ServicesController@index']);
-	Route::get('services/create',['middleware' => ['permission:manage-gymie|manage-services|add-service'],'uses' => 'ServicesController@create']);
-	Route::post('/services',['middleware' => ['permission:manage-gymie|manage-services|add-service'],'uses' => 'ServicesController@store']);
-	Route::get('services/{id}/edit',['middleware' => ['permission:manage-gymie|manage-services|edit-service'],'uses' => 'ServicesController@edit']);
-	Route::post('services/{id}/update',['middleware' => ['permission:manage-gymie|manage-services|edit-service'],'uses' => 'ServicesController@update']);
-	Route::post('services/{id}/delete',['middleware' => ['permission:manage-gymie|manage-services|delete-service'],'uses' => 'ServicesController@delete']);
+Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function() {
+	Route::get('/', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']);
+	Route::get('all', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']);
+	Route::get('show', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@show']);
+	Route::get('create', ['middleware' => ['permission:manage-gymie|manage-plans|add-plan'], 'uses' => 'PlansController@create']);
+	Route::post('/', ['middleware' => ['permission:manage-gymie|manage-plans|add-plan'], 'uses' => 'PlansController@store']);
+	Route::get('{id}/edit', ['middleware' => ['permission:manage-gymie|manage-plans|edit-plan'], 'uses' => 'PlansController@edit']);
+	Route::post('{id}/update', ['middleware' => ['permission:manage-gymie|manage-plans|edit-plan'], 'uses' => 'PlansController@update']);
+	Route::post('{id}/archive', ['middleware' => ['permission:manage-gymie|manage-plans|delete-plan'], 'uses' => 'PlansController@archive']);
+	Route::get('/services', ['middleware' => ['permission:manage-gymie|manage-services|view-service'], 'uses' => 'ServicesController@index']);
+	Route::get('services/all', ['middleware' => ['permission:manage-gymie|manage-services|view-service'], 'uses' => 'ServicesController@index']);
+	Route::get('services/create', ['middleware' => ['permission:manage-gymie|manage-services|add-service'], 'uses' => 'ServicesController@create']);
+	Route::post('/services', ['middleware' => ['permission:manage-gymie|manage-services|add-service'], 'uses' => 'ServicesController@store']);
+	Route::get('services/{id}/edit', ['middleware' => ['permission:manage-gymie|manage-services|edit-service'], 'uses' => 'ServicesController@edit']);
+	Route::post('services/{id}/update', ['middleware' => ['permission:manage-gymie|manage-services|edit-service'], 'uses' => 'ServicesController@update']);
+	Route::post('services/{id}/delete', ['middleware' => ['permission:manage-gymie|manage-services|delete-service'], 'uses' => 'ServicesController@delete']);
 });
 
 //services
@@ -163,36 +163,36 @@ 
 // });
 
 //subsciptions
-Route::group(['prefix' => 'subscriptions','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@index']);
-	Route::get('expiring',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@expiring']);
-	Route::get('expired',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@expired']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-subscriptions|add-subscription'],'uses' => 'SubscriptionsController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-subscriptions|add-subscription'],'uses' => 'SubscriptionsController@store']);
-	Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'],'uses' => 'SubscriptionsController@show']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-subscriptions|edit-subscription'],'uses' => 'SubscriptionsController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-subscriptions|edit-subscription'],'uses' => 'SubscriptionsController@update']);
-	Route::get('{id}/change',['middleware' => ['permission:manage-gymie|manage-subscriptions|change-subscription'],'uses' => 'SubscriptionsController@change']);
-	Route::post('{id}/modify',['middleware' => ['permission:manage-gymie|manage-subscriptions|change-subscription'],'uses' => 'SubscriptionsController@modify']);
-	Route::get('{id}/renew',['middleware' => ['permission:manage-gymie|manage-subscriptions|renew-subscription'],'uses' => 'SubscriptionsController@renew']);
-	Route::post('{id}/cancelSubscription',['middleware' => ['permission:manage-gymie|manage-subscriptions|cancel-subscription'],'uses' => 'SubscriptionsController@cancelSubscription']);
-	Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-subscriptions|delete-subscription'],'uses' => 'SubscriptionsController@delete']);
+Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function() {
+	Route::get('/', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']);
+	Route::get('all', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']);
+	Route::get('expiring', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@expiring']);
+	Route::get('expired', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@expired']);
+	Route::get('create', ['middleware' => ['permission:manage-gymie|manage-subscriptions|add-subscription'], 'uses' => 'SubscriptionsController@create']);
+	Route::post('/', ['middleware' => ['permission:manage-gymie|manage-subscriptions|add-subscription'], 'uses' => 'SubscriptionsController@store']);
+	Route::get('{id}/show', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@show']);
+	Route::get('{id}/edit', ['middleware' => ['permission:manage-gymie|manage-subscriptions|edit-subscription'], 'uses' => 'SubscriptionsController@edit']);
+	Route::post('{id}/update', ['middleware' => ['permission:manage-gymie|manage-subscriptions|edit-subscription'], 'uses' => 'SubscriptionsController@update']);
+	Route::get('{id}/change', ['middleware' => ['permission:manage-gymie|manage-subscriptions|change-subscription'], 'uses' => 'SubscriptionsController@change']);
+	Route::post('{id}/modify', ['middleware' => ['permission:manage-gymie|manage-subscriptions|change-subscription'], 'uses' => 'SubscriptionsController@modify']);
+	Route::get('{id}/renew', ['middleware' => ['permission:manage-gymie|manage-subscriptions|renew-subscription'], 'uses' => 'SubscriptionsController@renew']);
+	Route::post('{id}/cancelSubscription', ['middleware' => ['permission:manage-gymie|manage-subscriptions|cancel-subscription'], 'uses' => 'SubscriptionsController@cancelSubscription']);
+	Route::post('{id}/delete', ['middleware' => ['permission:manage-gymie|manage-subscriptions|delete-subscription'], 'uses' => 'SubscriptionsController@delete']);
 });
 
 //invoices
-Route::group(['prefix' => 'invoices','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@index']);
-	Route::get('paid',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@paid']);
-	Route::get('unpaid',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@unpaid']);
-	Route::get('partial',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@partial']);
-	Route::get('overpaid',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@overpaid']);
-	Route::get('{id}/show',['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'],'uses' => 'InvoicesController@show']);
-	Route::get('{id}/payment',['middleware' => ['permission:manage-gymie|manage-invoices|add-payment'],'uses' => 'InvoicesController@createPayment']);
-	Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-invoices|delete-invoice'],'uses' => 'InvoicesController@delete']);
-	Route::get('{id}/discount',['middleware' => ['permission:manage-gymie|manage-invoices|add-discount'],'uses' => 'InvoicesController@discount']);
-	Route::post('{id}/applyDiscount',['middleware' => ['permission:manage-gymie|manage-invoices|add-discount'],'uses' => 'InvoicesController@applyDiscount']);
+Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function() {
+	Route::get('/', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']);
+	Route::get('all', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']);
+	Route::get('paid', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@paid']);
+	Route::get('unpaid', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@unpaid']);
+	Route::get('partial', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@partial']);
+	Route::get('overpaid', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@overpaid']);
+	Route::get('{id}/show', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@show']);
+	Route::get('{id}/payment', ['middleware' => ['permission:manage-gymie|manage-invoices|add-payment'], 'uses' => 'InvoicesController@createPayment']);
+	Route::post('{id}/delete', ['middleware' => ['permission:manage-gymie|manage-invoices|delete-invoice'], 'uses' => 'InvoicesController@delete']);
+	Route::get('{id}/discount', ['middleware' => ['permission:manage-gymie|manage-invoices|add-discount'], 'uses' => 'InvoicesController@discount']);
+	Route::post('{id}/applyDiscount', ['middleware' => ['permission:manage-gymie|manage-invoices|add-discount'], 'uses' => 'InvoicesController@applyDiscount']);
 });
 
 //activities
@@ -201,19 +201,19 @@ 
 // Route::get('access_logs/create','Access_logsController@create');
 
 //payments
-Route::group(['prefix' => 'payments','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-payments|view-payment'],'uses' => 'PaymentsController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-payments|view-payment'],'uses' => 'PaymentsController@index']);
-	Route::get('show',['middleware' => ['permission:manage-gymie|manage-payments|view-payment'],'uses' => 'PaymentsController@show']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-payments|add-payment'],'uses' => 'PaymentsController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-payments|add-payment'],'uses' => 'PaymentsController@store']);	
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@edit']);
-	Route::get('{id}/clearCheque',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@clearCheque']);
-	Route::get('{id}/depositCheque',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@depositCheque']);
-	Route::get('{id}/chequeBounce',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@chequeBounce']);
-	Route::get('{id}/chequeReissue',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@chequeReissue']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'],'uses' => 'PaymentsController@update']);
-	Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-payments|delete-payment'],'uses' => 'PaymentsController@delete']);
+Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function() {
+	Route::get('/', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']);
+	Route::get('all', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']);
+	Route::get('show', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@show']);
+	Route::get('create', ['middleware' => ['permission:manage-gymie|manage-payments|add-payment'], 'uses' => 'PaymentsController@create']);
+	Route::post('/', ['middleware' => ['permission:manage-gymie|manage-payments|add-payment'], 'uses' => 'PaymentsController@store']);	
+	Route::get('{id}/edit', ['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'], 'uses' => 'PaymentsController@edit']);
+	Route::get('{id}/clearCheque', ['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'], 'uses' => 'PaymentsController@clearCheque']);
+	Route::get('{id}/depositCheque', ['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'], 'uses' => 'PaymentsController@depositCheque']);
+	Route::get('{id}/chequeBounce', ['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'], 'uses' => 'PaymentsController@chequeBounce']);
+	Route::get('{id}/chequeReissue', ['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'], 'uses' => 'PaymentsController@chequeReissue']);
+	Route::post('{id}/update', ['middleware' => ['permission:manage-gymie|manage-payments|edit-payment'], 'uses' => 'PaymentsController@update']);
+	Route::post('{id}/delete', ['middleware' => ['permission:manage-gymie|manage-payments|delete-payment'], 'uses' => 'PaymentsController@delete']);
 });
 
 //expense Categories
@@ -229,61 +229,61 @@ 
 
 
 //expenses
-Route::group(['prefix' => 'expenses','middleware' => ['auth']], function() {
-	Route::get('/',['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'],'uses' => 'ExpensesController@index']);
-	Route::get('all',['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'],'uses' => 'ExpensesController@index']);
-	Route::get('show',['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'],'uses' => 'ExpensesController@show']);
-	Route::get('create',['middleware' => ['permission:manage-gymie|manage-expenses|add-expense'],'uses' => 'ExpensesController@create']);
-	Route::post('/',['middleware' => ['permission:manage-gymie|manage-expenses|add-expense'],'uses' => 'ExpensesController@store']);
-	Route::get('{id}/edit',['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'],'uses' => 'ExpensesController@edit']);
-	Route::post('{id}/update',['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'],'uses' => 'ExpensesController@update']);
-	Route::get('{id}/paid',['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'],'uses' => 'ExpensesController@paid']);
-	Route::post('{id}/delete',['middleware' => ['permission:manage-gymie|manage-expenses|delete-expense'],'uses' => 'ExpensesController@delete']);
-	Route::get('/categories',['middleware' => ['permission:manage-gymie|manage-expenseCategories|view-expenseCategory'],'uses' => 'ExpenseCategoriesController@index']);
-	Route::get('categories/all',['middleware' => ['permission:manage-gymie|manage-expenseCategories|view-expenseCategory'],'uses' => 'ExpenseCategoriesController@index']);
-	Route::get('categories/create',['middleware' => ['permission:manage-gymie|manage-expenseCategories|add-expenseCategory'],'uses' => 'ExpenseCategoriesController@create']);
-	Route::post('/categories',['middleware' => ['permission:manage-gymie|manage-expenseCategories|add-expenseCategory'],'uses' => 'ExpenseCategoriesController@store']);
-	Route::get('categories/{id}/edit',['middleware' => ['permission:manage-gymie|manage-expenseCategories|edit-expenseCategory'],'uses' => 'ExpenseCategoriesController@edit']);
-	Route::post('categories/{id}/update',['middleware' => ['permission:manage-gymie|manage-expenseCategories|edit-expenseCategory'],'uses' => 'ExpenseCategoriesController@update']);
-	Route::post('categories/{id}/archive',['middleware' => ['permission:manage-gymie|manage-expenseCategories|delete-expenseCategory'],'uses' => 'ExpenseCategoriesController@archive']);
+Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function() {
+	Route::get('/', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']);
+	Route::get('all', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']);
+	Route::get('show', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@show']);
+	Route::get('create', ['middleware' => ['permission:manage-gymie|manage-expenses|add-expense'], 'uses' => 'ExpensesController@create']);
+	Route::post('/', ['middleware' => ['permission:manage-gymie|manage-expenses|add-expense'], 'uses' => 'ExpensesController@store']);
+	Route::get('{id}/edit', ['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'], 'uses' => 'ExpensesController@edit']);
+	Route::post('{id}/update', ['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'], 'uses' => 'ExpensesController@update']);
+	Route::get('{id}/paid', ['middleware' => ['permission:manage-gymie|manage-expenses|edit-expense'], 'uses' => 'ExpensesController@paid']);
+	Route::post('{id}/delete', ['middleware' => ['permission:manage-gymie|manage-expenses|delete-expense'], 'uses' => 'ExpensesController@delete']);
+	Route::get('/categories', ['middleware' => ['permission:manage-gymie|manage-expenseCategories|view-expenseCategory'], 'uses' => 'ExpenseCategoriesController@index']);
+	Route::get('categories/all', ['middleware' => ['permission:manage-gymie|manage-expenseCategories|view-expenseCategory'], 'uses' => 'ExpenseCategoriesController@index']);
+	Route::get('categories/create', ['middleware' => ['permission:manage-gymie|manage-expenseCategories|add-expenseCategory'], 'uses' => 'ExpenseCategoriesController@create']);
+	Route::post('/categories', ['middleware' => ['permission:manage-gymie|manage-expenseCategories|add-expenseCategory'], 'uses' => 'ExpenseCategoriesController@store']);
+	Route::get('categories/{id}/edit', ['middleware' => ['permission:manage-gymie|manage-expenseCategories|edit-expenseCategory'], 'uses' => 'ExpenseCategoriesController@edit']);
+	Route::post('categories/{id}/update', ['middleware' => ['permission:manage-gymie|manage-expenseCategories|edit-expenseCategory'], 'uses' => 'ExpenseCategoriesController@update']);
+	Route::post('categories/{id}/archive', ['middleware' => ['permission:manage-gymie|manage-expenseCategories|delete-expenseCategory'], 'uses' => 'ExpenseCategoriesController@archive']);
 });
 
 //settings
-Route::group(['prefix' => 'settings','middleware' => ['permission:manage-gymie|manage-settings','auth']], function() {
-	Route::get('/','SettingsController@show');
-	Route::get('edit','SettingsController@edit');
-	Route::post('save','SettingsController@save');
+Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function() {
+	Route::get('/', 'SettingsController@show');
+	Route::get('edit', 'SettingsController@edit');
+	Route::post('save', 'SettingsController@save');
 });
 
 //User Module with roles & permissions
-Route::group(['prefix' => 'user','middleware' => ['permission:manage-gymie|manage-users','auth']], function() {
+Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() {
 	//User
-	Route::get('/','AclController@userIndex');
-	Route::get('create','AclController@createUser');
-	Route::post('/','AclController@storeUser');
-	Route::get('{id}/edit','AclController@editUser');
-	Route::post('{id}/update','AclController@updateUser');
-	Route::post('{id}/delete','AclController@deleteUser');
+	Route::get('/', 'AclController@userIndex');
+	Route::get('create', 'AclController@createUser');
+	Route::post('/', 'AclController@storeUser');
+	Route::get('{id}/edit', 'AclController@editUser');
+	Route::post('{id}/update', 'AclController@updateUser');
+	Route::post('{id}/delete', 'AclController@deleteUser');
 
 });
 
-Route::group(['prefix' => 'user/role','middleware' => ['permission:manage-gymie|manage-users','auth']], function() {
+Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() {
 	//Roles
-	Route::get('/','AclController@roleIndex');
-	Route::get('create','AclController@createRole');
-	Route::post('/','AclController@storeRole');
-	Route::get('{id}/edit','AclController@editRole');
-	Route::post('{id}/update','AclController@updateRole');
-	Route::post('{id}/delete','AclController@deleteRole');
+	Route::get('/', 'AclController@roleIndex');
+	Route::get('create', 'AclController@createRole');
+	Route::post('/', 'AclController@storeRole');
+	Route::get('{id}/edit', 'AclController@editRole');
+	Route::post('{id}/update', 'AclController@updateRole');
+	Route::post('{id}/delete', 'AclController@deleteRole');
 
 });
 
-Route::group(['prefix' => 'user/permission','middleware' => ['auth','role:Gymie']], function() {
+Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function() {
 	//Permissions
-	Route::get('/','AclController@permissionIndex');
-	Route::get('create','AclController@createPermission');
-	Route::post('/','AclController@storePermission');
-	Route::get('{id}/edit','AclController@editPermission');
-	Route::post('{id}/update','AclController@updatePermission');
-	Route::post('{id}/delete','AclController@deletePermission');
+	Route::get('/', 'AclController@permissionIndex');
+	Route::get('create', 'AclController@createPermission');
+	Route::post('/', 'AclController@storePermission');
+	Route::get('{id}/edit', 'AclController@editPermission');
+	Route::post('{id}/update', 'AclController@updatePermission');
+	Route::post('{id}/delete', 'AclController@deletePermission');
 });
\ No newline at end of file