rebate annur

app/Support/v2/Calculation.php

@@ -3,7 +3,9 @@
 namespace App\Support\v2;
 
 use App\KadarUpah;
+use App\KadarRebet;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 class Calculation
 {
@@ -41,6 +43,16 @@ class Calculation
         return $onepercent;
     }
 
+    private function kiraanRebetAnnur (float $pembiayaan = 0.0){
+
+        $kadarrebet = KadarRebet::on('mysql7')
+        ->where('pembiayaan_min', '<=', $pembiayaan)
+        ->where('pembiayaan_max', '>=', $pembiayaan)
+        ->sum('kadarrebet');
+
+        return $kadarrebet;
+    }
+
     public function kiraanUjrahSebenar(float $nilaimarhun = 0.0,float $kadarujrah = 0.0,float $margin = 0.0){
 
         if($kadarujrah >= 1){
@@ -61,13 +73,17 @@ class Calculation
 
         $onepercent = $this->kiraanOnePercent($pembiayaan);
         $ujrah_sebenar = $this->kiraanUjrahSebenar($nilaimarhun,$kadarujrah,$margin);
+        $discount = $this->kiraanRebetAnnur($pembiayaan);
+        Log::debug('discount:' . $discount);
 
         $onepercent = (!empty($onepercent)) ? $this->getRoundedMethod($onepercent) : 0;
         $ujrah_sebenar = (!empty($ujrah_sebenar)) ? $this->getRoundedMethod($ujrah_sebenar) : 0;
 
         $keuntungan = $onepercent + $ujrah_sebenar;
 
-        return ['keuntungan' => $keuntungan,'onepercent' => $onepercent, 'ujrah' => $ujrah_sebenar];
+        $kadar_diskaun = $this->getRoundedMethod($keuntungan * ($discount/100));
+        Log::debug('kadar_discount:' .$kadar_diskaun);
+        return ['keuntungan' => $keuntungan,'onepercent' => $onepercent, 'ujrah' => $ujrah_sebenar,'diskaun' => $kadar_diskaun];
     }
 
     public function kiraanKeuntunganSebenar(float $pembiayaan = 0.0,float $nilaimarhun = 0.0,float $kadarujrah = 0.0,float $margin = 0.0){

app/Support/v2/GadaiV2.php

@@ -99,7 +99,9 @@ class GadaiV2
             $upah12 = $onepercentservices->getRoundedMethod($upah1 * 12);
             $ujrah = $onepercentservices->getRoundedMethod($keuntungan['ujrah']);
             $onepercent = $onepercentservices->getRoundedMethod($keuntungan['onepercent']);
-            $kadarrebet = $onepercentservices -> getRoundedMethod($keuntungan['kadarrebet']);
+            
+            $kadar_rebet = $request->input('kadar_rebate');
+            $diskaun = $request->input('rebate');            
 
             $hargajualan = $request->pinjaman + $upah12;
 
@@ -139,7 +141,8 @@ class GadaiV2
                     'tagbaru' => 1,
                     'tunggakanujrah' => $akrual['ujrah'],
                     'tunggakanonepercent' => $akrual['keuntungan'],
-                    'kadarrebet' =>  $kadarrebet,
+                    'kadarrebet' => $kadar_rebet,
+                    'diskaun' => $diskaun
                 ));
 
             $new_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
@@ -211,7 +214,8 @@ class GadaiV2
         $ujrah = $onepercentservices->getRoundedMethod($bilang_bln * $upah['ujrah']);
         $upahrebet_raw = $onepercent + $ujrah;
         $upahrebet_raw = $onepercentservices->getRoundedMethod($upahrebet_raw);
-        
+        $upahrebet_raw = $upahrebet_raw - $upah['diskaun'];
+
         return $upahrebet_raw;
     }
 
@@ -248,7 +252,7 @@ class GadaiV2
 
             $keuntungan = $onepercent->kiraanKeuntunganRebet($gadai['bakipjm'],$gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['margin_semasa']);
             $ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['percentpinj']);
