Browse Source

Merge pull request #135 from andrewdwallo/development-3.x

Development 3.x
3.x
Andrew Wallo 5 months ago
parent
commit
ae448c41e5
No account linked to committer's email address

+ 4
- 2
app/Filament/Company/Resources/Purchases/BillResource.php View File

@@ -349,8 +349,10 @@ class BillResource extends Resource
349 349
             ->actions([
350 350
                 Tables\Actions\ActionGroup::make([
351 351
                     Tables\Actions\ActionGroup::make([
352
-                        Tables\Actions\EditAction::make(),
353
-                        Tables\Actions\ViewAction::make(),
352
+                        Tables\Actions\EditAction::make()
353
+                            ->url(static fn (Bill $record) => Pages\EditBill::getUrl(['record' => $record])),
354
+                        Tables\Actions\ViewAction::make()
355
+                            ->url(static fn (Bill $record) => Pages\ViewBill::getUrl(['record' => $record])),
354 356
                         Bill::getReplicateAction(Tables\Actions\ReplicateAction::class),
355 357
                         Tables\Actions\Action::make('recordPayment')
356 358
                             ->label('Record payment')

+ 1
- 0
app/Filament/Company/Resources/Purchases/BillResource/Widgets/BillOverview.php View File

@@ -33,6 +33,7 @@ class BillOverview extends EnhancedStatsOverviewWidget
33 33
                 ->whereNotNull('paid_at')
34 34
                 ->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days')
35 35
                 ->groupBy('company_id')
36
+                ->reorder()
36 37
                 ->value('avg_days');
37 38
 
38 39
             $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);

+ 4
- 2
app/Filament/Company/Resources/Sales/EstimateResource.php View File

@@ -344,8 +344,10 @@ class EstimateResource extends Resource
344 344
             ->actions([
345 345
                 Tables\Actions\ActionGroup::make([
346 346
                     Tables\Actions\ActionGroup::make([
347
-                        Tables\Actions\EditAction::make(),
348
-                        Tables\Actions\ViewAction::make(),
347
+                        Tables\Actions\EditAction::make()
348
+                            ->url(static fn (Estimate $record) => Pages\EditEstimate::getUrl(['record' => $record])),
349
+                        Tables\Actions\ViewAction::make()
350
+                            ->url(static fn (Estimate $record) => Pages\ViewEstimate::getUrl(['record' => $record])),
349 351
                         Estimate::getReplicateAction(Tables\Actions\ReplicateAction::class),
350 352
                         Estimate::getApproveDraftAction(Tables\Actions\Action::class),
351 353
                         Estimate::getMarkAsSentAction(Tables\Actions\Action::class),

+ 1
- 0
app/Filament/Company/Resources/Sales/InvoiceResource/Widgets/InvoiceOverview.php View File

@@ -79,6 +79,7 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
79 79
                 ->whereNotNull('paid_at')
80 80
                 ->selectRaw('AVG(TIMESTAMPDIFF(DAY, approved_at, paid_at)) as avg_days')
81 81
                 ->groupBy('company_id')
82
+                ->reorder()
82 83
                 ->value('avg_days');
83 84
 
84 85
             $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);

+ 4
- 2
app/Filament/Company/Resources/Sales/RecurringInvoiceResource.php View File

@@ -338,8 +338,10 @@ class RecurringInvoiceResource extends Resource
338 338
             ->actions([
339 339
                 Tables\Actions\ActionGroup::make([
340 340
                     Tables\Actions\ActionGroup::make([
341
-                        Tables\Actions\EditAction::make(),
342
-                        Tables\Actions\ViewAction::make(),
341
+                        Tables\Actions\EditAction::make()
342
+                            ->url(static fn (RecurringInvoice $record): string => Pages\EditRecurringInvoice::getUrl(['record' => $record])),
343
+                        Tables\Actions\ViewAction::make()
344
+                            ->url(static fn (RecurringInvoice $record): string => Pages\ViewRecurringInvoice::getUrl(['record' => $record])),
343 345
                         RecurringInvoice::getManageScheduleAction(Tables\Actions\Action::class),
344 346
                     ])->dropdown(false),
345 347
                     Tables\Actions\DeleteAction::make(),

Loading…
Cancel
Save