lubusIN / laravel-gymie

app/Invoice.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
             'discount_note',
             'created_by',
             'updated_by',
-     ];
+        ];
 
     protected $dates = ['created_at', 'updated_at'];
 

app/Member.php

Indentation +4 added lines, -4 removed lines

@@ -47,12 +47,12 @@
     public function registerMediaConversions()
     {
         $this->addMediaConversion('thumb')
-             ->setManipulations(['w' => 50, 'h' => 50, 'q' => 100, 'fit' => 'crop'])
-             ->performOnCollections('profile');
+                ->setManipulations(['w' => 50, 'h' => 50, 'q' => 100, 'fit' => 'crop'])
+                ->performOnCollections('profile');
 
         $this->addMediaConversion('form')
-             ->setManipulations(['w' => 70, 'h' => 70, 'q' => 100, 'fit' => 'crop'])
-             ->performOnCollections('profile', 'proof');
+                ->setManipulations(['w' => 70, 'h' => 70, 'q' => 100, 'fit' => 'crop'])
+                ->performOnCollections('profile', 'proof');
     }
 
     //Relationships

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 class Member extends Model implements HasMediaConversions
 {
-    use HasMediaTrait , Eloquence;
+    use HasMediaTrait, Eloquence;
 
     protected $table = 'mst_members';
 

app/Console/Kernel.php

Indentation +14 added lines, -14 removed lines

@@ -36,39 +36,39 @@
     protected function schedule(Schedule $schedule)
     {
         $schedule->command('reshoot:offlineSms')
-                 ->hourly();
+                    ->hourly();
 
         $schedule->command('birthday:sms')
-                 ->dailyAt('00:01');
+                    ->dailyAt('00:01');
 
         $schedule->command('set:expired')
-                 ->dailyAt('00:05');
+                    ->dailyAt('00:05');
 
         $schedule->command('sms:event')
-                 ->dailyAt('09:00');
+                    ->dailyAt('09:00');
 
         $schedule->command('sms:expiring')
-                 ->dailyAt('10:00');
+                    ->dailyAt('10:00');
 
         $schedule->command('expense:alert')
-                 ->dailyAt('10:30')
-                 ->when(function () {
-                     return \Utilities::getSetting('primary_contact') != null;
-                 });
+                    ->dailyAt('10:30')
+                    ->when(function () {
+                        return \Utilities::getSetting('primary_contact') != null;
+                    });
 
         $schedule->command('pending:invoice')
-                 ->dailyAt('11:00');
+                    ->dailyAt('11:00');
 
         $schedule->command('followup:sms')
-                 ->dailyAt('11:30');
+                    ->dailyAt('11:30');
 
         $schedule->command('sms:expired')
-                 ->dailyAt('11:45');
+                    ->dailyAt('11:45');
 
         $schedule->command('repeat:expense')
-                 ->dailyAt('23:00');
+                    ->dailyAt('23:00');
 
         $schedule->command('sms:status')
-                 ->dailyAt('23:45');
+                    ->dailyAt('23:45');
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 
         $schedule->command('expense:alert')
                  ->dailyAt('10:30')
-                 ->when(function () {
+                 ->when(function() {
                      return \Utilities::getSetting('primary_contact') != null;
                  });
 

app/Console/Commands/RepeatExpense.php

Indentation +32 added lines, -32 removed lines

@@ -44,53 +44,53 @@
         foreach ($expenses as $expense) {
             if ($expense->repeat == 1) {
                 $expenseData = ['name' => $expense->name,
-                                     'category_id' => $expense->category_id,
-                                     'due_date' => $expense->due_date->addDays(1),
-                                     'repeat' => $expense->repeat,
-                                     'note' => $expense->note,
-                                     'amount' => $expense->amount,
-                                     'paid' => 0,
-                                     'created_by' => 1,
-                                     'updated_by' => 1, ];
+                                        'category_id' => $expense->category_id,
+                                        'due_date' => $expense->due_date->addDays(1),
+                                        'repeat' => $expense->repeat,
+                                        'note' => $expense->note,
+                                        'amount' => $expense->amount,
+                                        'paid' => 0,
+                                        'created_by' => 1,
+                                        'updated_by' => 1, ];
 
                 $newExpense = new Expense($expenseData);
                 $newExpense->save();
             } elseif ($expense->repeat == 2) {
                 $expenseData = ['name' => $expense->name,
-                                     'category_id' => $expense->category_id,
-                                     'due_date' => $expense->due_date->addWeek(),
-                                     'repeat' => $expense->repeat,
-                                     'note' => $expense->note,
-                                     'amount' => $expense->amount,
-                                     'paid' => 0,
-                                     'created_by' => 1,
-                                     'updated_by' => 1, ];
+                                        'category_id' => $expense->category_id,
+                                        'due_date' => $expense->due_date->addWeek(),
+                                        'repeat' => $expense->repeat,
+                                        'note' => $expense->note,
+                                        'amount' => $expense->amount,
+                                        'paid' => 0,
+                                        'created_by' => 1,
+                                        'updated_by' => 1, ];
 
                 $newExpense = new Expense($expenseData);
                 $newExpense->save();
             } elseif ($expense->repeat == 3) {
                 $expenseData = ['name' => $expense->name,
-                                     'category_id' => $expense->category_id,
-                                     'due_date' => $expense->due_date->addMonth(),
-                                     'repeat' => $expense->repeat,
-                                     'note' => $expense->note,
-                                     'amount' => $expense->amount,
-                                     'paid' => 0,
-                                     'created_by' => 1,
-                                     'updated_by' => 1, ];
+                                        'category_id' => $expense->category_id,
+                                        'due_date' => $expense->due_date->addMonth(),
+                                        'repeat' => $expense->repeat,
+                                        'note' => $expense->note,
+                                        'amount' => $expense->amount,
+                                        'paid' => 0,
+                                        'created_by' => 1,
+                                        'updated_by' => 1, ];
 
                 $newExpense = new Expense($expenseData);
                 $newExpense->save();
             } elseif ($expense->repeat == 4) {
                 $expenseData = ['name' => $expense->name,
-                                     'category_id' => $expense->category_id,
-                                     'due_date' => $expense->due_date->addYear(),
-                                     'repeat' => $expense->repeat,
-                                     'note' => $expense->note,
-                                     'amount' => $expense->amount,
-                                     'paid' => 0,
-                                     'created_by' => 1,
-                                     'updated_by' => 1, ];
+                                        'category_id' => $expense->category_id,
+                                        'due_date' => $expense->due_date->addYear(),
+                                        'repeat' => $expense->repeat,
+                                        'note' => $expense->note,
+                                        'amount' => $expense->amount,
+                                        'paid' => 0,
+                                        'created_by' => 1,
+                                        'updated_by' => 1, ];
 
                 $newExpense = new Expense($expenseData);
                 $newExpense->save();

app/Payment_detail.php

Indentation +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
             'invoice_id',
             'created_by',
             'updated_by',
-     ];
+        ];
 
     //Eloquence Search mapping
     use Eloquence;
