From 79aa543e699c97ca4eca905ce3fd64d600468f63 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 17 Jan 2021 08:46:07 +0800 Subject: [PATCH 1/2] fix kelulusan --- app/Http/Controllers/GadaiController.php | 11 +++- app/Http/Controllers/KelulusanController.php | 58 +++++++++++++++----- app/Http/Controllers/MarhunController.php | 5 ++ app/Http/Controllers/TebusController.php | 4 +- 4 files changed, 61 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 50f6bac..4f8e2bb 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -384,6 +384,10 @@ class GadaiController extends Controller } public function gadaiRingkasanTerkumpul($kodcaw,$tarikh){ + + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $array_terkumpul = []; @@ -392,13 +396,16 @@ class GadaiController extends Controller ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman') ->where('t_gadai','<=',$tarikh) // ->where('sttebus','=','') + ->whereYear('t_gadai','=',$current->year) ->orderBy('t_gadai','desc') ->get(); + $tebus = Gadai::on($cawangan['mysql']) ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan') ->where('t_gadai','<=',$tarikh) ->where('sttebus','=','T') + ->whereYear('t_gadai','=',$current->year) ->orderBy('t_gadai','desc') ->get(); @@ -406,6 +413,7 @@ class GadaiController extends Controller ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman') ->where('t_gadai','<=',$tarikh) ->where('sttebus','=','L') + ->whereYear('t_gadai','=',$current->year) ->orderBy('t_gadai','desc') ->get(); @@ -1098,8 +1106,7 @@ class GadaiController extends Controller return response('Deleted Successfully', 200); } else - return response('Bukan-Tebus'); - + return response('Bukan-Tebus', 200); } public function senaraiLelong($kodcaw,Request $request){ diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 728b571..99f7355 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -21,23 +21,28 @@ class KelulusanController extends Controller $kelulusan=Mohon::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) ->where('masalulus','=','') + ->where('pelulus','!=','operasi') ->get(); return response()->json($kelulusan); } - public function listdahlulus($kodcaw,$norujukan) + public function listdahlulus($kodcaw,$norujukan,Request $request) { $harini = Carbon::now(); $harini = new Carbon; $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $kelulusan=Mohon::on($cawangan['mysql']) - ->where('tarikh','=',$harini->toDateString()) - ->where('norujukan','=',$norujukan) - ->where('masalulus','<>','') - ->get(); + + $kelulusan=Mohon::on($cawangan['mysql']) + ->where('tarikh','=',$harini->toDateString()) + ->where('norujukan','=',$norujukan) + ->where('masalulus','<>','') + ->get(); + + + return response()->json($kelulusan); } @@ -63,16 +68,39 @@ class KelulusanController extends Controller $harini = new Carbon; $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $pengesahan = $request->pengesahan; + if($pengesahan == 'khazanah') + { + $kelulusan=Mohon::on($cawangan['mysql']) + ->where('tarikh','=',$harini->toDateString()) + ->where('norujukan','=',$norujukan) + ->update(array( + 'masalulus'=> $harini->toTimeString(), + 'khazanah'=> 'khazanah' + + )); + } + else + { + $kelulusan=Mohon::on($cawangan['mysql']) + ->where('tarikh','=',$harini->toDateString()) + ->where('norujukan','=',$norujukan) + ->update(array( + 'pelulus' => 'operasi' + )); + } - - $kelulusan=Mohon::on($cawangan['mysql']) - ->where('tarikh','=',$harini->toDateString()) - ->where('norujukan','=',$norujukan) - ->update(array( - 'masalulus'=> $harini->toTimeString() - - )); + if($request->sahkan === 1) + { + $kelulusan=Mohon::on($cawangan['mysql']) + ->where('tarikh','=',$harini->toDateString()) + ->where('norujukan','=',$norujukan) + ->update(array( + 'pelulus' => 'dahlulus', + 'masalulus'=> $harini->toTimeString() + )); + } return response()->json($kelulusan,201); } @@ -116,6 +144,7 @@ class KelulusanController extends Controller 'jumpinj' => $request->jumpinjam, 'jenistebus' => $request->jenistebus, 'teller' => $request->teller, + 'pelulus' => 'minta', 'peloperasi' => $request->peloperasi ]); @@ -209,6 +238,7 @@ class KelulusanController extends Controller $kelulusan=Mohon::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) ->where('masalulus','=','') + ->where('pelulus','=','operasi') ->get(); if(sizeof($kelulusan) != 0){ diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 13bfd00..175e2a7 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -118,6 +118,10 @@ class MarhunController extends Controller } public function getLaporanMarhunTerkumpul($kodcaw,$tarikh){ + + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $marhun = Marhun::on($cawangan['mysql']) @@ -125,6 +129,7 @@ class MarhunController extends Controller ->rightJoin('Gadai', 'Gadai.norujukan', '=', 'Marhun.norujukan') ->rightJoin('Customer', 'Customer.kpbaru', '=', 'Gadai.nokp') ->where('Marhun.t_gadai','<=',$tarikh) + ->whereYear('Marhun.t_gadai','=',$current->year) ->where('Gadai.sttebus','=','') ->orderBy('Marhun.norujukan') ->get(); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 88f8f14..edc3c25 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -257,6 +257,8 @@ class TebusController extends Controller { $rebet = $this->rebet($kodcaw,$norujukan); } + else + $rebet = 0; $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( @@ -382,7 +384,7 @@ class TebusController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $wakil = Wakil::on($cawangan['mysql']) - ->where('NOWAKIL','=',$nowakil) + ->where('nowakil','=',$nowakil) ->get(); return response()->json($wakil,200); From 58cab5f4488606fcc03beaa44297653076794e3e Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 17 Jan 2021 08:56:27 +0800 Subject: [PATCH 2/2] fix kelulusan --- app/Http/Controllers/GadaiController.php | 6 +++--- app/Http/Controllers/KelulusanController.php | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 4f8e2bb..5d58ccc 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -396,7 +396,7 @@ class GadaiController extends Controller ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman') ->where('t_gadai','<=',$tarikh) // ->where('sttebus','=','') - ->whereYear('t_gadai','=',$current->year) + // ->whereYear('t_gadai','=',$current->year) ->orderBy('t_gadai','desc') ->get(); @@ -405,7 +405,7 @@ class GadaiController extends Controller ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan') ->where('t_gadai','<=',$tarikh) ->where('sttebus','=','T') - ->whereYear('t_gadai','=',$current->year) + // ->whereYear('t_gadai','=',$current->year) ->orderBy('t_gadai','desc') ->get(); @@ -413,7 +413,7 @@ class GadaiController extends Controller ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman') ->where('t_gadai','<=',$tarikh) ->where('sttebus','=','L') - ->whereYear('t_gadai','=',$current->year) + // ->whereYear('t_gadai','=',$current->year) ->orderBy('t_gadai','desc') ->get(); diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 99f7355..04fd5dc 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -77,8 +77,7 @@ class KelulusanController extends Controller ->where('norujukan','=',$norujukan) ->update(array( 'masalulus'=> $harini->toTimeString(), - 'khazanah'=> 'khazanah' - + 'pelulus'=> 'khazanah' )); } else