fix: partial offer calculation

sWalbrun · Feb 3, 2024 · edc2c90 · edc2c90
1 parent f833bf2
commit edc2c90
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/app/Filament/Pages/OfferPage.php b/app/Filament/Pages/OfferPage.php
@@ -176,13 +176,15 @@ protected function getFormSchema(): array
             $buildOffer = function (?Offer $offer, int $numberOfRound) use ($topic) {
                 $shareValue = $this->putShareCount($topic);
                 $amount = $offer?->amount;
-                if (isset($shareValue) && isset($amount)) {
-                    $this->putTotalAmount($topic->id, $numberOfRound, $offer->amount * $shareValue->calculable());
-                    $this->putPartialAmount($topic->id, $numberOfRound, $offer->amount);
+                if (isset($shareValue)) {
+                    $this->putTotalAmount($topic->id, $numberOfRound, $amount ? $amount * $shareValue->calculable() : null);
+                    if (isset($amount)) {
+                        $this->putPartialAmount($topic->id, $numberOfRound, $amount);
+                    }
                 }
 
                 return [TextInput::make("roundToTotalAmountMapping.$topic->id.$numberOfRound")
-                    ->label(trans('Total offer :numberOfRound', ['numberOfRound' => $numberOfRound]))
+                    ->label(trans('Total :numberOfRound offer', ['numberOfRound' => $numberOfRound]))
                     ->numeric()
                     ->reactive()
                     ->afterStateUpdated(
@@ -210,7 +212,7 @@ protected function getFormSchema(): array
                     ->suffix('€')
                     ->required(),
                     TextInput::make("roundToPartialAmountMapping.$topic->id.$numberOfRound")
-                        ->label(trans('Partial offer :numberOfRound', ['numberOfRound' => $numberOfRound]))
+                        ->label(trans('Partial :numberOfRound offer', ['numberOfRound' => $numberOfRound]))
                         ->disabled()
                         ->suffix('€')];
             };

diff --git a/app/Jobs/SetTenantCookie.php b/app/Jobs/SetTenantCookie.php
@@ -3,11 +3,10 @@
 namespace App\Jobs;
 
 use App\Models\User;
+use function cookie;
 use Illuminate\Auth\Events\Authenticated;
 use Illuminate\Support\Facades\Cookie;
 
-use function cookie;
-
 /**
  * This middleware is setting the tenant id as a cookie. The current logic is allowing you only to be part of one
  * and only one tenancy determined by the {@link User::email user's email address}.

diff --git a/resources/lang/de.json b/resources/lang/de.json
@@ -667,8 +667,8 @@
     "User template": "Benutzervorlage herunter laden",
     "Remind participants": "Teilnehmer erinnern",
     "Currently no open round": "Derzeit gibt es keine offene Beitragsrunde",
-    "Total offer :numberOfRound": "Gebot Gesamt :numberOfRound",
-    "Partial offer :numberOfRound": "Gebot pro Anteil :numberOfRound",
+    "Total :numberOfRound offer": "Gebot :numberOfRound Gesamt",
+    "Partial :numberOfRound offer": "Gebot :numberOfRound pro Anteil",
     "Offers": "Gebote",
     "Payment interval": "Zahlungsintervall",
     "Your offers": "Deine Gebote",

diff --git a/tests/Feature/Filament/ImportTest.php b/tests/Feature/Filament/ImportTest.php
@@ -3,9 +3,8 @@
 use App\Models\User;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Hash;
-use SWalbrun\FilamentModelImport\Filament\Pages\ImportPage;
-
 use function Pest\Livewire\livewire;
+use SWalbrun\FilamentModelImport\Filament\Pages\ImportPage;
 
 it('can create an user and roles by import', function () {
     $fileToImport = getDefaultXlsx('UserImport.xlsx');

diff --git a/tests/Feature/Filament/OfferPageTest.php b/tests/Feature/Filament/OfferPageTest.php
@@ -10,7 +10,6 @@
 use App\Models\Topic;
 use App\Models\User;
 use Carbon\Carbon;
-
 use function Pest\Livewire\livewire;
 
 it('saves the given offers', function () {

diff --git a/tests/Feature/Filament/UserResourceTest.php b/tests/Feature/Filament/UserResourceTest.php
@@ -7,9 +7,8 @@
 use App\Filament\Resources\UserResource\Pages\ListUsers;
 use App\Models\User;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Spatie\Permission\Models\Permission;
-
 use function Pest\Livewire\livewire;
+use Spatie\Permission\Models\Permission;
 
 it('shows all existing users', function () {