@@ -34,16 +34,16 @@ 
 
         if ($drp_start == null or $drp_end == null) {
             return $query->leftJoin('trn_invoice', 'trn_payment_details.invoice_id', '=', 'trn_invoice.id')
-                         ->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')
-                         ->select('trn_payment_details.id', 'trn_payment_details.created_at', 'trn_payment_details.payment_amount', 'trn_payment_details.mode', 'trn_payment_details.invoice_id', 'trn_invoice.invoice_number', 'mst_members.id as member_id', 'mst_members.name as member_name', 'mst_members.member_code')
-                         ->orderBy($sorting_field, $sorting_direction);
+                            ->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')
+                            ->select('trn_payment_details.id', 'trn_payment_details.created_at', 'trn_payment_details.payment_amount', 'trn_payment_details.mode', 'trn_payment_details.invoice_id', 'trn_invoice.invoice_number', 'mst_members.id as member_id', 'mst_members.name as member_name', 'mst_members.member_code')
+                            ->orderBy($sorting_field, $sorting_direction);
         }
 
         return $query->leftJoin('trn_invoice', 'trn_payment_details.invoice_id', '=', 'trn_invoice.id')
-                     ->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')
-                     ->select('trn_payment_details.id', 'trn_payment_details.created_at', 'trn_payment_details.payment_amount', 'trn_payment_details.mode', 'trn_invoice.invoice_number', 'mst_members.name as member_name', 'mst_members.member_code')
-                     ->whereBetween('trn_payment_details.created_at', [$drp_start, $drp_end])
-                     ->orderBy($sorting_field, $sorting_direction);
+                        ->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')
+                        ->select('trn_payment_details.id', 'trn_payment_details.created_at', 'trn_payment_details.payment_amount', 'trn_payment_details.mode', 'trn_invoice.invoice_number', 'mst_members.name as member_name', 'mst_members.member_code')
+                        ->whereBetween('trn_payment_details.created_at', [$drp_start, $drp_end])
+                        ->orderBy($sorting_field, $sorting_direction);
     }
 
     public function createdBy()

