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

Merge branch 'main' into faiqahzaman

Browse Source
This commit is contained in:
faiqahzaman
2022-04-28 13:34:05 +08:00
parent b08fbf2896 36bb8e5665
commit c5e6030e09
25 changed files with 757 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+1 -1
View File
@@ -128,7 +128,7 @@ class AccountController extends Controller
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', '3,2')
->where('payment.status_payment_opt', '3,2')
->where('lelongbidder.status_payment', 2)
->select(
'lelongbid.id as lelongbid_id',
app/Http/Controllers/ImportDataController.php
+163
View File
@@ -0,0 +1,163 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Carbon\Carbon;
use App\Models\User;
use App\Models\Gadai;
use App\Models\GadaiMarhun;
use App\Models\Cawangan;
use App\Models\TransaksiKeuntungan;
use DateTime;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Input;
class ImportDataController extends Controller
{
//PC
public function importdata(Request $request)
{
//return view('importdata.importdatacawangan');
$caw = Cawangan::all();
return view('importdata.listcawangan',compact('caw'));
}
public function listcawangan()
{
$caw = Cawangan::all();
return view('importdata.listcawangan',compact('caw'));
}
public function showsenarai($kodcaw)
{
$caw = Cawangan::where('caw_code','=',$kodcaw)->first();
return view('importdata.showsenarai',compact('caw'));
}
public function importdatagadai($kodcaw)
{
// dd($kodcaw);
$caw = Cawangan::all();
if (Gadai::where('kodcaw', '=', $kodcaw)->count() == null)
{
$results = DB::select("SELECT * FROM cawangan where caw_code = '$kodcaw' ");
//dd($results);
foreach($results as $row)
{
$caw_ip = $row->caw_ip;
$caw_dbuser = $row->caw_dbuser;
$caw_dbpass = $row->caw_dbpass;
$caw_dbname = $row->caw_dbname;
$caw_name = $row->caw_name;
$caw_id = $row->id;
// dd($caw_ip);
$db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass);
if (!$db)
{
echo "<p style='color:#F00'>Server Down: $caw_name</p>";
continue;
die('Could not connect: ' . mysqli_error());
}
mysqli_select_db($db,$caw_dbname);
$count = 0;
$result=mysqli_query($db,"SELECT * FROM gadai where sttebus = '' and upah12 is NOT NULL");
while($row_gadai = mysqli_fetch_array($result))
{
$count++;
$kodcaw = $row_gadai['kodcaw'];
$norujukan = $row_gadai['norujukan'];
$nopelanggan = $row_gadai['nopelanggan'];
$nokp = $row_gadai['nokp'];
$t_gadai = $row_gadai['t_gadai'];
$masa = $row_gadai['masa'];
$sirig = $row_gadai['sirig'];
$nilaimarhun = $row_gadai['nilaimarhun'];
$berat = $row_gadai['berat'];
$pinjaman = $row_gadai['pinjaman'];
$kadarupah = $row_gadai['kadarupah'];
$tempoh = $row_gadai['tempoh'];
$t_matang = $row_gadai['t_matang'];
$t_matang1 = $row_gadai['t_matang1'];
$teller = $row_gadai['teller'];
$bakipjm = $row_gadai['bakipjm'];
$bakiupah = $row_gadai['bakiupah'];
$marhun = $row_gadai['marhun'];
$taglel = $row_gadai['taglel'];
$ansakhir = $row_gadai['ansakhir'];
$t_update = $row_gadai['t_update'];
$tagtbaki = $row_gadai['tagtbaki'];
$penilai = $row_gadai['penilai'];
$percentpinj = $row_gadai['percentpinj'];
$tagpalsu = $row_gadai['tagpalsu'];
$semakbarcode = $row_gadai['semakbarcode'];
$historygadaian = $row_gadai['historygadaian'];
$upah12 = $row_gadai['upah12'];
$hargajualan = $row_gadai['hargajualan'];
$bakihargajualan = $row_gadai['bakihargajualan'];
$tempohbayar = $row_gadai['tempohbayar'];
DB::insert("INSERT INTO elelong.gadai (kodcaw,norujukan,nopelanggan,nokp,t_gadai,masa,sirig,nilaimarhun,berat,pinjaman,sttebus,tagcetak,kadarupah,tempoh,t_matang,t_matang1,teller,bakipjm,bakiupah,marhun,taglel,ansakhir,t_update,tagtbaki,penilai,percentpinj,tagpalsu,semakbarcode,historygadaian,upah12,hargajualan,bakihargajualan,tempohbayar)
VALUES ('$kodcaw','$norujukan','$nopelanggan','$nokp','$t_gadai','$masa','$sirig','$nilaimarhun','$berat','$pinjaman', '','','$kadarupah','$tempoh','$t_matang','$t_matang1','$teller','$bakipjm','$bakiupah','$marhun','$taglel','$ansakhir','$t_update','$tagtbaki','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$tempohbayar')");
//untuk gadaimarhun
$result1=mysqli_query($db,"SELECT * FROM marhun where norujukan = '$norujukan'");
while($row_tender1 = mysqli_fetch_array($result1))
{
$kodcaw1 = $row_tender1['kodcaw'];
$norujukan1 = $row_tender1['norujukan'];
$bil1 = $row_tender1['bil'];
$t_gadai1 = $row_tender1['t_gadai'];
$marhun1 = $row_tender1['marhun'];
$nota1 = $row_tender1['nota'];
$karat1 = $row_tender1['karat'];
$berat1 = $row_tender1['berat'];
$harga1 = $row_tender1['harga'];
$n_marhun1 = $row_tender1['n_marhun'];
DB::insert("INSERT INTO elelong.gadaimarhun (kodcaw,norujukan,t_gadai,bil,marhun,nota,karat,berat,harga,n_marhun)
VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota1','$karat1','$berat1','$harga1','$n_marhun1')");
}
}
return redirect()->route('importdata.listcawangan')
->with('success','Data '.$caw_name.' berjaya import');
}
}else{
return redirect()->route('importdata.listcawangan')
->with('success','Data '.$kodcaw.' Ini Telah Wujud Sila Hapus Data Dahulu');
}
}
public function hapusdatacawangan($kodcaw)
{
$caw = Gadai::where('kodcaw','=',$kodcaw);
$caw->delete();
$cawmarhun = GadaiMarhun::where('kodcaw','=',$kodcaw);
$cawmarhun->delete();
// dd($cawmarhun);
return redirect()->route('importdata.listcawangan')
->with('success','Data '.$kodcaw.' Berjaya Dihapuskan');
}
}
app/Http/Controllers/LelongController.php
+48 -10
View File
@@ -984,14 +984,26 @@ class LelongController extends Controller
public function lapbidaanpembidaindex (Request $request){
$arraydetails = [];
$lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()
->toArray();
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
foreach($lelongid as $laporan){
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.laporanbidaanindex',compact('lelongid'));
return view('lelong.laporanbidaanindex',compact('lelongid','arraydetails'));
}
@@ -1068,12 +1080,25 @@ class LelongController extends Controller
}
Public function laplelongindex (Request $request){
$arraydetails =[];
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()
->toArray();
return view('lelong.laplelongindex',compact('lelongid'));
foreach($lelongid as $laporan){
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.laplelongindex',compact('lelongid','arraydetails'));
}
@@ -1168,11 +1193,24 @@ class LelongController extends Controller
Public function lapbrglelpembidaindex (Request $request){
$arraydetails = [];
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()
->toArray();
return view ('lelong.lapbrglelpembidaindex',compact('lelongid'));
foreach($lelongid as $laporan){
$details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arraydetails, ['laporan' =>$laporan,'details' =>$details]);
}
return view ('lelong.lapbrglelpembidaindex',compact('lelongid','arraydetails'));
}
app/Http/Controllers/MarhunController.php
+82 -111
View File
@@ -521,83 +521,72 @@ class MarhunController extends Controller
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)->where('lelong_id', $request->lelong_id)->get();
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)
->first();
$pengesahan->id = $pengesahan['id'] ;
$pengesahan->disahkan_oleh = $user['id'];
$pengesahan->disahkan_pada = $currentdate;
$pengesahan->save();
// dd($pengesahan);
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
if($request->jenis_button == "terima")
{
foreach($pengesahan as $index1=>$sah)
{
$savepengesahan = Pengesahan::where('id', $sah['id'])
->first();
$savepengesahan->disahkan_oleh = $user['id'];
$savepengesahan->disahkan_pada = $currentdate;
$savepengesahan->status = 1;
$savepengesahan->save();
$lelongbid = LelongBid::where('id', $sah->lelongbid_id)->get();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $sah->lelongbid_id)->get();
$lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
->where('pengesahan.lelongbid_id', $sah->lelongbid_id)
->where('pengesahan.id', $sah->id)
->get();
$total_berat = 0;
$total_hargaasas = 0;
foreach($lelongbidmarhuns as $index2=>$bidmarhuns)
{
if($bidmarhuns->status_ubah == 3)
{
$bidmarhuns->delete();
}
else
{
//
}
$lelongbids = LelongBid::where('id', $sah->lelongbid_id)->first();
$txtmarhun = ",1 " . $bidmarhuns->marhun ;
$lelongbids->marhun = str_replace( $txtmarhun,"", $lelongbid[0]['marhun']);
$lelongbids->berat = $total_berat += $bidmarhuns->berat ;
$lelongbids->hargaasas = $total_hargaasas += $bidmarhuns->hargaasas;
$lelongbids->save();
}
$lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
->where('pengesahan.id', $pengesahan->id)
->get();
dd($lelongbidmarhuns['marhun']);
foreach($lelongbidmarhuns as $bidmarhuns)
{
if($bidmarhuns->status_ubah == 3)
{
$bidmarhuns->delete();
}
else
{
//
}
}
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
->select('pengesahan.id as pengesahan_id')
->first();
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid_id','=',$pengesahan->lelongbid_id)
->get();
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
$txtmarhun = ",1 " . $lelongbidmarhuns->marhun ;
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat;
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->hargaasas;
$lelongbid->save();
// $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
}
else if($request->jenis_button == "tangguhlelong")
{
foreach($pengesahan as $index1=>$sah)
{
$savepengesahan = Pengesahan::where('id', $sah['id'])
->first();
$savepengesahan->disahkan_oleh = $user['id'];
$savepengesahan->disahkan_pada = $currentdate;
$savepengesahan->status = 1;
$savepengesahan->save();
$lelongbidasal = LelongBid::where('id', $sah['lelongbid_id'])->first();
//add into table tangguhlelong
$tangguhlelong = new TangguhLelong;
$tangguhlelong->lelong_id = $sah->lelong_id;
$tangguhlelong->lelongbid_id = $sah->lelongbid_id;
$tangguhlelong->norujukan = $sah->norujukan;
$tangguhlelong->pinjaman = $lelongbidasal['pinjaman'];
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->nota;
$tangguhlelong->save();
$marhundelete = LelongBid::where('id', $sah->lelongbid_id)->delete();
}
//add into table tangguhlelong
$tangguhlelong = new TangguhLelong;
$tangguhlelong->lelong_id = $pengesahan->lelong_id;
$tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
$tangguhlelong->norujukan = $pengesahan->norujukan;
$tangguhlelong->pinjaman = $lelongbid[0]['pinjaman'];
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->nota;
$tangguhlelong->save();
// dd($tangguhlelong);
$marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete();
}
@@ -641,29 +630,38 @@ class MarhunController extends Controller
}
public function pcdelete($id, $lelongbid_id)
{
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first();
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
->where('pengesahan.lelongbid_id', $lelongbid_id)
->select('pengesahan.id as pengesahan_id')
->first();
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid_id','=',$lelongbid_id)
->get();
$lelongbid = LelongBid::where('id', $lelongbid_id)->first();
$txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
$lelongbid->save();
}
public function senarailelong()
{
$arrayinfo = [];
$lelong = Lelong::where('sts_lelong', 0)
->get()->toArray();
->get();
foreach($lelong as $details)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id', $details['id'])
->get()
->toArray();
array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
}
return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo'));
return view('pengesahan.senarailelong',compact('lelong'));
}
public function senaraitangguhlelong($id)
{
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id')
$tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
->where('tangguhlelong.lelong_id', $id)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
@@ -681,41 +679,14 @@ class MarhunController extends Controller
)
->get();
foreach($tangguhlelong as $index1=>$tanguhlel)
{
$getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('lelong_id', $id)
->first();
$tangguhlelong[$index1]['details'] = $tanguhlel;
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
}
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
}
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
{
$tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
->where('gadaimarhun.norujukan', $norujukan)
->where('tangguhlelong.id', $tangguhlelong_id)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
'tangguhlelong.pinjaman',
'tangguhlelong.tarikhtangguh',
'tangguhlelong.nota as tangguh_nota',
'tangguhlelong.pinjaman',
'gadaimarhun.id as gadaimarhun_id',
'gadaimarhun.bil',
'gadaimarhun.marhun',
'gadaimarhun.nota as gadai_nota',
'gadaimarhun.karat',
'gadaimarhun.berat',
'gadaimarhun.harga',
'gadaimarhun.n_marhun'
)
$marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
->where('tangguhlelong.lelong_id', $id)
->where('tangguhlelong.norujukan', $norujukan)
->get();
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
app/Http/Controllers/PenggunaController.php
+5 -4
View File
@@ -63,18 +63,19 @@ class PenggunaController extends Controller
$currentdate = $currentdate->toDateTimeString();
//dd($request->all());
$validator = Validator::make($request->all(), [
'email' => 'required|string|unique:users|email'
'email' => 'required|string|unique:users|email',
'username' => 'required|string|unique:users'
]);
if ($validator->fails()) {
$errors = [
'success' => "error",
//'message' => $validator->errors()
'message' => $validator->errors()
];
return redirect()->route('pengguna.index')
->with('success', 'Sila Masukkan Email Yang Sah'); }
->with('message', 'Sila Masukkan Email Yang Sah'); }
$user = new User;
$user->name = $request->name;
@@ -111,7 +112,7 @@ class PenggunaController extends Controller
array_push($arraytaraf,$taraf);
}
}
// dd($arraytaraf);
//dd($arraytaraf);
$user->syncRoles($arraytaraf);
if($request->status == true)
app/Http/Controllers/SimulasiController.php
+19 -10
View File
@@ -57,7 +57,7 @@ class SimulasiController extends Controller
public function janadata(Request $request)
{
// dd($request->all());
//dd($request->all());
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = (int)round($request->jbg);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
@@ -185,22 +185,27 @@ class SimulasiController extends Controller
}
elseif($request->caw && $request->caw != 'all')
{
// dd($request->caw);
$caw = Cawangan::where('id','=',$request->caw)->first();
//dd($request->caw);
$caw = Cawangan::whereIn('id',$request->caw)->get();
// dd($caw);
foreach($caw as $index=>$cawsimulasi){
// dd($cawsimulasi->id);
$caw_simulasi = new CawanganSimulasi;
$caw_simulasi->simulasi_id = $simulasi->id;
$caw_simulasi->caw_id = $caw->id;
$caw_simulasi->caw_id = $cawsimulasi->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $caw->lokasi;
$caw_simulasi->lokasi = $cawsimulasi->lokasi;
$caw_simulasi->save();
// dd($caw_simulasi);
$suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all();
$suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all();
// $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get();
foreach($suratcaw as $data)
{
$simulasibid = new SimulasiBid;
$simulasibid->simulasi_id = $simulasi->id;
$simulasibid->caw_id = $caw->id;
$simulasibid->caw_id = $cawsimulasi->id;
$simulasibid->kodcaw = $data->kodcaw;
$simulasibid->norujukan = $data->norujukan;
$simulasibid->t_lelong = $request->tarikh_lelong;
@@ -267,6 +272,7 @@ class SimulasiController extends Controller
$updatesimbid->save();
}
}
}
else
{
dd('error');
@@ -301,7 +307,7 @@ class SimulasiController extends Controller
return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo'));
}
public function show($id)
public function show(Request $request, $id)
{
$simulasi_id = $id;
$simulasi = Simulasi::where('id','=',$id)->first();
@@ -460,6 +466,8 @@ class SimulasiController extends Controller
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
->get();
}
@@ -479,7 +487,7 @@ class SimulasiController extends Controller
'total23k',
'total22K',
'total21K',
'total20K',
'total20K',
'total18Kp',
'total18K',
'total14Kp',
@@ -490,7 +498,8 @@ class SimulasiController extends Controller
'jeniskarat',
'data',
'total_upahkeuntungan',
'total_nilaimarhun'));
'total_nilaimarhun'
));
}
public function delete($id)
app/Http/Controllers/TamatKontController.php
+9 -3
View File
@@ -206,14 +206,18 @@ class TamatKontController extends Controller
->first();
$tarikh_lelong = Carbon::parse($t_lelong);
$t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
// $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
$t_lelongdisplay = $tarikh_lelong->format('d-m-Y');
$t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
$t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
foreach($getsurat as $index1=>$surats)
{
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('norujukan', $surats['norujukan'])
->get();
dd($senarai);
//dd($senarai);
$getsurat[$index1]['list_norujukan'] = $senarai;
}
@@ -226,7 +230,9 @@ class TamatKontController extends Controller
't_lelong',
't_gadais',
't_anggaran',
'tarikh_lelong'
'tarikh_lelong',
't_daftarlelong',
't_lelongdisplay'
));
}