From c772d2e0d9264062a7fab05958622b16d40ce972 Mon Sep 17 00:00:00 2001 From: Afrina Alimi <82226421+Afrina16@users.noreply.github.com> Date: Wed, 29 Nov 2023 16:12:43 +0800 Subject: [PATCH 1/3] add table group --- .../2023_11_29_124752_create_group_table.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 database/migrations/2023_11_29_124752_create_group_table.php diff --git a/database/migrations/2023_11_29_124752_create_group_table.php b/database/migrations/2023_11_29_124752_create_group_table.php new file mode 100644 index 0000000..90ae9c8 --- /dev/null +++ b/database/migrations/2023_11_29_124752_create_group_table.php @@ -0,0 +1,32 @@ +id(); + $table->string('slug')->nullable(); + $table->string('description')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('group'); + } +} From 1003ae646d4efb09ccd8676c801ce0e3402d661a Mon Sep 17 00:00:00 2001 From: Afrina Alimi <82226421+Afrina16@users.noreply.github.com> Date: Thu, 30 Nov 2023 15:02:37 +0800 Subject: [PATCH 2/3] add column group id to kadarupah & cawangan --- ...1109_add_columns_to_komuditi_transaksi.php | 4 +-- ...142901_add_group_id_to_kadarupah_table.php | 33 +++++++++++++++++++ ...add_group_id_to_arrahn_master_db_table.php | 33 +++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 database/migrations/2023_11_29_142901_add_group_id_to_kadarupah_table.php create mode 100644 database/migrations/2023_11_29_155314_add_group_id_to_arrahn_master_db_table.php diff --git a/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php b/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php index e728acb..1c61cb9 100644 --- a/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php +++ b/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php @@ -42,7 +42,7 @@ class AddColumnsToKomuditiTransaksi extends Migration { $online_arrahn_connection_array = array_filter(config('database.connections'), function($connection) { - if($connection['database'] === 'online_arrahn'){ + if($connection['database'] === 'online_arrahn' || $connection['database'] === 'master_krk'){ return true; } @@ -53,7 +53,7 @@ class AddColumnsToKomuditiTransaksi extends Migration if(empty($online_arrahn_connection_array)){ - throw new Exception("online_arrahn doesn't exist in config.database.connections array"); + throw new Exception("online_arrahn or master_krk doesn't exist in config.database.connections array"); } return array_keys($online_arrahn_connection_array)[0]; diff --git a/database/migrations/2023_11_29_142901_add_group_id_to_kadarupah_table.php b/database/migrations/2023_11_29_142901_add_group_id_to_kadarupah_table.php new file mode 100644 index 0000000..b280e41 --- /dev/null +++ b/database/migrations/2023_11_29_142901_add_group_id_to_kadarupah_table.php @@ -0,0 +1,33 @@ +integer('group_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::connection('mysql7')->table('kadarupah', function (Blueprint $table) { + $table->dropColumn(['group_id']); + }); + } +} diff --git a/database/migrations/2023_11_29_155314_add_group_id_to_arrahn_master_db_table.php b/database/migrations/2023_11_29_155314_add_group_id_to_arrahn_master_db_table.php new file mode 100644 index 0000000..157b8e2 --- /dev/null +++ b/database/migrations/2023_11_29_155314_add_group_id_to_arrahn_master_db_table.php @@ -0,0 +1,33 @@ +integer('group_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::connection('mysql7')->table('arrahn_master_db', function (Blueprint $table) { + $table->dropColumn(['group_id']); + }); + } +} From 058736726227dc771eb4ebf26de5ff506a956ec3 Mon Sep 17 00:00:00 2001 From: Afrina Alimi <82226421+Afrina16@users.noreply.github.com> Date: Sun, 3 Dec 2023 08:58:25 +0800 Subject: [PATCH 3/3] read group id --- app/Http/Controllers/GadaiController.php | 11 +++++++++-- app/Services/OnePercentServices.php | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 2cb0be0..d43b43b 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -133,6 +133,7 @@ class GadaiController extends Controller $current = Carbon::now(); $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); try{ @@ -247,11 +248,17 @@ class GadaiController extends Controller $total_nilai_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('n_marhun'); $total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat'); - $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first(); + //query kadar upah baru + $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawagan['group_id'])->first(); + + dd($kadar_raw); + + // query kadar upah lama + // $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first(); $onepercentservices = new OnePercentServices(); $keuntungan = $onepercentservices->kiraanKeuntunganSebenar($request->pinjaman,$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjam); - // $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100); + // $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100); // $upah6 = $upah1 * 6; // $upah12 = $upah1 * 12; $upah1 = $keuntungan['keuntungan']; diff --git a/app/Services/OnePercentServices.php b/app/Services/OnePercentServices.php index b740b82..9c4c165 100644 --- a/app/Services/OnePercentServices.php +++ b/app/Services/OnePercentServices.php @@ -74,7 +74,7 @@ class OnePercentServices public function getKadarUjrah(float $nilaimarhun = 0.0) : Float{ - $kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->get()->toArray(); + $kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->where('group_id',$cawagan['group_id'])->get()->toArray(); return isset($kadarujrah[0]) ? $kadarujrah[0]['kadarujrah'] : 0; }