@@ -20,7 +20,7 @@ |
||
20 | 20 | 'end_date', |
21 | 21 | 'created_by', |
22 | 22 | 'updated_by', |
23 | - ]; |
|
23 | + ]; |
|
24 | 24 | |
25 | 25 | protected $dates = ['created_at', 'updated_at', 'start_date', 'end_date']; |
26 | 26 |
@@ -11,15 +11,15 @@ |
||
11 | 11 | protected $table = 'trn_expenses'; |
12 | 12 | |
13 | 13 | protected $fillable = [ |
14 | - 'name', |
|
15 | - 'category_id', |
|
16 | - 'amount', |
|
17 | - 'due_date', |
|
18 | - 'repeat', |
|
19 | - 'note', |
|
20 | - 'paid', |
|
21 | - 'created_by', |
|
22 | - 'updated_by', |
|
14 | + 'name', |
|
15 | + 'category_id', |
|
16 | + 'amount', |
|
17 | + 'due_date', |
|
18 | + 'repeat', |
|
19 | + 'note', |
|
20 | + 'paid', |
|
21 | + 'created_by', |
|
22 | + 'updated_by', |
|
23 | 23 | ]; |
24 | 24 | |
25 | 25 | //Eloquence Search mapping |
@@ -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; |
@@ -16,7 +16,7 @@ |
||
16 | 16 | 'item_amount', |
17 | 17 | 'created_by', |
18 | 18 | 'updated_by', |
19 | - ]; |
|
19 | + ]; |
|
20 | 20 | |
21 | 21 | public function createdBy() |
22 | 22 | { |
@@ -16,7 +16,7 @@ discard block |
||
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 |
||
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() |
@@ -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; |