From e350d84c27d30978d2bb5ecb3668b09f43044b49 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Fri, 16 Apr 2021 20:52:16 +0800 Subject: [PATCH 1/4] add ubah wakil --- app/Http/Controllers/TebusController.php | 13 +++++++++++++ routes/web.php | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 24b7f51..cbdb49d 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -436,6 +436,19 @@ class TebusController extends Controller return response()->json($wakil_create ,201); } + public function UbahWakil($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $wakil = $request->nowakil; + + $update_wakil = Tebus::on($cawangan['mysql'])->where('norujukan','=',$request->norujukan)->update(array( + "nowakil" => $wakil + )); + + return response()->json($update_wakil ,201); + } + public function listhistorypenebusan($kodcaw,Request $request){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); diff --git a/routes/web.php b/routes/web.php index e111cb3..5ae739a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -255,7 +255,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']); $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']); $router->get('getwakil/{kodcaw}/code/{nowakil}',['uses' => 'TebusController@getWakilbycode']); - + $router->put('ubahwakil/{kodcaw}',['uses'=>'TebusController@UbahWakil']); $router->post('createwakil/{kodcaw}/{icno}',['uses' => 'TebusController@createWakil']); //update tagterima Tebus From b2d1f512fb13c6afcd98d07a0146192986f52bc8 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Fri, 16 Apr 2021 23:34:58 +0800 Subject: [PATCH 2/4] buat kemaskini upah --- .../Controllers/TransactionController.php | 16 ++++++ app/Pengguna.php | 54 +++++++++++++++++++ routes/web.php | 3 ++ 3 files changed, 73 insertions(+) create mode 100644 app/Pengguna.php diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 141bb02..da7c4c8 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -3,6 +3,9 @@ namespace App\Http\Controllers; use App\Transaction; +use App\Pengguna; +use App\Cawangan; + use Illuminate\Http\Request; use Carbon\Carbon; @@ -68,4 +71,17 @@ class TransactionController extends Controller return response()->json($transaction); } + + public function GetPengguna($kodcaw,Request $request) + { + $namateller = $request->namateller; + + $namateller = 'NUR ADNIN BINTI MOHAMED'; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $pengguna=Pengguna::on($cawangan['mysql']) + ->where('nama','=',$namateller)->limit(1)->get(); + + return response()->json($pengguna); + } } \ No newline at end of file diff --git a/app/Pengguna.php b/app/Pengguna.php new file mode 100644 index 0000000..a0ad7b9 --- /dev/null +++ b/app/Pengguna.php @@ -0,0 +1,54 @@ +group(['prefix'=>'api'], function () use ($router){ $router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']); //transaction kira sum all bayaran online cawangan + //NAMA PENGGUNA TAMBAH KODLALUAN + $router->get('get/pengguna/{kodcaw}',['uses'=>'TransactionController@GetPengguna']); + //IMBANG DUGA// //Dua-Dua Table From 957d3c82a27e2b189e276dc0beaac7da2b0d9ff4 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 18 Apr 2021 16:13:42 +0800 Subject: [PATCH 3/4] fix skit2 --- app/Http/Controllers/TebusController.php | 31 +++++++++++++++++++ .../Controllers/TransactionController.php | 2 -- routes/web.php | 6 ++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index cbdb49d..8e292b7 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -470,6 +470,37 @@ class TebusController extends Controller return response()->json($listadvansur,200); } + public function SenaraiAdvansur($kodcaw,Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $listadvansur = Advansur::on($cawangan['mysql']) + ->where('teller','=',$request->kodlaluan) + ->where('tarikh','=',$current->toDateString()) + ->orderBy('tarikh','desc') + ->get(); + + return response()->json($listadvansur,200); + } + + public function getAdvansurByKodlaluan($kodcaw,Request $request) + { + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $listadvansur = Advansur::on($cawangan['mysql']) + ->where('teller','=',$request->kodlaluan) + ->where('tarikh','=',$current->toDateString()) + ->sum('upahdibayar'); + + return response()->json($listadvansur,200); + } + public function createAdvansur($kodcaw,Request $request){ $current = Carbon::now(); $current = new Carbon(); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index da7c4c8..b333220 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -76,8 +76,6 @@ class TransactionController extends Controller { $namateller = $request->namateller; - $namateller = 'NUR ADNIN BINTI MOHAMED'; - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $pengguna=Pengguna::on($cawangan['mysql']) ->where('nama','=',$namateller)->limit(1)->get(); diff --git a/routes/web.php b/routes/web.php index 45b2db8..239b588 100644 --- a/routes/web.php +++ b/routes/web.php @@ -177,9 +177,11 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']); - //ANSURAN API + //ANSURAN UPAH API $router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong - $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); + $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); + $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']); + $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']); $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']); //LAPORAN API From 1f9b8bbea98ca4c22df3a440839a5231c216f54d Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 19 Apr 2021 00:19:14 +0800 Subject: [PATCH 4/4] baiki backdate imbangduga --- app/Http/Controllers/GadaiController.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 8254c8f..ec53c06 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1939,16 +1939,16 @@ class GadaiController extends Controller $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) + ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']]) + ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']]) ->sum('pinjaman'); - $gadaibaru = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('pinjaman'); + // $gadaibaru = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',0) + // ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]]) + // ->sum('pinjaman'); - $rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru; + // $rekod_pinjamandiberi; $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; @@ -1962,10 +1962,12 @@ class GadaiController extends Controller if($request->tarikh > '2021-04-13'){ $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']]) - // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]]) - ->sum('pinjaman'); + ->where('tagpalsu','=',0) + // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]]) + ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']]) + // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']]) + ->sum('pinjaman'); } return response()->json($rekod_pinjamandiberi);