Merge branch 'develop'

Author: andreiio

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;
         }

app/Console/Commands/EndProjectPeriod.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands;
+
+use App\Models\Project;
+use App\Notifications\Ngo\ProjectEndingNotification;
+use Illuminate\Console\Command;
+
+class EndProjectPeriod extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:notification-end-project-period {--days=7}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Notify users that a project is ending in a number of days';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): void
+    {
+        $this->info('Ending project period...');
+        $daysBeforeEnding = (int) $this->option('days') ?? 7;
+        $this->info("Ending period {$daysBeforeEnding}...");
+        $projects = Project::withoutEagerLoads()->with(['organization'])
+            ->whereIsApproved()
+            ->whereDate('end', now()->addDays($daysBeforeEnding))
+            ->get();
+        $projects->each(function (Project $project) use ($daysBeforeEnding) {
+
+           $users =  $project->organization->load('users')->users->filter(function ($user) {
+                return $user->hasVerifiedEmail();
+            });
+           \Notification::send($users, new ProjectEndingNotification($project, $daysBeforeEnding));
+
+        });
+    }
+}

app/Console/Kernel.php

@@ -24,6 +24,16 @@ protected function schedule(Schedule $schedule): void
             ->everyFourHours()
             ->onOneServer()
             ->sentryMonitor('process-authorized-transactions-job');
+
+        $schedule->command('app:notification-end-project-period', ['--days' => 10])
+            ->dailyAt('09:00')
+            ->onOneServer()
+            ->sentryMonitor('notification-end-project-period');
+
+        $schedule->command('app:notification-end-project-period', ['--days' => 2])
+            ->dailyAt('10:00')
+            ->onOneServer()
+            ->sentryMonitor('notification-end-project-period');
     }
 
     /**

app/Filament/Resources/OrganizationResource/Actions/Tables/Activity/ViewActivityAction.php

@@ -50,6 +50,7 @@ protected function setUp(): void
                         if (! $media) {
                             return '-';
                         }
+
                         return new HtmlString(\sprintf(
                             '<a href="%s" target="_blank">%s</a>',
                             $media->getTemporaryUrl(now()->addMinutes(30)),

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(),

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(),

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(),

app/Filament/Widgets/BaseDonationWidget.php

@@ -28,7 +28,7 @@ protected function getChartData(
             )
             ->where('created_at', '>', $whereCreatedCondition)
             // TODO: add CAPTURE after pr #348
-            ->whereIn('status', [EuPlatescStatus::AUTHORIZED])
+            ->whereIn('status', [EuPlatescStatus::AUTHORIZED->value, EuPlatescStatus::CHARGED->value])
             ->groupBy($chartInterval)
             ->orderBy($chartInterval)
             ->get();

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',
             ],
         ]);
 

app/Http/Controllers/Dashboard/VolunteerController.php

@@ -8,6 +8,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Collections\VolunteerCollection;
 use App\Models\VolunteerRequest;
+use App\Notifications\UserWasApprovedForVolunteering;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Spatie\QueryBuilder\QueryBuilder;
@@ -41,6 +42,7 @@ public function approve(Request $request, VolunteerRequest $volunteerRequest)
     {
         $this->authorize('update', $volunteerRequest);
         $volunteerRequest->markAsApproved();
+        \Notification::send($volunteerRequest->volunteer->user, new UserWasApprovedForVolunteering());
 
         return redirect()->back()
             ->with('success', __('volunteer.messages.approved'));