app/Http/routes.php

Spacing +17 added lines, -17 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 @@ 
 });
 
 //ReportsController
-Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function() {
     Route::get('members/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@gymMemberCharts']);
     Route::get('members/data', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@gymMemberData']);
     Route::get('enquiries/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@enquiryCharts']);
@@ -98,7 +98,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']);
@@ -114,7 +114,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']);
@@ -127,13 +127,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']);
@@ -162,7 +162,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']);
@@ -180,7 +180,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']);
@@ -200,7 +200,7 @@ 
 // Route::get('access_logs/create','Access_logsController@create');
 
 //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']);
@@ -227,7 +227,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']);
@@ -247,14 +247,14 @@ 
 });
 
 //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');
 });
 
 //User Module with roles & permissions
-Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () {
+Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() {
     //User
     Route::get('/', 'AclController@userIndex');
     Route::get('create', 'AclController@createUser');
@@ -264,7 +264,7 @@ 
     Route::post('{id}/delete', 'AclController@deleteUser');
 });
 
-Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () {
+Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() {
     //Roles
     Route::get('/', 'AclController@roleIndex');
     Route::get('create', 'AclController@createRole');
@@ -274,7 +274,7 @@ 
     Route::post('{id}/delete', 'AclController@deleteRole');
 });
 
-Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function () {
+Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function() {
     //Permissions
     Route::get('/', 'AclController@permissionIndex');
     Route::get('create', 'AclController@createPermission');

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 Cheque_detail($chequeData);
                 $cheque_details->createdBy()->associate(Auth::user());
@@ -134,7 +134,7 @@ 
                 // Store Cheque Details
                 $cheque_detail = Cheque_detail::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 = 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;
 
@@ -224,8 +224,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 +1 added lines, -1 removed lines

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

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

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
         $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 {
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -44,7 +44,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;
@@ -61,7 +61,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;
@@ -78,7 +78,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;
@@ -95,7 +95,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/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 = Invoice_detail::create(['invoice_id'=> $invoice->id,
-                                                       'plan_id'=> (int) $planId,
-                                                       'item_amount'=> $line->get('total_amount'),
-                                                       'item_amount'=> $line->get('total_amount'),
-                                                       'created_by'=> Auth::user()->id,
-                                                       'updated_by'=> Auth::user()->id,
+                                                        'plan_id'=> (int) $planId,
+                                                        'item_amount'=> $line->get('total_amount'),
+                                                        'item_amount'=> $line->get('total_amount'),
+                                                        'created_by'=> Auth::user()->id,
+                                                        'updated_by'=> Auth::user()->id,
                                                         ]);
 
                 $paymentDetail = Payment_detail::create(['invoice_id'=> $invoice->id,
-                                                         'payment_amount'=> $payment_amount,
-                                                         'mode'=> '1',
-                                                         'note'=> ' ',
-                                                         'created_by'=> Auth::user()->id,
-                                                         'updated_by'=> Auth::user()->id,
+                                                            'payment_amount'=> $payment_amount,
+                                                            'mode'=> '1',
+                                                            'note'=> ' ',
+                                                            'created_by'=> Auth::user()->id,
+                                                            'updated_by'=> Auth::user()->id,
                                                         ]);
 
                 Setting::where('key', '=', 'invoice_last_number')->update(['value' => $invoiceCounter]);

Spacing +2 added lines, -2 removed lines

@@ -144,11 +144,11 @@
                     $paymentStatus = \constPaymentStatus::Overpaid;
                 }
 
-                if (empty($line->discount_percent) && ! empty($line->discount_amount)) {
+                if (empty($line->discount_percent) && !empty($line->discount_amount)) {
                     $discountPercent = 'custom';
                 } elseif (empty($line->discount_percent) && empty($line->discount_amount)) {
                     $discountPercent = '0';
-                } elseif (! empty($line->discount_percent)) {
+                } elseif (!empty($line->discount_percent)) {
                     $discountPercent = str_replace('%', '', $line->discount_percent);
                 }