From 431f4bda4f91a6df9d283abe97ebcb39d6512c34 Mon Sep 17 00:00:00 2001 From: Afiq Date: Wed, 13 Jul 2022 09:57:46 +0800 Subject: [PATCH 1/4] lelong api --- app/Http/Controllers/GadaiController.php | 26 ++++++++++++++++++++++++ routes/web.php | 25 ++++++++++++++--------- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 43849e5..e0f95b1 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3613,4 +3613,30 @@ class GadaiController extends Controller return response()->json(number_format($total,2)); } + + public function updateTagLelong(Request $request){ + $norujukan = $request->norujukan; + $kodcaw = $request->kodcaw; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first(); + + $updateTag = Gadai::on($cawangan->mysql)->where('norujukan',$norujukan)->update([ + 'taglel'=>1 + ]); + + return response()->json('success'); + } + + public function revertTagLelong(Request $request){ + $norujukan = $request->norujukan; + $kodcaw = $request->kodcaw; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first(); + + $updateTag = Gadai::on($cawangan->mysql)->where('norujukan',$norujukan)->update([ + 'taglel'=>0 + ]); + + return response()->json('success'); + } } diff --git a/routes/web.php b/routes/web.php index ea4f777..4566789 100644 --- a/routes/web.php +++ b/routes/web.php @@ -11,9 +11,9 @@ | */ -$router->get('/', function () use ($router) { - return $router->app->version(); -}); +// $router->get('/', function () use ($router) { +// return $router->app->version(); +// }); // $router->get('/key', function() { // return \Illuminate\Support\Str::random(32); // }); @@ -22,13 +22,13 @@ $router->group(['namespace' => '\Rap2hpoutre\LaravelLogViewer'], function() use $router->get('logs', 'LogViewerController@index'); }); -$router->get('_/phpinfo', function () { - ob_start(); - phpinfo(); - $response = ob_get_contents(); - ob_get_clean(); - return $response; - }); +// $router->get('_/phpinfo', function () { +// ob_start(); +// phpinfo(); +// $response = ob_get_contents(); +// ob_get_clean(); +// return $response; +// }); $router->group(['prefix'=>'api'], function () use ($router){ //Customer API @@ -708,6 +708,11 @@ $router->group(['prefix'=>'admin'], function () use ($router){ }); +$router->group(['prefix'=>'lelong'], function () use ($router){ + $router->post('taglel/update',['uses'=>'GadaiController@updateTagLelong']); + $router->post('taglel/revert',['uses'=>'GadaiController@revertTagLelong']); +}); + $router->group(['prefix'=>'kelantanpay'], function () use ($router){ $router->get('gadai/customer',['uses'=>'KelantanPayController@index']); $router->post('payment/gadai',['uses'=>'KelantanPayController@postPayment']); From 113ef50df1fada9a6188b0938e799d4107e4cff7 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Mon, 25 Jul 2022 22:19:13 +0800 Subject: [PATCH 2/4] from server --- app/Http/Controllers/GadaiController.php | 2 +- app/Http/Controllers/TebusController.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 43849e5..c8b9171 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3467,7 +3467,7 @@ class GadaiController extends Controller $gadai_all = Gadai::on($cawangan['mysql'])->where('sttebus','')->where('hargajualan','!=','bakihargajualan')->get(); foreach($gadai_all as $index=>$gadai){ $totalbayaran = round($gadai['hargajualan'] - $gadai['bakihargajualan'],1); - $upah6bln_raw = $gadai['bakiupah'] - 0.2; + $upah6bln_raw = $gadai['bakiupah'] - 0.5; $upah6bln_round = number_format($upah6bln_raw,2); $upah6bln = substr($upah6bln_round, 0, -1); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 1c58952..72c370c 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1121,7 +1121,7 @@ class TebusController extends Controller ->sum('upahdibayar'); $upahlelong = Lelong::on($cawangan['mysql']) - ->where([['t_jual','<=',$request->tarikh],['t_jual','>','2013-12-31']]) + ->where([['t_jual','<=',$request->tarikh],['t_jual','>','2013-12-31'],['t_jual','<=','2022-07-24']]) ->whereYear('t_jual','=',$current->year) ->sum('bakiupah'); @@ -1708,7 +1708,13 @@ class TebusController extends Controller // dd($ansuran); - $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); + $upahlelong = Lelong::on($cawangan['mysql']) + ->where([['t_jual','<=',$request->tarikh],['t_jual','>','2022-07-24']]) + ->whereYear('t_jual','=',$current->year) + ->sum('bakiupah'); + + + $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran + $upahlelong); } From 8542ca52ffa14a7ce737fe7ac2f0d4f7e89a1f22 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Mon, 25 Jul 2022 23:19:22 +0800 Subject: [PATCH 3/4] merge zone2 server --- app/Http/Controllers/CustomerController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 4e38b3d..3a38793 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -138,17 +138,21 @@ class CustomerController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - if($status == 'belum_tebus' || $status == 'sudah_tebus'){ + if($status == 'belum_tebus'){ + $gadai = Gadai::on($cawangan['mysql']) + ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]]) + ->get(); + }elseif($status == 'sudah_tebus'){ $gadai = Gadai::on($cawangan['mysql']) ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]]) - ->get(); + ->orderBy('t_update', 'desc') + ->take(50)->get(); }elseif($status == 'lelong'){ $gadai = Gadai::on($cawangan['mysql']) ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]]) ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') ->get(); - } - + } return response()->json($gadai); } From 27f8a56fb2dfd7c4084f564b26d4e3bd73daceb0 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 25 Jul 2022 23:36:04 +0800 Subject: [PATCH 4/4] persediaan kemasukan ke server untuk semua editing --- app/Http/Controllers/CustomerController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 3a38793..66b17e9 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -146,7 +146,7 @@ class CustomerController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]]) ->orderBy('t_update', 'desc') - ->take(50)->get(); + ->take(100)->get(); }elseif($status == 'lelong'){ $gadai = Gadai::on($cawangan['mysql']) ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])