Merged in new-onepercent (pull request #29)

New onepercent

app/Http/Controllers/CustomersController.php

@@ -40,7 +40,8 @@ class CustomersController extends Controller
         $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $bank = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/bank')->json();
         $blacklist_search = false;
-        return view('customers.index',compact('search','blacklist_search','cawangan_info','bank','api_url','idtype'));
+
+        return view('customers.' . $cawangan_info['version'] . '.index',compact('search','blacklist_search','cawangan_info','bank','api_url','idtype'));
     }
 
     public function info(Request $request){
@@ -59,11 +60,14 @@ class CustomersController extends Controller
         $request->session()->forget('page_reload');
         $request->session()->forget('norujukan');
 
+        $customer_page = ($cawangan_info['version'] == 'v1') ? 'customers.v1.info' : 'customers.v2.info';
+
+
         if($request->tebus_auto_tawarruq_berjaya === 'true'){
             $request->session()->flash('activate_tab', 'SAG_baru');
         }
 
-        return view('customers.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi'));
+        return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi'));
     }
 
     public function search(Request $request){

app/Http/Controllers/GadaianController.php

@@ -92,7 +92,7 @@ class GadaianController extends Controller
 
 
         $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('gadaian.index',compact('customer_info','limit_pinjaman_semasa','cawangan_info','norujukan','api_url','current'));
+        return view('gadaian.' . $cawangan_info['version'] . '.index',compact('customer_info','limit_pinjaman_semasa','cawangan_info','norujukan','api_url','current'));
     }
 
     public function edit(Request $request,$norujukan){
@@ -119,7 +119,7 @@ class GadaianController extends Controller
         $auth_user = Auth::user();
 
         $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('gadaian.edit',compact('customer_info','gadaiannorujukan','limit_pinjaman_semasa','cawangan_info','norujukan','api_url'));
+        return view('gadaian.' . $cawangan_info['version'] . '.edit',compact('customer_info','gadaiannorujukan','limit_pinjaman_semasa','cawangan_info','norujukan','api_url'));
     }
 
     public function editmarhun(Request $request){
@@ -348,7 +348,13 @@ class GadaianController extends Controller
         $pembayaran_segera = "https://spare.arrahn.com.my/pembayaransegera";
 
         // return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
+        
+        if($gadai_detail['tagbaru'] == 1)
+        {
             return view('print.sag_ujrah_2',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu', 'kadar_ujrah'));
+        }else{
+            return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
+        }
     }
 
     public function resit($id)
@@ -397,6 +403,8 @@ class GadaianController extends Controller
         // if(sizeof($customers_info) != 0)
         //     $customers_info = $customers_info[0];
 
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
         $wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $transaction['nowakil'])->json();
 
         if(sizeof($wakil) != 0)
@@ -405,7 +413,8 @@ class GadaianController extends Controller
         if($gadai['tagbaru'] == 1) {
             return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil'));
         } else {
-            return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+            return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
+            // return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
         }
     }
 

app/Http/Controllers/PenebusanController.php

@@ -41,7 +41,7 @@ class PenebusanController extends Controller
 
         $nilaihargasemasa = $this->tukaranhargaemas($norujukan);
 
-        return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
+        return view('penebusan.' . $cawangan_info['version'] . '.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
     }
 
     public function tebuspenuh(Request $request)
@@ -125,11 +125,11 @@ class PenebusanController extends Controller
                 'keluar' => $keluar,
                 'masuk' => $totalmasuk,
                 'bakiakhir' => $bakiakhir
-            ]);
+            ])->json();
     
             event(new KeuntunganNotify('lulus',Auth::user()->cawangan));
     
-            return response()->json($updateTunai,200);
+            return response()->json($updategadai,200);
 
         }else{
             return response('error');
@@ -429,7 +429,7 @@ class PenebusanController extends Controller
             'marhun' => $request->marhun,
             'jenisbayarantebus' => $request->jenisbayarantebus,
             'teller' => $request->teller,
-            'jeniskeuntungan' => 'asal',
+            'jeniskeuntungan' => $request->jeniskeuntungan,
             'totalbayaran' => $request->totalbayaran,
             "bayaranpelanggan" => $request->bayaran,
             "bakipelanggan" => $request->bakipelanggan,
@@ -502,7 +502,8 @@ class PenebusanController extends Controller
             'pembiayaan' => $request->pinjaman,
             'nilaimarhun' => $total_nilai_marhun,
             'kadarujrah' => $request->kadarkeuntungan,
-            'margin' => ($margin_pinjaman*100)
+            'margin' => ($margin_pinjaman*100),
+            'kodcaw' => Auth::user()->cawangan
         ])->json();
 
         $keuntungan_sebln = $onepercent['keuntungan'];

resources/views/customers/v2/info.blade.php

@@ -540,7 +540,26 @@
         minimumFractionDigits: 2
     });
 
+    function checkCanChangeGadaianDetail(norujukan){
+        let gadai_tawarruq = fetch(api_url + '/api/gadai/norujukan/' + norujukan );
 
+        gadai_tawarruq
+            .then(response => response.json())
+            .then(response => response[0][0])
+            .then(gadaian => {
+               return gadaian.historygadaian;
+            })
+            .then(historygadaian => {
+                let button_edit_gadaian = document.querySelector('#button-edit-gadaian');
+
+                if(historygadaian === '0' || historygadaian === null || historygadaian.length === 0) {
+                    button_edit_gadaian.disabled = false;
+                    return;
+                }
+
+                button_edit_gadaian.disabled = true;
+            })
+    }
 
     function checkserah(data){
         var urlpenebusan = $(data).data("url");
@@ -776,7 +795,10 @@
             let jeniskeuntungan = (gadai_detail['tagbaru'] == 1) ? 'onepercent' : 'asal';
             $.ajax({
                 method:'get',
-                url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'] + '/' + jeniskeuntungan,
+                url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'],
+                data: {
+                    'jeniskeuntungan' : jeniskeuntungan
+                },
                 success:function(upahsemasa){
                     if(jenistebus == "belum_tebus"){
                         var urlroute = '{{ route("penebusan", ":id") }}';
@@ -796,8 +818,11 @@
                                 var taglel = '';
                             }
 
+                            let table_norujukan = gadai_detail["norujukan"];
+                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
+
                             xtawarruq.row.add([
-                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' name="belum"/>',
+                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' 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'],
                                 tarikh_matang,
@@ -837,8 +862,10 @@
                                 }
                             }
 
+                            let table_norujukan = gadai_detail["norujukan"];
+                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
                             tablegadai.row.add([
-                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
+                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' 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'],
                                 tarikh_matang,
@@ -846,7 +873,7 @@
                                 'RM '+formatter.format(gadai_detail['bakipjm']),
                                 (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
                                 gadai_detail['tempoh'],
-                                'RM '+ upahsemasa,
+                                'RM '+ upahsemasa['pendapatan'],
                                 '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
                             ]).draw();
                         }
@@ -1521,25 +1548,8 @@
         });
     }
 
-    function getIsGadaianTawarruq(norujukan){
-        return fetch(api_url + '/api/gadai/norujukan/' + norujukan )
-            .then(response => response.json())
-            .then(response => response[0][0])
-            .then(gadaian => {
-               return gadaian.historygadaian;
-            })
-            .then(historygadaian => {
 
-                if(historygadaian === '0' || historygadaian === null || historygadaian.length === 0) {
+    function ubahfunc(e){
-                    return false;
-                }
-
-               return true;
-            })
-
-    }
-
-    async function ubahfunc(e){
 
         let ubahid = $('input[name="belum"]:checked').val();
         let harini = new Date();harini.setHours(0, 0, 0, 0);
@@ -1555,20 +1565,6 @@
                 });
                 return false;
             }
-
-           // Handle cannot change detail on gadaian tawarruq
-           $norujukan_selected = document.querySelector('#myTable input[name="belum"]:checked').value;
-           let isGadaianTawarruq = await getIsGadaianTawarruq($norujukan_selected);
-
-           if(isGadaianTawarruq){
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Amaran',
-                    text: 'Gadaian adalah gadaian Tawarruq. Ubah Gadai Tidak Dibenarkan'
-                });
-                return false;
-           }
-
         }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
 
             let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();

resources/views/gadaian/v2/edit.blade.php

@@ -460,6 +460,7 @@
                 'pembiayaan' : parseFloat($('#pinjaman').val()),
                 'kadarujrah' : kadarupah,
                 'margin' : perpinjam,
