add rebet to vault controller

This commit is contained in:
nurafrinaalimi16
2025-05-19 16:31:27 +08:00
parent 07d442a654
commit 65eb1dfc62
+15 -4
View File
@@ -10,6 +10,7 @@ use App\GlDetail;
use App\imbangdugalama;
use App\GlCode;
use App\Panjar;
use App\Tebus;
use Illuminate\Http\Request;
use Carbon\Carbon;
@@ -376,7 +377,7 @@ class VaultController extends Controller
$totalbakiakhirtunai = 0;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$vault=Vault::on($cawangan['mysql'])
$vault = Vault::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where('tarikh','<=', $request->tarikh)
->orderby('tarikh','desc')->first();
@@ -386,24 +387,34 @@ class VaultController extends Controller
->where('tarikh','=', $request->tarikh)
->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;
foreach($tunai as $index=>$money)
{
$total+=$money['baki'];
}
if($total != 0)
{
$totalbakiakhirtunai = $vault['bakiakhir'] + $total;
$totalbakiakhirtunai = $vault['bakiakhir'] + $total + $rebet - $rebet;
}else
{
$totalbakiakhirtunai = $vault['bakiakhir'];
$totalbakiakhirtunai = $vault['bakiakhir'] + $rebet - $rebet;
}
return response()->json($totalbakiakhirtunai);
}
public function TunaiDiTanganLejer($kodcaw,Request $request)
{