From 178989ab3df38f9b20cd53ea714b735f5e149db9 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sat, 22 Jan 2022 00:08:40 +0800 Subject: [PATCH 1/3] pembaikan tentang portal --- app/Http/Controllers/AdminPageController.php | 2 +- app/Http/Controllers/GadaiController.php | 29 ++++++++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 87db736..94f02d3 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -9,7 +9,7 @@ use App\Gadai; use App\Lelong; use App\Tebus; use App\Vault; -use App\Gldetail; +use App\GlDetail; use App\Panjar; use App\TransactionOnline; use App\Tunai; diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 3d08c7b..25d6943 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3270,45 +3270,50 @@ class GadaiController extends Controller $array_totalup = []; for($i=0;$i<12;$i++){ - if($i == 0){ - $monthly_array_date = $monthly_array->startOfMonth()->subMonths(0); - }else{ - $monthly_array_date = $monthly_array->startOfMonth()->subMonths(1); - } - - if($monthly_array_date->year === $current->year) - { - switch($monthly_array_date->month){ + + switch($i+1){ case 1: $namabulan = 'Jan'; + $tarikh = $current->year . '-' . '01'; break; case 2: $namabulan = 'Feb'; + $tarikh = $current->year . '-' . '02'; break; case 3: $namabulan = 'Mac'; + $tarikh = $current->year . '-' . '03'; break; case 4: $namabulan = 'Apr'; + $tarikh = $current->year . '-' . '04'; break; case 5: $namabulan = 'Mei'; + $tarikh = $current->year . '-' . '05'; break; case 6: $namabulan = 'Jun'; + $tarikh = $current->year . '-' . '06'; break; case 7: $namabulan = 'Jul'; + $tarikh = $current->year . '-' . '07'; break; case 8: $namabulan = 'Aug'; + $tarikh = $current->year . '-' . '08'; break; case 9: $namabulan = 'Sep'; + $tarikh = $current->year . '-' . '09'; break; case 10: $namabulan = 'Okt'; + $tarikh = $current->year . '-' . '10'; break; case 11: $namabulan = 'Nov'; + $tarikh = $current->year . '-' . '11'; break; case 12: $namabulan = 'Dis'; + $tarikh = $current->year . '-' . '12'; + break; } - array_push($array_totalup,['tarikh'=>$monthly_array_date->year.'-'.sprintf("%02d", $monthly_array_date->month),'namabulan'=>$namabulan,'pembiayaan'=>0,'bayaran'=>0]); - } + array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'pembiayaan'=>0,'bayaran'=>0]); + } - foreach($cawangan_all as $index=>$cawangan){ $gadai = Gadai::on($cawangan['mysql']) From 90f2d2b1e8a7049e873a9b7726386d57c9d704d7 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 28 Jan 2022 21:04:40 +0800 Subject: [PATCH 2/3] fix skit2 --- app/Http/Controllers/AdminPageController.php | 45 +++++++++++++++++--- routes/web.php | 1 + 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 94f02d3..a1713c8 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -986,7 +986,7 @@ class AdminPageController extends Controller $tebuslatest = Gadai::on($cawangan['mysql']) ->whereYear('t_update',$current->year) - ->where([['sttebus','=','T'],['t_update','<=',$harini],['t_update','>=',$monthly_date]]) + ->where([['sttebus','!=',''],['t_update','<=',$harini],['t_update','>=',$monthly_date]]) ->orderBy('t_update','asc') ->sum('pinjaman'); @@ -1039,9 +1039,10 @@ class AdminPageController extends Controller } - $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakipjm'); + $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('pinjaman'); + $lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$harini)->sum('pinjaman'); - $tebusToday += $tebus; + $tebusToday = $tebus + $lelong; $diffTebusPercent = 0; @@ -1140,11 +1141,31 @@ class AdminPageController extends Controller $upah_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakiupah'); $upah_today = Advansur::on($cawangan['mysql'])->where('tarikh',$harini)->sum('upahDibayar'); - $upahToday = $upahToday + $upah_tebus_today + $upah_today; + $upahToday += $upah_today; - $ansuran_today = TransaksiKeuntungan::on('mysql7')->where([['tarikh_bayaran','>=',$harini . ' 00:00:00'],['tarikh_bayaran','<=',$harini . ' 23:59:59']])->where('kodcaw','=',$request->kodcaw)->sum('bayaran_keuntungan'); + $ansuran_today = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->where('transaction.trans_type','=','A') + ->where([['trans.tarikh_bayaran','>=',$harini . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']]) + ->where('trans.kodcaw','=',$request->kodcaw) + ->sum('bayaran_keuntungan'); - $upahToday = $upahToday + $ansuran_today; + $upah_tebus_today = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->where('transaction.trans_type','!=','A') + ->where([['trans.tarikh_bayaran','>=',$harini . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']]) + ->where('trans.kodcaw','=',$request->kodcaw) + ->sum('keuntungan_rebet'); + + $upahToday = $upah_tebus_today + $ansuran_today; $diffUpah = 0; @@ -1446,4 +1467,16 @@ class AdminPageController extends Controller return response()->json($blacklist, 201); } + public function DeleteBlackList(Request $request) + { + + $customer = Customer::on('mysql7') + ->where('kpbaru','=', $request->nokp) + ->orWhere('kplama','=', $request->nokp) + ->first(); + + $blacklist = Blacklist::where('id',$id)->delete(); + + return response()->json($blacklist, 201); + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 93d2b02..7928bc2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -658,6 +658,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('simpanStatus',['uses'=>'AdminPageController@SimpanStatus']); $router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']); + $router->get('DeleteBlacklist/{kodcaw}',['uses'=>'AdminPageController@DeleteBlackList']); $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']); From 17a274bb89cfcf1e36e37cbffbc7f42bb0665b1c Mon Sep 17 00:00:00 2001 From: fifi97 <46933637+fifi97@users.noreply.github.com> Date: Sat, 29 Jan 2022 12:40:54 +0800 Subject: [PATCH 3/3] fix data penebusan untuk tambahan lelong dengan tambahan whitelist --- app/Http/Controllers/AdminPageController.php | 12 +++--------- routes/web.php | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index a1713c8..c6bb1ae 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -195,7 +195,7 @@ class AdminPageController extends Controller $tebus = Gadai::on($cawangan['mysql']) ->whereYear('t_update',$current->year) - ->where('sttebus','=','T') + ->where('sttebus','!=','') ->sum('pinjaman'); @@ -597,7 +597,7 @@ class AdminPageController extends Controller ->groupBy(DB::connection($cawangan['mysql']) ->raw("DATE_FORMAT(t_update,'%Y%m')")) ->whereYear('t_update',$current->year) - ->where([['sttebus','=','T'],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]]) + ->where([['sttebus','!=',''],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]]) ->orderBy('t_update','asc') ->get(); @@ -1469,13 +1469,7 @@ class AdminPageController extends Controller public function DeleteBlackList(Request $request) { - - $customer = Customer::on('mysql7') - ->where('kpbaru','=', $request->nokp) - ->orWhere('kplama','=', $request->nokp) - ->first(); - - $blacklist = Blacklist::where('id',$id)->delete(); + $blacklist = Blacklist::where('id',$request->id)->delete(); return response()->json($blacklist, 201); } diff --git a/routes/web.php b/routes/web.php index b9d1210..f313ee0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -660,7 +660,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('simpanStatus',['uses'=>'AdminPageController@SimpanStatus']); $router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']); - $router->get('DeleteBlacklist/{kodcaw}',['uses'=>'AdminPageController@DeleteBlackList']); + $router->post('DeleteBlacklist',['uses'=>'AdminPageController@DeleteBlackList']); $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);