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/DataMigrationController.php

Indentation +22 added lines, -22 removed lines

@@ -153,18 +153,18 @@ 
                 }
 
                 $invoice = Invoice::create(['invoice_number'=> $invoice_number,
-                                             'member_id'=> $member->id,
-                                             'total'=> $invoice_total,
-                                             'status'=> $paymentStatus,
-                                             'pending_amount'=> $pending,
-                                             'discount_amount'=> $discount,
-                                             'discount_percent'=> $discountPercent,
-                                             'discount_note'=> null,
-                                             'tax'=> ($tax_percent / 100) * $invoice_total,
-                                             'additional_fees'=> '0',
-                                             'note'=> null,
-                                             'created_by'=> Auth::user()->id,
-                                             'updated_by'=> Auth::user()->id,
+                                                'member_id'=> $member->id,
+                                                'total'=> $invoice_total,
+                                                'status'=> $paymentStatus,
+                                                'pending_amount'=> $pending,
+                                                'discount_amount'=> $discount,
+                                                'discount_percent'=> $discountPercent,
+                                                'discount_note'=> null,
+                                                'tax'=> ($tax_percent / 100) * $invoice_total,
+                                                'additional_fees'=> '0',
+                                                'note'=> null,
+                                                'created_by'=> Auth::user()->id,
+                                                'updated_by'=> Auth::user()->id,
                                             ]);
 
                 $start_date = Carbon::createFromFormat('d/m/Y', $line->get('start_date'));
@@ -198,19 +198,19 @@ 
                                                     ]);
 
                 $invoiceDetail = InvoiceDetail::create(['invoice_id'=> $invoice->id,
-                                                       'plan_id'=> (int) $planId,
-                                                       'item_amount'=> $line->get('total_amount'),
-                                                       'item_amount'=> $line->get('total_amount'),
-                                                       'created_by'=> Auth::user()->id,
-                                                       'updated_by'=> Auth::user()->id,
+                                                        'plan_id'=> (int) $planId,
+                                                        'item_amount'=> $line->get('total_amount'),
+                                                        'item_amount'=> $line->get('total_amount'),
+                                                        'created_by'=> Auth::user()->id,
+                                                        'updated_by'=> Auth::user()->id,
                                                         ]);
 
                 $paymentDetail = PaymentDetail::create(['invoice_id'=> $invoice->id,
-                                                         'payment_amount'=> $payment_amount,
-                                                         'mode'=> '1',
-                                                         'note'=> ' ',
-                                                         'created_by'=> Auth::user()->id,
-                                                         'updated_by'=> Auth::user()->id,
+                                                            'payment_amount'=> $payment_amount,
+                                                            'mode'=> '1',
+                                                            'note'=> ' ',
+                                                            'created_by'=> Auth::user()->id,
+                                                            'updated_by'=> Auth::user()->id,
                                                         ]);
 
                 Setting::where('key', '=', 'invoice_last_number')->update(['value' => $invoiceCounter]);

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

Indentation +20 added lines, -20 removed lines

@@ -144,8 +144,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();
@@ -202,16 +202,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());
@@ -235,8 +235,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());
@@ -246,9 +246,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'=> ' ', ];
 
             $payment_details = new PaymentDetail($paymentData);
             $payment_details->createdBy()->associate(Auth::user());
@@ -258,9 +258,9 @@ 
             if ($request->mode == 0) {
                 // Store Cheque Details
                 $chequeData = ['payment_id'=> $payment_details->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/SubscriptionsController.php

Indentation +42 added lines, -42 removed lines

@@ -78,10 +78,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(),
+        ]);
 
         //Get Numbering mode
         $invoice_number_mode = \Utilities::getSetting('invoice_number_mode');
@@ -123,16 +123,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());
@@ -156,8 +156,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());
@@ -167,9 +167,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());
@@ -281,10 +281,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'));
     }
@@ -390,14 +390,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'));
     }
@@ -427,15 +427,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'],
@@ -447,14 +447,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());