diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index ac0bf4d3..6c02b8db 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -302,6 +302,8 @@ class SerahanController extends Controller $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('lelongbidmarhun','lelongbid.id','=','lelongbidmarhun.lelongbid_id') + ->join('jenisemas','lelongbidmarhun.marhun','jenisemas.marhun') ->join('payment','lelongbid.norujukan','=','payment.norujukan') ->join('resit','payment.resit_id','=','resit.id') ->where('lelongbidder.user_id',$user_id) diff --git a/database/migrations/2022_03_07_061858_create_pengesahan_table.php b/database/migrations/2022_03_07_061858_create_pengesahan_table.php index 6cb2646b..815341a7 100644 --- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php +++ b/database/migrations/2022_03_07_061858_create_pengesahan_table.php @@ -40,6 +40,29 @@ class CreatePengesahanTable extends Migration // ->onDelete('cascade'); }); + + + Schema::create('scanmarhun', function (Blueprint $table) { + $table->id()->default(0); + $table->string('kodcaw')->nullable()->default(0); + $table->unsignedBigInteger('lelong_id')->unsigned()->default(0); + $table->integer('fasa')->default(0); + $table->string('norujukan')->nullable()->default(0); + $table->decimal('nilaimarhun', $precision = 9, $scale = 2)->default(0); + $table->string('drp','100')->nullable()->default(0); + $table->string('kpd','20')->nullable()->default(0); + $table->decimal('bulan', $precision = 3, $scale = 0)->default(0); + $table->decimal('tahun', $precision = 5, $scale = 0)->default(0); + $table->integer('tag')->default(0)->default(0); + $table->datetime('tarikh')->nullable()->default(0); + $table->time('masa')->nullable()->default(0); + $table->string('namateller','30')->nullable(); + + + $table->foreign('lelong_id') + ->references('id')->on('lelong') + ->onDelete('cascade'); + }); } /** diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 156cb0c6..9713f378 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -89,11 +89,11 @@ Jana Notis Lelong -
--}}