Andrew Wallo 7 months ago
parent
commit
21652a71c9

+ 11
- 0
app/Concerns/RedirectToViewPage.php View File

1
+<?php
2
+
3
+namespace App\Concerns;
4
+
5
+trait RedirectToViewPage
6
+{
7
+    protected function getRedirectUrl(): string
8
+    {
9
+        return $this->getResource()::getUrl('view', ['record' => $this->record]);
10
+    }
11
+}

+ 3
- 0
app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/CreateAdjustment.php View File

2
 
2
 
3
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
3
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
4
 
4
 
5
+use App\Concerns\RedirectToListPage;
5
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
6
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
6
 use Filament\Resources\Pages\CreateRecord;
7
 use Filament\Resources\Pages\CreateRecord;
7
 
8
 
8
 class CreateAdjustment extends CreateRecord
9
 class CreateAdjustment extends CreateRecord
9
 {
10
 {
11
+    use RedirectToListPage;
12
+
10
     protected static string $resource = AdjustmentResource::class;
13
     protected static string $resource = AdjustmentResource::class;
11
 }
14
 }

+ 3
- 0
app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/EditAdjustment.php View File

2
 
2
 
3
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
3
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
4
 
4
 
5
+use App\Concerns\RedirectToListPage;
5
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
6
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
6
 use Filament\Resources\Pages\EditRecord;
7
 use Filament\Resources\Pages\EditRecord;
7
 
8
 
8
 class EditAdjustment extends EditRecord
9
 class EditAdjustment extends EditRecord
