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

fix vault controller for rebate annur

Browse Source
This commit is contained in:
nurafrinaalimi16
2025-06-15 16:42:36 +08:00
parent 65eb1dfc62
commit 192a70d46e
1 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/VaultController.php
+29 -37
View File
@@ -369,50 +369,42 @@ class VaultController extends Controller
return response()->json($gldetail,200); return response()->json($gldetail,200);
} }
public function TunaiDiTangan($kodcaw,Request $request) public function TunaiDiTangan($kodcaw, Request $request)
{ {
$current = Carbon::now(); $totalbakiakhirtunai = 0;
$current = new Carbon();
$totalbakiakhirtunai = 0; $cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $vault = Vault::on($cawangan['mysql'])
$vault = Vault::on($cawangan['mysql']) ->where('kodcaw', $kodcaw)
->where('kodcaw','=',$kodcaw) ->where('tarikh', '<=', $request->tarikh)
->where('tarikh','<=', $request->tarikh) ->orderBy('tarikh', 'desc')->first();
->orderby('tarikh','desc')->first();
$tunai = Tunai::on($cawangan['mysql']) $tunai = Tunai::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw) ->where('kodcaw', $kodcaw)
->where('tarikh','=', $request->tarikh) ->where('tarikh', '=', $request->tarikh)
->get(); ->get();
$rebet = Tebus::on($cawangan['mysql']) // Jumlah diskaun_rebate dari 13/5/2025 hingga tarikh semasa
->join('gadai as db2','tebus.norujukan','=','db2.norujukan') $rebet = Tebus::on($cawangan['mysql'])
// ->where('tebus.t_tebus','>','2021-04-13') ->join('gadai as db2', 'tebus.norujukan', '=', 'db2.norujukan')
->where('tebus.t_tebus','<=',$request->tarikh) ->whereBetween('tebus.t_tebus', ['2025-05-13', $request->tarikh])
->where('db2.hargajualan','>','0') // tambahan 2021-05-07 ->where('db2.hargajualan', '>', 0)
->where('db2.t_gadai','>','2023-05-21') ->where('db2.t_gadai', '>', '2023-05-21')
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('diskaun_rebate'); ->sum('diskaun_rebate');
// Jumlahkan tunai
$total = 0;
foreach ($tunai as $money) {
$total += $money['baki'];
}
$total = 0; // Kira jumlah akhir termasuk rebate
foreach($tunai as $index=>$money) $totalbakiakhirtunai = $vault['bakiakhir'] + $total + $rebet;
{
$total+=$money['baki'];
}
if($total != 0) return response()->json($totalbakiakhirtunai);
{ }
$totalbakiakhirtunai = $vault['bakiakhir'] + $total + $rebet - $rebet;
}else
{
$totalbakiakhirtunai = $vault['bakiakhir'] + $rebet - $rebet;
}
return response()->json($totalbakiakhirtunai);
}
public function TunaiDiTanganLejer($kodcaw,Request $request) public function TunaiDiTanganLejer($kodcaw,Request $request)