lubusIN / laravel-gymie

app/Http/Controllers/ExpenseCategoriesController.php

Indentation +17 added lines, -17 removed lines

@@ -16,7 +16,7 @@ 
         $this->middleware('auth');
     }
    
-	/**
+    /**
      * Display a listing of the resource.
      *
      * @return Response
@@ -24,10 +24,10 @@ 
     public function index()
     {
         $expenseCategories = ExpenseCategory::paginate(10);
-    	$expenseCategoriesTotal = ExpenseCategory::all();
+        $expenseCategoriesTotal = ExpenseCategory::all();
         $count = $expenseCategoriesTotal->count();
 
-    	return view('expenseCategories.index', compact('expenseCategories','count'));
+        return view('expenseCategories.index', compact('expenseCategories','count'));
     }
 
     /**
@@ -38,26 +38,26 @@ 
      */
     public function show()
     {
-    	$expenseCategory = ExpenseCategory::findOrFail($id);
+        $expenseCategory = ExpenseCategory::findOrFail($id);
 
-    	return view('expenseCategories.show', compact('expenseCategory'));
+        return view('expenseCategories.show', compact('expenseCategory'));
     }
 
-     /**
-     * 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('expenseCategories.create');
+        return view('expenseCategories.create');
     }
     
-     /**
-     * Store a newly created resource in storage.
-     *
-     * @return Response
-     */
+        /**
+         * Store a newly created resource in storage.
+         *
+         * @return Response
+         */
     public function store(Request $request)
     {
         $this->validate($request, ['name' => 'unique:mst_expenses_categories,name']);
@@ -69,7 +69,7 @@ 
 
         $expenseCategory->save();
         flash()->success('Expense Category was successfully added');
-    	return redirect('expenses/categories'); 
+        return redirect('expenses/categories'); 
     }
 
     public function edit($id)

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     	$expenseCategoriesTotal = ExpenseCategory::all();
         $count = $expenseCategoriesTotal->count();
 
