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 <noreply@anthropic.com>

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([

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;

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;

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;

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;
 

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;
 
 /**

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;

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;

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;
 

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;

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;

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;
 

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;

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;

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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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,
         ]);

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;

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;

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.

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.

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.

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.

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;

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;

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;

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;
 

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
 {

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.

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;

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;

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;

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;
 

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;

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;

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;

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

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;

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

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;

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;

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;

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));
             }
 

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;

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);
 

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);
 

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);
 

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);
 

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);

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);
 

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);
 

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);
 

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 () {