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

Merge branch 'main' into amir_dev

Browse Source
This commit is contained in:
Amir
2022-08-07 09:00:06 +08:00
parent 738c3361bb aa281710af
commit 4b22b3ab2d
25 changed files with 9862 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/HomeController.php
+26 -1
View File
@@ -12,6 +12,8 @@ use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\Pengesahan;
use Carbon\Carbon;
use App\Models\Cawangan;
use App\Models\LelongBid;
class HomeController extends Controller
{
@@ -34,6 +36,11 @@ class HomeController extends Controller
{
// $user = Auth::user();
// $user->assignRole('admin');
$user = Auth::user();
$caw = Cawangan::where('caw_code','=',$user->kodcaw)->first();
$dateTime = date('Y-m-d');
$arrayinfo = [];
@@ -69,6 +76,8 @@ class HomeController extends Controller
->get()
->toArray();
// dd($lelong);
foreach($lelongmutu as $infomutu)
{
@@ -79,7 +88,23 @@ class HomeController extends Controller
array_push($arrayinfomutu,['info'=>$infomutu, 'detailsinfo'=>$detailsinfo]);
}
return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo'));
if($caw <> NULL) {
$sag = LelongBid::where('status_semak', 0) //belum disemak
->where('kodcaw', $caw['caw_code'])
->get();
//dd($sag);
}
else {
$sag = LelongBid::where('status_semak', 0) //belum disemak
->get();
}
return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag'));
}
public function about()
app/Http/Controllers/LelongController.php
+21 -37
View File
@@ -961,13 +961,8 @@ class LelongController extends Controller
}
public function senaraimarhun($lelongid, $cawid){
// $marhun = LelongBid::->get();
$keuntungan = 0;
$marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
// ->join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
->select(
'lelongbid.t_lelong',
@@ -986,16 +981,6 @@ class LelongController extends Controller
'lelongbid.bakiupah',
'lelongbid.status_jual',
'lelongbid.jbg'
// 'gadai.pinjaman as pinjasal',
// 'gadai.bakipjm',
// 'gadai.bakihargajualan',
// 'gadai.upah12',
// 'gadai.ansakhir',
// 'gadai.tempoh',
// 'gadai.tempohbayar',
// 'gadai.kadarupah',
// 'gadai.nokp',
// 'gadai.bakiupah as upah6bulan'
)
->get()->toArray();
// dd($marhuns);
@@ -1648,6 +1633,8 @@ class LelongController extends Controller
array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=> $detailsinfo]);
}
// dd($arrayinfo);
// $lelong = Lelong::where('sts_lelong', 3)
// ->get()->toArray();
@@ -2001,8 +1988,7 @@ class LelongController extends Controller
foreach($cawanganlel as $cawlel)
{
$cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
$databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
$databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong')
->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
// dd($databid->toArray());
@@ -2162,8 +2148,7 @@ class LelongController extends Controller
foreach($cawanganlel as $cawlel)
{
$cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
$databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
$databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong')
->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
// dd($databid->toArray());
@@ -2322,7 +2307,7 @@ class LelongController extends Controller
$marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->join('gadai','lelongbid.norujukan','=','gadai.norujukan')
// ->join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
->select(
'lelongbid.t_lelong',
@@ -2338,28 +2323,28 @@ class LelongController extends Controller
'lelongbid.baki',
'lelongbid.bakiupah',
'lelongbid.status_jual',
'lelongbid.jbg',
'gadai.bakipjm',
'gadai.bakihargajualan',
'gadai.upah12',
'gadai.ansakhir',
'gadai.tempoh',
'gadai.tempohbayar',
'gadai.kadarupah'
'lelongbid.jbg'
// 'gadai.bakipjm',
// 'gadai.bakihargajualan',
// 'gadai.upah12',
// 'gadai.ansakhir',
// 'gadai.tempoh',
// 'gadai.tempohbayar',
// 'gadai.kadarupah'
)
->get()->toArray();
foreach ($marhuns as $index1=> $cal) {
$keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
$marhuns[$index1]['keuntungan'] = bcdiv($keuntungan,1,1);
// $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
// $marhuns[$index1]['keuntungan'] = bcdiv($keuntungan,1,1);
$simulasilel = Lelong::where('id',$lelongid)->get();
$sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
// $simulasilel = Lelong::where('id',$lelongid)->get();
// $sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
// $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['baki'] = $totalbaki;
// $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1);
// $marhuns[$index1]['baki'] = $totalbaki;
}
$arrayinfo = [];
@@ -2453,8 +2438,7 @@ class LelongController extends Controller
foreach($cawanganlel as $cawlel)
{
$cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
$databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
$databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong')
->where('caw_id','=',$cawlel->caw_id)
->where('status_jual','=',0)
->where('lelong_id','=',$id)->get();
app/Http/Controllers/NotisController.php
+5 -5
View File
@@ -257,8 +257,8 @@ class NotisController extends Controller
Public function kemaskininotis(Request $request){
$tetapan = Tetapan::where('id','=',1)->first();
// dd($tetapan);
$tetapan = Tetapan::where('id','=',1)->get();
return view('jananotis.kemaskininotis',compact('tetapan'));
@@ -294,8 +294,9 @@ class NotisController extends Controller
// dd($request->all());
$tetapan = Tetapan::find(1);
$tetapan->para2 = $request->para2;
$tetapan->para2caw = $request->para2;
$tetapan->update();
$cawangan = Cawangan::all();
@@ -305,8 +306,7 @@ class NotisController extends Controller
$update = Cawangan::where('id', $updatecaw['id'])
->where('caw_code', $request->kodcaw)
->update(['para2'=>$request->para2]);
// $update->para2 = $request->para2;
// $update->update();
}
app/Http/Controllers/ReportController.php
+80
View File
@@ -31,6 +31,8 @@ use App\Models\LelKarat;
use App\Models\LelKarat_temp;
use App\Models\Resit;
use App\Models\Customer;
use App\Models\LelongTebus;
use Carbon\Carbon;
@@ -503,6 +505,84 @@ class ReportController extends Controller
}
Public function lelongtebusindex (){
$arraydetails = [];
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('lelong_tebus','lelong.id','=','lelong_tebus.batch_no')
->select('lelong.id','lelong_id','tarikh_lelong','lelong.fasa','lelong_tebus.batch_no')
->distinct()
->orderBy('batch_no')
->get()
->toArray();
// dd($lelongid);
foreach($lelongid as $laporan){
$details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['id'])
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
array_push($arraydetails, ['laporan' =>$laporan,'details' =>$details]);
}
return view ('lelong.lelongtebusindex',compact('lelongid','arraydetails'));
}
Public function lelongtebus ($lelong_id, $kodcaw){
$total_berat = 0;
$total_hargaasas = 0;
$total_hargalelong = 0;
$arrayinfocaw = [];
$info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan.caw_code',$kodcaw)
->where('cawangan_lelong.lelong_id','=',$lelong_id)
->select('lelong_id','tarikh_lelong','lelong.fasa')
->groupBy('lelong_id')
->get();
foreach($info as $laporancaw)
{
$cawangan = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan.caw_code',$kodcaw)
->where('lelong_id',$laporancaw['lelong_id'])
->get()
->toArray();
array_push($arrayinfocaw,['laporancaw' => $laporancaw,'cawangan' => $cawangan]);
}
// dd($arrayinfocaw);
$laporantebus = LelongTebus::where('kodcaw',$kodcaw)
->get()->toArray();
// dd($laporantebus);
// foreach( $brglelpembida as $index1=>$totalbrglelpembida){
// $total_berat = $total_berat + $totalbrglelpembida['berat'];
// $total_hargaasas = $total_hargaasas + $totalbrglelpembida['hargaasas'];
// $total_hargalelong = $total_hargalelong + $totalbrglelpembida['hargabida'];
// }
$pdf = PDF::loadView('pdf.pdflelongtebus',compact('lelong_id','info','laporantebus','total_berat','total_hargaasas','total_hargalelong','arrayinfocaw'))
->setPaper('a4','potrait');
return $pdf->download('Laporan Barang Lelong Pembida.pdf');
}
Public function simulasireport ($simulasi_id, $cawid){
$keuntungan = 0;
app/Http/Controllers/TamatKontController.php
+31 -7
View File
@@ -44,7 +44,14 @@ class TamatKontController extends Controller
$t_lelong = $request->tarikh_lelong;
$user = Auth::user();
$getsurat = Gadai::where('t_matang1', '<', $t_lelong)
// $cawangan = Cawangan::where('caw_code', $user->kodcaw)
// ->get();
// dd($cawangan);
$getsurat = Gadai::on($user->kodcaw)
->where('t_matang1', '<', $t_lelong)
->where('kodcaw', $user->kodcaw)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
@@ -53,11 +60,14 @@ class TamatKontController extends Controller
->whereNotNull('upah12')
->get();
// dd($getsurat);
if(sizeof($getsurat) != 0)
{
$t_gadais = Gadai::where('t_matang1', '<', $t_lelong)
$t_gadais = Gadai::on($user->kodcaw)
->where('t_matang1', '<', $t_lelong)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
@@ -66,8 +76,13 @@ class TamatKontController extends Controller
->orderBy('t_gadai')
->select('t_gadai')
->first();
$bil_lelongcaw = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
$cawangan_all = Cawangan::where('caw_code', $user->kodcaw)->get();
foreach($cawangan_all as $cawangan){
$bil_lelongcaw = Gadai::on($cawangan->caw_code)
// join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('gadai.t_matang1', '<', $t_lelong)
->where('kodcaw', $user->kodcaw)
->where('gadai.sttebus', '=', '')
@@ -77,7 +92,8 @@ class TamatKontController extends Controller
->whereNotNull('gadai.upah12')
->selectRaw('count(*) as bil_lelong')
->get()->toArray();
}
// dd($bil_lelongcaw);
$tarikh_lelong = Carbon::parse($t_lelong);
$t_anggaran = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
@@ -86,12 +102,19 @@ class TamatKontController extends Controller
foreach($getsurat as $index1=>$surats)
{
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
$senarai = Gadai::on($user->kodcaw)
// join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('norujukan', $surats['norujukan'])
->get();
$ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan'];
$getsurat[$index1]['list_norujukan'] = $senarai;
$getsurat[$index1]['ktlhbyr'] = $ktlhbyr;
}
// dd($getsurat);
// $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
// ->sum('bayaran_keuntungan');
@@ -101,7 +124,8 @@ class TamatKontController extends Controller
'user',
't_gadais',
't_anggaran',
'bil_lelongcaw'
'bil_lelongcaw',
'ktlhbyr'
));
}
else if(sizeof($getsurat) == 0)