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

Merge branch 'main' into afiqhamzah-feat-add-capture-marhun-picture

Browse Source
This commit is contained in:
afiq.hamzah
2022-11-29 16:48:07 +08:00
parent 412c77ae9c 3f3e41c3ba
commit 8e3bedca3f
34 changed files with 1073 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/DatabaseController.php
+3 -3
View File
@@ -44,12 +44,12 @@ class DatabaseController extends Controller
$roles_harian_penilai = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/KB2', [
'role_harian' => 'penilai',
])->json();
// $customer_details = Http::withOptions(['verify' => config('app.api_verify')])
// ->get('https://api.arrahn.com.my/api/customers/960403065465')->json();
$customer_details = Http::withOptions(['verify' => config('app.api_verify')])
->get('http://api.arrahn.com.my/api/customers/960403065465')->json();
// dd($gadai, $transaksi_keuntungan, $roles_harian_penilai, $customer_details);
return view('pengurusandatabase.senaraidb',compact('caw', 'gadai', 'transaksi_keuntungan', 'roles_harian_penilai'));
return view('pengurusandatabase.senaraidb',compact('caw', 'gadai', 'transaksi_keuntungan', 'roles_harian_penilai', 'customer_details'));
}
public function showConn($id)
app/Http/Controllers/LelongController.php
+49 -41
View File
@@ -2588,7 +2588,7 @@ class LelongController extends Controller
$tarikhlelongbaru = $request->tarikhlelongbaru;
// dd($tarikhlelongbaru);
$lelongidasal = $request->lelongidasal;
$lelongidbaru = $request->lelongidbaru;
// $lelongidbaru = $request->lelongidbaru;
// dd($request->caw);
$lelkarat = LelKarat::where('lelong_id','=',$lelongidasal)->get();
@@ -2601,26 +2601,26 @@ class LelongController extends Controller
// dd($cawanganasal);
// dd( $lelongidbaru);
$lelongnew = new Lelong();
$lelongnew->tarikh_lelong = $tarikhlelongbaru;
$lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas;
$lelongnew->jbg = $lelongasal->jbg;
$lelongnew->cajlelong = $lelongasal->cajlelong;
$lelongnew->fasa = $lelongasal->fasa;
$lelongnew->kali = $lelongasal->kali;
$lelongnew->save();
// $lelongnew = new Lelong();
// $lelongnew->tarikh_lelong = $tarikhlelongbaru;
// $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas;
// $lelongnew->jbg = $lelongasal->jbg;
// $lelongnew->cajlelong = $lelongasal->cajlelong;
// $lelongnew->fasa = $lelongasal->fasa;
// $lelongnew->kali = $lelongasal->kali;
// $lelongnew->save();
foreach($lelkarat as $lelongKarat)
{
$lelkarat = new LelKarat;
$lelkarat->lelong_id = $lelongnew->id;
$lelkarat->karat = $lelongKarat->karat;
$lelkarat->keterangan = $lelongKarat->keterangan;
$lelkarat->harga = $lelongKarat->harga;
$lelkarat->harga2 = $lelongKarat->harga2;
$lelkarat->save();
}
// foreach($lelkarat as $lelongKarat)
// {
// $lelkarat = new LelKarat;
// $lelkarat->lelong_id = $lelongnew->id;
// $lelkarat->karat = $lelongKarat->karat;
// $lelkarat->keterangan = $lelongKarat->keterangan;
// $lelkarat->harga = $lelongKarat->harga;
// $lelkarat->harga2 = $lelongKarat->harga2;
// $lelkarat->save();
// }
//tukartarikh ID lelong
@@ -2635,10 +2635,8 @@ class LelongController extends Controller
// dd($cawtukartarikh->caw_id);
$caw_tukartarikh = CawanganLelong::where('caw_id', $cawtukartarikh->id)
->where('lelong_id', $request->lelongidasal)->first();
// dd($caw_tukartarikh);
$caw_tukartarikh->lelong_id = $request->lelongidbaru;
$caw_tukartarikh = Lelong::where('id', $request->lelongidasal)->first();
$caw_tukartarikh->tarikh_lelong = $tarikhlelongbaru;
$caw_tukartarikh->update();
$surat = LelongBid::where('lelong_id','=',$lelongidasal)
@@ -2654,7 +2652,6 @@ class LelongController extends Controller
{
// dd($request->lelongidbaru);
$caw_pindahsag = LelongBid::where('norujukan', $data->norujukan)->first();
$caw_pindahsag->lelong_id = $request->lelongidbaru;
$caw_pindahsag->t_lelong = $tarikhlelongbaru;
$caw_pindahsag->update();
}
@@ -4779,6 +4776,7 @@ class LelongController extends Controller
$total_bakiupah = 0;
$total_nilaimarhun = 0;
$keuntungan = 0;
$total_cazlelong = 0;
$marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
@@ -4804,6 +4802,9 @@ class LelongController extends Controller
->get()->toArray();
// dd($marhuns);
$arraymarhun = [];
$cajlelong = 0;
$rugilelong = 0;
$bakilelong = 0;
foreach ($marhuns as $index1=> $cal) {
// dd($cal);
$gadai = Gadai::on($cal['kodcaw'])
@@ -4814,10 +4815,13 @@ class LelongController extends Controller
->orWhere('kplama','=',$gadai['nokp'])
->first();
// dd($customer);
// $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
$lelonglel = Lelong::where('id','=',$lelongid)->first();
$sumcajlelong = $cal['hargaasas'] * ($lelonglel->cajlelong/100);
$cajlelongnew = round($sumcajlelong,1,1);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
$marhuns[$index1]['cajlelong'] = $cajlelongnew;
$marhuns[$index1]['baki'] = $totalbaki;
$marhuns[$index1]['keuntungan'] = $keuntungan;
$marhuns[$index1]['nama'] = $customer;
array_push($arraymarhun,[
'norujukan' => $cal['norujukan'],
@@ -4831,8 +4835,8 @@ class LelongController extends Controller
'pinjaman' => $cal['pinjaman'],
'pinjasal' => $gadai['pinjaman'],
'bakiupah' => $cal['bakiupah'],
'cajlelong' => $cal['cajlelong'],
'baki' => $cal['baki'],
'cajlelong' => $cajlelongnew,
'baki' => $totalbaki,
'upah6bulan' => $gadai['bakiupah']
]);
// $total_marhun = $total_marhun + sizeof($databid);
@@ -4841,6 +4845,7 @@ class LelongController extends Controller
$total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cazlelong += $cajlelongnew;
}
$arrayinfo = [];
@@ -4861,12 +4866,14 @@ class LelongController extends Controller
->toArray();
array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.senaraimarhunpc',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
return view('lelong.senaraimarhunpc',compact('totalbaki','arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
'total_pinjaman',
'total_upah',
'total_hargaasas',
'total_bakiupah',
'total_nilaimarhun'));
'total_nilaimarhun',
'total_cazlelong',
));
}
public function showlelongpc(Request $request, $id)
@@ -4935,20 +4942,21 @@ class LelongController extends Controller
$pinjaman =$pinjaman + $bid['pinjaman'];
$bakiupah = $bakiupah + $bid['bakiupah'];
$hargaasas = $hargaasas + $bid['hargaasas'];
$cajlelong = $cajlelong + $bid['cajlelong'];
// $cajlelong = $cajlelong + $bid['cajlelong'];
$lelongsim = Lelong::where('id',$id)->get();
$sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
$cajlelongnew = round($sumcajlelong, 1, 1);
// $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
$cajlelong = $cajlelong + $cajlelongnew;
$totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew;
if($totalbaki > 0)
{
$bakilelong = $bakilelong + $totalbaki;
}
else
{
$rugilelong = $rugilelong - $totalbaki;
if (strpos($totalbaki, '-') !== false) {
$rugi = -$totalbaki;
$rugilelong += $rugi;
} else {
$baki = $totalbaki;
$bakilelong += $baki;
}
app/Http/Controllers/MarhunController.php
+151 -3
View File
@@ -2045,15 +2045,33 @@ class MarhunController extends Controller
->select('lelong_id', 'tarikh_lelong', 'cawangan_lelong.masatamat_lelong', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong')
->get()
->toArray();
if($lelong){
foreach ($lelong as $info) {
$lelong_id = $info['lelong_id'];
// dd( $lelong_id );
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.kodcaw',$user->kodcaw)
// ->where('lelongbid.lelong_id', $info->lelong_id)
->select('lelongbidder.user_id')
->groupBy('lelongbidder.user_id')
->get()->toArray();
foreach($listwinner as $index1=>$winner){
$userdetails = User::where('id', $winner['user_id'])->first();
$listwinner[$index1]['details'] = $userdetails;
}
}
$detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('lelong_id', $info['lelong_id'])
->where('cawangan.caw_code', $user->kodcaw)
->get()
->toArray();
array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]);
}
array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
}
return view('marhun.senarailelongscanjual', compact('lelong', 'arrayinfo'));
}
@@ -2369,6 +2387,136 @@ class MarhunController extends Controller
return $pdf->download('Senarai Marhun Pembida.pdf');
}
public function scanbarcodejualbycust($lelong_id,$userid)
{
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
->where('status_payment', '=', '1')
->where('nopembeli', '=', $userid)
->where('caw_id', '=', $caw->id)
->select('id')
->get()
->keyBy('id');
foreach ($lelongbid as $index => $value) {
$namabidder = LelongBidder::
where('lelongbid_id', '=', $value['id'])
// ->where('lelongbid.kodcaw', '=', $user->kodcaw)
->where('lelongbidder.status_bidder','=','1')
->where('user_id', '=', $userid)
->select('lelongbidder.lelongbid_id','lelongbidder.nama_bidder')
->get();
// dump($namabidder);
foreach ($namabidder as $namabid) {
$userdetails = User::where('id', $userid)->first();
// dd($userdetails);
}
$lelongbid[$index]['nama_bidder'] = $namabidder;
$lelongbid[$index]['namabid'] = $userdetails;
}
// dd($namabidder);
$senaraiScanKeluar = ScanSemak::join('lelongbidder', 'lelongbidder.lelongbid_id', '=', 'scan_semak.lelongbid_id')
->where('scan_semak.lelong_id', '=', $lelong_id)
->where('lelongbidder.status_bidder', '=', 1)
->where('scan_semak.kodcaw', '=', $caw->caw_code)
->where('lelongbidder.user_id', '=', $userid)
->where('scan_semak.serahkpdpembida', '=', '1')
// ->whereNull('scan_masuk')
->get();
$pluckLelongBid = $lelongbid->pluck('id')->toArray();
$pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray();
$diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar);
$new_lelong_bid = LelongBid::with('scanSemakSelesaiJual')
->whereIn('id', $diff_lelong_bid)
// ->whereIn('nopembeli', $userid)
->get();
// dd($new_lelong_bid);
return view('marhun.scanbarcodejualbycust', compact('userid','userdetails','namabidder','new_lelong_bid','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
}
public function scanKeluarMarhunjualbycust(Request $request)
{
$user = Auth::user();
$current = Carbon::now();
$checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode)
->where('serahkpdpembida', '=', '1')
->get();
if ($checkExisting->isEmpty()) {
$lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first();
$scanKeluar = new ScanSemak();
$scanKeluar->kodcaw = $lelongbidItem['kodcaw'];
$scanKeluar->lelong_id = $lelongbidItem['lelong_id'];
$scanKeluar->lelongbid_id = $lelongbidItem['id'];
$scanKeluar->norujukan = $lelongbidItem['norujukan'];
$scanKeluar->khazanah_id = $user['id'];
$scanKeluar->scan_keluar = $current->toDateTimeString();
$scanKeluar->serahkpdpembida = 1;
$scanKeluar->save();
$scanJualKeluar = new ScanJual();
$scanJualKeluar->kodcaw = $lelongbidItem['kodcaw'];
$scanJualKeluar->lelong_id = $lelongbidItem['lelong_id'];
$scanJualKeluar->lelongbid_id = $lelongbidItem['id'];
$scanJualKeluar->norujukan = $lelongbidItem['norujukan'];
$scanJualKeluar->khazanah_id = $user['id'];
$scanJualKeluar->scan_keluar = $current->toDateTimeString();
$scanJualKeluar->serah_marhun = $current->toDateTimeString();
$scanJualKeluar->serahkpdpembida = 1;
$scanJualKeluar->save();
return redirect()
->route('marhun.scanbarcodejualbycust', ['lelong_id'=>$request->lelong_id,'userid'=>$request->userid])
->with('success', 'Marhun Berjaya Di Scan Keluar Serahan Kepada Pembida.');
} else {
return redirect()
->route('marhun.scanbarcodejualbycust', ['lelong_id'=>$request->lelong_id,'userid'=>$request->userid])
->with('failed', 'Maaf,Marhun Telah Serah Kepada Pembida.');
}
}
public function cetakkeluarscanbarcodejualbycust($lelong_id,$userid)
{
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
->where('status_payment', '=', '1')
->where('caw_id', '=', $caw->id)
->get();
$userdetails = User::where('id', $userid)->first();
// $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
// ->where('kodcaw', '=', $caw->caw_code)
// ->where('serahkpdpembida', '=', '1')
// ->orderBy('id', 'desc')
// ->get();
$senaraiScanKeluar = ScanSemak::join('lelongbidder', 'lelongbidder.lelongbid_id', '=', 'scan_semak.lelongbid_id')
->where('scan_semak.lelong_id', '=', $lelong_id)
->where('lelongbidder.status_bidder', '=', 1)
->where('scan_semak.kodcaw', '=', $caw->caw_code)
->where('lelongbidder.user_id', '=', $userid)
->where('scan_semak.serahkpdpembida', '=', '1')
// ->whereNull('scan_masuk')
->get();
// dd($senaraiScanKeluar);
// return view('pdf.cetakkeluarscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw'));
$pdf = PDF::loadView('pdf.cetakkeluarscanbarcodejualbycust', compact('caw', 'lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar','userdetails'))->setPaper('a4', 'potrait');
return $pdf->download('Senarai SAG Telah Serah Kepada Pembida.pdf');
}
}
app/Http/Controllers/ReportCawanganController.php
+2 -1
View File
@@ -252,6 +252,7 @@ class ReportCawanganController extends Controller
$laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
->select('lelongbid_id','norujukan','hargaasas')
->where('lelongbid.lelong_id','=',$lelong_id)
->where('lelongbid.kodcaw','=',$user['kodcaw'])
->groupBy('lelongbid_id')
->get()
->toArray();
@@ -350,7 +351,7 @@ class ReportCawanganController extends Controller
$pdf = PDF::loadView('pdf.laporanlelfullcaw',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw'))
->setPaper('a4', 'potrait');
->setPaper('a4', 'landscape');
return $pdf->download('Laporan Lelong Keseluruhan.pdf');
app/Http/Controllers/TangguhLelongController.php
+17 -13
View File
@@ -286,10 +286,10 @@ class TangguhLelongController extends Controller
->where('lelong.sts_lelong',0)
->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
->distinct()
->get()
->toArray();
->get();
// ->toArray();
foreach($tangguh as $t)
foreach($tangguh as $index=>$t)
{
$sag = TangguhLelong::where('lelong_id', $t['lelong_id'])
->where('kodcaw', $t['caw_code'])
@@ -298,12 +298,13 @@ class TangguhLelongController extends Controller
->get()
->count();
$tangguh[$index]['bilsag'] = $sag;
array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]);
}
return view('tangguhlelong.senleltangguh',compact('tangguh','sag'));
return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo'));
}
@@ -726,6 +727,7 @@ class TangguhLelongController extends Controller
$tangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw)
->get();
// dd($tangguh);
foreach($tangguh as $index1=>$t)
{
@@ -963,17 +965,19 @@ class TangguhLelongController extends Controller
->where('kodcaw','=',$caw_code)
->get();
// dd($pengesahan);
// dd($tangguh);
if($tangguh){
foreach($tangguh as $index1=>$sah)
{
$lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->where('lelong.id', $sah->lelong_id)
->get();
// dd($lelongbid);
foreach($tangguh as $index1=>$sah)
{
$lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->where('lelong.id', $sah->lelong_id)
->get();
// dd($lelongbid);
$tangguh[$index1]['bid_details'] = $lelongbid;
$tangguh[$index1]['bid_details'] = $lelongbid;
$tangguh[$index1]['status'] = $sah['status'];
}
}
// $filter_null = function($x){
app/Mail/ResetPassword.php
+2 -2
View File
@@ -36,8 +36,8 @@ class ResetPassword extends Mailable
$user['name'] = $this->name;
$user['token'] = $this->token;
return $this->from("masterlelongpkb@gmail.com", "Admin Lelong")
->subject('Sistem Lelong Online PKB-Tukar Katalaluan')
return $this->from("masterlelongpkb@gmail.com", "Admin ArrahnBid")
->subject('ArrahnBid -Tukar Katalaluan')
->view('template.reset-password', ['user' => $user]);
}
}