From b611efe902725172632bae9e3593fb3a2636501d Mon Sep 17 00:00:00 2001 From: afiq Date: Thu, 25 Feb 2021 09:50:49 +0800 Subject: [PATCH 1/3] push --- app/Http/Controllers/KomuditiController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index 8b7af78..39455e2 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -200,6 +200,7 @@ class KomuditiController extends Controller 'baki_komoditi'=>number_format($baki_komoditi,2), 'percentage_komoditi_transaksi'=>number_format($percentage_komoditi_transaksi,1), 'percentage_baki_komoditi'=>number_format($percentage_baki_komoditi,1)]); + } public function statistikKomoditiDashboard(Request $request){ $current = Carbon::now(); From 4bc081728d97ee00022fa2d5b686edc1486c0c66 Mon Sep 17 00:00:00 2001 From: "LAPTOP-DGCU80CH\\user1" Date: Thu, 25 Feb 2021 12:33:23 +0800 Subject: [PATCH 2/3] update --- app/Http/Controllers/KomuditiController.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index 39455e2..20be971 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -292,4 +292,15 @@ class KomuditiController extends Controller } + public function rekodTransaksiKomoditi(Request $request){ + $rekod = KomuditiTransaksi::on('mysql7')->selectRaw('SUM(unit_komuditi) as totalkomoditi')->addSelect('kodcaw')->where('tarikh','=',$request->tarikh)->groupBy('kodcaw')->get(); + $rekodkomoditi = []; + foreach($rekod as $index=>$rekodtransaksi){ + $cawangan =Cawangan::on('mysql7')->select('details_caw')->where('kodcaw','=',$rekodtransaksi['kodcaw'])->first(); + array_push($rekodkomoditi,['totalkomoditi'=>$rekodtransaksi['totalkomoditi'],'cawangan'=>$cawangan['details_caw']]); + } + + return response()->json($rekodkomoditi); + } + } \ No newline at end of file From 3e8454d887508a426c0861107b64db6fce7a9338 Mon Sep 17 00:00:00 2001 From: izzatizulkifli Date: Thu, 25 Feb 2021 16:06:08 +0800 Subject: [PATCH 3/3] update api dashboard komoditi --- app/Http/Controllers/GadaiController.php | 2 +- app/Http/Controllers/KomuditiController.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 86fe2b9..381f245 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1538,7 +1538,7 @@ class GadaiController extends Controller array_push($array_percentage,['cawangan'=>$top5['cawangan'],'percentage_gadai'=>number_format($percentage,2)]); } - + // dd($array_percentage); return response()->json($array_percentage); } diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index 20be971..e299d42 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -200,6 +200,8 @@ class KomuditiController extends Controller 'baki_komoditi'=>number_format($baki_komoditi,2), 'percentage_komoditi_transaksi'=>number_format($percentage_komoditi_transaksi,1), 'percentage_baki_komoditi'=>number_format($percentage_baki_komoditi,1)]); + + return response()->json($komoditi); } public function statistikKomoditiDashboard(Request $request){