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

fix skit2

Browse Source
This commit is contained in:
fifi97
2022-03-06 11:06:07 +08:00
parent 28f601252c
commit 6ac338a38a
3 changed files with 359 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+101 -31
View File
@@ -1029,7 +1029,7 @@ class AdminPageController extends Controller
break;
case 2: $bulan = 'Februari';
break;
case 3: $bulan = 'March';
case 3: $bulan = 'Mac';
break;
case 4: $bulan = 'April';
break;
@@ -1122,7 +1122,7 @@ class AdminPageController extends Controller
break;
case 2: $bulan = 'Februari';
break;
case 3: $bulan = 'March';
case 3: $bulan = 'Mac';
break;
case 4: $bulan = 'April';
break;
@@ -1214,14 +1214,48 @@ class AdminPageController extends Controller
->orderBy('t_tebus','asc')
->sum('bakiupah');
$upahlatest = $lelongupahsimpan + $tebus;
$advansur = Advansur::on($cawangan['mysql'])
->selectRaw('SUM(upahDibayar) AS total')
->whereYear('tarikh',$current->year)
->where([['tarikh','<=',$harini],['tarikh','>=',$monthly_date]])
->sum('upahDibayar');
$ansuran = Transaction::on('mysql7')
->selectRaw('SUM(trans.bayaran_keuntungan) AS total')
->whereYear('transaction.created_at',$current->year)
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->where('transaction.trans_type','=','A')
->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini. ' 23:59:59']])
->where('trans.kodcaw','=',$request->kodcaw)
->sum('trans.bayaran_keuntungan');
$tebus_upah_tawarruq = Transaction::on('mysql7')
->selectRaw('SUM(trans.keuntungan_rebet) AS total')
->whereYear('transaction.created_at',$current->year)
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->where('transaction.trans_type','!=','A')
->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']])
->where('trans.kodcaw','=',$request->kodcaw)
->sum('trans.keuntungan_rebet');
$upahlatest = $lelongupahsimpan + $tebus + $ansuran + $advansur + $tebus_upah_tawarruq;
switch($current->month){
case 1: $bulan = 'Januari';
break;
case 2: $bulan = 'Februari';
break;
case 3: $bulan = 'March';
case 3: $bulan = 'Mac';
break;
case 4: $bulan = 'April';
break;
@@ -1686,7 +1720,7 @@ class AdminPageController extends Controller
return response()->json($arraykelulusan,200);
}
public function showOneCustomerGadai($ic,$status){
public function showOneCustomerGadai($ic,$status,Request $request){
if($status == 'belum_tebus'){
$gadai_status = '';
}elseif($status == 'sudah_tebus'){
@@ -1697,37 +1731,73 @@ class AdminPageController extends Controller
$cawangan_all = Cawangan::on('mysql7')->get();
$gadai_all = [];
foreach($cawangan_all as $index=>$cawangan){
if($status == 'belum_tebus' || $status == 'sudah_tebus'){
if($status == 'sudah_tebus')
{
$gadai = Gadai::on($cawangan['mysql'])
->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
->where([['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
->orderBy('tebus.t_tebus','desc')
if(isset($request->search))
{
foreach($cawangan_all as $index=>$cawangan){
if($status == 'belum_tebus' || $status == 'sudah_tebus'){
if($status == 'sudah_tebus')
{
$gadai = Gadai::on($cawangan['mysql'])
->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
->where([['gadai.norujukan','LIKE',"%{$request->search}%"],['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
->orderBy('tebus.t_tebus','desc')
->get()->toArray();
}else{
$gadai = Gadai::on($cawangan['mysql'])
->where([['norujukan','LIKE',"%{$request->search}%"],['sttebus','=',$gadai_status],['nokp','=',$ic]])
->orderBy('t_gadai','desc')
->get()->toArray();
}
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}elseif($status == 'lelong'){
$gadai = Gadai::on($cawangan['mysql'])
->where([['norujukan','LIKE',"%{$request->search}%"],['sttebus','=',$gadai_status],['nokp','=',$ic]])
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->get()->toArray();
}else{
$gadai = Gadai::on($cawangan['mysql'])
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}
}
}else{
foreach($cawangan_all as $index=>$cawangan){
if($status == 'belum_tebus' || $status == 'sudah_tebus'){
if($status == 'sudah_tebus')
{
$gadai = Gadai::on($cawangan['mysql'])
->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
->where([['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
->orderBy('tebus.t_tebus','desc')
->get()->toArray();
}else{
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
->orderBy('t_gadai','desc')
->get()->toArray();
}
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}elseif($status == 'lelong'){
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
->orderBy('t_gadai','desc')
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->get()->toArray();
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}
}
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}elseif($status == 'lelong'){
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->get()->toArray();
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}
}
$data = $this->paginate($gadai_all);
return response()->json($data);
app/Http/Controllers/LaporanController.php
+258 -5
View File
@@ -766,12 +766,15 @@ class LaporanController extends Controller
$tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]);
$ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]);
$bayaranonlinequery = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where('teller','=','Online')->where('kodcaw',$request->kodcaw);
$bayaranonline = $bayaranonlinequery->sum('duit_masuk');
$bilbayaranonline = $bayaranonlinequery->count();
//a
$total_gadai = $gadai->sum('pinjaman');
$total_tebus = $tebus->sum('pinjaman');
$total_ansuran = $ansuran->sum('duit_masuk');
// $total_ansuran = $ansuran->sum('duit_masuk');
// $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan');
$total_upah = Advansur::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->sum('upahdibayar');
$total_keuntungantebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]])->sum('bakiupah');
@@ -797,7 +800,7 @@ class LaporanController extends Controller
//b
$bilangan_gadai = $gadai->count();
$bilangan_tebus = $tebus->count();
$bilangan_ansuran = $ansuran->count();
// $bilangan_ansuran = $ansuran->count();
$bilangan_customer_baru = Customer::on($cawangan['mysql'])->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->akhir]])->count();
//f
@@ -847,13 +850,255 @@ class LaporanController extends Controller
$total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80);
//pendahuluan dan serahan
$serahanpkb = '1000/020';
$serahanjmc = '1000/026';
$pendahuluanpkb = '7000/102';
$pendahuluanjmc = '7000/106';
$serahankoperasi = '1000/090';
$totalserahan = GlDetail::on($cawangan['mysql'])
->where('ktacct','=',$serahanpkb)
->where('descpt','not like', 'SERAHAN BAYAR ONLINE%')
->where('tarikh','>=', $request->mula)
->where('tarikh','<=', $request->akhir)
->where('tarikh','>','2021-03-24')
->sum('serahan');
$serahanbayaranOnline = GlDetail::on($cawangan['mysql'])
->where('ktacct','=',$serahanpkb)
->where('descpt','like', 'SERAHAN BAYAR ONLINE%')
->where('tarikh','>=', $request->mula)
->where('tarikh','<=', $request->akhir)
->where('tarikh','>','2021-03-24')
->sum('serahan');
$totalpendahuluan = GlDetail::on($cawangan['mysql'])
->where('ktacct','=',$pendahuluanpkb)
->where([['tarikh','<=', $request->mula],['tarikh','<=', $request->akhir],['tarikh','>','2021-03-24']])
->sum('pendahuluan');
$belanjaam = Panjar::on($cawangan['mysql'])->where('tag','=', 1)->where('tarikh','>=', $request->mula)->where('tarikh','<=', $request->akhir)->sum('bayaran');
$baikidanselenggara = Panjar::on($cawangan['mysql'])->where('tag','=', 2)->where('tarikh','>=', $request->mula)->where('tarikh','<=', $request->akhir)->sum('bayaran');
$keraian = Panjar::on($cawangan['mysql'])->where('tag','=', 3)->where('tarikh','>=', $request->mula)->where('tarikh','<=', $request->akhir)->sum('bayaran');
//Ansuran
$ansurankaunter = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) >= ?',[$request->mula])
->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) <= ?',[$request->akhir])
->where([['trans.trans_type','=','A'],['teller','<>','Online'],['trans.kodcaw','=',$request->kodcaw]]);
$ansuranonline = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) >= ?',[$request->mula])
->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) <= ?',[$request->akhir])
->where([['trans.trans_type','=','A'],['teller','=','Online'],['trans.kodcaw','=',$request->kodcaw]]);
$total_ansuran = $ansurankaunter->sum('transaksi_keuntungan.bayaran_pembiayaan');
$total_ansuranonline = $ansuranonline->sum('transaksi_keuntungan.bayaran_pembiayaan');
$total_upah = Advansur::on($cawangan['mysql'])
->where([['tarikh','>=', $request->mula],['tarikh','<=', $request->akhir]])
->sum('upahdibayar');
$total_keuntungantebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]])->sum('bakiupah');
$total_keuntunganansuran_data_kaunter = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereDate('trans.created_at','>=',$request->mula)
->whereDate('trans.created_at','<=',$request->akhir)
->where('trans.teller','<>','Online')
->where('trans.trans_type','=','A')
->where('trans.kodcaw',$request->kodcaw)
->pluck('transaksi_keuntungan.norujukan');
$gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiDataKaunter)
->whereDate('tarikh_bayaran','>=',$request->mula)
->whereDate('tarikh_bayaran','<=',$request->akhir);
$total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan');
$bil_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->count();
$total_keuntunganansuran_data_online = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereDate('trans.created_at','>=',$request->mula)
->whereDate('trans.created_at','<=',$request->akhir)
->where('trans.teller','=','Online')
->where('trans.trans_type','=','A')
->where('trans.kodcaw',$request->kodcaw)
->pluck('transaksi_keuntungan.norujukan');
$gadaiDataOnline = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntunganansuran_online_query = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiDataOnline)
->whereDate('tarikh_bayaran','>=',$request->mula)
->whereDate('tarikh_bayaran','<=',$request->akhir);
$total_keuntunganansuran_online = $keuntunganansuran_online_query->sum('bayaran_keuntungan');
$bil_keuntunganansuran_online = $keuntunganansuran_online_query->count();
$total_keuntunganbukanansuran_data_kaunter = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->where('trans.teller','<>','Online')
->whereDate('trans.created_at','>=',$request->mula)
->whereDate('trans.created_at','<=',$request->akhir)
->where('trans.kodcaw','=',$request->kodcaw);
$total_keuntunganbukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->sum('keuntungan_rebet');
$bil_keuntunganbukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->count();
$total_keuntunganbukanansuran_data_online = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->where('trans.teller','=','Online')
->whereDate('trans.created_at','>=',$request->mula)
->whereDate('trans.created_at','<=',$request->akhir)
->where('trans.kodcaw','=',$request->kodcaw)
->pluck('transaksi_keuntungan.norujukan');
$gadaiDataOnline = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntunganbukanansuran_online_query = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiDataOnline)
->whereDate('tarikh_bayaran','>=',$request->mula)
->whereDate('tarikh_bayaran','<=',$request->akhir);
$total_keuntunganbukanansuran_online = $keuntunganbukanansuran_online_query->sum('keuntungan_rebet');
$bil_keuntunganbukanansuran_online = $keuntunganbukanansuran_online_query->count();
$keuntungan_data_kaunter = TransaksiKeuntungan::on('mysql7')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->akhir)
->where('trans.teller','<>','Online')
->pluck('transaksi_keuntungan.norujukan');
$gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data_kaunter)->whereNull('hargajualan')->pluck('norujukan');
$keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiDataKaunter);
$keuntungan_kaunter = $keuntungan_kaunter_query->sum('bayaran_keuntungan');
$bil_keuntungan_kaunter = $keuntungan_kaunter_query->count();
$bilangan_ansuran = $ansurankaunter->count();
$bilangan_ansuranonline = $ansuranonline->count();
$upahtebus = Tebus::on($cawangan['mysql'])
->where('t_tebus','>=',$request->mula)
->where('t_tebus','<=',$request->akhir)
->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->akhir)
->sum('bakiupah');
$upahansurKaunter = Advansur::on($cawangan['mysql'])
->where('teller','<>','Online')
->where('tarikh','>=',$request->mula)
->where('tarikh','<=',$request->akhir)
->sum('upahdibayar');
$upahansurOnlineQuery = Advansur::on($cawangan['mysql'])
->where('teller','=','Online')
->where('tarikh','>=',$request->mula)
->where('tarikh','<=',$request->akhir);
$upahansurOnline = $upahansurOnlineQuery->sum('upahdibayar');
$bilupahansurOnline = $upahansurOnlineQuery->count();
$upahsimpankaunter = $keuntungan_kaunter + $upahtebus + $upahlelong + $upahansurKaunter + $total_keuntunganbukanansuran_kaunter;
$keuntungansebenarkaunter = $total_keuntunganansuran_kaunter;
$upahsimpanonline = $upahansurOnline;
$keuntungansebenaronline = $total_keuntunganansuran_online + $total_keuntunganbukanansuran_online;
$total_keuntungan_kaunter = floatval($upahsimpankaunter) + floatval($keuntungansebenarkaunter);
$total_keuntungan_online = floatval($upahsimpanonline) + floatval($keuntungansebenaronline);
$totalbayaranonline = floatval($bayaranonline) + floatval($upahansurOnline);
$biltotalbayaranonline = $bilbayaranonline + $bilupahansurOnline;
$tebus = Tebus::on($cawangan['mysql'])
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg')
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('tebus.t_tebus','>=',$request->mula)
->where('tebus.t_tebus','<=',$request->akhir)
->get();
$pembiayaanlelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->akhir)
->sum('pinjaman');
$totalpenebusan = 0;
foreach($tebus as $index1=>$teb)
{
if($teb['gad.hargajualan'] != $teb['bakihargajualan'])
{
$totalpenebusan += $teb['gadaibakipjm'];
}else{
$totalpenebusan += $teb['pinjaman'];
}
}
//Lelongan Pembiayaan
$totalpenebusan += $pembiayaanlelong;
array_push($laporan_terkumpul,[
'total_gadai'=>$total_gadai,
'total_tebus'=>$total_tebus,
'total_ansuran'=>$total_ansuran,
'total_ansuranonline'=>$total_ansuranonline,
'bilangan_gadai'=>$bilangan_gadai,
'bilangan_tebus'=>$bilangan_tebus,
'bilangan_ansuran'=>$bilangan_ansuran,
'bilangan_ansuranonline'=>$bilangan_ansuranonline,
'bilangan_customer_baru'=>$bilangan_customer_baru,
'bayar_baki_lelong'=>$bayar_baki_lelong,
'bayar_rugi_lelong'=>$bayar_rugi_lelong,
@@ -874,8 +1119,16 @@ class LaporanController extends Controller
'jumlah_lelong'=>$jumlah_lelong,
'baki_lelong'=>$baki_lelong,
'rugi_lelong'=>$rugi_lelong,
'total_keuntungan'=>floatval($total_keuntungan)
'total_keuntungan'=>floatval($total_keuntungan),
'totalserahan' => floatval($totalserahan),
'serahanbayaranOnline' => floatval($serahanbayaranOnline),
'totalpendahuluan' => floatval($totalpendahuluan),
'belanjaam' => floatval($belanjaam),
'baikidanselenggara' => floatval($baikidanselenggara),
'keraian' => floatval($keraian),
'keuntungansebenarkaunter' => floatval($keuntungansebenarkaunter),
'total_keuntungan_kaunter'=>floatval($total_keuntungan_kaunter),
'total_keuntungan_online'=>floatval($total_keuntungan_online),
]);
return response()->json($laporan_terkumpul);
routes/web.php
-1
View File
@@ -683,7 +683,6 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->get('customers/{ic}/gadai/{status}',['uses'=>'AdminPageController@showOneCustomerGadai']);
});
$router->group(['prefix'=>'kelantanpay'], function () use ($router){