diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 59142949..967a5cb1 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -72,8 +72,8 @@ class AccountController extends Controller return view('account.listbayaranonline',compact('listwinner','lelong_id')); } - public function sahsagonline($lelong_id, $user_id){ - + public function sahsagonline($lelong_id, $user_id) + { $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') ->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id') ->where('lelongbid.lelong_id', $lelong_id) @@ -82,8 +82,6 @@ class AccountController extends Controller ->where('payment.status_payment_opt', 2) ->get()->toArray(); - // dd($senaraisag); - $total_payment = 0; foreach($senaraisag as $index1=>$sagbid){ @@ -97,7 +95,8 @@ class AccountController extends Controller return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id','total_payment')); } - public function sahbayaronline($lelong_id, $user_id){ + public function sahbayaronline($lelong_id, $user_id) + { $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 28290951..80877b9e 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -568,6 +568,7 @@ class LelongController extends Controller $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong.sts_lelong', 3) ->get(); return view('lelong.senarailelongtaklaku',compact('senarai')); diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index c8f5f298..dda6fa7f 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -46,8 +46,6 @@ class MarhunController extends Controller $lelongid = LelongBid::select('lelong_id')->where('caw_id','=',$caw->id)->groupBy('lelong_id')->get(); $lelong = Lelong::whereIn('id', $lelongid)->get(); - - return view('marhun.senaraimarhun',compact('lelongbid','lelong')); } @@ -130,6 +128,7 @@ class MarhunController extends Controller $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong.sts_lelong', 0) ->get(); return view('marhun.senarailelongmarhun',compact('senarai')); 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 7dadcf22..b1594c0e 100644 --- a/database/migrations/2021_12_13_053311_create_cawangans_table.php +++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php @@ -91,18 +91,18 @@ class CreateCawangansTable extends Migration $table->string('nokp')->nullable(); $table->date('t_gadai'); $table->time('masa')->nullable(); - $table->integer('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->integer('sirig')->nullable()->default(0); + $table->decimal('nilaimarhun', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('n_marhuns', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('berat', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('pinjaman', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('telahbayar', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('upahtelahbyr', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('cajtelahbyr', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('ansuran', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('ansupah', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable()->default(0.00); + $table->decimal('tempoh', $precision = 10, $scale = 2)->nullable()->default(0.00); $table->date('t_lanjut1')->nullable(); $table->date('t_lanjut2')->nullable(); $table->date('t_matang')->nullable(); @@ -115,7 +115,7 @@ class CreateCawangansTable extends Migration $table->date('t_hapus')->nullable(); $table->string('sttebus'); $table->string('terima')->nullable(); - $table->integer('cetak')->nullable(); + $table->integer('cetak')->nullable()->default(0);; $table->string('tncek')->nullable(); $table->string('nocek')->nullable(); $table->string('bkcode')->nullable(); @@ -129,89 +129,89 @@ class CreateCawangansTable extends Migration $table->time('canceltime')->nullable(); $table->string('f_lulus')->nullable(); $table->string('tag')->nullable(); - $table->decimal('jbg', $precision = 9, $scale = 2); - $table->decimal('bakipjm', $precision = 7, $scale = 2); - $table->decimal('bakiupah', $precision = 7, $scale = 2)->nullable(); - $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable(); + $table->decimal('jbg', $precision = 9, $scale = 2)->nullable()->default(0.00);; + $table->decimal('bakipjm', $precision = 7, $scale = 2)->nullable()->default(0.00);; + $table->decimal('bakiupah', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable()->default(0.00); $table->string('marhun')->nullable(); $table->string('jenisupah')->nullable(); - $table->decimal('cajkhidmat', $precision = 7, $scale = 2)->nullable(); - $table->integer('stcajkhidmat')->nullable(); + $table->decimal('cajkhidmat', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->integer('stcajkhidmat')->nullable()->default(0); $table->string('kodgl')->nullable(); - $table->integer('taglel')->nullable(); - $table->integer('instno')->nullable(); - $table->integer('currInstno')->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->integer('taglel')->nullable()->default(0); + $table->integer('instno')->nullable()->default(0); + $table->integer('currInstno')->nullable()->default(0); + $table->decimal('ansakhir', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('ansupahakhir', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('jumupahaz', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('tunggakan', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->date('t_update')->nullable();; $table->string('jantina')->nullable(); $table->string('bangsa')->nullable(); - $table->integer('sirit')->nullable(); - $table->integer('jenisansur')->nullable(); + $table->integer('sirit')->nullable()->default(0); + $table->integer('jenisansur')->nullable()->default(0); $table->string('nokotak')->nullable(); - $table->integer('tiada')->nullable(); - $table->integer('tagtbaki')->nullable(); + $table->integer('tiada')->nullable()->default(0); + $table->integer('tagtbaki')->nullable()->default(0); $table->string('penilai')->nullable(); $table->string('namapenilai')->nullable(); - $table->integer('tagserah')->nullable(); + $table->integer('tagserah')->nullable()->default(0); $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->decimal('percentpinj', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->integer('kuantiti')->nullable()->default(0); $table->string('namateller')->nullable(); - $table->decimal('jumtebus', $precision = 11, $scale = 2)->nullable(); - $table->decimal('upahnotis', $precision = 9, $scale = 2)->nullable(); + $table->decimal('jumtebus', $precision = 11, $scale = 2)->nullable()->default(0.00); + $table->decimal('upahnotis', $precision = 9, $scale = 2)->nullable()->default(0.00); $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->integer('tagpalsu')->nullable()->default(0); + $table->decimal('upahdibayar', $precision = 10, $scale = 2)->nullable()->default(0.00); + $table->string('tagcetak'); + $table->integer('tag_sms')->nullable()->default(0); + $table->string('semakbarcode')->nullable()->default('Tidak Lulus'); + $table->integer('wangkeluarteller')->nullable()->default(0); + $table->integer('semakpetibesi')->nullable()->default(0); + $table->integer('semakaudit')->nullable()->default(0); + $table->string('historygadaian')->nullable()->default(0); + $table->integer('tagkiratebus')->nullable()->default(0); + $table->integer('checkbp')->nullable()->default(0); + $table->decimal('pampasan', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->integer('lel1stop')->nullable()->default(0); $table->string('tellernew')->nullable(); - $table->string('idjompay')->nullable(); - $table->integer('tangguh')->nullable(); + $table->string('idjompay')->nullable()->default(0); + $table->integer('tangguh')->nullable()->default(0); $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->decimal('upahSim', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->decimal('jbgakru', $precision = 5, $scale = 2)->nullable()->default(0.00); + $table->decimal('upahakru', $precision = 7, $scale = 2)->nullable()->default(0.00); + $table->integer('tagpalsu2')->nullable()->default(0); + $table->integer('tagcall')->nullable()->default(0); + $table->decimal('upah_semasa', $precision = 11, $scale = 2)->nullable()->default(0.00); + $table->decimal('simulasi_hargaasas', $precision = 11, $scale = 2)->nullable()->default(0.00); + $table->decimal('simulasi_cajlelong', $precision = 11, $scale = 2)->nullable()->default(0.00); + $table->decimal('simulasi_bakilelong', $precision = 11, $scale = 2)->nullable()->default(0.00); + $table->decimal('sim_hargaasas', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('sim_cajlelong', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('sim_upahlelong', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('sim_bakilelong', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('percentrebet', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('rebet', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->decimal('upahlpsrebet', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->integer('taguploadslip')->nullable()->default(0); + $table->integer('tagsahupahonline')->nullable()->default(0); + $table->decimal('bayarupahonline', $precision = 9, $scale = 2)->nullable()->default(0.00); $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->decimal('upahsebenar', $precision = 9, $scale = 2)->nullable()->default(0.00); + $table->integer('tagupdatedbonline')->nullable()->default(0); + $table->decimal('bayarpinjamanonline', $precision = 9, $scale = 2)->nullable()->default(0.00); $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->integer('lelong_tawarruq')->nullable()->default(1); + $table->float('tempohbayar', $precision = 10, $scale = 2)->nullable()->default(0.00); $table->timestamps(); }); diff --git a/resources/views/jananotis/notislelong.blade.php b/resources/views/jananotis/notislelong.blade.php index 192be8f6..8330441c 100644 --- a/resources/views/jananotis/notislelong.blade.php +++ b/resources/views/jananotis/notislelong.blade.php @@ -12,7 +12,7 @@ @endif