|
@@ -491,16 +491,32 @@ class MacroServiceProvider extends ServiceProvider
|
491
|
491
|
});
|
492
|
492
|
|
493
|
493
|
ExportColumn::macro('date', function () {
|
494
|
|
- $this->formatStateUsing(static function (?Carbon $state) {
|
495
|
|
- return $state?->toDateString();
|
|
494
|
+ $this->formatStateUsing(static function ($state) {
|
|
495
|
+ if (blank($state)) {
|
|
496
|
+ return null;
|
|
497
|
+ }
|
|
498
|
+
|
|
499
|
+ try {
|
|
500
|
+ Carbon::parse($state)->toDateString();
|
|
501
|
+ } catch (\Exception) {
|
|
502
|
+ return null;
|
|
503
|
+ }
|
496
|
504
|
});
|
497
|
505
|
|
498
|
506
|
return $this;
|
499
|
507
|
});
|
500
|
508
|
|
501
|
509
|
ExportColumn::macro('dateTime', function () {
|
502
|
|
- $this->formatStateUsing(static function (?Carbon $state) {
|
503
|
|
- return $state?->toDateTimeString();
|
|
510
|
+ $this->formatStateUsing(static function ($state) {
|
|
511
|
+ if (blank($state)) {
|
|
512
|
+ return null;
|
|
513
|
+ }
|
|
514
|
+
|
|
515
|
+ try {
|
|
516
|
+ return Carbon::parse($state)->toDateTimeString();
|
|
517
|
+ } catch (\Exception) {
|
|
518
|
+ return null;
|
|
519
|
+ }
|
504
|
520
|
});
|
505
|
521
|
|
506
|
522
|
return $this;
|