Completed
Push — master ( 45f86d...419882 )
by Ajit
12s
created
app/Invoice.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
             'discount_note',
24 24
             'created_by',
25 25
             'updated_by',
26
-     ];
26
+        ];
27 27
 
28 28
     protected $dates = ['created_at', 'updated_at'];
29 29
 
Please login to merge, or discard this patch.
app/Member.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,12 +47,12 @@
 block discarded – undo
47 47
     public function registerMediaConversions()
48 48
     {
49 49
         $this->addMediaConversion('thumb')
50
-             ->setManipulations(['w' => 50, 'h' => 50, 'q' => 100, 'fit' => 'crop'])
51
-             ->performOnCollections('profile');
50
+                ->setManipulations(['w' => 50, 'h' => 50, 'q' => 100, 'fit' => 'crop'])
51
+                ->performOnCollections('profile');
52 52
 
53 53
         $this->addMediaConversion('form')
54
-             ->setManipulations(['w' => 70, 'h' => 70, 'q' => 100, 'fit' => 'crop'])
55
-             ->performOnCollections('profile', 'proof');
54
+                ->setManipulations(['w' => 70, 'h' => 70, 'q' => 100, 'fit' => 'crop'])
55
+                ->performOnCollections('profile', 'proof');
56 56
     }
57 57
 
58 58
     //Relationships
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
 class Member extends Model implements HasMediaConversions
