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

from server

Browse Source
This commit is contained in:
e.arrahn
2022-07-25 22:19:13 +08:00
parent a73d2938c6
commit 113ef50df1
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+1 -1
View File
@@ -3467,7 +3467,7 @@ class GadaiController extends Controller
$gadai_all = Gadai::on($cawangan['mysql'])->where('sttebus','')->where('hargajualan','!=','bakihargajualan')->get(); $gadai_all = Gadai::on($cawangan['mysql'])->where('sttebus','')->where('hargajualan','!=','bakihargajualan')->get();
foreach($gadai_all as $index=>$gadai){ foreach($gadai_all as $index=>$gadai){
$totalbayaran = round($gadai['hargajualan'] - $gadai['bakihargajualan'],1); $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_round = number_format($upah6bln_raw,2);
$upah6bln = substr($upah6bln_round, 0, -1); $upah6bln = substr($upah6bln_round, 0, -1);
app/Http/Controllers/TebusController.php
+8 -2
View File
@@ -1121,7 +1121,7 @@ class TebusController extends Controller
->sum('upahdibayar'); ->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql']) $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) ->whereYear('t_jual','=',$current->year)
->sum('bakiupah'); ->sum('bakiupah');
@@ -1708,7 +1708,13 @@ class TebusController extends Controller
// dd($ansuran); // 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);
} }