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

Merge branch 'atie' into 'main'

Browse Source 
update kodcaw dlam lelong tebus

See merge request online-sistem1/lelong!101
This commit is contained in:
Nur Izzati Zulkifli
2022-06-30 07:45:15 +00:00
parent 268c14ed14 3daa0446c2
commit e5f16081d7
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+4 -3
View File
@@ -65,7 +65,7 @@ class LelongController extends Controller
$lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->select('lelong_id','tarikh_lelong','fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
// ->where('lelong.sts_lelong', 3)
->get()->toArray();
@@ -1014,7 +1014,7 @@ class LelongController extends Controller
$lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->where('cawangan_lelong.lelong_id','=',$lelongid)
->select('lelong_id','tarikh_lelong','fasa')
->select('lelong_id','tarikh_lelong','lelong.fasa')
->groupBy('lelong_id')
->get()->toArray();
@@ -1810,10 +1810,11 @@ class LelongController extends Controller
//insert lelong_tebus
$lelongtebus = new LelongTebus;
$lelongtebus->tarikh = $currentdate;
$lelongtebus->kodcaw = $data['kodcaw'];
$lelongtebus->teller = $user->name;
$lelongtebus->norujukan = $data['norujukan'];
$lelongtebus->batch_no = $lelong_id;
$lelongtebus->nilai_marhun = $data['nilaimarhun'];
$lelongtebus->nilaimarhun = $data['nilaimarhun'];
$lelongtebus->pinjaman = $data['pinjaman'];
$lelongtebus->upah = $data['bakiupah'];
$lelongtebus->jbg = $data['jbg'];
app/Http/Controllers/SimulasiController.php
+1
View File
@@ -1121,6 +1121,7 @@ class SimulasiController extends Controller
//insert lelong_tebus
$lelongtebus = new LelongTebus;
$lelongtebus->tarikh = $currentdate;
$lelongtebus->kodcaw = $data['kodcaw'];
$lelongtebus->teller = $user->name;
$lelongtebus->norujukan = $data['norujukan'];
$lelongtebus->batch_no = $simulasi_id;
app/Models/LelongTebus.php
+1
View File
@@ -14,6 +14,7 @@ class LelongTebus extends Model
protected $fillable = [
'recno',
'tarikh',
'kodcaw',
'teller',
'norujukan',
'batch_no',
database/migrations/2021_12_14_041557_create_lelongs_table.php
+3 -1
View File
@@ -150,12 +150,14 @@ class CreateLelongsTable extends Migration
Schema::create('lelong_tebus', function (Blueprint $table) {
$table->bigIncrements('recno');
$table->datetime('tarikh')->nullable();
$table->datetime('tarikh')->nullable();
$table->string('kodcaw')->nullable();
$table->string('teller')->nullable();
$table->string('norujukan')->nullable();
$table->string('batch_no')->nullable();
$table->decimal('nilaimarhun', $precision = 5, $scale = 2);
$table->decimal('pinjaman', $precision = 5, $scale = 2);
$table->decimal('upah', $precision = 5, $scale = 2);
$table->decimal('jbg', $precision = 5, $scale = 2);
$table->string('jenis_tebus')->nullable();
$table->timestamps();