lubusIN / laravel-gymie

app/Http/Controllers/InvoicesController.php

Indentation +11 added lines, -11 removed lines

@@ -167,23 +167,23 @@
         try {
             $invoice_total = $request->admission_amount + $request->subscription_amount + $request->taxes_amount - $request->discount_amount;
             $already_paid = PaymentDetail::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');

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
         $invoices = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
         $count = $invoices->total();
 
-        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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -43,7 +43,7 @@ 
         $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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -60,7 +60,7 @@ 
         $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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -77,7 +77,7 @@ 
         $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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -94,7 +94,7 @@ 
         $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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;

app/Http/Controllers/PaymentsController.php

Indentation +8 added lines, -8 removed lines

@@ -52,9 +52,9 @@ 
             if ($request->mode == \constPaymentMode::Cheque) {
                 // Store Cheque Details
                 $chequeData = ['payment_id'=> $payment_detail->id,
-                                  'number'=> $request->number,
-                                  'date'=> $request->date,
-                                  'status'=> \constChequeStatus::Recieved, ];
+                                    'number'=> $request->number,
+                                    'date'=> $request->date,
+                                    'status'=> \constChequeStatus::Recieved, ];
 
                 $cheque_details = new ChequeDetail($chequeData);
                 $cheque_details->createdBy()->associate(Auth::user());
@@ -134,7 +134,7 @@ 
                 // Store Cheque Details
                 $cheque_detail = ChequeDetail::where('payment_id', $id)->first();
                 $cheque_detail->update(['number' => $request->number,
-                                      'date' => $request->date,
+                                        'date' => $request->date,
                                     ]);
                 $cheque_detail->updatedBy()->associate(Auth::user());
                 $cheque_detail->save();
@@ -179,8 +179,8 @@ 
 
             $invoice_total = $invoice->total;
             $payment_total = PaymentDetail::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;
 
@@ -224,8 +224,8 @@ 
             $invoice_total = $payment_detail->invoice->total;
 
             $payment_total = PaymentDetail::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 +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $paymentTotal = PaymentDetail::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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;

app/PaymentDetail.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 {
     //Eloquence Search mapping
     use Eloquence;
-    use createdByUser,updatedByUser;
+    use createdByUser, updatedByUser;
 
     protected $table = 'trn_payment_details';
 

app/Http/routes.php

Spacing +16 added lines, -16 removed lines

@@ -25,7 +25,7 @@ 
 //API routes
 Route::post('api/token', 'Api\AuthenticateController@authenticate');
 
-Route::group(['prefix' => 'api', 'middleware' => ['jwt.auth']], function () {
+Route::group(['prefix' => 'api', 'middleware' => ['jwt.auth']], function() {
     Route::get('dashboard', 'Api\DashboardController@index');
     Route::get('members', 'Api\MembersController@index');
     Route::get('subscriptions', 'Api\SubscriptionsController@index');
@@ -53,21 +53,21 @@ 
 });
 
 //Auth routes
-Route::group(['prefix' => 'auth'], function () {
+Route::group(['prefix' => 'auth'], function() {
     Route::get('login', 'Auth\AuthController@getLogin');
     Route::post('login', 'Auth\AuthController@postLogin');
     Route::get('logout', 'Auth\AuthController@getLogout');
 });
 
 //dashboard
-Route::group(['middleware' => ['auth']], function () {
+Route::group(['middleware' => ['auth']], function() {
     Route::get('/', 'DashboardController@index');
     Route::get('/dashboard', 'DashboardController@index');
     Route::post('/dashboard/smsRequest', 'DashboardController@smsRequest');
 });
 
 //MembersController
-Route::group(['prefix' => 'members', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'members', 'middleware' => ['auth']], function() {
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@index']);
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@index']);
     Route::get('active', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@active']);
@@ -82,7 +82,7 @@ 
 });
 
 //SmsController
-Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function() {
     Route::get('triggers', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggersIndex']);
     Route::post('triggers/update', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggerUpdate']);
     Route::get('events', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@eventsIndex']);
@@ -98,7 +98,7 @@ 
 });
 
 //enquiries
-Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function() {
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']);
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']);
     Route::get('create', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'], 'uses' => 'EnquiriesController@create']);
@@ -111,13 +111,13 @@ 
 });
 
 //followups
-Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function() {
     Route::post('followups', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry-followup'], 'uses' => 'FollowupsController@store']);
     Route::post('followups/{id}/update', ['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry-followup'], 'uses' => 'FollowupsController@update']);
 });
 
 //plans
-Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function() {
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']);
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']);
     Route::get('show', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@show']);
@@ -136,7 +136,7 @@ 
 });
 
 //subsciptions
-Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function() {
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']);
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']);
     Route::get('expiring', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@expiring']);
@@ -154,7 +154,7 @@ 
 });
 
 //invoices
-Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function() {
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']);
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']);
     Route::get('paid', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@paid']);
@@ -169,7 +169,7 @@ 
 });
 
 //payments
-Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function() {
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']);
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']);
     Route::get('show', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@show']);
@@ -185,7 +185,7 @@ 
 });
 
 //expenses
-Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function() {
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']);
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']);
     Route::get('show', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@show']);
@@ -205,7 +205,7 @@ 
 });
 
 //settings
-Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function () {
+Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function() {
     Route::get('/', 'SettingsController@show');
     Route::get('edit', 'SettingsController@edit');
     Route::post('save', 'SettingsController@save');
@@ -213,7 +213,7 @@ 
 
 //User Module with roles & permissions
 //User
-Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () {
+Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() {
     Route::get('/', 'AclController@userIndex');
     Route::get('create', 'AclController@createUser');
     Route::post('/', 'AclController@storeUser');
@@ -223,7 +223,7 @@ 
 });
 
 //Roles
-Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () {
+Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() {
     Route::get('/', 'AclController@roleIndex');
     Route::get('create', 'AclController@createRole');
     Route::post('/', 'AclController@storeRole');
@@ -233,7 +233,7 @@ 
 });
 
 //Permissions
-Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function () {
+Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function() {
     Route::get('/', 'AclController@permissionIndex');
     Route::get('create', 'AclController@createPermission');
     Route::post('/', 'AclController@storePermission');

app/Http/Controllers/MembersController.php

Indentation +20 added lines, -20 removed lines

@@ -129,8 +129,8 @@ 
     {
         // Member Model Validation
         $this->validate($request, ['email' => 'unique:mst_members,email',
-                                   'contact' => 'unique:mst_members,contact',
-                                   'member_code' => 'unique:mst_members,member_code', ]);
+                                    'contact' => 'unique:mst_members,contact',
+                                    'member_code' => 'unique:mst_members,member_code', ]);
 
         // Start Transaction
         DB::beginTransaction();
@@ -187,16 +187,16 @@ 
 
             // Storing Invoice
             $invoiceData = ['invoice_number'=> $request->invoice_number,
-                                     'member_id'=> $member->id,
-                                     'total'=> $invoice_total,
-                                     'status'=> $paymentStatus,
-                                     'pending_amount'=> $pending,
-                                     'discount_amount'=> $request->discount_amount,
-                                     'discount_percent'=> $request->discount_percent,
-                                     'discount_note'=> $request->discount_note,
-                                     'tax'=> $request->taxes_amount,
-                                     'additional_fees'=> $request->additional_fees,
-                                     'note'=>' ', ];
+                                        'member_id'=> $member->id,
+                                        'total'=> $invoice_total,
+                                        'status'=> $paymentStatus,
+                                        'pending_amount'=> $pending,
+                                        'discount_amount'=> $request->discount_amount,
+                                        'discount_percent'=> $request->discount_percent,
+                                        'discount_note'=> $request->discount_note,
+                                        'tax'=> $request->taxes_amount,
+                                        'additional_fees'=> $request->additional_fees,
+                                        'note'=>' ', ];
 
             $invoice = new Invoice($invoiceData);
             $invoice->createdBy()->associate(Auth::user());
@@ -220,8 +220,8 @@ 
 
                 //Adding subscription to invoice(Invoice Details)
                 $detailsData = ['invoice_id'=> $invoice->id,
-                                       'plan_id'=> $plan['id'],
-                                       'item_amount'=> $plan['price'], ];
+                                        'plan_id'=> $plan['id'],
+                                        'item_amount'=> $plan['price'], ];
 
                 $invoiceDetails = new InvoiceDetail($detailsData);
                 $invoiceDetails->createdBy()->associate(Auth::user());
@@ -231,9 +231,9 @@ 
 
             // Store Payment Details
             $paymentData = ['invoice_id'=> $invoice->id,
-                                     'payment_amount'=> $request->payment_amount,
-                                     'mode'=> $request->mode,
-                                     'note'=> ' ', ];
+                                        'payment_amount'=> $request->payment_amount,
+                                        'mode'=> $request->mode,
+                                        'note'=> ' ', ];
 
             $paymentDetails = new PaymentDetail($paymentData);
             $paymentDetails->createdBy()->associate(Auth::user());
@@ -243,9 +243,9 @@ 
             if ($request->mode == 0) {
                 // Store Cheque Details
                 $chequeData = ['payment_id'=> $paymentDetails->id,
-                                      'number'=> $request->number,
-                                      'date'=> $request->date,
-                                      'status'=> \constChequeStatus::Recieved, ];
+                                        'number'=> $request->number,
+                                        'date'=> $request->date,
+                                        'status'=> \constChequeStatus::Recieved, ];
 
                 $cheque_details = new ChequeDetail($chequeData);
                 $cheque_details->createdBy()->associate(Auth::user());

app/Http/Controllers/EnquiriesController.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         $enquiries = Enquiry::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
         $count = $enquiries->total();
 
-        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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;

app/Http/Controllers/AclController.php

Indentation +10 added lines, -10 removed lines

@@ -36,13 +36,13 @@ 
     public function storeUser(Request $request)
     {
         $this->validate($request, ['name' => 'required|max:255',
-                                   'email' => 'required|email|max:255|unique:mst_users',
-                                   'password' => 'required|confirmed|min:6', ]);
+                                    'email' => 'required|email|max:255|unique:mst_users',
+                                    'password' => 'required|confirmed|min:6', ]);
 
         $user = User::create(['name' => $request['name'],
                                 'email' => $request['email'],
                                 'password' => bcrypt($request['password']),
-                              'status'=> $request->status, ]);
+                                'status'=> $request->status, ]);
 
         $user->save();
 
@@ -142,9 +142,9 @@ 
         DB::beginTransaction();
         try {
             $role = Role::create(['name' => $request->name,
-                                  'display_name' => $request->display_name,
-                                  'description' => $request->description,
-                                 ]);
+                                    'display_name' => $request->display_name,
+                                    'description' => $request->description,
+                                    ]);
 
             if ($request->has('permissions')) {
                 $role->attachPermissions($request->permissions);
@@ -179,9 +179,9 @@ 
             $role = Role::findOrFail($id);
 
             $role->update(['name' => $request->name,
-                           'display_name' => $request->display_name,
-                           'description' => $request->description,
-                          ]);
+                            'display_name' => $request->display_name,
+                            'description' => $request->description,
+                            ]);
 
             //Updating permissions for the role
             $DBpermissions = PermissionRole::where('role_id', $id)->select('permission_id')->lists('permission_id');
@@ -252,7 +252,7 @@ 
                             'display_name' => $request->display_name,
                             'description' => $request->description,
                             'group_key' => $request->group_key,
-                           ]);
+                            ]);
 
         flash()->success('Permission was successfully created');
 

app/Http/Controllers/SubscriptionsController.php

Indentation +42 added lines, -42 removed lines

@@ -76,10 +76,10 @@ 
     {
         // For Tax calculation
         JavaScript::put([
-          'taxes' => \Utilities::getSetting('taxes'),
-          'gymieToday' => Carbon::today()->format('Y-m-d'),
-          'servicesCount' => Service::count(),
-      ]);
+            'taxes' => \Utilities::getSetting('taxes'),
+            'gymieToday' => Carbon::today()->format('Y-m-d'),
+            'servicesCount' => Service::count(),
+        ]);
         list($invoice_number_mode, $invoiceCounter, $invoice_number) = $this->generateInvoiceNumber();
 
         return view('subscriptions.create', compact('invoice_number', 'invoiceCounter', 'invoice_number_mode'));
