fix: remove resale_license from db as well

app/Livewire/Settings/Index.php

@@ -23,9 +23,6 @@ class Index extends Component
     #[Validate('nullable|string|max:255')]
     public ?string $fqdn = null;
 
-    #[Validate('nullable|string|max:255')]
-    public ?string $resale_license = null;
-
     #[Validate('required|integer|min:1025|max:65535')]
     public int $public_port_min;
 
@@ -83,7 +80,6 @@ class Index extends Component
         } else {
             $this->settings = instanceSettings();
             $this->fqdn = $this->settings->fqdn;
-            $this->resale_license = $this->settings->resale_license;
             $this->public_port_min = $this->settings->public_port_min;
             $this->public_port_max = $this->settings->public_port_max;
             $this->custom_dns_servers = $this->settings->custom_dns_servers;
@@ -122,7 +118,6 @@ class Index extends Component
         }
 
         $this->settings->fqdn = $this->fqdn;
-        $this->settings->resale_license = $this->resale_license;
         $this->settings->public_port_min = $this->public_port_min;
         $this->settings->public_port_max = $this->public_port_max;
         $this->settings->custom_dns_servers = $this->custom_dns_servers;

database/migrations/2024_12_10_122143_drop_resale_license.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('instance_settings', function (Blueprint $table) {
+            $table->dropColumn('is_resale_license_active');
+            $table->dropColumn('resale_license');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('instance_settings', function (Blueprint $table) {
+            $table->boolean('is_resale_license_active')->default(false);
+            $table->longText('resale_license')->nullable();
+        });
+    }
+};

database/seeders/InstanceSettingsSeeder.php

@@ -16,7 +16,6 @@ class InstanceSettingsSeeder extends Seeder
         InstanceSettings::create([
             'id' => 0,
             'is_registration_enabled' => true,
-            'is_resale_license_active' => true,
             'smtp_enabled' => true,
             'smtp_host' => 'coolify-mail',
             'smtp_port' => 1025,

resources/views/livewire/subscription/index.blade.php

@@ -2,42 +2,38 @@
     <x-slot:title>
         Subscribe | Coolify
     </x-slot>
-    @if ($settings->is_resale_license_active)
+    @if (auth()->user()->isAdminFromSession())
-        @if (auth()->user()->isAdminFromSession())
+        <div>
-            <div>
+            <div class="flex gap-2">
-                <div class="flex gap-2">
+                <h1>Subscriptions</h1>
-                    <h1>Subscriptions</h1>
+                @if (subscriptionProvider() === 'stripe' && $alreadySubscribed)
-                    @if (subscriptionProvider() === 'stripe' && $alreadySubscribed)
+                    <x-forms.button wire:click='stripeCustomerPortal'>Manage My Subscription</x-forms.button>
-                        <x-forms.button wire:click='stripeCustomerPortal'>Manage My Subscription</x-forms.button>
-                    @endif
-                </div>
-                @if (request()->query->get('cancelled'))
-                    <div class="mb-6 rounded alert-error">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
-                            viewBox="0 0 24 24">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
-                        </svg>
-                        <span>Something went wrong with your subscription. Please try again or contact
-                            support.</span>
-                    </div>
                 @endif
+            </div>
+            @if (request()->query->get('cancelled'))
+                <div class="mb-6 rounded alert-error">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
+                        viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                            d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                    </svg>
+                    <span>Something went wrong with your subscription. Please try again or contact
+                        support.</span>
+                </div>
+            @endif
 
-                @if (config('subscription.provider') === 'stripe')
+            @if (config('subscription.provider') === 'stripe')
-                    <livewire:subscription.pricing-plans />
+                <livewire:subscription.pricing-plans />
-                @endif
+            @endif
-            </div>
+        </div>
-        @else
-            <div class="flex flex-col justify-center mx-10">
-                <div class="flex gap-2">
-                    <h1>Subscription</h1>
-                </div>
-                <div>You are not an admin or have been removed from this team. If this does not make sense, please <span
-                        class="underline cursor-pointer dark:text-white" wire:click="help">contact
-                        us</span>.</div>
-            </div>
-        @endif
     @else
-        <div class="px-10">Resale license is not active. Please contact your instance admin.</div>
+        <div class="flex flex-col justify-center mx-10">
+            <div class="flex gap-2">
+                <h1>Subscription</h1>
+            </div>
+            <div>You are not an admin or have been removed from this team. If this does not make sense, please <span
+                    class="underline cursor-pointer dark:text-white" wire:click="help">contact
+                    us</span>.</div>
+        </div>
     @endif
 </div>