diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 666e265a..b5367411 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -227,7 +227,7 @@ class PembidaController extends Controller ->distinct() ->orderBy('lelongbid.lelong_id') ->where('lelongbid.status_jual', 1) - ->whereIn('lelongbidder.status_payment', [NULL, 2]) + ->whereIn('lelongbidder.status_payment', [null, 2]) ->where('lelongbidder.status_bidder', 1) ->where('lelong.sts_lelong', 3) @@ -394,12 +394,12 @@ class PembidaController extends Controller //$userdetail = User::where('id', $user_id)->first(); $infos = LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') - ->where('lelongbidder.status_payment', NULL, 2) + ->whereIn('lelongbidder.status_payment', [null,2]) ->where('lelongbid.lelong_id', $lelong_id) - ->where('lelongbidder.kodcaw', $kodcaw) + ->where('lelongbid.kodcaw', $kodcaw) ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.status_jual', 1) - ->select ('lelongbidder.kodcaw','lelongbid.caw_id','lelongbidder.user_id','lelongbidder.nama_bidder','lelongbidder.hargabida','lelongbid.norujukan','lelongbid.hargaasas','lelongbidder.masa_bidaan','lelongbid.t_lelong','lelongbid.id','lelongbid.fasa','lelongbid.lelong_id') + ->select ('lelongbid.kodcaw','lelongbid.caw_id','lelongbidder.user_id','lelongbidder.nama_bidder','lelongbidder.hargabida','lelongbid.norujukan','lelongbid.hargaasas','lelongbidder.masa_bidaan','lelongbid.t_lelong','lelongbid.id','lelongbid.fasa','lelongbid.lelong_id') ->get(); diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index f40037b6..d7125b7b 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -13,6 +13,24 @@ class CreateLelongsTable extends Migration */ public function up() { + Schema::create('taklaku', function (Blueprint $table) { + $table->bigIncrements('id'); + $table->unsignedBigInteger('lelong_id')->unsigned(); + $table->string('kodcaw'); + $table->string('norujukan'); + $table->date('t_lelong'); + $table->intger('status'); + $table->integer('fasa')->default(0); + $table->timestamps(); + + $table->foreign('caw_id') + ->references('id')->on('cawangan') + ->onDelete('cascade'); + + $table->foreign('lelong_id') + ->references('id')->on('lelong') + ->onDelete('cascade'); + Schema::create('lelong', function (Blueprint $table) { $table->bigIncrements('id'); $table->date('tarikh_lelong'); @@ -26,6 +44,7 @@ class CreateLelongsTable extends Migration $table->integer('sts_lelong')->default(0); //1= start, 2 = jana pemenang, 3 = senarai pemenang $table->integer('fasa')->default(0); $table->timestamps(); + }); Schema::create('cawangan_lelong', function (Blueprint $table) {