dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: remove resale_license from db as well

Browse Source
This commit is contained in:
Andras Bacsai
2024-12-11 12:04:58 +01:00
parent b442965976
commit 9ffae89a71
4 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Livewire/Settings/Index.php
View File

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

30
database/migrations/2024_12_10_122143_drop_resale_license.php Normal file
View File

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

1
database/seeders/InstanceSettingsSeeder.php
View File

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

4
resources/views/livewire/subscription/index.blade.php
View File

@@ -2,7 +2,6 @@
<x-slot:title> <x-slot:title>
Subscribe | Coolify Subscribe | Coolify
</x-slot> </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">
@@ -37,7 +36,4 @@
us</span>.</div> us</span>.</div>
</div> </div>
@endif @endif
@else
<div class="px-10">Resale license is not active. Please contact your instance admin.</div>
@endif
</div> </div>