Merge branch 'main' into faiqahzaman

database/migrations/2021_12_13_053311_create_cawangans_table.php

@@ -218,7 +218,9 @@ class CreateCawangansTable extends Migration
 
         Schema::create('gadaimarhun', function (Blueprint $table) {
             $table->bigIncrements('id');
+            $table->string('kodcaw')->nullable(); 
             $table->string('norujukan');
+            $table->date('t_gadai')->nullable();;
             $table->decimal('bil', $precision = 3, $scale = 2);
             $table->string('marhun');
             $table->string('nota');

database/migrations/2021_12_14_041545_create_simulasis_table.php

@@ -15,13 +15,13 @@ class CreateSimulasisTable extends Migration
     {
         Schema::create('simulasi', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->string('tarikh_lelong');
+            $table->string('tarikh_lelong')->nullable();
             $table->time('masatamat_lelong')->nullable();
             $table->dateTime('masakemaskini_data')->nullable();
             $table->string('kali')->nullable();
-            $table->string('harga_emas_asas');
-            $table->string('jbg');
-            $table->integer('cajlelong');
+            $table->string('harga_emas_asas')->nullable();
+            $table->string('jbg')->nullable();
+            $table->integer('cajlelong')->nullable();
             $table->timestamps();
         });
 
@@ -34,7 +34,7 @@ class CreateSimulasisTable extends Migration
             $table->string('import_data_sts')->nullable();
             $table->date('export_data_stsdate')->nullable();
             $table->date('import_data_sts_date')->nullable();
-            $table->string('lokasi');
+            $table->string('lokasi')->nullable();
             $table->timestamps();
 
             $table->foreign('caw_id')

database/migrations/2021_12_14_041557_create_lelongs_table.php

@@ -37,7 +37,7 @@ class CreateLelongsTable extends Migration
             $table->string('import_data_sts')->nullable();
             $table->date('export_data_stsdate')->nullable();
             $table->date('import_data_sts_date')->nullable();
-            $table->string('lokasi');
+            $table->string('lokasi')->nullable();
             $table->timestamps();
 
             $table->foreign('caw_id')

database/seeders/RolesSeeder.php

@@ -119,6 +119,10 @@ class RolesSeeder extends Seeder
             'name' => 'notistamatkontrak',
             'description' => 'Notis 30 Hari Sebelum Tamat Kontrak'
         ]);
+        Permission::create([
+            'name' => 'importdata',
+            'description' => 'Import Data Cawangan Dari LIVE to Master'
+        ]);
         
 
         //account
@@ -174,6 +178,7 @@ class RolesSeeder extends Seeder
         $role6->givePermissionTo('pengesahan');
         $role6->givePermissionTo('notistamatkontrak');
         $role6->givePermissionTo('kemaskinihargaasas');
+        $role6->givePermissionTo('importdata');
 
         $role7 = Role::create(['name' => 'account']);
         $role7->givePermissionTo('pengesahanbayaran');