@@ -182,27 +182,27 @@ |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | return \DataTables::of($invoices->get()) |
| 185 | - ->addColumn('number', function ($model) { |
|
| 185 | + ->addColumn('number', function($model) { |
|
| 186 | 186 | return $model->number; |
| 187 | 187 | }) |
| 188 | - ->addColumn('products', function ($model) { |
|
| 188 | + ->addColumn('products', function($model) { |
|
| 189 | 189 | $invoice = $this->invoice->find($model->id); |
| 190 | 190 | $products = $invoice->invoiceItem()->pluck('product_name')->toArray(); |
| 191 | 191 | |
| 192 | 192 | return ucfirst(implode(',', $products)); |
| 193 | 193 | }) |
| 194 | - ->addColumn('date', function ($model) { |
|
| 194 | + ->addColumn('date', function($model) { |
|
| 195 | 195 | $date = date_create($model->created_at); |
| 196 | 196 | |
| 197 | 197 | return date_format($date, 'M j, Y, g:i a'); |
| 198 | 198 | }) |
| 199 | - ->addColumn('total', function ($model) { |
|
| 199 | + ->addColumn('total', function($model) { |
|
| 200 | 200 | return $model->grand_total; |
| 201 | 201 | }) |
| 202 | - ->addColumn('status', function ($model) { |
|
| 202 | + ->addColumn('status', function($model) { |
|
| 203 | 203 | return ucfirst($model->status); |
| 204 | 204 | }) |
| 205 | - ->addColumn('action', function ($model) { |
|
| 205 | + ->addColumn('action', function($model) { |
|
| 206 | 206 | if (\Auth::user()->role == 'admin') { |
| 207 | 207 | $url = '/invoices/show?invoiceid='.$model->id; |
| 208 | 208 | } else { |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | $paymentRenewal = $this->updateInvoicePayment( |
| 158 | 158 | $invoiceid, |
| 159 | 159 | $payment_method, |
| 160 | - $payment_status, |
|
| 160 | + $payment_status, |
|
| 161 | 161 | $payment_date, |
| 162 | 162 | $amount |
| 163 | 163 | ); |
@@ -215,15 +215,15 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | return view( |
| 217 | 217 | 'themes.default1.invoice.payment', |
| 218 | - compact( |
|
| 219 | - 'invoice_status', |
|
| 220 | - 'payment_status', |
|
| 221 | - 'payment_method', |
|
| 222 | - 'invoice_id', |
|
| 223 | - 'domain', |
|
| 224 | - 'invoice', |
|
| 225 | - 'userid' |
|
| 226 | - ) |
|
| 218 | + compact( |
|
| 219 | + 'invoice_status', |
|
| 220 | + 'payment_status', |
|
| 221 | + 'payment_method', |
|
| 222 | + 'invoice_id', |
|
| 223 | + 'domain', |
|
| 224 | + 'invoice', |
|
| 225 | + 'userid' |
|
| 226 | + ) |
|
| 227 | 227 | ); |
| 228 | 228 | } |
| 229 | 229 | |