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

audit

Browse Source
This commit is contained in:
afiq
2021-10-02 19:34:43 +08:00
parent e6cfbcd232 542d5cbcdd
commit 8a82178b6b
11 changed files with 648 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomerController.php
+19
View File
@@ -707,4 +707,23 @@ class CustomerController extends Controller
return response()->json($blacklist);
}
public function showCustomerByEachCawangan($ic)
{
$cawangan_all = Cawangan::on('mysql7')->get();
$custcawangan = array();
foreach($cawangan_all as $index=>$cawangan)
{
$customer = Gadai::on($cawangan['mysql'])
->select('kodcaw')
->where('nokp', '=', $ic)
->first();
if($customer)
array_push($custcawangan,['kodcaw' => $customer['kodcaw'], 'namacawangan' => $cawangan['details_caw']]);
}
return response()->json($custcawangan);
}
}
app/Http/Controllers/GadaiController.php
+111 -37
View File
@@ -724,20 +724,10 @@ class GadaiController extends Controller
//Outstanding
$outstanding = Gadai::on($cawangan['mysql'])
->where([['tagpalsu','=',0],['t_gadai','<=',$current->toDateString()],['sttebus','=','']])
->orWhere([['tagpalsu','=',0],['t_update','>',$current->toDateString()],['sttebus','!=',''],['t_gadai','<=',$current->toDateString()]])
->get();
->where('sttebus','=','')
->sum('pinjaman');
$totaloutstanding = 0;
foreach($outstanding as $index1=>$os)
{
if($os['hargajualan'] == null)
$totaloutstanding += $os['pinjaman'];
else
$totaloutstanding += $os['bakipjm'];
}
array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $totaloutstanding]);
array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]);
return response()->json($array_dashboard);
}
@@ -2559,7 +2549,6 @@ class GadaiController extends Controller
$rekod_emaspalsu = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
@@ -2568,15 +2557,10 @@ class GadaiController extends Controller
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
->sum('pinjaman');
// $gadaibaru = Gadai::on($cawangan['mysql'])
// ->where('tagpalsu','=',0)
// ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
// ->sum('pinjaman');
// $rekod_pinjamandiberi;
if($kodcaw === '011232')
$rekod_pinjamandiberi -= 282;
{
$rekod_pinjamandiberi -= 282;
}
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
@@ -2725,11 +2709,6 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
// $Gadai = Gadai::on($cawangan['mysql'])
// ->where('tagpalsu','=',0)
// ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
// ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
// ->sum('pinjaman');
$Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman');
$Tebus = Gadai::on($cawangan['mysql'])
@@ -2796,16 +2775,6 @@ class GadaiController extends Controller
->whereNotNull('upah12')
->sum('upah12');
// $transaksi = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
// ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
// ->whereYear('tarikh_bayaran','=',$current->year)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
// $totalkeuntungan = $keuntungan - $transaksi;
$totalkeuntungan = $keuntungan;
return response()->json($totalkeuntungan,200);
@@ -2963,4 +2932,109 @@ class GadaiController extends Controller
}
return response()->json('successful',200);
}
public function PembiayaanBulanan(Request $request){
$current = Carbon::now();
$current = new Carbon();
$monthly = Carbon::now();
$monthly = new Carbon();
$monthly_array = Carbon::now();
$monthly_array = new Carbon();
$monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
$cawangan_all = Cawangan::on('mysql7')->get();
$arraybulanan = [];
$array_totalup = [];
for($i=0;$i<12;$i++){
if($i == 0){
$monthly_array_date = $monthly_array->startOfMonth()->subMonths(0);
}else{
$monthly_array_date = $monthly_array->startOfMonth()->subMonths(1);
}
if($monthly_array_date->year === $current->year)
{
switch($monthly_array_date->month){
case 1: $namabulan = 'Jan';
break;
case 2: $namabulan = 'Feb';
break;
case 3: $namabulan = 'Mac';
break;
case 4: $namabulan = 'Apr';
break;
case 5: $namabulan = 'Mei';
break;
case 6: $namabulan = 'Jun';
break;
case 7: $namabulan = 'Jul';
break;
case 8: $namabulan = 'Aug';
break;
case 9: $namabulan = 'Sep';
break;
case 10: $namabulan = 'Okt';
break;
case 11: $namabulan = 'Nov';
break;
case 12: $namabulan = 'Dis';
}
array_push($array_totalup,['tarikh'=>$monthly_array_date->year.'-'.sprintf("%02d", $monthly_array_date->month),'namabulan'=>$namabulan,'pembiayaan'=>0,'bayaran'=>0]);
}
}
foreach($cawangan_all as $index=>$cawangan){
$gadai = Gadai::on($cawangan['mysql'])
->selectRaw('SUM(pinjaman) AS totalpinjaman')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_gadai,'%Y%m')"))
->whereYear('t_gadai',2021)
->where([['nokp','=',$request->icno],['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])
->orderBy('t_gadai','desc')
->get();
foreach($array_totalup as $array_index=>$totalup){
foreach($gadai as $indexgadai=>$gadai_detail){
if($totalup['tarikh'] == $gadai_detail['t_gadai']){
$total_gadai = $totalup['pembiayaan'];
$total_gadai += $gadai_detail['totalpinjaman'];
$array_totalup[$array_index]['pembiayaan'] = $total_gadai;
}
}
}
}
$bayaran = Transaction::on('mysql7')->selectRaw('SUM(duit_masuk) AS totalbayaran')
->addSelect(DB::connection('mysql7')
->raw('DATE_FORMAT(created_at, "%Y-%m") as created_at'))
->groupBy(DB::connection('mysql7')
->raw("DATE_FORMAT(created_at,'%Y%m')"))
->where([['nokp','=',$request->icno],['created_at','<=',$current->toDateString()],['created_at','>=',$monthly_date]])
->orderBy('created_at','desc')
->get();
foreach($array_totalup as $array_index=>$totalup){
foreach($bayaran as $indexbayaran=>$bayaran_detail){
if($totalup['tarikh'] == $bayaran_detail['created_at']){
$total_bayaran = $totalup['bayaran'];
$total_bayaran += $bayaran_detail['totalbayaran'];
$array_totalup[$array_index]['bayaran'] = $total_bayaran;
}
}
}
// asort($array_totalup);
return response()->json($array_totalup);
}
}
app/Http/Controllers/LaporanController.php
+104 -12
View File
@@ -40,7 +40,8 @@ class LaporanController extends Controller
$total_upah = Advansur::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('upahdibayar');
$total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah');
$total_keuntunganansuran = TransaksiKeuntungan::on('mysql7')
$total_keuntunganansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -49,12 +50,100 @@ class LaporanController extends Controller
->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.kodcaw','=',$request->kodcaw)
->where('trans.trans_type','=','A')
// ->groupBy('trans.id')
->sum('bayaran_keuntungan');
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$total_keuntunganansuran = 0;
if($total_keuntunganansuran_data){
foreach($total_keuntunganansuran_data as $index=>$total_keuntunganansuranData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$total_keuntunganansuranData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$total_keuntunganansuran += $total_keuntunganansuranData['bayaran_keuntungan'];
}
}
}
$total_keuntunganbukanansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->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')
->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.kodcaw','=',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
->get();
$total_keuntunganbukanansuran = 0;
if($total_keuntunganbukanansuran_data){
foreach($total_keuntunganbukanansuran_data as $index=>$total_keuntunganbukanansuranData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$total_keuntunganbukanansuranData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$total_keuntunganbukanansuran += $total_keuntunganbukanansuranData['keuntungan_rebet'];
}
}
}
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh)
// ->whereNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$keuntungan = 0;
if($keuntungan_data){
foreach($keuntungan_data as $index=>$keuntunganData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first();
if($gadaiData){
$keuntungan += $keuntunganData['bayaran_keuntungan'];
}
}
}
$upahtebus = Tebus::on($cawangan['mysql'])
->where('t_tebus','=',$request->tarikh)
->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql'])
->where('t_jual','=',$request->tarikh)
->sum('bakiupah');
$upahansur = Advansur::on($cawangan['mysql'])
->where('tarikh','=',$request->tarikh)
->sum('upahdibayar');
$upahsimpan = $keuntungan + $upahtebus + $upahlelong + $upahansur;
$keuntungansebenar = $total_keuntunganansuran + $total_keuntunganbukanansuran;
// $total_ansuran = number_format($total_ansuran,2);
$total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
$total_keuntungan = floatval($upahsimpan) + floatval($keuntungansebenar);
$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->tarikh)
->get();
$totalpenebusan = 0;
foreach($tebus as $index1=>$teb)
{
if($teb['gad.hargajualan'] != $teb['bakihargajualan'])
{
$totalpenebusan += $teb['gadaibakipjm'];
}else{
$totalpenebusan += $teb['pinjaman'];
}
}
//b
@@ -196,10 +285,12 @@ class LaporanController extends Controller
}
//g
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh);
$tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','<',0);
$tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','>',0);
$bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman');
@@ -222,7 +313,7 @@ class LaporanController extends Controller
array_push($laporan_harian,[
'total_gadai'=>$total_gadai,
'total_tebus'=>$total_tebus,
'total_tebus'=>$totalpenebusan,
'total_ansuran'=>$total_ansuran,
'bilangan_gadai'=>$bilangan_gadai,
'bilangan_tebus'=>$bilangan_tebus,
@@ -329,10 +420,11 @@ class LaporanController extends Controller
}
//g
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]);
$tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','<',0);
$tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','>',0);
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
$bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');
app/Http/Controllers/LelongController.php
+3 -1
View File
@@ -223,7 +223,9 @@ class LelongController extends Controller
}
if($kodcaw === '011232')
{
$bakilelong += 6;
}
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
@@ -472,7 +474,7 @@ class LelongController extends Controller
->sum('cajlelong');
if($kodcaw === '011232')
$cajlelong += 122.5;
$cajlelong +=122.5;
return response()->json($cajlelong,200);
}
app/Http/Controllers/TacExpressPaymentController.php
+2 -2
View File
@@ -26,8 +26,8 @@ class TacExpressPaymentController extends Controller
$messages = 'SPARE : SMS-OTP '. $request->otp_token . ' for one time usage on ' . $expired_at . '. Call AR-RAHN CARELINE CENTRE 1300-22-4343 if not request';
$status = Http::get('http://gateway.onewaysms.com.au:10001/api.aspx',[
'apiusername' => 'APIUK330HDAFO',
'apipassword' => 'APIUK330HDAFOUK330',
'apiusername' => 'APIQ4LP5EMKXM',
'apipassword' => 'APIQ4LP5EMKXM7CQOX',
'senderid' => 'INFO',
'mobileno' => $mobileno,
'message'=> $messages,
app/Http/Controllers/TebusController.php
+157 -44
View File
@@ -605,8 +605,9 @@ class TebusController extends Controller
->whereNotNull('hargajualan')
->where('hargajualan','<>','bakihargajualan');
// $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
$totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
$bilpenebusantawarruq = $tebustawarruq->count();
$bilpenebusantawarruq = $tebustawarruq->count();
$totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
$totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
@@ -920,12 +921,23 @@ class TebusController extends Controller
$daterequest->addDays(1);
//Keuntungan Selepas Tawarruq
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// ->whereNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$keuntungan = 0;
if($keuntungan_data){
foreach($keuntungan_data as $index=>$keuntunganData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first();
if($gadaiData){
$keuntungan += $keuntunganData['bayaran_keuntungan'];
}
}
}
// $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
// ->where('t_tebus','<=',$request->tarikh)
@@ -966,7 +978,9 @@ class TebusController extends Controller
$total = $keuntungansebelumtawarruq + $keuntungan;
if($kodcaw === '011232')
$total += 623.5;
{
$total +=623.5;
}
return response()->json($total,200);
}
@@ -985,13 +999,24 @@ class TebusController extends Controller
$daterequest->addDays(1);
//Keuntungan Selepas Tawarruq
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// ->whereNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$keuntungan = 0;
if($keuntungan_data){
foreach($keuntungan_data as $index=>$keuntunganData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first();
if($gadaiData){
$keuntungan += $keuntunganData['bayaran_keuntungan'];
}
}
}
$upahtebus = Tebus::on($cawangan['mysql'])
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']])
@@ -1140,46 +1165,90 @@ class TebusController extends Controller
if($request->tarikh < '2021-06-09')
{
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$keuntungan = 0;
if($keuntungan_data){
foreach($keuntungan_data as $index=>$keuntunganData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$keuntungan += $keuntunganData['bayaran_keuntungan'];
}
}
}
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
->get();
$keuntunganreducing = 0;
if($keuntunganreducing_data){
foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganreducingData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$keuntunganreducing += $keuntunganreducingData['keuntungan_rebet'];
}
}
}
$total = ($keuntungan + $keuntunganreducing);
}else{
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$keuntungan = 0;
if($keuntungan_data){
foreach($keuntungan_data as $index=>$keuntunganData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$keuntungan += $keuntunganData['bayaran_keuntungan'];
}
}
}
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09')
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
->get();
$keuntunganreducing = 0;
if($keuntunganreducing_data){
foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganreducingData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$keuntunganreducing += $keuntunganreducingData['keuntungan_rebet'];
}
}
}
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$bukanansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -1190,11 +1259,22 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
->get();
$bukanansuran = 0;
if($bukanansuran_data){
foreach($bukanansuran_data as $index=>$bukanansuranData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bukanansuranData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$bukanansuran += $bukanansuranData['keuntungan_rebet'];
}
}
}
$ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$ansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -1205,8 +1285,19 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$ansuran = 0;
if($ansuran_data){
foreach($ansuran_data as $index=>$ansuranData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$ansuran += $ansuranData['bayaran_keuntungan'];
}
}
}
$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
@@ -1228,8 +1319,8 @@ class TebusController extends Controller
$current = Carbon::now();
$current = new Carbon();
$bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$bukanansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -1239,11 +1330,22 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');
// ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet');
->get();
$ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
$bukanansuran = 0;
if($bukanansuran_data){
foreach($bukanansuran_data as $index=>$bukanansuranData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bukanansuranData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$bukanansuran += $bukanansuranData['keuntungan_rebet'];
}
}
}
$ansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
@@ -1253,8 +1355,19 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->get();
$ansuran = 0;
if($ansuran_data){
foreach($ansuran_data as $index=>$ansuranData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first();
if($gadaiData){
$ansuran += $ansuranData['bayaran_keuntungan'];
}
}
}
$total = ($ansuran + $bukanansuran);
@@ -1266,7 +1379,7 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rebet = Tebus::on($cawangan['mysql'])
->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
->join('gadai as db2','tebus.norujukan','=','db2.norujukan')
// ->where('tebus.t_tebus','>','2021-04-13')
->where('tebus.t_tebus','<=',$request->tarikh)
->where('db2.hargajualan','>','0') // tambahan 2021-05-07
@@ -1281,7 +1394,7 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rebet = Tebus::on($cawangan['mysql'])
->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
->join('gadai as db2','tebus.norujukan','=','db2.norujukan')
->where('tebus.t_tebus','>=',$request->mula)
->where('tebus.t_tebus','<=',$request->hingga)
->where('db2.hargajualan','>','0')
app/Http/Controllers/TransactionController.php
+15
View File
@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Transaction;
use App\TransaksiKeuntungan;
use App\Pengguna;
use App\Cawangan;
@@ -103,4 +104,18 @@ class TransactionController extends Controller
return response()->json($transaction);
}
public function TransaksiPelanggan(Request $request){
$transaction = 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.norujukan','=',$request->norujukan)
->get();
return response()->json($transaction);
}
}
app/Http/Controllers/TunaiController.php
+168 -1
View File
@@ -7,6 +7,8 @@ use App\Tunai;
use App\Gadai;
use App\AddTunai;
use App\RequestTeller;
use App\Denominasi;
use App\Vault;
use Illuminate\Http\Request;
use Carbon\Carbon;
@@ -393,12 +395,177 @@ class TunaiController extends Controller
$teller = Tunai::on($cawangan['mysql'])
->select('kodlaluan')
->whereRaw('LENGTH(kodlaluan) > 10')
->whereRaw('LENGTH(kodlaluan) > 14')
->distinct()
->get();
return response()->json($teller);
}
public function initiateTunai(){
$current = new Carbon();
$current = Carbon::now();
$cawangan_all = Cawangan::on('mysql7')->get();
foreach($cawangan_all as $index=>$cawangan){
$getdate = Tunai::on($cawangan['mysql'])
->select('tarikh')
->where('tarikh', '<', $current->toDateString())
->orderBy('recno','desc')
->first();
$tunai=Tunai::on($cawangan['mysql'])
->where([['kodcaw','=',$kodcaw],['tarikh','=', $getdate['tarikh']],['baki','<>',0]])
->GroupBy('kodlaluan')
->get();
if($tunai)
{
foreach($tunai as $index=>$tunsem){
$latesttunai=Tunai::on($cawangan['mysql'])
->where([['kodcaw','=',$cawangan['kodcaw']],['tarikh','=',$current->toDateString()],['kodlaluan','=',$tunsem['kodlaluan']]])
->orderBy('tarikh','desc')
->first();
if(sizeof($latesttunai) == 0)
{
$tunai=Tunai::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'kodcaw'=> $cawangan['kodcaw'],
'kodlaluan'=>$tunsem['kodlaluan'],
'bakiawal'=>$tunsem['baki'],
'masuk'=>0.00,
'yuran'=>0.00,
'keluar'=>0.00,
'baki'=>$tunsem['baki'],
'tambah'=>0.00,
'kurang'=>0.00
]);
}
}
//Denominasi
$denominasi=Denominasi::on($cawangan['mysql'])->where('tarikh','=',$current->toDateString())->limit(1)->get();
if(sizeof($denominasi) == 0)
{
$deno = Denominasi::on($cawangan['mysql'])->orderby('tarikh','desc')->first();
if($deno)
{
$savedeno = Denominasi::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'bd1' => $deno['bd1'],
'b1' => $deno['b1'],
'bd5' => $deno['bd5'],
'b5' => $deno['b5'],
'bd10' => $deno['bd10'],
'b10' => $deno['b10'],
'bd20' => $deno['bd20'],
'b20' => $deno['b20'],
'bd50' => $deno['bd50'],
'b50' => $deno['b50'],
'bd100' => $deno['bd100'],
'b100' => $deno['b100'],
'txtring1' => $deno['txtring1'],
'k1' => $deno['k1'],
'txtring5' => $deno['txtring5'],
'k5' => $deno['k5'],
'txtsen1' => $deno['txtsen1'],
'k01' => $deno['k01'],
'txtsen5' => $deno['txtsen5'],
'k05' => $deno['k05'],
'txtsen10' => $deno['txtsen10'],
'k010' => $deno['k010'],
'txtsen20' => $deno['txtsen20'],
'k020' => $deno['k020'],
'txtsen50' => $deno['txtsen50'],
'k050' => $deno['k050'],
'txtring10' => $deno['txtring10'],
'k10' => $deno['k10'],
'txtring20' => $deno['txtring20'],
'k20' => $deno['k20'],
'txtring50' => $deno['txtring50'],
'k50' => $deno['k50'],
'txtring100' => $deno['txtring100'],
'k100' => $deno['k100'],
'txtring1000' => $deno['txtring1000'],
'k1000' => $deno['k1000'],
'jumlahbundle' => $deno['jumlahbundle'],
'txtjumlah' => $deno['txtjumlah'],
'lebihan' => $deno['lebihan'],
'nota' => $deno['nota'],
'jumlahkeping' => $deno['jumlahkeping']
]);
}else{
$savedeno = Denominasi::on($cawangan['mysql'])->create([
'tarikh' => $current->toDateString(),
'bd1' => 0,
'b1' => 0,
'bd5' => 0,
'b5' => 0,
'bd10' => 0,
'b10' => 0,
'bd20' => 0,
'b20' => 0,
'bd50' => 0,
'b50' => 0,
'bd100' => 0,
'b100' => 0,
'txtring1' => 0,
'k1' => 0,
'txtring5' => 0,
'k5' => 0,
'txtsen1' => 0,
'k01' => 0,
'txtsen5' => 0,
'k05' => 0,
'txtsen10' => 0,
'k010' => 0,
'txtsen20' => 0,
'k020' => 0,
'txtsen50' => 0,
'k050' => 0,
'txtring10' => 0,
'k10' => 0,
'txtring20' => 0,
'k20' => 0,
'txtring50' => 0,
'k50' => 0,
'txtring100' => 0,
'k100' => 0,
'txtring1000' => 0,
'k1000' => 0,
'jumlahbundle' => 0,
'txtjumlah' => 0,
'lebihan' => 0,
'nota' => 0,
'jumlahkeping' => 0
]);
}
}
//Peti Besi Cawangan
$getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
$getVault=Vault::on($cawangan['mysql'])
->where('kodcaw','=',$cawangan['kodcaw'])
->where('tarikh','=',$current->toDateString())
->orderby('tarikh','desc')->limit(1)->get();
if(sizeof($getVault) == 0)
{
$peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
$getVault = $peti_besi_terkini['bakiakhir'];
}
}
}
}
}
app/Http/Controllers/VaultController.php
-10
View File
@@ -400,16 +400,6 @@ class VaultController extends Controller
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
// $pendahuluan = Vault::on($cawangan['mysql'])
// ->where('kodcaw','=',$kodcaw)
// ->where('tarikh','<=', $request->tarikh)
// ->sum('pendahuluan');
// $serahan = Vault::on($cawangan['mysql'])
// ->where('kodcaw','=',$kodcaw)
// ->where('tarikh','<=', $request->tarikh)
// ->sum('serahan');
$serahanpkb = '1000/020';
$serahanjmc = '1000/026';
$pendahuluanpkb = '7000/102';
app/KomuditiPurchase.php
+4
View File
@@ -23,4 +23,8 @@ class KomuditiPurchase extends Model
* @var array
*/
// protected $hidden = [];
public function getBalance(){
}
}