From ce90d2b108c753b5aa512e593f52dbda35cb738b Mon Sep 17 00:00:00 2001
From: Hafifie PKB <hafpkb@Hafifies-MacBook-Pro.local>
Date: Thu, 16 Nov 2023 09:59:05 +0800
Subject: [PATCH] added one percent in the gadai platform and tebus platform

---
 app/Http/Controllers/GadaianController.php   |  11 +-
 app/Http/Controllers/PenebusanController.php | 168 ++++++++++---------
 resources/views/customers/info.blade.php     |  44 +++--
 resources/views/gadaian/index.blade.php      |  85 ++++++++--
 resources/views/penebusan/index.blade.php    |  62 ++++---
 5 files changed, 245 insertions(+), 125 deletions(-)

diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 7b72b64..17d965c 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -153,14 +153,16 @@ class GadaianController extends Controller
         $auth_user = Auth::user();
         $total_nilai_marhun = $request->total_nilai_marhun;
         $total_nilai_marhun = str_replace(',','',$total_nilai_marhun);
-
         $keuntungan_sebln = $request->keuntungan_sebulan;
         $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+        $onepercent = $request->onepercent;
+        $ujrah = $request->ujrah;
 
         $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
         $kadarupah = $request->kadarkeuntungan * 100;
         $keuntungan6bulan = $keuntungan_sebln * 6;
         $keuntungan12bulan = $keuntungan_sebln * 12;
+
         $hargajualan = $request->pinjaman + $keuntungan12bulan;
         $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $request->norujukan_gadai,[
             'kodcaw' => $auth_user['cawangan'],
@@ -175,9 +177,14 @@ class GadaianController extends Controller
             'upah12' => $keuntungan12bulan,
             'hargajualan' => $hargajualan,
             'kuantiti_marhun' => $request->kuantiti_marhun,
-            'transaction' => 'Daftar Gadai'
+            'transaction' => 'Daftar Gadai',
+            'kadarujrah' => round($kadarupah, 2),
+            'ujrah' => $ujrah,
+            'onepercent' => $onepercent,
+            'margin_semasa' => $margin_pinjaman,
         ])->json();
 
+
         $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
             'unit_komuditi' => round($request->pinjaman, 2),
             'norujukan' => $request->norujukan_gadai,
diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php
index ba224ac..5b4892b 100644
--- a/app/Http/Controllers/PenebusanController.php
+++ b/app/Http/Controllers/PenebusanController.php
@@ -63,7 +63,8 @@ class PenebusanController extends Controller
             "marhun" => $request->marhun,
             "nowakil" => $request->nowakil,
             "jenisbayarantebus" => $request->jenisbayarantebus,
-            "teller" => $request->teller
+            "teller" => $request->teller,
+            'jeniskeuntungan' => $request->jeniskeuntungan
         ])->json();
 
         if($updatetebus)
@@ -86,43 +87,50 @@ class PenebusanController extends Controller
             'nowakil' => $request->nowakil
         ])->json();
 
-        $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$request->kodcaw,['kodlaluan' => $request->teller])->json();
+        if($updategadai)
+        {
+            $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$request->kodcaw,['kodlaluan' => $request->teller])->json();
 
