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'])
->where('t_gadai','=',$request->tarikh)
// ->where('sttebus','=','')
// ->where('teller','=',$request->teller)
->where('tagserah','=',1)
->orderBy('t_gadai')
->get();
@@ -650,6 +651,7 @@ class GadaiController extends Controller
$tebus = Tebus::on($cawangan['mysql'])
->where('t_tebus','=',$request->tarikh)
// ->where('jenistebus','!=','T')
// ->where('teller','=',$request->teller)
->where('tagterima','=',1)
->orderBy('t_tebus')
->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){
$current = Carbon::now();
@@ -1412,12 +1451,13 @@ class GadaiController extends Controller
}else{
$totalmasuk = $masuk - $tebus['bakipjm'];
$bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
$totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
$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] ])->
update(array(
'keluar' => $keluar,
'keluar' => $totalkeluar,
'masuk' => $totalmasuk,
'baki' => $bakiakhir
));
@@ -1440,7 +1480,7 @@ class GadaiController extends Controller
}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] ])->
update(array(
@@ -1944,11 +1984,11 @@ class GadaiController extends Controller
$keuntungan = Gadai::on($cawangan['mysql'])
->where('t_gadai','<=',$request->tarikh)
->where('t_gadai','>=','2021-03-14')
->where('sttebus','=','')
->whereNotNull('upah12')
->sum('upah12');
return response()->json($keuntungan,200);
}