@@ -109,16 +109,16 @@ 
 
             // Storing Invoice
             $invoiceData = ['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());
@@ -142,8 +142,8 @@ 
 
                 //Adding subscription to invoice(Invoice Details)
                 $detailsData = ['invoice_id'=> $invoice->id,
-                                       'plan_id'=> $plan['id'],
-                                       'item_amount'=> $plan['price'], ];
+                                        'plan_id'=> $plan['id'],
+                                        'item_amount'=> $plan['price'], ];
 
                 $invoice_details = new InvoiceDetail($detailsData);
                 $invoice_details->createdBy()->associate(Auth::user());
@@ -153,9 +153,9 @@ 
 
             //Payment Details
             $paymentData = ['invoice_id'=> $invoice->id,
-                                   'payment_amount'=> $request->payment_amount,
-                                   'mode'=> $request->mode,
-                                   'note'=> ' ', ];
+                                    'payment_amount'=> $request->payment_amount,
+                                    'mode'=> $request->mode,
+                                    'note'=> ' ', ];
 
             $payment_details = new PaymentDetail($paymentData);
             $payment_details->createdBy()->associate(Auth::user());
@@ -267,10 +267,10 @@ 
         $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'),
-      ]);
+            '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'));
     }
@@ -366,14 +366,14 @@ 
         $subscription = Subscription::findOrFail($id);
 
         $already_paid = PaymentDetail::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');
