From b0251cb4a1f6c3b3ca725ffecf6d9242cdd18d2d Mon Sep 17 00:00:00 2001 From: afiq Date: Sat, 4 Sep 2021 22:45:47 +0800 Subject: [PATCH 1/3] keluar lelong --- app/Http/Controllers/LelongController.php | 28 +++++++++++++++++++ app/LelMarhun.php | 24 ++++++++++++++++ app/LelTebus.php | 34 +++++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 app/LelMarhun.php create mode 100644 app/LelTebus.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 5e173ef..c09e025 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -13,6 +13,8 @@ use App\AnsRugi; use App\SerahBaki; use App\Tebus; use App\Advansur; +use App\LelTebus; +use App\LelMarhun; use Illuminate\Http\Request; @@ -558,6 +560,32 @@ class LelongController extends Controller foreach($cawangan_all as $index=>$cawangan){ $list_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus',$current->toDateString())->pluck('norujukan')->toArray(); $list_advansur_today = Advansur::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->pluck('norujukan')->toArray(); + + $gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([ + 'taglel' => 0 + ]); + $gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([ + 'sttebus' => '', + 'taglel' => 0 + ]); + $lelong_tebus = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->get(); + foreach($lelong_tebus as $index=>$tebus_lelong){ + $tebus_detail = Tebus::on($cawangan['mysql'])->where('norujukan',$tebus_lelong['norujukan'])->first(); + + $lel_tebus = LelTebus::on($cawangan['mysql'])->create([ + 'tarikh' => $current->toDateString(), + 'teller' => $tebus_detail['teller'], + 'norujukan' => $tebus_lelong['norujukan'], + 'batch_no' => $tebus_lelong['batchno'], + 'nilai_marhun' => $tebus_lelong['nilaimarhun'], + 'pinjaman' => $tebus_lelong['pinjaman'], + 'upah' => $tebus_detail['bakiupah'], + 'jbg' => $tebus_detail['jbg'], + 'jenis_tebus' => 'T', + ]); + } + $lelong_marhun_tebus = LelMarhun::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->delete(); + $lelong_marhun_adv = LelMarhun::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->delete(); $lelong_tebus = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->delete(); $lelong_advansur = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->delete(); } diff --git a/app/LelMarhun.php b/app/LelMarhun.php new file mode 100644 index 0000000..61cfaa9 --- /dev/null +++ b/app/LelMarhun.php @@ -0,0 +1,24 @@ + Date: Mon, 6 Sep 2021 11:01:49 +0800 Subject: [PATCH 2/3] fix merge --- app/Http/Controllers/GadaiController.php | 4 +++- app/Http/Controllers/LelongController.php | 4 +++- app/Http/Controllers/TebusController.php | 7 +++++-- app/Http/Controllers/VaultController.php | 10 ---------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 4e97892..7481f2f 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2419,7 +2419,9 @@ class GadaiController extends Controller // $rekod_pinjamandiberi; if($kodcaw === '011232') - $rekod_pinjamandiberi -= 282; + { + $rekod_pinjamandiberi -= 282; + } $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c09e025..fc37193 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -223,7 +223,9 @@ class LelongController extends Controller } if($kodcaw === '011232') + { $bakilelong += 6; + } $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; @@ -496,7 +498,7 @@ class LelongController extends Controller ->sum('cajlelong'); if($kodcaw === '011232') - $cajlelong += 122.5; + $cajlelong +=122.5; return response()->json($cajlelong,200); } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 8bb2172..4c5e809 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -568,7 +568,8 @@ class TebusController extends Controller ->whereNotNull('hargajualan') ->where('hargajualan','<>','bakihargajualan'); - $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm'); + // $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm'); + $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman'); $bilpenebusantawarruq = $tebustawarruq->count(); $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate'); $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah'); @@ -929,7 +930,9 @@ class TebusController extends Controller $total = $keuntungansebelumtawarruq + $keuntungan; if($kodcaw === '011232') - $total += 623.5; + { + $total +=623.5; + } return response()->json($total,200); } diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index ccd243e..66daf7f 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -400,16 +400,6 @@ class VaultController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - // $pendahuluan = Vault::on($cawangan['mysql']) - // ->where('kodcaw','=',$kodcaw) - // ->where('tarikh','<=', $request->tarikh) - // ->sum('pendahuluan'); - - // $serahan = Vault::on($cawangan['mysql']) - // ->where('kodcaw','=',$kodcaw) - // ->where('tarikh','<=', $request->tarikh) - // ->sum('serahan'); - $serahanpkb = '1000/020'; $serahanjmc = '1000/026'; $pendahuluanpkb = '7000/102'; From 5ac8c01a71b59bba1181eee9ac344199e8659309 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Wed, 15 Sep 2021 21:27:28 +0800 Subject: [PATCH 3/3] server latest --- app/Http/Controllers/GadaiController.php | 16 +++++++++++++--- app/Http/Controllers/LelongController.php | 18 ++++++++++++++++-- .../TacExpressPaymentController.php | 4 ++-- app/Http/Controllers/TebusController.php | 12 ++++++++++-- app/Http/Controllers/TunaiController.php | 2 +- routes/web.php | 1 + 6 files changed, 43 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 4e97892..db4fb98 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -658,10 +658,20 @@ class GadaiController extends Controller //Outstanding $outstanding = Gadai::on($cawangan['mysql']) - ->where('sttebus','=','') - ->sum('pinjaman'); + ->where([['tagpalsu','=',0],['t_gadai','<=',$current->toDateString()],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$current->toDateString()],['sttebus','!=',''],['t_gadai','<=',$current->toDateString()]]) + ->get(); - array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]); + $totaloutstanding = 0; + foreach($outstanding as $index1=>$os) + { + if($os['hargajualan'] == null) + $totaloutstanding += $os['pinjaman']; + else + $totaloutstanding += $os['bakipjm']; + } + + array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $totaloutstanding]); return response()->json($array_dashboard); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c09e025..87b4853 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -424,6 +424,20 @@ class LelongController extends Controller return response()->json($tuntutbaki,200); } + public function showTuntutBakiTarikh($kodcaw,Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $tuntutbaki = TuntutBaki::on($cawangan['mysql']) + ->where('tarikh','=', $request->tarikh) + ->get(); + + return response()->json($tuntutbaki,200); + } + public function showTuntutBakiTeller($kodcaw,Request $request){ $current = Carbon::now(); @@ -561,10 +575,10 @@ class LelongController extends Controller $list_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus',$current->toDateString())->pluck('norujukan')->toArray(); $list_advansur_today = Advansur::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->pluck('norujukan')->toArray(); - $gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([ + $gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([ 'taglel' => 0 ]); - $gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([ + $gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([ 'sttebus' => '', 'taglel' => 0 ]); diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php index 5e5cf7d..feb455a 100644 --- a/app/Http/Controllers/TacExpressPaymentController.php +++ b/app/Http/Controllers/TacExpressPaymentController.php @@ -26,8 +26,8 @@ class TacExpressPaymentController extends Controller $messages = 'SPARE : SMS-OTP '. $request->otp_token . ' for one time usage on ' . $expired_at . '. Call AR-RAHN CARELINE CENTRE 1300-22-4343 if not request'; $status = Http::get('http://gateway.onewaysms.com.au:10001/api.aspx',[ - 'apiusername' => 'APIQ4LP5EMKXM', - 'apipassword' => 'APIQ4LP5EMKXM7CQOX', + 'apiusername' => 'APIUK330HDAFO', + 'apipassword' => 'APIUK330HDAFOUK330', 'senderid' => 'INFO', 'mobileno' => $mobileno, 'message'=> $messages, diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 8bb2172..71dc89b 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -203,6 +203,10 @@ class TebusController extends Controller } $upah_semasa = (float)$upah_semasa - $upahtelahbayar; + if($upah_semasa <= 0){ + $upah_semasa = 0; + } + return $upah_semasa; } @@ -238,6 +242,10 @@ class TebusController extends Controller $upah_semasa = str_replace(',','',$upah_semasa); } $upah_semasa = (float)$upah_semasa - $upahtelahbayar; + + if($upah_semasa <= 0){ + $upah_semasa = 0; + } return response()->json($upah_semasa); } @@ -568,8 +576,8 @@ class TebusController extends Controller ->whereNotNull('hargajualan') ->where('hargajualan','<>','bakihargajualan'); - $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm'); - $bilpenebusantawarruq = $tebustawarruq->count(); + $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman'); + $bilpenebusantawarruq = $tebustawarruq->count(); $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate'); $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah'); diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 0cd76a5..f64ff7f 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -393,7 +393,7 @@ class TunaiController extends Controller $teller = Tunai::on($cawangan['mysql']) ->select('kodlaluan') - ->whereRaw('LENGTH(kodlaluan) > 14') + ->whereRaw('LENGTH(kodlaluan) > 10') ->distinct() ->get(); diff --git a/routes/web.php b/routes/web.php index 578ab7c..6b83392 100644 --- a/routes/web.php +++ b/routes/web.php @@ -340,6 +340,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //Tuntut Baki $router->get('TuntutBaki/{kodcaw}',['uses'=>'LelongController@showTuntutBaki']); + $router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBakiTarikh']); $router->get('TuntutBaki/{kodcaw}/teller',['uses'=>'LelongController@showTuntutBakiTeller']); $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']); $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']);