-
+            Log::debug($keuntungan);
             $onepercentasal = $gadai['pinjaman'] * (1/100);
             $ujrahasal = $onepercent->getRoundedMethod($ujrahasal);
             $onepercentasal = $onepercent->getRoundedMethod($onepercentasal);
@@ -297,6 +301,7 @@ class GadaiV2
                         'tempoh' => $gadai['tempoh'],
                         'beza_tempoh' => $bilang_bln,
                         'margin_semasa' => $margin_semasa,
+                        'kadardiskaun' => $keuntungan['diskaun']
                     ]);
 
                     $transaksi_gadai = TransaksiGadai::on('mysql7')->create([

app/Support/v2/Penebusan.php

@@ -39,33 +39,34 @@ class Penebusan
         $this->cawangan_info = $cawangan_info;
     }
 
-    public function tebusTawarruq($kodcaw,$norujukan){
-        $onepercentservices = new Calculation();
+   public function tebusTawarruq($kodcaw, $norujukan)
+{
+    $onepercentservices = new Calculation();
 
-        $cawangan = Cawangan::on('mysql7')
-                    ->where('kodcaw','=',$kodcaw)
-                    ->first();
+    $cawangan = Cawangan::on('mysql7')
+        ->where('kodcaw', '=', $kodcaw)
+        ->first();
 
-        $gadai_data = Gadai::on($cawangan['mysql'])
-                    ->where('norujukan','=',$norujukan)
-                    ->first();
+    $gadai_data = Gadai::on($cawangan['mysql'])
+        ->where('norujukan', '=', $norujukan)
+        ->first();
 
-        $jeniskeuntungan = ($gadai_data['tagbaru'] == 1) ? 'onepercent' : 'asal';
+    $jeniskeuntungan = ($gadai_data['tagbaru'] == 1) ? 'onepercent' : 'asal';
 
-        $rebet = $this->rebetselepastawarruq($kodcaw,$norujukan,$jeniskeuntungan);
-        $harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
+    $rebet = $this->rebetselepastawarruq($kodcaw, $norujukan, $jeniskeuntungan);
 
-        // $hargatebus = round($harga_tebus,PHP_ROUND_HALF_UP);
-        // $hargatebus = bcdiv(round($harga_tebus,2),1,1);
-        // $hargatebus = number_format($hargatebus,2);
-        // if(strpos($hargatebus,',')){
-        //     $hargatebus = str_replace(',','',$hargatebus);
-        // }
+    // Ambil terus dari column 'diskaun'
+    $diskaun = $gadai_data['diskaun'] ?? 0;
 
-        $hargatebus = $onepercentservices->getRoundedMethod($harga_tebus);
+    // Kira harga tebus selepas tolak rebet & diskaun
+    $harga_tebus = $gadai_data['bakihargajualan'] - $rebet - $diskaun;
+
+    // Apply pembundaran
+    $hargatebus = $onepercentservices->getRoundedMethod($harga_tebus);
+
+    return response()->json($hargatebus);
+}
 
-        return response()->json($hargatebus);
-    }
 
     public function hargaTebusTawarruq($kodcaw,$norujukan){
         $onepercentservices = new Calculation();
@@ -485,6 +486,9 @@ class Penebusan
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
+         // Ambil nilai diskaun
+        $diskaun = $gadai['diskaun'] ?? 0;
+
         //check duplicate
         $data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->whereIn('trans_type', ['P', 'T', 'S'])->first();
 
@@ -516,6 +520,8 @@ class Penebusan
             }
         }
 
+         // Tolak diskaun dari harga tebus
+        $harga_tebus['harga'] -= $diskaun;
 
         $create_tebus = Tebus::on($cawangan['mysql'])->create([
             'kodcaw'=> $kodcaw,
@@ -543,6 +549,7 @@ class Penebusan
             'teller' => $request->teller,
             'ujrah' => $ujrah_rebet,
             'onepercent' => $onepercent_rebet,
+            'diskaun_rebate' => $diskaun, // Tambah kolum simpan diskaun
         ]);
 
         $create_inoutmar = InOutMar::on($cawangan['mysql'])->create([