diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php
index f369b89b..8df5c559 100644
--- a/database/migrations/2021_12_13_053311_create_cawangans_table.php
+++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php
@@ -84,37 +84,142 @@ class CreateCawangansTable extends Migration
 
         Schema::create('gadai', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->string('kodcaw'); 
+            $table->string('kodcaw')->nullable(); 
             $table->string('norujukan'); 
-            $table->string('nokp'); 
-            $table->decimal('jbg', $precision = 7, $scale = 2);
-            $table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable();
-            $table->decimal('upahsimpan', $precision = 11, $scale = 2)->nullable();
-            $table->decimal('ansuran', $precision = 11, $scale = 2)->nullable(); 
+            $table->string('prkod')->nullable();
+            $table->string('nopelanggan'); 
+            $table->string('nokp')->nullable(); 
+            $table->date('t_gadai'); 
+            $table->time('masa')->nullable(); 
+            $table->int('sirig')->nullable(); 
             $table->decimal('nilaimarhun', $precision = 9, $scale = 2)->nullable(); 
+            $table->decimal('n_marhuns', $precision = 9, $scale = 2)->nullable(); 
+            $table->decimal('berat', $precision = 7, $scale = 2)->nullable();
             $table->decimal('pinjaman', $precision = 9, $scale = 2)->nullable();  
+            $table->decimal('telahbayar', $precision = 7, $scale = 2)->nullable();
+            $table->decimal('upahtelahbyr', $precision = 7, $scale = 2)->nullable();
+            $table->decimal('cajtelahbyr', $precision = 7, $scale = 2)->nullable();
+            $table->decimal('ansuran', $precision = 9, $scale = 2)->nullable(); 
+            $table->decimal('ansupah', $precision = 7, $scale = 2)->nullable(); 
+            $table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable();
+            $table->decimal('tempoh', $precision = 10, $scale = 2)->nullable();
+            $table->date('t_lanjut1')->nullable();
+            $table->date('t_lanjut2')->nullable();
+            $table->date('t_matang')->nullable();
+            $table->date('t_matang1')->nullable();
+            $table->date('t_matang2')->nullable();
+            $table->date('t_notis1')->nullable();
+            $table->date('t_notis2')->nullable();
+            $table->date('t_notis3')->nullable();
+            $table->date('t_lelong')->nullable();
+            $table->date('t_hapus')->nullable();
+            $table->string('sttebus');
+            $table->string('terima')->nullable();
+            $table->integer('cetak')->nullable();
+            $table->string('tncek')->nullable();
+            $table->string('nocek')->nullable();
+            $table->string('bkcode')->nullable();
+            $table->string('glcode')->nullable();
+            $table->string('teller')->nullable();
+            $table->string('pelulus')->nullable();
+            $table->string('pelulust')->nullable();
+            $table->string('disburseid')->nullable();
+            $table->time('disbursetime')->nullable();
+            $table->string('cancelid')->nullable();
+            $table->time('canceltime')->nullable();
+            $table->string('f_lulus')->nullable();
+            $table->string('tag')->nullable();
+            $table->decimal('jbg', $precision = 9, $scale = 2);
+            $table->decimal('bakijpm', $precision = 7, $scale = 2);
             $table->decimal('bakiupah', $precision = 7, $scale = 2)->nullable();
             $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable();
-            $table->decimal('baki', $precision = 9, $scale = 2)->nullable();
-            $table->decimal('berat', $precision = 7, $scale = 2)->nullable();
             $table->string('marhun')->nullable();
-            $table->decimal('gst_hj', $precision = 7, $scale = 2)->default(0.00);
-            $table->decimal('gst_cl', $precision = 7, $scale = 2)->default(0.00);
-            $table->decimal('percent', $precision = 7, $scale = 2)->nullable();
-            $table->integer('mora_upah')->default(0);
-            $table->date('t_gadai')->nullable(); 
-            $table->date('t_matang')->nullable();
-            $table->integer('sttebus')->nullable();
-            $table->integer('tagpalsu')->nullable();
-            $table->integer('tagpalsu2')->nullable();
+            $table->string('jenisupah')->nullable();
+            $table->decimal('cajkhidmat', $precision = 7, $scale = 2)->nullable();
+            $table->integer('stcajkhidmat')->nullable();
+            $table->string('kodgl')->nullable();
             $table->integer('taglel')->nullable();
+            $table->integer('instno')->nullable();
+            $table->integer('currlnstno')->nullable();
+            $table->decimal('ansakhir', $precision = 7, $scale = 2)->nullable();
+            $table->decimal('ansupahakhir', $precision = 7, $scale = 2)->nullable();
+            $table->decimal('jumupahaz', $precision = 7, $scale = 2)->nullable();
+            $table->decimal('tunggakan', $precision = 7, $scale = 2)->nullable();
+            $table->date('t_update');
+            $table->string('jantina')->nullable();
+            $table->string('bangsa')->nullable();
+            $table->integer('sirit')->nullable();
+            $table->integer('jenisansur')->nullable();
+            $table->string('nokotak')->nullable();
+            $table->integer('tiada')->nullable();
+            $table->integer('tiada')->nullable();
+            $table->integer('tagtbaki')->nullable();
+            $table->string('penilai')->nullable();
+            $table->string('namapenilai')->nullable();
+            $table->integer('tagserah')->nullable();
+            $table->date('tempTarikhAging')->nullable();
+            $table->string('jenistebus')->nullable();
+            $table->string('namapelulus')->nullable();
+            $table->decimal('percentpinj', $precision = 9, $scale = 2)->nullable();
+            $table->integer('kuantiti')->nullable();
+            $table->string('namateller')->nullable();
+            $table->decimal('jumtebus', $precision = 11, $scale = 2)->nullable();
+            $table->decimal('upahnotis', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('upahpercuma', $precision = 11, $scale = 2)->nullable();
+            $table->integer('tagpalsu')->nullable();
+            $table->decimal('upahdibayar', $precision = 10, $scale = 2)->nullable();
+            $table->integer('tagcetak')->nullable();
+            $table->integer('tag_sms')->nullable();
+            $table->string('semakbarcode')->nullable();
+            $table->integer('wangkeluarteller')->nullable();
+            $table->integer('semakpetibesi')->nullable();
+            $table->integer('semakaudit')->nullable();
+            $table->string('historygadaian')->nullable();
+            $table->integer('tagkiratebus')->nullable();
+            $table->integer('checkbp')->nullable();
+            $table->decimal('pampasan', $precision = 9, $scale = 2)->nullable();
+            $table->integer('lel1stop')->nullable();
+            $table->string('tellernew')->nullable();
+            $table->string('idjompay')->nullable();
+            $table->integer('tangguh')->nullable();
+            $table->integer('tangguh')->nullable();
+            $table->date('tebus')->nullable();
+            $table->decimal('upahSim', $precision = 7, $scale = 2)->nullable();
+            $table->decimal('jbgakru', $precision = 5, $scale = 2)->nullable();
+            $table->decimal('upahakru', $precision = 7, $scale = 2)->nullable();
+            $table->integer('tagpalsu2')->nullable();
+            $table->integer('tagcall')->nullable();
+            $table->decimal('upah_semasa', $precision = 11, $scale = 2)->nullable();
+            $table->decimal('simulasi_hargaasas', $precision = 11, $scale = 2)->nullable();
+            $table->decimal('simulasi_cajlelong', $precision = 11, $scale = 2)->nullable();
+            $table->decimal('simulasi_bakilelong', $precision = 11, $scale = 2)->nullable();
+            $table->decimal('sim_hargaasas', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('sim_cajlelong', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('sim_upahlelong', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('sim_bakilelong', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('percentrebet', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('rebet', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('upahlpsrebet', $precision = 9, $scale = 2)->nullable();
+            $table->integer('taguploadslip')->nullable();
+            $table->integer('tagsahupahonline')->nullable();
+            $table->decimal('bayarupahonline', $precision = 9, $scale = 2)->nullable();
+            $table->date('tbayaronline')->nullable();
+            $table->decimal('upahsebenar', $precision = 9, $scale = 2)->nullable();
+            $table->integer('tagupdatedbonline')->nullable();
+            $table->decimal('bayarpinjamanonline', $precision = 9, $scale = 2)->nullable();
+            $table->string('jenis_bayaran')->nullable();
+            $table->decimal('upah12', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('hargajualan', $precision = 9, $scale = 2)->nullable();
+            $table->decimal('bakihargajualan', $precision = 9, $scale = 2)->nullable();
+            $table->integer('tagkomuditi')->nullable();
             $table->integer('lelong_tawarruq')->nullable();
+            $table->float('tempohbayar', $precision = 10, $scale = 2)->nullable();
             $table->timestamps();
         });
 
         Schema::create('gadaimarhun', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->unsignedBigInteger('gadai_id')->unsigned();
+            $table->string('norujukan')->unsigned();
             $table->decimal('bil', $precision = 3, $scale = 0);
             $table->string('marhun');
             $table->string('nota');
@@ -122,8 +227,8 @@ class CreateCawangansTable extends Migration
             $table->decimal('berat', $precision = 7, $scale = 2);
             $table->timestamps();
 
-            $table->foreign('gadai_id')
-                ->references('id')->on('gadai')
+            $table->foreign('norujukan')
+                ->references('norujukan')->on('gadai')
                 ->onDelete('cascade');
         });
     }