Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2024-11-13 22:15:13 +07:00
58 changed files with 3348 additions and 738 deletions

View File

@@ -18,23 +18,30 @@ return new class extends Migration
$table->string('jenis_kantor');
$table->string('nomor_ijin_usaha');
$table->string('province_code');
$table->string('city_code');
$table->string('district_code');
$table->string('village_code');
$table->string('city_code')->nullable();
$table->string('district_code')->nullable();
$table->string('village_code')->nullable();
$table->string('address');
$table->string('postal_code');
$table->string('nomor_telepon_kantor');
$table->string('postal_code')->nullable();
$table->string('nomor_telepon_kantor')->nullable();
$table->string('email_kantor');
$table->string('detail_email_kantor')->nullable();
$table->string('nama_pimpinan');
$table->string('nomor_hp_pimpinan');
$table->string('nama_pic_reviewer');
$table->string('nomor_hp_pic_reviewer');
$table->string('nama_pic_admin');
$table->string('nomor_hp_pic_admin');
$table->string('nama_pic_marketing');
$table->string('nomor_hp_pic_marketing');
$table->string('ijin_usaha_id')->nullable();
$table->string('jenis_aset_id')->nullable();
$table->string('nama_pic_reviewer')->nullable();
$table->string('detail_nama_pic_reviewer')->nullable();
$table->string('nomor_hp_pic_reviewer')->nullable();
$table->string('detail_nomor_hp_pic_reviewer')->nullable();
$table->string('nama_pic_admin')->nullable();
$table->string('detail_nama_pic_admin')->nullable();
$table->string('nomor_hp_pic_admin')->nullable();
$table->string('detail_nomor_hp_pic_admin')->nullable();
$table->string('nama_pic_marketing')->nullable();
$table->string('detail_nama_pic_marketing')->nullable();
$table->string('nomor_hp_pic_marketing')->nullable();
$table->string('detail_nomor_hp_pic_marketing')->nullable();
$table->string('ijin_usaha_id');
$table->string('jenis_aset_id');
$table->string('attachment')->nullable();
$table->boolean('status')->default(true)->nullable();
$table->char('authorized_status', 1)->nullable();

View File

@@ -15,6 +15,7 @@ return new class extends Migration
$table->id();
$table->string('name');
$table->string('code');
$table->unsignedBigInteger('kategori_jenis_aset_id'); // Add this line
$table->foreign('kategori_jenis_aset_id')->references('id')->on('kategori_jenis_aset');
$table->boolean('status')->default(true);
$table->char('authorized_status', 1)->nullable();

View File

@@ -0,0 +1,28 @@
<?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('detail_dokumen_jaminan', function (Blueprint $table) {
$table->string('dokumen_nomor')->nullable()->after('dokumen_jaminan');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('detail_dokumen_jaminan', function (Blueprint $table) {
$table->dropColumn('dokumen_nomor');
});
}
};

View File

@@ -4,20 +4,22 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('penilaian_team', function (Blueprint $table) {
Schema::create('permohonan_histories', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('penilaian_id');
$table->unsignedBigInteger('team_id');
$table->unsignedBigInteger('permohonan_id');
$table->string('status');
$table->text('keterangan')->nullable();
$table->json('before_request')->nullable();
$table->json('after_request')->nullable();
$table->string('file_path')->nullable();
$table->unsignedBigInteger('user_id')->nullable();
$table->string('role');
$table->boolean('status')->default(true);
$table->char('authorized_status', 1)->nullable();
$table->timestamps();
$table->timestamp('authorized_at')->nullable();
$table->unsignedBigInteger('authorized_by')->nullable();
@@ -25,6 +27,9 @@ return new class () extends Migration {
$table->unsignedBigInteger('created_by')->nullable();
$table->unsignedBigInteger('updated_by')->nullable();
$table->unsignedBigInteger('deleted_by')->nullable();
$table->foreign('permohonan_id')->references('id')->on('permohonan')->onDelete('cascade');
$table->foreign('user_id')->references('id')->on('users')->onDelete('set null');
});
}
@@ -33,6 +38,6 @@ return new class () extends Migration {
*/
public function down(): void
{
Schema::dropIfExists('penilai_team');
Schema::dropIfExists('permohonan_histories');
}
};

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('detail_penawaran', function (Blueprint $table) {
$table->string('no_proposal')->nullable()->after('penawaran_id');
$table->date('tgl_proposal')->nullable()->after('no_proposal');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('detail_penawaran', function (Blueprint $table) {
$table->dropColumn('no_proposal');
$table->dropColumn('tgl_proposal');
});
}
};

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('kjpp', function (Blueprint $table) {
$table->string('detail_nama_pimpinan')->nullable()->after('nama_pimpinan');
$table->string('detail_nomor_hp_pimpinan')->nullable()->after('nomor_hp_pimpinan');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('kjpp', function (Blueprint $table) {
$table->dropColumn('detail_nama_pimpinan');
$table->dropColumn('detail_nomor_hp_pimpinan');
});
}
};

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('detail_penawaran_logs', function (Blueprint $table) {
$table->string('no_proposal')->nullable()->after('penawaran_id');
$table->date('tgl_proposal')->nullable()->after('no_proposal');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('detail_penawaran_logs', function (Blueprint $table) {
$table->dropColumn('no_proposal');
$table->dropColumn('tgl_proposal');
});
}
};

View File

@@ -0,0 +1,38 @@
<?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::create('penilaian_team', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('penilaian_id');
$table->unsignedBigInteger('team_id');
$table->unsignedBigInteger('user_id')->nullable();
$table->string('role');
$table->boolean('status')->default(true);
$table->char('authorized_status', 1)->nullable();
$table->timestamps();
$table->timestamp('authorized_at')->nullable();
$table->unsignedBigInteger('authorized_by')->nullable();
$table->softDeletes();
$table->unsignedBigInteger('created_by')->nullable();
$table->unsignedBigInteger('updated_by')->nullable();
$table->unsignedBigInteger('deleted_by')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('penilaian_team');
}
};