@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | $order_id = $order->id; |
146 | 146 | $updatesEndDate = Subscription::select('update_ends_at') |
147 | - ->where('product_id', $productid)->where('order_id', $order_id)->first(); |
|
147 | + ->where('product_id', $productid)->where('order_id', $order_id)->first(); |
|
148 | 148 | if ($updatesEndDate) { |
149 | 149 | foreach ($versions as $version) { |
150 | 150 | if ($version->created_at->toDateTimeString() |
@@ -417,9 +417,9 @@ discard block |
||
417 | 417 | ->addColumn('payment_method', function ($model) { |
418 | 418 | return $model->payment_method; |
419 | 419 | }) |
420 | - ->addColumn('payment_status', function ($model) { |
|
421 | - return $model->payment_status; |
|
422 | - }) |
|
420 | + ->addColumn('payment_status', function ($model) { |
|
421 | + return $model->payment_status; |
|
422 | + }) |
|
423 | 423 | ->addColumn('created_at', function ($model) { |
424 | 424 | $date1 = new DateTime($model->created_at); |
425 | 425 | $tz = \Auth::user()->timezone()->first()->name; |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | return $date; |
430 | 430 | }) |
431 | 431 | ->rawColumns(['checkbox', 'number', 'amount', |
432 | - 'payment_method', 'payment_status', 'created_at', ]) |
|
432 | + 'payment_method', 'payment_status', 'created_at', ]) |
|
433 | 433 | ->make(true); |
434 | 434 | } catch (Exception $ex) { |
435 | 435 | Bugsnag::notifyException($ex); |
@@ -455,17 +455,17 @@ discard block |
||
455 | 455 | ->addColumn('number', function ($model) { |
456 | 456 | return $model->invoice()->first()->number; |
457 | 457 | }) |
458 | - ->addColumn('total', function ($model) { |
|
459 | - return $model->amount; |
|
460 | - }) |
|
461 | - ->addColumn('created_at', function ($model) { |
|
462 | - $date1 = new DateTime($model->created_at); |
|
463 | - $tz = \Auth::user()->timezone()->first()->name; |
|
464 | - $date1->setTimezone(new DateTimeZone($tz)); |
|
465 | - $date = $date1->format('M j, Y, g:i a'); |
|
466 | - |
|
467 | - return $date; |
|
468 | - }) |
|
458 | + ->addColumn('total', function ($model) { |
|
459 | + return $model->amount; |
|
460 | + }) |
|
461 | + ->addColumn('created_at', function ($model) { |
|
462 | + $date1 = new DateTime($model->created_at); |
|
463 | + $tz = \Auth::user()->timezone()->first()->name; |
|
464 | + $date1->setTimezone(new DateTimeZone($tz)); |
|
465 | + $date = $date1->format('M j, Y, g:i a'); |
|
466 | + |
|
467 | + return $date; |
|
468 | + }) |
|
469 | 469 | |
470 | 470 | ->addColumn('payment_method', 'payment_status', 'created_at') |
471 | 471 |