lubusIN / laravel-gymie

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/ReportData/MembersController.php

Indentation +6 added lines, -6 removed lines

@@ -10,11 +10,11 @@
 
 class MembersController extends Controller
 {
-	public function details()
-	{
-		$members = Member::all();
-		$data = ["members_data" => $members];
+    public function details()
+    {
+        $members = Member::all();
+        $data = ["members_data" => $members];
 
-		return response()->json($data);	
-	}
+        return response()->json($data);	
+    }
 }
\ No newline at end of file

app/Http/Controllers/Access_logsController.php

Indentation +24 added lines, -24 removed lines

@@ -13,51 +13,51 @@
     {
         $this->middleware('auth');
     }
-	/**
+    /**
      * Display a listing of the resource.
      *
      * @return Response
      */
     public function index()
     {
-    	$access_logs = Access_log::all();
+        $access_logs = Access_log::all();
 
-    	return view('access_logs.index', compact('access_logs'));
+        return view('access_logs.index', compact('access_logs'));
     }
 
-     /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return Response
-     */
+        /**
+         * Display the specified resource.
+         *
+         * @param  int  $id
+         * @return Response
+         */
     public function show()
     {
-    	$access_log = Access_log::findOrFail($id);
+        $access_log = Access_log::findOrFail($id);
 
-    	return view('access_logs.show', compact('access_log'));
+        return view('access_logs.show', compact('access_log'));
     }
 
-     /**
-     * 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('access_logs.create');
+        return view('access_logs.create');
     }
     
-     /**
-     * Store a newly created resource in storage.
-     *
-     * @return Response
-     */
+        /**
+         * Store a newly created resource in storage.
+         *
+         * @return Response
+         */
     public function store()
     {
-    	Access_log::create(Request::all());
+        Access_log::create(Request::all());
 
-    	return redirect('access_logs'); 
+        return redirect('access_logs'); 
     }
 
 

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

app/Invoice.php

Indentation +13 added lines, -13 removed lines

@@ -8,25 +8,25 @@ 
 
 class Invoice extends Model
 {
-	 protected $table = 'trn_invoice';
+        protected $table = 'trn_invoice';
 
-	 protected $fillable = [
-	 		'total',
+        protected $fillable = [
+                'total',
             'pending_amount',
-	 		'member_id',
-	 		'note',
+                'member_id',
+                'note',
             'status',
-			'tax',
+            'tax',
             'additional_fees',
-	 		'invoice_number',
+                'invoice_number',
             'discount_percent',
             'discount_amount',
             'discount_note',
-	 		'created_by',
-    		'updated_by',
-	 ];  
+                'created_by',
+            'updated_by',
+        ];  
 
-     protected $dates = ['created_at','updated_at'];
+        protected $dates = ['created_at','updated_at'];
 
     //Eloquence Search mapping
     use Eloquence;
@@ -52,7 +52,7 @@ 
         return $query->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')->select('trn_invoice.*','mst_members.name as member_name')->whereBetween('trn_invoice.created_at', [$drp_start, $drp_end])->orderBy($sorting_field,$sorting_direction);
     }
 
-	public function createdBy()
+    public function createdBy()
     {
         return $this->belongsTo('App\User','created_by');
     }
@@ -64,7 +64,7 @@ 
 
     public function Member()
     {
-    	return $this->belongsTo('App\Member','member_id');
+        return $this->belongsTo('App\Member','member_id');
     }
 
     public function Payment_details()

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
     		'updated_by',
 	 ];  
 
-     protected $dates = ['created_at','updated_at'];
+     protected $dates = ['created_at', 'updated_at'];
 
     //Eloquence Search mapping
     use Eloquence;
@@ -39,32 +39,32 @@ 
         'Member.member_code' => 10,
     ];
 
-    public function scopeIndexQuery($query,$sorting_field,$sorting_direction,$drp_start,$drp_end)
+    public function scopeIndexQuery($query, $sorting_field, $sorting_direction, $drp_start, $drp_end)
     {
         $sorting_field = ($sorting_field != null ? $sorting_field : 'created_at');
         $sorting_direction = ($sorting_direction != null ? $sorting_direction : 'desc');
 
         if ($drp_start == null or $drp_end == null) 
         {
-            return $query->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')->select('trn_invoice.*','mst_members.name as member_name')->orderBy($sorting_field,$sorting_direction);
+            return $query->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')->select('trn_invoice.*', 'mst_members.name as member_name')->orderBy($sorting_field, $sorting_direction);
         }
 
-        return $query->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')->select('trn_invoice.*','mst_members.name as member_name')->whereBetween('trn_invoice.created_at', [$drp_start, $drp_end])->orderBy($sorting_field,$sorting_direction);
+        return $query->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')->select('trn_invoice.*', 'mst_members.name as member_name')->whereBetween('trn_invoice.created_at', [$drp_start, $drp_end])->orderBy($sorting_field, $sorting_direction);
     }
 
 	public function createdBy()
     {
-        return $this->belongsTo('App\User','created_by');
+        return $this->belongsTo('App\User', 'created_by');
     }
 
     public function updatedBy()
     {
-        return $this->belongsTo('App\User','updated_by');
+        return $this->belongsTo('App\User', 'updated_by');
     }  
 
     public function Member()
     {
-    	return $this->belongsTo('App\Member','member_id');
+    	return $this->belongsTo('App\Member', 'member_id');
     }
 
     public function Payment_details()

app/Lubus/Utilities.php

Indentation +540 added lines, -540 removed lines

@@ -13,7 +13,7 @@ 
 
 static function setActiveMenu($uri,$isParent = false)
 {
-	$class = ($isParent) ? 'active open' : 'active';
+    $class = ($isParent) ? 'active open' : 'active';
     return \Request::is($uri) ? $class : '';
     //return \Request::is($uri);
 }
