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

fix aliran tunai separuh

Browse Source
This commit is contained in:
hafifierahman
2021-03-24 16:18:31 +08:00
parent 0ce6f4495c
commit d86244657a
6 changed files with 137 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+45 -5
View File
@@ -643,6 +643,7 @@ class GadaiController extends Controller
$gadai = Gadai::on($cawangan['mysql']) $gadai = Gadai::on($cawangan['mysql'])
->where('t_gadai','=',$request->tarikh) ->where('t_gadai','=',$request->tarikh)
// ->where('sttebus','=','') // ->where('sttebus','=','')
// ->where('teller','=',$request->teller)
->where('tagserah','=',1) ->where('tagserah','=',1)
->orderBy('t_gadai') ->orderBy('t_gadai')
->get(); ->get();
@@ -650,6 +651,7 @@ class GadaiController extends Controller
$tebus = Tebus::on($cawangan['mysql']) $tebus = Tebus::on($cawangan['mysql'])
->where('t_tebus','=',$request->tarikh) ->where('t_tebus','=',$request->tarikh)
// ->where('jenistebus','!=','T') // ->where('jenistebus','!=','T')
// ->where('teller','=',$request->teller)
->where('tagterima','=',1) ->where('tagterima','=',1)
->orderBy('t_tebus') ->orderBy('t_tebus')
->get(); ->get();
@@ -668,6 +670,43 @@ class GadaiController extends Controller
} }
public function GadaiTebusListTeller($kodcaw,Request $request)
{
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$arrayharian = [];
$gadai = Gadai::on($cawangan['mysql'])
->where('t_gadai','=',$request->tarikh)
->where('teller','=',$request->teller)
->where('tagserah','=',1)
->orderBy('t_gadai')
->get();
$tebus = Tebus::on($cawangan['mysql'])
->where('t_tebus','=',$request->tarikh)
->where('teller','=',$request->teller)
->where('tagterima','=',1)
->orderBy('t_tebus')
->get();
foreach($gadai as $index=>$g)
{
array_push($arrayharian,$g);
}
foreach($tebus as $index1=>$t)
{
array_push($arrayharian,$t);
}
return response()->json($arrayharian,200);
}
public function gadaiRingkasanTerkumpul($kodcaw,Request $request){ public function gadaiRingkasanTerkumpul($kodcaw,Request $request){
$current = Carbon::now(); $current = Carbon::now();
@@ -1412,12 +1451,13 @@ class GadaiController extends Controller
}else{ }else{
$totalmasuk = $masuk - $tebus['bakipjm']; $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
$bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan; $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
$bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array( update(array(
'keluar' => $keluar, 'keluar' => $totalkeluar,
'masuk' => $totalmasuk, 'masuk' => $totalmasuk,
'baki' => $bakiakhir 'baki' => $bakiakhir
)); ));
@@ -1440,7 +1480,7 @@ class GadaiController extends Controller
}else{ }else{
$bakiakhir = $bakiakhir - $tebus['bakipjm']; $bakiakhir = $bakiakhir - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array( update(array(
@@ -1944,11 +1984,11 @@ class GadaiController extends Controller
$keuntungan = Gadai::on($cawangan['mysql']) $keuntungan = Gadai::on($cawangan['mysql'])
->where('t_gadai','<=',$request->tarikh) ->where('t_gadai','<=',$request->tarikh)
->where('t_gadai','>=','2021-03-14')
->where('sttebus','=','') ->where('sttebus','=','')
->whereNotNull('upah12') ->whereNotNull('upah12')
->sum('upah12'); ->sum('upah12');
return response()->json($keuntungan,200); return response()->json($keuntungan,200);
} }
app/Http/Controllers/LelongController.php
+19 -7
View File
@@ -150,25 +150,22 @@ class LelongController extends Controller
$bakilelong = Lelong::on($cawangan['mysql']) $bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh) ->where('t_jual','<=',$request->tarikh)
->where(function($query){ ->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut') $query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-01-02'); ->orWhere('trkhtuntut','>',$tarikhbaru);
}) })
->where('baki','>=',0) ->where('baki','>=',0)
->sum('baki'); ->sum('baki');
// dd($bakilelong->toSql(), $bakilelong->getBindings());
// dd($bakilelong);
$ansrugi = AnsRugi::on($cawangan['mysql']) $ansrugi = AnsRugi::on($cawangan['mysql'])
->sum('bayaran'); ->sum('bayaran');
$rugilelong = Lelong::on($cawangan['mysql']) $rugilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh) ->where('t_jual','<=',$request->tarikh)
->where(function($query) ->where(function($query) use ($tarikhbaru)
{ {
$query->whereNull('trkhtuntut') $query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-01-02'); ->orWhere('trkhtuntut','>',$tarikhbaru);
}) })
->where('baki','<',0) ->where('baki','<',0)
->sum('baki'); ->sum('baki');
@@ -310,6 +307,21 @@ class LelongController extends Controller
return response()->json($tuntutbaki,200); return response()->json($tuntutbaki,200);
} }
public function showTuntutBakiTeller($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tuntutbaki = TuntutBaki::on($cawangan['mysql'])
->where('tarikh','=', $current->toDateString())
->where('teller','=', $request->teller)
->get();
return response()->json($tuntutbaki,200);
}
public function resitLelong($kodcaw,$norujukan){ public function resitLelong($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
app/Http/Controllers/TebusController.php
+54 -29
View File
@@ -16,6 +16,7 @@ use App\Customer;
use App\Lelong; use App\Lelong;
use App\HapusKira; use App\HapusKira;
use App\Parameter; use App\Parameter;
use App\Panjar;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -548,22 +549,40 @@ class TebusController extends Controller
$keuntunganselepastawarruq = 0; $keuntunganselepastawarruq = 0;
$keuntungansebelumtawarruq = 0; $keuntungansebelumtawarruq = 0;
if($request->tarikh >= '2021-03-15')
{
$keuntunganselepastawarruq = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
->whereYear('t_tebus','=',$current->year)
->whereNotNull('rebate')
->sum('rebate');
}
$keuntungansebelumtawarruq = Tebus::on($cawangan['mysql']) $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh) ->where('t_tebus','<=',$request->tarikh)
->where('t_tebus','>','2013-12-31') ->where('t_tebus','>=','2021-03-14')
->whereYear('t_tebus','=',$current->year)
->whereNotNull('rebate')
->sum('rebate');
$keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
->where('t_tebus','>=','2021-03-14')
->whereYear('t_tebus','=',$current->year)
->whereNotNull('bakiupah')
->sum('bakiupah');
$upahtebus = Tebus::on($cawangan['mysql'])
->where([['t_tebus','<=',$request->tarikh],['t_tebus','>','2013-12-31']])
->whereYear('t_tebus','=',$current->year) ->whereYear('t_tebus','=',$current->year)
// ->whereNotNull('upahdibayar')
->sum('upahdibayar'); ->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2013-12-31']])
->whereYear('t_jual','=',$current->year)
->sum('bakiupah');
$upahansur = Advansur::on($cawangan['mysql'])
->where('tarikh','<=',$request->tarikh)
->whereYear('tarikh','=',$current->year)
->sum('upahdibayar');
$keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
$keuntunganselepastawarruq = $keuntunganselepastawarruqrebate + $keuntunganselepastawarruqupah;
$total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq; $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
@@ -578,9 +597,8 @@ class TebusController extends Controller
$total = 0; $total = 0;
//Untung Rugi Terkumpul Sebelum 01.12.2013 //Untung Rugi Terkumpul Sebelum 01.12.2013
$utgrugilama = imbangdugalama::on($cawangan['mysql']) $utgrugilama = imbangdugalama::on($cawangan['mysql']) //--masuk
->sum('untung_t'); ->sum('untung_t');
//Yuran Ahli //Yuran Ahli
@@ -593,7 +611,7 @@ class TebusController extends Controller
->sum('yuranahli'); ->sum('yuranahli');
//Caj Lelong //Caj Lelong
$lelong = Lelong::on($cawangan['mysql']) $lelong = Lelong::on($cawangan['mysql']) //--masuk
->whereNotNull('t_jual') ->whereNotNull('t_jual')
->where('t_jual','>','2013-12-31') ->where('t_jual','>','2013-12-31')
->whereYear('t_jual','<',$current->year) ->whereYear('t_jual','<',$current->year)
@@ -603,31 +621,28 @@ class TebusController extends Controller
->sum('cajlelong_t'); ->sum('cajlelong_t');
// dd($current->year);
//Upah Simpan Tebus //Upah Simpan Tebus
$upahsimpantebus = Tebus::on($cawangan['mysql']) $upahsimpantebus = Tebus::on($cawangan['mysql']) //--masuk
->where('t_tebus','>','2013-12-31') ->where('t_tebus','>','2013-12-31')
->whereYear('t_tebus','<',$current->year) ->whereYear('t_tebus','<',$current->year)
->sum('upahdibayar'); ->sum('upahdibayar');
//Upah Simpan Lelong //Upah Simpan Lelong
$upahsimpanlelong = Lelong::on($cawangan['mysql']) $upahsimpanlelong = Lelong::on($cawangan['mysql']) //--masuk
->where('t_jual','>','2013-12-31') ->where('t_jual','>','2013-12-31')
->whereYear('t_jual','<',$current->year) ->whereYear('t_jual','<',$current->year)
->sum('bakiupah'); ->sum('bakiupah');
//Upah Simpan Advansur //Upah Simpan Advansur
$upahsimpanansur = Advansur::on($cawangan['mysql']) $upahsimpanansur = Advansur::on($cawangan['mysql']) //--masuk
->whereYear('tarikh','<',$current->year) ->whereYear('tarikh','<',$current->year)
->sum('upahdibayar'); ->sum('upahdibayar');
$upahsimpanlama = imbangdugalama::on($cawangan['mysql']) $upahsimpanlama = imbangdugalama::on($cawangan['mysql'])
->sum('upah_t'); ->sum('upah_t');
// dd($upahsimpanansur->toSql());
//GST Caj Lelong //GST Caj Lelong
$gstcajlelong = Lelong::on($cawangan['mysql']) $gstcajlelong = Lelong::on($cawangan['mysql']) //--masuk
->where('t_jual','<=',$request->tarikh) ->where('t_jual','<=',$request->tarikh)
->whereYear('t_jual','<',$current->year) ->whereYear('t_jual','<',$current->year)
->sum('gst_cl'); ->sum('gst_cl');
@@ -638,19 +653,29 @@ class TebusController extends Controller
->whereYear('tarikh','<',$current->year) ->whereYear('tarikh','<',$current->year)
->sum('bakiupah'); ->sum('bakiupah');
$parameter = Parameter::on($cawangan['mysql']) $panjar1 = Panjar::on($cawangan['mysql'])
->sum('sumpanjarlama'); ->whereYear('tarikh','<',$current->year)
->where('tag','=','1')
->sum('bayaran');
// dd($utgrugilama,$yuranTlama,$lelong,$upahsimpantebus,$upahsimpanlelong,$upahsimpanansur,$upahhapuskira,$parameter,$gstcajlelong); $panjar2 = Panjar::on($cawangan['mysql'])
->whereYear('tarikh','<',$current->year)
->where('tag','=','2')
->sum('bayaran');
$panjar3 = Panjar::on($cawangan['mysql'])
->whereYear('tarikh','<',$current->year)
->where('tag','=','3')
->sum('bayaran');
$parameter = ($panjar1*-1) + ($panjar2*-1) + ($panjar3*-1);
// $parameter = Parameter::on($cawangan['mysql']) //--masuk
// ->sum('sumpanjarlama');
$total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter; $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter;
// echo "UTGRUGI:" . $utgrugilama . " YuranTLama:" . $yuranTlama . " YuranBaru:" . $yuranbaru . " Lelong:" . $lelong . " Caj Lelong:" . $cajlelonglama . " Upah Tebus:" . $upahsimpantebus . " Upah Lelong:" . $upahsimpanlelong . " Upah Ansuran:". $upahsimpanansur;
// echo " UPah Hapus Kira : " . $upahhapuskira;
// var_dump($utgrugilama,$yuranTlama,$yuranbaru,$lelong,$cajlelonglama,$upahsimpantebus,$upahsimpanlelong,$upahsimpanansur,$upahsimpanlama,$gstcajlelong);
// + $cajlelonglama+ $upahsimpanlama+ $yuranbaru
// $total = ($yuranTlama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $utgrugilama ) - ($upahhapuskira);
return response()->json($total,200); return response()->json($total,200);
} }
app/Http/Controllers/TunaiController.php
+1
View File
@@ -286,6 +286,7 @@ class TunaiController extends Controller
$reqteller=RequestTeller::on('mysql7')->create([ $reqteller=RequestTeller::on('mysql7')->create([
'tarikh' => $current->toDateString(), 'tarikh' => $current->toDateString(),
'masa' => $current->toTimeString(),
'kodcaw' => $kodcaw, 'kodcaw' => $kodcaw,
'kodlaluan' => $request->kodlaluan, 'kodlaluan' => $request->kodlaluan,
'modal' => $request->modal, 'modal' => $request->modal,
app/Http/Controllers/VaultController.php
+10 -6
View File
@@ -261,13 +261,13 @@ class VaultController extends Controller
$serahanpkb = GlDetail::on($cawangan['mysql']) $serahanpkb = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanpkb) ->where('dtacct','=',$serahanpkb)
->where('tarikh','<=', $request->tarikh) ->where('tarikh','<=', $request->tarikh)
->where('tarikh','>','2014-12-31') ->where('tarikh','>','2013-12-31')
->sum('amaun'); ->sum('amaun');
$serahanJMC = GlDetail::on($cawangan['mysql']) $serahanJMC = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanjmc) ->where('dtacct','=',$serahanjmc)
->where('tarikh','<=', $request->tarikh) ->where('tarikh','<=', $request->tarikh)
->where('tarikh','>','2014-12-31') ->where('tarikh','>','2013-12-31')
->sum('amaun'); ->sum('amaun');
$serahanpkblama = imbangdugalama::on($cawangan['mysql']) $serahanpkblama = imbangdugalama::on($cawangan['mysql'])
@@ -281,10 +281,14 @@ class VaultController extends Controller
$totalserahan = $totaljmc + $totalpkb; $totalserahan = $totaljmc + $totalpkb;
$pendahuluan = GlDetail::on($cawangan['mysql']) $pendahuluanPKB = GlDetail::on($cawangan['mysql'])
->where('ktacct','=',$pendahuluanpkb) ->where('ktacct','=',$pendahuluanpkb)
->orWhere('ktacct','=',$pendahuluanjmc) ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2013-12-31']])
->where('tarikh','<=', $request->tarikh) ->sum('amaun');
$pendahuluanJMC = GlDetail::on($cawangan['mysql'])
->where('ktacct','=','7000/106')
->where([['tarikh','<=', $request->tarikh],['tarikh','>','2013-12-31']])
->sum('amaun'); ->sum('amaun');
$pendahuluanpkblama = imbangdugalama::on($cawangan['mysql']) $pendahuluanpkblama = imbangdugalama::on($cawangan['mysql'])
@@ -293,7 +297,7 @@ class VaultController extends Controller
$pendahuluanjmclama = imbangdugalama::on($cawangan['mysql']) $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql'])
->sum('pendahuluan_jmc'); ->sum('pendahuluan_jmc');
$total = $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluan; $total = $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC;
$pindahkekpkb = GlCode::on($cawangan['mysql']) $pindahkekpkb = GlCode::on($cawangan['mysql'])
->where('glcode','=',$serahankoperasi) ->where('glcode','=',$serahankoperasi)
routes/web.php
+4 -2
View File
@@ -51,7 +51,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('batalgadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanBatalGadai']); //laporan batalgadai $router->get('batalgadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanBatalGadai']); //laporan batalgadai
$router->get('gadai/laporan/ringkasan/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); //ringkasan terkumpul $router->get('gadai/laporan/ringkasan/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); //ringkasan terkumpul
$router->get('gadai/laporan/ringkasanharian/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanHarian']); //ringkasan harian $router->get('gadai/laporan/ringkasanharian/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanHarian']); //ringkasan harian
$router->get('gadaitebus/listharini/{kodcaw}',['uses'=>'GadaiController@GadaiTebusList']); $router->get('gadaitebus/listharini/{kodcaw}',['uses'=>'GadaiController@GadaiTebusList']); // Kesemua Gadai Harini
$router->get('gadaitebus/listharini/{kodcaw}/teller',['uses'=>'GadaiController@GadaiTebusListTeller']); //Mengikut Teller
$router->get('gadai/list/rekod/old',['uses'=>'GadaiController@rekodGadaian']); $router->get('gadai/list/rekod/old',['uses'=>'GadaiController@rekodGadaian']);
$router->get('check/serah/gadai',['uses'=>'GadaiController@checkSerahGadaian']); $router->get('check/serah/gadai',['uses'=>'GadaiController@checkSerahGadaian']);
@@ -272,6 +273,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
//Tuntut Baki //Tuntut Baki
$router->get('TuntutBaki/{kodcaw}',['uses'=>'LelongController@showTuntutBaki']); $router->get('TuntutBaki/{kodcaw}',['uses'=>'LelongController@showTuntutBaki']);
$router->get('TuntutBaki/{kodcaw}/teller',['uses'=>'LelongController@showTuntutBakiTeller']);
$router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']); $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']);
$router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']); $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']);
$router->put('tuntutbakiupdate/{kodcaw}/{norujukan}',['uses'=>'LelongController@updatetagtbaki']); $router->put('tuntutbakiupdate/{kodcaw}/{norujukan}',['uses'=>'LelongController@updatetagtbaki']);
@@ -326,7 +328,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
//-- Harta Semasa --// //-- Harta Semasa --//
$router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
$router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
$router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //pinjaman diberi $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
//-- Tanggungan Semasa --// //-- Tanggungan Semasa --//
$router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar $router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar