diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php
index 3abad3e..f2f0013 100644
--- a/app/Http/Controllers/PenebusanController.php
+++ b/app/Http/Controllers/PenebusanController.php
@@ -6,6 +6,8 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Auth;
 
+use Carbon\Carbon;
+
 class PenebusanController extends Controller
 {
     public function __construct()
@@ -23,8 +25,6 @@ class PenebusanController extends Controller
         $customerdetail = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
         $marhundetail = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json();
 
-        // dd($marhundetail[0]);
-
         $marhun = $marhundetail[0];
         $nama = $customerdetail[0]['nama'];
 
@@ -33,4 +33,128 @@ class PenebusanController extends Controller
 
         return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama'));
     }
+
+    public function tebusseparuh(Request $request)
+    {
+        $api_url = config('api.url');
+        $current = Carbon::now();
+        $current = new Carbon();
+        $curent_year = substr($current->year,2,2);
+        $curent_month = sprintf("%02d", $current->month);
+        $current_day = sprintf("%02d", $current->day);
+
+        $auth_user = Auth::user();
+
+
+        ////////////////////////
+       /// UPDATE TEBUS API////
+       ///////////////////////
+        $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
+            'nopelanggan' => $request->nopelanggan,
+            'jenistebus' => $request->jenistebus,
+            'jbg' => $request->jbg,
+            'kadarupah' => $request->kadarupah,
+            'nilai_marhun' => $request->nilai_marhun,
+            'pinjaman' => $request->pinjaman_lama,
+            'ansuran' => $request->ansuran,
+            'addpinjaman'=> $request->addpinjaman,
+            'bakipinjaman' => $request->bakipinjaman,
+            'bakiupah' => $request->bakiupah,
+            'historygadaian' => $request->historygadaian,
+            'marhun' => $request->marhun
+        ])->json();
+
+
+        //////////////////////
+       /// MAKING NEW SAG////
+       /////////////////////
+        $gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+        if($gadai_transaction){
+            $new_sirig = $gadai_transaction['sirig'] + 1;
+            
+        }else{
+            $new_sirig = 1;
+        }
+
+        $new_transaction = sprintf("%04d",$new_sirig);
+        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+        // dd($norujukan);
+        $gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+            'norujukan' => $norujukanbaru,
+            'nopelanggan' => $request->nopelanggan,
+            'nokp' => $request->noic,
+            'sirig' => $new_sirig
+        ]);
+
+        
+        //////////////////////
+       ////Update SAG BARU///
+       /////////////////////
+
+        $total_nilai_marhun = $request->total_nilai_marhun;
+        $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
+        $kadarupah = $request->kadarkeuntungan * 100;
+        $keuntungan6bulan = $request->keuntungan_6bln;
+        $keuntungan12bulan = $request->keuntungan_sebulan*12;
+        $hargajualan = $request->pinjaman + $keuntungan12bulan;
+
+        return ($margin_pinjaman);
+        
+
+        $gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'kodcaw' => $auth_user['cawangan'],
+            'nilaimarhun' => round($total_nilai_marhun, 2),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun_detail,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun
+        ])->json();
+
+
+    
+        ///////////////////////////
+       /// MARHUN UPDATE TABLE////
+       //////////////////////////
+
+
+       $arraymarhunbaru = [];
+
+       $arraydiola = $request->arrayrecno;
+
+       $marhunsediada = Http::get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+       $marhunyangdiambil = $marhunsediada[0];
+       foreach($marhunyangdiambil as $index=>$marhunloop)
+       {
+                if(!in_array($marhunloop['recno'], $arraydiola))
+               {
+                    array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $marhunloop['harga'], "n_marhun" => $marhunloop['n_marhun']]);
+               }
+       }
+
+       foreach($arraymarhunbaru as $array1)
+        {
+            $updatemarhun = Http::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();
+   
+        }
+
+
+        return response()->json($updatemarhun,200);
+
+    }
 }
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 9f00a8c..972a8d3 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -57,7 +57,7 @@
                             <select class="form-control" id="sltjenistebus">
                                 <option value="T">T = Tebus</option>
                                 <option value="A">A = Ansuran</option>
-                                <option value="S">S = Separuh</option>
+                                <option value="S" selected>S = Separuh</option>
                                 <option value="P">P = Tambah Pinjaman</option>
                               </select>
                         </div>
@@ -99,14 +99,13 @@
                         </thead>
                         <tbody>
                             @foreach ($marhun as $index=>$m)
-                            {{-- {{ dd($m) }} --}}
                             <tr>
-                            <td><input type="checkbox" id="checkmarhun" data-recno="{{ $m['recno'] }}" style="display:none;"/><span class="spannar">{{ $index+1 }}</span></td>
+                            <td><input type="checkbox" id="checkmarhun" data-recno="{{ $m['recno'] }}" data-nm="{{ $m['n_marhun'] }}" data-marhun="{{ $m['marhun'] }}" data-berat="{{ $m['berat'] }}" style="display:none;"/><span class="spannar">{{ $index+1 }}</span></td>
                             @php
                             $marhunperibadi = Http::get(config('api.url') .'/api/jemas/nama_marhun/',["marhun" => $m['marhun']])->json();
                             @endphp
                             <td>{{ $marhunperibadi['descpt'] }}</td>
-                            <td>RM {{ number_format($m['n_marhuns'],2) }}</td>
+                            <td>RM {{ number_format($m['n_marhun'],2) }}</td>
                             <td>{{ $m['berat'] }}</td>
                             <td>{{ $m['karat'] }}</td>
                             </tr>
@@ -190,6 +189,9 @@ var api = '<?php echo $api_url ?>';
 $('input[type="checkbox"]').hide();
 
 var array_recno = [];
+var array_nm = [];
+var array_marhun = [];
+var array_berat = [];
 
 var tarikhtawarruq = new Date("2021/1/1");
 var tarikhgadai = new Date("{{ $gadai['t_gadai'] }}");
@@ -335,14 +337,29 @@ if(tarikhgadai >= tarikhtawarruq)
 
 
                         var recno = $(this).data('recno');
+                        var nilaimarhun = $(this).data('nm');
+                        var marhun = $(this).data('marhun');
+                        var berat = $(this).data('berat');
 
                         if ($(this).is(':checked')) {
                             array_recno.push(recno);
+                            array_nm.push(nilaimarhun);
+                            array_marhun.push(marhun);
+                            array_berat.push(berat);
+
                         }
                         else{
                             var rm = array_recno.findIndex(x => x === recno);
+                            var rmnilai = array_nm.findIndex(y => y == nilaimarhun);
+                            var rmmarhun = array_marhun.findIndex(z => z == marhun);
+                            var rmberat = array_berat.findIndex(a => a == berat);
+
                             array_recno.splice(rm);
+                            array_nm.splice(rmnilai);
+                            array_marhun.splice(rmmarhun);
+                            array_berat.splice(rmberat);
                         }
+
                         if (checkedOne == false) {
                             $('#perludibayar').val(0);
                         }
@@ -363,8 +380,6 @@ if(tarikhgadai >= tarikhtawarruq)
                                 }
                             });
                         }
-                       
-
                     });
     }
     
@@ -405,20 +420,206 @@ $("#sltjenistebus").change(function(){
 });
 
 
-// function bayaransemua()
-// {
-//     var tarikhtawarruq = new Date("2021/1/1");
-//     var tarikhgadai = new Date("{{ $gadai['t_gadai'] }}");
+function bayaransemua()
+{
+    
 
-//     if(tarikhgadai >= tarikhtawarruq)
-//     {
+    if($('#sltjenistebus').find(":selected").val() == 'T')
+    {
+        var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+        var jenistebus = $('#sltjenistebus').find(":selected").val();
+        var jbg = "{{ $gadai['tempoh'] }}";
+        var kadarupah = "{{ $gadai['kadarupah'] }}";
+        var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
+        var pinjaman = "{{ $gadai['pinjaman']}}";
+        var ansuran = 0;
+        var addpinjaman = 0;
+        var bakipinjaman = 0;
+        var bakiupah = 0;
+        var historygadaian = 0;
+        var marhun = "{{ $gadai['marhun'] }}";
+
+        $.ajax({
+            method:'PUT',
+            url: api + '/api/updatetebus/' + kodcaw + '/' + norujukan,
+            data:{
+                "nopelanggan" : nopelanggan,
+                "jenistebus" : jenistebus,
+                "jbg" : jbg,
+                "kadarupah" : kadarupah,
+                "nilai_marhun" : nilai_marhun,
+                "pinjaman" : pinjaman,
+                "ansuran" : ansuran,
+                "addpinjaman" : addpinjaman,
+                "bakipinjaman" : bakipinjaman,
+                "bakiupah" : bakiupah,
+                "historygadaian" : historygadaian,
+                "marhun" : marhun
+            },
+            success:function(success_data){
+                Swal.fire(
+                    'Good job!',
+                    'You clicked the button!',
+                    'success'
+                ).then(function() {
+                    window.location.replace("{{ url()->previous() }}");
+                })
+            }
+        });
+    
+    }
+    else if($('#sltjenistebus').find(":selected").val() == 'A')
+    {
+        Swal.fire(
+            'Good job!',
+            'You clicked the button!',
+            'success'
+        ) .then(function() {
+            alert('dass');
+        })
+    }
+    else if($('#sltjenistebus').find(":selected").val() == 'S')
+    {
+        var sumnilaimarhun = 0;
+        var sumberat = 0;
+        var marhun = "{{ $gadai['marhun'] }}";
+
+        var test = marhun.split(",");
+    
+        $.each( array_nm, function( index, value ) {
+              sumnilaimarhun += parseFloat(value);
+        });
+
+        console.log(test);
+        console.log(array_marhun);
+        var countarrayerror = 0;
+        $.each( test, function( index, value ) {
+
+            for(var i=0; i<array_marhun.length; i++)
+            {
+                if (value.match(array_marhun[i])) {
+                console.log("value: " + value + " index :" + index +" marhun : " + array_marhun[i]);
+                console.log('true');
+                test.splice(index,1);
+                countarrayerror++;
+
+                if(countarrayerror == array_marhun.length)
+                    return false;
+                
+                }
+            }
+        });
+
+
+        var marhun_baru = test.join(", ");
+
+        // console.log(typeof marhun_baru  + " " + marhun_baru);
+
+        $.each( array_berat, function( index, value ) {
+            sumberat += parseFloat(value);
+        });
+
+        // console.log(array_recno);
+
+        var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+        var jenistebus = $('#sltjenistebus').find(":selected").val();
+        var jbg = "{{ $gadai['tempoh'] }}";
+        var kadarupah = "{{ $gadai['kadarupah'] }}";
+        var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
+        var nilai_marhun = parseFloat("{{ $gadai['nilaimarhun'] }}") - sumnilaimarhun;
+        var pinjamanbaru = parseFloat("{{ $gadai['pinjaman']}}") -  parseFloat($('#perludibayar').val());
+        var ansuran = 0;
+        var addpinjaman = 0;
+        var bakipinjaman = parseFloat("{{ $gadai['pinjaman']}}") -  parseFloat($('#perludibayar').val());
+        var bakiupah = 0;
+        var historygadaian = "{{ $gadai['norujukan'] }}";
+        var marhun = "{{ $gadai['marhun'] }}";
+        var noic = "{{ $gadai['nokp'] }}";
+        var total_berat = parseFloat("{{ $gadai['berat'] }}") - sumberat;
+        var pinjaman = parseFloat("{{ $gadai['pinjaman']}}");
+        var marhun_detail = marhun_baru;
+        var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length;
+
+        var kadarupahbaru = 0;
+
+        if(nilai_marhun > 0 && nilai_marhun < 401.99){
+            kadarupahbaru = 1.2/100;
+        }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+            kadarupahbaru = 1.50/100;
+        }else if(nilai_marhun >= 2002 ){
+            kadarupahbaru = 1.70/100;
+        }
+        
+        var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
+        var keuntungan_6bln = keuntungan_sebulan * 6;
+
+        // console.log("keuntungan : " + keuntungan_sebulan + "keuntungan 6bulan : " + keuntungan_6bln);
+
+        alert(norujukan);
+
+        $.ajax({
+        method:"GET",
+        url: "{{ route('tebus.separuh') }}",
+        data:{
+            //yang lama
+            "norujukan" : norujukan,
+            "nopelanggan" : nopelanggan,
+            "jenistebus" : jenistebus,
+            "jbg" : jbg,
+            "kadarupah" : kadarupah,
+            "nilai_marhun" : nilai_marhun_lama,
+            "pinjaman_lama" : pinjaman,
+            "ansuran" : ansuran,
+            "addpinjaman" : addpinjaman,
+            "bakipinjaman" : bakipinjaman,
+            "bakiupah" : bakiupah,
+            "historygadaian" : historygadaian,
+            "marhun" : marhun,
+            "arrayrecno" : array_recno,
+
+
+            //yang baru
+            "noic" : noic,
+            "total_nilai_marhun" : nilai_marhun,
+            "pinjaman" : pinjamanbaru,
+            "kadarkeuntungan" : kadarupahbaru,
+            "keuntungan_6bln" : keuntungan_6bln,
+            "keuntungan_sebulan" : keuntungan_sebulan,
+            "total_berat" : total_berat,
+            "marhun_detail" : marhun_detail,
+            "kuantiti_marhun" : kuantiti_marhun
+ 
+        },
+        success:function(success_data){
+            console.log(success_data);
+            Swal.fire(
+            'Good job!',
+            'You clicked the button!',
+            'success'
+        ) .then(function() {
+            // window.location.replace("{{ url()->previous() }}");
+        })
+        },error: function (request, status, error) {
+            console.log(request.responseText);
+        }
+
+
+
+        });
        
-//     }
-//     else if(tarikhgadai < tarikhtawarruq)
-//     {
-       
-//     }
-// }
+    }
+    else if($('#sltjenistebus').find(":selected").val() == 'P')
+    {
+        Swal.fire(
+            'Good job!',
+            'You clicked the button!',
+            'success'
+        ) .then(function() {
+            // alert('dass');
+        })
+    }
+
+}
 
 
 
diff --git a/routes/web.php b/routes/web.php
index d8d26b9..db0c61b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -44,6 +44,9 @@ Route::get('/gadai/batal',['as'=>'gadai.batal','uses'=>'GadaianController@batal'
 Route::get('/gadai/batal',['as'=>'gadai.batal','uses'=>'GadaianController@batal'])->middleware('auth','teller');
 Route::get('/customer/otp',['as'=>'customer.otp','uses'=>'CustomersController@getOTP'])->middleware('auth','teller');
 
+//MAINTENANCE
+Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller');
+
 //Penilai
 Route::get('/gadaiansemasa',['as'=>'gadaian.semasa','uses'=>'GadaianController@gadaiansemasa'])->middleware('auth','penilai');
 Route::post('/gadaiancetak',['as'=>'gadaian.cetak','uses'=>'GadaianController@cetakSAG'])->middleware('auth','penilai');