+                                        ->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(),
-      ]);
+            'taxes' => \Utilities::getSetting('taxes'),
+            'gymieToday' => Carbon::today()->format('Y-m-d'),
+            'servicesCount' => Service::count(),
+        ]);
 
         return view('subscriptions.change', compact('subscription', 'already_paid'));
     }
@@ -403,15 +403,15 @@ 
             }
 
             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'],
@@ -423,14 +423,14 @@ 
                 //Adding subscription to invoice(Invoice Details)
 
                 InvoiceDetail::where('invoice_id', $subscription->invoice_id)->update(['plan_id'=> $plan['id'],
-                                                                                         'item_amount'=> $plan['price'], ]);
+                                                                                            'item_amount'=> $plan['price'], ]);
             }
 
             //Payment Details
             $paymentData = ['invoice_id'=> $subscription->invoice_id,
-                                   'payment_amount'=> $request->payment_amount,
-                                   'mode'=> $request->mode,
-                                   'note'=> ' ', ];
+                                    'payment_amount'=> $request->payment_amount,
+                                    'mode'=> $request->mode,
+                                    'note'=> ' ', ];
 
             $payment_details = new PaymentDetail($paymentData);
             $payment_details->createdBy()->associate(Auth::user());

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
         $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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -45,7 +45,7 @@ 
         $expirings = Subscription::expiring($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
         $count = $expirings->total();
 
-        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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -61,7 +61,7 @@ 
         $allExpired = Subscription::expired($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
         $count = $allExpired->total();
 
-        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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;

app/Subscription.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     public function scopeDashboardExpiring($query)
     {
         return $query
-            ->with(['members' => function ($query) {
+            ->with(['members' => function($query) {
                     $query->where('status', '=', \constStatus::Active);
                 }])
             ->where('end_date', '<', Carbon::today()->addDays(7))
@@ -50,7 +50,7 @@ 
     public function scopeDashboardExpired($query)
     {
         return $query
-            ->with(['members' => function ($query) {
+            ->with(['members' => function($query) {
                 $query->where('status', '=', \constStatus::Active);
             }])
             ->where('status', '=', \constSubscription::Expired);