9
 {
10
 {
11
+    use RedirectToListPage;
12
+
10
     protected static string $resource = AdjustmentResource::class;
13
     protected static string $resource = AdjustmentResource::class;
11
 
14
 
12
     protected function getHeaderActions(): array
15
     protected function getHeaderActions(): array

+ 3
- 0
app/Filament/Company/Clusters/Settings/Resources/DocumentDefaultResource/Pages/EditDocumentDefault.php View File

2
 
2
 
3
 namespace App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource\Pages;
3
 namespace App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource\Pages;
4
 
4
 
5
+use App\Concerns\RedirectToListPage;
5
 use App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource;
6
 use App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource;
6
 use Filament\Resources\Pages\EditRecord;
7
 use Filament\Resources\Pages\EditRecord;
7
 use Illuminate\Contracts\Support\Htmlable;
8
 use Illuminate\Contracts\Support\Htmlable;
8
 
9
 
9
 class EditDocumentDefault extends EditRecord
10
 class EditDocumentDefault extends EditRecord
10
 {
11
 {
12
+    use RedirectToListPage;
13
+
11
     protected static string $resource = DocumentDefaultResource::class;
14
     protected static string $resource = DocumentDefaultResource::class;
12
 
15
 
13
     public function getRecordTitle(): string | Htmlable
16
     public function getRecordTitle(): string | Htmlable

+ 3
- 5
app/Filament/Company/Resources/Banking/AccountResource/Pages/CreateAccount.php View File

2
 
2
 
3
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
3
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
4
 
4
 
5
+use App\Concerns\RedirectToListPage;
5
 use App\Filament\Company\Resources\Banking\AccountResource;
6
 use App\Filament\Company\Resources\Banking\AccountResource;
6
 use Filament\Resources\Pages\CreateRecord;
7
 use Filament\Resources\Pages\CreateRecord;
7
 
8
 
8
 class CreateAccount extends CreateRecord
9
 class CreateAccount extends CreateRecord
9
 {
10
 {
10
-    protected static string $resource = AccountResource::class;
11
+    use RedirectToListPage;
11
 
12
 
12
-    protected function getRedirectUrl(): string
13
-    {
14
-        return $this->getResource()::getUrl('index');
15
-    }
13
+    protected static string $resource = AccountResource::class;
16
 
14
 
17
     protected function mutateFormDataBeforeCreate(array $data): array
15
     protected function mutateFormDataBeforeCreate(array $data): array
18
     {
16
     {

+ 3
- 5
app/Filament/Company/Resources/Banking/AccountResource/Pages/EditAccount.php View File

2
 
2
 
3
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
3
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
4
 
4
 
5
+use App\Concerns\RedirectToListPage;
5
 use App\Filament\Company\Resources\Banking\AccountResource;
6
 use App\Filament\Company\Resources\Banking\AccountResource;
6
 use Filament\Actions;
7
 use Filament\Actions;
7
 use Filament\Resources\Pages\EditRecord;
8
 use Filament\Resources\Pages\EditRecord;
8
 
9
 
9
 class EditAccount extends EditRecord
10
 class EditAccount extends EditRecord
10
 {
11
 {
12
+    use RedirectToListPage;
13
+
11
     protected static string $resource = AccountResource::class;
14
     protected static string $resource = AccountResource::class;
12
 
15
 
13
     protected function getHeaderActions(): array
16
     protected function getHeaderActions(): array
17
         ];
20
         ];
18
     }
21
     }
19
 
22
 
20
-    protected function getRedirectUrl(): string
21
-    {
22
-        return $this->getResource()::getUrl('index');
23
-    }
24
-
25
     protected function mutateFormDataBeforeSave(array $data): array
23
     protected function mutateFormDataBeforeSave(array $data): array
26
     {
24
     {
27
         $data['enabled'] = (bool) ($data['enabled'] ?? false);
25
         $data['enabled'] = (bool) ($data['enabled'] ?? false);

+ 2
- 5
app/Filament/Company/Resources/Purchases/BillResource/Pages/EditBill.php View File

3
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
3
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
4
 
4
 
5
 use App\Concerns\ManagesLineItems;
5
 use App\Concerns\ManagesLineItems;
6
+use App\Concerns\RedirectToViewPage;
6
 use App\Filament\Company\Resources\Purchases\BillResource;
7
 use App\Filament\Company\Resources\Purchases\BillResource;
7
 use App\Models\Accounting\Bill;
8
 use App\Models\Accounting\Bill;
8
 use Filament\Actions;
9
 use Filament\Actions;
13
 class EditBill extends EditRecord
14
 class EditBill extends EditRecord
14
 {
15
 {
15
     use ManagesLineItems;
16
     use ManagesLineItems;
17
+    use RedirectToViewPage;
16
 
18
 
17
     protected static string $resource = BillResource::class;
19
     protected static string $resource = BillResource::class;
18
 
20
 
28
         return MaxWidth::Full;
30
         return MaxWidth::Full;
29
     }
31
     }
30
 
32
 
31
-    protected function getRedirectUrl(): string
32
-    {
33
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
34
-    }
35
-
36
     protected function handleRecordUpdate(Model $record, array $data): Model
33
     protected function handleRecordUpdate(Model $record, array $data): Model
37
     {
34
     {
38
         /** @var Bill $record */
35
         /** @var Bill $record */

+ 2
- 2
app/Filament/Company/Resources/Purchases/VendorResource/Pages/EditVendor.php View File

2
 
2
 
3
 namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
3
 namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
4
 
4
 
5
-use App\Concerns\RedirectToListPage;
5
+use App\Concerns\RedirectToViewPage;
6
 use App\Filament\Company\Resources\Purchases\VendorResource;
6
 use App\Filament\Company\Resources\Purchases\VendorResource;
7
 use Filament\Actions;
7
 use Filament\Actions;
8
 use Filament\Resources\Pages\EditRecord;
8
 use Filament\Resources\Pages\EditRecord;
10
 
10
 
11
 class EditVendor extends EditRecord
11
 class EditVendor extends EditRecord
12
 {
12
 {
13
-    use RedirectToListPage;
13
+    use RedirectToViewPage;
14
 
14
 
15
     protected static string $resource = VendorResource::class;
15
     protected static string $resource = VendorResource::class;
16
 
16
 

+ 2
- 2
app/Filament/Company/Resources/Sales/ClientResource/Pages/EditClient.php View File

2
 
2
 
3
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
3
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
4
 
4
 
5
-use App\Concerns\RedirectToListPage;
5
+use App\Concerns\RedirectToViewPage;
6
 use App\Filament\Company\Resources\Sales\ClientResource;
6
 use App\Filament\Company\Resources\Sales\ClientResource;
7
 use App\Models\Common\Client;
7
 use App\Models\Common\Client;
8
 use Filament\Actions;
8
 use Filament\Actions;
12
 
12
 
13
 class EditClient extends EditRecord
13
 class EditClient extends EditRecord
14
 {
14
 {
15
-    use RedirectToListPage;
15
+    use RedirectToViewPage;
16
 
16
 
17
     protected static string $resource = ClientResource::class;
17
     protected static string $resource = ClientResource::class;
18
 
18
 

+ 2
- 5
app/Filament/Company/Resources/Sales/EstimateResource/Pages/EditEstimate.php View File

3
 namespace App\Filament\Company\Resources\Sales\EstimateResource\Pages;
3
 namespace App\Filament\Company\Resources\Sales\EstimateResource\Pages;
4
 
4
 
5
 use App\Concerns\ManagesLineItems;
5
 use App\Concerns\ManagesLineItems;
6
+use App\Concerns\RedirectToViewPage;
6
 use App\Filament\Company\Resources\Sales\EstimateResource;
7
 use App\Filament\Company\Resources\Sales\EstimateResource;
7
 use App\Models\Accounting\Estimate;
8
 use App\Models\Accounting\Estimate;
8
 use Filament\Actions;
9
 use Filament\Actions;
13
 class EditEstimate extends EditRecord
14
 class EditEstimate extends EditRecord
14
 {
15
 {
15
     use ManagesLineItems;
16
     use ManagesLineItems;
17
+    use RedirectToViewPage;
16
 
18
 
17
     protected static string $resource = EstimateResource::class;
19
     protected static string $resource = EstimateResource::class;
18
 
20
 
28
         return MaxWidth::Full;
30
         return MaxWidth::Full;
29
     }
31
     }
30
 
32
 
31
-    protected function getRedirectUrl(): string
32
-    {
33
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
34
-    }
35
-
36
     protected function handleRecordUpdate(Model $record, array $data): Model
33
     protected function handleRecordUpdate(Model $record, array $data): Model
37
     {
34
     {
38
         /** @var Estimate $record */
35
         /** @var Estimate $record */

+ 2
- 7
app/Filament/Company/Resources/Sales/InvoiceResource/Pages/EditInvoice.php View File

3
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
3
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
4
 
4
 
5
 use App\Concerns\ManagesLineItems;
5
 use App\Concerns\ManagesLineItems;
6
-use App\Concerns\RedirectToListPage;
6
+use App\Concerns\RedirectToViewPage;
7
 use App\Filament\Company\Resources\Sales\InvoiceResource;
7
 use App\Filament\Company\Resources\Sales\InvoiceResource;
8
 use App\Models\Accounting\Invoice;
8
 use App\Models\Accounting\Invoice;
9
 use Filament\Actions;
9
 use Filament\Actions;
14
 class EditInvoice extends EditRecord
14
 class EditInvoice extends EditRecord
15
 {
15
 {
16
     use ManagesLineItems;
16
     use ManagesLineItems;
17
-    use RedirectToListPage;
17
+    use RedirectToViewPage;
18
 
18
 
19
     protected static string $resource = InvoiceResource::class;
19
     protected static string $resource = InvoiceResource::class;
20
 
20
 
30
         return MaxWidth::Full;
30
         return MaxWidth::Full;
31
     }
31
     }
32
 
32
 
33
-    protected function getRedirectUrl(): string
34
-    {
35
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
36
-    }
37
-
38
     protected function handleRecordUpdate(Model $record, array $data): Model
33
     protected function handleRecordUpdate(Model $record, array $data): Model
39
     {
34
     {
40
         /** @var Invoice $record */
35
         /** @var Invoice $record */

+ 2
- 5
app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/EditRecurringInvoice.php View File

3
 namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
3
 namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
4
 
4
 
5
 use App\Concerns\ManagesLineItems;
5
 use App\Concerns\ManagesLineItems;
6
+use App\Concerns\RedirectToViewPage;
6
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
7
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
7
 use App\Models\Accounting\Estimate;
8
 use App\Models\Accounting\Estimate;
8
 use Filament\Actions;
9
 use Filament\Actions;
13
 class EditRecurringInvoice extends EditRecord
14
 class EditRecurringInvoice extends EditRecord
14
 {
15
 {
15
     use ManagesLineItems;
16
     use ManagesLineItems;
17
+    use RedirectToViewPage;
16
 
18
 
17
     protected static string $resource = RecurringInvoiceResource::class;
19
     protected static string $resource = RecurringInvoiceResource::class;
18
 
20
 
28
         return MaxWidth::Full;
30
         return MaxWidth::Full;
29
     }
31
     }
30
 
32
 
31
-    protected function getRedirectUrl(): string
32
-    {
33
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
34
-    }
35
-
36
     protected function handleRecordUpdate(Model $record, array $data): Model
33
     protected function handleRecordUpdate(Model $record, array $data): Model
37
     {
34
     {
38
         /** @var Estimate $record */
35
         /** @var Estimate $record */

Loading…
Cancel
Save