From 113ef50df1fada9a6188b0938e799d4107e4cff7 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Mon, 25 Jul 2022 22:19:13 +0800 Subject: [PATCH] from server --- app/Http/Controllers/GadaiController.php | 2 +- app/Http/Controllers/TebusController.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 43849e5..c8b9171 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -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); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 1c58952..72c370c 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -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); }