lubusIN / laravel-gymie

app/Http/Controllers/Auth/AuthController.php

Indentation +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
      */
     public function postLogin(LoginRequest $request)
     { 
-       if($this->auth->attempt(['email'=>  $request->email, 'password'=> $request->password , 'status'=> 1],$request->remember))
+        if($this->auth->attempt(['email'=>  $request->email, 'password'=> $request->password , 'status'=> 1],$request->remember))
 
         {
             return redirect()->intended('/dashboard');

app/Http/Controllers/MembersController.php

Indentation +145 added lines, -145 removed lines

@@ -27,92 +27,92 @@ 
     {
         $this->middleware('auth');
     }
-	/**
+    /**
      * Display a listing of the resource.
      *
      * @return Response
      */
     public function index(Request $request)
     {
-      $members = Member::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $memberTotal = Member::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
-      $count = $memberTotal->count();
+        $members = Member::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+        $memberTotal = Member::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+        $count = $memberTotal->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('members.index', compact('members','count','drp_placeholder','old_sort'));
+        return view('members.index', compact('members','count','drp_placeholder','old_sort'));
     }
 
     public function active(Request $request)
     {
-      $members = Member::active($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $Totalmembers = Member::active($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
-      $count = $Totalmembers->count();
+        $members = Member::active($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+        $Totalmembers = Member::active($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+        $count = $Totalmembers->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('members.active', compact('members','count','drp_placeholder','old_sort'));
+        return view('members.active', compact('members','count','drp_placeholder','old_sort'));
     }
 
     public function inactive(Request $request)
     {
-      $members = Member::inactive($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $Totalmembers = Member::inactive($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
-      $count = $Totalmembers->count();
+        $members = Member::inactive($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+        $Totalmembers = Member::inactive($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+        $count = $Totalmembers->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('members.inactive', compact('members','count','drp_placeholder','old_sort'));
+        return view('members.inactive', compact('members','count','drp_placeholder','old_sort'));
     }
 
-     /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return Response
-     */
+        /**
+         * Display the specified resource.
+         *
+         * @param  int  $id
+         * @return Response
+         */
     public function show($id)
     {
-      $member = Member::findOrFail($id);
+        $member = Member::findOrFail($id);
 
-      return view('members.show', compact('member'));
+        return view('members.show', compact('member'));
     }
 
-     /**
-     * Show the form for creating a new resource.
-     *
-     * @return Response
-     */
+        /**
+         * Show the form for creating a new resource.
+         *
+         * @return Response
+         */
     public function create()
     {
         // For Tax calculation
@@ -150,20 +150,20 @@ 
             $memberCounter = '';
         }
 
-    	return view('members.create',compact('invoice_number','invoiceCounter','member_code','memberCounter','member_number_mode','invoice_number_mode'));
+        return view('members.create',compact('invoice_number','invoiceCounter','member_code','memberCounter','member_number_mode','invoice_number_mode'));
     }
     
-     /**
-     * Store a newly created resource in storage.
-     *
-     * @return Response
-     */
+        /**
+         * Store a newly created resource in storage.
+         *
+         * @return Response
+         */
     public function store(Request $request)
     {
         // Member Model Validation
         $this->validate($request, ['email' => 'unique:mst_members,email',
-                                   'contact' => 'unique:mst_members,contact', 
-                                   'member_code' => 'unique:mst_members,member_code']);
+                                    'contact' => 'unique:mst_members,contact', 
+                                    'member_code' => 'unique:mst_members,member_code']);
 
         // Start Transaction
         DB::beginTransaction();
@@ -195,12 +195,12 @@ 
                 // Adding media i.e. Profile & proof photo
                 if($request->hasFile('photo'))
                 {
-                  $member->addMedia($request->file('photo'))->usingFileName('profile_'.$member->id.$request->photo->getClientOriginalExtension())->toCollection('profile');
+                    $member->addMedia($request->file('photo'))->usingFileName('profile_'.$member->id.$request->photo->getClientOriginalExtension())->toCollection('profile');
                 }
 
                 if($request->hasFile('proof_photo'))
                 {
-                  $member->addMedia($request->file('proof_photo'))->usingFileName('proof_'.$member->id.$request->proof_photo->getClientOriginalExtension())->toCollection('proof');
+                    $member->addMedia($request->file('proof_photo'))->usingFileName('proof_'.$member->id.$request->proof_photo->getClientOriginalExtension())->toCollection('proof');
                 }                
 
                 // Helper function for calculating payment status
@@ -210,36 +210,36 @@ 
 
                 if($request->mode == 1)
                 {
-                  if ($request->payment_amount == $invoice_total) 
-                  {
+                    if ($request->payment_amount == $invoice_total) 
+                    {
                     $paymentStatus = \constPaymentStatus::Paid;
-                  } 
-                  elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) 
-                  {
+                    } 
+                    elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) 
+                    {
                     $paymentStatus = \constPaymentStatus::Partial;
-                  }
-                  elseif($request->payment_amount == 0)
-                  {
+                    }
+                    elseif($request->payment_amount == 0)
+                    {
                     $paymentStatus = \constPaymentStatus::Unpaid;
-                  }
-                  else 
-                  {
+                    }
+                    else 
+                    {
                     $paymentStatus = \constPaymentStatus::Overpaid;
-                  }
+                    }
                 }
 
                 // Storing Invoice                
                 $invoiceData = array('invoice_number'=> $request->invoice_number,
-                                     'member_id'=> $member->id,
-                                     'total'=> $invoice_total,
-                                     'status'=> $paymentStatus,
-                                     'pending_amount'=> $pending,
-                                     'discount_amount'=> $request->discount_amount,
-                                     'discount_percent'=> $request->discount_percent,
-                                     'discount_note'=> $request->discount_note,
-                                     'tax'=> $request->taxes_amount,
-                                     'additional_fees'=> $request->additional_fees,
-                                     'note'=>' ');
+                                        'member_id'=> $member->id,
+                                        'total'=> $invoice_total,
+                                        'status'=> $paymentStatus,
+                                        'pending_amount'=> $pending,
+                                        'discount_amount'=> $request->discount_amount,
+                                        'discount_percent'=> $request->discount_percent,
+                                        'discount_note'=> $request->discount_note,
+                                        'tax'=> $request->taxes_amount,
+                                        'additional_fees'=> $request->additional_fees,
+                                        'note'=>' ');
 
                 $invoice = new Invoice($invoiceData);
                 $invoice->createdBy()->associate(Auth::user());
@@ -249,7 +249,7 @@ 
                 // Storing subscription
                 foreach($request->plan as $plan)
                 {
-                  $subscriptionData = array('member_id'=> $member->id,
+                    $subscriptionData = array('member_id'=> $member->id,
                                             'invoice_id'=> $invoice->id,
                                             'plan_id'=> $plan['id'],
                                             'start_date'=> $plan['start_date'],
@@ -257,27 +257,27 @@ 
                                             'status'=> \constSubscription::onGoing,
                                             'is_renewal'=>'0');
 
-                  $subscription = new Subscription($subscriptionData);
-                  $subscription->createdBy()->associate(Auth::user());
-                  $subscription->updatedBy()->associate(Auth::user());
-                  $subscription->save();
+                    $subscription = new Subscription($subscriptionData);
+                    $subscription->createdBy()->associate(Auth::user());
+                    $subscription->updatedBy()->associate(Auth::user());
+                    $subscription->save();
 
-                  //Adding subscription to invoice(Invoice Details)
-                  $detailsData = array('invoice_id'=> $invoice->id,
-                                       'plan_id'=> $plan['id'],
-                                       'item_amount'=> $plan['price']);
+                    //Adding subscription to invoice(Invoice Details)
+                    $detailsData = array('invoice_id'=> $invoice->id,
+                                        'plan_id'=> $plan['id'],
+                                        'item_amount'=> $plan['price']);
                
-                  $invoice_details = new Invoice_detail($detailsData);
-                  $invoice_details->createdBy()->associate(Auth::user());
-                  $invoice_details->updatedBy()->associate(Auth::user());
-                  $invoice_details->save();
+                    $invoice_details = new Invoice_detail($detailsData);
+                    $invoice_details->createdBy()->associate(Auth::user());
+                    $invoice_details->updatedBy()->associate(Auth::user());
+                    $invoice_details->save();
                 }
 
                 // Store Payment Details
                 $paymentData = array('invoice_id'=> $invoice->id,
-                                     'payment_amount'=> $request->payment_amount,
-                                     'mode'=> $request->mode,
-                                     'note'=> ' ');
+                                        'payment_amount'=> $request->payment_amount,
+                                        'mode'=> $request->mode,
+                                        'note'=> ' ');
             
                 $payment_details = new Payment_detail($paymentData);
                 $payment_details->createdBy()->associate(Auth::user());
@@ -286,16 +286,16 @@ 
 
                 if($request->mode == 0)
                 {
-                  // Store Cheque Details
-                  $chequeData = array('payment_id'=> $payment_details->id,
-                                      'number'=> $request->number,
-                                      'date'=> $request->date,
-                                      'status'=> \constChequeStatus::Recieved);
+                    // Store Cheque Details
+                    $chequeData = array('payment_id'=> $payment_details->id,
+                                        'number'=> $request->number,
+                                        'date'=> $request->date,
+                                        'status'=> \constChequeStatus::Recieved);
               
-                  $cheque_details = new Cheque_detail($chequeData);
-                  $cheque_details->createdBy()->associate(Auth::user());
-                  $cheque_details->updatedBy()->associate(Auth::user());
-                  $cheque_details->save();
+                    $cheque_details = new Cheque_detail($chequeData);
+                    $cheque_details->createdBy()->associate(Auth::user());
+                    $cheque_details->updatedBy()->associate(Auth::user());
+                    $cheque_details->save();
                 }
 
                 // On member transfer update enquiry Status
@@ -316,69 +316,69 @@ 
                 //SMS Trigger
                 if ($invoice->status == \constPaymentStatus::Paid) 
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_paid_invoice')->first();
-                  $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$member->name,$gym_name,$payment_details->payment_amount,$invoice->invoice_number);
-                  $sms_status = $sms_trigger->status;
+                    $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_paid_invoice')->first();
+                    $message = $sms_trigger->message;
+                    $sms_text = sprintf($message,$member->name,$gym_name,$payment_details->payment_amount,$invoice->invoice_number);
+                    $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
+                    \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
                 } 
                 elseif($invoice->status == \constPaymentStatus::Partial)
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_partial_invoice')->first();
-                  $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$member->name,$gym_name,$payment_details->payment_amount,$invoice->invoice_number,$invoice->pending_amount);
-                  $sms_status = $sms_trigger->status;
+                    $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_partial_invoice')->first();
+                    $message = $sms_trigger->message;
+                    $sms_text = sprintf($message,$member->name,$gym_name,$payment_details->payment_amount,$invoice->invoice_number,$invoice->pending_amount);
+                    $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
+                    \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
                 }
                 elseif($invoice->status == \constPaymentStatus::Unpaid)
                 {
-                  if($request->mode == 0)
-                  {
+                    if($request->mode == 0)
+                    {
                     $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
                     $message = $sms_trigger->message;
                     $sms_text = sprintf($message,$member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
                     $sms_status = $sms_trigger->status;
 
                     \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
-                  }
-                  else
-                  {
+                    }
+                    else
+                    {
                     $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_unpaid_invoice')->first();
                     $message = $sms_trigger->message;
                     $sms_text = sprintf($message,$member->name,$gym_name,$invoice->pending_amount,$invoice->invoice_number);
                     $sms_status = $sms_trigger->status;
 
                     \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
-                  }
+                    }
                   
                 }
 
                 if($subscription->start_date < $member->created_at)
                 {
-                  $member->created_at = $subscription->start_date;
-                  $member->updated_at = $subscription->start_date;
-                  $member->save(); 
+                    $member->created_at = $subscription->start_date;
+                    $member->updated_at = $subscription->start_date;
+                    $member->save(); 
 
-                  $invoice->created_at = $subscription->start_date;
-                  $invoice->updated_at = $subscription->start_date;
-                  $invoice->save();
+                    $invoice->created_at = $subscription->start_date;
+                    $invoice->updated_at = $subscription->start_date;
+                    $invoice->save();
 
-                  foreach($invoice->invoice_details as $invoice_detail)
-                  {
+                    foreach($invoice->invoice_details as $invoice_detail)
+                    {
                     $invoice_detail->created_at = $subscription->start_date;
                     $invoice_detail->updated_at = $subscription->start_date;
                     $invoice_detail->save();
-                  }
+                    }
                   
-                  $payment_details->created_at = $subscription->start_date;
-                  $payment_details->updated_at = $subscription->start_date;
-                  $payment_details->save();
+                    $payment_details->created_at = $subscription->start_date;
+                    $payment_details->updated_at = $subscription->start_date;
+                    $payment_details->save();
 
-                  $subscription->created_at = $subscription->start_date;
-                  $subscription->updated_at = $subscription->start_date;
-                  $subscription->save();
+                    $subscription->created_at = $subscription->start_date;
+                    $subscription->updated_at = $subscription->start_date;
+                    $subscription->save();
                 }                
 
                 DB::commit();    
@@ -426,14 +426,14 @@ 
 
         if($request->hasFile('photo'))
         {
-          $member->clearMediaCollection('profile');
-          $member->addMedia($request->file('photo'))->usingFileName('profile_'.$member->id.$request->photo->getClientOriginalExtension())->toCollection('profile');
+            $member->clearMediaCollection('profile');
+            $member->addMedia($request->file('photo'))->usingFileName('profile_'.$member->id.$request->photo->getClientOriginalExtension())->toCollection('profile');
         }
 
         if($request->hasFile('proof_photo'))
         {
-          $member->clearMediaCollection('proof');
-          $member->addMedia($request->file('proof_photo'))->usingFileName('proof_'.$member->id.$request->proof_photo->getClientOriginalExtension())->toCollection('proof');
+            $member->clearMediaCollection('proof');
+            $member->addMedia($request->file('proof_photo'))->usingFileName('proof_'.$member->id.$request->proof_photo->getClientOriginalExtension())->toCollection('proof');
         }        
 
         $member->updatedBy()->associate(Auth::user());
@@ -458,16 +458,16 @@ 
 
         foreach($invoices as $invoice)
         {
-          Invoice_detail::where('invoice_id',$invoice->id)->delete();
-          $payment_details = Payment_detail::where('invoice_id',$invoice->id)->get();
+            Invoice_detail::where('invoice_id',$invoice->id)->delete();
+            $payment_details = Payment_detail::where('invoice_id',$invoice->id)->get();
 
-          foreach($payment_details as $payment_detail)
-          {
+            foreach($payment_details as $payment_detail)
+            {
             Cheque_detail::where('payment_id',$payment_detail->id)->delete();
             $payment_detail->delete();
-          }
+            }
           
-          $invoice->delete();
+            $invoice->delete();
         }
 
         $member = Member::findOrFail($id);

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

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)

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)

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)

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)

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]);