@@ -11,7 +11,7 @@ |
||
11 | 11 | protected $fillable = [ |
12 | 12 | 'key', |
13 | 13 | 'value', |
14 | - ]; |
|
14 | + ]; |
|
15 | 15 | |
16 | 16 | const CREATED_AT = null; |
17 | 17 |
@@ -9,7 +9,7 @@ |
||
9 | 9 | { |
10 | 10 | public function applyFilter(Image $image) |
11 | 11 | { |
12 | - return $image->resize(150, null, function ($constraint) { |
|
12 | + return $image->resize(150, null, function($constraint) { |
|
13 | 13 | $constraint->aspectRatio(); |
14 | 14 | })->encode('jpg', 100); |
15 | 15 | } |
@@ -650,11 +650,11 @@ |
||
650 | 650 | if (str_contains($response, 'SMS-SHOOT-ID')) { |
651 | 651 | //Log entry for SMS_log table |
652 | 652 | $log->update(['shoot_id' => substr($response, strpos($response, 'SMS-SHOOT-ID/') + 13), |
653 | - 'number' => $member_contact, |
|
654 | - 'message' => $sms_text, |
|
655 | - 'sender_id' => $sender_id, |
|
656 | - 'send_time' => Carbon::now(), |
|
657 | - 'status' => 'NA', ]); |
|
653 | + 'number' => $member_contact, |
|
654 | + 'message' => $sms_text, |
|
655 | + 'sender_id' => $sender_id, |
|
656 | + 'send_time' => Carbon::now(), |
|
657 | + 'status' => 'NA', ]); |
|
658 | 658 | $log->save(); |
659 | 659 | } |
660 | 660 | //Update SMS balance |
@@ -43,13 +43,13 @@ discard block |
||
43 | 43 | public static function getFollowUpStatus($status) |
44 | 44 | { |
45 | 45 | switch ($status) { |
46 | - case '1': |
|
47 | - return 'Done'; |
|
48 | - break; |
|
46 | + case '1': |
|
47 | + return 'Done'; |
|
48 | + break; |
|
49 | 49 | |
50 | - default: |
|
51 | - return 'Pending'; |
|
52 | - break; |
|
50 | + default: |
|
51 | + return 'Pending'; |
|
52 | + break; |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
@@ -57,17 +57,17 @@ discard block |
||
57 | 57 | public static function getFollowupBy($followUpBy) |
58 | 58 | { |
59 | 59 | switch ($followUpBy) { |
60 | - case '1': |
|
61 | - return 'SMS'; |
|
62 | - break; |
|
60 | + case '1': |
|
61 | + return 'SMS'; |
|
62 | + break; |
|
63 | 63 | |
64 | - case '2': |
|
65 | - return 'Personal'; |
|
66 | - break; |
|
64 | + case '2': |
|
65 | + return 'Personal'; |
|
66 | + break; |
|
67 | 67 | |
68 | - default: |
|
69 | - return 'Call'; |
|
70 | - break; |
|
68 | + default: |
|
69 | + return 'Call'; |
|
70 | + break; |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | |
@@ -75,13 +75,13 @@ discard block |
||
75 | 75 | public static function getIconBg($status) |
76 | 76 | { |
77 | 77 | switch ($status) { |
78 | - case '1': |
|
79 | - return 'bg-blue-400 border-blue-700'; |
|
80 | - break; |
|
78 | + case '1': |
|
79 | + return 'bg-blue-400 border-blue-700'; |
|
80 | + break; |
|
81 | 81 | |
82 | - default: |
|
83 | - return 'bg-orange-400 border-orange-700'; |
|
84 | - break; |
|
82 | + default: |
|
83 | + return 'bg-orange-400 border-orange-700'; |
|
84 | + break; |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
@@ -89,13 +89,13 @@ discard block |
||
89 | 89 | public static function getStatusIcon($status) |
90 | 90 | { |
91 | 91 | switch ($status) { |
92 | - case '1': |
|
93 | - return 'fa fa-thumbs-up'; |
|
94 | - break; |
|
92 | + case '1': |
|
93 | + return 'fa fa-thumbs-up'; |
|
94 | + break; |
|
95 | 95 | |
96 | - default: |
|
97 | - return 'fa fa-refresh'; |
|
98 | - break; |
|
96 | + default: |
|
97 | + return 'fa fa-refresh'; |
|
98 | + break; |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
@@ -103,29 +103,29 @@ discard block |
||
103 | 103 | public static function getAim($aim) |
104 | 104 | { |
105 | 105 | switch ($aim) { |
106 | - case '1': |
|
107 | - return 'Networking'; |
|
108 | - break; |
|
106 | + case '1': |
|
107 | + return 'Networking'; |
|
108 | + break; |
|
109 | 109 | |
110 | - case '2': |
|
111 | - return 'Body Building'; |
|
112 | - break; |
|
110 | + case '2': |
|
111 | + return 'Body Building'; |
|
112 | + break; |
|
113 | 113 | |
114 | - case '3': |
|
115 | - return 'Fatloss'; |
|
116 | - break; |
|
114 | + case '3': |
|
115 | + return 'Fatloss'; |
|
116 | + break; |
|
117 | 117 | |
118 | - case '4': |
|
119 | - return 'Weightgain'; |
|
120 | - break; |
|
118 | + case '4': |
|
119 | + return 'Weightgain'; |
|
120 | + break; |
|
121 | 121 | |
122 | - case '5': |
|
123 | - return 'Others'; |
|
124 | - break; |
|
122 | + case '5': |
|
123 | + return 'Others'; |
|
124 | + break; |
|
125 | 125 | |
126 | - default: |
|
127 | - return 'Fitness'; |
|
128 | - break; |
|
126 | + default: |
|
127 | + return 'Fitness'; |
|
128 | + break; |
|
129 | 129 | } |
130 | 130 | } |
131 | 131 | |
@@ -133,21 +133,21 @@ discard block |
||
133 | 133 | public static function getInvoiceLabel($status) |
134 | 134 | { |
135 | 135 | switch ($status) { |
136 | - case '0': |
|
137 | - return 'label label-danger'; |
|
138 | - break; |
|
136 | + case '0': |
|
137 | + return 'label label-danger'; |
|
138 | + break; |
|
139 | 139 | |
140 | - case '1': |
|
141 | - return 'label label-success'; |
|
142 | - break; |
|
140 | + case '1': |
|
141 | + return 'label label-success'; |
|
142 | + break; |
|
143 | 143 | |
144 | - case '3': |
|
145 | - return 'label label-default'; |
|
146 | - break; |
|
144 | + case '3': |
|
145 | + return 'label label-default'; |
|
146 | + break; |
|
147 | 147 | |
148 | - default: |
|
149 | - return 'label label-primary'; |
|
150 | - break; |
|
148 | + default: |
|
149 | + return 'label label-primary'; |
|
150 | + break; |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
@@ -155,25 +155,25 @@ discard block |
||
155 | 155 | public static function expenseRepeatIntervel($repeat) |
156 | 156 | { |
157 | 157 | switch ($repeat) { |
158 | - case '0': |
|
159 | - return 'Never Repeat'; |
|
160 | - break; |
|
158 | + case '0': |
|
159 | + return 'Never Repeat'; |
|
160 | + break; |
|
161 | 161 | |
162 | - case '1': |
|
163 | - return 'Every Day'; |
|
164 | - break; |
|
162 | + case '1': |
|
163 | + return 'Every Day'; |
|
164 | + break; |
|
165 | 165 | |
166 | - case '2': |
|
167 | - return 'Every Week'; |
|
168 | - break; |
|
166 | + case '2': |
|
167 | + return 'Every Week'; |
|
168 | + break; |
|
169 | 169 | |
170 | - case '3': |
|
171 | - return 'Every Month'; |
|
172 | - break; |
|
170 | + case '3': |
|
171 | + return 'Every Month'; |
|
172 | + break; |
|
173 | 173 | |
174 | - default: |
|
175 | - return 'Every Year'; |
|
176 | - break; |
|
174 | + default: |
|
175 | + return 'Every Year'; |
|
176 | + break; |
|
177 | 177 | } |
178 | 178 | } |
179 | 179 | |
@@ -181,13 +181,13 @@ discard block |
||
181 | 181 | public static function getPaidUnpaid($status) |
182 | 182 | { |
183 | 183 | switch ($status) { |
184 | - case '0': |
|
185 | - return 'label label-danger'; |
|
186 | - break; |
|
184 | + case '0': |
|
185 | + return 'label label-danger'; |
|
186 | + break; |
|
187 | 187 | |
188 | - default: |
|
189 | - return 'label label-primary'; |
|
190 | - break; |
|
188 | + default: |
|
189 | + return 'label label-primary'; |
|
190 | + break; |
|
191 | 191 | } |
192 | 192 | } |
193 | 193 | |
@@ -195,13 +195,13 @@ discard block |
||
195 | 195 | public static function getActiveInactive($status) |
196 | 196 | { |
197 | 197 | switch ($status) { |
198 | - case '0': |
|
199 | - return 'label label-danger'; |
|
200 | - break; |
|
198 | + case '0': |
|
199 | + return 'label label-danger'; |
|
200 | + break; |
|
201 | 201 | |
202 | - default: |
|
203 | - return 'label label-primary'; |
|
204 | - break; |
|
202 | + default: |
|
203 | + return 'label label-primary'; |
|
204 | + break; |
|
205 | 205 | } |
206 | 206 | } |
207 | 207 | |
@@ -209,29 +209,29 @@ discard block |
||
209 | 209 | public static function getOccupation($occupation) |
210 | 210 | { |
211 | 211 | switch ($occupation) { |
212 | - case '1': |
|
213 | - return 'Housewife'; |
|
214 | - break; |
|
212 | + case '1': |
|
213 | + return 'Housewife'; |
|
214 | + break; |
|
215 | 215 | |
216 | - case '2': |
|
217 | - return 'Self Employed'; |
|
218 | - break; |
|
216 | + case '2': |
|
217 | + return 'Self Employed'; |
|
218 | + break; |
|
219 | 219 | |
220 | - case '3': |
|
221 | - return 'Professional'; |
|
222 | - break; |
|
220 | + case '3': |
|
221 | + return 'Professional'; |
|
222 | + break; |
|
223 | 223 | |
224 | - case '4': |
|
225 | - return 'Freelancer'; |
|
226 | - break; |
|
224 | + case '4': |
|
225 | + return 'Freelancer'; |
|
226 | + break; |
|
227 | 227 | |
228 | - case '5': |
|
229 | - return 'Others'; |
|
230 | - break; |
|
228 | + case '5': |
|
229 | + return 'Others'; |
|
230 | + break; |
|
231 | 231 | |
232 | - default: |
|
233 | - return 'Student'; |
|
234 | - break; |
|
232 | + default: |
|
233 | + return 'Student'; |
|
234 | + break; |
|
235 | 235 | } |
236 | 236 | } |
237 | 237 | |
@@ -239,17 +239,17 @@ discard block |
||
239 | 239 | public static function getSource($source) |
240 | 240 | { |
241 | 241 | switch ($source) { |
242 | - case '1': |
|
243 | - return 'Word of mouth'; |
|
244 | - break; |
|
242 | + case '1': |
|
243 | + return 'Word of mouth'; |
|
244 | + break; |
|
245 | 245 | |
246 | - case '2': |
|
247 | - return 'Others'; |
|
248 | - break; |
|
246 | + case '2': |
|
247 | + return 'Others'; |
|
248 | + break; |
|
249 | 249 | |
250 | - default: |
|
251 | - return 'Promotions'; |
|
252 | - break; |
|
250 | + default: |
|
251 | + return 'Promotions'; |
|
252 | + break; |
|
253 | 253 | } |
254 | 254 | } |
255 | 255 | |
@@ -257,17 +257,17 @@ discard block |
||
257 | 257 | public static function getStatusValue($status) |
258 | 258 | { |
259 | 259 | switch ($status) { |
260 | - case '0': |
|
261 | - return 'Inactive'; |
|
262 | - break; |
|
260 | + case '0': |
|
261 | + return 'Inactive'; |
|
262 | + break; |
|
263 | 263 | |
264 | - case '2': |
|
265 | - return 'Archived'; |
|
266 | - break; |
|
264 | + case '2': |
|
265 | + return 'Archived'; |
|
266 | + break; |
|
267 | 267 | |
268 | - default: |
|
269 | - return 'Active'; |
|
270 | - break; |
|
268 | + default: |
|
269 | + return 'Active'; |
|
270 | + break; |
|
271 | 271 | } |
272 | 272 | } |
273 | 273 | |
@@ -275,17 +275,17 @@ discard block |
||
275 | 275 | public static function getEnquiryStatus($status) |
276 | 276 | { |
277 | 277 | switch ($status) { |
278 | - case '0': |
|
279 | - return 'Lost'; |
|
280 | - break; |
|
278 | + case '0': |
|
279 | + return 'Lost'; |
|
280 | + break; |
|
281 | 281 | |
282 | - case '2': |
|
283 | - return 'Member'; |
|
284 | - break; |
|
282 | + case '2': |
|
283 | + return 'Member'; |
|
284 | + break; |
|
285 | 285 | |
286 | - default: |
|
287 | - return 'Lead'; |
|
288 | - break; |
|
286 | + default: |
|
287 | + return 'Lead'; |
|
288 | + break; |
|
289 | 289 | } |
290 | 290 | } |
291 | 291 | |
@@ -293,17 +293,17 @@ discard block |
||
293 | 293 | public static function getEnquiryLabel($status) |
294 | 294 | { |
295 | 295 | switch ($status) { |
296 | - case '0': |
|
297 | - return 'label label-danger'; |
|
298 | - break; |
|
296 | + case '0': |
|
297 | + return 'label label-danger'; |
|
298 | + break; |
|
299 | 299 | |
300 | - case '2': |
|
301 | - return 'label label-success'; |
|
302 | - break; |
|
300 | + case '2': |
|
301 | + return 'label label-success'; |
|
302 | + break; |
|
303 | 303 | |
304 | - default: |
|
305 | - return 'label label-primary'; |
|
306 | - break; |
|
304 | + default: |
|
305 | + return 'label label-primary'; |
|
306 | + break; |
|
307 | 307 | } |
308 | 308 | } |
309 | 309 | |
@@ -327,21 +327,21 @@ discard block |
||
327 | 327 | public static function getInvoiceStatus($status) |
328 | 328 | { |
329 | 329 | switch ($status) { |
330 | - case '1': |
|
331 | - return 'Paid'; |
|
332 | - break; |
|
330 | + case '1': |
|
331 | + return 'Paid'; |
|
332 | + break; |
|
333 | 333 | |
334 | - case '2': |
|
335 | - return 'Partial'; |
|
336 | - break; |
|
334 | + case '2': |
|
335 | + return 'Partial'; |
|
336 | + break; |
|
337 | 337 | |
338 | - case '3': |
|
339 | - return 'Overpaid'; |
|
340 | - break; |
|
338 | + case '3': |
|
339 | + return 'Overpaid'; |
|
340 | + break; |
|
341 | 341 | |
342 | - default: |
|
343 | - return 'Unpaid'; |
|
344 | - break; |
|
342 | + default: |
|
343 | + return 'Unpaid'; |
|
344 | + break; |
|
345 | 345 | } |
346 | 346 | } |
347 | 347 | |
@@ -349,21 +349,21 @@ discard block |
||
349 | 349 | public static function getSubscriptionStatus($status) |
350 | 350 | { |
351 | 351 | switch ($status) { |
352 | - case '0': |
|
353 | - return 'Expired'; |
|
354 | - break; |
|
352 | + case '0': |
|
353 | + return 'Expired'; |
|
354 | + break; |
|
355 | 355 | |
356 | - case '2': |
|
357 | - return 'Renewed'; |
|
358 | - break; |
|
356 | + case '2': |
|
357 | + return 'Renewed'; |
|
358 | + break; |
|
359 | 359 | |
360 | - case '3': |
|
361 | - return 'Cancelled'; |
|
362 | - break; |
|
360 | + case '3': |
|
361 | + return 'Cancelled'; |
|
362 | + break; |
|
363 | 363 | |
364 | - default: |
|
365 | - return 'OnGoing'; |
|
366 | - break; |
|
364 | + default: |
|
365 | + return 'OnGoing'; |
|
366 | + break; |
|
367 | 367 | } |
368 | 368 | } |
369 | 369 | |
@@ -371,21 +371,21 @@ discard block |
||
371 | 371 | public static function getSubscriptionLabel($status) |
372 | 372 | { |
373 | 373 | switch ($status) { |
374 | - case '0': |
|
375 | - return 'label label-danger'; |
|
376 | - break; |
|
374 | + case '0': |
|
375 | + return 'label label-danger'; |
|
376 | + break; |
|
377 | 377 | |
378 | - case '2': |
|
379 | - return 'label label-success'; |
|
380 | - break; |
|
378 | + case '2': |
|
379 | + return 'label label-success'; |
|
380 | + break; |
|
381 | 381 | |
382 | - case '3': |
|
383 | - return 'label label-default'; |
|
384 | - break; |
|
382 | + case '3': |
|
383 | + return 'label label-default'; |
|
384 | + break; |
|
385 | 385 | |
386 | - default: |
|
387 | - return 'label label-primary'; |
|
388 | - break; |
|
386 | + default: |
|
387 | + return 'label label-primary'; |
|
388 | + break; |
|
389 | 389 | } |
390 | 390 | } |
391 | 391 | |
@@ -393,13 +393,13 @@ discard block |
||
393 | 393 | public static function getPaymentMode($status) |
394 | 394 | { |
395 | 395 | switch ($status) { |
396 | - case '0': |
|
397 | - return 'Cheque'; |
|
398 | - break; |
|
396 | + case '0': |
|
397 | + return 'Cheque'; |
|
398 | + break; |
|
399 | 399 | |
400 | - default: |
|
401 | - return 'Cash'; |
|
402 | - break; |
|
400 | + default: |
|
401 | + return 'Cash'; |
|
402 | + break; |
|
403 | 403 | } |
404 | 404 | } |
405 | 405 | |
@@ -407,25 +407,25 @@ discard block |
||
407 | 407 | public static function getChequeStatus($status) |
408 | 408 | { |
409 | 409 | switch ($status) { |
410 | - case '1': |
|
411 | - return 'Deposited'; |
|
412 | - break; |
|
410 | + case '1': |
|
411 | + return 'Deposited'; |
|
412 | + break; |
|
413 | 413 | |
414 | - case '2': |
|
415 | - return 'Cleared'; |
|
416 | - break; |
|
414 | + case '2': |
|
415 | + return 'Cleared'; |
|
416 | + break; |
|
417 | 417 | |
418 | - case '3': |
|
419 | - return 'Bounced'; |
|
420 | - break; |
|
418 | + case '3': |
|
419 | + return 'Bounced'; |
|
420 | + break; |
|
421 | 421 | |
422 | - case '4': |
|
423 | - return 'Reissued'; |
|
424 | - break; |
|
422 | + case '4': |
|
423 | + return 'Reissued'; |
|
424 | + break; |
|
425 | 425 | |
426 | - default: |
|
427 | - return 'Recieved'; |
|
428 | - break; |
|
426 | + default: |
|
427 | + return 'Recieved'; |
|
428 | + break; |
|
429 | 429 | } |
430 | 430 | } |
431 | 431 | |
@@ -433,13 +433,13 @@ discard block |
||
433 | 433 | public static function getGender($gender) |
434 | 434 | { |
435 | 435 | switch ($gender) { |
436 | - case 'm': |
|
437 | - return 'Male'; |
|
438 | - break; |
|
436 | + case 'm': |
|
437 | + return 'Male'; |
|
438 | + break; |
|
439 | 439 | |
440 | - case 'f': |
|
441 | - return 'Female'; |
|
442 | - break; |
|
440 | + case 'f': |
|
441 | + return 'Female'; |
|
442 | + break; |
|
443 | 443 | } |
444 | 444 | } |
445 | 445 | |
@@ -447,13 +447,13 @@ discard block |
||
447 | 447 | public static function getDisplay($display) |
448 | 448 | { |
449 | 449 | switch ($display) { |
450 | - case 'gym_logo': |
|
451 | - return 'Gym Logo'; |
|
452 | - break; |
|
450 | + case 'gym_logo': |
|
451 | + return 'Gym Logo'; |
|
452 | + break; |
|
453 | 453 | |
454 | - default: |
|
455 | - return 'Gym Name'; |
|
456 | - break; |
|
454 | + default: |
|
455 | + return 'Gym Name'; |
|
456 | + break; |
|
457 | 457 | } |
458 | 458 | } |
459 | 459 | |
@@ -461,13 +461,13 @@ discard block |
||
461 | 461 | public static function getMode($mode) |
462 | 462 | { |
463 | 463 | switch ($mode) { |
464 | - case '0': |
|
465 | - return 'Manual'; |
|
466 | - break; |
|
464 | + case '0': |
|
465 | + return 'Manual'; |
|
466 | + break; |
|
467 | 467 | |
468 | - default: |
|
469 | - return 'Automatic'; |
|
470 | - break; |
|
468 | + default: |
|
469 | + return 'Automatic'; |
|
470 | + break; |
|
471 | 471 | } |
472 | 472 | } |
473 | 473 |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | $fileName = 'gym_logo.jpg'; |
504 | 504 | $destinationPath = public_path($upload_path); |
505 | 505 | $request->file($upload_field)->move($destinationPath, $fileName); |
506 | - Image::make($destinationPath.'/'.$fileName)->resize(600, null, function ($constraint) { |
|
506 | + Image::make($destinationPath.'/'.$fileName)->resize(600, null, function($constraint) { |
|
507 | 507 | $constraint->aspectRatio(); |
508 | 508 | })->save(); |
509 | 509 | } |
@@ -562,7 +562,7 @@ discard block |
||
562 | 562 | public static function isDomainAvailible($domain) |
563 | 563 | { |
564 | 564 | //check, if a valid url is provided |
565 | - if (! filter_var($domain, FILTER_VALIDATE_URL)) { |
|
565 | + if (!filter_var($domain, FILTER_VALIDATE_URL)) { |
|
566 | 566 | return false; |
567 | 567 | } |
568 | 568 |
@@ -167,23 +167,23 @@ |
||
167 | 167 | try { |
168 | 168 | $invoice_total = $request->admission_amount + $request->subscription_amount + $request->taxes_amount - $request->discount_amount; |
169 | 169 | $already_paid = PaymentDetail::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'); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | $invoices = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10); |
27 | 27 | $count = $invoices->total(); |
28 | 28 | |
29 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
29 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
30 | 30 | $drp_placeholder = 'Select daterange filter'; |
31 | 31 | } else { |
32 | 32 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $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(); |
44 | 44 | $count = $invoicesTotal->count(); |
45 | 45 | |
46 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
46 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
47 | 47 | $drp_placeholder = 'Select daterange filter'; |
48 | 48 | } else { |
49 | 49 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $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(); |
61 | 61 | $count = $invoicesTotal->count(); |
62 | 62 | |
63 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
63 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
64 | 64 | $drp_placeholder = 'Select daterange filter'; |
65 | 65 | } else { |
66 | 66 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $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(); |
78 | 78 | $count = $invoicesTotal->count(); |
79 | 79 | |
80 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
80 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
81 | 81 | $drp_placeholder = 'Select daterange filter'; |
82 | 82 | } else { |
83 | 83 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $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(); |
95 | 95 | $count = $invoicesTotal->count(); |
96 | 96 | |
97 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
97 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
98 | 98 | $drp_placeholder = 'Select daterange filter'; |
99 | 99 | } else { |
100 | 100 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -52,9 +52,9 @@ discard block |
||
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 ChequeDetail($chequeData); |
60 | 60 | $cheque_details->createdBy()->associate(Auth::user()); |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | // Store Cheque Details |
135 | 135 | $cheque_detail = ChequeDetail::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 |
||
179 | 179 | |
180 | 180 | $invoice_total = $invoice->total; |
181 | 181 | $payment_total = PaymentDetail::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 |
||
224 | 224 | $invoice_total = $payment_detail->invoice->total; |
225 | 225 | |
226 | 226 | $payment_total = PaymentDetail::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 |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $paymentTotal = PaymentDetail::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; |
@@ -9,7 +9,7 @@ |
||
9 | 9 | { |
10 | 10 | //Eloquence Search mapping |
11 | 11 | use Eloquence; |
12 | - use createdByUser,updatedByUser; |
|
12 | + use createdByUser, updatedByUser; |
|
13 | 13 | |
14 | 14 | protected $table = 'trn_payment_details'; |
15 | 15 |
@@ -25,7 +25,7 @@ discard block |
||
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 |
||
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 |
||
82 | 82 | }); |
83 | 83 | |
84 | 84 | //SmsController |
85 | -Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function () { |
|
85 | +Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function() { |
|
86 | 86 | Route::get('triggers', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggersIndex']); |
87 | 87 | Route::post('triggers/update', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggerUpdate']); |
88 | 88 | Route::get('events', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@eventsIndex']); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | }); |
99 | 99 | |
100 | 100 | //enquiries |
101 | -Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function () { |
|
101 | +Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function() { |
|
102 | 102 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']); |
103 | 103 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']); |
104 | 104 | Route::get('create', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'], 'uses' => 'EnquiriesController@create']); |
@@ -111,13 +111,13 @@ discard block |
||
111 | 111 | }); |
112 | 112 | |
113 | 113 | //followups |
114 | -Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function () { |
|
114 | +Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function() { |
|
115 | 115 | Route::post('followups', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry-followup'], 'uses' => 'FollowupsController@store']); |
116 | 116 | Route::post('followups/{id}/update', ['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry-followup'], 'uses' => 'FollowupsController@update']); |
117 | 117 | }); |
118 | 118 | |
119 | 119 | //plans |
120 | -Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function () { |
|
120 | +Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function() { |
|
121 | 121 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']); |
122 | 122 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']); |
123 | 123 | Route::get('show', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@show']); |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | }); |
137 | 137 | |
138 | 138 | //subsciptions |
139 | -Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function () { |
|
139 | +Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function() { |
|
140 | 140 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']); |
141 | 141 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']); |
142 | 142 | Route::get('expiring', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@expiring']); |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | }); |
155 | 155 | |
156 | 156 | //invoices |
157 | -Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function () { |
|
157 | +Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function() { |
|
158 | 158 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']); |
159 | 159 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']); |
160 | 160 | Route::get('paid', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@paid']); |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | }); |
170 | 170 | |
171 | 171 | //payments |
172 | -Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function () { |
|
172 | +Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function() { |
|
173 | 173 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']); |
174 | 174 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']); |
175 | 175 | Route::get('show', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@show']); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | }); |
186 | 186 | |
187 | 187 | //expenses |
188 | -Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function () { |
|
188 | +Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function() { |
|
189 | 189 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']); |
190 | 190 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']); |
191 | 191 | Route::get('show', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@show']); |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | }); |
206 | 206 | |
207 | 207 | //settings |
208 | -Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function () { |
|
208 | +Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function() { |
|
209 | 209 | Route::get('/', 'SettingsController@show'); |
210 | 210 | Route::get('edit', 'SettingsController@edit'); |
211 | 211 | Route::post('save', 'SettingsController@save'); |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | |
214 | 214 | //User Module with roles & permissions |
215 | 215 | //User |
216 | -Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () { |
|
216 | +Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() { |
|
217 | 217 | Route::get('/', 'AclController@userIndex'); |
218 | 218 | Route::get('create', 'AclController@createUser'); |
219 | 219 | Route::post('/', 'AclController@storeUser'); |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | }); |
224 | 224 | |
225 | 225 | //Roles |
226 | -Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () { |
|
226 | +Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() { |
|
227 | 227 | Route::get('/', 'AclController@roleIndex'); |
228 | 228 | Route::get('create', 'AclController@createRole'); |
229 | 229 | Route::post('/', 'AclController@storeRole'); |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | }); |
234 | 234 | |
235 | 235 | //Permissions |
236 | -Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function () { |
|
236 | +Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function() { |
|
237 | 237 | Route::get('/', 'AclController@permissionIndex'); |
238 | 238 | Route::get('create', 'AclController@createPermission'); |
239 | 239 | Route::post('/', 'AclController@storePermission'); |
@@ -129,8 +129,8 @@ discard block |
||
129 | 129 | { |
130 | 130 | // Member Model Validation |
131 | 131 | $this->validate($request, ['email' => 'unique:mst_members,email', |
132 | - 'contact' => 'unique:mst_members,contact', |
|
133 | - 'member_code' => 'unique:mst_members,member_code', ]); |
|
132 | + 'contact' => 'unique:mst_members,contact', |
|
133 | + 'member_code' => 'unique:mst_members,member_code', ]); |
|
134 | 134 | |
135 | 135 | // Start Transaction |
136 | 136 | DB::beginTransaction(); |
@@ -187,16 +187,16 @@ discard block |
||
187 | 187 | |
188 | 188 | // Storing Invoice |
189 | 189 | $invoiceData = ['invoice_number'=> $request->invoice_number, |
190 | - 'member_id'=> $member->id, |
|
191 | - 'total'=> $invoice_total, |
|
192 | - 'status'=> $paymentStatus, |
|
193 | - 'pending_amount'=> $pending, |
|
194 | - 'discount_amount'=> $request->discount_amount, |
|
195 | - 'discount_percent'=> $request->discount_percent, |
|
196 | - 'discount_note'=> $request->discount_note, |
|
197 | - 'tax'=> $request->taxes_amount, |
|
198 | - 'additional_fees'=> $request->additional_fees, |
|
199 | - 'note'=>' ', ]; |
|
190 | + 'member_id'=> $member->id, |
|
191 | + 'total'=> $invoice_total, |
|
192 | + 'status'=> $paymentStatus, |
|
193 | + 'pending_amount'=> $pending, |
|
194 | + 'discount_amount'=> $request->discount_amount, |
|
195 | + 'discount_percent'=> $request->discount_percent, |
|
196 | + 'discount_note'=> $request->discount_note, |
|
197 | + 'tax'=> $request->taxes_amount, |
|
198 | + 'additional_fees'=> $request->additional_fees, |
|
199 | + 'note'=>' ', ]; |
|
200 | 200 | |
201 | 201 | $invoice = new Invoice($invoiceData); |
202 | 202 | $invoice->createdBy()->associate(Auth::user()); |
@@ -220,8 +220,8 @@ discard block |
||
220 | 220 | |
221 | 221 | //Adding subscription to invoice(Invoice Details) |
222 | 222 | $detailsData = ['invoice_id'=> $invoice->id, |
223 | - 'plan_id'=> $plan['id'], |
|
224 | - 'item_amount'=> $plan['price'], ]; |
|
223 | + 'plan_id'=> $plan['id'], |
|
224 | + 'item_amount'=> $plan['price'], ]; |
|
225 | 225 | |
226 | 226 | $invoiceDetails = new InvoiceDetail($detailsData); |
227 | 227 | $invoiceDetails->createdBy()->associate(Auth::user()); |
@@ -231,9 +231,9 @@ discard block |
||
231 | 231 | |
232 | 232 | // Store Payment Details |
233 | 233 | $paymentData = ['invoice_id'=> $invoice->id, |
234 | - 'payment_amount'=> $request->payment_amount, |
|
235 | - 'mode'=> $request->mode, |
|
236 | - 'note'=> ' ', ]; |
|
234 | + 'payment_amount'=> $request->payment_amount, |
|
235 | + 'mode'=> $request->mode, |
|
236 | + 'note'=> ' ', ]; |
|
237 | 237 | |
238 | 238 | $paymentDetails = new PaymentDetail($paymentData); |
239 | 239 | $paymentDetails->createdBy()->associate(Auth::user()); |
@@ -243,9 +243,9 @@ discard block |
||
243 | 243 | if ($request->mode == 0) { |
244 | 244 | // Store Cheque Details |
245 | 245 | $chequeData = ['payment_id'=> $paymentDetails->id, |
246 | - 'number'=> $request->number, |
|
247 | - 'date'=> $request->date, |
|
248 | - 'status'=> \constChequeStatus::Recieved, ]; |
|
246 | + 'number'=> $request->number, |
|
247 | + 'date'=> $request->date, |
|
248 | + 'status'=> \constChequeStatus::Recieved, ]; |
|
249 | 249 | |
250 | 250 | $cheque_details = new ChequeDetail($chequeData); |
251 | 251 | $cheque_details->createdBy()->associate(Auth::user()); |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | { |
77 | 77 | // For Tax calculation |
78 | 78 | JavaScript::put([ |
79 | - 'taxes' => \Utilities::getSetting('taxes'), |
|
80 | - 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
81 | - 'servicesCount' => Service::count(), |
|
82 | - ]); |
|
79 | + 'taxes' => \Utilities::getSetting('taxes'), |
|
80 | + 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
81 | + 'servicesCount' => Service::count(), |
|
82 | + ]); |
|
83 | 83 | list($invoice_number_mode, $invoiceCounter, $invoice_number) = $this->generateInvoiceNumber(); |
84 | 84 | |
85 | 85 | return view('subscriptions.create', compact('invoice_number', 'invoiceCounter', 'invoice_number_mode')); |
@@ -109,16 +109,16 @@ discard block |
||
109 | 109 | |
110 | 110 | // Storing Invoice |
111 | 111 | $invoiceData = ['invoice_number'=> $request->invoice_number, |
112 | - 'member_id'=> $request->member_id, |
|
113 | - 'total'=> $invoice_total, |
|
114 | - 'status'=> $paymentStatus, |
|
115 | - 'pending_amount'=> $pending, |
|
116 | - 'discount_amount'=> $request->discount_amount, |
|
117 | - 'discount_percent'=> $request->discount_percent, |
|
118 | - 'discount_note'=> $request->discount_note, |
|
119 | - 'tax'=> $request->taxes_amount, |
|
120 | - 'additional_fees'=> $request->additional_fees, |
|
121 | - 'note'=>' ', ]; |
|
112 | + 'member_id'=> $request->member_id, |
|
113 | + 'total'=> $invoice_total, |
|
114 | + 'status'=> $paymentStatus, |
|
115 | + 'pending_amount'=> $pending, |
|
116 | + 'discount_amount'=> $request->discount_amount, |
|
117 | + 'discount_percent'=> $request->discount_percent, |
|
118 | + 'discount_note'=> $request->discount_note, |
|
119 | + 'tax'=> $request->taxes_amount, |
|
120 | + 'additional_fees'=> $request->additional_fees, |
|
121 | + 'note'=>' ', ]; |
|
122 | 122 | |
123 | 123 | $invoice = new Invoice($invoiceData); |
124 | 124 | $invoice->createdBy()->associate(Auth::user()); |
@@ -142,8 +142,8 @@ discard block |
||
142 | 142 | |
143 | 143 | //Adding subscription to invoice(Invoice Details) |
144 | 144 | $detailsData = ['invoice_id'=> $invoice->id, |
145 | - 'plan_id'=> $plan['id'], |
|
146 | - 'item_amount'=> $plan['price'], ]; |
|
145 | + 'plan_id'=> $plan['id'], |
|
146 | + 'item_amount'=> $plan['price'], ]; |
|
147 | 147 | |
148 | 148 | $invoice_details = new InvoiceDetail($detailsData); |
149 | 149 | $invoice_details->createdBy()->associate(Auth::user()); |
@@ -153,9 +153,9 @@ discard block |
||
153 | 153 | |
154 | 154 | //Payment Details |
155 | 155 | $paymentData = ['invoice_id'=> $invoice->id, |
156 | - 'payment_amount'=> $request->payment_amount, |
|
157 | - 'mode'=> $request->mode, |
|
158 | - 'note'=> ' ', ]; |
|
156 | + 'payment_amount'=> $request->payment_amount, |
|
157 | + 'mode'=> $request->mode, |
|
158 | + 'note'=> ' ', ]; |
|
159 | 159 | |
160 | 160 | $payment_details = new PaymentDetail($paymentData); |
161 | 161 | $payment_details->createdBy()->associate(Auth::user()); |
@@ -267,10 +267,10 @@ discard block |
||
267 | 267 | $gymieDiff = $subscription->end_date->addDays($diff); |
268 | 268 | |
269 | 269 | JavaScript::put([ |
270 | - 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
271 | - 'gymieEndDate' => $subscription->end_date->format('Y-m-d'), |
|
272 | - 'gymieDiff' => $gymieDiff->format('Y-m-d'), |
|
273 | - ]); |
|
270 | + 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
271 | + 'gymieEndDate' => $subscription->end_date->format('Y-m-d'), |
|
272 | + 'gymieDiff' => $gymieDiff->format('Y-m-d'), |
|
273 | + ]); |
|
274 | 274 | |
275 | 275 | return view('subscriptions.edit', compact('subscription')); |
276 | 276 | } |
@@ -366,14 +366,14 @@ discard block |
||
366 | 366 | $subscription = Subscription::findOrFail($id); |
367 | 367 | |
368 | 368 | $already_paid = PaymentDetail::leftJoin('trn_cheque_details', 'trn_payment_details.id', '=', 'trn_cheque_details.payment_id') |
369 | - ->whereRaw("trn_payment_details.invoice_id = $subscription->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)") |
|
370 | - ->sum('trn_payment_details.payment_amount'); |
|
369 | + ->whereRaw("trn_payment_details.invoice_id = $subscription->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)") |
|
370 | + ->sum('trn_payment_details.payment_amount'); |
|
371 | 371 | |
372 | 372 | JavaScript::put([ |
373 | - 'taxes' => \Utilities::getSetting('taxes'), |
|
374 | - 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
375 | - 'servicesCount' => Service::count(), |
|
376 | - ]); |
|
373 | + 'taxes' => \Utilities::getSetting('taxes'), |
|
374 | + 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
375 | + 'servicesCount' => Service::count(), |
|
376 | + ]); |
|
377 | 377 | |
378 | 378 | return view('subscriptions.change', compact('subscription', 'already_paid')); |
379 | 379 | } |
@@ -403,15 +403,15 @@ discard block |
||
403 | 403 | } |
404 | 404 | |
405 | 405 | Invoice::where('id', $subscription->invoice_id)->update(['invoice_number'=> $request->invoice_number, |
406 | - 'total'=> $invoice_total, |
|
407 | - 'status'=> $paymentStatus, |
|
408 | - 'pending_amount'=> $pending, |
|
409 | - 'discount_amount'=> $request->discount_amount, |
|
410 | - 'discount_percent'=> $request->discount_percent, |
|
411 | - 'discount_note'=> $request->discount_note, |
|
412 | - 'tax'=> $request->taxes_amount, |
|
413 | - 'additional_fees'=> $request->additional_fees, |
|
414 | - 'note'=>' ', ]); |
|
406 | + 'total'=> $invoice_total, |
|
407 | + 'status'=> $paymentStatus, |
|
408 | + 'pending_amount'=> $pending, |
|
409 | + 'discount_amount'=> $request->discount_amount, |
|
410 | + 'discount_percent'=> $request->discount_percent, |
|
411 | + 'discount_note'=> $request->discount_note, |
|
412 | + 'tax'=> $request->taxes_amount, |
|
413 | + 'additional_fees'=> $request->additional_fees, |
|
414 | + 'note'=>' ', ]); |
|
415 | 415 | |
416 | 416 | foreach ($request->plan as $plan) { |
417 | 417 | $subscription->update(['plan_id'=> $plan['id'], |
@@ -423,14 +423,14 @@ discard block |
||
423 | 423 | //Adding subscription to invoice(Invoice Details) |
424 | 424 | |
425 | 425 | InvoiceDetail::where('invoice_id', $subscription->invoice_id)->update(['plan_id'=> $plan['id'], |
426 | - 'item_amount'=> $plan['price'], ]); |
|
426 | + 'item_amount'=> $plan['price'], ]); |
|
427 | 427 | } |
428 | 428 | |
429 | 429 | //Payment Details |
430 | 430 | $paymentData = ['invoice_id'=> $subscription->invoice_id, |
431 | - 'payment_amount'=> $request->payment_amount, |
|
432 | - 'mode'=> $request->mode, |
|
433 | - 'note'=> ' ', ]; |
|
431 | + 'payment_amount'=> $request->payment_amount, |
|
432 | + 'mode'=> $request->mode, |
|
433 | + 'note'=> ' ', ]; |
|
434 | 434 | |
435 | 435 | $payment_details = new PaymentDetail($paymentData); |
436 | 436 | $payment_details->createdBy()->associate(Auth::user()); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $subscriptionTotal = Subscription::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end, $request->plan_name)->search('"'.$request->input('search').'"')->get(); |
30 | 30 | $count = $subscriptionTotal->count(); |
31 | 31 | |
32 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
32 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
33 | 33 | $drp_placeholder = 'Select daterange filter'; |
34 | 34 | } else { |
35 | 35 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $expirings = Subscription::expiring($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10); |
46 | 46 | $count = $expirings->total(); |
47 | 47 | |
48 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
48 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
49 | 49 | $drp_placeholder = 'Select daterange filter'; |
50 | 50 | } else { |
51 | 51 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $allExpired = Subscription::expired($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10); |
62 | 62 | $count = $allExpired->total(); |
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; |