-        $keluar=$getTunai2['keluar'];
-        $baki=$getTunai2['baki'];
-        $masuk=$getTunai2['masuk'];
-        $bakiawal=$getTunai2['bakiawal'];
-        $pendahuluan=$getTunai2['tambah'];
-        $serahan=$getTunai2['kurang'];
-        $totalmasuk = 0;
-        $bakiakhir = 0;
+            $keluar=$getTunai2['keluar'];
+            $baki=$getTunai2['baki'];
+            $masuk=$getTunai2['masuk'];
+            $bakiawal=$getTunai2['bakiawal'];
+            $pendahuluan=$getTunai2['tambah'];
+            $serahan=$getTunai2['kurang'];
+            $totalmasuk = 0;
+            $bakiakhir = 0;
+    
+            $totalmasuk = $request->bayaran + $masuk;
+    
+            // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+            $bakiakhir = $baki + $request->bayaran;
+    
+            // // Add on 20210411
+            // $gadaidetail = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $request->kodcaw.'/'.$request->norujukan)->json();
+            // $tempohGadai=$gadaidetail[0]['tempoh'];
+            // $upah12bulan=$gadaidetail[0]['upah12'];
+            // $bakiPinjaman=$gadaidetail[0]['bakipjm'];
+            // $teller=$gadaidetail[0]['teller'];
+            // $upah6bulan= $upah12bulan/2;                   //add on 202104011
+            // $tempoh_bayar=$gadaidetail[0]['tempohbayar']; //add on 202104011
+            // $tarikhgadai=$gadaidetail[0]['t_gadai'];//Add on 20210411
+    
+            //masuk dalam tunai aliran
+            $updateTunai=Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/updateTunaiGT/'.$request->kodcaw, [
+                'kodlaluan' => $request->teller,
+                'keluar' => $keluar,
+                'masuk' => $totalmasuk,
+                'bakiakhir' => $bakiakhir
+            ]);
+    
+            event(new KeuntunganNotify('lulus',Auth::user()->cawangan));
+    
+            return response()->json($updateTunai,200);
 
-        $totalmasuk = $request->bayaran + $masuk;
-
-        // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
-        $bakiakhir = $baki + $request->bayaran;
-
-        // // Add on 20210411
-        // $gadaidetail = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $request->kodcaw.'/'.$request->norujukan)->json();
-        // $tempohGadai=$gadaidetail[0]['tempoh'];
-        // $upah12bulan=$gadaidetail[0]['upah12'];
-        // $bakiPinjaman=$gadaidetail[0]['bakipjm'];
-        // $teller=$gadaidetail[0]['teller'];
-        // $upah6bulan= $upah12bulan/2;                   //add on 202104011
-        // $tempoh_bayar=$gadaidetail[0]['tempohbayar']; //add on 202104011
-        // $tarikhgadai=$gadaidetail[0]['t_gadai'];//Add on 20210411
-
-        //masuk dalam tunai aliran
-        $updateTunai=Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/updateTunaiGT/'.$request->kodcaw, [
-            'kodlaluan' => $request->teller,
-            'keluar' => $keluar,
-            'masuk' => $totalmasuk,
-            'bakiakhir' => $bakiakhir
-        ]);
-
-        event(new KeuntunganNotify('lulus',Auth::user()->cawangan));
-
-        return response()->json($updateTunai,200);
+        }else{
+            return response('error',500);
+        }
+        
     }
 
     public function bayaransurans(Request $request)
@@ -417,7 +425,7 @@ class PenebusanController extends Controller
             'marhun' => $request->marhun,
             'jenisbayarantebus' => $request->jenisbayarantebus,
             'teller' => $request->teller,
-
+            'jeniskeuntungan' => 'asal',
             'totalbayaran' => $request->totalbayaran,
         ])->json();
 
@@ -443,15 +451,55 @@ class PenebusanController extends Controller
             'sirig' => $new_sirig
         ]);
 
+        ///////////////////////////
+       /// MARHUN UPDATE TABLE////
+       //////////////////////////
+
+       $arraymarhunbaru = [];
+
+       $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+       $marhunyangdiambil = $marhunsediada[0];
+       foreach($marhunyangdiambil as $index=>$marhunloop)
+       {
+           $karatbaru = str_replace('.','-',$marhunloop['karat']);
+           $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+           $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
+
+           array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
+       }
+
+       foreach($arraymarhunbaru as $array1){
+           $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+               'norujukan' => $norujukanbaru,
+               'marhun' => $array1['marhun'],
+               'nota' => $array1['nota'],
+               'karat' => $array1['karat'],
+               'berat_emas' => $array1['berat'],
+               'harga' => $array1['harga'],
+               'nilai_marhun' => $array1['n_marhun']
+           ])->json();
+       }
 
         //////////////////////
        ////Update SAG BARU///
        /////////////////////
-        $keuntungan_sebln = $request->keuntungan_sebulan;
-        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
 
         $total_nilai_marhun = $request->total_nilai_marhun;