12 12
 {
13
-    use HasMediaTrait , Eloquence;
13
+    use HasMediaTrait, Eloquence;
14 14
 
15 15
     protected $table = 'mst_members';
16 16
 
Please login to merge, or discard this patch.
app/Console/Kernel.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -36,39 +36,39 @@
 block discarded – undo
36 36
     protected function schedule(Schedule $schedule)
37 37
     {
38 38
         $schedule->command('reshoot:offlineSms')
39
-                 ->hourly();
39
+                    ->hourly();
40 40
 
41 41
         $schedule->command('birthday:sms')
42
-                 ->dailyAt('00:01');
42
+                    ->dailyAt('00:01');
43 43
 
44 44
         $schedule->command('set:expired')
45
-                 ->dailyAt('00:05');
45
+                    ->dailyAt('00:05');
46 46
 
47 47
         $schedule->command('sms:event')
48
-                 ->dailyAt('09:00');
48
+                    ->dailyAt('09:00');
49 49
 
50 50
         $schedule->command('sms:expiring')
51
-                 ->dailyAt('10:00');
51
+                    ->dailyAt('10:00');
52 52
 
53 53
         $schedule->command('expense:alert')
54
-                 ->dailyAt('10:30')
55
-                 ->when(function () {
56
-                     return \Utilities::getSetting('primary_contact') != null;
57
-                 });
54
+                    ->dailyAt('10:30')
55
+                    ->when(function () {
56
+                        return \Utilities::getSetting('primary_contact') != null;
57
+                    });
58 58
 
59 59
         $schedule->command('pending:invoice')
60
-                 ->dailyAt('11:00');
60
+                    ->dailyAt('11:00');
61 61
 
62 62
         $schedule->command('followup:sms')
63
-                 ->dailyAt('11:30');
63
+                    ->dailyAt('11:30');
64 64
 
65 65
         $schedule->command('sms:expired')
66
-                 ->dailyAt('11:45');
66
+                    ->dailyAt('11:45');
67 67
 
68 68
         $schedule->command('repeat:expense')
69
-                 ->dailyAt('23:00');
69
+                    ->dailyAt('23:00');
70 70
 
71 71
         $schedule->command('sms:status')
72
-                 ->dailyAt('23:45');
72
+                    ->dailyAt('23:45');
73 73
     }
74 74
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 
53 53
         $schedule->command('expense:alert')
54 54
                  ->dailyAt('10:30')
55
-                 ->when(function () {
55
+                 ->when(function() {
56 56
                      return \Utilities::getSetting('primary_contact') != null;
57 57
                  });
58 58
 
Please login to merge, or discard this patch.
app/Console/Commands/RepeatExpense.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -44,53 +44,53 @@
 block discarded – undo
44 44
         foreach ($expenses as $expense) {
45 45
             if ($expense->repeat == 1) {
46 46
                 $expenseData = ['name' => $expense->name,
47
-                                     'category_id' => $expense->category_id,
48
-                                     'due_date' => $expense->due_date->addDays(1),
49
-                                     'repeat' => $expense->repeat,
50
-                                     'note' => $expense->note,
51
-                                     'amount' => $expense->amount,
52
-                                     'paid' => 0,
53
-                                     'created_by' => 1,
54
-                                     'updated_by' => 1, ];
47
+                                        'category_id' => $expense->category_id,
48
+                                        'due_date' => $expense->due_date->addDays(1),
49
+                                        'repeat' => $expense->repeat,
50
+                                        'note' => $expense->note,
51
+                                        'amount' => $expense->amount,
52
+                                        'paid' => 0,
53
+                                        'created_by' => 1,
54
+                                        'updated_by' => 1, ];
55 55
 
56 56
                 $newExpense = new Expense($expenseData);
57 57
                 $newExpense->save();
58 58
             } elseif ($expense->repeat == 2) {
59 59
                 $expenseData = ['name' => $expense->name,
60
-                                     'category_id' => $expense->category_id,
61
-                                     'due_date' => $expense->due_date->addWeek(),
62
-                                     'repeat' => $expense->repeat,
63
-                                     'note' => $expense->note,
64
-                                     'amount' => $expense->amount,
65
-                                     'paid' => 0,
66
-                                     'created_by' => 1,
67
-                                     'updated_by' => 1, ];
60
+                                        'category_id' => $expense->category_id,
61
+                                        'due_date' => $expense->due_date->addWeek(),
62
+                                        'repeat' => $expense->repeat,
63
+                                        'note' => $expense->note,
64
+                                        'amount' => $expense->amount,
65
+                                        'paid' => 0,
66
+                                        'created_by' => 1,
67
+                                        'updated_by' => 1, ];
68 68
 
69 69
                 $newExpense = new Expense($expenseData);
70 70
                 $newExpense->save();
71 71
             } elseif ($expense->repeat == 3) {
72 72
                 $expenseData = ['name' => $expense->name,
73
-                                     'category_id' => $expense->category_id,
74
-                                     'due_date' => $expense->due_date->addMonth(),
75
-                                     'repeat' => $expense->repeat,
76
-                                     'note' => $expense->note,
77
-                                     'amount' => $expense->amount,
78
-                                     'paid' => 0,
79
-                                     'created_by' => 1,
80
-                                     'updated_by' => 1, ];
73
+                                        'category_id' => $expense->category_id,
74
+                                        'due_date' => $expense->due_date->addMonth(),
75
+                                        'repeat' => $expense->repeat,
76
+                                        'note' => $expense->note,
77
+                                        'amount' => $expense->amount,
78
+                                        'paid' => 0,
79
+                                        'created_by' => 1,
80
+                                        'updated_by' => 1, ];
81 81
 
82 82
                 $newExpense = new Expense($expenseData);
83 83
                 $newExpense->save();
84 84
             } elseif ($expense->repeat == 4) {
85 85
                 $expenseData = ['name' => $expense->name,
86
-                                     'category_id' => $expense->category_id,
87
-                                     'due_date' => $expense->due_date->addYear(),
88
-                                     'repeat' => $expense->repeat,
89
-                                     'note' => $expense->note,
90
-                                     'amount' => $expense->amount,
91
-                                     'paid' => 0,
92
-                                     'created_by' => 1,
93
-                                     'updated_by' => 1, ];
86
+                                        'category_id' => $expense->category_id,
87
+                                        'due_date' => $expense->due_date->addYear(),
88
+                                        'repeat' => $expense->repeat,
89
+                                        'note' => $expense->note,
90
+                                        'amount' => $expense->amount,
91
+                                        'paid' => 0,
92
+                                        'created_by' => 1,
93
+                                        'updated_by' => 1, ];
94 94
 
95 95
                 $newExpense = new Expense($expenseData);
96 96
                 $newExpense->save();
Please login to merge, or discard this patch.
app/Payment_detail.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
             'invoice_id',
17 17
             'created_by',
18 18
             'updated_by',
19
-     ];
19
+        ];
20 20
 
21 21
     //Eloquence Search mapping
22 22
     use Eloquence;
@@ -34,16 +34,16 @@  discard block
 block discarded – undo
34 34
 
