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

Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn

Browse Source
This commit is contained in:
e.arrahn
2022-07-25 23:19:41 +08:00
parent 8542ca52ff 2949b2ac8c
commit 4aa074a49f
3 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+27 -1
View File
@@ -3467,7 +3467,7 @@ class GadaiController extends Controller
$gadai_all = Gadai::on($cawangan['mysql'])->where('sttebus','')->where('hargajualan','!=','bakihargajualan')->get();
foreach($gadai_all as $index=>$gadai){
$totalbayaran = round($gadai['hargajualan'] - $gadai['bakihargajualan'],1);
$upah6bln_raw = $gadai['bakiupah'] - 0.2;
$upah6bln_raw = $gadai['bakiupah'] - 0.5;
$upah6bln_round = number_format($upah6bln_raw,2);
$upah6bln = substr($upah6bln_round, 0, -1);
@@ -3613,4 +3613,30 @@ class GadaiController extends Controller
return response()->json(number_format($total,2));
}
public function updateTagLelong(Request $request){
$norujukan = $request->norujukan;
$kodcaw = $request->kodcaw;
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
$updateTag = Gadai::on($cawangan->mysql)->where('norujukan',$norujukan)->update([
'taglel'=>1
]);
return response()->json('success');
}
public function revertTagLelong(Request $request){
$norujukan = $request->norujukan;
$kodcaw = $request->kodcaw;
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
$updateTag = Gadai::on($cawangan->mysql)->where('norujukan',$norujukan)->update([
'taglel'=>0
]);
return response()->json('success');
}
}
app/Http/Controllers/TebusController.php
+8 -2
View File
@@ -1121,7 +1121,7 @@ class TebusController extends Controller
->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2013-12-31']])
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2013-12-31'],['t_jual','<=','2022-07-24']])
->whereYear('t_jual','=',$current->year)
->sum('bakiupah');
@@ -1708,7 +1708,13 @@ class TebusController extends Controller
// dd($ansuran);
$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2022-07-24']])
->whereYear('t_jual','=',$current->year)
->sum('bakiupah');
$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran + $upahlelong);
}