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

add rebet to vault controller

Browse Source
This commit is contained in:
nurafrinaalimi16
2025-05-19 16:31:27 +08:00
parent 07d442a654
commit 65eb1dfc62
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/VaultController.php
+19 -8
View File
@@ -10,6 +10,7 @@ use App\GlDetail;
use App\imbangdugalama; use App\imbangdugalama;
use App\GlCode; use App\GlCode;
use App\Panjar; use App\Panjar;
use App\Tebus;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Carbon\Carbon; use Carbon\Carbon;
@@ -371,12 +372,12 @@ class VaultController extends Controller
public function TunaiDiTangan($kodcaw,Request $request) public function TunaiDiTangan($kodcaw,Request $request)
{ {
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
$totalbakiakhirtunai = 0; $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();
@@ -386,24 +387,34 @@ class VaultController extends Controller
->where('tarikh','=', $request->tarikh) ->where('tarikh','=', $request->tarikh)
->get(); ->get();
$rebet = Tebus::on($cawangan['mysql'])
->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
->where('db2.t_gadai','>','2023-05-21')
->whereNotNull('db2.hargajualan')
->sum('diskaun_rebate');
$total = 0; $total = 0;
foreach($tunai as $index=>$money) foreach($tunai as $index=>$money)
{ {
$total+=$money['baki']; $total+=$money['baki'];
} }
if($total != 0) if($total != 0)
{ {
$totalbakiakhirtunai = $vault['bakiakhir'] + $total; $totalbakiakhirtunai = $vault['bakiakhir'] + $total + $rebet - $rebet;
}else }else
{ {
$totalbakiakhirtunai = $vault['bakiakhir']; $totalbakiakhirtunai = $vault['bakiakhir'] + $rebet - $rebet;
} }
return response()->json($totalbakiakhirtunai); return response()->json($totalbakiakhirtunai);
} }
public function TunaiDiTanganLejer($kodcaw,Request $request) public function TunaiDiTanganLejer($kodcaw,Request $request)
{ {