35 35
         if ($drp_start == null or $drp_end == null) {
36 36
             return $query->leftJoin('trn_invoice', 'trn_payment_details.invoice_id', '=', 'trn_invoice.id')
37
-                         ->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')
38
-                         ->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')
39
-                         ->orderBy($sorting_field, $sorting_direction);
37
+                            ->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')
38
+                            ->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')
39
+                            ->orderBy($sorting_field, $sorting_direction);
40 40
         }
41 41
 
42 42
         return $query->leftJoin('trn_invoice', 'trn_payment_details.invoice_id', '=', 'trn_invoice.id')
43
-                     ->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')
44
-                     ->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')
45
-                     ->whereBetween('trn_payment_details.created_at', [$drp_start, $drp_end])
46
-                     ->orderBy($sorting_field, $sorting_direction);
43
+                        ->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')
44
+                        ->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')
45
+                        ->whereBetween('trn_payment_details.created_at', [$drp_start, $drp_end])
46
+                        ->orderBy($sorting_field, $sorting_direction);
47 47
     }
48 48
 
49 49
     public function createdBy()
Please login to merge, or discard this patch.
app/Http/routes.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 //API routes
26 26
 Route::post('api/token', 'Api\AuthenticateController@authenticate');
27 27
 
28
-Route::group(['prefix' => 'api', 'middleware' => ['jwt.auth']], function () {
28
+Route::group(['prefix' => 'api', 'middleware' => ['jwt.auth']], function() {
29 29
     Route::get('dashboard', 'Api\DashboardController@index');
30 30
     Route::get('members', 'Api\MembersController@index');
31 31
     Route::get('subscriptions', 'Api\SubscriptionsController@index');
@@ -53,21 +53,21 @@  discard block
 block discarded – undo
53 53
 });
54 54
 
55 55
 //Auth routes
56
-Route::group(['prefix' => 'auth'], function () {
56
+Route::group(['prefix' => 'auth'], function() {
57 57
     Route::get('login', 'Auth\AuthController@getLogin');
58 58
     Route::post('login', 'Auth\AuthController@postLogin');
59 59
     Route::get('logout', 'Auth\AuthController@getLogout');
60 60
 });
61 61
 
62 62
 //dashboard
63
-Route::group(['middleware' => ['auth']], function () {
63
+Route::group(['middleware' => ['auth']], function() {
64 64
     Route::get('/', 'DashboardController@index');
65 65
     Route::get('/dashboard', 'DashboardController@index');
66 66
     Route::post('/dashboard/smsRequest', 'DashboardController@smsRequest');
67 67
 });
68 68
 
69 69
 //MembersController
70
-Route::group(['prefix' => 'members', 'middleware' => ['auth']], function () {
70
+Route::group(['prefix' => 'members', 'middleware' => ['auth']], function() {
71 71
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@index']);
72 72
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@index']);
73 73
     Route::get('active', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@active']);
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 });
83 83
 
84 84
 //ReportsController
85
-Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function () {
85
+Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function() {
86 86
     Route::get('members/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@gymMemberCharts']);
87 87
     Route::get('members/data', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@gymMemberData']);
88 88
     Route::get('enquiries/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@enquiryCharts']);
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 });
99 99
 
100 100
 //SmsController
101
-Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function () {
101
+Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function() {
102 102
     Route::get('triggers', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggersIndex']);
103 103
     Route::post('triggers/update', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggerUpdate']);
104 104
     Route::get('events', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@eventsIndex']);
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 });
115 115
 
116 116
 //enquiries
117
-Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function () {
117
+Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function() {
118 118
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']);
119 119
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']);
120 120
     Route::get('create', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'], 'uses' => 'EnquiriesController@create']);
@@ -127,13 +127,13 @@  discard block
 block discarded – undo
127 127
 });
128 128
 
129 129
 //followups
130
-Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function () {
130
+Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function() {
131 131
     Route::post('followups', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry-followup'], 'uses' => 'FollowupsController@store']);
132 132
     Route::post('followups/{id}/update', ['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry-followup'], 'uses' => 'FollowupsController@update']);
133 133
 });
134 134
 
135 135
 //plans
136
-Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function () {
136
+Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function() {
137 137
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']);
138 138
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']);
139 139
     Route::get('show', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@show']);
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 // });
163 163
 
164 164
 //subsciptions
165
-Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function () {
165
+Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function() {
166 166
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']);
167 167
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']);
168 168
     Route::get('expiring', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@expiring']);
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
 });
181 181
 
182 182
 //invoices
183
-Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function () {
183
+Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function() {
184 184
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']);
185 185
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']);
186 186
     Route::get('paid', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@paid']);
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 // Route::get('access_logs/create','Access_logsController@create');
201 201
 
202 202
 //payments
203
-Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function () {
203
+Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function() {
204 204
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']);
205 205
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']);
206 206
     Route::get('show', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@show']);
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 // });
228 228
 
229 229
 //expenses
230
-Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function () {
230
+Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function() {
231 231
     Route::get('/', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']);
232 232
     Route::get('all', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']);
233 233
     Route::get('show', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@show']);
@@ -247,14 +247,14 @@  discard block
 block discarded – undo
247 247
 });
248 248
 
249 249
 //settings
250
-Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function () {
250
+Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function() {
251 251
     Route::get('/', 'SettingsController@show');
252 252
     Route::get('edit', 'SettingsController@edit');
253 253
     Route::post('save', 'SettingsController@save');
254 254
 });
255 255
 
256 256
 //User Module with roles & permissions
257
-Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () {
257
+Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() {
258 258
     //User
259 259
     Route::get('/', 'AclController@userIndex');
260 260
     Route::get('create', 'AclController@createUser');
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
     Route::post('{id}/delete', 'AclController@deleteUser');
265 265
 });
266 266
 
267
-Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () {
267
+Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() {
268 268
     //Roles
269 269
     Route::get('/', 'AclController@roleIndex');
270 270
     Route::get('create', 'AclController@createRole');
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
     Route::post('{id}/delete', 'AclController@deleteRole');
275 275
 });
276 276
 
277
-Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function () {
277
+Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function() {
278 278
     //Permissions
279 279
     Route::get('/', 'AclController@permissionIndex');
280 280
     Route::get('create', 'AclController@createPermission');
Please login to merge, or discard this patch.
app/Http/Controllers/PaymentsController.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
             if ($request->mode == \constPaymentMode::Cheque) {
53 53
                 // Store Cheque Details
54 54
                 $chequeData = ['payment_id'=> $payment_detail->id,
55
-                                  'number'=> $request->number,
56
-                                  'date'=> $request->date,
57
-                                  'status'=> \constChequeStatus::Recieved, ];
55
+                                    'number'=> $request->number,
56
+                                    'date'=> $request->date,
57
+                                    'status'=> \constChequeStatus::Recieved, ];
58 58
 
59 59
                 $cheque_details = new Cheque_detail($chequeData);
60 60
                 $cheque_details->createdBy()->associate(Auth::user());
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
                 // Store Cheque Details
135 135
                 $cheque_detail = Cheque_detail::where('payment_id', $id)->first();
136 136
                 $cheque_detail->update(['number' => $request->number,
137
-                                      'date' => $request->date,
137
+                                        'date' => $request->date,
138 138
                                     ]);
139 139
                 $cheque_detail->updatedBy()->associate(Auth::user());
140 140
                 $cheque_detail->save();
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 
180 180
             $invoice_total = $invoice->total;
181 181
             $payment_total = Payment_detail::leftJoin('trn_cheque_details', 'trn_payment_details.id', '=', 'trn_cheque_details.payment_id')
182
-                                           ->whereRaw("trn_payment_details.invoice_id = $invoice->id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
183
-                                           ->sum('trn_payment_details.payment_amount');
182
+                                            ->whereRaw("trn_payment_details.invoice_id = $invoice->id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
183
+                                            ->sum('trn_payment_details.payment_amount');
184 184
 
185 185
             $amount_due = $invoice_total - $payment_total;
186 186
 
@@ -224,8 +224,8 @@  discard block
 block discarded – undo
224 224
             $invoice_total = $payment_detail->invoice->total;
225 225
 
226 226
             $payment_total = Payment_detail::leftJoin('trn_cheque_details', 'trn_payment_details.id', '=', 'trn_cheque_details.payment_id')
227
-                                           ->whereRaw("trn_payment_details.invoice_id = $payment_detail->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
228
-                                           ->sum('trn_payment_details.payment_amount');
227
+                                            ->whereRaw("trn_payment_details.invoice_id = $payment_detail->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
228
+                                            ->sum('trn_payment_details.payment_amount');
229 229
 
230 230
             $amount_due = $invoice_total - $payment_total;
231 231
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
         $paymentTotal = Payment_detail::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
24 24
         $count = $paymentTotal->sum('payment_amount');
25 25
 
26
-        if (! $request->has('drp_start') or ! $request->has('drp_end')) {
26
+        if (!$request->has('drp_start') or !$request->has('drp_end')) {
27 27
             $drp_placeholder = 'Select daterange filter';
28 28
         } else {
29 29
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
Please login to merge, or discard this patch.
app/Http/Controllers/InvoicesController.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -167,23 +167,23 @@
 block discarded – undo
167 167
         try {
168 168
             $invoice_total = $request->admission_amount + $request->subscription_amount + $request->taxes_amount - $request->discount_amount;
169 169
             $already_paid = Payment_detail::leftJoin('trn_cheque_details', 'trn_payment_details.id', '=', 'trn_cheque_details.payment_id')
170
-                                       ->whereRaw("trn_payment_details.invoice_id = $id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
171
-                                       ->sum('trn_payment_details.payment_amount');
170
+                                        ->whereRaw("trn_payment_details.invoice_id = $id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)")
171
+                                        ->sum('trn_payment_details.payment_amount');
172 172
 
173 173
             $pending = $invoice_total - $already_paid;
174 174
 
175 175
             $status = \Utilities::setInvoiceStatus($pending, $invoice_total);
176 176
 
177 177
             Invoice::where('id', $id)->update(['invoice_number'=> $request->invoice_number,
178
-                                         'total'=> $invoice_total,
179
-                                         'status'=> $status,
180
-                                         'pending_amount'=> $pending,
181
-                                         'discount_amount'=> $request->discount_amount,
182
-                                         'discount_percent'=> $request->discount_percent,
183
-                                         'discount_note'=> $request->discount_note,
184
-                                         'tax'=> $request->taxes_amount,
185
-                                         'additional_fees'=> $request->additional_fees,
186
-                                         'note'=>' ', ]);
178
+                                            'total'=> $invoice_total,
179
+                                            'status'=> $status,
180
+                                            'pending_amount'=> $pending,
181
+                                            'discount_amount'=> $request->discount_amount,
182
+                                            'discount_percent'=> $request->discount_percent,
183
+                                            'discount_note'=> $request->discount_note,
184
+                                            'tax'=> $request->taxes_amount,
185
+                                            'additional_fees'=> $request->additional_fees,
186
+                                            'note'=>' ', ]);
187 187
 
188 188
             DB::commit();
189 189
             flash()->success('Discount was successfully updated');
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
         $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get();
28 28
         $count = $invoicesTotal->count();
29 29
 
30
-        if (! $request->has('drp_start') or ! $request->has('drp_end')) {
30
+        if (!$request->has('drp_start') or !$request->has('drp_end')) {
31 31
             $drp_placeholder = 'Select daterange filter';
32 32
         } else {
33 33
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
         $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();
45 45
         $count = $invoicesTotal->count();
46 46
 
47
-        if (! $request->has('drp_start') or ! $request->has('drp_end')) {
47
+        if (!$request->has('drp_start') or !$request->has('drp_end')) {
48 48
             $drp_placeholder = 'Select daterange filter';
49 49
         } else {
50 50
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         $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();
62 62
         $count = $invoicesTotal->count();
63 63
 
64
-        if (! $request->has('drp_start') or ! $request->has('drp_end')) {
64
+        if (!$request->has('drp_start') or !$request->has('drp_end')) {
65 65
             $drp_placeholder = 'Select daterange filter';
66 66
         } else {
67 67
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
         $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();
79 79
         $count = $invoicesTotal->count();
80 80
 
81
-        if (! $request->has('drp_start') or ! $request->has('drp_end')) {
81
+        if (!$request->has('drp_start') or !$request->has('drp_end')) {
82 82
             $drp_placeholder = 'Select daterange filter';
83 83
         } else {
84 84
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         $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();
96 96
         $count = $invoicesTotal->count();
97 97
 
98
-        if (! $request->has('drp_start') or ! $request->has('drp_end')) {
98
+        if (!$request->has('drp_start') or !$request->has('drp_end')) {
99 99
             $drp_placeholder = 'Select daterange filter';
100 100
         } else {
101 101
             $drp_placeholder = $request->drp_start.' - '.$request->drp_end;
Please login to merge, or discard this patch.
app/Http/Controllers/DataMigrationController.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -153,18 +153,18 @@  discard block
 block discarded – undo
153 153
                 }
154 154
 
155 155
                 $invoice = Invoice::create(['invoice_number'=> $invoice_number,
156
-                                             'member_id'=> $member->id,
157
-                                             'total'=> $invoice_total,
158
-                                             'status'=> $paymentStatus,
159
-                                             'pending_amount'=> $pending,
160
-                                             'discount_amount'=> $discount,
161
-                                             'discount_percent'=> $discountPercent,
162
-                                             'discount_note'=> null,
163
-                                             'tax'=> ($tax_percent / 100) * $invoice_total,
164
-                                             'additional_fees'=> '0',
165
-                                             'note'=> null,
166
-                                             'created_by'=> Auth::user()->id,
167
-                                             'updated_by'=> Auth::user()->id,
156
+                                                'member_id'=> $member->id,
157
+                                                'total'=> $invoice_total,
158
+                                                'status'=> $paymentStatus,
159
+                                                'pending_amount'=> $pending,
160
+                                                'discount_amount'=> $discount,
161
+                                                'discount_percent'=> $discountPercent,
162
+                                                'discount_note'=> null,
163
+                                                'tax'=> ($tax_percent / 100) * $invoice_total,
164
+                                                'additional_fees'=> '0',
165
+                                                'note'=> null,
166
+                                                'created_by'=> Auth::user()->id,
167
+                                                'updated_by'=> Auth::user()->id,
168 168
                                             ]);
169 169
 
170 170
                 $start_date = Carbon::createFromFormat('d/m/Y', $line->get('start_date'));
@@ -198,19 +198,19 @@  discard block
 block discarded – undo
198 198
                                                     ]);
199 199
 
200 200
                 $invoiceDetail = Invoice_detail::create(['invoice_id'=> $invoice->id,
201
-                                                       'plan_id'=> (int) $planId,
202
-                                                       'item_amount'=> $line->get('total_amount'),
203
-                                                       'item_amount'=> $line->get('total_amount'),
204
-                                                       'created_by'=> Auth::user()->id,
205
-                                                       'updated_by'=> Auth::user()->id,
201
+                                                        'plan_id'=> (int) $planId,
202
+                                                        'item_amount'=> $line->get('total_amount'),
203
+                                                        'item_amount'=> $line->get('total_amount'),
204
+                                                        'created_by'=> Auth::user()->id,
205
+                                                        'updated_by'=> Auth::user()->id,
206 206
                                                         ]);
207 207
 
208 208
                 $paymentDetail = Payment_detail::create(['invoice_id'=> $invoice->id,
209
-                                                         'payment_amount'=> $payment_amount,
210
-                                                         'mode'=> '1',
211
-                                                         'note'=> ' ',
212
-                                                         'created_by'=> Auth::user()->id,
213
-                                                         'updated_by'=> Auth::user()->id,
209
+                                                            'payment_amount'=> $payment_amount,
210
+                                                            'mode'=> '1',
211
+                                                            'note'=> ' ',
212
+                                                            'created_by'=> Auth::user()->id,
213
+                                                            'updated_by'=> Auth::user()->id,
214 214
                                                         ]);
215 215
 
216 216
                 Setting::where('key', '=', 'invoice_last_number')->update(['value' => $invoiceCounter]);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -144,11 +144,11 @@
 block discarded – undo
144 144
                     $paymentStatus = \constPaymentStatus::Overpaid;
145 145
                 }
146 146
 
147
-                if (empty($line->discount_percent) && ! empty($line->discount_amount)) {
147
+                if (empty($line->discount_percent) && !empty($line->discount_amount)) {
148 148
                     $discountPercent = 'custom';
149 149
                 } elseif (empty($line->discount_percent) && empty($line->discount_amount)) {
150 150
                     $discountPercent = '0';
151
-                } elseif (! empty($line->discount_percent)) {
151
+                } elseif (!empty($line->discount_percent)) {
152 152
                     $discountPercent = str_replace('%', '', $line->discount_percent);
153 153
                 }
154 154
 
Please login to merge, or discard this patch.