Passed
Branch master (45f86d)
by Ajit
06:39
created
app/Http/Controllers/SettingsController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
     {
20 20
     	$settings = \Utilities::getSettings();
21 21
 
22
-    	return view('settings.show',compact('settings'));
22
+    	return view('settings.show', compact('settings'));
23 23
     }
24 24
 
25 25
     public function edit()
26 26
     {
27 27
     	$settings = \Utilities::getSettings();
28 28
 
29
-    	return view('settings.edit',compact('settings'));
29
+    	return view('settings.edit', compact('settings'));
30 30
     }
31 31
 
32 32
     public function save(Request $request)
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
39 39
 
40 40
             if ($key == "gym_logo") 
41 41
             {
42
-                \Utilities::uploadFile($request,'', $key,'gym_logo',\constPaths::GymLogo); // Upload File
42
+                \Utilities::uploadFile($request, '', $key, 'gym_logo', \constPaths::GymLogo); // Upload File
43 43
                 $value = $key.'.jpg'; // Image Name For DB
44 44
             }
45 45
 
46
-            Setting::where('key', '=',$key)->update(['value' => $value ]);
46
+            Setting::where('key', '=', $key)->update(['value' => $value]);
47 47
         }
48 48
        
49 49
         flash()->success('Setting was successfully updated');
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/AuthController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
      */
83 83
     public function postLogin(LoginRequest $request)
