KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitlab.com/online-sistem1/lelong into main

Browse Source
This commit is contained in:
root
2022-08-16 16:05:31 +08:00
parent 7882c3897e 86c502a4f2
commit d5f2c55020
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PembidaController.php
+4 -4
View File
@@ -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();
database/migrations/2021_12_14_041557_create_lelongs_table.php
+19
View File
@@ -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) {