Split Status into payment and fulfillment status

app/Console/Commands/BadgesPrintCommand.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Models\Badge\Badge;
-use App\Models\Badge\States\Printed;
+use App\Models\Badge\State_Fulfillment\Printed;
 use Illuminate\Console\Command;
 
 class BadgesPrintCommand extends Command
@@ -16,7 +16,7 @@ public function handle(): void
     {
         // Prints all badges
         Badge::whereNull('printed_at')->update([
-            'status' => Printed::$name,
+            'status_fulfillment' => Printed::$name,
             'printed_at' => now(),
         ]);
     }

app/Console/Commands/BadgesUnprintCommand.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Models\Badge\Badge;
-use App\Models\Badge\States\Pending;
+use App\Models\Badge\State_Fulfillment\Pending;
 use Illuminate\Console\Command;
 
 class BadgesUnprintCommand extends Command
@@ -16,7 +16,7 @@ public function handle(): void
     {
         // Unprint all badges
         Badge::whereNotNull('printed_at')->update([
-            'status' => Pending::$name,
+            'status_fulfillment' => Pending::$name,
             'printed_at' => null,
         ]);
     }

app/Domain/Checkout/Models/Checkout/States/Active.php

@@ -2,13 +2,12 @@
 
 namespace App\Domain\Checkout\Models\Checkout\States;
 
-use App\Models\Badge\States\BadgeStatusState;
 
 class Active extends CheckoutStatusState
 {
-    public static string $name = 'ACTIVE';
-    public function color(): string
-    {
-        // TODO: Implement color() method.
-    }
+  public static string $name = 'ACTIVE';
+  public function color(): string
+  {
+    // TODO: Implement color() method.
+  }
 }

app/Domain/Checkout/Models/Checkout/States/Cancelled.php

@@ -2,13 +2,11 @@
 
 namespace App\Domain\Checkout\Models\Checkout\States;
 
-use App\Models\Badge\States\BadgeStatusState;
-
 class Cancelled extends CheckoutStatusState
 {
-    public static string $name = 'CANCELLED';
-    public function color(): string
-    {
-        // TODO: Implement color() method.
-    }
+  public static string $name = 'CANCELLED';
+  public function color(): string
+  {
+    // TODO: Implement color() method.
+  }
 }

app/Domain/Checkout/Models/Checkout/States/Finished.php

@@ -2,13 +2,11 @@
 
 namespace App\Domain\Checkout\Models\Checkout\States;
 
-use App\Models\Badge\States\BadgeStatusState;
-
 class Finished extends CheckoutStatusState
 {
-    public static string $name = 'FINISHED';
-    public function color(): string
-    {
-        // TODO: Implement color() method.
-    }
+  public static string $name = 'FINISHED';
+  public function color(): string
+  {
+    // TODO: Implement color() method.
+  }
 }

app/Domain/Checkout/Models/Checkout/Transitions/ToFinished.php

@@ -6,7 +6,8 @@
 use App\Domain\Checkout\Models\Checkout\States\Cancelled;
 use App\Domain\Checkout\Models\Checkout\States\Finished;
 use App\Domain\Checkout\Services\FiskalyService;
-use App\Models\Badge\States\ReadyForPickup;
+use App\Models\Badge\State_Fulfillment\ReadyForPickup;
+use App\Models\Badge\State_Payment\Paid;
 use Illuminate\Support\Facades\DB;
 use Spatie\ModelStates\Transition;
 
