diff --git a/app/Concerns/Enums/Comparable.php b/app/Concerns/Enums/Comparable.php index 1c871899..efefc281 100644 --- a/app/Concerns/Enums/Comparable.php +++ b/app/Concerns/Enums/Comparable.php @@ -11,7 +11,6 @@ trait Comparable */ public function is(mixed $enum): bool { - if ($enum instanceof static) { return $this->value === $enum->value; } diff --git a/app/Filament/Resources/OrganizationResource/Actions/Tables/Activity/ViewActivityAction.php b/app/Filament/Resources/OrganizationResource/Actions/Tables/Activity/ViewActivityAction.php index 4cac5738..b4174147 100644 --- a/app/Filament/Resources/OrganizationResource/Actions/Tables/Activity/ViewActivityAction.php +++ b/app/Filament/Resources/OrganizationResource/Actions/Tables/Activity/ViewActivityAction.php @@ -50,7 +50,8 @@ protected function setUp(): void if (! $media) { return '-'; } - return new HtmlString(\sprintf( + + return new HtmlString(sprintf( '%s', $media->getTemporaryUrl(now()->addMinutes(30)), $media->file_name diff --git a/app/Filament/Resources/ProjectResource/Widgets/ApprovedProject.php b/app/Filament/Resources/ProjectResource/Widgets/ApprovedProject.php index 50eacf6f..4a183d8d 100644 --- a/app/Filament/Resources/ProjectResource/Widgets/ApprovedProject.php +++ b/app/Filament/Resources/ProjectResource/Widgets/ApprovedProject.php @@ -4,6 +4,7 @@ namespace App\Filament\Resources\ProjectResource\Widgets; +use App\Filament\Resources\ProjectResource; use App\Filament\Resources\ProjectResource\Actions\Tables\Projects\RejectProjectAction; use App\Models\Project; use Filament\Tables\Actions\EditAction; @@ -58,6 +59,7 @@ protected function getTableActions(): array ->iconButton() ->url($this->getTableRecordUrlUsing()), EditAction::make() + ->url(fn (Project $record) => ProjectResource::getUrl('edit', ['record' => $record])) ->iconButton(), RejectProjectAction::make() ->iconButton(), diff --git a/app/Filament/Resources/ProjectResource/Widgets/NewProject.php b/app/Filament/Resources/ProjectResource/Widgets/NewProject.php index 8641c53e..c25f08fe 100644 --- a/app/Filament/Resources/ProjectResource/Widgets/NewProject.php +++ b/app/Filament/Resources/ProjectResource/Widgets/NewProject.php @@ -51,7 +51,8 @@ protected function getTableActions(): array ViewAction::make()->label(__('project.actions.view')) ->iconButton() ->url($this->getTableRecordUrlUsing()), - EditAction::make() + EditAction::make('edit') + ->url(fn (Project $record) => ProjectResource::getUrl('edit', ['record' => $record])) ->iconButton(), ApproveProjectAction::make() ->iconButton(), diff --git a/app/Filament/Resources/ProjectResource/Widgets/RejectedProject.php b/app/Filament/Resources/ProjectResource/Widgets/RejectedProject.php index 0c85be8e..78136a5b 100644 --- a/app/Filament/Resources/ProjectResource/Widgets/RejectedProject.php +++ b/app/Filament/Resources/ProjectResource/Widgets/RejectedProject.php @@ -4,6 +4,7 @@ namespace App\Filament\Resources\ProjectResource\Widgets; +use App\Filament\Resources\ProjectResource; use App\Filament\Resources\ProjectResource\Actions\Tables\Projects\ApproveProjectAction; use App\Models\Project; use Filament\Tables\Actions\EditAction; @@ -55,6 +56,7 @@ protected function getTableActions(): array ->iconButton() ->url($this->getTableRecordUrlUsing()), EditAction::make() + ->url(fn (Project $record) => ProjectResource::getUrl('edit', ['record' => $record])) ->iconButton(), ApproveProjectAction::make() ->iconButton(), diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 721d50eb..76751f91 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -23,12 +23,12 @@ public function update(Request $request): RedirectResponse 'password' => [ 'required', Password::min(8) - ->mixedCase() - ->letters() - ->numbers() - ->symbols() - ->uncompromised(), - 'confirmed' + ->mixedCase() + ->letters() + ->numbers() + ->symbols() + ->uncompromised(), + 'confirmed', ], ]); diff --git a/app/Http/Controllers/Dashboard/WelcomeController.php b/app/Http/Controllers/Dashboard/WelcomeController.php index 8420aaac..c5b9793a 100644 --- a/app/Http/Controllers/Dashboard/WelcomeController.php +++ b/app/Http/Controllers/Dashboard/WelcomeController.php @@ -53,11 +53,11 @@ public function store(Request $request, User $user): RedirectResponse $attributes = $request->validate([ 'password' => ['required', 'confirmed', Password::min(8) - ->mixedCase() - ->letters() - ->numbers() - ->symbols() - ->uncompromised(),], + ->mixedCase() + ->letters() + ->numbers() + ->symbols() + ->uncompromised(), ], ]); $user->setPassword($attributes['password']); diff --git a/app/Http/Controllers/DonationController.php b/app/Http/Controllers/DonationController.php index 4b3ac28a..844a5797 100644 --- a/app/Http/Controllers/DonationController.php +++ b/app/Http/Controllers/DonationController.php @@ -39,6 +39,6 @@ public function euPlatescCallback(EuPlatescRequest $request, Donation $donation) (new EuPlatescService($donation->organization_id))->processIpn($donation, $validatedData); - echo "OK";//IMPORTANT to print OK + echo 'OK'; //IMPORTANT to print OK } } diff --git a/app/Http/Controllers/NewsletterController.php b/app/Http/Controllers/NewsletterController.php index 92de8074..303f9895 100644 --- a/app/Http/Controllers/NewsletterController.php +++ b/app/Http/Controllers/NewsletterController.php @@ -10,7 +10,6 @@ class NewsletterController extends Controller { - public function __invoke(Request $request) { $attributes = $request->validate([ diff --git a/app/Http/Requests/Donations/EuPlatescRequest.php b/app/Http/Requests/Donations/EuPlatescRequest.php index 33d952ee..7df3dead 100644 --- a/app/Http/Requests/Donations/EuPlatescRequest.php +++ b/app/Http/Requests/Donations/EuPlatescRequest.php @@ -1,5 +1,7 @@ ['required', 'decimal:2'], - 'curr' => ['required', 'string'], + 'amount' => ['required', 'decimal:2'], + 'curr' => ['required', 'string'], 'invoice_id' => ['required', 'string'], - 'ep_id' => ['required', 'string'], - 'merch_id' => ['required', 'string'], - 'action' => ['required', 'numeric', Rule::in(0, 1)], - 'message' => ['required', 'string'], - 'approval' => ['required', 'string'], - 'timestamp' => ['required', 'date_format:YmdHis'], - 'nonce' => ['required', 'string'], - 'fp_hash' => ['required', 'string'], + 'ep_id' => ['required', 'string'], + 'merch_id' => ['required', 'string'], + 'action' => ['required', 'numeric', Rule::in(0, 1)], + 'message' => ['required', 'string'], + 'approval' => ['required', 'string'], + 'timestamp' => ['required', 'date_format:YmdHis'], + 'nonce' => ['required', 'string'], + 'fp_hash' => ['required', 'string'], 'sec_status' => ['nullable', 'numeric'], 'rrn' => ['nullable', 'numeric'], 'mcard' => ['nullable', 'numeric'], @@ -45,7 +47,7 @@ public function rules(): array 'card_holder' => ['nullable', 'string'], 'email' => ['nullable', 'string'], 'rtype' => ['nullable', 'string'], - 'cce' => ['nullable', 'string'] + 'cce' => ['nullable', 'string'], ]; } } diff --git a/app/Http/Resources/GalaProject/ShowResource.php b/app/Http/Resources/GalaProject/ShowResource.php index 9076199c..3cd7d53f 100644 --- a/app/Http/Resources/GalaProject/ShowResource.php +++ b/app/Http/Resources/GalaProject/ShowResource.php @@ -53,5 +53,4 @@ public function toArray(Request $request): array ]; } - } diff --git a/database/factories/GalaFactory.php b/database/factories/GalaFactory.php index 7add8c07..ab24a6e5 100644 --- a/database/factories/GalaFactory.php +++ b/database/factories/GalaFactory.php @@ -6,7 +6,6 @@ use App\Models\County; use App\Models\Gala; -use Carbon\Carbon; use Carbon\CarbonImmutable; use Illuminate\Database\Eloquent\Factories\Factory; diff --git a/database/migrations/2024_02_06_130643_add_ep_id_in_donations.php b/database/migrations/2024_02_06_130643_add_ep_id_in_donations.php index 75e39668..224af101 100644 --- a/database/migrations/2024_02_06_130643_add_ep_id_in_donations.php +++ b/database/migrations/2024_02_06_130643_add_ep_id_in_donations.php @@ -1,10 +1,13 @@