wip

app/Concerns/HandlePageRedirect.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Concerns;
+
+trait HandlePageRedirect
+{
+    protected function getRedirectUrl(): string
+    {
+        $resource = $this->getResource();
+
+        if ($resource::hasPage('view') && $this->record) {
+            return $resource::getUrl('view', ['record' => $this->record]);
+        }
+
+        return $resource::getUrl('index');
+    }
+}

app/Concerns/RedirectToListPage.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Concerns;
-
-trait RedirectToListPage
-{
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-}

app/Concerns/RedirectToViewPage.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Concerns;
-
-trait RedirectToViewPage
-{
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
-    }
-}

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/CreateAdjustment.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateAdjustment extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = AdjustmentResource::class;
 }

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/EditAdjustment.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
 use Filament\Resources\Pages\EditRecord;
 
 class EditAdjustment extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = AdjustmentResource::class;
 

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/CreateCurrency.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\CurrencyResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\CurrencyResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateCurrency extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = CurrencyResource::class;
 }

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/EditCurrency.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\CurrencyResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\CurrencyResource;
 use Filament\Resources\Pages\EditRecord;
 
 class EditCurrency extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = CurrencyResource::class;
 

app/Filament/Company/Clusters/Settings/Resources/DocumentDefaultResource/Pages/EditDocumentDefault.php

@@ -2,14 +2,14 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Contracts\Support\Htmlable;
 
 class EditDocumentDefault extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = DocumentDefaultResource::class;
 

app/Filament/Company/Resources/Banking/AccountResource/Pages/CreateAccount.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateAccount extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = AccountResource::class;
 

app/Filament/Company/Resources/Banking/AccountResource/Pages/EditAccount.php

@@ -2,14 +2,14 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditAccount extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = AccountResource::class;
 

app/Filament/Company/Resources/Common/OfferingResource/Pages/CreateOffering.php

@@ -2,14 +2,14 @@
 
 namespace App\Filament\Company\Resources\Common\OfferingResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Common\OfferingResource;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 
 class CreateOffering extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = OfferingResource::class;
 

app/Filament/Company/Resources/Common/OfferingResource/Pages/EditOffering.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Common\OfferingResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Common\OfferingResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditOffering extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = OfferingResource::class;
 

app/Filament/Company/Resources/Purchases/BillResource/Pages/CreateBill.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Accounting\Bill;
 use App\Models\Common\Vendor;
@@ -14,8 +14,8 @@ use Livewire\Attributes\Url;
 
 class CreateBill extends CreateRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = BillResource::class;
 

app/Filament/Company/Resources/Purchases/BillResource/Pages/EditBill.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Accounting\Bill;
 use Filament\Actions;
@@ -13,8 +13,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditBill extends EditRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = BillResource::class;
 

app/Filament/Company/Resources/Purchases/VendorResource/Pages/CreateVendor.php

@@ -2,14 +2,14 @@
 
 namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
 
-use App\Concerns\RedirectToViewPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Purchases\VendorResource;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
 
 class CreateVendor extends CreateRecord
 {
-    use RedirectToViewPage;
+    use HandlePageRedirect;
 
     protected static string $resource = VendorResource::class;
 

app/Filament/Company/Resources/Purchases/VendorResource/Pages/EditVendor.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
 
-use App\Concerns\RedirectToViewPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Purchases\VendorResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -10,7 +10,7 @@ use Filament\Support\Enums\MaxWidth;
 
 class EditVendor extends EditRecord
 {
-    use RedirectToViewPage;
+    use HandlePageRedirect;
 
     protected static string $resource = VendorResource::class;
 

app/Filament/Company/Resources/Sales/ClientResource/Pages/CreateClient.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Enums\Common\AddressType;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Models\Common\Address;
@@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class CreateClient extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = ClientResource::class;
 

app/Filament/Company/Resources/Sales/ClientResource/Pages/EditClient.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 
-use App\Concerns\RedirectToViewPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Models\Common\Client;
 use Filament\Actions;
@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditClient extends EditRecord
 {
-    use RedirectToViewPage;
+    use HandlePageRedirect;
 
     protected static string $resource = ClientResource::class;
 

app/Filament/Company/Resources/Sales/EstimateResource/Pages/CreateEstimate.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\EstimateResource;
 use App\Models\Accounting\Estimate;
 use App\Models\Common\Client;
@@ -14,8 +14,8 @@ use Livewire\Attributes\Url;
 
 class CreateEstimate extends CreateRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = EstimateResource::class;
 

app/Filament/Company/Resources/Sales/EstimateResource/Pages/EditEstimate.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\EstimateResource;
 use App\Models\Accounting\Estimate;
 use Filament\Actions;
@@ -13,8 +13,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditEstimate extends EditRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = EstimateResource::class;
 

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/CreateInvoice.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
 use App\Models\Common\Client;
@@ -14,8 +14,8 @@ use Livewire\Attributes\Url;
 
 class CreateInvoice extends CreateRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = InvoiceResource::class;
 

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/EditInvoice.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
 use Filament\Actions;
@@ -13,8 +13,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditInvoice extends EditRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = InvoiceResource::class;
 

app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/EditRecurringInvoice.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
 use App\Models\Accounting\Estimate;
 use Filament\Actions;
@@ -13,8 +13,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditRecurringInvoice extends EditRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = RecurringInvoiceResource::class;