Fix endcustomer package allocation and event create gating

2026-02-06 13:21:11 +01:00
parent 0291d537fb
commit df00deb0df
11 changed files with 409 additions and 14 deletions
--- a/app/Services/Checkout/CheckoutAssignmentService.php
+++ b/app/Services/Checkout/CheckoutAssignmentService.php
@@ -111,21 +111,26 @@ class CheckoutAssignmentService
                    ]);
                }
            } else {
-                $tenantPackage = TenantPackage::updateOrCreate(
-                    [
+                if ($purchase->wasRecentlyCreated) {
+                    $tenantPackage = TenantPackage::create([
                        'tenant_id' => $tenant->id,
                        'package_id' => $package->id,
-                    ],
-                    [
                        'price' => round($price, 2),
                        'active' => true,
                        'purchased_at' => now(),
                        'expires_at' => $this->resolveExpiry($package, $tenant),
-                    ]
-                );
+                    ]);
+                } else {
+                    $tenantPackage = TenantPackage::query()
+                        ->where('tenant_id', $tenant->id)
+                        ->where('package_id', $package->id)
+                        ->orderByDesc('purchased_at')
+                        ->orderByDesc('id')
+                        ->first();
+                }
            }

-            if ($package->type !== 'reseller') {
+            if ($package->type !== 'reseller' && $tenantPackage) {
                $tenant->forceFill([
                    'subscription_status' => 'active',
                    'subscription_expires_at' => $tenantPackage->expires_at,