diff --git a/README.md b/README.md index 39cd7bd..222eb04 100644 --- a/README.md +++ b/README.md @@ -118,23 +118,23 @@ composer test ### E-mail list -![](https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/table.png) + ### Advanced filters -![](https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/filters.png) + ### Resend e-mail -![](https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/resend.png) + ### Update addresses and resend e-mail -![](https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/update-and-resend.png) + ### E-mail view with attachments -![](https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/view.png) + ## Credits diff --git a/config/filament-email.php b/config/filament-email.php index 7081375..275fd24 100644 --- a/config/filament-email.php +++ b/config/filament-email.php @@ -14,11 +14,6 @@ 'default_sort_column' => 'created_at', 'default_sort_direction' => 'desc', 'datetime_format' => 'Y-m-d H:i:s', - 'filters' => [ - 'created_at' => [ - 'date_format' => 'Y-m-d', - ], - ], 'table_search_fields' => [ 'subject', 'from', diff --git a/screenshots/filters.png b/screenshots/filters.png index 2fd7828..6dd7431 100644 Binary files a/screenshots/filters.png and b/screenshots/filters.png differ diff --git a/screenshots/resend.png b/screenshots/resend.png index 187369f..21ce800 100644 Binary files a/screenshots/resend.png and b/screenshots/resend.png differ diff --git a/screenshots/table.png b/screenshots/table.png index a8dd787..f2446ac 100644 Binary files a/screenshots/table.png and b/screenshots/table.png differ diff --git a/screenshots/update-and-resend.png b/screenshots/update-and-resend.png index 6bbd38f..3152d79 100644 Binary files a/screenshots/update-and-resend.png and b/screenshots/update-and-resend.png differ diff --git a/screenshots/view.png b/screenshots/view.png index b4567b8..6a9c6cb 100644 Binary files a/screenshots/view.png and b/screenshots/view.png differ diff --git a/src/Filament/Resources/EmailResource.php b/src/Filament/Resources/EmailResource.php index 1386f0a..6053fe2 100644 --- a/src/Filament/Resources/EmailResource.php +++ b/src/Filament/Resources/EmailResource.php @@ -307,13 +307,13 @@ public static function table(Table $table): Table ->when( $data['created_at'], function (Builder $query, $value): Builder { - $format = config('filament-email.resource.filters.created_at.date_format'); [$start, $end] = explode(' - ', $value); - + $start = str_replace('/', '-', $start); + $end = str_replace('/', '-', $end); return $query->whereBetween('created_at', [ - Carbon::createFromFormat($format, $start) + Carbon::createFromTimestamp(strtotime($start)) ->format('Y-m-d'), - Carbon::createFromFormat($format, $end) + Carbon::createFromTimestamp(strtotime($end)) ->format('Y-m-d'), ]); }