From 6ab2203fea05953b8b3ef86b9649d8cd590b10d9 Mon Sep 17 00:00:00 2001 From: afiq Date: Thu, 25 Feb 2021 05:23:18 +0800 Subject: [PATCH] new calculation upah --- .env.example | 79 +++++++++++---------- app/Gadai.php | 3 +- app/Http/Controllers/GadaiController.php | 27 ++++--- app/Http/Controllers/KomuditiController.php | 21 ++++-- app/Http/Controllers/TebusController.php | 18 +++-- routes/web.php | 1 + 6 files changed, 80 insertions(+), 69 deletions(-) diff --git a/.env.example b/.env.example index e8362d4..3d2ce69 100644 --- a/.env.example +++ b/.env.example @@ -1,89 +1,90 @@ APP_NAME=Lumen -APP_ENV=production +APP_ENV=local APP_KEY=WbPGkYNmXZ6ZQplGlvl0iZ7zyW1b09xa APP_DEBUG=true -APP_URL=http://localhost +APP_URL=http://api_arrahn.test APP_TIMEZONE=Asia/Kuala_Lumpur LOG_CHANNEL=stack LOG_SLACK_WEBHOOK_URL= DB_CONNECTION=mysql -DB_HOST=192.168.0.102 -DB_PORT=3307 +DB_HOST=localhost +DB_PORT=3306 DB_DATABASE=arrahn DB_USERNAME=root -DB_PASSWORD=G0dz!ll42020 +DB_PASSWORD=root DB_CONNECTION_2=mysql -DB_HOST_2=192.168.0.102 -DB_PORT_2=3307 +DB_HOST_2=localhost +DB_PORT_2=3306 DB_DATABASE_2=arrahn_kangar DB_USERNAME_2=root -DB_PASSWORD_2=G0dz!ll42020 +DB_PASSWORD_2=root DB_CONNECTION_3=mysql -DB_HOST_3=192.168.0.102 -DB_PORT_3=3307 +DB_HOST_3=localhost +DB_PORT_3=3306 DB_DATABASE_3=arrahn_kuantan DB_USERNAME_3=root -DB_PASSWORD_3=G0dz!ll42020 +DB_PASSWORD_3=root DB_CONNECTION_4=mysql -DB_HOST_4=192.168.0.102 -DB_PORT_4=3307 +DB_HOST_4=localhost +DB_PORT_4=3306 DB_DATABASE_4=arrahn_pmas DB_USERNAME_4=root -DB_PASSWORD_4=G0dz!ll42020 +DB_PASSWORD_4=root DB_CONNECTION_5=mysql -DB_HOST_5=192.168.0.102 -DB_PORT_5=3307 +DB_HOST_5=localhost +DB_PORT_5=3306 DB_DATABASE_5=arrahn_putatan DB_USERNAME_5=root -DB_PASSWORD_5=G0dz!ll42020 +DB_PASSWORD_5=root DB_CONNECTION_6=mysql -DB_HOST_6=192.168.0.102 -DB_PORT_6=3307 +DB_HOST_6=localhost +DB_PORT_6=3306 DB_DATABASE_6=arrahn_koklanas DB_USERNAME_6=root -DB_PASSWORD_6=G0dz!ll42020 +DB_PASSWORD_6=root DB_CONNECTION_7=mysql -DB_HOST_7=192.168.0.102 -DB_PORT_7=3307 +DB_HOST_7=localhost +DB_PORT_7=3306 DB_DATABASE_7=online_arrahn DB_USERNAME_7=root -DB_PASSWORD_7=G0dz!ll42020 +DB_PASSWORD_7=root DB_CONNECTION_8=mysql -DB_HOST_8=192.168.0.102 -DB_PORT_8=3307 +DB_HOST_8=localhost +DB_PORT_8=3306 DB_DATABASE_8=arrahn_kb1 DB_USERNAME_8=root -DB_PASSWORD_8=G0dz!ll42020 +DB_PASSWORD_8=root DB_CONNECTION_9=mysql -DB_HOST_9=192.168.0.102 -DB_PORT_9=3307 +DB_HOST_9=localhost +DB_PORT_9=3306 DB_DATABASE_9=arrahn_kb2 DB_USERNAME_9=root -DB_PASSWORD_9=G0dz!ll42020 - -DB_CONNECTION_9=mysql -DB_HOST_9=192.168.0.102 -DB_PORT_9=3307 -DB_DATABASE_9=arrahn_kb2 -DB_USERNAME_9=root -DB_PASSWORD_9=G0dz!ll42020 +DB_PASSWORD_9=root DB_CONNECTION_10=mysql -DB_HOST_10=192.168.0.102 -DB_PORT_10=3307 +DB_HOST_10=localhost +DB_PORT_10=3306 DB_DATABASE_10=arrahn_sandakan DB_USERNAME_10=root -DB_PASSWORD_10=G0dz!ll42020 +DB_PASSWORD_10=root + +DB_CONNECTION_11=mysql +DB_HOST_11=localhost +DB_PORT_11=3306 +DB_DATABASE_11=arrahn_pputeh +DB_USERNAME_11=root +DB_PASSWORD_11=root + CACHE_DRIVER=file QUEUE_CONNECTION=sync diff --git a/app/Gadai.php b/app/Gadai.php index a972538..9372369 100644 --- a/app/Gadai.php +++ b/app/Gadai.php @@ -70,7 +70,8 @@ class Gadai extends Model 'bakihargajualan', 'hargajualan', 'upah12', - 'tagkomuditi' + 'tagkomuditi', + 'tempohbayar', ]; /** diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index d5f8ff7..b95ac80 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -265,27 +265,24 @@ class GadaiController extends Controller ->first(); if($gadai_data['tempoh'] > 6){ - $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); - - $upah_semasa_round = round($upahsemasa_raw,2); - + $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); + $upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa = (float)substr($upah_semasa_round, 0, -1); }else{ if($gadai_data['tempoh'] == 6){ if($gadai_data['bakiupah'] != 0){ $upah_semasa = $gadai_data['bakiupah']; }else{ - $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); - - $upah_semasa_round = round($upahsemasa_raw,2); - + $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); + $upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa = (float)substr($upah_semasa_round, 0, -1); } }else{ - $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); - - $upah_semasa_round = round($upahsemasa_raw,2); - + $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); + $upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa = (float)substr($upah_semasa_round, 0, -1); } } @@ -346,7 +343,8 @@ class GadaiController extends Controller 'bakiupah' => $baki_upah, 'jbg' => 0, 't_update' => $current->toDateString(), - 'bakihargajualan' => $baki_hargajualan + 'bakihargajualan' => $baki_hargajualan, + 'tempohbayar' => $gadai['tempoh'] )); return response()->json($update_gadai, 200); } @@ -404,7 +402,8 @@ class GadaiController extends Controller 'bakiupah' => $baki_upah, 'jbg' => 0, 't_update' => $current->toDateString(), - 'bakihargajualan' => $baki_hargajualan + 'bakihargajualan' => $baki_hargajualan, + 'tempohbayar' => $gadai['tempoh'] )); return response()->json($update_gadai, 200); } diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index 837d8c8..4521d9e 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -6,6 +6,7 @@ use App\Komuditi; use App\KomuditiPurchase; use App\KomuditiTransaksi; use App\KomuditiProduk; +use App\Cawangan; use DB; use Illuminate\Http\Request; @@ -77,7 +78,7 @@ class KomuditiController extends Controller 'harga'=> $komuditi_asal['nilai'] ]); - return response()->json($komuditi_purchase); + return response()->json('berjaya'); } public function rekodKomuditi(){ @@ -179,8 +180,8 @@ class KomuditiController extends Controller return response()->json($komuditi_transaksi); } - public function jumlahKomoditiDashboard() - { + + public function jumlahKomoditiDashboard(){ $current = Carbon::now(); $current = new Carbon(); $komoditi = []; @@ -195,8 +196,7 @@ class KomuditiController extends Controller } - public function statistikKomoditiDashboard(Request $request) - { + public function statistikKomoditiDashboard(Request $request){ $current = Carbon::now(); $current = new Carbon(); $weekly = Carbon::now(); @@ -286,4 +286,15 @@ class KomuditiController extends Controller return response()->json($array_totalup); } + + 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 diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 0628287..7962e9f 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -67,8 +67,8 @@ class TebusController extends Controller ->first(); if($gadai_data['tempoh'] > 6){ - $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); - + $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); $upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa = (float)substr($upah_semasa_round, 0, -1); }else{ @@ -76,17 +76,15 @@ class TebusController extends Controller if($gadai_data['bakiupah'] != 0){ $upah_semasa = $gadai_data['bakiupah']; }else{ - $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); - - $upah_semasa_round = round($upahsemasa_raw,2); - + $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); + $upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa = (float)substr($upah_semasa_round, 0, -1); } }else{ - $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); - - $upah_semasa_round = round($upahsemasa_raw,2); - + $tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + $upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); + $upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa = (float)substr($upah_semasa_round, 0, -1); } } diff --git a/routes/web.php b/routes/web.php index ed2e7ac..aa6811d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -273,6 +273,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('komuditi/description',['uses'=>'KomuditiController@getKomuditiProductDescription']); $router->get('komuditi/rekodharian',['uses'=>'KomuditiController@rekodTransaksiHarian']); $router->get('komuditi/rekodkomuditi',['uses'=>'KomuditiController@rekodKomuditi']); + $router->get('komoditi/rekod/transaksi',['uses'=>'KomuditiController@rekodTransaksiKomoditi']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){