@@ -21,68 +21,68 @@ 
 // Get Setting
 static function getSetting($key)
 {
-	$settingValue = Setting::where('key','=',$key)->pluck('value');
-	return $settingValue;
+    $settingValue = Setting::where('key','=',$key)->pluck('value');
+    return $settingValue;
 }
 
 //get Settings
 static function getSettings()
 {
-	$settings = Setting::all();
-	$settings_array = array();
+    $settings = Setting::all();
+    $settings_array = array();
 
-	foreach ($settings as $setting) {
-		$settings_array[$setting->key] = $setting->value;
-	}
+    foreach ($settings as $setting) {
+        $settings_array[$setting->key] = $setting->value;
+    }
 
-	return $settings_array;
+    return $settings_array;
 }
 
 
 //Follow up Status
 static function getFollowUpStatus($status)
 {
-	switch ($status) {
-		case '1':
-			return "Done"; 
-			break;
-
-	    default :
-	        return "Pending";
-	        break;
-	}
+    switch ($status) {
+        case '1':
+            return "Done"; 
+            break;
+
+        default :
+            return "Pending";
+            break;
+    }
 }
 
 //Follow up by
 static function getFollowupBy($followUpBy)
 {
-	switch ($followUpBy) {
-		case '1':
-			return "SMS";
-			break;
-
-		case '2':
-			return "Personal";
-			break;
-
-	    default :
-	        return "Call";
-	        break;
-	}
+    switch ($followUpBy) {
+        case '1':
+            return "SMS";
+            break;
+
+        case '2':
+            return "Personal";
+            break;
+
+        default :
+            return "Call";
+            break;
+    }
 }
 
 //FollowUp Status Icon bg
 static function getIconBg($status)
 {
-	switch ($status) {
-		case '1':
-			return "bg-blue-400 border-blue-700"; 
-			break;
-
-	    default :
-	        return "bg-orange-400 border-orange-700";
-	        break;
-	}
+    switch ($status) {
+        case '1':
+            return "bg-blue-400 border-blue-700"; 
+            break;
+
+        default :
+            return "bg-orange-400 border-orange-700";
+            break;
+    }
 }
 
 
@@ -90,123 +90,123 @@ 
 //Followup Status Icon
 static function getStatusIcon($status)
 {
-	switch ($status) {
-		case '1':
-			return "fa fa-thumbs-up"; 
-			break;
-
-	    default :
-	        return "fa fa-refresh";
-	        break;
-	}
+    switch ($status) {
+        case '1':
+            return "fa fa-thumbs-up"; 
+            break;
+
+        default :
+            return "fa fa-refresh";
+            break;
+    }
 }
 
 
 // Aim for member & enquiry creation
 static function getAim($aim)
 {
-	switch ($aim) {
-		case '1':
-			return "Networking";
-			break;
+    switch ($aim) {
+        case '1':
+            return "Networking";
+            break;
 		
-		case '2':
-			return "Body Building";
-			break;
-
-		case '3':
-			return "Fatloss";
-			break;
-
-		case '4':
-			return "Weightgain";
-			break;
-
-		case '5':
-			return "Others";
-			break;
-
-	    default :
-	        return "Fitness";
-	        break;
-	}
+        case '2':
+            return "Body Building";
+            break;
+
+        case '3':
+            return "Fatloss";
+            break;
+
+        case '4':
+            return "Weightgain";
+            break;
+
+        case '5':
+            return "Others";
+            break;
+
+        default :
+            return "Fitness";
+            break;
+    }
 }
 
 
 // Invoice Labels
 static function getInvoiceLabel($status)
 {
-	switch ($status) {
-		case '0':
-			return "label label-danger";
-			break;
+    switch ($status) {
+        case '0':
+            return "label label-danger";
+            break;
 		
-		case '1':
-			return "label label-success";
-			break;
-
-		case '3':
-			return "label label-default";
-			break;
-
-	    default :
-	        return "label label-primary";
-	        break;
-	}
+        case '1':
+            return "label label-success";
+            break;
+
+        case '3':
+            return "label label-default";
+            break;
+
+        default :
+            return "label label-primary";
+            break;
+    }
 }
 
 // Expense alert repeat
 static function expenseRepeatIntervel($repeat)
 {
-	switch ($repeat) {
-		case '0':
-			return "Never Repeat";
-			break;
+    switch ($repeat) {
+        case '0':
+            return "Never Repeat";
+            break;
 		
-		case '1':
-			return "Every Day";
-			break;
-
-		case '2':
-			return "Every Week";
-			break;
-
-		case '3':
-			return "Every Month";
-			break;
-
-	    default :
-	        return "Every Year";
-	        break;
-	}
+        case '1':
+            return "Every Day";
+            break;
+
+        case '2':
+            return "Every Week";
+            break;
+
+        case '3':
+            return "Every Month";
+            break;
+
+        default :
+            return "Every Year";
+            break;
+    }
 }
 
 //Paid Unpaid Labels
 static function getPaidUnpaid($status)
 {
-	switch ($status) {
-		case '0':
-			return "label label-danger";
-			break;
-
-	    default :
-	        return "label label-primary";
-	        break;
-	}
+    switch ($status) {
+        case '0':
+            return "label label-danger";
+            break;
+
+        default :
+            return "label label-primary";
+            break;
+    }
 }
 
 //Active-Inactive Labels
 static function getActiveInactive($status)
 {
-	switch ($status) {
-		case '0':
-			return "label label-danger";
-			break;
-
-	    default :
-	        return "label label-primary";
-	        break;
-	}
+    switch ($status) {
+        case '0':
+            return "label label-danger";
+            break;
+
+        default :
+            return "label label-primary";
+            break;
+    }
 }
 
 
@@ -214,31 +214,31 @@ 
 // Occupation of members
 static function getOccupation($occupation)
 {
-	switch ($occupation) {
-		case '1':
-			return "Housewife";
-			break;
+    switch ($occupation) {
+        case '1':
+            return "Housewife";
+            break;
 		
-		case '2':
-			return "Self Employed";
-			break;
-
-		case '3':
-			return "Professional";
-			break;
-
-		case '4':
-			return "Freelancer";
-			break;
-
-		case '5':
-			return "Others";
-			break;
-
-	    default :
-	        return "Student";
-	        break;
-	}
+        case '2':
+            return "Self Employed";
+            break;
+
+        case '3':
+            return "Professional";
+            break;
+
+        case '4':
+            return "Freelancer";
+            break;
+
+        case '5':
+            return "Others";
+            break;
+
+        default :
+            return "Student";
+            break;
+    }
 }
 
 
