Fixed date range filter conversion. Updated screnshots. Minor fixes.

RickDBCN · Aug 30, 2024 · 3ac0417 · 3ac0417
1 parent 3565e9d
commit 3ac0417
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 14 deletions.
diff --git 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)
+<img src="https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/table.png" style="border-radius:2%"/>
 
 ### Advanced filters
 
-![](https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/filters.png)
+<img src="https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/filters.png" style="border-radius:2%"/>
 
 ### Resend e-mail
 
-![](https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/resend.png)
+<img src="https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/resend.png" style="border-radius:2%"/>
 
 ### Update addresses and resend e-mail
 
-![](https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/update-and-resend.png)
+<img src="https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/update-and-resend.png" style="border-radius:2%"/>
 
 ### E-mail view with attachments
 
-![](https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/view.png)
+<img src="https://raw.githubusercontent.com/RickDBCN/filament-email/main/screenshots/view.png" style="border-radius:2%"/>
 
 ## Credits
 

diff --git 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
diff --git a/screenshots/resend.png b/screenshots/resend.png
diff --git a/screenshots/table.png b/screenshots/table.png
diff --git a/screenshots/update-and-resend.png b/screenshots/update-and-resend.png
diff --git a/screenshots/view.png b/screenshots/view.png
diff --git 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'),
                                     ]);
                                 }