From efa191895f6dc7fed4c87f98a1e264e22e22b32b Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 24 Jul 2023 20:31:04 +0800 Subject: [PATCH] baiki conflict server 24/7/2023 --- app/BayaranHutang.php | 35 ++++++++++++++++++++ app/Http/Controllers/AdminPageController.php | 21 ++++++++++++ app/Penghutang.php | 34 +++++++++++++++++++ routes/web.php | 5 ++- 4 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 app/BayaranHutang.php create mode 100644 app/Penghutang.php diff --git a/app/BayaranHutang.php b/app/BayaranHutang.php new file mode 100644 index 0000000..5a9e0a5 --- /dev/null +++ b/app/BayaranHutang.php @@ -0,0 +1,35 @@ + +kodcaw == '010219'){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + $hutang = Penghutang::on($cawangan['mysql'])->where('tarikh','<=',$request->tarikh)->sum('hutang'); + $bakihutang = Penghutang::on($cawangan['mysql'])->where('tarikh','<=',$request->tarikh)->sum('baki_hutang'); + $array_hutang = ['hutang' => $hutang, 'bakihutang' => $bakihutang]; + + return response()->json($array_hutang); + } + } + + public function SenaraiBayaranHutang(Request $request){ + if($request->kodcaw == '010219'){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + $bayaran = BayaranHutang::on($cawangan['mysql'])->where('tarikh','<=',$request->tarikh)->sum('bayaran'); + $bayaran = (float)$bayaran; + return response()->json($bayaran); + } + } } diff --git a/app/Penghutang.php b/app/Penghutang.php new file mode 100644 index 0000000..8f5da79 --- /dev/null +++ b/app/Penghutang.php @@ -0,0 +1,34 @@ +group(['prefix'=>'admin'], function () use ($router){ $router->get('store/ringkasanharian',['uses'=>'AdminPageController@StoreRingkasanHarian']); $router->get('get/ringkasanharian',['uses'=>'AdminPageController@getRingkasanHarian']); - - - + $router->get('ig/penghutang',['uses'=>'AdminPageController@ListPenghutang']); + $router->get('ig/bayaran_penghutang',['uses'=>'AdminPageController@SenaraiBayaranHutang']); }); $router->group(['prefix'=>'lelong'], function () use ($router){