-        $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
+        $margin_pinjaman = ($request->pinjaman / $total_nilai_marhun);
+
+        $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
+            'pembiayaan' => $request->pinjaman,
+            'nilaimarhun' => $total_nilai_marhun,
+            'kadarujrah' => $request->kadarkeuntungan,
+            'margin' => ($margin_pinjaman*100)
+        ])->json();
+
+        $keuntungan_sebln = $onepercent['keuntungan'];
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
         $kadarupah = $request->kadarkeuntungan * 100;
         $keuntungan6bulan = $keuntungan_sebln * 6;
         $keuntungan12bulan = $keuntungan_sebln * 12;
@@ -470,8 +518,9 @@ class PenebusanController extends Controller
             'upah6' => $keuntungan6bulan,
             'upah12' => $keuntungan12bulan,
             'hargajualan' => $hargajualan,
-            'kuantiti_marhun' => $request->kuantiti_marhun
-        ])->json();
+            'kuantiti_marhun' => $request->kuantiti_marhun,
+        ]);
+
 
         $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
             'unit_komuditi' => round($request->pinjaman, 2),
@@ -488,42 +537,11 @@ class PenebusanController extends Controller
             'historygadaian' => $request->norujukan
         ])->json();
 
-        ///////////////////////////
-       /// MARHUN UPDATE TABLE////
-       //////////////////////////
-
-
-       $arraymarhunbaru = [];
-
-        $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
-
-        $marhunyangdiambil = $marhunsediada[0];
-        foreach($marhunyangdiambil as $index=>$marhunloop)
-        {
-            $karatbaru = str_replace('.','-',$marhunloop['karat']);
-            $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
-
-            $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
-
-            array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
-        }
-
-        foreach($arraymarhunbaru as $array1){
-            $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
-                'norujukan' => $norujukanbaru,
-                'marhun' => $array1['marhun'],
-                'nota' => $array1['nota'],
-                'karat' => $array1['karat'],
-                'berat_emas' => $array1['berat'],
-                'harga' => $array1['harga'],
-                'nilai_marhun' => $array1['n_marhun']
-            ])->json();
-        }
 
+        $alirantunai = new AliranTunaiController();
         event(new TebusNotify('lulus',Auth::user()->cawangan));
         event(new GadaiNotify('lulus',Auth::user()->cawangan));
-        $this->AliranTunaiController->alirantunaiTebusAutoTawarruq($request);
-
+        $alirantunai->alirantunaiTebusAutoTawarruq($request);
 
         return response()->json($updatemarhun,200);
 
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 16b9e3d..db823fb 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -144,8 +144,8 @@
                 <div class="card-body">
                     <nav class="mb-3">
                         <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                            <a class="nav-item nav-link active" id="nav-tawarruq-tab" data-toggle="tab" href="#nav-tawarruq" role="tab" aria-controls="nav-tawarruq" aria-selected="true">Tawarruq</a>
-                            <a class="nav-item nav-link" id="nav-xtawarruq-tab" data-toggle="tab" href="#nav-xtawarruq" role="tab" aria-controls="nav-xtawarruq" aria-selected="false">Ar-Rahn</a>
+                            <a class="nav-item nav-link active" id="nav-tawarruq-tab" data-toggle="tab" href="#nav-tawarruq" role="tab" aria-controls="nav-tawarruq" aria-selected="true">SAG Baru</a>
+                            <a class="nav-item nav-link" id="nav-xtawarruq-tab" data-toggle="tab" href="#nav-xtawarruq" role="tab" aria-controls="nav-xtawarruq" aria-selected="false"><span id="textnavsag">SAG Lama</span></a>
                         </div>
                     </nav>
                     <div class="tab-content" id="navtawarruqdannottawarruq">
@@ -170,7 +170,7 @@
                         <div class="tab-pane fade" id="nav-xtawarruq" role="tabpanel" aria-labelledby="nav-xtawarruq-tab">
                             <table id="xtawarruq" class="table table-striped table-hover">
                                 <thead class="thead-dark">
