Merge branch 'main' into develop

code4romania · Jun 25, 2024 · 7f57c68 · 7f57c68
2 parents 3c643fc + 7b51dbd
commit 7f57c68
Show file tree

Hide file tree

Showing 33 changed files with 2,833 additions and 3,876 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -16,7 +16,9 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         $schedule->command('model:prune')
-            ->daily();
+            ->daily()
+            ->onOneServer()
+            ->sentryMonitor('model-prune');
 
         $schedule->job(ProcessAuthorizedTransactionsJob::class)
             ->everyFourHours()

diff --git a/app/Filament/Widgets/StatisticsCards.php b/app/Filament/Widgets/StatisticsCards.php
@@ -59,17 +59,10 @@ private function getProjectCard(string $cardLabel): Card
         $color = $currentGrandThanLast ? 'success' : 'danger';
         $icon = $currentGrandThanLast ? 'heroicon-s-trending-up' : 'heroicon-s-trending-down';
 
-        $description = $cardLabel === 'year' ?
-            (
-                $currentGrandThanLast ?
-                __('statistics.labels.current_year_grand_than_last_year', ['number' => $currentAvg - $lastAvg]) :
-                __('statistics.labels.current_year_less_than_last_year', ['number' => $lastAvg - $currentAvg])
-            ) :
-            (
-                $currentGrandThanLast ?
-                __('statistics.labels.current_month_grand_than_last_month', ['number' => $currentAvg - $lastAvg]) :
-                __('statistics.labels.current_month_less_than_last_month', ['number' => $lastAvg - $currentAvg])
-            );
+        $diffPercent = round(($currentAvg * 100 / $lastAvg) - 100, 2);
+        $description = $cardLabel === 'year'
+            ? __('statistics.labels.current_year_vs_last_year', ['number' => $diffPercent])
+            : __('statistics.labels.current_month_vs_last_month', ['number' => $diffPercent]);
 
         $chart = array_map(function () use ($currentAvg, $lastAvg) {
             return rand(min((int) $currentAvg, (int) $lastAvg), max((int) $currentAvg, (int) $lastAvg));
@@ -118,14 +111,13 @@ private function getDonationCard(string $string)
         $color = $currentGrandThanLast ? 'success' : 'danger';
         $icon = $currentGrandThanLast ? 'heroicon-s-trending-up' : 'heroicon-s-trending-down';
 
-        $description =
-            $currentGrandThanLast ?
-                __('statistics.labels.donation_grand_than_last_year', ['amount' => $currentYear - $lastYear]) :
-                __('statistics.labels.donation_less_than_last_year', ['amount' => $lastYear - $currentYear]);
+        $diffPercent = round(($currentYear * 100 / $lastYear) - 100, 2);
+
+        $description = __('statistics.labels.donation_vs_last_year', ['amount' => $diffPercent]);
 
         return Card::make(
             __('statistics.labels.donations_amount'),
-            __('statistics.labels.amount_in_currency', ['amount' => $currentYear])
+            __('statistics.labels.amount_in_currency', ['amount' => number_format($currentYear)])
         )
             ->descriptionColor($color)
             ->descriptionIcon($icon)

diff --git a/app/Http/Controllers/Dashboard/DonationController.php b/app/Http/Controllers/Dashboard/DonationController.php
@@ -39,7 +39,8 @@ public function index(Request $request): Response
         $dates = $donations
             ->pluck('created_at')
             ->map(fn ($date) => $date->format('Y-m'))
-            ->unique();
+            ->unique()
+            ->values();
 
         return Inertia::render('AdminOng/Donations/Index', [
             'filter' => $request->query('filter'),

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "laravel/framework": "^10.20",
         "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.8",
-        "league/flysystem-aws-s3-v3": "^3.15",
+        "league/flysystem-aws-s3-v3": "^3.28",
         "pxlrbt/filament-excel": "^1.1",
         "sentry/sentry-laravel": "^3.8",
         "spatie/laravel-activitylog": "^4.7",
@@ -36,7 +36,7 @@
         "tpetry/laravel-query-expressions": "^1.1"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^3.9",
+        "barryvdh/laravel-debugbar": "^3.13",
         "barryvdh/laravel-ide-helper": "^2.13",
         "doctrine/dbal": "^3.6",
         "fakerphp/faker": "^1.9",
@@ -48,7 +48,7 @@
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^7.8",
         "phpunit/phpunit": "^10.3",
-        "spatie/laravel-ignition": "^2.3"
+        "spatie/laravel-ignition": "^2.8"
     },
     "autoload": {
         "files": [