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

Bugfix/list clickup issue (#5)

Browse Source 
Reviewed-on: #5
Co-authored-by: ISMAIL MASSERAN <ismail@koppkb.com>
Co-committed-by: ISMAIL MASSERAN <ismail@koppkb.com>
This commit was merged in pull request #5.
This commit is contained in:
ISMAIL MASSERAN
2026-10-19 13:30:36 +08:00
committed by ismailmasseran
parent b1d393b1a1
commit e29a5891c8
196 changed files with 18243 additions and 19520 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Bulan.php
+1
View File
@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model;
class Bulan extends Model
{
use HasFactory;
protected $table = 'bulan';
protected $fillable = [
app/Models/Cart.php
+1 -2
View File
@@ -12,7 +12,6 @@ class Cart extends Model
protected $table = 'carts';
protected $fillable = [
'hargabida'
'hargabida',
];
}
app/Models/Cawangan.php
+5 -5
View File
@@ -29,15 +29,15 @@ class Cawangan extends Model
'pkb_jmc',
'para2',
'para3',
'tagujrah'
'tagujrah',
];
public function simulasi()
public function simulasi()
{
return $this->belongsToMany(Simulasi::class, 'cawangan_simulasi', 'caw_id', 'simulasi_id');
}
public function lelong()
public function lelong()
{
return $this->belongsToMany(Lelong::class, 'cawangan_lelong', 'caw_id', 'lelong_id');
}
@@ -56,7 +56,7 @@ class Cawangan extends Model
{
return $this->hasMany(SimulasiBid::class, 'caw_id', 'id');
}
public function lelongBid()
{
return $this->hasMany(LelongBid::class, 'caw_id', 'id');
@@ -82,7 +82,7 @@ class Cawangan extends Model
return $this->hasMany(CawanganKpi::class, 'caw_id', 'id');
}
public function datakpi()
public function datakpi()
{
return $this->belongsToMany(DataKpi::class, 'cawangan_kpi', 'caw_id', 'id');
}
app/Models/CawanganKpi.php
+3 -1
View File
@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model;
class CawanganKpi extends Model
{
use HasFactory;
protected $table = 'cawangan_kpi';
protected $fillable = [
@@ -20,6 +21,7 @@ class CawanganKpi extends Model
{
return $this->belongsTo(Cawangan::class, 'caw_id', 'id');
}
public function dataKpi()
{
return $this->hasMany(DataKpi::class, 'namastaff', 'namastaff');
@@ -33,5 +35,5 @@ class CawanganKpi extends Model
// public function notis()
// {
// return $this->belongsTo(Notis::class, 'notis_id', 'id');
//}
// }
}
app/Models/CawanganLelong.php
+1 -1
View File
@@ -21,7 +21,7 @@ class CawanganLelong extends Model
'import_data_sts',
'export_data_stsdate',
'import_data_stsdate',
'lokasi'
'lokasi',
];
public function lelongBid()
app/Models/CawanganNotis.php
+1 -3
View File
@@ -16,7 +16,7 @@ class CawanganNotis extends Model
'notis_id',
'caw_id',
'fasa',
'status'
'status',
];
// public function lelongBid()
@@ -34,5 +34,3 @@ class CawanganNotis extends Model
return $this->belongsTo(Notis::class, 'notis_id', 'id');
}
}
app/Models/CawanganSimulasi.php
+3 -4
View File
@@ -17,7 +17,7 @@ class CawanganSimulasi extends Model
'import_data_sts',
'export_data_stsdate',
'import_data_stsdate',
'lokasi'
'lokasi',
];
// function below to delete
@@ -31,9 +31,8 @@ class CawanganSimulasi extends Model
return $this->belongsTo(Cawangan::class, 'caw_id', 'id');
}
public function simulasiBid_id()
public function simulasiBid_id()
{
return SimulasiBid::where('simulasi_id',$this->simulasi_id)->where('caw_id',$this->caw_id)->get();
return SimulasiBid::where('simulasi_id', $this->simulasi_id)->where('caw_id', $this->caw_id)->get();
}
}
app/Models/Customer.php
+46 -44
View File
@@ -8,53 +8,55 @@ use Illuminate\Database\Eloquent\Model;
class Customer extends Model
{
use HasFactory;
protected $connection = 'main';
protected $table = 'customer';
protected $fillable = [
'ahli',
'kodcaw',
'nosiri',
'tarikhdaftar',
'nopelanggan',
'kplama',
'kpbaru',
'nama',
't_lahir',
'jantina',
'alamat1',
'alamat2',
'alamat3',
'alamat4',
'poskod',
'koddaerah',
'kodnegeri',
'telefon',
'jumpinjaman',
't_gadai',
'pinjamhari',
'bumiputra',
'warganegara',
'bangsa',
'kodkerja',
'kodugama',
'kodstatus',
'kodbank',
'noakaun',
'nota',
'teller',
'pelulus',
't_ubah',
'm_ubah',
'aktif',
'yuranahli',
'nopelangganlama',
'tujuangadai',
'kodkerjabaru',
'tagperingatan',
'namateller',
'kumpulan',
'telefon2',
'tagpelanggan'
'ahli',
'kodcaw',
'nosiri',
'tarikhdaftar',
'nopelanggan',
'kplama',
'kpbaru',
'nama',
't_lahir',
'jantina',
'alamat1',
'alamat2',
'alamat3',
'alamat4',
'poskod',
'koddaerah',
'kodnegeri',
'telefon',
'jumpinjaman',
't_gadai',
'pinjamhari',
'bumiputra',
'warganegara',
'bangsa',
'kodkerja',
'kodugama',
'kodstatus',
'kodbank',
'noakaun',
'nota',
'teller',
'pelulus',
't_ubah',
'm_ubah',
'aktif',
'yuranahli',
'nopelangganlama',
'tujuangadai',
'kodkerjabaru',
'tagperingatan',
'namateller',
'kumpulan',
'telefon2',
'tagpelanggan',
];
}
app/Models/DataKpi.php
+5 -3
View File
@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model;
class DataKpi extends Model
{
use HasFactory;
protected $table = 'datakpi';
protected $fillable = [
@@ -38,10 +39,11 @@ class DataKpi extends Model
public function cawangan()
{
return $this->belongsTo(Cawangan::class, 'caw_id','id');
return $this->belongsTo(Cawangan::class, 'caw_id', 'id');
}
public function cawanganKpi(){
return $this->hasOne(CawanganKpi::class, 'caw_id','caw_id');
public function cawanganKpi()
{
return $this->hasOne(CawanganKpi::class, 'caw_id', 'caw_id');
}
}
app/Models/File.php
+4 -4
View File
@@ -12,9 +12,9 @@ class File extends Model
protected $table = 'file';
protected $fillable = [
'file_type',
'filename',
'deleted_at',
'deleted_by'
'file_type',
'filename',
'deleted_at',
'deleted_by',
];
}
app/Models/FileMarhun.php
+5 -5
View File
@@ -12,10 +12,10 @@ class FileMarhun extends Model
protected $table = 'filemarhun';
protected $fillable = [
'lelongbid_id',
'lelongbidmarhun_id',
'photo_type', //1-overall_marhun, 2-each_marhun
'file_type',
'filename',
'lelongbid_id',
'lelongbidmarhun_id',
'photo_type', // 1-overall_marhun, 2-each_marhun
'file_type',
'filename',
];
}
app/Models/FileResit.php
+7 -7
View File
@@ -15,12 +15,12 @@ class FileResit extends Model
'user_id',
'lelong_id',
'payment_id',
'file_type',
'filename',
'deleted_at',
'deleted_by',
'original_file_type',
'original_size',
'compress_size'
'file_type',
'filename',
'deleted_at',
'deleted_by',
'original_file_type',
'original_size',
'compress_size',
];
}
app/Models/Gadai.php
+7 -6
View File
@@ -10,6 +10,7 @@ class Gadai extends Model
use HasFactory;
protected $connection = 'main';
protected $table = 'gadai';
protected $fillable = [
@@ -17,13 +18,13 @@ class Gadai extends Model
'norujukan',
'jbg',
'kadarupah',
'upahsimpan',
'ansuran',
'nilaimarhun',
'pinjaman',
'upahsimpan',
'ansuran',
'nilaimarhun',
'pinjaman',
'bakiupah',
'cajlain',
'baki',
'baki',
'berat',
'marhun',
'percent',
@@ -34,7 +35,7 @@ class Gadai extends Model
'tagpalsu',
'tagpalsu2',
'taglel',
'lelong_tawarruq'
'lelong_tawarruq',
];
public function gadaiMarhun()
app/Models/GadaiMarhun.php
+1 -1
View File
@@ -17,6 +17,6 @@ class GadaiMarhun extends Model
'marhun',
'nota',
'karat',
'berat'
'berat',
];
}
app/Models/GadaiTemp.php
+2 -3
View File
@@ -16,13 +16,12 @@ class GadaiTemp extends Model
'norujukan',
'tempoh',
'kadarupah',
'nilaimarhun',
'bakipjm',
'nilaimarhun',
'bakipjm',
'bakiupah',
'cajlain',
'berat',
'marhun',
'percentpinj',
];
}
app/Models/Invoice.php
+2 -2
View File
@@ -15,8 +15,8 @@ class Invoice extends Model
'invoice_no',
'total_invoice',
'invoice_type', // 1 = fee , 2 = bid
'status', //status => 1 = paid , 2 = pending
'status', // status => 1 = paid , 2 = pending
'opencash',
'paid_at'
'paid_at',
];
}
app/Models/JanaNotisExport.php
+42
View File
@@ -0,0 +1,42 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class JanaNotisExport extends Model
{
use HasFactory;
protected $table = 'jana_notis_exports';
protected $fillable = [
'user_id',
'lelong_id',
'kodcaw',
'fasa',
'status',
'file_path',
'file_name',
'error_message',
];
public const STATUS_PENDING = 'pending';
public const STATUS_PROCESSING = 'processing';
public const STATUS_COMPLETED = 'completed';
public const STATUS_FAILED = 'failed';
public function isReady()
{
return $this->status === self::STATUS_COMPLETED && ! empty($this->file_path);
}
public function isInProgress()
{
return in_array($this->status, [self::STATUS_PENDING, self::STATUS_PROCESSING], true);
}
}
app/Models/Jawatan.php
+2 -1
View File
@@ -8,11 +8,12 @@ use Illuminate\Database\Eloquent\Model;
class Jawatan extends Model
{
use HasFactory;
protected $table = 'jawatan';
protected $fillable = [
'id',
'idjawatan',
'namajawatan'
'namajawatan',
];
}
app/Models/LelKarat.php
+1 -1
View File
@@ -16,6 +16,6 @@ class LelKarat extends Model
'karat2',
'keterangan',
'harga',
'harga2'
'harga2',
];
}
app/Models/LelKarat_temp.php
-1
View File
@@ -20,5 +20,4 @@ class LelKarat_temp extends Model
'created_at',
'updated_at',
];
}
app/Models/Lelong.php
+10 -9
View File
@@ -19,7 +19,7 @@ class Lelong extends Model
'harga_emas_asas',
'jbg',
'cajlelong',
'sts_lelong'
'sts_lelong',
];
public function cawangan()
@@ -32,18 +32,18 @@ class Lelong extends Model
return $this->hasMany(CawanganLelong::class, 'lelong_id');
}
public function lelongBid()
{
public function lelongBid()
{
return $this->hasMany(LelongBid::class, 'lelong_id', 'id');
}
public function lelongBidJual()
{
public function lelongBidJual()
{
return $this->hasMany(LelongBid::class, 'lelong_id', 'id')->where('status_jual', 1);
}
public function lelongBidBelumSemak()
{
public function lelongBidBelumSemak()
{
return $this->hasMany(LelongBid::class, 'lelong_id', 'id')->where('status_semak', 0);
}
@@ -61,8 +61,9 @@ class Lelong extends Model
{
return $this->hasMany(Pengesahan::class, 'lelong_id', 'id')->whereNotNull('disahkan_oleh');
}
public function scanjual()
{
public function scanjual()
{
return $this->hasMany(ScanJual::class, 'lelong_id', 'id')->where('serahkpdpembida', 1);
}
}
app/Models/LelongBid.php
+9 -6
View File
@@ -40,20 +40,22 @@ class LelongBid extends Model
'fasa',
'tagujrah',
'ujrah',
'onepercent'
'onepercent',
];
public function cawangan()
{
return $this->belongsTo(Cawangan::class, 'caw_id','id');
return $this->belongsTo(Cawangan::class, 'caw_id', 'id');
}
public function lelongbidder() {
return $this->hasOne(LelongBidder::class,'lelongbid_id', 'id' );
public function lelongbidder()
{
return $this->hasOne(LelongBidder::class, 'lelongbid_id', 'id');
}
public function cawanganLelong(){
return $this->hasOne(CawanganLelong::class, 'caw_id','caw_id');
public function cawanganLelong()
{
return $this->hasOne(CawanganLelong::class, 'caw_id', 'caw_id');
}
public function fileMarhunMain()
@@ -100,6 +102,7 @@ class LelongBid extends Model
{
return $this->hasOne(LelongBidder::class, 'lelongbid_id', 'id')->where('status_bidder', 1);
}
public function scanjual()
{
return $this->belongsTo(ScanJual::class, 'id', 'lelongbid_id');
app/Models/LelongBidMarhun.php
+16 -15
View File
@@ -12,23 +12,24 @@ class LelongBidMarhun extends Model
protected $table = 'lelongbidmarhun';
protected $fillable = [
'lelongbid_id',
'bil',
'marhun',
'nota',
'old_karat',
'karat',
'old_berat',
'berat',
'old_harga',
'harga',
'old_nmarhun',
'n_marhun',
'old_hargaasas',
'hargaasas',
'lelongbid_id',
'bil',
'marhun',
'nota',
'old_karat',
'karat',
'old_berat',
'berat',
'old_harga',
'harga',
'old_nmarhun',
'n_marhun',
'old_hargaasas',
'hargaasas',
];
public function pengesahan() {
public function pengesahan()
{
return $this->hasOne(Pengesahan::class, 'lelongbidmarhun_id', 'id');
}
app/Models/LelongBidder.php
+6 -5
View File
@@ -21,11 +21,12 @@ class LelongBidder extends Model
'cajlelong',
'status_bidder',
'status_payment',
'masa_bidaan'
'masa_bidaan',
];
public function lelongbid() {
return $this->hasOne(LelongBid::class,'id', 'lelongbid_id');
public function lelongbid()
{
return $this->hasOne(LelongBid::class, 'id', 'lelongbid_id');
}
public function payment()
@@ -33,8 +34,8 @@ class LelongBidder extends Model
return $this->hasOne(Payment::class, 'lelongbid_id', 'lelongbid_id')->where('remark', '<>', '');
}
public function scanjual() {
public function scanjual()
{
return $this->hasOne(ScanJual::class, 'lelongbid_id', 'lelongbid_id');
}
}
app/Models/LelongBidderTemp.php
+6 -5
View File
@@ -21,11 +21,12 @@ class LelongBidderTemp extends Model
'cajlelong',
'status_bidder',
'status_payment',
'masa_bidaan'
'masa_bidaan',
];
public function lelongbid() {
return $this->hasOne(LelongBid::class,'id', 'lelongbid_id');
public function lelongbid()
{
return $this->hasOne(LelongBid::class, 'id', 'lelongbid_id');
}
public function payment()
@@ -33,8 +34,8 @@ class LelongBidderTemp extends Model
return $this->hasOne(Payment::class, 'lelongbid_id', 'lelongbid_id')->where('remark', '<>', '');
}
public function scanjual() {
public function scanjual()
{
return $this->hasOne(ScanJual::class, 'lelongbid_id', 'lelongbid_id');
}
}
app/Models/LelongBidxlaku.php
+5 -4
View File
@@ -37,20 +37,21 @@ class LelongBidxlaku extends Model
'status_jual',
'status_payment',
'mora_upah',
'fasa'
'fasa',
];
public function cawangan()
{
return $this->belongsTo(Cawangan::class, 'caw_id','id');
return $this->belongsTo(Cawangan::class, 'caw_id', 'id');
}
// public function lelongbidder() {
// return $this->hasOne(LelongBidder::class,'lelongbid_id', 'id' );
// }
public function cawanganLelong(){
return $this->hasOne(CawanganLelong::class, 'caw_id','caw_id');
public function cawanganLelong()
{
return $this->hasOne(CawanganLelong::class, 'caw_id', 'caw_id');
}
// public function fileMarhunMain()
app/Models/LelongCawangan.php
+87 -88
View File
@@ -10,97 +10,96 @@ class LelongCawangan extends Model
use HasFactory;
protected $connection = 'main';
protected $table = 'lelong';
protected $fillable = [
'batchno',
'sirilel',
'kodcaw',
'norujukan',
't_lelong',
'hargaasas',
'sandaran',
'hargajual',
'glcode',
't_jual',
'nopembeli',
'jbg',
'kadarupah',
'upahsimpan',
'ansuran',
'nilaimarhun',
'pinjaman',
'bakipjmas',
'bakipjm',
'bakiupahas',
'bakiupah',
'cajlainas',
'cajlain',
'cajlelongas',
'cajlelong',
'baki',
'terima',
'cetak',
'teller',
'pelulus',
'pelulust',
'f_lulus',
'type',
'prkod',
'tagsurat',
'trkhtuntut',
'tellertb',
'pelulustb',
'terimatb',
't_hapuskira',
'hapuskira',
'hkpjm',
'cancelid',
'canceltime',
'kodgl',
't_update',
'berat',
'marhun',
'recno',
'lebihkurang',
'nilaimarhuns',
'tagaid',
'gst_hj',
'gst_cl',
'hargajual_sim',
'cajlelong_sim',
'gst_hj_sim',
'gst_cl_sim',
'bakiupah_sim',
'hargaasas_sim',
'mutu_terendah',
'harga_baru',
'turun',
'percent',
'baki_sim',
'hargalama',
't_lelong_sim',
'tag_gst',
'makan_pinj',
'baki_upah6',
'baki6',
'rugi_asal',
'tagpelanggan',
'fasa',
'pmt',
'tagpmt',
'hargaasasasal',
'beratasal',
'loopsemak',
'lel1stop',
'jbg_lelong',
'berat_plastik',
'status_bida_online',
'nopelanggan',
'tag_tbaki',
'pel_tbaki',
'tagcall'
'sirilel',
'kodcaw',
'norujukan',
't_lelong',
'hargaasas',
'sandaran',
'hargajual',
'glcode',
't_jual',
'nopembeli',
'jbg',
'kadarupah',
'upahsimpan',
'ansuran',
'nilaimarhun',
'pinjaman',
'bakipjmas',
'bakipjm',
'bakiupahas',
'bakiupah',
'cajlainas',
'cajlain',
'cajlelongas',
'cajlelong',
'baki',
'terima',
'cetak',
'teller',
'pelulus',
'pelulust',
'f_lulus',
'type',
'prkod',
'tagsurat',
'trkhtuntut',
'tellertb',
'pelulustb',
'terimatb',
't_hapuskira',
'hapuskira',
'hkpjm',
'cancelid',
'canceltime',
'kodgl',
't_update',
'berat',
'marhun',
'recno',
'lebihkurang',
'nilaimarhuns',
'tagaid',
'gst_hj',
'gst_cl',
'hargajual_sim',
'cajlelong_sim',
'gst_hj_sim',
'gst_cl_sim',
'bakiupah_sim',
'hargaasas_sim',
'mutu_terendah',
'harga_baru',
'turun',
'percent',
'baki_sim',
'hargalama',
't_lelong_sim',
'tag_gst',
'makan_pinj',
'baki_upah6',
'baki6',
'rugi_asal',
'tagpelanggan',
'fasa',
'pmt',
'tagpmt',
'hargaasasasal',
'beratasal',
'loopsemak',
'lel1stop',
'jbg_lelong',
'berat_plastik',
'status_bida_online',
'nopelanggan',
'tag_tbaki',
'pel_tbaki',
'tagcall',
];
}
app/Models/LelongTebus.php
+1 -2
View File
@@ -22,7 +22,6 @@ class LelongTebus extends Model
'pinjaman',
'upah',
'jbg',
'jenis_tebus'
'jenis_tebus',
];
}
app/Models/LogUser.php
+1 -2
View File
@@ -18,7 +18,6 @@ class LogUser extends Model
'username',
'nama_user',
'norujukan',
'nota'
'nota',
];
}
app/Models/MarhunTemp.php
+2 -3
View File
@@ -15,10 +15,9 @@ class MarhunTemp extends Model
'norujukan',
'karat',
'berat',
'bil',
'marhun',
'bil',
'marhun',
'nota',
'n_marhun',
];
}
app/Models/Notis.php
+7 -7
View File
@@ -16,7 +16,7 @@ class Notis extends Model
'daritempoh',
'hinggatempoh',
'sts_notis',
'fasa'
'fasa',
];
public function cawangan()
@@ -29,18 +29,18 @@ class Notis extends Model
return $this->hasMany(CawanganNotis::class, 'notis_id');
}
public function notisBid()
{
public function notisBid()
{
return $this->hasMany(NotisBid::class, 'notis_id', 'id');
}
// public function lelongBidJual()
// {
// public function lelongBidJual()
// {
// return $this->hasMany(LelongBid::class, 'lelong_id', 'id')->where('status_jual', 1);
// }
// public function lelongBidBelumSemak()
// {
// public function lelongBidBelumSemak()
// {
// return $this->hasMany(LelongBid::class, 'lelong_id', 'id')->where('status_semak', 0);
// }
app/Models/NotisBid.php
+3 -3
View File
@@ -38,8 +38,8 @@ class NotisBid extends Model
return $this->belongsTo(Notis::class, 'notis_id', 'id');
}
public function cawanganNotis(){
return $this->hasOne(CawanganNotis::class, 'caw_id','caw_id');
public function cawanganNotis()
{
return $this->hasOne(CawanganNotis::class, 'caw_id', 'caw_id');
}
}
app/Models/PayDenoKaunter.php
+1 -1
View File
@@ -34,6 +34,6 @@ class PayDenoKaunter extends Model
'rm100',
'total_payment',
'disahkan_pada',
'disahkan_oleh'
'disahkan_oleh',
];
}
app/Models/Payment.php
+1 -1
View File
@@ -39,7 +39,7 @@ class Payment extends Model
'rm100',
'total_payment',
'disahkan_pada',
'disahkan_oleh'
'disahkan_oleh',
];
public function user()
app/Models/Pengesahan.php
+3 -3
View File
@@ -20,15 +20,15 @@ class Pengesahan extends Model
'diminta_oleh',
'diminta_pada',
'status',
'status_ubah'
'status_ubah',
];
public function lelongbidmarhun()
{
return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id');
return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id', 'id');
}
public function lelong()
public function lelong()
{
return $this->belongsTo(Lelong::class, 'lelong_id', 'id');
}
app/Models/Resit.php
+2 -2
View File
@@ -19,8 +19,8 @@ class Resit extends Model
'billplz_id',
'total_payment',
'resit_type', // 1 = fee , 2 = bid
'status', //status => 1 = paid , 2 = pending
'status', // status => 1 = paid , 2 = pending
'paid_at',
'response'
'response',
];
}
app/Models/ScanJual.php
+1 -1
View File
@@ -19,6 +19,6 @@ class ScanJual extends Model
'khazanah_id',
'scan_keluar',
'serah_marhun',
'serahkpdpembida'
'serahkpdpembida',
];
}
app/Models/ScanSemak.php
+1 -1
View File
@@ -22,6 +22,6 @@ class ScanSemak extends Model
'terima_marhun',
'serah_marhun',
'scan_masuk',
'serahkpdpembida'
'serahkpdpembida',
];
}
app/Models/SimKarat.php
+1 -1
View File
@@ -17,7 +17,7 @@ class SimKarat extends Model
'keterangan',
'harga',
'harga2',
'simulasi_id'
'simulasi_id',
];
public function simulasi()
app/Models/SimKarat_temp.php
+1 -1
View File
@@ -18,7 +18,7 @@ class SimKarat_temp extends Model
'harga',
'harga2',
't_harga',
'simulasi_id'
'simulasi_id',
];
public function simulasi()
app/Models/Simulasi.php
+3 -2
View File
@@ -20,7 +20,7 @@ class Simulasi extends Model
'cajlelong',
'fasa',
'success_import',
'tagujrah'
'tagujrah',
];
public function cawangan()
@@ -54,7 +54,8 @@ class Simulasi extends Model
return $this->hasMany(SimKarat_temp::class, 'simulasi_id', 'id');
}
public function simulasiBidMarhun(){
public function simulasiBidMarhun()
{
return $this->hasManyThrough(
app/Models/SimulasiBidMarhun.php
+9 -9
View File
@@ -12,15 +12,15 @@ class SimulasiBidMarhun extends Model
protected $table = 'simulasibidmarhun';
protected $fillable = [
'simulasibid_id',
'bil',
'marhun',
'nota',
'karat',
'berat',
'harga',
'n_marhun',
'hargaasas',
'simulasibid_id',
'bil',
'marhun',
'nota',
'karat',
'berat',
'harga',
'n_marhun',
'hargaasas',
];
public function simulasiBid()
app/Models/Staff.php
+1 -1
View File
@@ -12,6 +12,6 @@ class Staff extends Model
protected $table = 'staffs';
protected $fillable = [
];
}
app/Models/TakLaku.php
+1 -1
View File
@@ -18,6 +18,6 @@ class TakLaku extends Model
'norujukan',
't_lelong',
'status',
'fasa'
'fasa',
];
}
app/Models/TangguhLelong.php
+7 -7
View File
@@ -12,12 +12,12 @@ class TangguhLelong extends Model
protected $table = 'tangguhlelong';
protected $fillable = [
'lelong_id',
'lelongbid_id',
'norujukan',
'tarikhtangguh',
'ditangguh_oleh',
'ditangguh_pada',
'nota'
'lelong_id',
'lelongbid_id',
'norujukan',
'tarikhtangguh',
'ditangguh_oleh',
'ditangguh_pada',
'nota',
];
}
app/Models/TempPengesahan.php
+4 -3
View File
@@ -20,10 +20,11 @@ class TempPengesahan extends Model
'diminta_oleh',
'diminta_pada',
'status',
'status_ubah'
'status_ubah',
];
public function lelongbidmarhun(){
return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id');
public function lelongbidmarhun()
{
return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id', 'id');
}
}
app/Models/Tetapan.php
+1 -2
View File
@@ -15,7 +15,6 @@ class Tetapan extends Model
'id',
'tetap_tarikh_lelong',
'kali',
'cajlelong'
'cajlelong',
];
}
app/Models/TransaksiKeuntungan.php
+4 -2
View File
@@ -2,21 +2,23 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class TransaksiKeuntungan extends Model
{
protected $connection = 'main';
protected $table = 'transaksi_keuntungan';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan','keuntungan_rebet'
'norujukan', 'bayaran_keuntungan', 'tarikh_bayaran', 'kodcaw', 'bayaran_pembiayaan', 'keuntungan_rebet',
];
/**
app/Models/User.php
+6 -8
View File
@@ -2,17 +2,16 @@
namespace App\Models;
use Laravel\Sanctum\HasApiTokens;
use Spatie\Permission\Traits\HasRoles;
use Illuminate\Notifications\Notifiable;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use App\Notifications\PasswordResetNotification;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Laravel\Sanctum\HasApiTokens;
use Spatie\Permission\Traits\HasRoles;
class User extends Authenticatable
{
use HasApiTokens, HasFactory, Notifiable, HasRoles;
use HasApiTokens, HasFactory, HasRoles, Notifiable;
/**
* The attributes that are mass assignable.
@@ -39,7 +38,7 @@ class User extends Authenticatable
'online',
'register_agree',
'disahkan_pada',
'disahkan_oleh'
'disahkan_oleh',
];
@@ -70,12 +69,11 @@ class User extends Authenticatable
public function cawangan()
{
return $this->hasOne(Cawangan::class, 'caw_code' , 'kodcaw');
return $this->hasOne(Cawangan::class, 'caw_code', 'kodcaw');
}
public function payment()
{
return $this->hasMany(Payment::class, 'user_id', 'id');
}
}
app/Models/UserKaunter.php
+2 -1
View File
@@ -10,6 +10,7 @@ class UserKaunter extends Model
use HasFactory;
protected $connection = 'kaunterpkb';
protected $table = 'users';
protected $fillable = [
@@ -27,7 +28,7 @@ class UserKaunter extends Model
'remember_token',
'updated_at',
'created_at',
'email_verified_at'
'email_verified_at',
];
public function gadaiteller()
app/Models/WtdDraft.php
+4 -2
View File
@@ -2,21 +2,23 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class WtdDraft extends Model
{
protected $connection = 'main';
protected $table = 'wtd_draft';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'id','nokp','kodcaw','norujukan','t_jual','t_gadai','t_lelong','batchno_serah'
'id', 'nokp', 'kodcaw', 'norujukan', 't_jual', 't_gadai', 't_lelong', 'batchno_serah',
];
/**