soeren/fotospiel-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Endkunden‑Checkout setzt subscription_expires_at nicht mehr (bleibt null)

Browse Source 
app/Services/Checkout/CheckoutAssignmentService.php
  - TenantPackage setzt für Endkunden kein addCentury mehr (Default jetzt 1 Jahr, nur wenn expires_at fehlt)
app/Models/TenantPackage.php
  - Tests angepasst
tests/Unit/TenantPackageTest.php
This commit is contained in:
Codex Agent
2025-12-22 15:21:45 +01:00
parent 84d90c5ece
commit d78ed0961b
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/TenantPackage.php
View File

@@ -97,8 +97,8 @@ class TenantPackage extends Model
if (! $tenantPackage->expires_at) { if (! $tenantPackage->expires_at) {
$tenantPackage->expires_at = now()->addYear(); $tenantPackage->expires_at = now()->addYear();
} }
} else { } elseif (! $tenantPackage->expires_at) {
$tenantPackage->expires_at = now()->addCentury(); $tenantPackage->expires_at = now()->addYear();
} }
if ($tenantPackage->active === null) { if ($tenantPackage->active === null) {
@@ -120,10 +120,6 @@ class TenantPackage extends Model
return; return;
} }
if ($tenantPackage->isDirty('expires_at')) {
$tenantPackage->expires_at = now()->addCentury();
}
}); });
} }
} }

2
app/Services/Checkout/CheckoutAssignmentService.php
View File

@@ -110,7 +110,7 @@ class CheckoutAssignmentService
if ($package->type !== 'reseller') { if ($package->type !== 'reseller') {
$tenant->forceFill([ $tenant->forceFill([
'subscription_status' => 'active', 'subscription_status' => 'active',
'subscription_expires_at' => $tenantPackage->expires_at, 'subscription_expires_at' => null,
])->save(); ])->save();
} }

6
tests/Unit/TenantPackageTest.php
View File

@@ -17,7 +17,7 @@ class TenantPackageTest extends TestCase
$tenantPackage = TenantPackage::factory()->create([ $tenantPackage = TenantPackage::factory()->create([
'package_id' => $package->id, 'package_id' => $package->id,
'expires_at' => now()->subYear(), 'expires_at' => null,
'active' => true, 'active' => true,
]); ]);
@@ -25,7 +25,9 @@ class TenantPackageTest extends TestCase
$this->assertTrue($tenantPackage->isActive()); $this->assertTrue($tenantPackage->isActive());
$this->assertTrue($tenantPackage->active); $this->assertTrue($tenantPackage->active);
$this->assertTrue($tenantPackage->expires_at->greaterThan(now()->addYears(50))); $this->assertNotNull($tenantPackage->expires_at);
$this->assertTrue($tenantPackage->expires_at->isFuture());
$this->assertTrue($tenantPackage->expires_at->lessThanOrEqualTo(now()->addYears(2)));
} }
public function test_reseller_packages_still_expire(): void public function test_reseller_packages_still_expire(): void