Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn into apiaku
This commit is contained in:
@@ -1550,7 +1550,7 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
array_push($array_percentage,['cawangan'=>$top5['cawangan'],'percentage_gadai'=>number_format($percentage,2)]);
|
array_push($array_percentage,['cawangan'=>$top5['cawangan'],'percentage_gadai'=>number_format($percentage,2)]);
|
||||||
}
|
}
|
||||||
|
// dd($array_percentage);
|
||||||
return response()->json($array_percentage);
|
return response()->json($array_percentage);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -201,6 +201,9 @@ class KomuditiController extends Controller
|
|||||||
'percentage_komoditi_transaksi'=>number_format($percentage_komoditi_transaksi,1),
|
'percentage_komoditi_transaksi'=>number_format($percentage_komoditi_transaksi,1),
|
||||||
'percentage_baki_komoditi'=>number_format($percentage_baki_komoditi,1)]);
|
'percentage_baki_komoditi'=>number_format($percentage_baki_komoditi,1)]);
|
||||||
|
|
||||||
|
return response()->json($komoditi);
|
||||||
|
}
|
||||||
|
|
||||||
public function statistikKomoditiDashboard(Request $request){
|
public function statistikKomoditiDashboard(Request $request){
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
@@ -291,4 +294,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);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user