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

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;
 

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/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());

app/ChequeDetail.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
             'status',
             'created_by',
             'updated_by',
-     ];
+        ];
 
     protected $searchableColumns = [
         'number' => 20,