From 91897ae869c8d286fb6cad0b95f420d5eef9a933 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Thu, 20 Jun 2024 09:31:23 +0800 Subject: [PATCH 1/3] add get balance --- .../Reports/BalanceSheetsController.php | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 app/Http/Controllers/Reports/BalanceSheetsController.php diff --git a/app/Http/Controllers/Reports/BalanceSheetsController.php b/app/Http/Controllers/Reports/BalanceSheetsController.php new file mode 100644 index 0000000..9c0b1e7 --- /dev/null +++ b/app/Http/Controllers/Reports/BalanceSheetsController.php @@ -0,0 +1,22 @@ +where('kodcaw','=',$request->kodcaw)->first(); + + $list_imbangan = imbangdugabackup::on($cawangan['mysql']) + ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]]) + ->paginate(5); + + return json_encode($list_imbangan); + } +} From c97ea041cdf43f85e131825e6530443c840f5d7f Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Thu, 20 Jun 2024 09:32:01 +0800 Subject: [PATCH 2/3] add reports route --- routes/report.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routes/report.php b/routes/report.php index 2903a97..14df879 100644 --- a/routes/report.php +++ b/routes/report.php @@ -25,5 +25,7 @@ $router->group(['prefix' => 'api/reports'], function () use ($router) { $router->get('getTotalCurrentProfit/{kod_cawangan}', ['uses' => 'OnePercentController@getCurrentProfit']); $router->get('stokaudit/get',['uses' => 'OnePercentController@getStokAuditBackdate']); + + $router->get('balancesheets/get',['uses' => 'BalanceSheetsController@getBalanceSheetsList']); }); }); From cee249564145a961f883c93bef97224c6907b6ea Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Wed, 3 Jul 2024 16:09:29 +0800 Subject: [PATCH 3/3] fix keuntungan akru percent --- app/Services/Reports/OnePercentService.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Services/Reports/OnePercentService.php b/app/Services/Reports/OnePercentService.php index aeb93e3..bd63f56 100644 --- a/app/Services/Reports/OnePercentService.php +++ b/app/Services/Reports/OnePercentService.php @@ -469,7 +469,12 @@ class OnePercentService } private function filterCollection($collection,$type,$sumtype) : Float{ - return $collection->filter(function ($item) use($type) { + + $array_type = ['T','S','P','AT']; + return $collection->filter(function ($item) use($type,$array_type) { + if($type == 'T') + return in_array($type, $array_type); + return $item->trans_type === $type; })->sum($sumtype); }