From 8f27fe85c34217c4a440453b596c40f37cb37ed7 Mon Sep 17 00:00:00 2001 From: Snider Date: Tue, 27 Jan 2026 17:39:12 +0000 Subject: [PATCH] refactor: update Tenant module imports after namespace migration Updates all references from Core\Mod\Tenant to Core\Tenant following the monorepo separation. The Tenant module now lives in its own package with the simplified namespace. Co-Authored-By: Claude Opus 4.5 --- Controllers/Api/CommerceController.php | 8 +++--- Controllers/InvoiceController.php | 2 +- .../Webhooks/StripeWebhookController.php | 4 +-- Jobs/ProcessSubscriptionRenewal.php | 6 ++--- Listeners/ProvisionSocialHostSubscription.php | 6 ++--- .../RewardAgentReferralOnSubscription.php | 2 +- Mcp/Tools/GetBillingStatus.php | 2 +- Mcp/Tools/UpgradePlan.php | 4 +-- Models/CouponUsage.php | 2 +- Models/CreditNote.php | 4 +-- Models/Entity.php | 2 +- Models/InventoryMovement.php | 2 +- Models/Invoice.php | 2 +- Models/Order.php | 4 +-- Models/OrderItem.php | 2 +- Models/Payment.php | 2 +- Models/PaymentMethod.php | 4 +-- Models/PermissionRequest.php | 2 +- Models/Referral.php | 2 +- Models/ReferralCode.php | 2 +- Models/ReferralCommission.php | 2 +- Models/ReferralPayout.php | 2 +- Models/Refund.php | 2 +- Models/Subscription.php | 4 +-- Models/UsageEvent.php | 4 +-- Services/CommerceService.php | 26 +++++++++---------- Services/CouponService.php | 4 +-- Services/CreditNoteService.php | 4 +-- Services/DunningService.php | 2 +- Services/InvoiceService.php | 2 +- Services/PaymentGateway/BTCPayGateway.php | 2 +- .../PaymentGateway/PaymentGatewayContract.php | 2 +- Services/PaymentGateway/StripeGateway.php | 2 +- Services/PaymentMethodService.php | 4 +-- Services/ReferralService.php | 2 +- Services/RefundService.php | 2 +- Services/SubscriptionService.php | 8 +++--- Services/TaxService.php | 2 +- Services/UsageBillingService.php | 4 +-- View/Modal/Admin/CouponManager.php | 2 +- View/Modal/Admin/CreditNoteManager.php | 4 +-- View/Modal/Admin/EntityManager.php | 2 +- View/Modal/Admin/OrderManager.php | 2 +- View/Modal/Admin/SubscriptionManager.php | 2 +- View/Modal/Web/ChangePlan.php | 4 +-- View/Modal/Web/CheckoutCancel.php | 2 +- View/Modal/Web/CheckoutPage.php | 4 +-- View/Modal/Web/CheckoutSuccess.php | 4 +-- View/Modal/Web/Dashboard.php | 2 +- View/Modal/Web/Invoices.php | 2 +- View/Modal/Web/PaymentMethods.php | 2 +- View/Modal/Web/Subscription.php | 4 +-- View/Modal/Web/UsageDashboard.php | 2 +- tests/Feature/CheckoutFlowTest.php | 8 +++--- tests/Feature/CouponServiceTest.php | 6 ++--- tests/Feature/DunningServiceTest.php | 8 +++--- .../ProcessSubscriptionRenewalTest.php | 16 ++++++------ tests/Feature/RefundServiceTest.php | 4 +-- tests/Feature/SubscriptionServiceTest.php | 10 +++---- tests/Feature/TaxServiceTest.php | 2 +- tests/Feature/WebhookTest.php | 10 +++---- tests/UseCase/AdminCrudBasic.php | 4 +-- 62 files changed, 125 insertions(+), 125 deletions(-) diff --git a/Controllers/Api/CommerceController.php b/Controllers/Api/CommerceController.php index d831b04..30ca5cd 100644 --- a/Controllers/Api/CommerceController.php +++ b/Controllers/Api/CommerceController.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace Core\Mod\Commerce\Controllers\Api; use Core\Front\Controller; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\Workspace; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -38,7 +38,7 @@ class CommerceController extends Controller { $user = Auth::user(); - if (! $user instanceof \Core\Mod\Tenant\Models\User) { + if (! $user instanceof \Core\Tenant\Models\User) { return null; } @@ -200,7 +200,7 @@ class CommerceController extends Controller return response()->json(['error' => 'No workspace found'], 404); } - $entitlements = app(\Core\Mod\Tenant\Services\EntitlementService::class); + $entitlements = app(\Core\Tenant\Services\EntitlementService::class); $summary = $entitlements->getUsageSummary($workspace); return response()->json([ diff --git a/Controllers/InvoiceController.php b/Controllers/InvoiceController.php index 7cfe74c..5ebc6b5 100644 --- a/Controllers/InvoiceController.php +++ b/Controllers/InvoiceController.php @@ -7,7 +7,7 @@ namespace Core\Mod\Commerce\Controllers; use Core\Front\Controller; use Core\Mod\Commerce\Models\Invoice; use Core\Mod\Commerce\Services\InvoiceService; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\Auth; diff --git a/Controllers/Webhooks/StripeWebhookController.php b/Controllers/Webhooks/StripeWebhookController.php index 57e6190..3b5b305 100644 --- a/Controllers/Webhooks/StripeWebhookController.php +++ b/Controllers/Webhooks/StripeWebhookController.php @@ -4,8 +4,8 @@ namespace Core\Mod\Commerce\Controllers\Webhooks; use Carbon\Carbon; use Core\Front\Controller; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\EntitlementService; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; diff --git a/Jobs/ProcessSubscriptionRenewal.php b/Jobs/ProcessSubscriptionRenewal.php index c319543..c1dcea1 100644 --- a/Jobs/ProcessSubscriptionRenewal.php +++ b/Jobs/ProcessSubscriptionRenewal.php @@ -6,9 +6,9 @@ namespace Core\Mod\Commerce\Jobs; use Core\Mod\Commerce\Events\SubscriptionRenewed; use Core\Mod\Commerce\Models\Subscription; -use Core\Mod\Tenant\Models\EntitlementLog; -use Core\Mod\Tenant\Models\WorkspacePackage; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\EntitlementLog; +use Core\Tenant\Models\WorkspacePackage; +use Core\Tenant\Services\EntitlementService; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/Listeners/ProvisionSocialHostSubscription.php b/Listeners/ProvisionSocialHostSubscription.php index 02437fc..0847c3c 100644 --- a/Listeners/ProvisionSocialHostSubscription.php +++ b/Listeners/ProvisionSocialHostSubscription.php @@ -7,9 +7,9 @@ use Core\Mod\Commerce\Events\SubscriptionCancelled; use Core\Mod\Commerce\Events\SubscriptionCreated; use Core\Mod\Commerce\Events\SubscriptionRenewed; use Core\Mod\Commerce\Events\SubscriptionUpdated; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\WorkspacePackage; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\WorkspacePackage; +use Core\Tenant\Services\EntitlementService; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Support\Facades\Log; diff --git a/Listeners/RewardAgentReferralOnSubscription.php b/Listeners/RewardAgentReferralOnSubscription.php index 40dc519..eed54cf 100644 --- a/Listeners/RewardAgentReferralOnSubscription.php +++ b/Listeners/RewardAgentReferralOnSubscription.php @@ -6,7 +6,7 @@ namespace Core\Mod\Commerce\Listeners; use Core\Mod\Commerce\Events\SubscriptionCreated; use Mod\Trees\Models\TreePlanting; -use Core\Mod\Tenant\Models\AgentReferralBonus; +use Core\Tenant\Models\AgentReferralBonus; use Illuminate\Support\Facades\Log; /** diff --git a/Mcp/Tools/GetBillingStatus.php b/Mcp/Tools/GetBillingStatus.php index 6a82f6d..9ff0041 100644 --- a/Mcp/Tools/GetBillingStatus.php +++ b/Mcp/Tools/GetBillingStatus.php @@ -3,7 +3,7 @@ namespace Core\Mod\Commerce\Mcp\Tools; use Core\Mod\Commerce\Models\Subscription; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Contracts\JsonSchema\JsonSchema; use Laravel\Mcp\Request; use Laravel\Mcp\Response; diff --git a/Mcp/Tools/UpgradePlan.php b/Mcp/Tools/UpgradePlan.php index 97ebb09..2c72c92 100644 --- a/Mcp/Tools/UpgradePlan.php +++ b/Mcp/Tools/UpgradePlan.php @@ -4,8 +4,8 @@ namespace Core\Mod\Commerce\Mcp\Tools; use Core\Mod\Commerce\Models\Subscription; use Core\Mod\Commerce\Services\SubscriptionService; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Models\Package; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Models\Package; use Illuminate\Contracts\JsonSchema\JsonSchema; use Laravel\Mcp\Request; use Laravel\Mcp\Response; diff --git a/Models/CouponUsage.php b/Models/CouponUsage.php index 79e2103..9973b6c 100644 --- a/Models/CouponUsage.php +++ b/Models/CouponUsage.php @@ -2,7 +2,7 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/CreditNote.php b/Models/CreditNote.php index 3a737cc..b8d8c9b 100644 --- a/Models/CreditNote.php +++ b/Models/CreditNote.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/Entity.php b/Models/Entity.php index 16ab660..e0e76de 100644 --- a/Models/Entity.php +++ b/Models/Entity.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/InventoryMovement.php b/Models/InventoryMovement.php index e21a045..780ae5c 100644 --- a/Models/InventoryMovement.php +++ b/Models/InventoryMovement.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/Invoice.php b/Models/Invoice.php index 04403b6..3e91646 100644 --- a/Models/Invoice.php +++ b/Models/Invoice.php @@ -2,7 +2,7 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/Order.php b/Models/Order.php index ff6cfee..e4cfbcc 100644 --- a/Models/Order.php +++ b/Models/Order.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/OrderItem.php b/Models/OrderItem.php index 77bd4dc..207ff22 100644 --- a/Models/OrderItem.php +++ b/Models/OrderItem.php @@ -2,7 +2,7 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\Package; +use Core\Tenant\Models\Package; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/Payment.php b/Models/Payment.php index 102a2c0..1bc6e91 100644 --- a/Models/Payment.php +++ b/Models/Payment.php @@ -2,7 +2,7 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/PaymentMethod.php b/Models/PaymentMethod.php index a016e7e..603b010 100644 --- a/Models/PaymentMethod.php +++ b/Models/PaymentMethod.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/PermissionRequest.php b/Models/PermissionRequest.php index 88da47c..1685ab2 100644 --- a/Models/PermissionRequest.php +++ b/Models/PermissionRequest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/Referral.php b/Models/Referral.php index 06e65ec..e22679a 100644 --- a/Models/Referral.php +++ b/Models/Referral.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; diff --git a/Models/ReferralCode.php b/Models/ReferralCode.php index b28fd61..2b0effc 100644 --- a/Models/ReferralCode.php +++ b/Models/ReferralCode.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Spatie\Activitylog\LogOptions; diff --git a/Models/ReferralCommission.php b/Models/ReferralCommission.php index ebec500..e1c4c47 100644 --- a/Models/ReferralCommission.php +++ b/Models/ReferralCommission.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Spatie\Activitylog\LogOptions; diff --git a/Models/ReferralPayout.php b/Models/ReferralPayout.php index bbea189..0f71b2e 100644 --- a/Models/ReferralPayout.php +++ b/Models/ReferralPayout.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; diff --git a/Models/Refund.php b/Models/Refund.php index e7ed92f..bf0c01e 100644 --- a/Models/Refund.php +++ b/Models/Refund.php @@ -2,7 +2,7 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/Subscription.php b/Models/Subscription.php index 035a3a6..88fbd1b 100644 --- a/Models/Subscription.php +++ b/Models/Subscription.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Models\WorkspacePackage; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Models\WorkspacePackage; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/Models/UsageEvent.php b/Models/UsageEvent.php index ec7d5aa..7f97e7a 100644 --- a/Models/UsageEvent.php +++ b/Models/UsageEvent.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\Models; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Support\Str; diff --git a/Services/CommerceService.php b/Services/CommerceService.php index d824ec4..b4ec897 100644 --- a/Services/CommerceService.php +++ b/Services/CommerceService.php @@ -2,9 +2,9 @@ namespace Core\Mod\Commerce\Services; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\EntitlementService; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; use Core\Mod\Commerce\Contracts\Orderable; @@ -114,7 +114,7 @@ class CommerceService $order = Order::create([ 'orderable_type' => get_class($orderable), 'orderable_id' => $orderable->id, - 'user_id' => $orderable instanceof \Core\Mod\Tenant\Models\User ? $orderable->id : null, + 'user_id' => $orderable instanceof \Core\Tenant\Models\User ? $orderable->id : null, 'order_number' => Order::generateOrderNumber(), 'status' => 'pending', 'billing_cycle' => $billingCycle, @@ -253,7 +253,7 @@ class CommerceService $order = Order::create([ 'orderable_type' => get_class($orderable), 'orderable_id' => $orderable->id, - 'user_id' => $orderable instanceof \Core\Mod\Tenant\Models\User ? $orderable->id : null, + 'user_id' => $orderable instanceof \Core\Tenant\Models\User ? $orderable->id : null, 'order_number' => Order::generateOrderNumber(), 'status' => 'pending', 'billing_cycle' => 'onetime', @@ -329,7 +329,7 @@ class CommerceService } // Provision boosts for user-level orders - if ($order->orderable instanceof \Core\Mod\Tenant\Models\User) { + if ($order->orderable instanceof \Core\Tenant\Models\User) { foreach ($order->items as $item) { if ($item->item_type === 'boost') { $quantity = $item->metadata['quantity'] ?? $item->quantity ?? 1; @@ -349,21 +349,21 @@ class CommerceService /** * Provision a boost for a user. */ - public function provisionBoostForUser(\Core\Mod\Tenant\Models\User $user, string $featureCode, int $quantity = 1, array $metadata = []): \Core\Mod\Tenant\Models\Boost + public function provisionBoostForUser(\Core\Tenant\Models\User $user, string $featureCode, int $quantity = 1, array $metadata = []): \Core\Tenant\Models\Boost { // Use ADD_LIMIT for quantity-based boosts, ENABLE for boolean boosts $boostType = $quantity > 1 || $this->isQuantityBasedFeature($featureCode) - ? \Core\Mod\Tenant\Models\Boost::BOOST_TYPE_ADD_LIMIT - : \Core\Mod\Tenant\Models\Boost::BOOST_TYPE_ENABLE; + ? \Core\Tenant\Models\Boost::BOOST_TYPE_ADD_LIMIT + : \Core\Tenant\Models\Boost::BOOST_TYPE_ENABLE; - return \Core\Mod\Tenant\Models\Boost::create([ + return \Core\Tenant\Models\Boost::create([ 'user_id' => $user->id, 'workspace_id' => null, 'feature_code' => $featureCode, 'boost_type' => $boostType, - 'duration_type' => \Core\Mod\Tenant\Models\Boost::DURATION_PERMANENT, - 'limit_value' => $boostType === \Core\Mod\Tenant\Models\Boost::BOOST_TYPE_ADD_LIMIT ? $quantity : null, - 'status' => \Core\Mod\Tenant\Models\Boost::STATUS_ACTIVE, + 'duration_type' => \Core\Tenant\Models\Boost::DURATION_PERMANENT, + 'limit_value' => $boostType === \Core\Tenant\Models\Boost::BOOST_TYPE_ADD_LIMIT ? $quantity : null, + 'status' => \Core\Tenant\Models\Boost::STATUS_ACTIVE, 'starts_at' => now(), 'metadata' => $metadata, ]); diff --git a/Services/CouponService.php b/Services/CouponService.php index 1b0a81d..5585ee3 100644 --- a/Services/CouponService.php +++ b/Services/CouponService.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\Services; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Model; use Core\Mod\Commerce\Contracts\Orderable; use Core\Mod\Commerce\Data\CouponValidationResult; diff --git a/Services/CreditNoteService.php b/Services/CreditNoteService.php index e206528..3ea979f 100644 --- a/Services/CreditNoteService.php +++ b/Services/CreditNoteService.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\Services; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; diff --git a/Services/DunningService.php b/Services/DunningService.php index 7a0c22c..2fd4b18 100644 --- a/Services/DunningService.php +++ b/Services/DunningService.php @@ -12,7 +12,7 @@ use Core\Mod\Commerce\Notifications\PaymentFailed; use Core\Mod\Commerce\Notifications\PaymentRetry; use Core\Mod\Commerce\Notifications\SubscriptionCancelled; use Core\Mod\Commerce\Notifications\SubscriptionPaused; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Services\EntitlementService; /** * Dunning service for failed payment recovery. diff --git a/Services/InvoiceService.php b/Services/InvoiceService.php index ee8a2a7..2659f12 100644 --- a/Services/InvoiceService.php +++ b/Services/InvoiceService.php @@ -10,7 +10,7 @@ use Core\Mod\Commerce\Models\Invoice; use Core\Mod\Commerce\Models\InvoiceItem; use Core\Mod\Commerce\Models\Order; use Core\Mod\Commerce\Models\Payment; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; /** * Invoice generation and management service. diff --git a/Services/PaymentGateway/BTCPayGateway.php b/Services/PaymentGateway/BTCPayGateway.php index 85f0d87..1dd1d7b 100644 --- a/Services/PaymentGateway/BTCPayGateway.php +++ b/Services/PaymentGateway/BTCPayGateway.php @@ -9,7 +9,7 @@ use Core\Mod\Commerce\Models\Order; use Core\Mod\Commerce\Models\Payment; use Core\Mod\Commerce\Models\PaymentMethod; use Core\Mod\Commerce\Models\Subscription; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; /** * BTCPay Server payment gateway implementation. diff --git a/Services/PaymentGateway/PaymentGatewayContract.php b/Services/PaymentGateway/PaymentGatewayContract.php index 7648f97..03509ef 100644 --- a/Services/PaymentGateway/PaymentGatewayContract.php +++ b/Services/PaymentGateway/PaymentGatewayContract.php @@ -7,7 +7,7 @@ use Core\Mod\Commerce\Models\Payment; use Core\Mod\Commerce\Models\PaymentMethod; use Core\Mod\Commerce\Models\Refund; use Core\Mod\Commerce\Models\Subscription; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; /** * Contract for payment gateway implementations. diff --git a/Services/PaymentGateway/StripeGateway.php b/Services/PaymentGateway/StripeGateway.php index ae37391..f0276b8 100644 --- a/Services/PaymentGateway/StripeGateway.php +++ b/Services/PaymentGateway/StripeGateway.php @@ -2,7 +2,7 @@ namespace Core\Mod\Commerce\Services\PaymentGateway; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Facades\Log; use Core\Mod\Commerce\Models\Order; use Core\Mod\Commerce\Models\Payment; diff --git a/Services/PaymentMethodService.php b/Services/PaymentMethodService.php index 0525b1f..6f8e78f 100644 --- a/Services/PaymentMethodService.php +++ b/Services/PaymentMethodService.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\Services; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; diff --git a/Services/ReferralService.php b/Services/ReferralService.php index f210d85..3feab2d 100644 --- a/Services/ReferralService.php +++ b/Services/ReferralService.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\Services; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Mod\Bio\Models\Page; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; diff --git a/Services/RefundService.php b/Services/RefundService.php index 63372c7..1d90fb7 100644 --- a/Services/RefundService.php +++ b/Services/RefundService.php @@ -5,7 +5,7 @@ namespace Core\Mod\Commerce\Services; use Core\Mod\Commerce\Models\Payment; use Core\Mod\Commerce\Models\Refund; use Core\Mod\Commerce\Notifications\RefundProcessed; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; diff --git a/Services/SubscriptionService.php b/Services/SubscriptionService.php index bde8748..29164fc 100644 --- a/Services/SubscriptionService.php +++ b/Services/SubscriptionService.php @@ -7,10 +7,10 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Core\Mod\Commerce\Exceptions\PauseLimitExceededException; use Core\Mod\Commerce\Models\Subscription; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Models\WorkspacePackage; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Models\WorkspacePackage; +use Core\Tenant\Services\EntitlementService; class SubscriptionService { diff --git a/Services/TaxService.php b/Services/TaxService.php index 140e519..30d024d 100644 --- a/Services/TaxService.php +++ b/Services/TaxService.php @@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; use Core\Mod\Commerce\Contracts\Orderable; use Core\Mod\Commerce\Models\TaxRate; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; /** * Tax calculation service. diff --git a/Services/UsageBillingService.php b/Services/UsageBillingService.php index 73edf0a..cddcd04 100644 --- a/Services/UsageBillingService.php +++ b/Services/UsageBillingService.php @@ -3,8 +3,8 @@ namespace Core\Mod\Commerce\Services; use Carbon\Carbon; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; diff --git a/View/Modal/Admin/CouponManager.php b/View/Modal/Admin/CouponManager.php index b106e45..5db8eac 100644 --- a/View/Modal/Admin/CouponManager.php +++ b/View/Modal/Admin/CouponManager.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\View\Modal\Admin; -use Core\Mod\Tenant\Models\Package; +use Core\Tenant\Models\Package; use Livewire\Attributes\Computed; use Livewire\Attributes\Layout; use Livewire\Attributes\Title; diff --git a/View/Modal/Admin/CreditNoteManager.php b/View/Modal/Admin/CreditNoteManager.php index 8c1cb55..a04591f 100644 --- a/View/Modal/Admin/CreditNoteManager.php +++ b/View/Modal/Admin/CreditNoteManager.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace Core\Mod\Commerce\View\Modal\Admin; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Livewire\Attributes\Computed; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/View/Modal/Admin/EntityManager.php b/View/Modal/Admin/EntityManager.php index 15cd03c..180efad 100644 --- a/View/Modal/Admin/EntityManager.php +++ b/View/Modal/Admin/EntityManager.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\View\Modal\Admin; use Core\Mod\Commerce\Models\Entity; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Livewire\Attributes\Layout; use Livewire\Component; diff --git a/View/Modal/Admin/OrderManager.php b/View/Modal/Admin/OrderManager.php index f680188..54ab892 100644 --- a/View/Modal/Admin/OrderManager.php +++ b/View/Modal/Admin/OrderManager.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Core\Mod\Commerce\View\Modal\Admin; use Core\Mod\Commerce\Models\Order; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Livewire\Attributes\Computed; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/View/Modal/Admin/SubscriptionManager.php b/View/Modal/Admin/SubscriptionManager.php index afbbdca..1811a0e 100644 --- a/View/Modal/Admin/SubscriptionManager.php +++ b/View/Modal/Admin/SubscriptionManager.php @@ -6,7 +6,7 @@ namespace Core\Mod\Commerce\View\Modal\Admin; use Core\Mod\Commerce\Models\Subscription; use Core\Mod\Commerce\Services\SubscriptionService; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Livewire\Attributes\Computed; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/View/Modal/Web/ChangePlan.php b/View/Modal/Web/ChangePlan.php index 8a7e2eb..5fbad54 100644 --- a/View/Modal/Web/ChangePlan.php +++ b/View/Modal/Web/ChangePlan.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\View\Modal\Web; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; use Livewire\Attributes\Layout; diff --git a/View/Modal/Web/CheckoutCancel.php b/View/Modal/Web/CheckoutCancel.php index 2dbb38f..6aabdd1 100644 --- a/View/Modal/Web/CheckoutCancel.php +++ b/View/Modal/Web/CheckoutCancel.php @@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Auth; use Livewire\Attributes\Layout; use Livewire\Component; use Core\Mod\Commerce\Models\Order; -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; #[Layout('shared::layouts.checkout')] class CheckoutCancel extends Component diff --git a/View/Modal/Web/CheckoutPage.php b/View/Modal/Web/CheckoutPage.php index 2b3f97c..c2f36af 100644 --- a/View/Modal/Web/CheckoutPage.php +++ b/View/Modal/Web/CheckoutPage.php @@ -2,8 +2,8 @@ namespace Core\Mod\Commerce\View\Modal\Web; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Facades\Auth; use Livewire\Attributes\Computed; use Livewire\Attributes\Layout; diff --git a/View/Modal/Web/CheckoutSuccess.php b/View/Modal/Web/CheckoutSuccess.php index 05e68b4..7215097 100644 --- a/View/Modal/Web/CheckoutSuccess.php +++ b/View/Modal/Web/CheckoutSuccess.php @@ -10,8 +10,8 @@ use Livewire\Attributes\Layout; use Livewire\Attributes\Validate; use Livewire\Component; use Core\Mod\Commerce\Models\Order; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; #[Layout('shared::layouts.checkout')] class CheckoutSuccess extends Component diff --git a/View/Modal/Web/Dashboard.php b/View/Modal/Web/Dashboard.php index 21e170c..dc87fb1 100644 --- a/View/Modal/Web/Dashboard.php +++ b/View/Modal/Web/Dashboard.php @@ -4,7 +4,7 @@ namespace Core\Mod\Commerce\View\Modal\Web; use Core\Mod\Commerce\Models\Subscription; use Core\Mod\Commerce\Services\CommerceService; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; use Livewire\Component; diff --git a/View/Modal/Web/Invoices.php b/View/Modal/Web/Invoices.php index 23a8930..d73a954 100644 --- a/View/Modal/Web/Invoices.php +++ b/View/Modal/Web/Invoices.php @@ -3,7 +3,7 @@ namespace Core\Mod\Commerce\View\Modal\Web; use Core\Mod\Commerce\Services\CommerceService; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Support\Facades\Auth; use Livewire\Attributes\Layout; diff --git a/View/Modal/Web/PaymentMethods.php b/View/Modal/Web/PaymentMethods.php index d281c88..29b1b79 100644 --- a/View/Modal/Web/PaymentMethods.php +++ b/View/Modal/Web/PaymentMethods.php @@ -2,7 +2,7 @@ namespace Core\Mod\Commerce\View\Modal\Web; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; use Livewire\Attributes\Layout; diff --git a/View/Modal/Web/Subscription.php b/View/Modal/Web/Subscription.php index 6c7c364..1f9bf53 100644 --- a/View/Modal/Web/Subscription.php +++ b/View/Modal/Web/Subscription.php @@ -6,7 +6,7 @@ use Core\Mod\Commerce\Models\Subscription as SubscriptionModel; use Core\Mod\Commerce\Notifications\SubscriptionCancelled; use Core\Mod\Commerce\Services\CommerceService; use Core\Mod\Commerce\Services\SubscriptionService; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; use Livewire\Attributes\Layout; @@ -123,7 +123,7 @@ class Subscription extends Component // Notify user $user = Auth::user(); - if ($user instanceof \Core\Mod\Tenant\Models\User) { + if ($user instanceof \Core\Tenant\Models\User) { $user->notify(new SubscriptionCancelled($this->activeSubscription)); } diff --git a/View/Modal/Web/UsageDashboard.php b/View/Modal/Web/UsageDashboard.php index f8c18e5..89dea49 100644 --- a/View/Modal/Web/UsageDashboard.php +++ b/View/Modal/Web/UsageDashboard.php @@ -2,7 +2,7 @@ namespace Core\Mod\Commerce\View\Modal\Web; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; use Livewire\Component; diff --git a/tests/Feature/CheckoutFlowTest.php b/tests/Feature/CheckoutFlowTest.php index 8b77fc1..9d68cc7 100644 --- a/tests/Feature/CheckoutFlowTest.php +++ b/tests/Feature/CheckoutFlowTest.php @@ -6,10 +6,10 @@ use Core\Mod\Commerce\Models\Order; use Core\Mod\Commerce\Models\Payment; use Core\Mod\Commerce\Services\CommerceService; use Core\Mod\Commerce\Services\PaymentGateway\PaymentGatewayContract; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Models\WorkspacePackage; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Models\WorkspacePackage; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/tests/Feature/CouponServiceTest.php b/tests/Feature/CouponServiceTest.php index 239a9b8..38d8985 100644 --- a/tests/Feature/CouponServiceTest.php +++ b/tests/Feature/CouponServiceTest.php @@ -4,9 +4,9 @@ use Core\Mod\Commerce\Models\Coupon; use Core\Mod\Commerce\Models\CouponUsage; use Core\Mod\Commerce\Models\Order; use Core\Mod\Commerce\Services\CouponService; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/tests/Feature/DunningServiceTest.php b/tests/Feature/DunningServiceTest.php index dcb347e..d6b630e 100644 --- a/tests/Feature/DunningServiceTest.php +++ b/tests/Feature/DunningServiceTest.php @@ -10,10 +10,10 @@ use Core\Mod\Commerce\Notifications\PaymentFailed; use Core\Mod\Commerce\Notifications\SubscriptionCancelled; use Core\Mod\Commerce\Notifications\SubscriptionPaused; use Core\Mod\Commerce\Services\DunningService; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Models\WorkspacePackage; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Models\WorkspacePackage; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/tests/Feature/ProcessSubscriptionRenewalTest.php b/tests/Feature/ProcessSubscriptionRenewalTest.php index 103827f..2ffd282 100644 --- a/tests/Feature/ProcessSubscriptionRenewalTest.php +++ b/tests/Feature/ProcessSubscriptionRenewalTest.php @@ -5,14 +5,14 @@ use Illuminate\Support\Facades\Event; use Core\Mod\Commerce\Events\SubscriptionRenewed; use Core\Mod\Commerce\Jobs\ProcessSubscriptionRenewal; use Core\Mod\Commerce\Models\Subscription; -use Core\Mod\Tenant\Models\Boost; -use Core\Mod\Tenant\Models\EntitlementLog; -use Core\Mod\Tenant\Models\Feature; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Models\WorkspacePackage; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Boost; +use Core\Tenant\Models\EntitlementLog; +use Core\Tenant\Models\Feature; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Models\WorkspacePackage; +use Core\Tenant\Services\EntitlementService; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/tests/Feature/RefundServiceTest.php b/tests/Feature/RefundServiceTest.php index e69b8eb..82f957f 100644 --- a/tests/Feature/RefundServiceTest.php +++ b/tests/Feature/RefundServiceTest.php @@ -5,8 +5,8 @@ use Core\Mod\Commerce\Models\Refund; use Core\Mod\Commerce\Notifications\RefundProcessed; use Core\Mod\Commerce\Services\CommerceService; use Core\Mod\Commerce\Services\RefundService; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Facades\Notification; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/tests/Feature/SubscriptionServiceTest.php b/tests/Feature/SubscriptionServiceTest.php index de1a500..2b57783 100644 --- a/tests/Feature/SubscriptionServiceTest.php +++ b/tests/Feature/SubscriptionServiceTest.php @@ -6,11 +6,11 @@ use Core\Mod\Commerce\Exceptions\PauseLimitExceededException; use Core\Mod\Commerce\Models\Subscription; use Core\Mod\Commerce\Services\ProrationResult; use Core\Mod\Commerce\Services\SubscriptionService; -use Core\Mod\Tenant\Models\Feature; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Models\WorkspacePackage; +use Core\Tenant\Models\Feature; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Models\WorkspacePackage; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/tests/Feature/TaxServiceTest.php b/tests/Feature/TaxServiceTest.php index 0903a87..d3af65c 100644 --- a/tests/Feature/TaxServiceTest.php +++ b/tests/Feature/TaxServiceTest.php @@ -2,7 +2,7 @@ use Core\Mod\Commerce\Models\TaxRate; use Core\Mod\Commerce\Services\TaxService; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/tests/Feature/WebhookTest.php b/tests/Feature/WebhookTest.php index ad19199..c3245dc 100644 --- a/tests/Feature/WebhookTest.php +++ b/tests/Feature/WebhookTest.php @@ -15,11 +15,11 @@ use Core\Mod\Commerce\Services\InvoiceService; use Core\Mod\Commerce\Services\PaymentGateway\BTCPayGateway; use Core\Mod\Commerce\Services\PaymentGateway\StripeGateway; use Core\Mod\Commerce\Services\WebhookLogger; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Models\WorkspacePackage; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Models\WorkspacePackage; +use Core\Tenant\Services\EntitlementService; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/tests/UseCase/AdminCrudBasic.php b/tests/UseCase/AdminCrudBasic.php index 757842a..7004b98 100644 --- a/tests/UseCase/AdminCrudBasic.php +++ b/tests/UseCase/AdminCrudBasic.php @@ -10,8 +10,8 @@ use Core\Mod\Commerce\Models\Order; use Core\Mod\Commerce\Models\Product; use Core\Mod\Commerce\Models\Subscription; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; describe('Commerce Admin Dashboard', function () { beforeEach(function () {