- Endkunden‑Checkout setzt subscription_expires_at nicht mehr (bleibt null)
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:
@@ -97,8 +97,8 @@ class TenantPackage extends Model
|
||||
if (! $tenantPackage->expires_at) {
|
||||
$tenantPackage->expires_at = now()->addYear();
|
||||
}
|
||||
} else {
|
||||
$tenantPackage->expires_at = now()->addCentury();
|
||||
} elseif (! $tenantPackage->expires_at) {
|
||||
$tenantPackage->expires_at = now()->addYear();
|
||||
}
|
||||
|
||||
if ($tenantPackage->active === null) {
|
||||
@@ -120,10 +120,6 @@ class TenantPackage extends Model
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if ($tenantPackage->isDirty('expires_at')) {
|
||||
$tenantPackage->expires_at = now()->addCentury();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ class CheckoutAssignmentService
|
||||
if ($package->type !== 'reseller') {
|
||||
$tenant->forceFill([
|
||||
'subscription_status' => 'active',
|
||||
'subscription_expires_at' => $tenantPackage->expires_at,
|
||||
'subscription_expires_at' => null,
|
||||
])->save();
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ class TenantPackageTest extends TestCase
|
||||
|
||||
$tenantPackage = TenantPackage::factory()->create([
|
||||
'package_id' => $package->id,
|
||||
'expires_at' => now()->subYear(),
|
||||
'expires_at' => null,
|
||||
'active' => true,
|
||||
]);
|
||||
|
||||
@@ -25,7 +25,9 @@ class TenantPackageTest extends TestCase
|
||||
|
||||
$this->assertTrue($tenantPackage->isActive());
|
||||
$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
|
||||
|
||||
Reference in New Issue
Block a user