diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 9596136..3a55dc9 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -17,6 +17,7 @@ use App\Vault; use App\Tunai; use App\Denominasi; use App\HapusKira; +use App\GlCode; use Carbon\Carbon; @@ -249,4 +250,26 @@ class LaporanController extends Controller return response()->json($hapuskira); } + + public function CalcXtra($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $upahsimpan = GlCode::on($cawangan['mysql']) + ->where('glcode','=','5000/413') + ->sum('amaun'); + + $bakilelongxtra = GlCode::on($cawangan['mysql']) + ->where('glcode','=','7000/190') + ->sum('amaun'); + + $untungrugiterkumpul = GlCode::on($cawangan['mysql']) + ->where('glcode','=','7000/201') + ->sum('amaun'); + + $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul)]; + + return response()->json($arrayxtra); + } + } \ No newline at end of file diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 142f011..ceacbb1 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -10,6 +10,7 @@ use App\WTD; use App\GlCode; use App\imbangdugalama; use App\AnsRugi; +use App\SerahBaki; use Illuminate\Http\Request; @@ -381,6 +382,18 @@ class LelongController extends Controller return response()->json($wtd,200); } + public function calculationserahbaki($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + + $serahbaki = SerahBaki::on($cawangan['mysql']) + ->where('tarikh','<=', $request->tarikh) + ->sum('baki'); + + return response()->json($serahbaki,200); + } + public function cajlelongcalculation($kodcaw,Request $request) { $current = Carbon::now(); diff --git a/app/SerahBaki.php b/app/SerahBaki.php new file mode 100644 index 0000000..5cbc0cf --- /dev/null +++ b/app/SerahBaki.php @@ -0,0 +1,42 @@ +group(['prefix'=>'api'], function () use ($router){ $router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar $router->get('BakiLelongCalculation/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong $router->get('WTD/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut + $router->get('SerahBaki/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut $router->get('cajlelong/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira + $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Hapus Kira //-- Untung Rugi --//