@@ -246,82 +246,82 @@ 
 // Source for member & enquiry creation
 static function getSource($source)
 {
-	switch ($source) {
-		case '1':
-			return "Word of mouth";
-			break;
+    switch ($source) {
+        case '1':
+            return "Word of mouth";
+            break;
 		
-		case '2':
-			return "Others";
-			break;
-
-	    default :
-	        return "Promotions";
-	        break;
-	}
+        case '2':
+            return "Others";
+            break;
+
+        default :
+            return "Promotions";
+            break;
+    }
 }
 
 
 // Member Status
 static function getStatusValue($status)
 {
-	switch ($status) {
-		case '0':
-			return "Inactive";
-			break;
+    switch ($status) {
+        case '0':
+            return "Inactive";
+            break;
 		
-		case '2':
-			return "Archived";
-			break;
-
-	    default :
-	        return "Active";
-	        break;
-	}
+        case '2':
+            return "Archived";
+            break;
+
+        default :
+            return "Active";
+            break;
+    }
 }
 
 // Enquiry Status
 static function getEnquiryStatus($status)
 {
-	switch ($status) {
-		case '0':
-			return "Lost";
-			break;
+    switch ($status) {
+        case '0':
+            return "Lost";
+            break;
 		
-		case '2':
-			return "Member";
-			break;
+        case '2':
+            return "Member";
+            break;
 			
-	    default :
-	        return "Lead";
-	        break;
-	}
+        default :
+            return "Lead";
+            break;
+    }
 }
 
 // Enquiry Label
 static function getEnquiryLabel($status)
 {
-	switch ($status) {
-		case '0':
-			return "label label-danger";
-			break;
+    switch ($status) {
+        case '0':
+            return "label label-danger";
+            break;
 		
-		case '2':
-			return "label label-success";
-			break;
-
-	    default :
-	        return "label label-primary";
-	        break;
-	}
+        case '2':
+            return "label label-success";
+            break;
+
+        default :
+            return "label label-primary";
+            break;
+    }
 }
 
 // Set invoice status
 static function setInvoiceStatus($amount_due,$invoice_total)
 {
-	if($amount_due == 0)
+    if($amount_due == 0)
     {
-         $paymentStatus = \constPaymentStatus::Paid;
+            $paymentStatus = \constPaymentStatus::Paid;
     } 
     elseif($amount_due > 0 && $amount_due < $invoice_total) 
     {
@@ -342,162 +342,162 @@ 
 // Invoice Status
 static function getInvoiceStatus($status)
 {
-	switch ($status) {
-		case '1':
-			return "Paid";
-			break;
+    switch ($status) {
+        case '1':
+            return "Paid";
+            break;
 		
-		case '2':
-			return "Partial";
-			break;
-
-		case '3':
-			return "Overpaid";
-			break;
-
-	    default :
-	        return "Unpaid";
-	        break;
-	}
+        case '2':
+            return "Partial";
+            break;
+
+        case '3':
+            return "Overpaid";
+            break;
+
+        default :
+            return "Unpaid";
+            break;
+    }
 }
 
 
 // Subcription Status
 static function getSubscriptionStatus($status)
 {
-	switch ($status) {
-		case '0':
-			return "Expired";
-			break;
+    switch ($status) {
+        case '0':
+            return "Expired";
+            break;
 		
-		case '2':
-			return "Renewed";
-			break;
-
-		case '3':
-			return "Cancelled";
-			break;
-
-	    default :
-	        return "OnGoing";
-	        break;
-	}
+        case '2':
+            return "Renewed";
+            break;
+
+        case '3':
+            return "Cancelled";
+            break;
+
+        default :
+            return "OnGoing";
+            break;
+    }
 }
 
 
 // Subcription Label
 static function getSubscriptionLabel($status)
 {
-	switch ($status) {
-		case '0':
-			return "label label-danger";
-			break;
+    switch ($status) {
+        case '0':
+            return "label label-danger";
+            break;
 		
-		case '2':
-			return "label label-success";
-			break;
-
-		case '3':
-			return "label label-default";
-			break;
-
-	    default :
-	        return "label label-primary";
-	        break;
-	}
+        case '2':
+            return "label label-success";
+            break;
+
+        case '3':
+            return "label label-default";
+            break;
+
+        default :
+            return "label label-primary";
+            break;
+    }
 }
 
 
 // Payment Mode
 static function getPaymentMode($status)
 {
-	switch ($status) {
-		case '0':
-			return "Cheque";
-			break;
-
-	    default :
-	        return "Cash";
-	        break;
-	}
+    switch ($status) {
+        case '0':
+            return "Cheque";
+            break;
+
+        default :
+            return "Cash";
+            break;
+    }
 }
 
 // Cheque status
 static function getChequeStatus($status)
 {
-	switch ($status) {
-		case '1':
-			return "Deposited";
-			break;
-
-		case '2':
-			return "Cleared";
-			break;
-
-		case '3':
-			return "Bounced";
-			break;
-
-		case '4':
-			return "Reissued";
-			break;
-
-	    default :
-	        return "Recieved";
-	        break;
-	}
+    switch ($status) {
+        case '1':
+            return "Deposited";
+            break;
+
+        case '2':
+            return "Cleared";
+            break;
+
+        case '3':
+            return "Bounced";
+            break;
+
+        case '4':
+            return "Reissued";
+            break;
+
+        default :
+            return "Recieved";
+            break;
+    }
 }
 
 // Get Gender
 static function getGender($gender)
 {
-	switch ($gender) 
-	{
-		case 'm':
-			return "Male";
-			break;
+    switch ($gender) 
+    {
+        case 'm':
+            return "Male";
+            break;
 		
-		case 'f':
-			return "Female";
-			break;
-	}
+        case 'f':
+            return "Female";
+            break;
+    }
 }
 
 
 //Get invoice display name type
 static function getDisplay($display)
 {
-	switch ($display) 
-	{
-		case 'gym_logo':
-			return "Gym Logo";
-			break;
+    switch ($display) 
+    {
+        case 'gym_logo':
+            return "Gym Logo";
+            break;
 		
-		default:
-			return "Gym Name";
-			break;
-	}
+        default:
+            return "Gym Name";
+            break;
+    }
 }
 
 
 // Get Numbering mode 
 static function getMode($mode)
 {
-	switch ($mode) 
-	{
-		case '0':
-			return "Manual";
-			break;
+    switch ($mode) 
+    {
+        case '0':
+            return "Manual";
+            break;
 		
-		default :
-			return "Automatic";
-			break;
-	}
+        default :
+            return "Automatic";
+            break;
+    }
 }
 
 static function getGreeting(){
-	//$time = date("H");
-	$time = Carbon::now()->hour;
+    //$time = date("H");
+    $time = Carbon::now()->hour;
     /* If the time is less than 1200 hours, show good morning */
     if ($time < "12") {
         echo "Good morning";
@@ -521,258 +521,258 @@ 
 *File Upload
 **/
 
-	static function uploadFile(Request $request, $prefix, $recordId, $upload_field, $upload_path)
-		{		
-		if ($request->hasFile($upload_field)) 
-			{
-				$file = $request->file($upload_field);
+    static function uploadFile(Request $request, $prefix, $recordId, $upload_field, $upload_path)
+        {		
+        if ($request->hasFile($upload_field)) 
+            {
+                $file = $request->file($upload_field);
 
-	            if ($file->isValid())
+                if ($file->isValid())
                 {
-                	File::delete(public_path('assets/img/gym/gym_logo.jpg'));
-                	$fileName = "gym_logo.jpg";
+                    File::delete(public_path('assets/img/gym/gym_logo.jpg'));
+                    $fileName = "gym_logo.jpg";
                     $destinationPath = public_path($upload_path);
                     $request->file($upload_field)->move($destinationPath,$fileName);
                     Image::make($destinationPath."/".$fileName)->resize(600, null, function ($constraint) {
-																					    $constraint->aspectRatio();
-																					})->save();
+                                                                                        $constraint->aspectRatio();
+                                                                                    })->save();
                 }
-			}
-		}
-
-	static function registrationsTrend()
-	{
-		// Get Financial date
-		$startDate = new Carbon(Setting::where('key','=','financial_start')->pluck('value'));
-		$data = array();
+            }
+        }
+
+    static function registrationsTrend()
+    {
+        // Get Financial date
+        $startDate = new Carbon(Setting::where('key','=','financial_start')->pluck('value'));
+        $data = array();
 		
-		for ($i=1; $i <= 12 ; $i++) { 
-			//$members = member::registrations($startDate->month,$startDate->year); // Laravel Scoped Query Issue: Workaroud Needed
-			$members = Member::whereMonth('created_at', '=', $startDate->month)->whereYear('created_at', '=',$startDate->year)->count();
-			$data[] = array("month" => $startDate->format('Y-m'), "registrations" => $members);
-			$startDate->addMonth();
-		}
-
-		return json_encode($data);
-	}
-
-
-	static function membersPerPlan()
-	{
-		$data = array();
-
-		$plans = Plan::onlyActive()->get();
-
-		foreach ($plans as $plan) 
-		{
-			$subscriptions = Subscription::where('status','=',\constSubscription::onGoing)->where('plan_id','=',$plan->id)->count();
-			$data[] = array('label' =>$plan->plan_name ,'value'=>$subscriptions);
-		}
-		return json_encode($data);		
-	}
-
-	// Checking logonutility gateway status
-	static function smsGatewayStatus()
-	{
-		try
-		{
-			$api_key = Utilities::getSetting('sms_api_key');
-
-			$api_url = "http://logonutility.in/app/miscapi/".$api_key."/getBalance/true/";
-
-			if(Utilities::isDomainAvailible($api_url))
-	        {
-	               return true;
-	        }
-	        else
-	        {
-	               return false;
-	        }			
+        for ($i=1; $i <= 12 ; $i++) { 
+            //$members = member::registrations($startDate->month,$startDate->year); // Laravel Scoped Query Issue: Workaroud Needed
+            $members = Member::whereMonth('created_at', '=', $startDate->month)->whereYear('created_at', '=',$startDate->year)->count();
+            $data[] = array("month" => $startDate->format('Y-m'), "registrations" => $members);
+            $startDate->addMonth();
+        }
+
+        return json_encode($data);
+    }
+
+
+    static function membersPerPlan()
+    {
+        $data = array();
+
+        $plans = Plan::onlyActive()->get();
+
+        foreach ($plans as $plan) 
+        {
+            $subscriptions = Subscription::where('status','=',\constSubscription::onGoing)->where('plan_id','=',$plan->id)->count();
+            $data[] = array('label' =>$plan->plan_name ,'value'=>$subscriptions);
+        }
+        return json_encode($data);		
+    }
+
+    // Checking logonutility gateway status
+    static function smsGatewayStatus()
+    {
+        try
+        {
+            $api_key = Utilities::getSetting('sms_api_key');
+
+            $api_url = "http://logonutility.in/app/miscapi/".$api_key."/getBalance/true/";
+
+            if(Utilities::isDomainAvailible($api_url))
+            {
+                    return true;
+            }
+            else
+            {
+                    return false;
+            }			
 						
-		}
-		catch(Exception $e)
-		{
-			return false;
-		}
-	}
-
-
-   // returns true, if domain is availible, false if not
-   static function isDomainAvailible($domain)
-   {
-       //check, if a valid url is provided
-       if(!filter_var($domain, FILTER_VALIDATE_URL))
-       {
-               return false;
-       }
-
-       //initialize curl
-       $curlInit = curl_init($domain);
-       curl_setopt($curlInit,CURLOPT_CONNECTTIMEOUT,10);
-       curl_setopt($curlInit,CURLOPT_HEADER,true);
-       curl_setopt($curlInit,CURLOPT_NOBODY,true);
-       curl_setopt($curlInit,CURLOPT_RETURNTRANSFER,true);
-
-       //get answer
-       $response = curl_exec($curlInit);
-
-       curl_close($curlInit);
-
-       if ($response) return true;
-
-       return false;
-   }
-
-
-	static function Sms($sender_id,$member_contact,$sms_text,$sms_status)
-	{
-		$sms = Utilities::getSetting('sms');
-		$gatewayStatus = Utilities::smsGatewayStatus();
-
-		if ($sms && $sms_status) 
-		{
-			if($gatewayStatus)
-			{
-				$api_key = Utilities::getSetting('sms_api_key');
-				$contacts = $member_contact;
-				$from = $sender_id;
-				$send_sms_text = urlencode($sms_text);
-
-				//Transactional = 20 , Promo with sender id = 21 , only promotional = 18
-				$api_url = "http://www.logonutility.in/app/smsapi/index.php?key=".$api_key."&campaign=1&routeid=20&type=text&contacts=".$contacts."&senderid=".$from."&msg=".$send_sms_text;
-
-				//Submit to server
-				$response = file_get_contents($api_url);
-
-				if (str_contains($response,'SMS-SHOOT-ID')) 
-				{
-					//Log entry for SMS_log table
-					$SmsLogData = array('shoot_id' => substr($response, strpos($response, "SMS-SHOOT-ID/") + 13),
-										'number' => $member_contact,
-										'message' => $sms_text,
-										'sender_id' => $sender_id,
-										'send_time' => Carbon::now(),
-										'status' => 'NA');
-
-					$SmsLog  = new Sms_log($SmsLogData);
-					$SmsLog->save();
-				}
-				//Update SMS balance
-				Utilities::smsBalance();
-			}
-			else
-			{
-				$SmsLogData = array('shoot_id' => '',
-									'number' => $member_contact,
-									'message' => $sms_text,
-									'sender_id' => $sender_id,
-									'send_time' => Carbon::now(),
-									'status' => 'offline');
-
-				$SmsLog  = new Sms_log($SmsLogData);
-				$SmsLog->save();
-			}
+        }
+        catch(Exception $e)
+        {
+            return false;
+        }
+    }
+
+
+    // returns true, if domain is availible, false if not
+    static function isDomainAvailible($domain)
+    {
+        //check, if a valid url is provided
+        if(!filter_var($domain, FILTER_VALIDATE_URL))
+        {
+                return false;
+        }
+
+        //initialize curl
+        $curlInit = curl_init($domain);
+        curl_setopt($curlInit,CURLOPT_CONNECTTIMEOUT,10);
+        curl_setopt($curlInit,CURLOPT_HEADER,true);
+        curl_setopt($curlInit,CURLOPT_NOBODY,true);
+        curl_setopt($curlInit,CURLOPT_RETURNTRANSFER,true);
+
+        //get answer
+        $response = curl_exec($curlInit);
+
+        curl_close($curlInit);
+
+        if ($response) return true;
+
+        return false;
+    }
+
+
+    static function Sms($sender_id,$member_contact,$sms_text,$sms_status)
+    {
+        $sms = Utilities::getSetting('sms');
+        $gatewayStatus = Utilities::smsGatewayStatus();
+
+        if ($sms && $sms_status) 
+        {
+            if($gatewayStatus)
+            {
+                $api_key = Utilities::getSetting('sms_api_key');
+                $contacts = $member_contact;
+                $from = $sender_id;
+                $send_sms_text = urlencode($sms_text);
+
+                //Transactional = 20 , Promo with sender id = 21 , only promotional = 18
+                $api_url = "http://www.logonutility.in/app/smsapi/index.php?key=".$api_key."&campaign=1&routeid=20&type=text&contacts=".$contacts."&senderid=".$from."&msg=".$send_sms_text;
+
+                //Submit to server
+                $response = file_get_contents($api_url);
+
+                if (str_contains($response,'SMS-SHOOT-ID')) 
+                {
+                    //Log entry for SMS_log table
+                    $SmsLogData = array('shoot_id' => substr($response, strpos($response, "SMS-SHOOT-ID/") + 13),
+                                        'number' => $member_contact,
+                                        'message' => $sms_text,
+                                        'sender_id' => $sender_id,
+                                        'send_time' => Carbon::now(),
+                                        'status' => 'NA');
+
+                    $SmsLog  = new Sms_log($SmsLogData);
+                    $SmsLog->save();
+                }
+                //Update SMS balance
+                Utilities::smsBalance();
+            }
+            else
+            {
+                $SmsLogData = array('shoot_id' => '',
+                                    'number' => $member_contact,
+                                    'message' => $sms_text,
+                                    'sender_id' => $sender_id,
+                                    'send_time' => Carbon::now(),
+                                    'status' => 'offline');
+
+                $SmsLog  = new Sms_log($SmsLogData);
+                $SmsLog->save();
+            }
 			
-		}
-	}
-
-	static function retrySms($sender_id,$member_contact,$sms_text,$log)
-	{
-		$gatewayStatus = Utilities::smsGatewayStatus();
-
-		if($gatewayStatus)
-		{
-			$api_key = Utilities::getSetting('sms_api_key');
-			$contacts = $member_contact;
-			$from = $sender_id;
-			$send_sms_text = urlencode($sms_text);
-
-			//Transactional = 20 , Promo with sender id = 21 , only promotional = 18
-			$api_url = "http://www.logonutility.in/app/smsapi/index.php?key=".$api_key."&campaign=1&routeid=21&type=text&contacts=".$contacts."&senderid=".$from."&msg=".$send_sms_text;
-
-			//Submit to server
-			$response = file_get_contents($api_url);
-
-			if (str_contains($response,'SMS-SHOOT-ID')) 
-			{
-				//Log entry for SMS_log table
-				$log->update(['shoot_id' => substr($response, strpos($response, "SMS-SHOOT-ID/") + 13),
-							  'number' => $member_contact,
-							  'message' => $sms_text,
-							  'sender_id' => $sender_id,
-							  'send_time' => Carbon::now(),
-							  'status' => 'NA']);
-				$log->save();
-			}
-			//Update SMS balance
-			Utilities::smsBalance();
-		}
-	}
-
-	static function smsBalance()
-	{
-		$sms = Utilities::getSetting('sms');
-		$gatewayStatus = Utilities::smsGatewayStatus();
-
-		if($sms && $gatewayStatus)
-		{
-			$api_key = Utilities::getSetting('sms_api_key');
-
-			$api_url = "http://logonutility.in/app/miscapi/".$api_key."/getBalance/true/";
-
-			//Submit to server
-
-			$credit_balance = file_get_contents($api_url);
-			$balance = json_decode($credit_balance);
-			Setting::where('key', '=','sms_balance')->update(['value' => $balance[0]->BALANCE]);
-
-			// If balance turns zero turn off SMS
-			if($balance[0]->BALANCE == 0)
-			{
-				Setting::where('key', '=','sms')->update(['value' => 0]);
-			}
-		}
-	}
-
-	static function smsStatusUpdate()
-	{
-		$sms = Utilities::getSetting('sms');
-		$gatewayStatus = Utilities::smsGatewayStatus();
-
-		if($sms && $gatewayStatus)
-		{
-			$api_key = Utilities::getSetting('sms_api_key');
+        }
+    }
+
+    static function retrySms($sender_id,$member_contact,$sms_text,$log)
+    {
+        $gatewayStatus = Utilities::smsGatewayStatus();
+
+        if($gatewayStatus)
+        {
+            $api_key = Utilities::getSetting('sms_api_key');
+            $contacts = $member_contact;
+            $from = $sender_id;
+            $send_sms_text = urlencode($sms_text);
+
+            //Transactional = 20 , Promo with sender id = 21 , only promotional = 18
+            $api_url = "http://www.logonutility.in/app/smsapi/index.php?key=".$api_key."&campaign=1&routeid=21&type=text&contacts=".$contacts."&senderid=".$from."&msg=".$send_sms_text;
+
+            //Submit to server
+            $response = file_get_contents($api_url);
+
+            if (str_contains($response,'SMS-SHOOT-ID')) 
+            {
+                //Log entry for SMS_log table
+                $log->update(['shoot_id' => substr($response, strpos($response, "SMS-SHOOT-ID/") + 13),
+                                'number' => $member_contact,
+                                'message' => $sms_text,
+                                'sender_id' => $sender_id,
+                                'send_time' => Carbon::now(),
+                                'status' => 'NA']);
+                $log->save();
+            }
+            //Update SMS balance
+            Utilities::smsBalance();
+        }
+    }
+
+    static function smsBalance()
+    {
+        $sms = Utilities::getSetting('sms');
+        $gatewayStatus = Utilities::smsGatewayStatus();
+
+        if($sms && $gatewayStatus)
+        {
+            $api_key = Utilities::getSetting('sms_api_key');
+
+            $api_url = "http://logonutility.in/app/miscapi/".$api_key."/getBalance/true/";
+
+            //Submit to server
+
+            $credit_balance = file_get_contents($api_url);
+            $balance = json_decode($credit_balance);
+            Setting::where('key', '=','sms_balance')->update(['value' => $balance[0]->BALANCE]);
+
+            // If balance turns zero turn off SMS
+            if($balance[0]->BALANCE == 0)
+            {
+                Setting::where('key', '=','sms')->update(['value' => 0]);
+            }
+        }
+    }
+
+    static function smsStatusUpdate()
+    {
+        $sms = Utilities::getSetting('sms');
+        $gatewayStatus = Utilities::smsGatewayStatus();
+
+        if($sms && $gatewayStatus)
+        {
+            $api_key = Utilities::getSetting('sms_api_key');
 			
-			// Retry Offline Msg
-			$messages = Sms_log::where('status','offline')->get();
+            // Retry Offline Msg
+            $messages = Sms_log::where('status','offline')->get();
 		
-			foreach($messages as $message)
-			{
-				Utilities::retrySms($message->sender_id,$message->number,$message->message,$message);
-			}
+            foreach($messages as $message)
+            {
+                Utilities::retrySms($message->sender_id,$message->number,$message->message,$message);
+            }
 			
 			
-			// Update Status
-			$messages = Sms_log::whereNotIn('status', ['Delivered','Failed','offline'])->get();
+            // Update Status
+            $messages = Sms_log::whereNotIn('status', ['Delivered','Failed','offline'])->get();
 
-			foreach($messages as $message)
-				{
-					$sms_shoot_id = $message->shoot_id;				
-					$api_url = "http://logonutility.in/app/miscapi/".$api_key."/getDLR/".$sms_shoot_id;
+            foreach($messages as $message)
+                {
+                    $sms_shoot_id = $message->shoot_id;				
+                    $api_url = "http://logonutility.in/app/miscapi/".$api_key."/getDLR/".$sms_shoot_id;
 
-					//Submit to server
-					$response = file_get_contents($api_url);
+                    //Submit to server
+                    $response = file_get_contents($api_url);
 					
 					
-					$dlr_array = json_decode($response);
+                    $dlr_array = json_decode($response);
 
-					//Update Status
-					$message->status = $dlr_array[0]->DLR;
-					$message->save();
-				}
-		}
+                    //Update Status
+                    $message->status = $dlr_array[0]->DLR;
+                    $message->save();
+                }
+        }
 				
-	}
+    }
 
 }
 

Spacing +39 added lines, -39 removed lines

@@ -11,7 +11,7 @@ 
 
 class Utilities {
 
-static function setActiveMenu($uri,$isParent = false)
+static function setActiveMenu($uri, $isParent = false)
 {
 	$class = ($isParent) ? 'active open' : 'active';
     return \Request::is($uri) ? $class : '';
@@ -21,7 +21,7 @@ 
 // Get Setting
 static function getSetting($key)
 {
-	$settingValue = Setting::where('key','=',$key)->pluck('value');
+	$settingValue = Setting::where('key', '=', $key)->pluck('value');
 	return $settingValue;
 }
 
@@ -317,17 +317,17 @@ 
 }
 
 // Set invoice status
-static function setInvoiceStatus($amount_due,$invoice_total)
+static function setInvoiceStatus($amount_due, $invoice_total)
 {
-	if($amount_due == 0)
+	if ($amount_due == 0)
     {
          $paymentStatus = \constPaymentStatus::Paid;
     } 
-    elseif($amount_due > 0 && $amount_due < $invoice_total) 
+    elseif ($amount_due > 0 && $amount_due < $invoice_total) 
     {
         $paymentStatus = \constPaymentStatus::Partial;
     }
-    elseif($amount_due == $invoice_total) 
+    elseif ($amount_due == $invoice_total) 
     {
         $paymentStatus = \constPaymentStatus::Unpaid;
     }
@@ -495,7 +495,7 @@ 
 	}
 }
 
-static function getGreeting(){
+static function getGreeting() {
 	//$time = date("H");
 	$time = Carbon::now()->hour;
     /* If the time is less than 1200 hours, show good morning */
@@ -532,8 +532,8 @@ 
                 	File::delete(public_path('assets/img/gym/gym_logo.jpg'));
                 	$fileName = "gym_logo.jpg";
                     $destinationPath = public_path($upload_path);
-                    $request->file($upload_field)->move($destinationPath,$fileName);
-                    Image::make($destinationPath."/".$fileName)->resize(600, null, function ($constraint) {
+                    $request->file($upload_field)->move($destinationPath, $fileName);
+                    Image::make($destinationPath."/".$fileName)->resize(600, null, function($constraint) {
 																					    $constraint->aspectRatio();
 																					})->save();
                 }
@@ -543,12 +543,12 @@ 
 	static function registrationsTrend()
 	{
 		// Get Financial date
-		$startDate = new Carbon(Setting::where('key','=','financial_start')->pluck('value'));
+		$startDate = new Carbon(Setting::where('key', '=', 'financial_start')->pluck('value'));
 		$data = array();
 		
-		for ($i=1; $i <= 12 ; $i++) { 
+		for ($i = 1; $i <= 12; $i++) { 
 			//$members = member::registrations($startDate->month,$startDate->year); // Laravel Scoped Query Issue: Workaroud Needed
-			$members = Member::whereMonth('created_at', '=', $startDate->month)->whereYear('created_at', '=',$startDate->year)->count();
+			$members = Member::whereMonth('created_at', '=', $startDate->month)->whereYear('created_at', '=', $startDate->year)->count();
 			$data[] = array("month" => $startDate->format('Y-m'), "registrations" => $members);
 			$startDate->addMonth();
 		}
@@ -565,8 +565,8 @@ 
 
 		foreach ($plans as $plan) 
 		{
-			$subscriptions = Subscription::where('status','=',\constSubscription::onGoing)->where('plan_id','=',$plan->id)->count();
-			$data[] = array('label' =>$plan->plan_name ,'value'=>$subscriptions);
+			$subscriptions = Subscription::where('status', '=', \constSubscription::onGoing)->where('plan_id', '=', $plan->id)->count();
+			$data[] = array('label' =>$plan->plan_name, 'value'=>$subscriptions);
 		}
 		return json_encode($data);		
 	}
@@ -580,7 +580,7 @@ 
 
 			$api_url = "http://logonutility.in/app/miscapi/".$api_key."/getBalance/true/";
 
-			if(Utilities::isDomainAvailible($api_url))
+			if (Utilities::isDomainAvailible($api_url))
 	        {
 	               return true;
 	        }
@@ -590,7 +590,7 @@ 
 	        }			
 						
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return false;
 		}
@@ -601,17 +601,17 @@ 
    static function isDomainAvailible($domain)
    {
        //check, if a valid url is provided
-       if(!filter_var($domain, FILTER_VALIDATE_URL))
+       if (!filter_var($domain, FILTER_VALIDATE_URL))
        {
                return false;
        }
 
        //initialize curl
        $curlInit = curl_init($domain);
-       curl_setopt($curlInit,CURLOPT_CONNECTTIMEOUT,10);
-       curl_setopt($curlInit,CURLOPT_HEADER,true);
-       curl_setopt($curlInit,CURLOPT_NOBODY,true);
-       curl_setopt($curlInit,CURLOPT_RETURNTRANSFER,true);
+       curl_setopt($curlInit, CURLOPT_CONNECTTIMEOUT, 10);
+       curl_setopt($curlInit, CURLOPT_HEADER, true);
+       curl_setopt($curlInit, CURLOPT_NOBODY, true);
+       curl_setopt($curlInit, CURLOPT_RETURNTRANSFER, true);
 
        //get answer
        $response = curl_exec($curlInit);
@@ -624,14 +624,14 @@ 
    }
 
 
-	static function Sms($sender_id,$member_contact,$sms_text,$sms_status)
+	static function Sms($sender_id, $member_contact, $sms_text, $sms_status)
 	{
 		$sms = Utilities::getSetting('sms');
 		$gatewayStatus = Utilities::smsGatewayStatus();
 
 		if ($sms && $sms_status) 
 		{
-			if($gatewayStatus)
+			if ($gatewayStatus)
 			{
 				$api_key = Utilities::getSetting('sms_api_key');
 				$contacts = $member_contact;
@@ -644,7 +644,7 @@ 
 				//Submit to server
 				$response = file_get_contents($api_url);
 
-				if (str_contains($response,'SMS-SHOOT-ID')) 
+				if (str_contains($response, 'SMS-SHOOT-ID')) 
 				{
 					//Log entry for SMS_log table
 					$SmsLogData = array('shoot_id' => substr($response, strpos($response, "SMS-SHOOT-ID/") + 13),
@@ -654,7 +654,7 @@ 
 										'send_time' => Carbon::now(),
 										'status' => 'NA');
 
-					$SmsLog  = new Sms_log($SmsLogData);
+					$SmsLog = new Sms_log($SmsLogData);
 					$SmsLog->save();
 				}
 				//Update SMS balance
@@ -669,18 +669,18 @@ 
 									'send_time' => Carbon::now(),
 									'status' => 'offline');
 
-				$SmsLog  = new Sms_log($SmsLogData);
+				$SmsLog = new Sms_log($SmsLogData);
 				$SmsLog->save();
 			}
 			
 		}
 	}
 
-	static function retrySms($sender_id,$member_contact,$sms_text,$log)
+	static function retrySms($sender_id, $member_contact, $sms_text, $log)
 	{
 		$gatewayStatus = Utilities::smsGatewayStatus();
 
-		if($gatewayStatus)
+		if ($gatewayStatus)
 		{
 			$api_key = Utilities::getSetting('sms_api_key');
 			$contacts = $member_contact;
@@ -693,7 +693,7 @@ 
 			//Submit to server
 			$response = file_get_contents($api_url);
 
-			if (str_contains($response,'SMS-SHOOT-ID')) 
+			if (str_contains($response, 'SMS-SHOOT-ID')) 
 			{
 				//Log entry for SMS_log table
 				$log->update(['shoot_id' => substr($response, strpos($response, "SMS-SHOOT-ID/") + 13),
@@ -714,7 +714,7 @@ 
 		$sms = Utilities::getSetting('sms');
 		$gatewayStatus = Utilities::smsGatewayStatus();
 
-		if($sms && $gatewayStatus)
+		if ($sms && $gatewayStatus)
 		{
 			$api_key = Utilities::getSetting('sms_api_key');
 
@@ -724,12 +724,12 @@ 
 
 			$credit_balance = file_get_contents($api_url);
 			$balance = json_decode($credit_balance);
-			Setting::where('key', '=','sms_balance')->update(['value' => $balance[0]->BALANCE]);
+			Setting::where('key', '=', 'sms_balance')->update(['value' => $balance[0]->BALANCE]);
 
 			// If balance turns zero turn off SMS
-			if($balance[0]->BALANCE == 0)
+			if ($balance[0]->BALANCE == 0)
 			{
-				Setting::where('key', '=','sms')->update(['value' => 0]);
+				Setting::where('key', '=', 'sms')->update(['value' => 0]);
 			}
 		}
 	}
@@ -739,23 +739,23 @@ 
 		$sms = Utilities::getSetting('sms');
 		$gatewayStatus = Utilities::smsGatewayStatus();
 
-		if($sms && $gatewayStatus)
+		if ($sms && $gatewayStatus)
 		{
 			$api_key = Utilities::getSetting('sms_api_key');
 			
 			// Retry Offline Msg
-			$messages = Sms_log::where('status','offline')->get();
+			$messages = Sms_log::where('status', 'offline')->get();
 		
-			foreach($messages as $message)
+			foreach ($messages as $message)
 			{
-				Utilities::retrySms($message->sender_id,$message->number,$message->message,$message);
+				Utilities::retrySms($message->sender_id, $message->number, $message->message, $message);
 			}
 			
 			
 			// Update Status
-			$messages = Sms_log::whereNotIn('status', ['Delivered','Failed','offline'])->get();
+			$messages = Sms_log::whereNotIn('status', ['Delivered', 'Failed', 'offline'])->get();
 
-			foreach($messages as $message)
+			foreach ($messages as $message)
 				{
 					$sms_shoot_id = $message->shoot_id;				
 					$api_url = "http://logonutility.in/app/miscapi/".$api_key."/getDLR/".$sms_shoot_id;

Braces +9 added lines, -13 removed lines

@@ -322,16 +322,13 @@ 
 	if($amount_due == 0)
     {
          $paymentStatus = \constPaymentStatus::Paid;
-    } 
-    elseif($amount_due > 0 && $amount_due < $invoice_total) 
+    } elseif($amount_due > 0 && $amount_due < $invoice_total) 
     {
         $paymentStatus = \constPaymentStatus::Partial;
-    }
-    elseif($amount_due == $invoice_total) 
+    } elseif($amount_due == $invoice_total) 
     {
         $paymentStatus = \constPaymentStatus::Unpaid;
-    }
-    else
+    } else
     {
         $paymentStatus = \constPaymentStatus::Overpaid;
     }    
@@ -583,14 +580,12 @@ 
 			if(Utilities::isDomainAvailible($api_url))
 	        {
 	               return true;
-	        }
-	        else
+	        } else
 	        {
 	               return false;
 	        }			
 						
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return false;
 		}
@@ -618,7 +613,9 @@ 
 
        curl_close($curlInit);
 
-       if ($response) return true;
+       if ($response) {
+           return true;
+       }
 
        return false;
    }
@@ -659,8 +656,7 @@ 
 				}
 				//Update SMS balance
 				Utilities::smsBalance();
-			}
-			else
+			} else
 			{
 				$SmsLogData = array('shoot_id' => '',
 									'number' => $member_contact,

app/Lubus/ImageFilters/Invoice.php

Indentation +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@
     public function applyFilter(Image $image)
     {
         return $image->resize(150, null, function ($constraint) {
-		    $constraint->aspectRatio();
-		})->encode('jpg', 100);   
-	}
+            $constraint->aspectRatio();
+        })->encode('jpg', 100);   
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     public function applyFilter(Image $image)
     {
-        return $image->resize(150, null, function ($constraint) {
+        return $image->resize(150, null, function($constraint) {
 		    $constraint->aspectRatio();
 		})->encode('jpg', 100);   
 	}

app/Lubus/constants.php

Indentation +28 added lines, -28 removed lines

@@ -16,15 +16,15 @@ 
 
 //Follow Up Status
 class constFollowUpStatus {
-	const Pending = 0;
-	const Done = 1;
+    const Pending = 0;
+    const Done = 1;
 }
 
 //Follow Up By
 class constFollowUpBy {
-	const Call = 0;
-	const SMS = 1;
-	const Personal = 2;
+    const Call = 0;
+    const SMS = 1;
+    const Personal = 2;
 }
 
 // File PATHS
@@ -36,53 +36,53 @@ 
 }
 
 class constFilePrefix {
-	const UserProfilePhoto = 'profile_';
-	const UserProofPhoto = 'proof_';
-	const StaffPhoto = 'staff_';
+    const UserProfilePhoto = 'profile_';
+    const UserProofPhoto = 'proof_';
+    const StaffPhoto = 'staff_';
 }
 
 // Payment status
 class constPaymentStatus {
-	const Unpaid = 0;
-	const Paid = 1;
-	const Partial = 2;
-	const Overpaid = 3;
+    const Unpaid = 0;
+    const Paid = 1;
+    const Partial = 2;
+    const Overpaid = 3;
 }
 
 // Cheque status
 class constChequeStatus {
-	const Recieved = 0;
-	const Deposited = 1;
-	const Cleared = 2;
-	const Bounced = 3;
-	const Reissued = 4;
+    const Recieved = 0;
+    const Deposited = 1;
+    const Cleared = 2;
+    const Bounced = 3;
+    const Reissued = 4;
 }
 
 // Invoice Items
 class constInvoiceItem {
-	const admission = "Admission";
-	const gymSubscription = "Gym Subscription";
-	const taxes = "Taxes";
+    const admission = "Admission";
+    const gymSubscription = "Gym Subscription";
+    const taxes = "Taxes";
 }
 
 //subscription
 class constSubscription {
-	const Expired = 0;
-	const onGoing = 1;
-	const renewed = 2;
-	const cancelled = 3;  
+    const Expired = 0;
+    const onGoing = 1;
+    const renewed = 2;
+    const cancelled = 3;  
 }
 
 //numbering mode
 class constNumberingMode {
-	const Manual = 0;
-	const Auto = 1;
+    const Manual = 0;
+    const Auto = 1;
 }
 
 //Payment mode
 class constPaymentMode {
-	const Cheque = 0;
-	const Cash = 1;
+    const Cheque = 0;
+    const Cash = 1;
 }
 
 ?>
\ No newline at end of file