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

Merge branch 'main' into amirah

Browse Source
This commit is contained in:
Amirah22
2022-05-18 12:17:55 +08:00
parent b108eafa1b 2f91401299
commit e53cd7b573
34 changed files with 1543 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ImportDataController.php
+5 -4
View File
@@ -72,7 +72,7 @@ class ImportDataController extends Controller
mysqli_select_db($db,$caw_dbname);
$count = 0;
$result=mysqli_query($db,"SELECT * FROM gadai where sttebus = '' and upah12 is NOT NULL");
$result=mysqli_query($db,"SELECT * FROM gadai where taglel = '0' and sttebus = '' and upah12 is NOT NULL");
while($row_gadai = mysqli_fetch_array($result))
{
@@ -108,9 +108,9 @@ class ImportDataController extends Controller
$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')");
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','0','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$tempohbayar')");
//untuk gadaimarhun
$result1=mysqli_query($db,"SELECT * FROM marhun where norujukan = '$norujukan'");
@@ -127,9 +127,10 @@ class ImportDataController extends Controller
$berat1 = $row_tender1['berat'];
$harga1 = $row_tender1['harga'];
$n_marhun1 = $row_tender1['n_marhun'];
$nota2 = $db -> real_escape_string($nota1);
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')");
VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota2','$karat1','$berat1','$harga1','$n_marhun1')");
}
app/Http/Controllers/LelongController.php
+2
View File
@@ -792,9 +792,11 @@ class LelongController extends Controller
public function senaraisagpemenang($user_id, $lelong_id){
// dd($user_id);
$senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->get();
return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id'));
app/Http/Controllers/MarhunController.php
+83 -35
View File
@@ -394,25 +394,25 @@ class MarhunController extends Controller
return view('pengesahan.senarailelongubahmutu',compact('lelong'));
}
public function sahubahmutu($id)
{
$mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id')
->where('lelong.id', $id)
->whereNull('disahkan_oleh')
public function sahubahmutu($id){
$mutumarhun = Pengesahan::whereNull('disahkan_oleh')
->whereNull('disahkan_pada')
->where('lelong_id', $id)
->whereIn('status_ubah', [1,2,3,4,5])
->selectRaw('count(*) as total, sum(status) as tstat,norujukan')
->groupBy('pengesahan.norujukan')
->groupBy('norujukan')
->get()->toArray();
foreach($mutumarhun as $index1=>$mutu)
{
$cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', 'cawangan.id')
->join('lelongbid', 'cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id')
$cawangan = LelongBid::join('cawangan', 'lelongbid.caw_id', 'cawangan.id')
->where('lelongbid.lelong_id', $id)
->where('lelongbid.norujukan', $mutu['norujukan'])
->select('cawangan.caw_name')
->first();
// dd($cawangan);
$mutumarhun[$index1]['cawangan_name'] = $cawangan;
$mutumarhun[$index1]['cawangan_name'] = $cawangan['caw_name'];
}
// foreach($mutumarhun as $index1=>$marhun)
@@ -528,7 +528,7 @@ class MarhunController extends Controller
$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();
@@ -538,7 +538,6 @@ class MarhunController extends Controller
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
->where('pengesahan.id', $pengesahan->id)
->get();
dd($lelongbidmarhuns['marhun']);
foreach($lelongbidmarhuns as $bidmarhuns)
{
@@ -550,29 +549,32 @@ class MarhunController extends Controller
{
//
}
$txtmarhun = ",1 " . $bidmarhuns->marhun ;
}
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
$pengesahans = 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();
// $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
// ->where('lelongbid_id','=',$pengesahan->lelongbid_id)
// ->get();
$lelongbids = LelongBid::where('id', $lelongbid[0]['id'])->first();
$lelongbids->marhun = str_replace( $txtmarhun,"",$lelongbids->marhun);
$lelongbids->berat = $lelongbids->berat;
$lelongbids->hargaasas = $lelongbids->hargaasas;
$lelongbids->save();
// $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
}
else if($request->jenis_button == "tangguhlelong")
{
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)
->get();
dd($pengesahan) ;
//add into table tangguhlelong
$tangguhlelong = new TangguhLelong;
$tangguhlelong->lelong_id = $pengesahan->lelong_id;
@@ -653,16 +655,29 @@ class MarhunController extends Controller
public function senarailelong()
{
$lelong = Lelong::where('sts_lelong', 0)
->get();
$arrayinfo = [];
return view('pengesahan.senarailelong',compact('lelong'));
$lelong = Lelong::where('sts_lelong', 0)
->get()->toArray();
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'));
}
public function senaraitangguhlelong($id)
public function senaraitangguhlelong($id, $caw_name)
{
$tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
->where('tangguhlelong.lelong_id', $id)
->whereNotNull('tangguhlelong.tarikhtangguh')
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
@@ -678,20 +693,53 @@ class MarhunController extends Controller
'lelong.sts_lelong'
)
->get();
// dd($tangguhlelong);
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
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', 'caw_name'));
}
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
{
$marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
$tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
->where('gadaimarhun.norujukan', $norujukan)
->where('tangguhlelong.id', $tangguhlelong_id)
->where('tangguhlelong.lelong_id', $id)
->where('tangguhlelong.norujukan', $norujukan)
->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.bil',
'gadaimarhun.marhun',
'gadaimarhun.nota as gadai_nota',
'gadaimarhun.karat',
'gadaimarhun.berat',
'gadaimarhun.harga',
'gadaimarhun.n_marhun'
)
->get();
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
$caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code')
->where('gadaimarhun.norujukan', $norujukan)
->select('cawangan.caw_name')
->first();
// dd($caw_names);
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names'));
}
}
app/Http/Controllers/PaymentController.php
+55 -27
View File
@@ -24,11 +24,9 @@ class PaymentController extends Controller
$senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->where('sts_lelong', 3)
->where('lelong.sts_lelong', 3)
->get();
// dd($senarai);
return view('pembayaran.senarailelongbayaran',compact('senarai'));
}
@@ -120,6 +118,7 @@ class PaymentController extends Controller
}
public function paymentdenokaunter(Request $request){
// dd($request->all());
$currentdate = Carbon::now();
@@ -127,7 +126,9 @@ class PaymentController extends Controller
$user = Auth::user();
$bid_id = explode(",", $request->eachbid);
// $bid_id = implode(",", $request->eachbid);
$bid_id = $request->eachbid;
// dd($bid_id);
$resit = Resit::where('lelong_id', $request->lelong_id)
->where('user_id',$request->user_id)
@@ -158,24 +159,24 @@ class PaymentController extends Controller
'disahkan_oleh' => $user->id,
'disahkan_pada' => $currentdate
]);
foreach($bid_id as $bid){
foreach($bid_id as $bid)
{
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.lelongbid_id', $bid)
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.id as lelongbidder_id',
'lelongbid.lelong_id as lelong_id'
)
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.id as lelongbidder_id',
'lelongbid.lelong_id as lelong_id'
)
->first();
$total_hargabida = $total_hargabida + $eachbid->hargabida;
// dd($total_hargabida);
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
->where('user_id',$request->user_id)
->first();
@@ -191,14 +192,15 @@ class PaymentController extends Controller
$eachbidupdate->save();
}
$senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbidder.status_bidder', 1)
->get();
// dd(floatval($request->amaunkiraan));
if(floatval($request->amaunkiraan) == $total_hargabida){
// dd('hye');
if(floatval($request->amaunkiraan) == $total_hargabida)
{
$resit->total_payment = $resit->total_payment + $total_hargabida;
if($resit->total_payment >= $senaraisagallpayment->sum('hargabida'))
{
@@ -207,11 +209,14 @@ class PaymentController extends Controller
}
$resit->save();
}
return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya');
}
public function pengesahanPembayaran(Request $request){
// dd($request->all());
$pengesahanPembayaran = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.status_bidder', 1)
@@ -228,15 +233,15 @@ class PaymentController extends Controller
$currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
// dd($user);
$totalcheck = implode(",", $request->checkboxdata);
// $totalcheck = implode(",", $request->checkboxdata);
$bid_id = explode(",", $request->eachbid); //bid_id = lelongbid_id
$resit = Resit::where('lelong_id', $request->lelong_id)
->where('user_id',$request->user_id)
->where('resit_type', 2)
->first();
$payment = new Payment;
$payment->user_id = $request->user_id;
$payment->lelong_id = $request->lelong_id;
@@ -245,21 +250,44 @@ class PaymentController extends Controller
$payment->status = 2;
$payment->remark = 'BAYARAN CDM';
$payment->resit_id = $resit->id;
$payment->total_payment = $totalcheck;
$payment->total_payment = $request->total;
$payment->diminta_pada = $currentdate;
$payment->diminta_oleh = $user->id;
$payment->save();
$sts_payment = LelongBidder::where('user_id', $request->user_id)
->where('lelongbid_id', $request->eachbid)
foreach($bid_id as $bid){
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.lelongbid_id', $bid)
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.id as lelongbidder_id',
'lelongbid.lelong_id as lelong_id'
)
->first();
$sts_payment->payment_id = $payment->id;
$sts_payment->status_payment = 2; //Menunggu pengesahan account
$sts_payment->update();
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
->where('user_id',$request->user_id)
->first();
$updatelelbidbidder->status_payment = 1;
$updatelelbidbidder->payment_id = $payment->id;
$updatelelbidbidder->save();
$eachbidupdate = LelongBid::where('id',$bid)->first();
$eachbidupdate->status_jual = 1;
$eachbidupdate->status_payment = 2;
$eachbidupdate->t_jual = $currentdate;
$eachbidupdate->hargajual = $eachbid->hargabida;
$eachbidupdate->save();
}
return redirect()->route('pembayaran.SenaraiLelongBayar')
->with('success','Menunggu Pengesahan Account');
->with('success','Menunggu Pengesahan Account');
}
}
app/Http/Controllers/PembidaController.php
+13 -19
View File
@@ -194,29 +194,22 @@ class PembidaController extends Controller
->groupBy('lelongbidder.user_id')
->get()->toArray();
foreach($listwinner as $index1=>$winner){
foreach($listwinner as $index1=>$winner)
{
$userdetails = User::where('id', $winner['user_id'])->first();
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $request->lelong_id)
->get();
// dd($SAGWin);
$sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $request->lelong_id)
->select('lelongbidder.status_payment')
->get();
foreach($SAGWin as $index2=>$sag)
{
$detailspayment = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->where('payment.kodcaw', $request->kodcaw)
->where('payment.lelong_id', $request->lelong_id)
->whereNotNull('payment.disahkan_pada')
->where('lelongbidder.status_bidder', 1)
->where('lelongbidder.status_payment', 1)
->get();
$detailspayment = Payment::where('id', $sag->payment_id)->first();
// dd($detailspayment);
}
$payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
@@ -225,7 +218,8 @@ class PembidaController extends Controller
->select('payment_id')->groupBy('payment_id')->get();
$total_payment = 0;
foreach($payment_id as $id){
foreach($payment_id as $id)
{
$payment = Payment::where('id', $id->payment_id)
->first();
@@ -238,9 +232,9 @@ class PembidaController extends Controller
$listwinner[$index1]['total_surat'] = sizeof($SAGWin);
$listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
$listwinner[$index1]['totalPay'] = $total_payment;
$listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment'];
$listwinner[$index1]['status'] = $detailspayment[0]['status'];
$listwinner[$index1]['remark'] = $detailspayment[0]['remark'];
$listwinner[$index1][$index2]['remarks'] = $detailspayment['remark'];
$listwinner[$index1][$index2]['status_payment'] = $sag->status_payment;
$listwinner[$index1][$index2]['status'] = $detailspayment['status'];
}
app/Http/Controllers/PenggunaController.php
+2 -2
View File
@@ -33,8 +33,8 @@ class PenggunaController extends Controller
public function index()
{
// $alluser = User::all();
$alluser = User::with('roles')->get();
$allroles = Role::all()->pluck('name');
$alluser = User::with('roles')->orderBy('id')->get();
$allroles = Role::all();
$caw = Cawangan::all();
$user = User::with('roles')->first();
$userroles = $user->getRoleNames()->toArray();
app/Http/Controllers/SimulasiController.php
+23 -4
View File
@@ -60,14 +60,29 @@ class SimulasiController extends Controller
//dd($request->all());
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = (int)round($request->jbg);
$fasa = $request->fasa;
$jbg = $request->jbg;
// dd($fasa);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
$surat = Gadai::where('t_gadai','<=',$jbgadai)
if($request->fasa == '1'){
$surat = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->where('lelong_tawarruq','=',1)
->get();
}
else if($request->fasa == '2'){
$surat = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->get();
}
// dd($jbg);
if(sizeof($surat) == 0)
{
return redirect()->route('analisa.janasimulasi')
@@ -80,6 +95,7 @@ class SimulasiController extends Controller
$simulasi->harga_emas_asas = $request->hargaasas;
$simulasi->jbg = $request->jbg;
$simulasi->cajlelong = $request->cajlelong;
$simulasi->fasa = $request->fasa;
$simulasi->save();
//create harga asas berdasarkan input harga asas
@@ -96,10 +112,11 @@ class SimulasiController extends Controller
$simkarat->save();
}
//$fasa = $request->fasa;
// join cawangan yang terlibat dengan simulasi
if($request->caw && $request->caw == 'all')
{
//dd($request->fasa);
foreach($cawangan as $key=>$caw)
{
@@ -108,6 +125,7 @@ class SimulasiController extends Controller
$caw_simulasi->caw_id = $caw->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $caw->lokasi;
$caw_simulasi->fasa = $request->fasa;
$caw_simulasi->save();
$suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all();
@@ -195,6 +213,7 @@ class SimulasiController extends Controller
$caw_simulasi->caw_id = $cawsimulasi->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $cawsimulasi->lokasi;
$caw_simulasi->fasa = $request->fasa;
$caw_simulasi->save();
// dd($caw_simulasi);
@@ -288,7 +307,7 @@ class SimulasiController extends Controller
$arrayinfo = [];
$simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id')
->select('simulasi_id','tarikh_lelong')
->select('simulasi_id','tarikh_lelong', 'simulasi.fasa')
->groupBy('simulasi_id')
->get()
->toArray();
@@ -359,7 +378,6 @@ class SimulasiController extends Controller
$keuntungan = 0;
$total_upahkeuntungan = 0;
$total_nilaimarhun = 0;
@@ -466,6 +484,7 @@ class SimulasiController extends Controller
$total_cazlelong = $total_cazlelong + $cajlelong;
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
->get();
app/Http/Controllers/TamatKontController.php
+171 -2
View File
@@ -5,12 +5,28 @@ namespace App\Http\Controllers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Carbon\Carbon;
use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
use App\Models\User;
use App\Models\Gadai;
use App\Models\GadaiMarhun;
use App\Models\Cawangan;
use App\Models\TransaksiKeuntungan;
use PDF;
use App\Models\Simulasi;
use App\Models\SimulasiBid;
use App\Models\SimulasiBidMarhun;
use App\Models\SimKarat;
use App\Models\SimKarat_temp;
use App\Models\CawanganSimulasi;
use App\Models\JenisEmas;
use App\Models\JenisKarat;
use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\LelongBid;
use App\Models\LelongBidMarhun;
use App\Models\LelKarat;
use DateTime;
@@ -140,9 +156,11 @@ class TamatKontController extends Controller
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->where('t_matang1', '<', $t_lelong)
->orderBy('t_gadai')
->select('t_gadai')
->first();
->select('t_gadai', 'norujukan')
->first();
//dd($t_gadais);
// $t_gadais = $request->t_gadai;
// $t_gadaisehingga = Carbon::parse($t_gadais);
// $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y');
@@ -235,6 +253,157 @@ class TamatKontController extends Controller
't_lelongdisplay'
));
}
public function janadatatamatkontrak(Request $request)
{
//dd($request->all());
$t_lelong = Carbon::parse($request->trkh_lelong);
$bulan = (int)round('12.00');
$fasa = '2';
$jbg = '12';
$cajlelong = '3';
//dd($t_lelong);
$t_gadai = $request->t_gadai;
//dd($t_gadai);
if($fasa == '2'){
$surat = Gadai::where('t_matang1','<',$t_lelong)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->get();
}
//dd($surat);
// dd($jbg);
if(sizeof($surat) == 0)
{
return redirect()->route('analisa.janasimulasi')
->with('failed','Tiada surat untuk di lelong');
}
$cawangan = Cawangan::all();
//create simulasi
$simulasi = new Simulasi;
$simulasi->tarikh_lelong = $request->trkh_lelong;
$simulasi->harga_emas_asas = "0.00";
$simulasi->jbg = $jbg;
$simulasi->cajlelong = $cajlelong;
$simulasi->fasa = $fasa;
$simulasi->save();
//create harga asas berdasarkan input harga asas
$karat = JenisKarat::all();
$hargaasas = $request->hargaasas; //rial
foreach($karat as $item)
{
$simkarat = new SimKarat;
$simkarat->simulasi_id = $simulasi->id;
$simkarat->karat = $item->karat;
$simkarat->keterangan = $item->keterangan;
$simkarat->harga = ($hargaasas + ($item->dariharga916)); //gram
$simkarat->harga2 = $hargaasas + ($item->dariharga916); //rial
$simkarat->save();
}
//$fasa = $request->fasa;
// join cawangan yang terlibat dengan simulasi
if($request->caw && $request->caw != 'all')
{
// dd($request->kodcaw);
$caw = Cawangan::whereIn('caw_code',$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 = $cawsimulasi->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $cawsimulasi->lokasi;
$caw_simulasi->fasa = $request->fasa;
$caw_simulasi->save();
// dd($caw_simulasi);
$suratcaw = $surat->where('kodcaw','=',$cawsimulasi->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 = $cawsimulasi->id;
$simulasibid->kodcaw = $data->kodcaw;
$simulasibid->norujukan = $data->norujukan;
$simulasibid->t_lelong = $request->trkh_lelong;
$simulasibid->hargaasas = 0.00;
$simulasibid->hargajual = 0.00;
$simulasibid->jbg = $data->jbg;
$simulasibid->kadarupah = $data->kadarupah;
$simulasibid->upahsimpan = $data->upahSim;
$simulasibid->ansuran = $data->ansuran;
$simulasibid->nilaimarhun = $data->nilaimarhun;
$simulasibid->pinjaman = $data->pinjaman;
$simulasibid->bakiupah = $data->bakiupah;
$simulasibid->cajlain = $data->cajlain;
$simulasibid->cajlelong = 0.00;
$simulasibid->baki = 0.00;
$simulasibid->berat = $data->berat;
$simulasibid->marhun = $data->marhun;
$simulasibid->percent = $data->percentpinj;
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
$simulasibid->save();
$sumhargaasas = 0;
$berat = 0;
$gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
foreach($gadaimarhun as $marhun)
{
$simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
// dd($simkarat);
foreach($simkarat as $karat)
{
if($karat->karat == $marhun->karat)
{
$val = round($marhun->berat * $karat->harga);
$sumhargaasas = $sumhargaasas + $val;
$berat = $berat + $marhun->berat;
$simmarhun = new SimulasiBidMarhun;
$simmarhun->simulasibid_id = $simulasibid->id;
$simmarhun->bil = $marhun->bil;
$simmarhun->marhun = $marhun->marhun;
$simmarhun->nota = $marhun->nota;
$simmarhun->karat = $marhun->karat;
$simmarhun->berat = $marhun->berat;
$simmarhun->harga = $karat->harga;
$simmarhun->n_marhun = $marhun->berat * $karat->harga;
$simmarhun->hargaasas = $val;
$simmarhun->save();
}
}
}
$calcaj = ($request->cajlelong/100)*$sumhargaasas;
$updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first();
$updatesimbid->hargaasas = $sumhargaasas;
$updatesimbid->cajlelong = $calcaj;
$updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
$updatesimbid->berat = $berat;
$updatesimbid->save();
}
}
}
else
{
dd('error');
}
return redirect()->route('analisa.show',$simulasi->id);
}
// public function janasimulasi($t_lelong, )
}
app/Http/Controllers/TangguhLelongController.php
+329
View File
@@ -0,0 +1,329 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Carbon\Carbon;
use App\Models\Gadai;
use App\Models\Cawangan;
use App\Models\Customer;
use App\Models\Lelong;
use App\Models\LelongBid;
use App\Models\LelongBidMarhun;
use App\Models\CawanganLelong;
use App\Models\TangguhLelong;
use App\Models\Pengesahan;
class TangguhLelongController extends Controller
{
//PC
public function senleluntuktangguh()
{
$user = Auth::user();
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
->get()
->toArray();
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
// dd($arrayinfo);
}
return view('tangguhlelong.senarailelongtangguh',compact('lelong', 'arrayinfo'));
}
public function carian($lelong_id)
{
return view('tangguhlelong.carian', compact('lelong_id'));
}
public function searchbyic(Request $request)
{
// dd($request->all());
$user = Auth::user();
if($request->nokp == null)
{
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Sila Masukkan No Kad Pengenalan');
}
else if($request->nokp != null)
{
$lelong = Lelong::where('id', $request->lelong_id)->first();
$getic = Customer::join('gadai', 'customer.kpbaru', '=', 'gadai.nokp')
->where('customer.kpbaru', '=', $request->nokp)
->where('gadai.tempoh', '=', $lelong->jbg)
->get();
foreach($getic as $index1=>$ic)
{
$getnorujukan = LelongBid::where('norujukan', $ic->norujukan)
->where('jbg', $ic->tempoh)
->get();
foreach($getnorujukan as $norujukan)
{
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id)
->where('lelongbid_id', $norujukan->lelongbid_id)
->where('norujukan', $norujukan->norujukan)
->first();
$adapengesahan = Pengesahan::join('lelongbid', 'pengesahan.norujukan', '=', 'lelongbid.norujukan')
->where('pengesahan.norujukan', $norujukan->norujukan)
->where('pengesahan.status_ubah', 6)
->where('pengesahan.lelong_id', $request->lelong_id)
->get();
if($pengesahan)
{
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Pengesahan Tangguh Lelong Telah Dibuat');
}
else
{
//
}
}
$getic[$index1]['user_details'] = $getnorujukan;
$getic[$index1]['sdhadapengesahan'] = $adapengesahan;
}
$lelong_id = $request->lelong_id;
return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id'));
}
}
public function tangguhlelong(Request $request)
{
// dd($request->all());
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$lelbidmarhun = $request->checkboxdata;
// dd($lelbidmarhun);
$lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
foreach($lelbidmarhun as $bidmarhun)
{
$lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.id', $bidmarhun)
->select('lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.old_karat',
'lelongbidmarhun.karat',
'lelongbidmarhun.old_berat',
'lelongbidmarhun.berat',
'lelongbidmarhun.old_harga',
'lelongbidmarhun.harga',
'lelongbidmarhun.old_nmarhun',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.old_hargaasas',
'lelongbidmarhun.hargaasas',
'lelongbid.id as lelongbid_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.hargaasas',
'lelongbid.nopembeli',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlain',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
'lelongbid.marhun',
)
->get()->toArray();
// dd($lelongbidmarhun);
$pengesahan = new Pengesahan();
$pengesahan->lelong_id = $request->lelong_id;
$pengesahan->lelongbid_id = $bidmarhun;
$pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id'];
$pengesahan->norujukan = $lelongbidmarhun[0]['norujukan'];
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status = 2;
$pengesahan->status_ubah = 6;
$pengesahan->save();
$tangguhlelong = new TangguhLelong();
$tangguhlelong->lelong_id = $request->lelong_id;
$tangguhlelong->lelongbid_id = $bidmarhun;
$tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan'];
$tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman'];
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->remark;
$tangguhlelong->save();
}
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya');
}
//Operasi
public function senarailelongtangguh()
{
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
->get()
->toArray();
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
// dd($arrayinfo);
}
return view('tangguhlelong.senleltangguh',compact('lelong', 'arrayinfo'));
}
public function senaraisahtangguh($lelong_id, $caw_code)
{
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$pengesahan = Pengesahan::join('tangguhlelong', 'pengesahan.norujukan', '=', 'tangguhlelong.norujukan')
->where('pengesahan.lelong_id', $lelong_id)
->whereNull('pengesahan.disahkan_oleh')
->whereNull('pengesahan.disahkan_pada')
->whereNull('tangguhlelong.tarikhtangguh')
->get();
foreach($pengesahan as $index1=>$sah)
{
$lelongbid = LelongBid::where('id', $sah->lelongbid_id)
->where('norujukan', $sah->norujukan)
->where('kodcaw', $caw_code)
->get();
$pengesahan[$index1]['bid_details'] = $lelongbid;
$pengesahan[$index1]['nota'] = $sah->nota;
}
return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code'));
}
public function sahkantangguhlel(Request $request)
{
// dd($request->all());
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$lelbidmarhun = $request->checkboxdata;
$lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
foreach($lelbidmarhun as $bidmarhun)
{
// dd($bidmarhun);
$lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.id', $bidmarhun)
->select('lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.old_karat',
'lelongbidmarhun.karat',
'lelongbidmarhun.old_berat',
'lelongbidmarhun.berat',
'lelongbidmarhun.old_harga',
'lelongbidmarhun.harga',
'lelongbidmarhun.old_nmarhun',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.old_hargaasas',
'lelongbidmarhun.hargaasas',
'lelongbid.id as lelongbid_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.hargaasas',
'lelongbid.nopembeli',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlain',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
'lelongbid.marhun',
)
->get()->toArray();
// dd($lelongbidmarhun);
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $lelongbidmarhun[0]['lelongbidmarhun_id'])
->where('lelongbid_id', $lelongbidmarhun[0]['lelongbid_id'])
->where('norujukan', $lelongbidmarhun[0]['norujukan'])
->first();
$pengesahan->disahkan_oleh = $user->id;
$pengesahan->disahkan_pada = $currentdate;
$pengesahan->save();
$tangguhlelong = TangguhLelong::where('lelong_id', $request->lelong_id)
->where('lelongbid_id', $bidmarhun)
->where('norujukan', $lelongbidmarhun[0]['norujukan'])
->first();
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->save();
$biddelete = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id')
->where('lelongbid.id', $tangguhlelong->lelongbid_id)
->where('lelongbid.norujukan', $tangguhlelong->norujukan)
->where('lelongbid.lelong_id', $request->lelong_id)
->delete();
$caw_code = $request->kodcaw;
}
return redirect()->route('pengesahan.senaraisahtangguh', [$request->lelong_id, $caw_code])->with('success','Pengesahan Berjaya');
}
}