From 94d80b497114059b32542a06a2446283c3ea0d59 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Mon, 12 Jul 2021 10:47:22 +0800 Subject: [PATCH 1/6] fix --- app/Http/Controllers/GadaiController.php | 11 +++++++---- app/Http/Controllers/TebusController.php | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index be7bf5f..84d01fd 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -921,6 +921,7 @@ class GadaiController extends Controller $dateans = new Carbon($request->tarikh); $ansuran = Transaction::on('mysql7') + ->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller') ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -2547,12 +2548,14 @@ class GadaiController extends Controller ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) ->sum('pinjaman'); - $Tebus = Gadai::on($cawangan['mysql']) - ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan') - ->where('Gadai.tagpalsu','=',0) - ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['Gadai.sttebus','=','T'],['Gadai.hargajualan','<>','NULL']]) + $Tebus = Tebus::on($cawangan['mysql']) + ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan') + ->where('gad.tagpalsu','=',0) + ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']]) ->sum('teb.pinjaman'); + dd($Tebus); + $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus]; return response()->json($rekod_pinjamandiberi); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index b126639..425d2b2 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -515,6 +515,7 @@ class TebusController extends Controller }) ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan') ->where('tebus.t_tebus','=',$tarikh) + ->groupBy('tebus.norujukan') ->orderBy('tebus.teller') ->orderBy('tebus.sirit') ->get(); From 4bd4f814ccc83fafaaec932a43f4376ab105d245 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 13 Jul 2021 17:22:58 +0800 Subject: [PATCH 2/6] fix skit2 --- app/Http/Controllers/GadaiController.php | 72 ++++++++---------------- app/Http/Controllers/TebusController.php | 11 +--- 2 files changed, 25 insertions(+), 58 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 84d01fd..5d23143 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2542,19 +2542,19 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $Gadai = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) - ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) - ->sum('pinjaman'); + // $Gadai = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',0) + // ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) + // ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) + // ->sum('pinjaman'); + + $Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman'); $Tebus = Tebus::on($cawangan['mysql']) - ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan') + ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') ->where('gad.tagpalsu','=',0) - ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']]) - ->sum('teb.pinjaman'); - - dd($Tebus); + ->where([['tebus.t_tebus','>=',$request->mula],['tebus.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']]) + ->sum('tebus.pinjaman'); $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus]; @@ -2676,29 +2676,15 @@ class GadaiController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $rekodaudit = Gadai::on($cawangan['mysql']) + $audit = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->get(); + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); - $totalrekod = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('pinjaman'); - - $totalberat = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('berat'); - - $totalnilaimarhun = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('nilaimarhun'); + $rekodaudit = $audit->get(); + $totalrekod = $audit->sum('pinjaman'); + $totalberat = $audit->sum('berat'); + $totalnilaimarhun = $audit->sum('nilaimarhun'); $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; @@ -2709,29 +2695,15 @@ class GadaiController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $rekodaudit = Gadai::on($cawangan['mysql']) + $audit = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',1) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->get(); + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); - $totalrekod = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('pinjaman'); - - $totalberat = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('berat'); - - $totalnilaimarhun = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('nilaimarhun'); + $rekodaudit = $audit->get(); + $totalrekod = $audit->sum('pinjaman'); + $totalberat = $audit->sum('berat'); + $totalnilaimarhun = $audit->sum('nilaimarhun'); $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 425d2b2..08e1499 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1051,29 +1051,24 @@ class TebusController extends Controller $current = Carbon::now(); $current = new Carbon(); - if($request->tarikh < '2021-06-09') { $keuntungan = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<', $request->tarikh) - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); - $keuntunganreducing = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); - - // dd($keuntungan,$keuntunganreducing); - $total = ($keuntungan + $keuntunganreducing); From 3311dbd859d95ea22cf21de643b38744d29700fa Mon Sep 17 00:00:00 2001 From: fifi97 Date: Wed, 14 Jul 2021 10:19:02 +0800 Subject: [PATCH 3/6] fix skit2 --- app/Http/Controllers/KelulusanController.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 0ebd9d6..6f35d4a 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -99,7 +99,8 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'masalulus' => $harini->toTimeString(), - 'pelulus' => 'khazanah' + 'pelulus' => 'khazanah', + 'khazanah' => $request->namakhazanah )); }else{ @@ -110,7 +111,8 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'masalulus'=> 'batal', - 'pelulus'=> 'khazanah' + 'pelulus'=> 'khazanah', + 'khazanah' => $request->namakhazanah )); } @@ -125,7 +127,9 @@ class KelulusanController extends Controller ->where('norujukan','=',$norujukan) ->where('siri','=',$request->siri) ->update(array( - 'pelulus' => 'operasi' + 'pelulus' => 'operasi', + 'khazanah' => $request->namakhazanah + )); } @@ -137,7 +141,8 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'operasi', - 'masalulus' => 'batal' + 'masalulus' => 'batal', + 'khazanah' => $request->namakhazanah )); } } @@ -150,6 +155,7 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'dahlulus', + 'operasi' => $request->namaoperasi, 'masalulus'=> $harini->toTimeString() )); }else if($request->sahkan === 2){ @@ -159,6 +165,7 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'dahlulus', + 'operasi' => $request->namaoperasi, 'masalulus'=> 'batal' )); } From bca8e2ec0d6e2e2a06ebf04be1d16ef2a4e1f511 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 14 Jul 2021 16:43:23 +0800 Subject: [PATCH 4/6] fix sedikit2 --- app/Http/Controllers/GadaiController.php | 8 +++----- app/Http/Controllers/PolisController.php | 19 +++++++++++++++++++ routes/web.php | 1 + 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 5d23143..a5d81f3 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2507,7 +2507,7 @@ class GadaiController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']]) + ->where([['t_gadai','<=',$tarikhtawarruq]]) ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]]) ->sum('pinjaman'); @@ -2677,9 +2677,8 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $audit = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); + ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); $rekodaudit = $audit->get(); $totalrekod = $audit->sum('pinjaman'); @@ -2696,7 +2695,6 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $audit = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); diff --git a/app/Http/Controllers/PolisController.php b/app/Http/Controllers/PolisController.php index 5f92ddb..8bf4b10 100644 --- a/app/Http/Controllers/PolisController.php +++ b/app/Http/Controllers/PolisController.php @@ -54,4 +54,23 @@ class PolisController extends Controller return response()->json($polis); } + + public function editPolis(Request $request) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $polis = Polis::on($cawangan['mysql']) + ->where('norujukan','=',$request->norujukan) + ->update([ + 'komen1' => $request->komen1, + 'komen2' => $request->komen2, + 'teller' => $request->teller + ]); + + return response()->json($polis); + + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index a0cae3a..5c8e9b7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -214,6 +214,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('polis/get/',['uses'=>'PolisController@getPolis']); $router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']); $router->post('polis/create/',['uses'=>'PolisController@createPolis']); + $router->put('polis/edit/',['uses'=>'PolisController@editPolis']); //LAPORAN API From 8a81343bee3e53b1b6976227f21d4776e0707adf Mon Sep 17 00:00:00 2001 From: fifi97 Date: Thu, 15 Jul 2021 04:37:56 +0800 Subject: [PATCH 5/6] fix polis --- app/Http/Controllers/PolisController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/PolisController.php b/app/Http/Controllers/PolisController.php index 8bf4b10..17d5228 100644 --- a/app/Http/Controllers/PolisController.php +++ b/app/Http/Controllers/PolisController.php @@ -68,7 +68,7 @@ class PolisController extends Controller 'komen1' => $request->komen1, 'komen2' => $request->komen2, 'teller' => $request->teller - ]); + ]); return response()->json($polis); From 659d3b828bbe89cfd38db4fea3ae519f3e92dab6 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 15 Jul 2021 11:14:48 +0800 Subject: [PATCH 6/6] fix lelong --- app/Http/Controllers/LelongController.php | 15 +++++++++++++++ routes/web.php | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index d98c88c..6bedf89 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -496,4 +496,19 @@ class LelongController extends Controller return response()->json($cajperkhidmatan,200); } + public function LelonganHarini($kodcaw) + { + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $lelong = Lelong::on($cawangan['mysql']) + ->whereNotNull('t_jual') + ->where('t_jual','=', $current->toDateString()) + ->sum('hargajual'); + + return response()->json($lelong,200); + } + } diff --git a/routes/web.php b/routes/web.php index 5c8e9b7..8ab5013 100644 --- a/routes/web.php +++ b/routes/web.php @@ -116,7 +116,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('bakilelong/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelong']); $router->get('bakilelong/cawangan/{kodcaw}/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelongEachCawangan']); $router->get('bilangandilelong/{noic}',['uses'=>'LelongController@BilAkanDilelong']); - $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanLelong']); //laporan lelong + $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); //laporan lelong + $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); //laporan lelong + //Marhun API