@@ -78,10 +78,10 @@ discard block |
||
78 | 78 | { |
79 | 79 | // For Tax calculation |
80 | 80 | JavaScript::put([ |
81 | - 'taxes' => \Utilities::getSetting('taxes'), |
|
82 | - 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
83 | - 'servicesCount' => Service::count(), |
|
84 | - ]); |
|
81 | + 'taxes' => \Utilities::getSetting('taxes'), |
|
82 | + 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
83 | + 'servicesCount' => Service::count(), |
|
84 | + ]); |
|
85 | 85 | |
86 | 86 | //Get Numbering mode |
87 | 87 | $invoice_number_mode = \Utilities::getSetting('invoice_number_mode'); |
@@ -123,16 +123,16 @@ discard block |
||
123 | 123 | |
124 | 124 | // Storing Invoice |
125 | 125 | $invoiceData = ['invoice_number'=> $request->invoice_number, |
126 | - 'member_id'=> $request->member_id, |
|
127 | - 'total'=> $invoice_total, |
|
128 | - 'status'=> $paymentStatus, |
|
129 | - 'pending_amount'=> $pending, |
|
130 | - 'discount_amount'=> $request->discount_amount, |
|
131 | - 'discount_percent'=> $request->discount_percent, |
|
132 | - 'discount_note'=> $request->discount_note, |
|
133 | - 'tax'=> $request->taxes_amount, |
|
134 | - 'additional_fees'=> $request->additional_fees, |
|
135 | - 'note'=>' ', ]; |
|
126 | + 'member_id'=> $request->member_id, |
|
127 | + 'total'=> $invoice_total, |
|
128 | + 'status'=> $paymentStatus, |
|
129 | + 'pending_amount'=> $pending, |
|
130 | + 'discount_amount'=> $request->discount_amount, |
|
131 | + 'discount_percent'=> $request->discount_percent, |
|
132 | + 'discount_note'=> $request->discount_note, |
|
133 | + 'tax'=> $request->taxes_amount, |
|
134 | + 'additional_fees'=> $request->additional_fees, |
|
135 | + 'note'=>' ', ]; |
|
136 | 136 | |
137 | 137 | $invoice = new Invoice($invoiceData); |
138 | 138 | $invoice->createdBy()->associate(Auth::user()); |
@@ -156,8 +156,8 @@ discard block |
||
156 | 156 | |
157 | 157 | //Adding subscription to invoice(Invoice Details) |
158 | 158 | $detailsData = ['invoice_id'=> $invoice->id, |
159 | - 'plan_id'=> $plan['id'], |
|
160 | - 'item_amount'=> $plan['price'], ]; |
|
159 | + 'plan_id'=> $plan['id'], |
|
160 | + 'item_amount'=> $plan['price'], ]; |
|
161 | 161 | |
162 | 162 | $invoice_details = new Invoice_detail($detailsData); |
163 | 163 | $invoice_details->createdBy()->associate(Auth::user()); |
@@ -167,9 +167,9 @@ discard block |
||
167 | 167 | |
168 | 168 | //Payment Details |
169 | 169 | $paymentData = ['invoice_id'=> $invoice->id, |
170 | - 'payment_amount'=> $request->payment_amount, |
|
171 | - 'mode'=> $request->mode, |
|
172 | - 'note'=> ' ', ]; |
|
170 | + 'payment_amount'=> $request->payment_amount, |
|
171 | + 'mode'=> $request->mode, |
|
172 | + 'note'=> ' ', ]; |
|
173 | 173 | |
174 | 174 | $payment_details = new Payment_detail($paymentData); |
175 | 175 | $payment_details->createdBy()->associate(Auth::user()); |
@@ -281,10 +281,10 @@ discard block |
||
281 | 281 | $gymieDiff = $subscription->end_date->addDays($diff); |
282 | 282 | |
283 | 283 | JavaScript::put([ |
284 | - 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
285 | - 'gymieEndDate' => $subscription->end_date->format('Y-m-d'), |
|
286 | - 'gymieDiff' => $gymieDiff->format('Y-m-d'), |
|
287 | - ]); |
|
284 | + 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
285 | + 'gymieEndDate' => $subscription->end_date->format('Y-m-d'), |
|
286 | + 'gymieDiff' => $gymieDiff->format('Y-m-d'), |
|
287 | + ]); |
|
288 | 288 | |
289 | 289 | return view('subscriptions.edit', compact('subscription')); |
290 | 290 | } |
@@ -390,14 +390,14 @@ discard block |
||
390 | 390 | $subscription = Subscription::findOrFail($id); |
391 | 391 | |
392 | 392 | $already_paid = Payment_detail::leftJoin('trn_cheque_details', 'trn_payment_details.id', '=', 'trn_cheque_details.payment_id') |
393 | - ->whereRaw("trn_payment_details.invoice_id = $subscription->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)") |
|
394 | - ->sum('trn_payment_details.payment_amount'); |
|
393 | + ->whereRaw("trn_payment_details.invoice_id = $subscription->invoice_id AND (trn_cheque_details.`status` = 2 or trn_cheque_details.`status` IS NULL)") |
|
394 | + ->sum('trn_payment_details.payment_amount'); |
|
395 | 395 | |
396 | 396 | JavaScript::put([ |
397 | - 'taxes' => \Utilities::getSetting('taxes'), |
|
398 | - 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
399 | - 'servicesCount' => Service::count(), |
|
400 | - ]); |
|
397 | + 'taxes' => \Utilities::getSetting('taxes'), |
|
398 | + 'gymieToday' => Carbon::today()->format('Y-m-d'), |
|
399 | + 'servicesCount' => Service::count(), |
|
400 | + ]); |
|
401 | 401 | |
402 | 402 | return view('subscriptions.change', compact('subscription', 'already_paid')); |
403 | 403 | } |
@@ -427,15 +427,15 @@ discard block |
||
427 | 427 | } |
428 | 428 | |
429 | 429 | Invoice::where('id', $subscription->invoice_id)->update(['invoice_number'=> $request->invoice_number, |
430 | - 'total'=> $invoice_total, |
|
431 | - 'status'=> $paymentStatus, |
|
432 | - 'pending_amount'=> $pending, |
|
433 | - 'discount_amount'=> $request->discount_amount, |
|
434 | - 'discount_percent'=> $request->discount_percent, |
|
435 | - 'discount_note'=> $request->discount_note, |
|
436 | - 'tax'=> $request->taxes_amount, |
|
437 | - 'additional_fees'=> $request->additional_fees, |
|
438 | - 'note'=>' ', ]); |
|
430 | + 'total'=> $invoice_total, |
|
431 | + 'status'=> $paymentStatus, |
|
432 | + 'pending_amount'=> $pending, |
|
433 | + 'discount_amount'=> $request->discount_amount, |
|
434 | + 'discount_percent'=> $request->discount_percent, |
|
435 | + 'discount_note'=> $request->discount_note, |
|
436 | + 'tax'=> $request->taxes_amount, |
|
437 | + 'additional_fees'=> $request->additional_fees, |
|
438 | + 'note'=>' ', ]); |
|
439 | 439 | |
440 | 440 | foreach ($request->plan as $plan) { |
441 | 441 | $subscription->update(['plan_id'=> $plan['id'], |
@@ -447,14 +447,14 @@ discard block |
||
447 | 447 | //Adding subscription to invoice(Invoice Details) |
448 | 448 | |
449 | 449 | Invoice_detail::where('invoice_id', $subscription->invoice_id)->update(['plan_id'=> $plan['id'], |
450 | - 'item_amount'=> $plan['price'], ]); |
|
450 | + 'item_amount'=> $plan['price'], ]); |
|
451 | 451 | } |
452 | 452 | |
453 | 453 | //Payment Details |
454 | 454 | $paymentData = ['invoice_id'=> $subscription->invoice_id, |
455 | - 'payment_amount'=> $request->payment_amount, |
|
456 | - 'mode'=> $request->mode, |
|
457 | - 'note'=> ' ', ]; |
|
455 | + 'payment_amount'=> $request->payment_amount, |
|
456 | + 'mode'=> $request->mode, |
|
457 | + 'note'=> ' ', ]; |
|
458 | 458 | |
459 | 459 | $payment_details = new Payment_detail($paymentData); |
460 | 460 | $payment_details->createdBy()->associate(Auth::user()); |
@@ -144,8 +144,8 @@ discard block |
||
144 | 144 | { |
145 | 145 | // Member Model Validation |
146 | 146 | $this->validate($request, ['email' => 'unique:mst_members,email', |
147 | - 'contact' => 'unique:mst_members,contact', |
|
148 | - 'member_code' => 'unique:mst_members,member_code', ]); |
|
147 | + 'contact' => 'unique:mst_members,contact', |
|
148 | + 'member_code' => 'unique:mst_members,member_code', ]); |
|
149 | 149 | |
150 | 150 | // Start Transaction |
151 | 151 | DB::beginTransaction(); |
@@ -202,16 +202,16 @@ discard block |
||
202 | 202 | |
203 | 203 | // Storing Invoice |
204 | 204 | $invoiceData = ['invoice_number'=> $request->invoice_number, |
205 | - 'member_id'=> $member->id, |
|
206 | - 'total'=> $invoice_total, |
|
207 | - 'status'=> $paymentStatus, |
|
208 | - 'pending_amount'=> $pending, |
|
209 | - 'discount_amount'=> $request->discount_amount, |
|
210 | - 'discount_percent'=> $request->discount_percent, |
|
211 | - 'discount_note'=> $request->discount_note, |
|
212 | - 'tax'=> $request->taxes_amount, |
|
213 | - 'additional_fees'=> $request->additional_fees, |
|
214 | - 'note'=>' ', ]; |
|
205 | + 'member_id'=> $member->id, |
|
206 | + 'total'=> $invoice_total, |
|
207 | + 'status'=> $paymentStatus, |
|
208 | + 'pending_amount'=> $pending, |
|
209 | + 'discount_amount'=> $request->discount_amount, |
|
210 | + 'discount_percent'=> $request->discount_percent, |
|
211 | + 'discount_note'=> $request->discount_note, |
|
212 | + 'tax'=> $request->taxes_amount, |
|
213 | + 'additional_fees'=> $request->additional_fees, |
|
214 | + 'note'=>' ', ]; |
|
215 | 215 | |
216 | 216 | $invoice = new Invoice($invoiceData); |
217 | 217 | $invoice->createdBy()->associate(Auth::user()); |
@@ -235,8 +235,8 @@ discard block |
||
235 | 235 | |
236 | 236 | //Adding subscription to invoice(Invoice Details) |
237 | 237 | $detailsData = ['invoice_id'=> $invoice->id, |
238 | - 'plan_id'=> $plan['id'], |
|
239 | - 'item_amount'=> $plan['price'], ]; |
|
238 | + 'plan_id'=> $plan['id'], |
|
239 | + 'item_amount'=> $plan['price'], ]; |
|
240 | 240 | |
241 | 241 | $invoice_details = new Invoice_detail($detailsData); |
242 | 242 | $invoice_details->createdBy()->associate(Auth::user()); |
@@ -246,9 +246,9 @@ discard block |
||
246 | 246 | |
247 | 247 | // Store Payment Details |
248 | 248 | $paymentData = ['invoice_id'=> $invoice->id, |
249 | - 'payment_amount'=> $request->payment_amount, |
|
250 | - 'mode'=> $request->mode, |
|
251 | - 'note'=> ' ', ]; |
|
249 | + 'payment_amount'=> $request->payment_amount, |
|
250 | + 'mode'=> $request->mode, |
|
251 | + 'note'=> ' ', ]; |
|
252 | 252 | |
253 | 253 | $payment_details = new Payment_detail($paymentData); |
254 | 254 | $payment_details->createdBy()->associate(Auth::user()); |
@@ -258,9 +258,9 @@ discard block |
||
258 | 258 | if ($request->mode == 0) { |
259 | 259 | // Store Cheque Details |
260 | 260 | $chequeData = ['payment_id'=> $payment_details->id, |
261 | - 'number'=> $request->number, |
|
262 | - 'date'=> $request->date, |
|
263 | - 'status'=> \constChequeStatus::Recieved, ]; |
|
261 | + 'number'=> $request->number, |
|
262 | + 'date'=> $request->date, |
|
263 | + 'status'=> \constChequeStatus::Recieved, ]; |
|
264 | 264 | |
265 | 265 | $cheque_details = new Cheque_detail($chequeData); |
266 | 266 | $cheque_details->createdBy()->associate(Auth::user()); |
@@ -59,7 +59,7 @@ |
||
59 | 59 | { |
60 | 60 | //Model Validation |
61 | 61 | $this->validate($request, ['plan_code' => 'unique:mst_plans,plan_code', |
62 | - 'plan_name' => 'unique:mst_plans,plan_name', ]); |
|
62 | + 'plan_name' => 'unique:mst_plans,plan_name', ]); |
|
63 | 63 | |
64 | 64 | $plan = new Plan($request->all()); |
65 | 65 |
@@ -36,13 +36,13 @@ discard block |
||
36 | 36 | public function storeUser(Request $request) |
37 | 37 | { |
38 | 38 | $this->validate($request, ['name' => 'required|max:255', |
39 | - 'email' => 'required|email|max:255|unique:mst_users', |
|
40 | - 'password' => 'required|confirmed|min:6', ]); |
|
39 | + 'email' => 'required|email|max:255|unique:mst_users', |
|
40 | + 'password' => 'required|confirmed|min:6', ]); |
|
41 | 41 | |
42 | 42 | $user = User::create(['name' => $request['name'], |
43 | 43 | 'email' => $request['email'], |
44 | 44 | 'password' => bcrypt($request['password']), |
45 | - 'status'=> $request->status, ]); |
|
45 | + 'status'=> $request->status, ]); |
|
46 | 46 | |
47 | 47 | $user->save(); |
48 | 48 | |
@@ -142,9 +142,9 @@ discard block |
||
142 | 142 | DB::beginTransaction(); |
143 | 143 | try { |
144 | 144 | $role = Role::create(['name' => $request->name, |
145 | - 'display_name' => $request->display_name, |
|
146 | - 'description' => $request->description, |
|
147 | - ]); |
|
145 | + 'display_name' => $request->display_name, |
|
146 | + 'description' => $request->description, |
|
147 | + ]); |
|
148 | 148 | |
149 | 149 | if ($request->has('permissions')) { |
150 | 150 | $role->attachPermissions($request->permissions); |
@@ -179,9 +179,9 @@ discard block |
||
179 | 179 | $role = Role::findOrFail($id); |
180 | 180 | |
181 | 181 | $role->update(['name' => $request->name, |
182 | - 'display_name' => $request->display_name, |
|
183 | - 'description' => $request->description, |
|
184 | - ]); |
|
182 | + 'display_name' => $request->display_name, |
|
183 | + 'description' => $request->description, |
|
184 | + ]); |
|
185 | 185 | |
186 | 186 | //Updating permissions for the role |
187 | 187 | $DBpermissions = Permission_role::where('role_id', $id)->select('permission_id')->lists('permission_id'); |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | 'display_name' => $request->display_name, |
253 | 253 | 'description' => $request->description, |
254 | 254 | 'group_key' => $request->group_key, |
255 | - ]); |
|
255 | + ]); |
|
256 | 256 | |
257 | 257 | flash()->success('Permission was successfully created'); |
258 | 258 |
@@ -66,11 +66,11 @@ |
||
66 | 66 | public function store(Request $request) |
67 | 67 | { |
68 | 68 | $expenseData = ['name' => $request->name, |
69 | - 'category_id' => $request->category_id, |
|
70 | - 'due_date' => $request->due_date, |
|
71 | - 'repeat' => $request->repeat, |
|
72 | - 'note' => $request->note, |
|
73 | - 'amount' => $request->amount, ]; |
|
69 | + 'category_id' => $request->category_id, |
|
70 | + 'due_date' => $request->due_date, |
|
71 | + 'repeat' => $request->repeat, |
|
72 | + 'note' => $request->note, |
|
73 | + 'amount' => $request->amount, ]; |
|
74 | 74 | |
75 | 75 | $expense = new Expense($expenseData); |
76 | 76 | $expense->createdBy()->associate(Auth::user()); |
@@ -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 |
@@ -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 |
@@ -16,7 +16,7 @@ |
||
16 | 16 | 'status', |
17 | 17 | 'created_by', |
18 | 18 | 'updated_by', |
19 | - ]; |
|
19 | + ]; |
|
20 | 20 | |
21 | 21 | //Eloquence Search mapping |
22 | 22 | use Eloquence; |
@@ -29,10 +29,10 @@ |
||
29 | 29 | public function scopeReminders($query) |
30 | 30 | { |
31 | 31 | return $query->leftJoin('mst_enquiries', 'trn_enquiry_followups.enquiry_id', '=', 'mst_enquiries.id') |
32 | - ->select('trn_enquiry_followups.*', 'mst_enquiries.status') |
|
33 | - ->where('trn_enquiry_followups.due_date', '<=', Carbon::today()) |
|
34 | - ->where('trn_enquiry_followups.status', '=', \constFollowUpStatus::Pending) |
|
35 | - ->where('mst_enquiries.status', '=', \constEnquiryStatus::Lead); |
|
32 | + ->select('trn_enquiry_followups.*', 'mst_enquiries.status') |
|
33 | + ->where('trn_enquiry_followups.due_date', '<=', Carbon::today()) |
|
34 | + ->where('trn_enquiry_followups.status', '=', \constFollowUpStatus::Pending) |
|
35 | + ->where('mst_enquiries.status', '=', \constEnquiryStatus::Lead); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function createdBy() |