diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 905ec31..9ac15fc 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2277,6 +2277,15 @@ class GadaiController extends Controller case '020306': $tarikhtawarruq = '2021-06-08'; break; + case '010311': + $tarikhtawarruq = '2021-06-13'; + break; + case 'GC': + $tarikhtawarruq = '2021-06-13'; + break; + case 'JLI': + $tarikhtawarruq = '2021-06-13'; + break; } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index beb7d68..0b601d8 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -375,7 +375,11 @@ class LaporanController extends Controller ->where('glcode','=','7000/201') ->sum('amaun'); - $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul)]; + $kerugianlelongxtra = GlCode::on($cawangan['mysql']) + ->where('glcode','=','3000/120') + ->sum('amaun'); + + $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; return response()->json($arrayxtra); }