@@ -26,8 +27,8 @@ public function handle()
             $fiskalyService->updateOrCreateTransaction($this->checkout);
 
             $this->checkout->items->each(function ($item) {
-                if ($item->payable->status->canTransitionTo(ReadyForPickup::class)) {
-                    $item->payable->status->transitionTo(ReadyForPickup::class);
+                if ($item->payable->status_payment->canTransitionTo(Paid::class)) {
+                    $item->payable->status_payment->transitionTo(Paid::class);
                 }
             });
 

app/Filament/Resources/BadgeResource.php

@@ -5,11 +5,14 @@
 use App\Filament\Resources\BadgeResource\Pages;
 use App\Jobs\Printing\PrintBadgeJob;
 use App\Models\Badge\Badge;
-use App\Models\Badge\States\BadgeStatusState;
-use App\Models\Badge\States\Pending;
-use App\Models\Badge\States\PickedUp;
-use App\Models\Badge\States\Printed;
-use App\Models\Badge\States\ReadyForPickup;
+use App\Models\Badge\State_Fulfillment\BadgeFulfillmentStatusState;
+use App\Models\Badge\State_Fulfillment\Pending;
+use App\Models\Badge\State_Fulfillment\PickedUp;
+use App\Models\Badge\State_Fulfillment\Printed;
+use App\Models\Badge\State_Fulfillment\ReadyForPickup;
+use App\Models\Badge\State_Payment\BadgePaymentStatusState;
+use App\Models\Badge\State_Payment\Paid;
+use App\Models\Badge\State_Payment\Unpaid;
 use App\Models\Fursuit\States\FursuitStatusState;
 use App\Models\Machine;
 use Filament\Forms;
@@ -37,9 +40,13 @@ public static function form(Form $form): Form
                     ->relationship('fursuit', 'name')
                     ->required(),
                 // Status
-                Forms\Components\Select::make('status')
-                    ->label('Status')
-                    ->options(BadgeStatusState::getStateMapping()->keys()->mapWithKeys(fn($key) => [$key => ucfirst($key)]))
+                Forms\Components\Select::make('status_fulfillment')
+                    ->label('status_fulfillment')
+                    ->options(BadgeFulfillmentStatusState::getStateMapping()->keys()->mapWithKeys(fn($key) => [$key => ucfirst($key)]))
+                    ->required(),
+                Forms\Components\Select::make('status_payment')
+                    ->label('status_payment')
+                    ->options(BadgePaymentStatusState::getStateMapping()->keys()->mapWithKeys(fn($key) => [$key => ucfirst($key)]))
                     ->required(),
                 Forms\Components\Group::make([
                     // Total
@@ -64,25 +71,32 @@ public static function table(Table $table): Table
                 Tables\Columns\TextColumn::make('custom_id')
                     ->sortable()
                     ->searchable()
-                    ->label('Fursuit'),
+                    ->label('Custom ID'),
                 Tables\Columns\TextColumn::make('fursuit.user.attendee_id')
                     ->sortable()
                     ->searchable()
-                    ->label('Fursuit'),
+                    ->label('Attendee ID'),
                 Tables\Columns\TextColumn::make('fursuit.name')
                     ->searchable()
                     ->label('Fursuit'),
-                Tables\Columns\TextColumn::make('status')->badge()->colors([
+                Tables\Columns\TextColumn::make('status_fulfillment')->badge()->colors([
                     Pending::$name => 'default',
                     Printed::$name => 'success',
                     ReadyForPickup::$name => 'success',
                     PickedUp::$name => 'warning',
                 ]),
+                Tables\Columns\TextColumn::make('status_payment')->badge()->colors([
+                    Unpaid::$name => 'warning',
+                    Paid::$name => 'success',
+                ]),
             ])
             ->filters([
-                Tables\Filters\SelectFilter::make('status')
-                    ->options(BadgeStatusState::getStateMapping()->keys()->mapWithKeys(fn($key) => [ucfirst($key) => $key]))
-                    ->label('Badge Status'),
+                Tables\Filters\SelectFilter::make('status_fulfillment')
+                    ->options(BadgeFulfillmentStatusState::getStateMapping()->keys()->mapWithKeys(fn($key) => [ucfirst($key) => $key]))
+                    ->label('Badge Fulfillment Status'),
+                Tables\Filters\SelectFilter::make('status_payment')
+                    ->options(BadgePaymentStatusState::getStateMapping()->keys()->mapWithKeys(fn($key) => [ucfirst($key) => $key]))
+                    ->label('Badge Payment Status'),
                 // Duplex Bool Filter
                 Tables\Filters\TernaryFilter::make('dual_side_print')
                     ->label('Double Sided'),
@@ -114,10 +128,10 @@ public static function table(Table $table): Table
             ->defaultSort('fursuit.user.attendee_id', 'asc');
     }
 
-    public static function printBadge(Badge $badge,$mass = 0): Badge
+    public static function printBadge(Badge $badge, $mass = 0): Badge
     {
-        if ($badge->status !== Printed::class && $badge->status->canTransitionTo(Printed::class)) {
-            $badge->status->transitionTo(Printed::class);
+        if ($badge->status_fulfillment->canTransitionTo(Printed::class)) {
+            $badge->status_fulfillment->transitionTo(Printed::class);
         }
         // Add delay for mass printing so they are generated in order
         PrintBadgeJob::dispatch($badge)->delay(now()->addSeconds($mass * 15));

app/Http/Controllers/BadgeController.php

@@ -5,12 +5,12 @@
 use App\Http\Requests\BadgeCreateRequest;
 use App\Http\Requests\BadgeUpdateRequest;
 use App\Models\Badge\Badge;
+use App\Models\Badge\State_Payment\Paid;
+use App\Models\Badge\State_Payment\Unpaid;
 use App\Models\Event;
-use App\Models\Fursuit\States\Pending;
 use App\Models\Species;
 use App\Models\User;
 use App\Notifications\BadgeCreatedNotification;
-use App\Notifications\FursuitApprovedNotification;
 use App\Services\BadgeCalculationService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -56,7 +56,7 @@ public function store(BadgeCreateRequest $request)
             $validated = $request->validated();
             // Create Fursuit
             $fursuit = $request->user()->fursuits()->create([
-                'status' => Pending::$name,
+                'status' => \App\Models\Fursuit\States\Pending::$name,
                 'event_id' => $event->id,
                 'species_id' => Species::firstOrCreate([
                     'name' => $validated['species'],
@@ -80,18 +80,20 @@ public function store(BadgeCreateRequest $request)
             );
 
             // Tax is 19% in Germany
-            $subtotal = round($total / 1.19,);
+            $subtotal = round($total / 1.19, );
             $tax = round($total - $subtotal);
 
             $badge = $fursuit->badges()->create([
-                'status' => \App\Models\Badge\States\Pending::$name,
+                'status_fulfillment' => \App\Models\Badge\State_Fulfillment\Pending::$name,
+                'status_payment' => $total === 0 ? Paid::$name : Unpaid::class,
                 'subtotal' => round($subtotal),
                 'tax_rate' => 0.19,
                 'tax' => round($tax),
                 'total' => round($total),
                 'dual_side_print' => true,
                 'is_free_badge' => $isFreeBadge,
                 'apply_late_fee' => $event->preorder_ends_at->isPast(),
+                'paid_at' => $total === 0 ? now() : null,
             ]);
             // Pay for Badge (force pay as we allow negative balance)
             $request->user()->forcePay($badge);
@@ -105,9 +107,12 @@ public function store(BadgeCreateRequest $request)
                 $clone->subtotal = round($total / 1.19);
                 $clone->tax = round($clone->total - $clone->subtotal);
                 $clone->extra_copy_of = $badge->id;
+                $clone->status_payment = Unpaid::class;
+                $clone->paid_at = null; // Spare copies are not paid immediately
                 $clone->save();
                 $request->user()->forcePay($clone->fresh());
             }
+
             return $badge;
         });
 
@@ -158,7 +163,7 @@ public function update(BadgeUpdateRequest $request, Badge $badge)
             }
             // if species_id, name or image changed, status goes back to pending review
             if ($fursuit->isDirty(['species_id', 'name', 'image'])) {
-                $fursuit->status = Pending::$name;
+                $fursuit->status = \App\Models\Badge\State_Fulfillment\Pending::$name;
             }
             $fursuit->save();
             /**
@@ -169,7 +174,7 @@ public function update(BadgeUpdateRequest $request, Badge $badge)
                 isFreeBadge: $badge->is_free_badge,
                 isLate: $badge->apply_late_fee,
             );
-            if($previousTotal !== $total) {
+            if ($previousTotal !== $total) {
                 $badge->fursuit->user->refund($badge);
             }
             $badge->total = round($total);

app/Http/Controllers/POS/BadgeController.php

@@ -4,8 +4,8 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Badge\Badge;
-use App\Models\Badge\States\PickedUp;
-use App\Models\Badge\States\ReadyForPickup;
+use App\Models\Badge\State_Fulfillment\PickedUp;
+use App\Models\Badge\State_Fulfillment\ReadyForPickup;
 use Illuminate\Http\Request;
 use function Symfony\Component\String\b;
 
@@ -17,8 +17,8 @@ public function handoutBulk(Request $request)
         $badgeIds = $request->input('badge_ids');
         $badges = Badge::whereIn('id', $badgeIds)->get();
         $badges->each(function ($badge) {
-            if($badge->status->canTransitionTo(PickedUp::class)) {
-                $badge->status->transitionTo(PickedUp::class);
+            if($badge->status_fulfillment->canTransitionTo(PickedUp::class)) {
+                $badge->status_fulfillment->transitionTo(PickedUp::class);
             } else {
                 $someError = true;
             }
@@ -30,8 +30,8 @@ public function handoutBulk(Request $request)
     }
     public function handout(Badge $badge)
     {
-        if($badge->status->canTransitionTo(PickedUp::class)) {
-            $badge->status->transitionTo(PickedUp::class);
+        if($badge->status_fulfillment->canTransitionTo(PickedUp::class)) {
+            $badge->status_fulfillment->transitionTo(PickedUp::class);
             return back()->with('success', 'Badge handed out');
         } else {
             return back()->with('error', 'Badge cannot be handed out');
@@ -40,8 +40,8 @@ public function handout(Badge $badge)
 
     public function handoutUndo(Badge $badge)
     {
-        if($badge->status->canTransitionTo(ReadyForPickup::class)) {
-            $badge->status->transitionTo(ReadyForPickup::class);
+        if($badge->status_fulfillment->canTransitionTo(ReadyForPickup::class)) {
+            $badge->status_fulfillment->transitionTo(ReadyForPickup::class);
             return back()->with('success', 'Badge handout undone');
         }
         return back()->with('error', 'Badge handout cannot be undone');

app/Http/Controllers/POS/CheckoutController.php

@@ -11,6 +11,7 @@
 use App\Domain\Checkout\Services\FiskalyService;
 use App\Http\Controllers\Controller;
 use App\Models\Badge\Badge;
+use App\Models\Badge\State_Payment\Unpaid;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
@@ -63,12 +64,12 @@ public function store(Request $request)
         if (empty($data['badge_ids'])) {
             $data['badge_ids'] = Badge::whereHas('fursuit.user', function ($query) use ($data) {
                 $query->where('id', $data['user_id']);
-            })->where('status', 'unpaid')->pluck('id')->toArray();
+            })->where('status_payment', Unpaid::$name)->pluck('id')->toArray();
         } else {
 
             $data['badge_ids'] = Badge::whereHas('fursuit.user', function ($query) use ($data) {
                 $query->where('id', $data['user_id']);
-            })->where('status', 'unpaid')
+            })->where('status_payment', Unpaid::$name)
                 ->whereIn('id', $data['badge_ids'])
                 ->pluck('id')->toArray();
         }

app/Http/Controllers/POS/Printing/PrintBadgeController.php

@@ -2,23 +2,19 @@
 
 namespace App\Http\Controllers\POS\Printing;
 
-use App\Badges\EF28_Badge;
-use App\Enum\PrintJobStatusEnum;
-use App\Enum\PrintJobTypeEnum;
+
 use App\Http\Controllers\Controller;
 use App\Jobs\Printing\PrintBadgeJob;
 use App\Models\Badge\Badge;
-use App\Models\Badge\States\Printed;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
+use App\Models\Badge\State_Fulfillment\Printed;
 
 class PrintBadgeController extends Controller
 {
     public function __invoke(Badge $badge)
     {
         PrintBadgeJob::dispatch($badge);
-        if($badge->status !== Printed::class && $badge->status->canTransitionTo(Printed::class)) {
-            $badge->status->transitionTo(Printed::class);
+        if($badge->status_fulfillment->canTransitionTo(Printed::class)) {
+            $badge->status_fulfillment->transitionTo(Printed::class);
         }
         // dispatch print job
         return redirect()->back()->with('success', 'Badge has been added to the print queue');

app/Jobs/Printing/PrintBadgeJob.php

@@ -7,7 +7,7 @@
 use App\Enum\PrintJobStatusEnum;
 use App\Enum\PrintJobTypeEnum;
 use App\Models\Badge\Badge;
-use App\Models\Badge\States\Printed;
+use App\Models\Badge\State_Fulfillment\Printed;
 use App\Models\Machine;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -26,8 +26,8 @@ public function __construct(private readonly Badge $badge)
 
     public function handle(): void
     {
-        if($this->badge->status !== Printed::class && $this->badge->status->canTransitionTo(Printed::class)) {
-            $this->badge->status->transitionTo(Printed::class);
+        if($this->badge->status_fulfillment->canTransitionTo(Printed::class)) {
+            $this->badge->status_fulfillment->transitionTo(Printed::class);
         }