@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | - 'providers' => [ |
|
| 4 | + 'providers' => [ |
|
| 5 | 5 | 0 => 'App\\Plugins\\Ccavanue\\ServiceProvider', |
| 6 | 6 | 1 => 'App\\Plugins\\Ping\\ServiceProvider', |
| 7 | 7 | 2 => 'App\\Plugins\\Twilio\\ServiceProvider', |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | 29 => 'App\\Providers\\EventServiceProvider', |
| 35 | 35 | 30 => 'App\\Providers\\RouteServiceProvider', |
| 36 | 36 | 31 => 'Illuminate\\Broadcasting\\BroadcastServiceProvider', |
| 37 | - ], |
|
| 38 | - 'eager' => [ |
|
| 37 | + ], |
|
| 38 | + 'eager' => [ |
|
| 39 | 39 | 0 => 'App\\Plugins\\Ccavanue\\ServiceProvider', |
| 40 | 40 | 1 => 'App\\Plugins\\Ping\\ServiceProvider', |
| 41 | 41 | 2 => 'App\\Plugins\\Twilio\\ServiceProvider', |
@@ -54,8 +54,8 @@ discard block |
||
| 54 | 54 | 15 => 'App\\Providers\\AppServiceProvider', |
| 55 | 55 | 16 => 'App\\Providers\\EventServiceProvider', |
| 56 | 56 | 17 => 'App\\Providers\\RouteServiceProvider', |
| 57 | - ], |
|
| 58 | - 'deferred' => [ |
|
| 57 | + ], |
|
| 58 | + 'deferred' => [ |
|
| 59 | 59 | 'Illuminate\\Bus\\Dispatcher' => 'Illuminate\\Bus\\BusServiceProvider', |
| 60 | 60 | 'Illuminate\\Contracts\\Bus\\Dispatcher' => 'Illuminate\\Bus\\BusServiceProvider', |
| 61 | 61 | 'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => 'Illuminate\\Bus\\BusServiceProvider', |
@@ -122,8 +122,8 @@ discard block |
||
| 122 | 122 | 'Illuminate\\Broadcasting\\BroadcastManager' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider', |
| 123 | 123 | 'Illuminate\\Contracts\\Broadcasting\\Factory' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider', |
| 124 | 124 | 'Illuminate\\Contracts\\Broadcasting\\Broadcaster' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider', |
| 125 | - ], |
|
| 126 | - 'when' => [ |
|
| 125 | + ], |
|
| 126 | + 'when' => [ |
|
| 127 | 127 | 'Illuminate\\Bus\\BusServiceProvider' => [ |
| 128 | 128 | ], |
| 129 | 129 | 'Illuminate\\Cache\\CacheServiceProvider' => [ |
@@ -152,5 +152,5 @@ discard block |
||
| 152 | 152 | ], |
| 153 | 153 | 'Illuminate\\Broadcasting\\BroadcastServiceProvider' => [ |
| 154 | 154 | ], |
| 155 | - ], |
|
| 155 | + ], |
|
| 156 | 156 | ]; |
@@ -91,10 +91,10 @@ discard block |
||
| 91 | 91 | //dd($this->invoice->get()); |
| 92 | 92 | //$invoice = \DB::table('invoices'); |
| 93 | 93 | return \Datatable::query($this->invoice->select('id', 'user_id', 'number', 'date', 'grand_total', 'status', 'created_at')) |
| 94 | - ->addColumn('#', function ($model) { |
|
| 94 | + ->addColumn('#', function($model) { |
|
| 95 | 95 | return "<input type='checkbox' value=".$model->id.' name=select[] id=check>'; |
| 96 | 96 | }) |
| 97 | - ->addColumn('user_id', function ($model) { |
|
| 97 | + ->addColumn('user_id', function($model) { |
|
| 98 | 98 | |
| 99 | 99 | $first = $this->user->where('id', $model->user_id)->first()->first_name; |
| 100 | 100 | $last = $this->user->where('id', $model->user_id)->first()->last_name; |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>'; |
| 104 | 104 | }) |
| 105 | 105 | ->showColumns('number', 'created_at', 'grand_total', 'status') |
| 106 | - ->addColumn('action', function ($model) { |
|
| 106 | + ->addColumn('action', function($model) { |
|
| 107 | 107 | $order = \App\Model\Order\Order::where('invoice_id', $model->id)->first(); |
| 108 | 108 | if (!$order) { |
| 109 | 109 | $action = '<a href='.url('order/execute?invoiceid='.$model->id)." class='btn btn-sm btn-primary'>Execute Order</a>"; |
@@ -56,14 +56,14 @@ discard block |
||
| 56 | 56 | ->select('number', 'created_at', 'grand_total', 'id'); |
| 57 | 57 | |
| 58 | 58 | return \Datatable::query($invoices) |
| 59 | - ->addColumn('number', function ($model) { |
|
| 59 | + ->addColumn('number', function($model) { |
|
| 60 | 60 | return $model->number; |
| 61 | 61 | }) |
| 62 | 62 | ->showColumns('created_at') |
| 63 | - ->addColumn('total', function ($model) { |
|
| 63 | + ->addColumn('total', function($model) { |
|
| 64 | 64 | return $model->grand_total; |
| 65 | 65 | }) |
| 66 | - ->addColumn('action', function ($model) { |
|
| 66 | + ->addColumn('action', function($model) { |
|
| 67 | 67 | return '<a href='.url('my-invoice/'.$model->id)." class='btn btn-sm btn-primary'>View</a>"; |
| 68 | 68 | }) |
| 69 | 69 | ->searchColumns('number', 'created_at', 'total') |
@@ -91,15 +91,15 @@ discard block |
||
| 91 | 91 | //->select('id','product','created_at') |
| 92 | 92 | |
| 93 | 93 | return \Datatable::query($orders) |
| 94 | - ->addColumn('id', function ($model) { |
|
| 94 | + ->addColumn('id', function($model) { |
|
| 95 | 95 | return $model->id; |
| 96 | 96 | }) |
| 97 | 97 | |
| 98 | - ->addColumn('product', function ($model) { |
|
| 98 | + ->addColumn('product', function($model) { |
|
| 99 | 99 | return $model->product()->first()->name; |
| 100 | 100 | }) |
| 101 | 101 | ->showColumns('created_at') |
| 102 | - ->addColumn('ends_at', function ($model) { |
|
| 102 | + ->addColumn('ends_at', function($model) { |
|
| 103 | 103 | $end = $model->subscription()->first()->ends_at; |
| 104 | 104 | if ($end == '0000-00-00 00:00:00' || $end == null) { |
| 105 | 105 | $end = '--'; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | return $end; |
| 109 | 109 | }) |
| 110 | - ->addColumn('action', function ($model) { |
|
| 110 | + ->addColumn('action', function($model) { |
|
| 111 | 111 | //dd($model); |
| 112 | 112 | return '<a href='.url('my-order/'.$model->id)." class='btn btn-sm btn-primary'>Details</a>" |
| 113 | 113 | .' <a href='.url('my-invoice/'.$model->invoice()->first()->id)." class='btn btn-sm btn-primary'>Invoice</a>" |
@@ -136,12 +136,12 @@ discard block |
||
| 136 | 136 | $subscriptions = $this->subscription->where('user_id', \Auth::user()->id)->get(); |
| 137 | 137 | |
| 138 | 138 | return \Datatable::collection($subscriptions) |
| 139 | - ->addColumn('id', function ($model) { |
|
| 139 | + ->addColumn('id', function($model) { |
|
| 140 | 140 | return $model->id; |
| 141 | 141 | }) |
| 142 | 142 | ->showColumns('created_at') |
| 143 | 143 | |
| 144 | - ->addColumn('ends_at', function ($model) { |
|
| 144 | + ->addColumn('ends_at', function($model) { |
|
| 145 | 145 | return $model->subscription()->first()->ends_at; |
| 146 | 146 | }) |
| 147 | 147 | ->searchColumns('id', 'created_at', 'ends_at') |
@@ -255,19 +255,19 @@ discard block |
||
| 255 | 255 | ->select('number', 'created_at', 'grand_total', 'id'); |
| 256 | 256 | |
| 257 | 257 | return \Datatable::query($invoices) |
| 258 | - ->addColumn('number', function ($model) { |
|
| 258 | + ->addColumn('number', function($model) { |
|
| 259 | 259 | return $model->number; |
| 260 | 260 | }) |
| 261 | - ->addColumn('invoice_item', function ($model) { |
|
| 261 | + ->addColumn('invoice_item', function($model) { |
|
| 262 | 262 | $products = $model->invoiceItem()->lists('product_name')->toArray(); |
| 263 | 263 | |
| 264 | 264 | return ucfirst(implode(',', $products)); |
| 265 | 265 | }) |
| 266 | 266 | ->showColumns('created_at') |
| 267 | - ->addColumn('total', function ($model) { |
|
| 267 | + ->addColumn('total', function($model) { |
|
| 268 | 268 | return $model->grand_total; |
| 269 | 269 | }) |
| 270 | - ->addColumn('action', function ($model) { |
|
| 270 | + ->addColumn('action', function($model) { |
|
| 271 | 271 | if (\Auth::user()->role == 'admin') { |
| 272 | 272 | $url = '/invoices/show?invoiceid='.$model->id; |
| 273 | 273 | } else { |
@@ -294,11 +294,11 @@ discard block |
||
| 294 | 294 | ->select('id', 'invoice_id', 'user_id', 'amount', 'payment_method', 'payment_status', 'created_at'); |
| 295 | 295 | |
| 296 | 296 | return \Datatable::query($payments) |
| 297 | - ->addColumn('number', function ($model) { |
|
| 297 | + ->addColumn('number', function($model) { |
|
| 298 | 298 | return $model->invoice()->first()->number; |
| 299 | 299 | }) |
| 300 | 300 | ->showColumns('amount', 'payment_method', 'payment_status') |
| 301 | - ->addColumn('total', function ($model) { |
|
| 301 | + ->addColumn('total', function($model) { |
|
| 302 | 302 | return $model->grand_total; |
| 303 | 303 | }) |
| 304 | 304 | |
@@ -88,14 +88,14 @@ |
||
| 88 | 88 | return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'<a>'; |
| 89 | 89 | }) |
| 90 | 90 | ->showColumns('number', 'price_override', 'order_status') |
| 91 | - ->addColumn('ends_at', function ($model) { |
|
| 92 | - $end = $model->subscription()->first()->ends_at; |
|
| 93 | - if ($end == '0000-00-00 00:00:00' || $end == null) { |
|
| 94 | - $end = '--'; |
|
| 95 | - } |
|
| 96 | - |
|
| 97 | - return $end; |
|
| 98 | - }) |
|
| 91 | + ->addColumn('ends_at', function ($model) { |
|
| 92 | + $end = $model->subscription()->first()->ends_at; |
|
| 93 | + if ($end == '0000-00-00 00:00:00' || $end == null) { |
|
| 94 | + $end = '--'; |
|
| 95 | + } |
|
| 96 | + |
|
| 97 | + return $end; |
|
| 98 | + }) |
|
| 99 | 99 | ->addColumn('action', function ($model) { |
| 100 | 100 | return '<a href='.url('orders/'.$model->id)." class='btn btn-sm btn-primary'>View</a>"; |
| 101 | 101 | }) |