+                'kodcaw' : "{{ $cawangan_info['kodcaw'] }}"
             },
             success:function(data){
                 array_keuntungan = data;
@@ -637,6 +638,7 @@
                 'pembiayaan' : parseFloat($('#pinjaman').val()),
                 'kadarujrah' : kadarupah,
                 'margin' : perpinjam,
+                'kodcaw' : "{{ $cawangan_info['kodcaw'] }}"
             },
             success:function(data){
                 array_keuntungan = data;

resources/views/gadaian/v2/index.blade.php

@@ -109,14 +109,14 @@
                             <div class="col-4">
                                 <div class="form-group row">
                                     <div class="col-md-6">
-                                        Keuntungan Sebulan
+                                        Pendapatan Sebulan
                                     </div>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" readonly name="keuntungan_sebulan" id="keuntungan_sebulan">
                                     </div>
                                 </diV>
                             </div>
-                            <div class="col-3 d-none">
+                            <div class="col-3">
                                 <div class="form-group row">
                                     <div class="col-md-6">
                                         Ujrah
@@ -126,10 +126,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-1">
+                            {{-- <div class="col-1">
                                 <div class="form-group row">
                                 </div>
-                            </div>
+                            </div> --}}
                             <div class="col-md-5">
                                 <div class="form-group row">
                                     <div class="col-5">
@@ -146,17 +146,17 @@
                             <div class="col-4">
                                 <div class="form-group row">
                                     <div class="col-md-6">
-                                        Keuntungan 6 Bulan
+                                        Pendapatan 6 Bulan
                                     </div>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" readonly name="keuntungan_6bln" id="keuntungan_6bln">
                                     </div>
                                 </diV>
                             </div>
-                            <div class="col-3 d-none">
+                            <div class="col-3">
                                 <div class="form-group row">
                                     <div class="col-md-6">
-                                        One Percent
+                                        Keuntungan
                                     </div>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" readonly name="onepercent" id="onepercent">
@@ -484,6 +484,7 @@
                 'pembiayaan' : pinjaman,
                 'kadarujrah' : kadarupah,
                 'margin' : percent_pinjaman,
+                'kodcaw' : "{{ Auth::user()->cawangan }}"
             },
             success:function(data){
                 array_keuntungan = data;

resources/views/penebusan/v2/index.blade.php

@@ -167,7 +167,7 @@
                 <div class="card-body">
                     <form action="">
                         <div class="col-12 form-group row">
-                            <div class="col-6" id="divbakihargajualan">
+                            <div class="col-6 flex-column-reverse d-flex" id="divbakihargajualan">
                                 <div class="form-group row">
                                     <div class="col-4">
                                         BAKI HARGA JUALAN(RM)
@@ -206,9 +206,31 @@
                             </div>
 
                             <div class="col-6">
+                                @if($gadai['tagbaru'] == 1)
                                 <div class="form-group row">
                                         <div class="col-4">
-                                        JUMLAH KEUNTUNGAN
+                                        </div>
+                                        <div class="col-4">
+                                            <span>UJRAH</span>
+                                        </div>
+                                        <div class="col-4">
+                                            <span>KEUNTUNGAN</span>
+                                        </div>
+
+                                        <div class="col-4">
+                                        </div>
+
+                                        <div class="col-4">
+                                            <input type="text" id="jumujrah" class="form-control" readonly/>
+                                        </div>
+                                        <div class="col-4">
+                                            <input type="text" id="jumonepercent" class="form-control" readonly/>
+                                        </div>
+                                </div>
+                                @endif
+                                <div class="form-group row">
+                                    <div class="col-4">
+                                        JUMLAH PENDAPATAN
                                     </div>
                                     <div class="col-8">
                                         <input type="text" id="jumlahupah" class="form-control" readonly/>
@@ -564,16 +586,30 @@
             let jeniskeuntungan = (tagbaru == 1) ? 'onepercent' : 'asal';
             $.ajax({
                 method:'GET',
-                url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan + '/' + jeniskeuntungan,
+                url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
+                data: {
+                    'jeniskeuntungan' : jeniskeuntungan
+                },
                 dataType: 'json',
                 success:function(data){
+                    if(jeniskeuntungan == 'asal')
+                    {
                         $('#jumlahupah').val(data);
+                    }else{
+                        $('#jumlahupah').val(data['pendapatan']);
+                        $('#jumujrah').val(data['ujrah']);
+                        $('#jumonepercent').val(data['keuntungan']);
+                    }
+                    
                 }
             });
 
             $.ajax({
                 method:'GET',
-                url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan + '/' + jeniskeuntungan,
+                url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan,
+                data: {
+                    'jeniskeuntungan' : jeniskeuntungan
+                },
                 dataType: 'json',
                 success:function(data){
                     $('#bayaranditerima').val(data);
@@ -1176,6 +1212,7 @@
     {
         $("#terima_transaksi").prop('disabled', true);
         var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
+
         if($('#sltjenistebus').find(":selected").val() == 'T'){
 
             var adadah = false;
@@ -1257,7 +1294,16 @@
             var nowakil = nw;
             var duitpelanggan = $('#duitPelanggan').val().replace(/[^0-9.-]+/g,"");
             var bakipelanggan =  $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,"");
-            console.log('test');
+
+
+            if(duitpelanggan < bakipinjaman){
+                Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
+                $("#terima_transaksi").prop('disabled', false);
+
+                event.preventDefault();
+                return false;
+            }
+
             $.ajax({
                 method:'get',
                 datatype: 'json',
@@ -1376,6 +1422,15 @@
             var duitpelanggan = parseFloat($('#duitPelanggan').val().replace(/[^0-9.-]+/g,""));
             var bakipelanggan = parseFloat($('#bakiPelanggan').val().replace(/[^0-9.-]+/g,""));
 
+            if(isNaN(duitpelanggan)) duitpelanggan = 0;
+
+            if(duitpelanggan < bayar){
+                Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
+                $("#terima_transaksi").prop('disabled', false);
+
+                event.preventDefault();
+                return false;
+            }
 
             if(bayar < jumupah){
                 $("#terima_transaksi").prop('disabled', false);
@@ -1411,7 +1466,7 @@
                 },
                 success:function(success_data){
 
-                    if(success_data != 'error'){
+                    if(success_data == 'success'){
                         var urlroute = '{{ route("resit.ansurans", ":id") }}';
                         urlroute = urlroute.replace(':id', norujukan);
 
@@ -2177,20 +2232,31 @@
             var pinjaman_baru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
 
             let lebihanmargin = parseFloat((nilaimargin) ? nilaimargin : 0);
-            total = keuntungan + lebihanmargin;
+            total = (jenisAT != 'hargalama') ? (keuntungan + lebihanmargin) : keuntungan;
 
             var marginsemasa = (jenisAT == 'hargalama') ? pinjaman_baru/nm * 100 : pinjaman_baru/nmsemasa * 100;
             
+            let texting = (jenisAT != 'hargalama') ? 'Bayaran harus melebihi keuntungan dan jumlah lebihan margin' : 'Bayaran harus melebihi keuntungan';
             if(parseFloat($('#perludibayarAT').val()) < parseFloat(total.toFixed(2))){
                 Swal.fire({
                     icon: 'error',
                     title: 'Ralat Bayaran!',
-                    text: 'Bayaran harus melebihi keuntungan dan jumlah lebihan margin'
+                    text: texting
                 });
                 event.preventDefault();
                 return false;
             }
 
+            var duitpelanggan = parseFloat($('#duitPelanggan').val().replace(/[^0-9.-]+/g,""));
+
+            if(duitpelanggan < parseFloat($('#perludibayarAT').val())){
+                Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
+                $("#terima_transaksi").prop('disabled', false);
+
+                event.preventDefault();
+                return false;
+            }
+
 	        $.ajax({
                 method:'get',
                 url: api + '/api/komuditi/check',
@@ -2252,8 +2318,8 @@
                                     if (result.isConfirmed) {
 
                                         let nm = nmsemasa;let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
-                                        // let komen = "Pembiayaan Melebihi Margin 70%|" + nmsemasa + "|" + ber +  "|" + marg + "| Auto Tawarruq";
+                                        // let komen = "Pembiayaan Melebihi Margin 70%|" + nmsemasa + "|" + ber +  "|" + marg + "| Pembiayaan Semula";
-                                        let status = "[Auto Tawarruq] Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
+                                        let status = "[Pembiayaan Semula] Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
                                         let teller = "{{ Auth::user()->name }}";
 
                                         Swal.fire({
@@ -2375,7 +2441,7 @@
                                         let komen = '';
                                         if(pinjamanbaru >= 10000)
                                         {
-                                            komen = "[Auto Tawarruq] Pembiayaan Melebihi RM 10,000";
+                                            komen = "[Pembiayaan Semula] Pembiayaan Melebihi RM 10,000";
                                         }
                                         let status = komen;
 
@@ -2501,6 +2567,7 @@
     function gadaiautotawarruq()
     {
 
+        let jeniskeuntungan = (tagbaru == 1) ? 'onepercent' : 'asal';
         var nopelanggan = "{{ $gadai['nopelanggan'] }}";
         var jenistebus = 'T';
         var jbg = "{{ $gadai['tempoh'] }}";
@@ -2575,7 +2642,7 @@
                 "nowakil" : nowakil,
                 "jenisbayarantebus" : "nottawarruq",
                 "teller" : teller,
-
+                "jeniskeuntungan" : jeniskeuntungan,
 
                 //yang baru
                 "noic" : noic,
@@ -2599,12 +2666,11 @@
                 urlroute = urlroute.replace(':id', norujukan);
                 Swal.fire(
                     'Berjaya!',
-                    'Tebus Auto Tawarruq Berjaya',
+                    'Tebus Pembiayaan Semula Berjaya',
                     'success'
                 ) .then(function() {
                     window.open(urlroute, '_blank');
-                    //add query params to signal tebus auto tawarruq berjaya to controller
+                    window.location.replace("{{  route('customer_info') }}");
-                    window.location.replace("{{  route('customer_info') . '?tebus_auto_tawarruq_berjaya=true' }}");
                 })
             },error: function (request, status, error) {
                 console.log(request.responseText);
@@ -3207,10 +3273,14 @@ function pembatalanbalik()
 
 function funcexcuse(toggle){
 
+
+    
     if(toggle){   
         let pembiayaan = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,""));
         var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
         let percentasal = parseFloat('{{ number_format($percent_asal,2) }}');
+        var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
+        var bakipjm = parseFloat("{{ $gadai['bakipjm'] }}");
 
         const swalWithBootstrapButtons = Swal.mixin({
         customClass: {
@@ -3220,7 +3290,7 @@ function funcexcuse(toggle){
         buttonsStyling: false
         });
 
-        var errortext = "[Auto Tawarruq] Menggunakan Harga Lama & Margin Lama";
+        var errortext = "[Pembiayaan Semula] Menggunakan Harga Lama & Margin Lama";
 
         swalWithBootstrapButtons.fire({
             title: 'Dapatkan Pengesahan Operasi',
@@ -3263,9 +3333,9 @@ function funcexcuse(toggle){
                         "komen" : '',
                         "margin" : marg,
                         "berat" : ber,
-                        "nilaimarhun" : nm,
+                        "nilaimarhun" : nilai_marhun_lama,
                         "status" : status,
-                        "jumpinjam" : jumpinjam,
+                        "jumpinjam" : bakipjm,
                         "teller" : teller
                     },
                     success:function(data){
@@ -3450,19 +3520,26 @@ function blockbayaranAT(event){
     let value = $(event).val();
     let upah = parseFloat($('#jumlahupah').val());
     let pembiayaan = parseFloat("{{ $pembiayaanbaru }}");
+    let pembiayaanlama = parseFloat("{{ $bakipjm }}");
     let hargamarhun = parseFloat("{{ $nilaihargasemasa }}");
+    let percentlama = parseFloat(" {{ $percent_asal }} ");
 
     totalpercent = (pembiayaan / hargamarhun) * 100;
 
     let nilaimargin = $('#txtlebihanmargin').val();
     let lebihanmargin = parseFloat((nilaimargin) ? nilaimargin : 0);
-    total = upah + lebihanmargin;
+    total = (jenisAT != 'hargalama') ? (upah + lebihanmargin) : upah;
 
     if(value == '' || value <= 0 || value < total){
+        if(jenisAT != 'hargalama'){
             $('#perludibayarAT').val(formatter.format(total));
             $('#pinjamanbaru').val(formatter.format(pembiayaan));
             $('#basic-addon2').text(formatter.format(totalpercent.toFixed(2)));
-
+        }else{
+            $('#perludibayarAT').val(formatter.format(total));
+            $('#pinjamanbaru').val(formatter.format(pembiayaanlama));
+            $('#basic-addon2').text(formatter.format(percentlama.toFixed(2)));
+        }
     }
 }