-                                    <tr>
+                                    {{-- <tr>
                                         <th>Bil</th>
                                         <th>No Rujukan</th>
                                         <th>Tarikh Gadai</th>
@@ -179,6 +179,18 @@
                                         <th>Margin</th>
                                         <th>Tempoh</th>
                                         <th>Lelong</th>
+                                    </tr> --}}
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Tarikh Gadai</th>
+                                        <th>Tarikh Matang</th>
+                                        <th>Baki Harga Jualan</th>
+                                        <th>Baki Pembiayaan</th>
+                                        <th>Margin</th>
+                                        <th>Tempoh</th>
+                                        <th>Keuntungan</th>
+                                        <th>Lelong</th>
                                     </tr>
                                 </thead>
                             </table>
@@ -747,14 +759,23 @@
         tablelelong.clear().draw();
         xtawarruq.clear().draw();
         $.each(data,function(index,gadai_detail){
+            let jeniskeuntungan = (gadai_detail['tagbaru'] == 1) ? 'onepercent' : 'asal';
             $.ajax({
                 method:'get',
-                url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'],
+                url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'] + '/' + jeniskeuntungan,
                 success:function(upahsemasa){
                     if(jenistebus == "belum_tebus"){
                         var urlroute = '{{ route("penebusan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
-                        if(gadai_detail["bakihargajualan"] == null){
+
+                        if(gadai_detail['lelong_tawarruq'] == 0){
+                            var tarikh_matang = gadai_detail['t_matang1'];
+                        }else{
+                            var tarikh_matang = gadai_detail['t_matang'];
+                        }
+
+                        if(gadai_detail["tagbaru"] == 0){
+                            $('#textnavsag').addClass('text-danger');
                             if(gadai_detail['taglel'] == 1){
                                 var taglel = '<b class="text-danger">Akan Dilelong</b>';
                             }else{
@@ -764,11 +785,13 @@
                                 '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
                                 '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                                 gadai_detail['t_gadai'],
-                                gadai_detail['t_matang'],
-                                'RM '+formatter.format(gadai_detail['pinjaman']),
+                                tarikh_matang,
+                                'RM '+ formatter.format(gadai_detail['bakihargajualan']),
+                                'RM '+formatter.format(gadai_detail['bakipjm']),
                                 (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
                                 gadai_detail['tempoh'],
-                                taglel,
+                                'RM '+ upahsemasa,
+                                '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
                             ]).draw();
                         }else{
                             var taglel = '';
@@ -799,11 +822,6 @@
                                 }
                             }
 
-                            if(gadai_detail['lelong_tawarruq'] == 0){
-                                var tarikh_matang = gadai_detail['t_matang1'];
-                            }else{
-                                var tarikh_matang = gadai_detail['t_matang'];
-                            }
                             tablegadai.row.add([
                                 '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
                                 '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 073d246..366baad 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -93,7 +93,7 @@
                     <!-- <form action="{{ route('gadai.store') }}" method='post' name="gadaistore" id="gadaistore"> -->
                         @csrf
                         <div class="col-12 form-group row">
-                            <div class="col-md-4">
+                            <div class="col-md-5">
                                 <div class="form-group row">
                                     <div class="col-5">
                                         Pembiayaan Max
@@ -116,11 +116,21 @@
                                     </div>
                                 </diV>
                             </div>
-                            <div class="col-5">
+                            <div class="col-3">
                                 <div class="form-group row">
-                                </diV>
+                                    <div class="col-md-6">
+                                        Ujrah
+                                    </div>
+                                    <div class="col-md-6">
+                                        <input type="text" class="form-control" readonly name="ujrah" id="ujrah">
+                                    </div>
+                                </div>
                             </div>
-                            <div class="col-md-4">
+                            <div class="col-1">
+                                <div class="form-group row">
+                                </div>
+                            </div>
+                            <div class="col-md-5">
                                 <div class="form-group row">
                                     <div class="col-5">
                                         Pembiayaan
@@ -143,7 +153,18 @@
                                     </div>
                                 </diV>
                             </div>
-                            <div class="col-5">
+                            <div class="col-3">
+                                <div class="form-group row">
+                                    <div class="col-md-6">
+                                        One Percent
+                                    </div>
+                                    <div class="col-md-6">
+                                        <input type="text" class="form-control" readonly name="onepercent" id="onepercent">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-5"></div>
+                            <div class="col-6">
                                 <div class="form-group row">
                                     <div class="col-md-6">
                                         Pembiayaan Max Pelulus
@@ -394,13 +415,26 @@
         $('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun));
         $('#bilangan_marhun').val(formatter.format(counter-1));
         $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
-        if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
-            kadarupah = 1.2/100;
-        }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
-            kadarupah = 1.5/100;
-        }else if(total_nilai_marhun >= 2001 ){
-            kadarupah = 1.7/100;
-        }
+        // if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
+        //     kadarupah = 1.2/100;
+        // }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
+        //     kadarupah = 1.5/100;
+        // }else if(total_nilai_marhun >= 2001 ){
+        //     kadarupah = 1.7/100;
+        // }
+
+        $.ajax({
+            method:'GET',
+            url: api_url + '/api/kadarujrah',
+            async:false,
+            data:{
+                'nilaimarhun' : total_nilai_marhun
+            },
+            success:function(data){
+                kadarupah = data;
+            }
+        });
+
         $('#total_nilai_marhun').val(formatter.format(total_nilai_marhun));
         $('#marhun_detail').val(marhun_details);
         $('#total_berat').val(formatter.format(total_berat));
@@ -433,14 +467,37 @@
         var pinjaman = Number(this.value);
         var nilaimarhun = Number($('#jumlah_nilai_marhun').val());
 
-        var keuntungan_sebulan = pinjaman * kadarupah;
-        var keuntungan_6bln = keuntungan_sebulan * 6;
+        // var keuntungan_sebulan = pinjaman * kadarupah;
+        // var keuntungan_6bln = keuntungan_sebulan * 6;
 
         percent_pinjaman = (Number(pinjaman)/Number(total_nilai_marhun))*100;
 
+        let array_keuntungan = [];
+
+        $.ajax({
+            method:'POST',
+            url: api_url + '/api/onepercent',
+            async:false,
+            data:{
+                'nilaimarhun' : total_nilai_marhun,
+                'pembiayaan' : pinjaman,
+                'kadarujrah' : kadarupah,
+                'margin' : percent_pinjaman,
+            },
+            success:function(data){
+                array_keuntungan = data;
+            }
+        });
+
+        var keuntungan_sebulan = array_keuntungan['keuntungan'];
+        var keuntungan_6bln = keuntungan_sebulan * 6;
+
         $('.span-pinjaman').text(formatter.format(percent_pinjaman.toFixed(2)) + ' %');
         $('#keuntungan_sebulan').val(formatter.format(keuntungan_sebulan.toFixed(2)));
         $('#keuntungan_6bln').val(formatter.format(keuntungan_6bln.toFixed(2)));
+        $('#ujrah').val(formatter.format(array_keuntungan['ujrah'].toFixed(2)));
+        $('#onepercent').val(formatter.format(array_keuntungan['onepercent'].toFixed(2)));
+
     });
 
     const formatter = new Intl.NumberFormat('en-US', {
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 0a00866..f4c9d00 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -67,12 +67,12 @@
                         <div class="col-8">
                             <select class="form-control" id="sltjenistebus">
                                 <option value="T">T = Tebus</option>
-                                @if($gadai['hargajualan'] != null)
+                                @if($gadai['tagbaru'] != 0)
                                     <option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran</option>
                                     <option value="S">S = Separuh</option>
                                     <option value="P">P = Tambah Pembiayaan</option>
-                                @endif
-                                @if($gadai['hargajualan'] == null)
+                                @else
+                                {{-- @if($gadai['tagbaru'] == 0) --}}
                                     <option value="AT">A = Auto Tawarruq</option>
                                 @endif
                               </select>
@@ -413,6 +413,7 @@
 
 
     var hargajualan = "{{ $gadai['hargajualan'] }}";
+    var tagbaru = "{{ $gadai['tagbaru'] }}";
 
 
     var kodcaw = "{{ $gadai['kodcaw'] }}";
@@ -476,9 +477,10 @@
             $('#histbtn').show();
 
             //Upah Tawarruq
+            let jeniskeuntungan = (tagbaru == 1) ? 'onepercent' : 'asal';
             $.ajax({
                 method:'GET',
-                url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
+                url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan + '/' + jeniskeuntungan,
                 dataType: 'json',
                 success:function(data){
                     $('#jumlahupah').val(data);
@@ -487,7 +489,7 @@
 
             $.ajax({
                 method:'GET',
-                url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan,
+                url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan + '/' + jeniskeuntungan,
                 dataType: 'json',
                 success:function(data){
                     $('#bayaranditerima').val(data);
@@ -620,11 +622,6 @@
                 totalnilaimarhunseparuh += parseFloat(value);
             });
 
-            // console.log("TOTAL HARGA SEMASA :" + totalmarhunhargasemasa);
-            // console.log("TOTAL HARGA SEMASA SPEARUH :" + totalnilaimarhunseparuh);
-            // console.log("YANG DIAMBIL :" + nilaimarhunhargasemasa);
-
-
             if(numbernotchecked != totalCheckboxes){
 
                 // console.log(nmsemasa);
@@ -1104,6 +1101,15 @@
                 jenisbayarantebus = "tawarruq";
             }
 
+            //tambahan untuk one percent
+            let jeniskeuntungan = '';
+            if(tagbaru == 1){
+                jeniskeuntungan = "onepercent";
+            }
+            else{
+                jeniskeuntungan = "asal";
+            }
+
             var nopelanggan = "{{ $gadai['nopelanggan'] }}";
             var jenistebus = $('#sltjenistebus').find(":selected").val();
             var jbg = "{{ $gadai['tempoh'] }}";
@@ -1139,6 +1145,7 @@
                     "marhun" : marhun,
                     "nowakil" : nowakil,
                     "jenisbayarantebus" : jenisbayarantebus,
+                    "jeniskeuntungan" : jeniskeuntungan,
                     "teller" : teller
                 },
                 success:function(success_data){
@@ -2350,16 +2357,29 @@
         var perludibayar = parseFloat($('#perludibayartawarruq').val().replace(/[^0-9.-]+/g,""));
 
         var kadarupahbaru = 0;
-        if(nilai_marhun > 0 && nilai_marhun < 400.99){
-            kadarupahbaru = 1.20/100;
-        }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
-            kadarupahbaru = 1.50/100;
-        }else if(nilai_marhun >= 2001 ){
-            kadarupahbaru = 1.70/100;
-        }
+        // if(nilai_marhun > 0 && nilai_marhun < 400.99){
+        //     kadarupahbaru = 1.20/100;
+        // }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
+        //     kadarupahbaru = 1.50/100;
+        // }else if(nilai_marhun >= 2001 ){
+        //     kadarupahbaru = 1.70/100;
+        // }
 
-        var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
-        var keuntungan_6bln = keuntungan_sebulan * 6;
+        $.ajax({
+            method:'GET',
+            url: api + '/api/kadarujrah',
+            async:false,
+            data:{
+                'nilaimarhun' : nilai_marhun
+            },
+            success:function(data){
+                kadarupahbaru = data;
+            }
+        });
+
+
+        // var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
+        // var keuntungan_6bln = keuntungan_sebulan * 6;
 
         $.ajax({
             method:"GET",
@@ -2389,8 +2409,8 @@
                 "total_nilai_marhun" : nilai_marhun,
                 "pinjaman" : pinjamanbaru,
                 "kadarkeuntungan" : kadarupahbaru,
-                "keuntungan_6bln" : keuntungan_6bln,
-                "keuntungan_sebulan" : keuntungan_sebulan,
+                // "keuntungan_6bln" : keuntungan_6bln,
+                // "keuntungan_sebulan" : keuntungan_sebulan,
                 "total_berat" : total_berat,
                 "marhun_detail" : marhun,
                 "kuantiti_marhun" : kuantiti_marhun,