84 84
     { 
85
-       if($this->auth->attempt(['email'=>  $request->email, 'password'=> $request->password , 'status'=> 1],$request->remember))
85
+       if ($this->auth->attempt(['email'=>  $request->email, 'password'=> $request->password, 'status'=> 1], $request->remember))
86 86
 
87 87
         {
88 88
             return redirect()->intended('/dashboard');
Please login to merge, or discard this patch.
app/Http/Controllers/MembersController.php 1 patch
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
      */
35 35
     public function index(Request $request)
36 36
     {
37
-      $members = Member::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
38
-      $memberTotal = Member::indexQuery($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
37
+      $members = Member::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
38
+      $memberTotal = Member::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
39 39
       $count = $memberTotal->count();
40 40
      
41 41
  
@@ -45,18 +45,18 @@  discard block
 block discarded – undo
45 45
       }
46 46
       else
47 47
       {
48
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
48
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
49 49
       }
50 50
 
51 51
       $request->flash();
52 52
       
53
-      return view('members.index', compact('members','count','drp_placeholder','old_sort'));
53
+      return view('members.index', compact('members', 'count', 'drp_placeholder', 'old_sort'));
54 54
     }
55 55
 
56 56
     public function active(Request $request)
57 57
     {
58
-      $members = Member::active($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
59
-      $Totalmembers = Member::active($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
58
+      $members = Member::active($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
59
+      $Totalmembers = Member::active($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
60 60
       $count = $Totalmembers->count();
61 61
      
62 62
  
@@ -66,18 +66,18 @@  discard block
 block discarded – undo
66 66
       }
67 67
       else
68 68
       {
69
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
69
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
70 70
       }
71 71
 
72 72
       $request->flash();
73 73
       
74
-      return view('members.active', compact('members','count','drp_placeholder','old_sort'));
74
+      return view('members.active', compact('members', 'count', 'drp_placeholder', 'old_sort'));
75 75
     }
76 76
 
77 77
     public function inactive(Request $request)
78 78
     {
79
-      $members = Member::inactive($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
80
-      $Totalmembers = Member::inactive($request->sort_field,$request->sort_direction,$request->drp_start,$request->drp_end)->search('"'.$request->input('search').'"')->get();
79
+      $members = Member::inactive($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10);
80
+      $Totalmembers = Member::inactive($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
81 81
       $count = $Totalmembers->count();
82 82
      
83 83
  
@@ -87,12 +87,12 @@  discard block
 block discarded – undo
87 87
       }
88 88
       else
89 89
       {
90
-        $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end;
90
+        $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
91 91
       }
92 92
 
93 93
       $request->flash();
94 94
       
95
-      return view('members.inactive', compact('members','count','drp_placeholder','old_sort'));
95
+      return view('members.inactive', compact('members', 'count', 'drp_placeholder', 'old_sort'));
96 96
     }
97 97
 
98 98
      /**
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
         $member_number_mode = \Utilities::getSetting('member_number_mode');
128 128
 
129 129
         //Generating Invoice number
130
-        if ($invoice_number_mode == \constNumberingMode::Auto ) {
130
+        if ($invoice_number_mode == \constNumberingMode::Auto) {
131 131
             $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1;
132 132
             $invoicePrefix = \Utilities::getSetting('invoice_prefix');
133 133
             $invoice_number = $invoicePrefix.$invoiceCounter;
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
         }
140 140
 
141 141
         //Generating Member Counter
142
-        if ($member_number_mode == \constNumberingMode::Auto ) {
142
+        if ($member_number_mode == \constNumberingMode::Auto) {
143 143
             $memberCounter = \Utilities::getSetting('member_last_number') + 1;
144 144
             $memberPrefix = \Utilities::getSetting('member_prefix');
145 145
             $member_code = $memberPrefix.$memberCounter;
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
             $memberCounter = '';
151 151
         }
152 152
 
153
-    	return view('members.create',compact('invoice_number','invoiceCounter','member_code','memberCounter','member_number_mode','invoice_number_mode'));
153
+    	return view('members.create', compact('invoice_number', 'invoiceCounter', 'member_code', 'memberCounter', 'member_number_mode', 'invoice_number_mode'));
154 154
     }
155 155
     
156 156
      /**
@@ -187,18 +187,18 @@  discard block
 block discarded – undo
187 187
                                     'aim'=> $request->aim, 
188 188
                                     'source'=> $request->source);
189 189
 
190
-                $member  = new Member($memberData);
190
+                $member = new Member($memberData);
191 191
                 $member->createdBy()->associate(Auth::user());
192 192
                 $member->updatedBy()->associate(Auth::user());
193 193
                 $member->save();
194 194
 
195 195
                 // Adding media i.e. Profile & proof photo
196
-                if($request->hasFile('photo'))
196
+                if ($request->hasFile('photo'))
197 197
                 {
198 198
                   $member->addMedia($request->file('photo'))->usingFileName('profile_'.$member->id.$request->photo->getClientOriginalExtension())->toCollection('profile');
199 199
                 }
200 200
 
201
-                if($request->hasFile('proof_photo'))
201
+                if ($request->hasFile('proof_photo'))
202 202
                 {
203 203
                   $member->addMedia($request->file('proof_photo'))->usingFileName('proof_'.$member->id.$request->proof_photo->getClientOriginalExtension())->toCollection('proof');
204 204
                 }                
@@ -208,17 +208,17 @@  discard block
 block discarded – undo
208 208
                 $paymentStatus = \constPaymentStatus::Unpaid;
209 209
                 $pending = $invoice_total - $request->payment_amount;
210 210
 
211
-                if($request->mode == 1)
211
+                if ($request->mode == 1)
212 212
                 {
213 213
                   if ($request->payment_amount == $invoice_total) 
214 214
                   {
215 215
                     $paymentStatus = \constPaymentStatus::Paid;
216 216
                   } 
217
-                  elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) 
217
+                  elseif ($request->payment_amount > 0 && $request->payment_amount < $invoice_total) 
218 218
                   {
219 219
                     $paymentStatus = \constPaymentStatus::Partial;
220 220
                   }
221
-                  elseif($request->payment_amount == 0)
221
+                  elseif ($request->payment_amount == 0)
222 222
                   {
223 223
                     $paymentStatus = \constPaymentStatus::Unpaid;
224 224
                   }
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
                 $invoice->save();
248 248
 
249 249
                 // Storing subscription
250
-                foreach($request->plan as $plan)
250
+                foreach ($request->plan as $plan)
251 251
                 {
252 252
                   $subscriptionData = array('member_id'=> $member->id,
253 253
                                             'invoice_id'=> $invoice->id,
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
                 $payment_details->updatedBy()->associate(Auth::user());
285 285
                 $payment_details->save();
286 286
 
287
-                if($request->mode == 0)
287
+                if ($request->mode == 0)
288 288
                 {
289 289
                   // Store Cheque Details
290 290
                   $chequeData = array('payment_id'=> $payment_details->id,
@@ -301,61 +301,61 @@  discard block
 block discarded – undo
301 301
                 // On member transfer update enquiry Status
302 302
                 if ($request->has('transfer_id')) 
303 303
                 {
304
-                    $enquiry=Enquiry::findOrFail($request->transfer_id);
304
+                    $enquiry = Enquiry::findOrFail($request->transfer_id);
305 305
                     $enquiry->status = \constEnquiryStatus::Member;
306 306
                     $enquiry->updatedBy()->associate(Auth::user());
307 307
                     $enquiry->save();
308 308
                 }
309 309
 
310 310
                 //Updating Numbering Counters
311
-                Setting::where('key', '=','invoice_last_number')->update(['value' => $request->invoiceCounter]);
312
-                Setting::where('key', '=','member_last_number')->update(['value' => $request->memberCounter]);
311
+                Setting::where('key', '=', 'invoice_last_number')->update(['value' => $request->invoiceCounter]);
312
+                Setting::where('key', '=', 'member_last_number')->update(['value' => $request->memberCounter]);
313 313
                 $sender_id = \Utilities::getSetting('sms_sender_id');
314 314
                 $gym_name = \Utilities::getSetting('gym_name');
315 315
 
316 316
                 //SMS Trigger
317 317
                 if ($invoice->status == \constPaymentStatus::Paid) 
318 318
                 {
319
-                  $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_paid_invoice')->first();
319
+                  $sms_trigger = Sms_trigger::where('alias', '=', 'member_admission_with_paid_invoice')->first();
320 320
                   $message = $sms_trigger->message;
321
-                  $sms_text = sprintf($message,$member->name,$gym_name,$payment_details->payment_amount,$invoice->invoice_number);
321
+                  $sms_text = sprintf($message, $member->name, $gym_name, $payment_details->payment_amount, $invoice->invoice_number);
322 322
                   $sms_status = $sms_trigger->status;
323 323
 
324
-                  \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
324
+                  \Utilities::Sms($sender_id, $member->contact, $sms_text, $sms_status);
325 325
                 } 
326
-                elseif($invoice->status == \constPaymentStatus::Partial)
326
+                elseif ($invoice->status == \constPaymentStatus::Partial)
327 327
                 {
328
-                  $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_partial_invoice')->first();
328
+                  $sms_trigger = Sms_trigger::where('alias', '=', 'member_admission_with_partial_invoice')->first();
329 329
                   $message = $sms_trigger->message;
330
-                  $sms_text = sprintf($message,$member->name,$gym_name,$payment_details->payment_amount,$invoice->invoice_number,$invoice->pending_amount);
330
+                  $sms_text = sprintf($message, $member->name, $gym_name, $payment_details->payment_amount, $invoice->invoice_number, $invoice->pending_amount);
331 331
                   $sms_status = $sms_trigger->status;
332 332
 
333
-                  \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
333
+                  \Utilities::Sms($sender_id, $member->contact, $sms_text, $sms_status);
334 334
                 }
335
-                elseif($invoice->status == \constPaymentStatus::Unpaid)
335
+                elseif ($invoice->status == \constPaymentStatus::Unpaid)
336 336
                 {
337
-                  if($request->mode == 0)
337
+                  if ($request->mode == 0)
338 338
                   {
339
-                    $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first();
339
+                    $sms_trigger = Sms_trigger::where('alias', '=', 'payment_with_cheque')->first();
340 340
                     $message = $sms_trigger->message;
341
-                    $sms_text = sprintf($message,$member->name,$payment_details->payment_amount,$cheque_details->number,$invoice->invoice_number,$gym_name);
341
+                    $sms_text = sprintf($message, $member->name, $payment_details->payment_amount, $cheque_details->number, $invoice->invoice_number, $gym_name);
342 342
                     $sms_status = $sms_trigger->status;
343 343
 
344
-                    \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
344
+                    \Utilities::Sms($sender_id, $member->contact, $sms_text, $sms_status);
345 345
                   }
346 346
                   else
347 347
                   {
348
-                    $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_unpaid_invoice')->first();
348
+                    $sms_trigger = Sms_trigger::where('alias', '=', 'member_admission_with_unpaid_invoice')->first();
349 349
                     $message = $sms_trigger->message;
350
-                    $sms_text = sprintf($message,$member->name,$gym_name,$invoice->pending_amount,$invoice->invoice_number);
350
+                    $sms_text = sprintf($message, $member->name, $gym_name, $invoice->pending_amount, $invoice->invoice_number);
351 351
                     $sms_status = $sms_trigger->status;
352 352
 
353
-                    \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status);
353
+                    \Utilities::Sms($sender_id, $member->contact, $sms_text, $sms_status);
354 354
                   }
355 355
                   
356 356
                 }
357 357
 
358
-                if($subscription->start_date < $member->created_at)
358
+                if ($subscription->start_date < $member->created_at)
359 359
                 {
360 360
                   $member->created_at = $subscription->start_date;
361 361
                   $member->updated_at = $subscription->start_date;
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
                   $invoice->updated_at = $subscription->start_date;
366 366
                   $invoice->save();
367 367
 
368
-                  foreach($invoice->invoice_details as $invoice_detail)
368
+                  foreach ($invoice->invoice_details as $invoice_detail)
369 369
                   {
370 370
                     $invoice_detail->created_at = $subscription->start_date;
371 371
                     $invoice_detail->updated_at = $subscription->start_date;
@@ -383,13 +383,13 @@  discard block
 block discarded – undo
383 383
 
384 384
                 DB::commit();    
385 385
                 flash()->success('Member was successfully created');                         
386
-                return redirect (action('MembersController@show', ['id' => $member->id]));
386
+                return redirect(action('MembersController@show', ['id' => $member->id]));
387 387
             } 
388 388
             catch (\Exception $e) 
389 389
             {
390 390
                 DB::rollback();
391 391
                 flash()->error('Error while creating the member');
392
-                return redirect (action('MembersController@index'));
392
+                return redirect(action('MembersController@index'));
393 393
             }
394 394
     }//End of new Member
395 395
         
@@ -405,11 +405,11 @@  discard block
 block discarded – undo
405 405
 
406 406
     public function edit($id)
407 407
     {
408
-        $member=Member::findOrFail($id);
408
+        $member = Member::findOrFail($id);
409 409
         $member_number_mode = \Utilities::getSetting('member_number_mode');
410 410
         $member_code = $member->member_code;
411 411
 
412
-        return view('members.edit', compact('member','member_number_mode','member_code'));
412
+        return view('members.edit', compact('member', 'member_number_mode', 'member_code'));
413 413
     }
414 414
 
415 415
     /**
@@ -421,16 +421,16 @@  discard block
 block discarded – undo
421 421
     public function update($id, Request $request)
422 422
     {
423 423
         //dd($request->all());
424
-        $member=Member::findOrFail($id);
424
+        $member = Member::findOrFail($id);
425 425
         $member->update($request->all());        
426 426
 
427
-        if($request->hasFile('photo'))
427
+        if ($request->hasFile('photo'))
428 428
         {
429 429
           $member->clearMediaCollection('profile');
430 430
           $member->addMedia($request->file('photo'))->usingFileName('profile_'.$member->id.$request->photo->getClientOriginalExtension())->toCollection('profile');
431 431
         }
432 432
 
433
-        if($request->hasFile('proof_photo'))
433
+        if ($request->hasFile('proof_photo'))
434 434
         {
435 435
           $member->clearMediaCollection('proof');
436 436
           $member->addMedia($request->file('proof_photo'))->usingFileName('proof_'.$member->id.$request->proof_photo->getClientOriginalExtension())->toCollection('proof');
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
 
442 442
         flash()->success('Member details were successfully updated');
443 443
 
444
-        return redirect (action('MembersController@show', ['id' => $member->id]));
444
+        return redirect(action('MembersController@show', ['id' => $member->id]));
445 445
     }
446 446
 
447 447
     /**
@@ -452,18 +452,18 @@  discard block
 block discarded – undo
452 452
 
453 453
     public function archive($id, Request $request)
454 454
     {
455
-        Subscription::where('member_id',$id)->delete();
455
+        Subscription::where('member_id', $id)->delete();
456 456
 
457
-        $invoices = Invoice::where('member_id',$id)->get();
457
+        $invoices = Invoice::where('member_id', $id)->get();
458 458
 
459
-        foreach($invoices as $invoice)
459
+        foreach ($invoices as $invoice)
460 460
         {
461
-          Invoice_detail::where('invoice_id',$invoice->id)->delete();
462
-          $payment_details = Payment_detail::where('invoice_id',$invoice->id)->get();
461
+          Invoice_detail::where('invoice_id', $invoice->id)->delete();
462
+          $payment_details = Payment_detail::where('invoice_id', $invoice->id)->get();
463 463
 
464
-          foreach($payment_details as $payment_detail)
464
+          foreach ($payment_details as $payment_detail)
465 465
           {
466
-            Cheque_detail::where('payment_id',$payment_detail->id)->delete();
466
+            Cheque_detail::where('payment_id', $payment_detail->id)->delete();
467 467
             $payment_detail->delete();
468 468
           }
469 469
           
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
         $member_number_mode = \Utilities::getSetting('member_number_mode');
493 493
 
494 494
         //Generating Invoice number
495
-        if ($invoice_number_mode == \constNumberingMode::Auto ) {
495
+        if ($invoice_number_mode == \constNumberingMode::Auto) {
496 496
             $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1;
497 497
             $invoicePrefix = \Utilities::getSetting('invoice_prefix');
498 498
             $invoice_number = $invoicePrefix.$invoiceCounter;
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
         }
505 505
 
506 506
         //Generating Member Counter
507
-        if ($member_number_mode == \constNumberingMode::Auto ) {
507
+        if ($member_number_mode == \constNumberingMode::Auto) {
508 508
             $memberCounter = \Utilities::getSetting('member_last_number') + 1;
509 509
             $memberPrefix = \Utilities::getSetting('member_prefix');
510 510
             $member_code = $memberPrefix.$memberCounter;
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
 
518 518
         $enquiry = Enquiry::findOrFail($id);
519 519
 
520
-        return view('members.transfer',compact('enquiry','invoice_number','invoiceCounter','member_code','memberCounter','member_number_mode','invoice_number_mode'));
520
+        return view('members.transfer', compact('enquiry', 'invoice_number', 'invoiceCounter', 'member_code', 'memberCounter', 'member_number_mode', 'invoice_number_mode'));
521 521
     }
522 522
     
523 523
 }
524 524
\ No newline at end of file
Please login to merge, or discard this patch.
app/Http/Controllers/AclController.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     {
32 32
     	$users = User::excludeArchive()->paginate(10);
33 33
 
34
-    	return view('user.userIndex',compact('users'));
34
+    	return view('user.userIndex', compact('users'));
35 35
     }
36 36
 
37 37
     public function createUser()
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         $user->save();
54 54
 
55 55
         // Adding Photo
56
-        if($request->hasFile('photo'))
56
+        if ($request->hasFile('photo'))
57 57
         {
58 58
           $user->addMedia($request->file('photo'))->usingFileName('staff_'.$user->id.$request->photo->getClientOriginalExtension())->toCollection('staff');
59 59
         }
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
     	$user->name = $request->name;
80 80
     	$user->email = $request->email;
81 81
 
82
-    	if(!empty($request->password))
82
+    	if (!empty($request->password))
83 83
         {
84 84
             $this->validate($request, ['password' => 'required|string|min:6|confirmed']);
85 85
             $user->password = bcrypt($request->password);
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
         $user->update();
91 91
 
92
-        if($request->hasFile('photo'))
92
+        if ($request->hasFile('photo'))
93 93
         {
94 94
           $user->clearMediaCollection('staff');
95 95
           $user->addMedia($request->file('photo'))->usingFileName('staff_'.$user->id.$request->photo->getClientOriginalExtension())->toCollection('staff');
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
         if ($user->role_user->role->id != $request->role_id) 
100 100
         {
101
-            Role_user::where('user_id',$user->id)->where('role_id',$user->role_user->role_id)->delete();
101
+            Role_user::where('user_id', $user->id)->where('role_id', $user->role_user->role_id)->delete();
102 102
             $user->attachRole($request->role_id);
103 103
         }
104 104
     	
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     	DB::beginTransaction();
112 112
     	try 
113 113
     	{
114
-    		Role_user::where('user_id',$id)->delete();
114
+    		Role_user::where('user_id', $id)->delete();
115 115
     		$user = User::findOrFail($id);
116 116
             $user->clearMediaCollection('staff');
117 117
             $user->status = \constStatus::Archive;
@@ -138,14 +138,14 @@  discard block
 block discarded – undo
138 138
     {
139 139
     	$roles = Role::excludeGymie()->get();
140 140
 
141
-    	return view('user.roleIndex',compact('roles'));
141
+    	return view('user.roleIndex', compact('roles'));
142 142
     }
143 143
 
144 144
     public function createRole()
145 145
     {
146 146
     	$permissions = Permission::all();
147 147
 
148
-    	return view('user.createRole',compact('permissions'));
148
+    	return view('user.createRole', compact('permissions'));
149 149
     }
150 150
 
151 151
     public function storeRole(Request $request)
@@ -179,9 +179,9 @@  discard block
 block discarded – undo
179 179
     {
180 180
     	$role = Role::findOrFail($id);
181 181
     	$permissions = Permission::all();
182
-    	$permission_role = Permission_role::where('role_id',$id)->get();
182
+    	$permission_role = Permission_role::where('role_id', $id)->get();
183 183
 
184
-    	return view('user.editRole', compact('role','permissions','permission_role'));
184
+    	return view('user.editRole', compact('role', 'permissions', 'permission_role'));
185 185
     }
186 186
 
187 187
     public function updateRole($id, Request $request)
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 				 		  ]);
199 199
 
200 200
     		//Updating permissions for the role
201
-    		$DBpermissions = Permission_role::where('role_id',$id)->select('permission_id')->lists('permission_id');
201
+    		$DBpermissions = Permission_role::where('role_id', $id)->select('permission_id')->lists('permission_id');
202 202
     		$ClientPermissions = collect($request->permissions);
203 203
     
204 204
     		$addPermissions = $ClientPermissions->diff($DBpermissions);
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
     		{
214 214
     			foreach ($deletePermissions as $deletePermission) 
215 215
     			{
216
-    				Permission_role::where('role_id',$id)->where('permission_id',$deletePermission)->delete();
216
+    				Permission_role::where('role_id', $id)->where('permission_id', $deletePermission)->delete();
217 217
     			}
218 218
     		}
219 219
     		    		    		
@@ -234,8 +234,8 @@  discard block
 block discarded – undo
234 234
     	DB::beginTransaction();
235 235
     	try 
236 236
     	{
237
-    		Permission_role::where('role_id',$id)->delete();
238
-    		Role::where('id',$id)->delete();
237
+    		Permission_role::where('role_id', $id)->delete();
238
+    		Role::where('id', $id)->delete();
239 239
 
240 240
     		DB::commit();
241 241
     		flash()->success('Role was successfully deleted');
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
     {
258 258
     	$permissions = Permission::all();
259 259
 
260
-    	return view('user.permissionIndex',compact('permissions'));
260
+    	return view('user.permissionIndex', compact('permissions'));
261 261
     }
262 262
 
263 263
     public function createPermission()
Please login to merge, or discard this patch.
app/Http/Controllers/FollowupsController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,19 +27,19 @@
 block discarded – undo
27 27
 
28 28
         flash()->success('Follow Up was successfully created');
29 29
 
30
-    	return redirect (action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
30
+    	return redirect(action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
31 31
     }    
32 32
 
33 33
     public function update($id, Request $request)
34 34
     {
35 35
 
36
-        $followup=Followup::findOrFail($id);
36
+        $followup = Followup::findOrFail($id);
37 37
         $followup->update($request->all());
38 38
         $followup->updatedBy()->associate(Auth::user());
39 39
         $followup->save();
40 40
 
41 41
         flash()->success('Follow Up details were successfully updated');
42 42
 
43
-        return redirect (action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
43
+        return redirect(action('EnquiriesController@show', ['id' => $request->enquiry_id])); 
44 44
     }
45 45
 }
46 46
\ No newline at end of file
Please login to merge, or discard this patch.
app/Http/Controllers/PlansController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
         $planTotal = Plan::excludeArchive()->search('"'.$request->input('search').'"')->get();
27 27
         $count = $planTotal->count();
28 28
         
29
-    	return view('plans.index', compact('plans','count'));
29
+    	return view('plans.index', compact('plans', 'count'));
30 30
     }
31 31
 
32 32
      /**
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
     public function edit($id)
79 79
     {
80
-        $plan=Plan::findOrFail($id);
80
+        $plan = Plan::findOrFail($id);
81 81
 
82 82
         return view('plans.edit', compact('plan'));
83 83
     }
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
     public function update($id, Request $request)
86 86
     {
87 87
 
88
-        $plan=Plan::findOrFail($id);
88
+        $plan = Plan::findOrFail($id);
89 89
 
90 90
         $plan->update($request->all());
91 91
         $plan->updatedBy()->associate(Auth::user());
Please login to merge, or discard this patch.
app/Http/Controllers/ServicesController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
         $serviceTotal = Service::search('"'.$request->input('search').'"')->get();
27 27
         $count = $serviceTotal->count();
28 28
 
29
-    	return view('services.index', compact('services','count'));
29
+    	return view('services.index', compact('services', 'count'));
30 30
      }
31 31
 
32 32
      /**
Please login to merge, or discard this patch.
app/Http/Controllers/DashboardController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -50,15 +50,15 @@  discard block
 block discarded – undo
50 50
         $outstandings = Expense::outstandingAlerts()->get();
51 51
         $smsRequestSetting = \Utilities::getSetting('sms_request');
52 52
         $smslogs = Sms_log::dashboardLogs()->get();
53
-        $recievedCheques = Cheque_detail::where('status',\constChequeStatus::Recieved)->get();
53
+        $recievedCheques = Cheque_detail::where('status', \constChequeStatus::Recieved)->get();
54 54
         $recievedChequesCount = $recievedCheques->count();
55
-        $depositedCheques = Cheque_detail::where('status',\constChequeStatus::Deposited)->get();
55
+        $depositedCheques = Cheque_detail::where('status', \constChequeStatus::Deposited)->get();
56 56
         $depositedChequesCount = $depositedCheques->count();
57
-        $bouncedCheques = Cheque_detail::where('status',\constChequeStatus::Bounced)->get();
57
+        $bouncedCheques = Cheque_detail::where('status', \constChequeStatus::Bounced)->get();
58 58
         $bouncedChequesCount = $bouncedCheques->count();
59
-        $membersPerPlan =  json_decode(\Utilities::membersPerPlan());
59
+        $membersPerPlan = json_decode(\Utilities::membersPerPlan());
60 60
 
61
-		return view('dashboard.index',compact('expirings','allExpired','birthdays','recents','enquiries','reminders','dues','outstandings','smsRequestSetting','smslogs','expiringCount','expiredCount','birthdayCount','reminderCount','recievedCheques','recievedChequesCount','depositedCheques','depositedChequesCount','bouncedCheques','bouncedChequesCount','membersPerPlan'));
61
+		return view('dashboard.index', compact('expirings', 'allExpired', 'birthdays', 'recents', 'enquiries', 'reminders', 'dues', 'outstandings', 'smsRequestSetting', 'smslogs', 'expiringCount', 'expiredCount', 'birthdayCount', 'reminderCount', 'recievedCheques', 'recievedChequesCount', 'depositedCheques', 'depositedChequesCount', 'bouncedCheques', 'bouncedChequesCount', 'membersPerPlan'));
62 62
     }
63 63
 
64 64
     public function smsRequest(Request $request)
@@ -66,9 +66,9 @@  discard block
 block discarded – undo
66 66
         $contact = 9820461665;
67 67
         $sms_text = "A request for ".$request->smsCount." sms has came from ".\Utilities::getSetting('gym_name')." by ".Auth::user()->name;
68 68
         $sms_status = 1;
69
-        \Utilities::Sms($contact,$sms_text,$sms_status);
69
+        \Utilities::Sms($contact, $sms_text, $sms_status);
70 70
 
71
-        Setting::where('key', '=','sms_request')->update(['value' => 1]);
71
+        Setting::where('key', '=', 'sms_request')->update(['value' => 1]);
72 72
 
73 73
         flash()->success('Request has been successfully sent, a confirmation call will be made soon');
74 74
         return redirect('/dashboard');
Please login to merge, or discard this patch.
app/Http/Controllers/DataMigrationController.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
                 $dob = Carbon::createFromFormat('d/m/Y', $line->get('dob'))->toDateString();
117 117
                 $gender = ($line->get('gender') == 'male' ? 'm' : 'f');
118 118
                 // $explodedName = explode(" ", $line->get('name'));
119
-                $email = $member_code . "@evolvegym.in";
119
+                $email = $member_code."@evolvegym.in";
120 120
 
121 121
                 $address = (empty($line->get('address')) ? 'Naigaon east' : $line->get('address'));
122 122
 
@@ -148,23 +148,23 @@  discard block
 block discarded – undo
148 148
                 if ($payment_amount == $invoice_total) {
149 149
                   $paymentStatus = \constPaymentStatus::Paid;
150 150
                 } 
151
-                elseif($payment_amount > 0 && $payment_amount < $invoice_total) {
151
+                elseif ($payment_amount > 0 && $payment_amount < $invoice_total) {
152 152
                   $paymentStatus = \constPaymentStatus::Partial;
153 153
                 }
154
-                elseif($payment_amount == 0) {
154
+                elseif ($payment_amount == 0) {
155 155
                   $paymentStatus = \constPaymentStatus::Unpaid;
156 156
                 }
157 157
                 else {
158 158
                   $paymentStatus = \constPaymentStatus::Overpaid;
159 159
                 }
160 160
 
161
-                if(empty($line->discount_percent) && !empty($line->discount_amount)) {
161
+                if (empty($line->discount_percent) && !empty($line->discount_amount)) {
162 162
                     $discountPercent = 'custom';
163 163
                 }
164
-                elseif(empty($line->discount_percent) && empty($line->discount_amount)) {
164
+                elseif (empty($line->discount_percent) && empty($line->discount_amount)) {
165 165
                     $discountPercent = '0';
166 166
                 }
167
-                elseif(!empty($line->discount_percent)) {
167
+                elseif (!empty($line->discount_percent)) {
168 168
                     $discountPercent = str_replace("%", "", $line->discount_percent);
169 169
                 }
170 170
 
@@ -186,20 +186,20 @@  discard block
 block discarded – undo
186 186
                 $start_date = Carbon::createFromFormat('d/m/Y', $line->get('start_date'));
187 187
                 $planId = $line->get('plan');
188 188
 
189
-                if($planId == 3) {
189
+                if ($planId == 3) {
190 190
                     $end_date = $start_date->copy()->addMonth();
191 191
                 }
192
-                elseif($planId == 4) {
192
+                elseif ($planId == 4) {
193 193
                     $end_date = $start_date->copy()->addMonths(3);
194 194
                 }
195
-                elseif($planId == 5) {
195
+                elseif ($planId == 5) {
196 196
                     $end_date = $start_date->copy()->addMonths(6);
197 197
                 }
198
-                elseif($planId == 6) {
198
+                elseif ($planId == 6) {
199 199
                     $end_date = $start_date->copy()->addMonths(12);
200 200
                 }
201 201
 
202
-                if($end_date->lt(Carbon::today())) {
202
+                if ($end_date->lt(Carbon::today())) {
203 203
                     $subscription_status = \constSubscription::Expired;
204 204
                 }
205 205
                 else {
@@ -233,13 +233,13 @@  discard block
 block discarded – undo
233 233
                                                          'updated_by'=> Auth::user()->id
234 234
                                                         ]);
235 235
 
236
-                Setting::where('key', '=','invoice_last_number')->update(['value' => $invoiceCounter]);
237
-                Setting::where('key', '=','member_last_number')->update(['value' => $memberCounter]);
236
+                Setting::where('key', '=', 'invoice_last_number')->update(['value' => $invoiceCounter]);
237
+                Setting::where('key', '=', 'member_last_number')->update(['value' => $memberCounter]);
238 238
             }
239 239
             DB::commit();
240 240
         }
241 241
 
242
-        catch(\Exception $e) {
242
+        catch (\Exception $e) {
243 243
             DB::rollback();
244 244
             dd($e);
245 245
         }
Please login to merge, or discard this patch.