浏览代码

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

Development 3.x
3.x
Andrew Wallo 5 个月前
父节点
当前提交
ae448c41e5
没有帐户链接到提交者的电子邮件

+ 4
- 2
app/Filament/Company/Resources/Purchases/BillResource.php 查看文件

349
             ->actions([
349
             ->actions([
350
                 Tables\Actions\ActionGroup::make([
350
                 Tables\Actions\ActionGroup::make([
351
                     Tables\Actions\ActionGroup::make([
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
                         Bill::getReplicateAction(Tables\Actions\ReplicateAction::class),
356
                         Bill::getReplicateAction(Tables\Actions\ReplicateAction::class),
355
                         Tables\Actions\Action::make('recordPayment')
357
                         Tables\Actions\Action::make('recordPayment')
356
                             ->label('Record payment')
358
                             ->label('Record payment')

+ 1
- 0
app/Filament/Company/Resources/Purchases/BillResource/Widgets/BillOverview.php 查看文件

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

+ 4
- 2
app/Filament/Company/Resources/Sales/EstimateResource.php 查看文件

344
             ->actions([
344
             ->actions([
345
                 Tables\Actions\ActionGroup::make([
345
                 Tables\Actions\ActionGroup::make([
346
                     Tables\Actions\ActionGroup::make([
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
                         Estimate::getReplicateAction(Tables\Actions\ReplicateAction::class),
351
                         Estimate::getReplicateAction(Tables\Actions\ReplicateAction::class),
350
                         Estimate::getApproveDraftAction(Tables\Actions\Action::class),
352
                         Estimate::getApproveDraftAction(Tables\Actions\Action::class),
351
                         Estimate::getMarkAsSentAction(Tables\Actions\Action::class),
353
                         Estimate::getMarkAsSentAction(Tables\Actions\Action::class),

+ 1
- 0
app/Filament/Company/Resources/Sales/InvoiceResource/Widgets/InvoiceOverview.php 查看文件

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

+ 4
- 2
app/Filament/Company/Resources/Sales/RecurringInvoiceResource.php 查看文件

338
             ->actions([
338
             ->actions([
339
                 Tables\Actions\ActionGroup::make([
339
                 Tables\Actions\ActionGroup::make([
340
                     Tables\Actions\ActionGroup::make([
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
                         RecurringInvoice::getManageScheduleAction(Tables\Actions\Action::class),
345
                         RecurringInvoice::getManageScheduleAction(Tables\Actions\Action::class),
344
                     ])->dropdown(false),
346
                     ])->dropdown(false),
345
                     Tables\Actions\DeleteAction::make(),
347
                     Tables\Actions\DeleteAction::make(),

正在加载...
取消
保存