-    	return view('expenseCategories.index', compact('expenseCategories','count'));
+    	return view('expenseCategories.index', compact('expenseCategories', 'count'));
     }
 
     /**
@@ -74,14 +74,14 @@ 
 
     public function edit($id)
     {
-        $expenseCategory=ExpenseCategory::findOrFail($id);
+        $expenseCategory = ExpenseCategory::findOrFail($id);
 
         return view('expenseCategories.edit', compact('expenseCategory'));
     }
 
     public function update($id, Request $request)
     {
-        $expenseCategory=ExpenseCategory::findOrFail($id);
+        $expenseCategory = ExpenseCategory::findOrFail($id);
 
         $expenseCategory->update($request->all());
 

app/Http/Controllers/PaymentsController.php

Indentation +31 added lines, -31 removed lines

@@ -23,26 +23,26 @@ 
         $this->middleware('auth');
     }
 
-	public function index(Request $request)
+    public function index(Request $request)
     {
 
-      $payment_details = Payment_detail::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $paymentTotal = Payment_detail::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
-      $count = $paymentTotal->sum('payment_amount');
+        $payment_details = Payment_detail::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+        $paymentTotal = Payment_detail::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+        $count = $paymentTotal->sum('payment_amount');
      
  
-      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('payments.index', compact('payment_details','count','drp_placeholder'));
+        return view('payments.index', compact('payment_details','count','drp_placeholder'));
 
     }
 
@@ -64,16 +64,16 @@ 
 
             if($request->mode == \constPaymentMode::Cheque)
             {
-              // Store Cheque Details
-              $chequeData = array('payment_id'=> $payment_detail->id,
-                                  'number'=> $request->number,
-                                  'date'=> $request->date,
-                                  'status'=> \constChequeStatus::Recieved);
+                // Store Cheque Details
+                $chequeData = array('payment_id'=> $payment_detail->id,
+                                    'number'=> $request->number,
+                                    'date'=> $request->date,
+                                    'status'=> \constChequeStatus::Recieved);
           
-              $cheque_details = new Cheque_detail($chequeData);
-              $cheque_details->createdBy()->associate(Auth::user());
-              $cheque_details->updatedBy()->associate(Auth::user());
-              $cheque_details->save();
+                $cheque_details = new Cheque_detail($chequeData);
+                $cheque_details->createdBy()->associate(Auth::user());
+                $cheque_details->updatedBy()->associate(Auth::user());
+                $cheque_details->save();
             }
 
             elseif($request->mode == \constPaymentMode::Cash)
@@ -154,13 +154,13 @@ 
 
             if($request->mode == \constPaymentMode::Cheque)
             {
-              // Store Cheque Details
-              $cheque_detail = Cheque_detail::where('payment_id',$id)->first();
-              $cheque_detail->update(['number' => $request->number,
-                                      'date' => $request->date
+                // Store Cheque Details
+                $cheque_detail = Cheque_detail::where('payment_id',$id)->first();
+                $cheque_detail->update(['number' => $request->number,
+                                        'date' => $request->date
                                     ]);
-              $cheque_detail->updatedBy()->associate(Auth::user());
-              $cheque_detail->save();
+                $cheque_detail->updatedBy()->associate(Auth::user());
+                $cheque_detail->save();
             }
 
             elseif($request->mode == \constPaymentMode::Cash)
@@ -207,8 +207,8 @@ 
 
             $invoice_total = $invoice->total;
             $payment_total = Payment_detail::leftJoin('trn_cheque_details','trn_payment_details.id','=','trn_cheque_details.payment_id')
-                                           ->whereRaw("trn_payment_details.invoice_id = $invoice->id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
-                                           ->sum('trn_payment_details.payment_amount');
+                                            ->whereRaw("trn_payment_details.invoice_id = $invoice->id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
+                                            ->sum('trn_payment_details.payment_amount');
 
             $amount_due = $invoice_total - $payment_total;
 
@@ -254,8 +254,8 @@ 
             $invoice_total = $payment_detail->invoice->total;
 
             $payment_total = Payment_detail::leftJoin('trn_cheque_details','trn_payment_details.id','=','trn_cheque_details.payment_id')
-                                           ->whereRaw("trn_payment_details.invoice_id = $payment_detail->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
-                                           ->sum('trn_payment_details.payment_amount');
+                                            ->whereRaw("trn_payment_details.invoice_id = $payment_detail->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
+                                            ->sum('trn_payment_details.payment_amount');
                                            
             $amount_due = $invoice_total - $payment_total;
 

Spacing +43 added lines, -43 removed lines

@@ -26,8 +26,8 @@ 
 	public function index(Request $request)
     {
 
-      $payment_details = Payment_detail::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $paymentTotal = Payment_detail::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+      $payment_details = Payment_detail::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+      $paymentTotal = Payment_detail::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
       $count = $paymentTotal->sum('payment_amount');
      
  
@@ -37,12 +37,12 @@ 
       }
       else
       {
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
       }
       
       $request->flash();
       
-      return view('payments.index', compact('payment_details','count','drp_placeholder'));
+      return view('payments.index', compact('payment_details', 'count', 'drp_placeholder'));
 
     }
 
@@ -62,7 +62,7 @@ 
             $payment_detail->updatedBy()->associate(Auth::user());
             $payment_detail->save();
 
-            if($request->mode == \constPaymentMode::Cheque)
+            if ($request->mode == \constPaymentMode::Cheque)
             {
               // Store Cheque Details
               $chequeData = array('payment_id'=> $payment_detail->id,
@@ -76,22 +76,22 @@ 
               $cheque_details->save();
             }
 
-            elseif($request->mode == \constPaymentMode::Cash)
+            elseif ($request->mode == \constPaymentMode::Cash)
             {
             // Updating Invoice Status and amounts
             $invoice_total = $payment_detail->invoice->total;
-            $payment_total = Payment_detail::where('invoice_id',$payment_detail->invoice_id)->sum('payment_amount');
+            $payment_total = Payment_detail::where('invoice_id', $payment_detail->invoice_id)->sum('payment_amount');
             $amount_due = $invoice_total - $payment_total;
 
             $payment_detail->invoice->pending_amount = $amount_due;
-            $payment_detail->invoice->status = \Utilities::setInvoiceStatus($amount_due,$invoice_total);
+            $payment_detail->invoice->status = \Utilities::setInvoiceStatus($amount_due, $invoice_total);
             $payment_detail->invoice->save();
             }
 
             //If cheque reissued , set the status of the previous cheque detail to Reissued
-            if($request->has('previousPayment'))
+            if ($request->has('previousPayment'))
             {
-                $cheque_detail = Cheque_detail::where('payment_id',$request->previousPayment)->first();
+                $cheque_detail = Cheque_detail::where('payment_id', $request->previousPayment)->first();
                 $cheque_detail->status = \constChequeStatus::Reissued;
                 $cheque_detail->save();
             }
@@ -100,34 +100,34 @@ 
             $sender_id = \Utilities::getSetting('sms_sender_id');
             $gym_name = \Utilities::getSetting('gym_name');
             
-            if($request->mode == \constPaymentMode::Cash)
+            if ($request->mode == \constPaymentMode::Cash)
             {
-                $sms_trigger = Sms_trigger::where('alias','=','payment_recieved')->first();
+                $sms_trigger = Sms_trigger::where('alias', '=', 'payment_recieved')->first();
                 $message = $sms_trigger->message;
-                $sms_text = sprintf($message,$payment_detail->invoice->member->name,$payment_detail->payment_amount,$payment_detail->invoice->invoice_number);
+                $sms_text = sprintf($message, $payment_detail->invoice->member->name, $payment_detail->payment_amount, $payment_detail->invoice->invoice_number);
                 $sms_status = $sms_trigger->status;
                 $sender_id = \Utilities::getSetting('sms_sender_id');
 
-                \Utilities::Sms($sender_id,$payment_detail->invoice->member->contact,$sms_text,$sms_status);
+                \Utilities::Sms($sender_id, $payment_detail->invoice->member->contact, $sms_text, $sms_status);
             }
-            elseif($request->mode == \constPaymentMode::Cheque)
+            elseif ($request->mode == \constPaymentMode::Cheque)
             {
-                $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
+                $sms_trigger = Sms_trigger::where('alias', '=', 'payment_with_cheque')->first();
                 $message = $sms_trigger->message;
-                $sms_text = sprintf($message,$payment_detail->invoice->member->name,$payment_detail->payment_amount,$cheque_details->number,$payment_detail->invoice->invoice_number,$gym_name);
+                $sms_text = sprintf($message, $payment_detail->invoice->member->name, $payment_detail->payment_amount, $cheque_details->number, $payment_detail->invoice->invoice_number, $gym_name);
                 $sms_status = $sms_trigger->status;
 
-                \Utilities::Sms($sender_id,$payment_detail->invoice->member->contact,$sms_text,$sms_status);
+                \Utilities::Sms($sender_id, $payment_detail->invoice->member->contact, $sms_text, $sms_status);
             }            
 
             DB::commit();
             flash()->success('Payment Details were successfully stored');
-            return redirect (action('InvoicesController@show', ['id' => $payment_detail->invoice_id]));            
+            return redirect(action('InvoicesController@show', ['id' => $payment_detail->invoice_id]));            
         } 
         catch (Exception $e) 
         {
             DB::rollback();
-            flash()->error('Payment Details weren\'t stored succesfully' );
+            flash()->error('Payment Details weren\'t stored succesfully');
             return redirect('payments/all');
         }                           
 }
@@ -135,9 +135,9 @@ 
     public function edit($id)
     {
         $payment_detail = Payment_detail::findOrFail($id);
-        $cheque_detail = Cheque_detail::where('payment_id',$id)->first();
+        $cheque_detail = Cheque_detail::where('payment_id', $id)->first();
 
-        return view('payments.edit', compact('payment_detail','cheque_detail'));
+        return view('payments.edit', compact('payment_detail', 'cheque_detail'));
     }
 
     public function update($id, Request $request)
@@ -147,15 +147,15 @@ 
         try 
         {
             // Storing Payment Details
-            $payment_detail=Payment_detail::findOrFail($id);
+            $payment_detail = Payment_detail::findOrFail($id);
             $payment_detail->update($request->all());
             $payment_detail->updatedBy()->associate(Auth::user());
             $payment_detail->save();
 
-            if($request->mode == \constPaymentMode::Cheque)
+            if ($request->mode == \constPaymentMode::Cheque)
             {
               // Store Cheque Details
-              $cheque_detail = Cheque_detail::where('payment_id',$id)->first();
+              $cheque_detail = Cheque_detail::where('payment_id', $id)->first();
               $cheque_detail->update(['number' => $request->number,
                                       'date' => $request->date
                                     ]);
@@ -163,27 +163,27 @@ 
               $cheque_detail->save();
             }
 
-            elseif($request->mode == \constPaymentMode::Cash)
+            elseif ($request->mode == \constPaymentMode::Cash)
             {
                 // Updating Invoice Status and amounts
                 $invoice_total = $payment_detail->invoice->total;
-                $payment_total = Payment_detail::where('invoice_id',$payment_detail->invoice_id)->sum('payment_amount');
+                $payment_total = Payment_detail::where('invoice_id', $payment_detail->invoice_id)->sum('payment_amount');
                 $amount_due = $invoice_total - $payment_total;
 
                 $payment_detail->invoice->pending_amount = $amount_due;
-                $payment_detail->invoice->status = \Utilities::setInvoiceStatus($amount_due,$invoice_total);
+                $payment_detail->invoice->status = \Utilities::setInvoiceStatus($amount_due, $invoice_total);
                 $payment_detail->invoice->updatedBy()->associate(Auth::user());
                 $payment_detail->invoice->save();
             }
 
             DB::commit();
             flash()->success('Payment Details were successfully updated');
-            return redirect (action('InvoicesController@show', ['id' => $payment_detail->invoice_id]));            
+            return redirect(action('InvoicesController@show', ['id' => $payment_detail->invoice_id]));            
         } 
         catch (Exception $e) 
         {
             DB::rollback();
-            flash()->error('Payment Details weren\'t updated succesfully' );
+            flash()->error('Payment Details weren\'t updated succesfully');
             return redirect('payments');
         }
     }
@@ -195,10 +195,10 @@ 
         try
         {
             $payment_detail = Payment_detail::findOrFail($id);
-            $invoice = Invoice::where('id',$payment_detail->invoice_id)->first();
-            $cheque_details = Cheque_detail::where('payment_id',$payment_detail->id)->get();
+            $invoice = Invoice::where('id', $payment_detail->invoice_id)->first();
+            $cheque_details = Cheque_detail::where('payment_id', $payment_detail->id)->get();
 
-            foreach($cheque_details as $cheque_detail)
+            foreach ($cheque_details as $cheque_detail)
             {
                 $cheque_detail->delete();
             }
@@ -206,14 +206,14 @@ 
             $payment_detail->delete();
 
             $invoice_total = $invoice->total;
-            $payment_total = Payment_detail::leftJoin('trn_cheque_details','trn_payment_details.id','=','trn_cheque_details.payment_id')
+            $payment_total = Payment_detail::leftJoin('trn_cheque_details', 'trn_payment_details.id', '=', 'trn_cheque_details.payment_id')
                                            ->whereRaw("trn_payment_details.invoice_id = $invoice->id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
                                            ->sum('trn_payment_details.payment_amount');
 
             $amount_due = $invoice_total - $payment_total;
 
             $invoice->pending_amount = $amount_due;
-            $invoice->status = \Utilities::setInvoiceStatus($amount_due,$invoice_total);
+            $invoice->status = \Utilities::setInvoiceStatus($amount_due, $invoice_total);
             $invoice->updatedBy()->associate(Auth::user());
             $invoice->save();
 
@@ -221,7 +221,7 @@ 
             return redirect('payments/all');
         }
 
-        catch(\Exception $e)
+        catch (\Exception $e)
         {
             DB::rollback();
             return redirect('payments/all');
@@ -231,7 +231,7 @@ 
 
     public function depositCheque($id)
     {
-        Cheque_detail::where('payment_id',$id)->update(['status' => \constChequeStatus::Deposited]);
+        Cheque_detail::where('payment_id', $id)->update(['status' => \constChequeStatus::Deposited]);
 
         flash()->success('Cheque has been marked as deposited');
         return back();
@@ -245,7 +245,7 @@ 
             $payment_detail = Payment_detail::findOrFail($id);
 
             // Updating cheque status
-            $cheque_detail = Cheque_detail::where('payment_id',$id)->first();
+            $cheque_detail = Cheque_detail::where('payment_id', $id)->first();
             $cheque_detail->status = \constChequeStatus::Cleared;
             $cheque_detail->updatedBy()->associate(Auth::user());
             $cheque_detail->save();
@@ -253,21 +253,21 @@ 
             // Updating Invoice Status and amounts
             $invoice_total = $payment_detail->invoice->total;
 
-            $payment_total = Payment_detail::leftJoin('trn_cheque_details','trn_payment_details.id','=','trn_cheque_details.payment_id')
+            $payment_total = Payment_detail::leftJoin('trn_cheque_details', 'trn_payment_details.id', '=', 'trn_cheque_details.payment_id')
                                            ->whereRaw("trn_payment_details.invoice_id = $payment_detail->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
                                            ->sum('trn_payment_details.payment_amount');
                                            
             $amount_due = $invoice_total - $payment_total;
 
             $payment_detail->invoice->pending_amount = $amount_due;
-            $payment_detail->invoice->status = \Utilities::setInvoiceStatus($amount_due,$invoice_total);
+            $payment_detail->invoice->status = \Utilities::setInvoiceStatus($amount_due, $invoice_total);
             $payment_detail->invoice->save();            
 
             DB::commit();
             flash()->success('Cheque has been marked as cleared');
             return back();
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             DB::rollback();
             flash()->error('Error while marking the cheque as cleared');
@@ -277,7 +277,7 @@ 
 
     public function chequeBounce($id)
     {
-        Cheque_detail::where('payment_id',$id)->update(['status' => \constChequeStatus::Bounced]);
+        Cheque_detail::where('payment_id', $id)->update(['status' => \constChequeStatus::Bounced]);
         
         flash()->success('Cheque has been marked as bounced');
         return back();
@@ -287,6 +287,6 @@ 
     {
         $payment_detail = Payment_detail::findOrFail($id);
 
-        return view('payments.reissue',compact('payment_detail'));
+        return view('payments.reissue', compact('payment_detail'));
     }
 }

Braces +8 added lines, -19 removed lines

@@ -34,8 +34,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;
       }
@@ -74,9 +73,7 @@ 
               $cheque_details->createdBy()->associate(Auth::user());
               $cheque_details->updatedBy()->associate(Auth::user());
               $cheque_details->save();
-            }
-
-            elseif($request->mode == \constPaymentMode::Cash)
+            } elseif($request->mode == \constPaymentMode::Cash)
             {
             // Updating Invoice Status and amounts
             $invoice_total = $payment_detail->invoice->total;
@@ -109,8 +106,7 @@ 
                 $sender_id = \Utilities::getSetting('sms_sender_id');
 
                 \Utilities::Sms($sender_id,$payment_detail->invoice->member->contact,$sms_text,$sms_status);
-            }
-            elseif($request->mode == \constPaymentMode::Cheque)
+            } elseif($request->mode == \constPaymentMode::Cheque)
             {
                 $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
                 $message = $sms_trigger->message;
@@ -123,8 +119,7 @@ 
             DB::commit();
             flash()->success('Payment Details were successfully stored');
             return redirect (action('InvoicesController@show', ['id' => $payment_detail->invoice_id]));            
-        } 
-        catch (Exception $e) 
+        } catch (Exception $e) 
         {
             DB::rollback();
             flash()->error('Payment Details weren\'t stored succesfully' );
@@ -161,9 +156,7 @@ 
                                     ]);
               $cheque_detail->updatedBy()->associate(Auth::user());
               $cheque_detail->save();
-            }
-
-            elseif($request->mode == \constPaymentMode::Cash)
+            } elseif($request->mode == \constPaymentMode::Cash)
             {
                 // Updating Invoice Status and amounts
                 $invoice_total = $payment_detail->invoice->total;
@@ -179,8 +172,7 @@ 
             DB::commit();
             flash()->success('Payment Details were successfully updated');
             return redirect (action('InvoicesController@show', ['id' => $payment_detail->invoice_id]));            
-        } 
-        catch (Exception $e) 
+        } catch (Exception $e) 
         {
             DB::rollback();
             flash()->error('Payment Details weren\'t updated succesfully' );
@@ -219,9 +211,7 @@ 
 
             DB::commit();
             return redirect('payments/all');
-        }
-
-        catch(\Exception $e)
+        } catch(\Exception $e)
         {
             DB::rollback();
             return redirect('payments/all');
@@ -266,8 +256,7 @@ 
             DB::commit();
             flash()->success('Cheque has been marked as cleared');
             return back();
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             DB::rollback();
             flash()->error('Error while marking the cheque as cleared');

app/Http/Controllers/SubscriptionsController.php

Indentation +221 added lines, -221 removed lines

@@ -30,23 +30,23 @@ 
     public function index(Request $request)
     {
 
-      $subscriptions = Subscription::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end,$request->plan_name)->search('"'.$request->input('search').'"')->paginate(10);
-      $subscriptionTotal = Subscription::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end,$request->plan_name)->search('"'.$request->input('search').'"')->get();
-      $count = $subscriptionTotal->count();
+        $subscriptions = Subscription::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end,$request->plan_name)->search('"'.$request->input('search').'"')->paginate(10);
+        $subscriptionTotal = Subscription::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end,$request->plan_name)->search('"'.$request->input('search').'"')->get();
+        $count = $subscriptionTotal->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('subscriptions.index', compact('subscriptions','count','drp_placeholder'));
+        return view('subscriptions.index', compact('subscriptions','count','drp_placeholder'));
       
     }
 
@@ -58,11 +58,11 @@ 
 
         if (!$request->has('drp_start') or !$request->has('drp_end')) 
         {
-          $drp_placeholder = "Select daterange filter";
+            $drp_placeholder = "Select daterange filter";
         }
         else
         {
-          $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+            $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
         }
 
         $request->flash();
@@ -78,11 +78,11 @@ 
 
         if (!$request->has('drp_start') or !$request->has('drp_end')) 
         {
-          $drp_placeholder = "Select daterange filter";
+            $drp_placeholder = "Select daterange filter";
         }
         else
         {
-          $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+            $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
         }
 
         $request->flash();
@@ -92,29 +92,29 @@ 
 
     public function create()
     {
-     // For Tax calculation
-      JavaScript::put([
-          'taxes' => \Utilities::getSetting('taxes'),
-          'gymieToday' => Carbon::today()->format('Y-m-d'),
-          'servicesCount' => Service::count(),
-      ]);
-
-      //Get Numbering mode
-      $invoice_number_mode = \Utilities::getSetting('invoice_number_mode');
-
-      //Generating Invoice number
-      if ($invoice_number_mode == \constNumberingMode::Auto ) {
+        // For Tax calculation
+        JavaScript::put([
+            'taxes' => \Utilities::getSetting('taxes'),
+            'gymieToday' => Carbon::today()->format('Y-m-d'),
+            'servicesCount' => Service::count(),
+        ]);
+
+        //Get Numbering mode
+        $invoice_number_mode = \Utilities::getSetting('invoice_number_mode');
+
+        //Generating Invoice number
+        if ($invoice_number_mode == \constNumberingMode::Auto ) {
             $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1;
             $invoicePrefix = \Utilities::getSetting('invoice_prefix');
             $invoice_number = $invoicePrefix.$invoiceCounter;
-      }
+        }
 
-      else {
+        else {
             $invoice_number = '';
             $invoiceCounter = '';
-      }
+        }
 
-    	return view('subscriptions.create',compact('invoice_number','invoiceCounter','invoice_number_mode'));
+        return view('subscriptions.create',compact('invoice_number','invoiceCounter','invoice_number_mode'));
     }
 
     public function store(Request $request)
@@ -123,43 +123,43 @@ 
         DB::beginTransaction();
 
         try {
-              //Helper function to set Payment status
-              $invoice_total = $request->admission_amount + $request->subscription_amount + $request->taxes_amount - $request->discount_amount;
-              $paymentStatus = \constPaymentStatus::Unpaid;
-              $pending = $invoice_total - $request->payment_amount;
+                //Helper function to set Payment status
+                $invoice_total = $request->admission_amount + $request->subscription_amount + $request->taxes_amount - $request->discount_amount;
+                $paymentStatus = \constPaymentStatus::Unpaid;
+                $pending = $invoice_total - $request->payment_amount;
 
-              if($request->mode == 1)
-              {
+                if($request->mode == 1)
+                {
                 if ($request->payment_amount == $invoice_total) 
                 {
-                  $paymentStatus = \constPaymentStatus::Paid;
+                    $paymentStatus = \constPaymentStatus::Paid;
                 } 
                 elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) 
                 {
-                  $paymentStatus = \constPaymentStatus::Partial;
+                    $paymentStatus = \constPaymentStatus::Partial;
                 }
                 elseif($request->payment_amount == 0)
                 {
-                  $paymentStatus = \constPaymentStatus::Unpaid;
+                    $paymentStatus = \constPaymentStatus::Unpaid;
                 }
                 else 
                 {
-                  $paymentStatus = \constPaymentStatus::Overpaid;
+                    $paymentStatus = \constPaymentStatus::Overpaid;
+                }
                 }
-              }
             
-              // Storing Invoice                
+                // Storing Invoice                
                 $invoiceData = array('invoice_number'=> $request->invoice_number,
-                                     'member_id'=> $request->member_id,
-                                     'total'=> $invoice_total,
-                                     'status'=> $paymentStatus,
-                                     'pending_amount'=> $pending,
-                                     'discount_amount'=> $request->discount_amount,
-                                     'discount_percent'=> $request->discount_percent,
-                                     'discount_note'=> $request->discount_note,
-                                     'tax'=> $request->taxes_amount,
-                                     'additional_fees'=> $request->additional_fees,
-                                     'note'=>' ');
+                                        'member_id'=> $request->member_id,
+                                        'total'=> $invoice_total,
+                                        'status'=> $paymentStatus,
+                                        'pending_amount'=> $pending,
+                                        'discount_amount'=> $request->discount_amount,
+                                        'discount_percent'=> $request->discount_percent,
+                                        'discount_note'=> $request->discount_note,
+                                        'tax'=> $request->taxes_amount,
+                                        'additional_fees'=> $request->additional_fees,
+                                        'note'=>' ');
 
                 $invoice = new Invoice($invoiceData);
                 $invoice->createdBy()->associate(Auth::user());
@@ -169,7 +169,7 @@ 
                 // Storing subscription
                 foreach($request->plan as $plan)
                 {
-                  $subscriptionData = array('member_id'=> $request->member_id,
+                    $subscriptionData = array('member_id'=> $request->member_id,
                                             'invoice_id'=> $invoice->id,
                                             'plan_id'=> $plan['id'],
                                             'start_date'=> $plan['start_date'],
@@ -177,35 +177,35 @@ 
                                             'status'=> \constSubscription::onGoing,
                                             'is_renewal'=>'0');
 
-                  $subscription = new Subscription($subscriptionData);
-                  $subscription->createdBy()->associate(Auth::user());
-                  $subscription->updatedBy()->associate(Auth::user());
-                  $subscription->save();
+                    $subscription = new Subscription($subscriptionData);
+                    $subscription->createdBy()->associate(Auth::user());
+                    $subscription->updatedBy()->associate(Auth::user());
+                    $subscription->save();
 
-                  //Adding subscription to invoice(Invoice Details)
-                  $detailsData = array('invoice_id'=> $invoice->id,
-                                       'plan_id'=> $plan['id'],
-                                       'item_amount'=> $plan['price']);
+                    //Adding subscription to invoice(Invoice Details)
+                    $detailsData = array('invoice_id'=> $invoice->id,
+                                        'plan_id'=> $plan['id'],
+                                        'item_amount'=> $plan['price']);
                
-                  $invoice_details = new Invoice_detail($detailsData);
-                  $invoice_details->createdBy()->associate(Auth::user());
-                  $invoice_details->updatedBy()->associate(Auth::user());
-                  $invoice_details->save();
+                    $invoice_details = new Invoice_detail($detailsData);
+                    $invoice_details->createdBy()->associate(Auth::user());
+                    $invoice_details->updatedBy()->associate(Auth::user());
+                    $invoice_details->save();
                 }
 
-              //Payment Details 
-              $paymentData = array('invoice_id'=> $invoice->id,
-                                   'payment_amount'=> $request->payment_amount,
-                                   'mode'=> $request->mode,
-                                   'note'=> ' ');
+                //Payment Details 
+                $paymentData = array('invoice_id'=> $invoice->id,
+                                    'payment_amount'=> $request->payment_amount,
+                                    'mode'=> $request->mode,
+                                    'note'=> ' ');
 
-              $payment_details = new Payment_detail($paymentData);
-              $payment_details->createdBy()->associate(Auth::user());
-              $payment_details->updatedBy()->associate(Auth::user());
-              $payment_details->save();
+                $payment_details = new Payment_detail($paymentData);
+                $payment_details->createdBy()->associate(Auth::user());
+                $payment_details->updatedBy()->associate(Auth::user());
+                $payment_details->save();
 
-              if($request->mode == 0)
-              {
+                if($request->mode == 0)
+                {
                 // Store Cheque Details
                 $chequeData = array('payment_id'=> $payment_details->id,
                                     'number'=> $request->number,
@@ -216,98 +216,98 @@ 
                 $cheque_details->createdBy()->associate(Auth::user());
                 $cheque_details->updatedBy()->associate(Auth::user());
                 $cheque_details->save();
-              }
+                }
 
-              // Set the subscription status of the 'Renewed' subscription to Renew
-              if ($request->has('previousSubscriptions')) 
-              {                    
+                // Set the subscription status of the 'Renewed' subscription to Renew
+                if ($request->has('previousSubscriptions')) 
+                {                    
                 Subscription::where('invoice_id',$invoice->id)->update(['is_renewal' => '1']);
 
                 foreach($request->previousSubscriptions as $subscriptionId)
                 {
-                  $oldSubscription=Subscription::findOrFail($subscriptionId);
-                  $oldSubscription->status = \constSubscription::renewed;
-                  $oldSubscription->updatedBy()->associate(Auth::user());
-                  $oldSubscription->save();
+                    $oldSubscription=Subscription::findOrFail($subscriptionId);
+                    $oldSubscription->status = \constSubscription::renewed;
+                    $oldSubscription->updatedBy()->associate(Auth::user());
+                    $oldSubscription->save();
                 }                  
-              }
+                }
 
-              //Updating Numbering Counters
-              Setting::where('key', '=','invoice_last_number')->update(['value' => $request->invoiceCounter]);
-              $sender_id = \Utilities::getSetting('sms_sender_id');
-              $gym_name = \Utilities::getSetting('gym_name');
+                //Updating Numbering Counters
+                Setting::where('key', '=','invoice_last_number')->update(['value' => $request->invoiceCounter]);
+                $sender_id = \Utilities::getSetting('sms_sender_id');
+                $gym_name = \Utilities::getSetting('gym_name');
 
-              //SMS Trigger
-              if ($invoice->status == \constPaymentStatus::Paid) 
-              {
+                //SMS Trigger
+                if ($invoice->status == \constPaymentStatus::Paid) 
+                {
                 if($request->mode == 0)
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
-                  $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
-                  $sms_status = $sms_trigger->status;
+                    $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
+                    $message = $sms_trigger->message;
+                    $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
+                    $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                    \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
                 }
                 else
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_paid_invoice')->first();
-                  $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$invoice->invoice_number);
-                  $sms_status = $sms_trigger->status;
+                    $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_paid_invoice')->first();
+                    $message = $sms_trigger->message;
+                    $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$invoice->invoice_number);
+                    $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                    \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
                 }
                 
-              } 
-              elseif($invoice->status == \constPaymentStatus::Partial)
-              {
+                } 
+                elseif($invoice->status == \constPaymentStatus::Partial)
+                {
                 if($request->mode == 0)
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
-                  $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
-                  $sms_status = $sms_trigger->status;
+                    $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
+                    $message = $sms_trigger->message;
+                    $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
+                    $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                    \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
                 }
                 else
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_partial_invoice')->first();
-                  $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$invoice->invoice_number,$invoice->pending_amount);
-                  $sms_status = $sms_trigger->status;
+                    $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_partial_invoice')->first();
+                    $message = $sms_trigger->message;
+                    $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$invoice->invoice_number,$invoice->pending_amount);
+                    $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                    \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
                 }
                 
-              }
-              elseif($invoice->status == \constPaymentStatus::Unpaid)
-              {
+                }
+                elseif($invoice->status == \constPaymentStatus::Unpaid)
+                {
                 if($request->mode == 0)
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
-                  $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
-                  $sms_status = $sms_trigger->status;
+                    $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
+                    $message = $sms_trigger->message;
+                    $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
+                    $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                    \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
                 }
                 else
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_unpaid_invoice')->first();
-                  $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$invoice->total,$invoice->invoice_number);
-                  $sms_status = $sms_trigger->status;
+                    $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_unpaid_invoice')->first();
+                    $message = $sms_trigger->message;
+                    $sms_text = sprintf($message,$subscription->member->name,$invoice->total,$invoice->invoice_number);
+                    $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                    \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
                 }
                 
-              }
+                }
 
-              DB::commit();    
-              flash()->success('Subscription was successfully created');                         
-              return redirect (action('SubscriptionsController@index'));
+                DB::commit();    
+                flash()->success('Subscription was successfully created');                         
+                return redirect (action('SubscriptionsController@index'));
             } 
 
             catch (\Exception $e) 
@@ -322,20 +322,20 @@ 
 
     public function edit($id)
     {    
-      $subscription = Subscription::findOrFail($id);
-      // $carbonToday = Carbon::today()->format('Y-m-d');
-      // $subscriptionEndDate = $subscription->end_date->format('Y-m-d');
-      $diff = Carbon::today()->diffInDays($subscription->end_date);
-      //$gymieDiff = $diff->format('Y-m-d');
-      $gymieDiff = $subscription->end_date->addDays($diff);
+        $subscription = Subscription::findOrFail($id);
+        // $carbonToday = Carbon::today()->format('Y-m-d');
+        // $subscriptionEndDate = $subscription->end_date->format('Y-m-d');
+        $diff = Carbon::today()->diffInDays($subscription->end_date);
+        //$gymieDiff = $diff->format('Y-m-d');
+        $gymieDiff = $subscription->end_date->addDays($diff);
     
-      JavaScript::put([
-          'gymieToday' => Carbon::today()->format('Y-m-d'),
-          'gymieEndDate' => $subscription->end_date->format('Y-m-d'),
-          'gymieDiff' => $gymieDiff->format('Y-m-d'),
-      ]);
+        JavaScript::put([
+            'gymieToday' => Carbon::today()->format('Y-m-d'),
+            'gymieEndDate' => $subscription->end_date->format('Y-m-d'),
+            'gymieDiff' => $gymieDiff->format('Y-m-d'),
+        ]);
 
-      return view('subscriptions.edit', compact('subscription'));
+        return view('subscriptions.edit', compact('subscription'));
     }
 
     public function update($id, Request $request)
@@ -358,14 +358,14 @@ 
 
         //Generating Invoice number
         if ($invoice_number_mode == \constNumberingMode::Auto) {
-              $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1;
-              $invoicePrefix = \Utilities::getSetting('invoice_prefix');
-              $invoice_number = $invoicePrefix.$invoiceCounter;
+                $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1;
+                $invoicePrefix = \Utilities::getSetting('invoice_prefix');
+                $invoice_number = $invoicePrefix.$invoiceCounter;
         }
 
         else {
-              $invoice_number = '';
-              $invoiceCounter = '';
+                $invoice_number = '';
+                $invoiceCounter = '';
         }
 
         $subscriptions = Subscription::where('invoice_id',$id)->get();
@@ -384,9 +384,9 @@ 
 
     public function cancelSubscription($id)
     {
-      DB::beginTransaction();
-      try 
-      {
+        DB::beginTransaction();
+        try 
+        {
         $subscription = Subscription::findOrFail($id);
 
         $subscription->update(['status' => \constSubscription::cancelled]);
@@ -396,22 +396,22 @@ 
         DB::commit();
         flash()->success('Subscription was successfully cancelled');
         return redirect('subscriptions/expired');
-      } 
-      catch (Exception $e) 
-      {
+        } 
+        catch (Exception $e) 
+        {
         DB::rollback();
         flash()->error('Error while cancelling the Subscription');
         return redirect('subscriptions/expired');
-      }
+        }
       
     }
 
     public function delete($id)
     {
-      DB::beginTransaction();
+        DB::beginTransaction();
 
-      try
-      {
+        try
+        {
         $subscription = Subscription::findOrFail($id);
         $invoice = Invoice::where('id',$subscription->invoice_id)->first();
         $invoice_details = Invoice_detail::where('invoice_id',$invoice->id)->get();
@@ -419,13 +419,13 @@ 
 
         foreach($invoice_details as $invoice_detail)
         {
-          $invoice_detail->delete();
+            $invoice_detail->delete();
         }
 
         foreach($payment_details as $payment_detail)
         {
-          Cheque_detail::where('payment_id',$payment_detail->id)->delete();
-          $payment_detail->delete();
+            Cheque_detail::where('payment_id',$payment_detail->id)->delete();
+            $payment_detail->delete();
         }
 
         $subscription->delete();
@@ -433,39 +433,39 @@ 
         
         DB::commit();
         return back();
-      }
+        }
 
-      catch(\Exception $e)
-      {
+        catch(\Exception $e)
+        {
         DB::rollback();
         return back();
-      }
+        }
 
     }
 
     public function change($id)
     {
-      $subscription = Subscription::findOrFail($id);
+        $subscription = Subscription::findOrFail($id);
 
-      $already_paid = Payment_detail::leftJoin('trn_cheque_details','trn_payment_details.id','=','trn_cheque_details.payment_id')
-                                     ->whereRaw("trn_payment_details.invoice_id = $subscription->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
-                                     ->sum('trn_payment_details.payment_amount');
+        $already_paid = Payment_detail::leftJoin('trn_cheque_details','trn_payment_details.id','=','trn_cheque_details.payment_id')
+                                        ->whereRaw("trn_payment_details.invoice_id = $subscription->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
+                                        ->sum('trn_payment_details.payment_amount');
 
-      JavaScript::put([
-          'taxes' => \Utilities::getSetting('taxes'),
-          'gymieToday' => Carbon::today()->format('Y-m-d'),
-          'servicesCount' => Service::count(),
-      ]);
+        JavaScript::put([
+            'taxes' => \Utilities::getSetting('taxes'),
+            'gymieToday' => Carbon::today()->format('Y-m-d'),
+            'servicesCount' => Service::count(),
+        ]);
 
-      return view('subscriptions.change',compact('subscription','already_paid'));
+        return view('subscriptions.change',compact('subscription','already_paid'));
     }
 
     public function modify($id, Request $request)
     {
-      $subscription = Subscription::findOrFail($id);
+        $subscription = Subscription::findOrFail($id);
 
-      try
-      {
+        try
+        {
         DB::beginTransaction();
         //Helper function to set Payment status
         $invoice_total = $request->admission_amount + $request->subscription_amount + $request->taxes_amount - $request->discount_amount;
@@ -475,62 +475,62 @@ 
 
         if($request->mode == 1)
         {
-          if ($total_paid == $invoice_total) 
-          {
+            if ($total_paid == $invoice_total) 
+            {
             $paymentStatus = \constPaymentStatus::Paid;
-          } 
-          elseif($total_paid > 0 && $total_paid < $invoice_total) 
-          {
+            } 
+            elseif($total_paid > 0 && $total_paid < $invoice_total) 
+            {
             $paymentStatus = \constPaymentStatus::Partial;
-          }
-          elseif($total_paid == 0)
-          {
+            }
+            elseif($total_paid == 0)
+            {
             $paymentStatus = \constPaymentStatus::Unpaid;
-          }
-          else 
-          {
+            }
+            else 
+            {
             $paymentStatus = \constPaymentStatus::Overpaid;
-          }
+            }
         }
 
         Invoice::where('id',$subscription->invoice_id)->update(['invoice_number'=> $request->invoice_number,                                                               
-                                                               'total'=> $invoice_total,
-                                                               'status'=> $paymentStatus,
-                                                               'pending_amount'=> $pending,
-                                                               'discount_amount'=> $request->discount_amount,
-                                                               'discount_percent'=> $request->discount_percent,
-                                                               'discount_note'=> $request->discount_note,
-                                                               'tax'=> $request->taxes_amount,
-                                                               'additional_fees'=> $request->additional_fees,
-                                                               'note'=>' ']);
+                                                                'total'=> $invoice_total,
+                                                                'status'=> $paymentStatus,
+                                                                'pending_amount'=> $pending,
+                                                                'discount_amount'=> $request->discount_amount,
+                                                                'discount_percent'=> $request->discount_percent,
+                                                                'discount_note'=> $request->discount_note,
+                                                                'tax'=> $request->taxes_amount,
+                                                                'additional_fees'=> $request->additional_fees,
+                                                                'note'=>' ']);
 
                 foreach($request->plan as $plan)
                 {
-                  $subscription->update(['plan_id'=> $plan['id'],
+                    $subscription->update(['plan_id'=> $plan['id'],
                                         'start_date'=> $plan['start_date'],
                                         'end_date'=> $plan['end_date'],
                                         'status'=> \constSubscription::onGoing,
                                         'is_renewal'=>'0']);
 
-                  //Adding subscription to invoice(Invoice Details)
+                    //Adding subscription to invoice(Invoice Details)
 
-                  Invoice_detail::where('invoice_id',$subscription->invoice_id)->update(['plan_id'=> $plan['id'],
-                                                                                         'item_amount'=> $plan['price']]);          
+                    Invoice_detail::where('invoice_id',$subscription->invoice_id)->update(['plan_id'=> $plan['id'],
+                                                                                            'item_amount'=> $plan['price']]);          
                 }
 
-              //Payment Details 
-              $paymentData = array('invoice_id'=> $subscription->invoice_id,
-                                   'payment_amount'=> $request->payment_amount,
-                                   'mode'=> $request->mode,
-                                   'note'=> ' ');
+                //Payment Details 
+                $paymentData = array('invoice_id'=> $subscription->invoice_id,
+                                    'payment_amount'=> $request->payment_amount,
+                                    'mode'=> $request->mode,
+                                    'note'=> ' ');
 
-              $payment_details = new Payment_detail($paymentData);
-              $payment_details->createdBy()->associate(Auth::user());
-              $payment_details->updatedBy()->associate(Auth::user());
-              $payment_details->save();
+                $payment_details = new Payment_detail($paymentData);
+                $payment_details->createdBy()->associate(Auth::user());
+                $payment_details->updatedBy()->associate(Auth::user());
+                $payment_details->save();
 
-              if($request->mode == 0)
-              {
+                if($request->mode == 0)
+                {
                 // Store Cheque Details
                 $chequeData = array('payment_id'=> $payment_details->id,
                                     'number'=> $request->number,
@@ -541,19 +541,19 @@ 
                 $cheque_details->createdBy()->associate(Auth::user());
                 $cheque_details->updatedBy()->associate(Auth::user());
                 $cheque_details->save();
-              }
+                }
 
         DB::commit();
         flash()->success('Subscription was successfully changed');
         return redirect (action('MembersController@show', ['id' => $subscription->member_id]));
-      }
+        }
 
-      catch(\Exception $e)
-      {
+        catch(\Exception $e)
+        {
         DB::rollback();
         flash()->error('Error while changing the Subscription');
         return back();
-      }
+        }
 
     }
 

Spacing +69 added lines, -69 removed lines

@@ -30,8 +30,8 @@ 
     public function index(Request $request)
     {
 
-      $subscriptions = Subscription::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end,$request->plan_name)->search('"'.$request->input('search').'"')->paginate(10);
-      $subscriptionTotal = Subscription::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end,$request->plan_name)->search('"'.$request->input('search').'"')->get();
+      $subscriptions = Subscription::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end, $request->plan_name)->search('"'.$request->input('search').'"')->paginate(10);
+      $subscriptionTotal = Subscription::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end, $request->plan_name)->search('"'.$request->input('search').'"')->get();
       $count = $subscriptionTotal->count();
      
  
@@ -41,19 +41,19 @@ 
       }
       else
       {
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
       }
 
       $request->flash();
       
-      return view('subscriptions.index', compact('subscriptions','count','drp_placeholder'));
+      return view('subscriptions.index', compact('subscriptions', 'count', 'drp_placeholder'));
       
     }
 
     public function expiring(Request $request)
     {
-        $expirings =  Subscription::expiring($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-        $expiringTotal =  Subscription::expiring($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+        $expirings = Subscription::expiring($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+        $expiringTotal = Subscription::expiring($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
         $count = $expiringTotal->count();
 
         if (!$request->has('drp_start') or !$request->has('drp_end')) 
@@ -62,18 +62,18 @@ 
         }
         else
         {
-          $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+          $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
         }
 
         $request->flash();
 
-        return view('subscriptions.expiring',compact('expirings','count','drp_placeholder'));
+        return view('subscriptions.expiring', compact('expirings', 'count', 'drp_placeholder'));
     }
 
     public function expired(Request $request)
     {
-        $allExpired = Subscription::expired($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-        $allExpiredTotal = Subscription::expired($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+        $allExpired = Subscription::expired($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+        $allExpiredTotal = Subscription::expired($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
         $count = $allExpiredTotal->count();
 
         if (!$request->has('drp_start') or !$request->has('drp_end')) 
@@ -82,12 +82,12 @@ 
         }
         else
         {
-          $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+          $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
         }
 
         $request->flash();
 
-        return view('subscriptions.expired',compact('allExpired','count','drp_placeholder'));
+        return view('subscriptions.expired', compact('allExpired', 'count', 'drp_placeholder'));
     }
 
     public function create()
@@ -103,7 +103,7 @@ 
       $invoice_number_mode = \Utilities::getSetting('invoice_number_mode');
 
       //Generating Invoice number
-      if ($invoice_number_mode == \constNumberingMode::Auto ) {
+      if ($invoice_number_mode == \constNumberingMode::Auto) {
             $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1;
             $invoicePrefix = \Utilities::getSetting('invoice_prefix');
             $invoice_number = $invoicePrefix.$invoiceCounter;
@@ -114,7 +114,7 @@ 
             $invoiceCounter = '';
       }
 
-    	return view('subscriptions.create',compact('invoice_number','invoiceCounter','invoice_number_mode'));
+    	return view('subscriptions.create', compact('invoice_number', 'invoiceCounter', 'invoice_number_mode'));
     }
 
     public function store(Request $request)
@@ -128,17 +128,17 @@ 
               $paymentStatus = \constPaymentStatus::Unpaid;
               $pending = $invoice_total - $request->payment_amount;
 
-              if($request->mode == 1)
+              if ($request->mode == 1)
               {
                 if ($request->payment_amount == $invoice_total) 
                 {
                   $paymentStatus = \constPaymentStatus::Paid;
                 } 
-                elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) 
+                elseif ($request->payment_amount > 0 && $request->payment_amount < $invoice_total) 
                 {
                   $paymentStatus = \constPaymentStatus::Partial;
                 }
-                elseif($request->payment_amount == 0)
+                elseif ($request->payment_amount == 0)
                 {
                   $paymentStatus = \constPaymentStatus::Unpaid;
                 }
@@ -167,7 +167,7 @@ 
                 $invoice->save();
 
                 // Storing subscription
-                foreach($request->plan as $plan)
+                foreach ($request->plan as $plan)
                 {
                   $subscriptionData = array('member_id'=> $request->member_id,
                                             'invoice_id'=> $invoice->id,
@@ -204,7 +204,7 @@ 
               $payment_details->updatedBy()->associate(Auth::user());
               $payment_details->save();
 
-              if($request->mode == 0)
+              if ($request->mode == 0)
               {
                 // Store Cheque Details
                 $chequeData = array('payment_id'=> $payment_details->id,
@@ -221,11 +221,11 @@ 
               // Set the subscription status of the 'Renewed' subscription to Renew
               if ($request->has('previousSubscriptions')) 
               {                    
-                Subscription::where('invoice_id',$invoice->id)->update(['is_renewal' => '1']);
+                Subscription::where('invoice_id', $invoice->id)->update(['is_renewal' => '1']);
 
-                foreach($request->previousSubscriptions as $subscriptionId)
+                foreach ($request->previousSubscriptions as $subscriptionId)
                 {
-                  $oldSubscription=Subscription::findOrFail($subscriptionId);
+                  $oldSubscription = Subscription::findOrFail($subscriptionId);
                   $oldSubscription->status = \constSubscription::renewed;
                   $oldSubscription->updatedBy()->associate(Auth::user());
                   $oldSubscription->save();
@@ -233,88 +233,88 @@ 
               }
 
               //Updating Numbering Counters
-              Setting::where('key', '=','invoice_last_number')->update(['value' => $request->invoiceCounter]);
+              Setting::where('key', '=', 'invoice_last_number')->update(['value' => $request->invoiceCounter]);
               $sender_id = \Utilities::getSetting('sms_sender_id');
               $gym_name = \Utilities::getSetting('gym_name');
 
               //SMS Trigger
               if ($invoice->status == \constPaymentStatus::Paid) 
               {
-                if($request->mode == 0)
+                if ($request->mode == 0)
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
+                  $sms_trigger = Sms_trigger::where('alias', '=', 'payment_with_cheque')->first();
                   $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
+                  $sms_text = sprintf($message, $subscription->member->name, $payment_details->payment_amount, $cheque_details->number, $invoice->invoice_number, $gym_name);
                   $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                  \Utilities::Sms($sender_id, $subscription->member->contact, $sms_text, $sms_status);
                 }
                 else
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_paid_invoice')->first();
+                  $sms_trigger = Sms_trigger::where('alias', '=', 'subscription_renewal_with_paid_invoice')->first();
                   $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$invoice->invoice_number);
+                  $sms_text = sprintf($message, $subscription->member->name, $payment_details->payment_amount, $invoice->invoice_number);
                   $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                  \Utilities::Sms($sender_id, $subscription->member->contact, $sms_text, $sms_status);
                 }
                 
               } 
-              elseif($invoice->status == \constPaymentStatus::Partial)
+              elseif ($invoice->status == \constPaymentStatus::Partial)
               {
-                if($request->mode == 0)
+                if ($request->mode == 0)
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
+                  $sms_trigger = Sms_trigger::where('alias', '=', 'payment_with_cheque')->first();
                   $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
+                  $sms_text = sprintf($message, $subscription->member->name, $payment_details->payment_amount, $cheque_details->number, $invoice->invoice_number, $gym_name);
                   $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                  \Utilities::Sms($sender_id, $subscription->member->contact, $sms_text, $sms_status);
                 }
                 else
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_partial_invoice')->first();
+                  $sms_trigger = Sms_trigger::where('alias', '=', 'subscription_renewal_with_partial_invoice')->first();
                   $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$invoice->invoice_number,$invoice->pending_amount);
+                  $sms_text = sprintf($message, $subscription->member->name, $payment_details->payment_amount, $invoice->invoice_number, $invoice->pending_amount);
                   $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                  \Utilities::Sms($sender_id, $subscription->member->contact, $sms_text, $sms_status);
                 }
                 
               }
-              elseif($invoice->status == \constPaymentStatus::Unpaid)
+              elseif ($invoice->status == \constPaymentStatus::Unpaid)
               {
-                if($request->mode == 0)
+                if ($request->mode == 0)
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
+                  $sms_trigger = Sms_trigger::where('alias', '=', 'payment_with_cheque')->first();
                   $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
+                  $sms_text = sprintf($message, $subscription->member->name, $payment_details->payment_amount, $cheque_details->number, $invoice->invoice_number, $gym_name);
                   $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                  \Utilities::Sms($sender_id, $subscription->member->contact, $sms_text, $sms_status);
                 }
                 else
                 {
-                  $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_unpaid_invoice')->first();
+                  $sms_trigger = Sms_trigger::where('alias', '=', 'subscription_renewal_with_unpaid_invoice')->first();
                   $message = $sms_trigger->message;
-                  $sms_text = sprintf($message,$subscription->member->name,$invoice->total,$invoice->invoice_number);
+                  $sms_text = sprintf($message, $subscription->member->name, $invoice->total, $invoice->invoice_number);
                   $sms_status = $sms_trigger->status;
 
-                  \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
+                  \Utilities::Sms($sender_id, $subscription->member->contact, $sms_text, $sms_status);
                 }
                 
               }
 
               DB::commit();    
               flash()->success('Subscription was successfully created');                         
-              return redirect (action('SubscriptionsController@index'));
+              return redirect(action('SubscriptionsController@index'));
             } 
 
             catch (\Exception $e) 
             {
                 DB::rollback();
                 flash()->error('Error while creating the Subscription');
-                return redirect (action('SubscriptionsController@index'));
+                return redirect(action('SubscriptionsController@index'));
             }
 
 }  //End of store method
@@ -340,7 +340,7 @@ 
 
     public function update($id, Request $request)
     {
-        $subscription=Subscription::findOrFail($id);
+        $subscription = Subscription::findOrFail($id);
 
         $subscription->update($request->all());
         $subscription->updatedBy()->associate(Auth::user());
@@ -368,7 +368,7 @@ 
               $invoiceCounter = '';
         }
 
-        $subscriptions = Subscription::where('invoice_id',$id)->get();
+        $subscriptions = Subscription::where('invoice_id', $id)->get();
         $member_id = $subscriptions->pluck('member_id')->first();
 
         // Javascript Variables
@@ -379,7 +379,7 @@ 
             'currentServices' => $subscriptions->count(),
         ]);
 
-        return view('subscriptions.renew',compact('subscriptions','member_id','invoice_number','invoiceCounter','invoice_number_mode'));
+        return view('subscriptions.renew', compact('subscriptions', 'member_id', 'invoice_number', 'invoiceCounter', 'invoice_number_mode'));
     }
 
     public function cancelSubscription($id)
@@ -413,18 +413,18 @@ 
       try
       {
         $subscription = Subscription::findOrFail($id);
-        $invoice = Invoice::where('id',$subscription->invoice_id)->first();
-        $invoice_details = Invoice_detail::where('invoice_id',$invoice->id)->get();
-        $payment_details = Payment_detail::where('invoice_id',$invoice->id)->get();
+        $invoice = Invoice::where('id', $subscription->invoice_id)->first();
+        $invoice_details = Invoice_detail::where('invoice_id', $invoice->id)->get();
+        $payment_details = Payment_detail::where('invoice_id', $invoice->id)->get();
 
-        foreach($invoice_details as $invoice_detail)
+        foreach ($invoice_details as $invoice_detail)
         {
           $invoice_detail->delete();
         }
 
-        foreach($payment_details as $payment_detail)
+        foreach ($payment_details as $payment_detail)
         {
-          Cheque_detail::where('payment_id',$payment_detail->id)->delete();
+          Cheque_detail::where('payment_id', $payment_detail->id)->delete();
           $payment_detail->delete();
         }
 
@@ -435,7 +435,7 @@ 
         return back();
       }
 
-      catch(\Exception $e)
+      catch (\Exception $e)
       {
         DB::rollback();
         return back();
@@ -447,7 +447,7 @@ 
     {
       $subscription = Subscription::findOrFail($id);
 
-      $already_paid = Payment_detail::leftJoin('trn_cheque_details','trn_payment_details.id','=','trn_cheque_details.payment_id')
+      $already_paid = Payment_detail::leftJoin('trn_cheque_details', 'trn_payment_details.id', '=', 'trn_cheque_details.payment_id')
                                      ->whereRaw("trn_payment_details.invoice_id = $subscription->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
                                      ->sum('trn_payment_details.payment_amount');
 
@@ -457,7 +457,7 @@ 
           'servicesCount' => Service::count(),
       ]);
 
-      return view('subscriptions.change',compact('subscription','already_paid'));
+      return view('subscriptions.change', compact('subscription', 'already_paid'));
     }
 
     public function modify($id, Request $request)
@@ -473,17 +473,17 @@ 
         $total_paid = $request->payment_amount + $request->previous_payment;
         $pending = $invoice_total - $total_paid;
 
-        if($request->mode == 1)
+        if ($request->mode == 1)
         {
           if ($total_paid == $invoice_total) 
           {
             $paymentStatus = \constPaymentStatus::Paid;
           } 
-          elseif($total_paid > 0 && $total_paid < $invoice_total) 
+          elseif ($total_paid > 0 && $total_paid < $invoice_total) 
           {
             $paymentStatus = \constPaymentStatus::Partial;
           }
-          elseif($total_paid == 0)
+          elseif ($total_paid == 0)
           {
             $paymentStatus = \constPaymentStatus::Unpaid;
           }
@@ -493,7 +493,7 @@ 
           }
         }
 
-        Invoice::where('id',$subscription->invoice_id)->update(['invoice_number'=> $request->invoice_number,                                                               
+        Invoice::where('id', $subscription->invoice_id)->update(['invoice_number'=> $request->invoice_number,                                                               
                                                                'total'=> $invoice_total,
                                                                'status'=> $paymentStatus,
                                                                'pending_amount'=> $pending,
@@ -504,7 +504,7 @@ 
                                                                'additional_fees'=> $request->additional_fees,
                                                                'note'=>' ']);
 
-                foreach($request->plan as $plan)
+                foreach ($request->plan as $plan)
                 {
                   $subscription->update(['plan_id'=> $plan['id'],
                                         'start_date'=> $plan['start_date'],
@@ -514,7 +514,7 @@ 
 
                   //Adding subscription to invoice(Invoice Details)
 
-                  Invoice_detail::where('invoice_id',$subscription->invoice_id)->update(['plan_id'=> $plan['id'],
+                  Invoice_detail::where('invoice_id', $subscription->invoice_id)->update(['plan_id'=> $plan['id'],
                                                                                          'item_amount'=> $plan['price']]);          
                 }
 
@@ -529,7 +529,7 @@ 
               $payment_details->updatedBy()->associate(Auth::user());
               $payment_details->save();
 
-              if($request->mode == 0)
+              if ($request->mode == 0)
               {
                 // Store Cheque Details
                 $chequeData = array('payment_id'=> $payment_details->id,
@@ -545,10 +545,10 @@ 
 
         DB::commit();
         flash()->success('Subscription was successfully changed');
-        return redirect (action('MembersController@show', ['id' => $subscription->member_id]));
+        return redirect(action('MembersController@show', ['id' => $subscription->member_id]));
       }
 
-      catch(\Exception $e)
+      catch (\Exception $e)
       {
         DB::rollback();
         flash()->error('Error while changing the Subscription');

Braces +20 added lines, -45 removed lines

@@ -38,8 +38,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;
       }
@@ -59,8 +58,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;
         }
@@ -79,8 +77,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;
         }
@@ -107,9 +104,7 @@ 
             $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1;
             $invoicePrefix = \Utilities::getSetting('invoice_prefix');
             $invoice_number = $invoicePrefix.$invoiceCounter;
-      }
-
-      else {
+      } else {
             $invoice_number = '';
             $invoiceCounter = '';
       }
@@ -133,16 +128,13 @@ 
                 if ($request->payment_amount == $invoice_total) 
                 {
                   $paymentStatus = \constPaymentStatus::Paid;
-                } 
-                elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) 
+                } elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) 
                 {
                   $paymentStatus = \constPaymentStatus::Partial;
-                }
-                elseif($request->payment_amount == 0)
+                } elseif($request->payment_amount == 0)
                 {
                   $paymentStatus = \constPaymentStatus::Unpaid;
-                }
-                else 
+                } else 
                 {
                   $paymentStatus = \constPaymentStatus::Overpaid;
                 }
@@ -248,8 +240,7 @@ 
                   $sms_status = $sms_trigger->status;
 
                   \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
-                }
-                else
+                } else
                 {
                   $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_paid_invoice')->first();
                   $message = $sms_trigger->message;
@@ -259,8 +250,7 @@ 
                   \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
                 }
                 
-              } 
-              elseif($invoice->status == \constPaymentStatus::Partial)
+              } elseif($invoice->status == \constPaymentStatus::Partial)
               {
                 if($request->mode == 0)
                 {
@@ -270,8 +260,7 @@ 
                   $sms_status = $sms_trigger->status;
 
                   \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
-                }
-                else
+                } else
                 {
                   $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_partial_invoice')->first();
                   $message = $sms_trigger->message;
@@ -281,8 +270,7 @@ 
                   \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
                 }
                 
-              }
-              elseif($invoice->status == \constPaymentStatus::Unpaid)
+              } elseif($invoice->status == \constPaymentStatus::Unpaid)
               {
                 if($request->mode == 0)
                 {
@@ -292,8 +280,7 @@ 
                   $sms_status = $sms_trigger->status;
 
                   \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status);
-                }
-                else
+                } else
                 {
                   $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_unpaid_invoice')->first();
                   $message = $sms_trigger->message;
@@ -308,9 +295,7 @@ 
               DB::commit();    
               flash()->success('Subscription was successfully created');                         
               return redirect (action('SubscriptionsController@index'));
-            } 
-
-            catch (\Exception $e) 
+            } catch (\Exception $e) 
             {
                 DB::rollback();
                 flash()->error('Error while creating the Subscription');
@@ -361,9 +346,7 @@ 
               $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1;
               $invoicePrefix = \Utilities::getSetting('invoice_prefix');
               $invoice_number = $invoicePrefix.$invoiceCounter;
-        }
-
-        else {
+        } else {
               $invoice_number = '';
               $invoiceCounter = '';
         }
@@ -396,8 +379,7 @@ 
         DB::commit();
         flash()->success('Subscription was successfully cancelled');
         return redirect('subscriptions/expired');
-      } 
-      catch (Exception $e) 
+      } catch (Exception $e) 
       {
         DB::rollback();
         flash()->error('Error while cancelling the Subscription');
@@ -433,9 +415,7 @@ 
         
         DB::commit();
         return back();
-      }
-
-      catch(\Exception $e)
+      } catch(\Exception $e)
       {
         DB::rollback();
         return back();
@@ -478,16 +458,13 @@ 
           if ($total_paid == $invoice_total) 
           {
             $paymentStatus = \constPaymentStatus::Paid;
-          } 
-          elseif($total_paid > 0 && $total_paid < $invoice_total) 
+          } elseif($total_paid > 0 && $total_paid < $invoice_total) 
           {
             $paymentStatus = \constPaymentStatus::Partial;
-          }
-          elseif($total_paid == 0)
+          } elseif($total_paid == 0)
           {
             $paymentStatus = \constPaymentStatus::Unpaid;
-          }
-          else 
+          } else 
           {
             $paymentStatus = \constPaymentStatus::Overpaid;
           }
@@ -546,9 +523,7 @@ 
         DB::commit();
         flash()->success('Subscription was successfully changed');
         return redirect (action('MembersController@show', ['id' => $subscription->member_id]));
-      }
-
-      catch(\Exception $e)
+      } catch(\Exception $e)
       {
         DB::rollback();
         flash()->error('Error while changing the Subscription');

app/Http/Controllers/InvoicesController.php

Indentation +90 added lines, -90 removed lines

@@ -30,138 +30,138 @@ 
     public function index(Request $request)
     {
 
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
-      $count = $invoicesTotal->count();
+        $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+        $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+        $count = $invoicesTotal->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('invoices.index', compact('invoices','count','drp_placeholder'));
+        return view('invoices.index', compact('invoices','count','drp_placeholder'));
 
     }
 
     public function unpaid(Request $request)
     {
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',0)->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',0)->get();
-      $count = $invoicesTotal->count();
+        $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',0)->paginate(10);
+        $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',0)->get();
+        $count = $invoicesTotal->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('invoices.unpaid', compact('invoices','count','drp_placeholder'));
+        return view('invoices.unpaid', compact('invoices','count','drp_placeholder'));
     }
 
     public function paid(Request $request)
     {
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',1)->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',1)->get();
-      $count = $invoicesTotal->count();
+        $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',1)->paginate(10);
+        $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',1)->get();
+        $count = $invoicesTotal->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('invoices.paid', compact('invoices','count','drp_placeholder'));
+        return view('invoices.paid', compact('invoices','count','drp_placeholder'));
     }
 
     public function partial(Request $request)
     {
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',2)->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',2)->get();
-      $count = $invoicesTotal->count();
+        $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',2)->paginate(10);
+        $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',2)->get();
+        $count = $invoicesTotal->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('invoices.partial', compact('invoices','count','drp_placeholder'));
+        return view('invoices.partial', compact('invoices','count','drp_placeholder'));
     }
 
     public function overpaid(Request $request)
     {
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',3)->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',3)->get();
-      $count = $invoicesTotal->count();
+        $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',3)->paginate(10);
+        $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',3)->get();
+        $count = $invoicesTotal->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('invoices.overpaid', compact('invoices','count','drp_placeholder'));
+        return view('invoices.overpaid', compact('invoices','count','drp_placeholder'));
     }
 
     public function show($id)
     {
-      $invoice = Invoice::findOrFail($id);
-      $settings = \Utilities::getSettings();
+        $invoice = Invoice::findOrFail($id);
+        $settings = \Utilities::getSettings();
       
-      return view('invoices.show', compact('invoice','settings'));
+        return view('invoices.show', compact('invoice','settings'));
     }
 
     public function createPayment($id, Request $request)
     {
-       $invoice = Invoice::findOrFail($id);
+        $invoice = Invoice::findOrFail($id);
 
-       return view('payments.create', compact('invoice'));
+        return view('payments.create', compact('invoice'));
     }
 
     public function delete($id)
     {
-      DB::beginTransaction();
+        DB::beginTransaction();
 
-      try
-      {
+        try
+        {
         Invoice_detail::where('invoice_id',$id)->delete();
         $payment_details = Payment_detail::where('invoice_id',$id)->get();
 
         foreach($payment_details as $payment_detail)
         {
-          Cheque_detail::where('payment_id',$payment_detail->id)->delete();
-          $payment_detail->delete();
+            Cheque_detail::where('payment_id',$payment_detail->id)->delete();
+            $payment_detail->delete();
         }
 
         Subscription::where('invoice_id',$id)->delete();
@@ -169,64 +169,64 @@ 
 
         DB::commit();
         return back();
-      }
-      catch(\Exception $e)
-      {
+        }
+        catch(\Exception $e)
+        {
         DB::rollback();
         return back();
-      }
+        }
       
     }
 
     public function discount($id)
     {
-      $invoice = Invoice::findOrFail($id);
+        $invoice = Invoice::findOrFail($id);
 
-      JavaScript::put([
+        JavaScript::put([
             'taxes' => \Utilities::getSetting('taxes'),
             'gymieToday' => Carbon::today()->format('Y-m-d'),
             'servicesCount' => Service::count(),
         ]);
 
-      return view('invoices.discount',compact('invoice'));
+        return view('invoices.discount',compact('invoice'));
     }
 
     public function applyDiscount($id, Request $request)
     {
-      DB::beginTransaction();
+        DB::beginTransaction();
 
-      try
-      {          
+        try
+        {          
         $invoice_total = $request->admission_amount + $request->subscription_amount + $request->taxes_amount - $request->discount_amount;
         $already_paid = Payment_detail::leftJoin('trn_cheque_details','trn_payment_details.id','=','trn_cheque_details.payment_id')
-                                       ->whereRaw("trn_payment_details.invoice_id = $id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
-                                       ->sum('trn_payment_details.payment_amount');
+                                        ->whereRaw("trn_payment_details.invoice_id = $id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
+                                        ->sum('trn_payment_details.payment_amount');
 
         $pending = $invoice_total - $already_paid;
 
         $status = \Utilities::setInvoiceStatus($pending,$invoice_total);
 
         Invoice::where('id',$id)->update(['invoice_number'=> $request->invoice_number,
-                                         'total'=> $invoice_total,
-                                         'status'=> $status,
-                                         'pending_amount'=> $pending,
-                                         'discount_amount'=> $request->discount_amount,
-                                         'discount_percent'=> $request->discount_percent,
-                                         'discount_note'=> $request->discount_note,
-                                         'tax'=> $request->taxes_amount,
-                                         'additional_fees'=> $request->additional_fees,
-                                         'note'=>' ']);
+                                            'total'=> $invoice_total,
+                                            'status'=> $status,
+                                            'pending_amount'=> $pending,
+                                            'discount_amount'=> $request->discount_amount,
+                                            'discount_percent'=> $request->discount_percent,
+                                            'discount_note'=> $request->discount_note,
+                                            'tax'=> $request->taxes_amount,
+                                            'additional_fees'=> $request->additional_fees,
+                                            'note'=>' ']);
 
         DB::commit();
         flash()->success('Discount was successfully updated');
         return redirect(action('InvoicesController@show', ['id' => $id]));
-      }
-      catch(\Exception $e)
-      {
+        }
+        catch(\Exception $e)
+        {
         DB::rollback();
         flash()->error('Error while updating discount. Please try again');
         return back();
-      }
+        }
       
     }
 

Spacing +32 added lines, -32 removed lines

@@ -30,8 +30,8 @@ 
     public function index(Request $request)
     {
 
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+      $invoices = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+      $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
       $count = $invoicesTotal->count();
      
  
@@ -41,19 +41,19 @@ 
       }
       else
       {
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
       }
 
       $request->flash();
       
-      return view('invoices.index', compact('invoices','count','drp_placeholder'));
+      return view('invoices.index', compact('invoices', 'count', 'drp_placeholder'));
 
     }
 
     public function unpaid(Request $request)
     {
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',0)->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',0)->get();
+      $invoices = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 0)->paginate(10);
+      $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 0)->get();
       $count = $invoicesTotal->count();
      
  
@@ -63,18 +63,18 @@ 
       }
       else
       {
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
       }
 
       $request->flash();
       
-      return view('invoices.unpaid', compact('invoices','count','drp_placeholder'));
+      return view('invoices.unpaid', compact('invoices', 'count', 'drp_placeholder'));
     }
 
     public function paid(Request $request)
     {
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',1)->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',1)->get();
+      $invoices = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 1)->paginate(10);
+      $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 1)->get();
       $count = $invoicesTotal->count();
      
  
@@ -84,18 +84,18 @@ 
       }
       else
       {
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
       }
       
       $request->flash();
 
-      return view('invoices.paid', compact('invoices','count','drp_placeholder'));
+      return view('invoices.paid', compact('invoices', 'count', 'drp_placeholder'));
     }
 
     public function partial(Request $request)
     {
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',2)->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',2)->get();
+      $invoices = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 2)->paginate(10);
+      $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 2)->get();
       $count = $invoicesTotal->count();
      
  
@@ -105,18 +105,18 @@ 
       }
       else
       {
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
       }
 
       $request->flash();
       
-      return view('invoices.partial', compact('invoices','count','drp_placeholder'));
+      return view('invoices.partial', compact('invoices', 'count', 'drp_placeholder'));
     }
 
     public function overpaid(Request $request)
     {
-      $invoices = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',3)->paginate(10);
-      $invoicesTotal = Invoice::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status',3)->get();
+      $invoices = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 3)->paginate(10);
+      $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 3)->get();
       $count = $invoicesTotal->count();
      
  
@@ -126,12 +126,12 @@ 
       }
       else
       {
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
       }
 
       $request->flash();
       
-      return view('invoices.overpaid', compact('invoices','count','drp_placeholder'));
+      return view('invoices.overpaid', compact('invoices', 'count', 'drp_placeholder'));
     }
 
     public function show($id)
@@ -139,7 +139,7 @@ 
       $invoice = Invoice::findOrFail($id);
       $settings = \Utilities::getSettings();
       
-      return view('invoices.show', compact('invoice','settings'));
+      return view('invoices.show', compact('invoice', 'settings'));
     }
 
     public function createPayment($id, Request $request)
@@ -155,22 +155,22 @@ 
 
       try
       {
-        Invoice_detail::where('invoice_id',$id)->delete();
-        $payment_details = Payment_detail::where('invoice_id',$id)->get();
+        Invoice_detail::where('invoice_id', $id)->delete();
+        $payment_details = Payment_detail::where('invoice_id', $id)->get();
 
-        foreach($payment_details as $payment_detail)
+        foreach ($payment_details as $payment_detail)
         {
-          Cheque_detail::where('payment_id',$payment_detail->id)->delete();
+          Cheque_detail::where('payment_id', $payment_detail->id)->delete();
           $payment_detail->delete();
         }
 
-        Subscription::where('invoice_id',$id)->delete();
+        Subscription::where('invoice_id', $id)->delete();
         Invoice::destroy($id);
 
         DB::commit();
         return back();
       }
-      catch(\Exception $e)
+      catch (\Exception $e)
       {
         DB::rollback();
         return back();
@@ -188,7 +188,7 @@ 
             'servicesCount' => Service::count(),
         ]);
 
-      return view('invoices.discount',compact('invoice'));
+      return view('invoices.discount', compact('invoice'));
     }
 
     public function applyDiscount($id, Request $request)
@@ -198,15 +198,15 @@ 
       try
       {          
         $invoice_total = $request->admission_amount + $request->subscription_amount + $request->taxes_amount - $request->discount_amount;
-        $already_paid = Payment_detail::leftJoin('trn_cheque_details','trn_payment_details.id','=','trn_cheque_details.payment_id')
+        $already_paid = Payment_detail::leftJoin('trn_cheque_details', 'trn_payment_details.id', '=', 'trn_cheque_details.payment_id')
                                        ->whereRaw("trn_payment_details.invoice_id = $id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
                                        ->sum('trn_payment_details.payment_amount');
 
         $pending = $invoice_total - $already_paid;
 
-        $status = \Utilities::setInvoiceStatus($pending,$invoice_total);
+        $status = \Utilities::setInvoiceStatus($pending, $invoice_total);
 
-        Invoice::where('id',$id)->update(['invoice_number'=> $request->invoice_number,
+        Invoice::where('id', $id)->update(['invoice_number'=> $request->invoice_number,
                                          'total'=> $invoice_total,
                                          'status'=> $status,
                                          'pending_amount'=> $pending,
@@ -221,7 +221,7 @@ 
         flash()->success('Discount was successfully updated');
         return redirect(action('InvoicesController@show', ['id' => $id]));
       }
-      catch(\Exception $e)
+      catch (\Exception $e)
       {
         DB::rollback();
         flash()->error('Error while updating discount. Please try again');

Braces +7 added lines, -14 removed lines

@@ -38,8 +38,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;
       }
@@ -60,8 +59,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;
       }
@@ -81,8 +79,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;
       }
@@ -102,8 +99,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;
       }
@@ -123,8 +119,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;
       }
@@ -169,8 +164,7 @@ 
 
         DB::commit();
         return back();
-      }
-      catch(\Exception $e)
+      } catch(\Exception $e)
       {
         DB::rollback();
         return back();
@@ -220,8 +214,7 @@ 
         DB::commit();
         flash()->success('Discount was successfully updated');
         return redirect(action('InvoicesController@show', ['id' => $id]));
-      }
-      catch(\Exception $e)
+      } catch(\Exception $e)
       {
         DB::rollback();
         flash()->error('Error while updating discount. Please try again');

app/Http/Controllers/SmsController.php

Indentation +5 added lines, -5 removed lines

@@ -24,9 +24,9 @@ 
 
     public function triggersIndex(Request $request)
     {
-    	$triggers = Sms_trigger::search($request->input('search'))->get();
+        $triggers = Sms_trigger::search($request->input('search'))->get();
 
-    	return view('sms.triggers.index',compact('triggers'));
+        return view('sms.triggers.index',compact('triggers'));
     }
 
     public function triggerUpdate(Request $request)
@@ -35,15 +35,15 @@ 
         $Clienttriggers = collect($request->triggers);
         //dd($request->triggers);
 
-    	foreach ($DBtriggers as $trigger) 
+        foreach ($DBtriggers as $trigger) 
         {
             $status = ($Clienttriggers->contains($trigger->id) ? 1 : 0);
             
             Sms_trigger::where('id','=',$trigger['id'])->update(['status' => $status]);
         }
 
-    	flash()->success('Message triggers were successfully updated');
-    	return redirect('sms/triggers');
+        flash()->success('Message triggers were successfully updated');
+        return redirect('sms/triggers');
     }
 
     public function eventsIndex(Request $request)

Spacing +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
     {
     	$triggers = Sms_trigger::search($request->input('search'))->get();
 
-    	return view('sms.triggers.index',compact('triggers'));
+    	return view('sms.triggers.index', compact('triggers'));
     }
 
     public function triggerUpdate(Request $request)
@@ -39,7 +39,7 @@ 
         {
             $status = ($Clienttriggers->contains($trigger->id) ? 1 : 0);
             
-            Sms_trigger::where('id','=',$trigger['id'])->update(['status' => $status]);
+            Sms_trigger::where('id', '=', $trigger['id'])->update(['status' => $status]);
         }
 
     	flash()->success('Message triggers were successfully updated');
@@ -50,7 +50,7 @@ 
     {
         $events = Sms_event::search($request->input('search'))->paginate(10);
 
-        return view('sms.events.index',compact('events'));
+        return view('sms.events.index', compact('events'));
     }
 
     public function createEvent()
@@ -109,54 +109,54 @@ 
         $sms_text = $request->message;
         $sender_id = $request->sender_id;
 
-        foreach($request->send as $sendnow)
+        foreach ($request->send as $sendnow)
         {
             switch ($sendnow) {
                 case 0:
-                        $recievers = Member::where('status',1)->get();
+                        $recievers = Member::where('status', 1)->get();
                         foreach ($recievers as $reciever) 
                         {
-                            \Utilities::Sms($sender_id,$reciever->contact,$sms_text,true);
+                            \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true);
                         }
                         break;
 
                     case 1:
-                        $recievers = Member::where('status',0)->get();
+                        $recievers = Member::where('status', 0)->get();
                         foreach ($recievers as $reciever) 
                         {
-                            \Utilities::Sms($sender_id,$reciever->contact,$sms_text,true);
+                            \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true);
                         }
                         break;
 
                     case 2:
-                        $recievers = Enquiry::where('status',1)->get();
+                        $recievers = Enquiry::where('status', 1)->get();
                         foreach ($recievers as $reciever) 
                         {
-                            \Utilities::Sms($sender_id,$reciever->contact,$sms_text,true);
+                            \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true);
                         }
                         
                         break;
 
                     case 3:
-                        $recievers = Enquiry::where('status',0)->get();
+                        $recievers = Enquiry::where('status', 0)->get();
                         foreach ($recievers as $reciever) 
                         {
-                            \Utilities::Sms($sender_id,$reciever->contact,$sms_text,true);
+                            \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true);
                         }
                         
                         break;
 
                 case 4:
-                    if($request->customcontacts != '')
+                    if ($request->customcontacts != '')
                     {
-                        $custom = explode(",",str_replace(" ","",($request->customcontacts)));
-                        foreach($custom as $number)
+                        $custom = explode(",", str_replace(" ", "", ($request->customcontacts)));
+                        foreach ($custom as $number)
                         {
-                            if (starts_with($number,'0')) 
+                            if (starts_with($number, '0')) 
                             {
                                 $number = substr($number, 1);
                             }
-                            \Utilities::Sms($sender_id,$number,$sms_text,true);
+                            \Utilities::Sms($sender_id, $number, $sms_text, true);
                         }
                     }
                 
@@ -172,9 +172,9 @@ 
 
     public function logIndex(Request $request)
     {
-        $smslogs = Sms_log::orderBy('send_time','desc')->search('"'.$request->input('search').'"')->paginate(10);
+        $smslogs = Sms_log::orderBy('send_time', 'desc')->search('"'.$request->input('search').'"')->paginate(10);
 
-        return view('sms.log',compact('smslogs'));
+        return view('sms.log', compact('smslogs'));
     }
 
     public function logRefresh()

app/Http/Controllers/ExpensesController.php

Indentation +31 added lines, -31 removed lines

@@ -17,29 +17,29 @@ 
     {
         $this->middleware('auth');
     }
-     /* Display a listing of the resource.
+        /* Display a listing of the resource.
      *
      * @return Response
      */
     public function index(Request $request)
     {
-      $expenses = Expense::indexQuery($request->category_id,$request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $expenseTotal = Expense::indexQuery($request->category_id,$request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
-      $count = $expenseTotal->sum('amount');
+        $expenses = Expense::indexQuery($request->category_id,$request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+        $expenseTotal = Expense::indexQuery($request->category_id,$request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+        $count = $expenseTotal->sum('amount');
      
  
-      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('expenses.index', compact('expenses','count','drp_placeholder'));
+        return view('expenses.index', compact('expenses','count','drp_placeholder'));
     }
 
     /**
@@ -50,34 +50,34 @@ 
      */
     public function show()
     {
-    	$expense = Expense::findOrFail($id);
+        $expense = Expense::findOrFail($id);
 
-    	return view('expenses.show', compact('expense'));
+        return view('expenses.show', compact('expense'));
     }
 
-     /**
-     * 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('expenses.create');
+        return view('expenses.create');
     }
     
-     /**
-     * Store a newly created resource in storage.
-     *
-     * @return Response
-     */
+        /**
+         * Store a newly created resource in storage.
+         *
+         * @return Response
+         */
     public function store(Request $request)
     {
         $expenseData = array('name' => $request->name,
-                             'category_id' => $request->category_id,
-                             'due_date' => $request->due_date,
-                             'repeat' => $request->repeat,
-                             'note' => $request->note,
-                             'amount' => $request->amount);
+                                'category_id' => $request->category_id,
+                                'due_date' => $request->due_date,
+                                'repeat' => $request->repeat,
+                                'note' => $request->note,
+                                'amount' => $request->amount);
 
         $expense  = new Expense($expenseData);
         $expense->createdBy()->associate(Auth::user());
@@ -97,7 +97,7 @@ 
 
         $expense->save();
         flash()->success('Expense was successfully added');
-    	return redirect('expenses/all'); 
+        return redirect('expenses/all'); 
     }
 
     public function edit($id)

Spacing +9 added lines, -9 removed lines

@@ -23,8 +23,8 @@ 
      */
     public function index(Request $request)
     {
-      $expenses = Expense::indexQuery($request->category_id,$request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
-      $expenseTotal = Expense::indexQuery($request->category_id,$request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
+      $expenses = Expense::indexQuery($request->category_id, $request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
+      $expenseTotal = Expense::indexQuery($request->category_id, $request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
       $count = $expenseTotal->sum('amount');
      
  
@@ -34,12 +34,12 @@ 
       }
       else
       {
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
       }
 
       $request->flash();
       
-      return view('expenses.index', compact('expenses','count','drp_placeholder'));
+      return view('expenses.index', compact('expenses', 'count', 'drp_placeholder'));
     }
 
     /**
@@ -79,7 +79,7 @@ 
                              'note' => $request->note,
                              'amount' => $request->amount);
 
-        $expense  = new Expense($expenseData);
+        $expense = new Expense($expenseData);
         $expense->createdBy()->associate(Auth::user());
         $expense->updatedBy()->associate(Auth::user());
         $expense->save();
@@ -102,14 +102,14 @@ 
 
     public function edit($id)
     {
-        $expense=Expense::findOrFail($id);
+        $expense = Expense::findOrFail($id);
 
         return view('expenses.edit', compact('expense'));
     }
 
     public function update($id, Request $request)
     {
-        $expense=Expense::findOrFail($id);
+        $expense = Expense::findOrFail($id);
 
         $expense->update($request->all());
 
@@ -117,7 +117,7 @@ 
         {
             $expense->paid = \constPaymentStatus::Paid;
         }
-        elseif($request->due_date != Carbon::today() && $expense->paid == \constPaymentStatus::Paid)
+        elseif ($request->due_date != Carbon::today() && $expense->paid == \constPaymentStatus::Paid)
         {
             $expense->paid = \constPaymentStatus::Paid;
         }
@@ -135,7 +135,7 @@ 
 
     public function paid($id, Request $request)
     {
-        Expense::where('id','=',$id)->update(['paid' => \constPaymentStatus::Paid]);
+        Expense::where('id', '=', $id)->update(['paid' => \constPaymentStatus::Paid]);
         
         flash()->success('Expense was successfully paid');
         return redirect('expenses/all');

Braces +4 added lines, -8 removed lines

@@ -31,8 +31,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;
       }
@@ -87,8 +86,7 @@ 
         if ($request->due_date <= Carbon::today()->format('Y-m-d')) 
         {
             $expense->paid = \constPaymentStatus::Paid;
-        }
-        else
+        } else
         {
             $expense->paid = \constPaymentStatus::Unpaid;
         }
@@ -116,12 +114,10 @@ 
         if ($request->due_date == Carbon::today()) 
         {
             $expense->paid = \constPaymentStatus::Paid;
-        }
-        elseif($request->due_date != Carbon::today() && $expense->paid == \constPaymentStatus::Paid)
+        } elseif($request->due_date != Carbon::today() && $expense->paid == \constPaymentStatus::Paid)
         {
             $expense->paid = \constPaymentStatus::Paid;
-        }
-        else
+        } else
         {
             $expense->paid = \constPaymentStatus::Unpaid;
         }

app/Http/Controllers/UsersController.php

Indentation +22 added lines, -22 removed lines

@@ -11,46 +11,46 @@
 
 class UsersController extends Controller
 {
-	/** 
+    /** 
      * Display a listing of the resource.
      *
      * @return Response
      */
     public function index()
     {
-    	$users = user::excludeArchive()->paginate(10);
+        $users = user::excludeArchive()->paginate(10);
 
-    	return view('users.index', compact('users'));
+        return view('users.index', compact('users'));
     }
 
-     /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return Response
-     */
+        /**
+         * Display the specified resource.
+         *
+         * @param  int  $id
+         * @return Response
+         */
     public function show()
     {
-    	$user = user::findOrFail($id);
+        $user = user::findOrFail($id);
 
-    	return view('users.show', compact('user'));
+        return view('users.show', compact('user'));
     }
 
-     /**
-     * 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('users.create');
+        return view('users.create');
     }
     
-     /**
-     * Store a newly created resource in storage.
-     *
-     * @return Response
-     */
+        /**
+         * Store a newly created resource in storage.
+         *
+         * @return Response
+         */
     public function store(Request $request)
     {
         $this->validate($request, ['email' => 'unique:mst_users,email']);

Spacing +11 added lines, -11 removed lines

@@ -55,20 +55,20 @@ 
     {
         $this->validate($request, ['email' => 'unique:mst_users,email']);
 
-        $user=array('name'=>$request->name,
+        $user = array('name'=>$request->name,
                     'email'=> $request->email,
                     'photo'=> '',
                     'password' => bcrypt($request->password),
                     'status'=> $request->status);
-        $user  = new User($user);
+        $user = new User($user);
         $user->save();
 
-        if($user->id)
+        if ($user->id)
         {
 
-        $user->photo = \constFilePrefix::StaffPhoto. $user->id . '.jpg';
+        $user->photo = \constFilePrefix::StaffPhoto.$user->id.'.jpg';
         $user->save();
-        \Utilities::uploadFile($request,\constFilePrefix::StaffPhoto, $user->id,'photo',\constPaths::StaffPhoto);       
+        \Utilities::uploadFile($request, \constFilePrefix::StaffPhoto, $user->id, 'photo', \constPaths::StaffPhoto);       
 
         flash()->success('User was successfully registered');
 
@@ -84,19 +84,19 @@ 
 
     public function edit($id)
     {
-        $user=user::findOrFail($id);
+        $user = user::findOrFail($id);
 
         return view('users.edit', compact('user'));
     }
 
     public function update($id, Request $request)
     {
-        $user=user::findOrFail($id);
+        $user = user::findOrFail($id);
 
         $user->name = $request->name;
         $user->email = $request->email;
 
-        if($request->password !="")
+        if ($request->password != "")
         {
             $user->password = bcrypt($request->password);
         }
@@ -104,10 +104,10 @@ 
         $user->status = $request->status;
 
         $user->update();
-        $user->photo = \constFilePrefix::staffPhoto. $user->id . '.jpg';
+        $user->photo = \constFilePrefix::staffPhoto.$user->id.'.jpg';
         $user->save();
 
-        \Utilities::uploadFile($request,\constFilePrefix::staffPhoto, $user->id,'photo',\constPaths::staffPhoto);
+        \Utilities::uploadFile($request, \constFilePrefix::staffPhoto, $user->id, 'photo', \constPaths::staffPhoto);
 
         flash()->success('User details was successfully updated');
         return redirect('users');
@@ -115,7 +115,7 @@ 
 
     public function archive($id, Request $request)
     {
-        $user=user::findOrFail($id);
+        $user = user::findOrFail($id);
         $user->status = \constStatus::Archive;
         $user->save();
         flash()->error('User was successfully deleted');

Braces +1 added lines, -3 removed lines

@@ -73,9 +73,7 @@
         flash()->success('User was successfully registered');
 
         return redirect('users'); 
-        }
-
-        else
+        } else
         {
             flash()->error('Error while user registration');
             return redirect('users');

app/Http/Controllers/SettingsController.php

Indentation +5 added lines, -5 removed lines

@@ -10,23 +10,23 @@
 
 class SettingsController extends Controller
 {
-	public function __construct()
+    public function __construct()
     {
         $this->middleware('auth');
     }
 
     public function show()
     {
-    	$settings = \Utilities::getSettings();
+        $settings = \Utilities::getSettings();
 
-    	return view('settings.show',compact('settings'));
+        return view('settings.show',compact('settings'));
     }
 
     public function edit()
     {
-    	$settings = \Utilities::getSettings();
+        $settings = \Utilities::getSettings();
 
-    	return view('settings.edit',compact('settings'));
+        return view('settings.edit',compact('settings'));
     }
 
     public function save(Request $request)

Spacing +4 added lines, -4 removed lines

@@ -19,14 +19,14 @@ 
     {
     	$settings = \Utilities::getSettings();
 
-    	return view('settings.show',compact('settings'));
+    	return view('settings.show', compact('settings'));
     }
 
     public function edit()
     {
     	$settings = \Utilities::getSettings();
 
-    	return view('settings.edit',compact('settings'));
+    	return view('settings.edit', compact('settings'));
     }
 
     public function save(Request $request)
@@ -39,11 +39,11 @@ 
 
             if ($key == "gym_logo") 
             {
-                \Utilities::uploadFile($request,'', $key,'gym_logo',\constPaths::GymLogo); // Upload File
+                \Utilities::uploadFile($request, '', $key, 'gym_logo', \constPaths::GymLogo); // Upload File
                 $value = $key.'.jpg'; // Image Name For DB
             }
 
-            Setting::where('key', '=',$key)->update(['value' => $value ]);
+            Setting::where('key', '=', $key)->update(['value' => $value]);
         }
        
         flash()->success('Setting was successfully updated');

app/Http/Controllers/Auth/AuthController.php

Indentation +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

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