fix penebusan

app/Http/Controllers/PenebusanController.php

@@ -38,6 +38,36 @@ class PenebusanController extends Controller
         return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
     }
 
+    public function tebuspenuh(Request $request)
+    {
+        $api_url = config('api.url');
+
+        $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $request->kodcaw .'/' . $request->norujukan,[
+            "nopelanggan" => $request->nopelanggan,
+            "jenistebus" => $request->jenistebus,
+            "jbg" => $request->jbg,
+            "kadarupah" => $request->kadarupah,
+            "nilai_marhun" => $request->nilai_marhun,
+            "pinjaman" => $request->pinjaman,
+            "ansuran" => $request->ansuran,
+            "addpinjaman" => $request->addpinjaman,
+            "bakipinjaman" => $request->bakipinjaman,
+            "bakiupah" => $request->bakiupah,
+            "historygadaian" => $request->historygadaian,
+            "marhun" => $request->marhun,
+            "nowakil" => $request->nowakil,
+            "jenisbayarantebus" => $request->jenisbayarantebus,
+            "teller" => $request->teller
+        ])->json();
+
+        if($updatetebus)
+        {
+            return response('success');
+        }else{
+            return response('fail');
+        }
+    }
+
     public function bayaransuransTawarruq(Request $request)
     {
         $api_url = config('api.url');

public/js/main.js

@@ -135,7 +135,6 @@ function totalkeyserahan(datakeyin)
     $.each(arrayambilan, function( index, arr ){
         if(arr[0] == idkey)
         {
-
             arrayambilan[index][1] = totalamount(idkey,valkey);
         }
             
@@ -267,6 +266,114 @@ function kiraan(datakeyin)
       
 }
 
+function kiraanpanjar(datakeyin)
+{
+    var idkey = $(datakeyin).attr('id');
+    var valkey = $(datakeyin).val();
+    var amount = 0;
+    let amountkiraan = 0;
+
+    var validate = parseFloat($('#amaundiminta').val());
+    
+    console.log(validate);
+    $.each(arrayambilan, function( index, arr ){
+        if(arr[0] == idkey)
+        {
+
+            arrayambilan[index][1] = totalamount(idkey,valkey);
+        }
+            
+        amount += arr[1];
+      });
+
+      if(amount > validate)
+      {
+        Swal.fire({
+            icon: 'error',
+            title: 'Amaran',
+            text: 'Jumlah denominasi melebihi kadar'
+          });
+      }
+      else
+      {
+        
+        $('#amaunkiraan').val(amount);
+
+      }
+
+      switch(idkey) {
+        case 'bundle1': 
+            amountkiraan += (valkey * 100);
+            $('#totalb1').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'bundle20': 
+            amountkiraan += (valkey * 1000);
+            $('#totalb20').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'bundle5': 
+            amountkiraan += (valkey * 500);
+            $('#totalb5').val(formatter.format(amountkiraan.toFixed(2)));
+            break;		
+        case 'bundle50': 
+            amountkiraan += (valkey * 5000);
+            $('#totalb50').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'bundle10': 
+            amountkiraan += (valkey * 1000);
+            $('#totalb10').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'bundle100': 
+            amountkiraan += (valkey * 5000);
+            $('#totalb100').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'sen1': 
+            amountkiraan += (valkey * 0.01);
+            $('#totalsen1').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'sen5': 
+            amountkiraan += (valkey * 0.05);
+            $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'sen10': 
+            amountkiraan += (valkey * 0.05);
+            $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2)));
+        break;
+        case 'sen20': 
+            amountkiraan += (valkey * 0.20);
+            $('#totalsen20').val(formatter.format(amountkiraan.toFixed(2)));
+            break;		
+        case 'sen50': 
+            amountkiraan += (valkey * 0.50);
+            $('#totalsen50').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'ringgit1': 
+            amountkiraan += (valkey * 1);
+            $('#totalring1').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'ringgit5': 
+            amountkiraan += (valkey * 5);
+            $('#totalring5').val(formatter.format(amountkiraan.toFixed(2)));
+            break;      
+        case 'ringgit10': 
+            amountkiraan += (valkey * 10);
+            $('#totalring10').val(formatter.format(amountkiraan.toFixed(2)));
+            break;		
+        case 'ringgit20': 
+            amountkiraan += (valkey * 20);
+            $('#totalring20').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'ringgit50': 
+            amountkiraan += (valkey * 50);
+            $('#totalring50').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'ringgit100': 
+            amountkiraan += (valkey * 100);
+            $('#totalring100').val(formatter.format(amountkiraan.toFixed(2)));
+            break;         
+      }
+      
+}
+
 async function openuptambahdanserah(e)
 {
     var id = $(e).attr('id');

resources/views/khazanah/panjar.blade.php

@@ -134,7 +134,7 @@
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
-                    text: 'Tambah Marhun Tidak Berjaya'
+                    text: 'Panjar Tak Berjaya'
                 });
                 console.log(xhRequest);
             }
@@ -196,7 +196,7 @@
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
-                        text: 'Tambah Marhun Tidak Berjaya'
+                        text: 'Panjar Tidak Berjaya'
                     });
                     console.log(xhRequest);
                 }

resources/views/modal/denopanjar.blade.php

@@ -35,51 +35,51 @@
                   <tr>
                     <td>RM0.01</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td>
-                    <td><input type="text" name="ambilsen1" class="form-control kosong" id="sen1" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilsen1" class="form-control kosong" id="sen1" data-amaun="{{ $denominasi['txtsen1'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalsen1" id="totalsen1" class="form-control kosong" value="0.00" readonly/> </td>
                     <td>RM1</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td>
-                    <td><input type="text" name="ambilring1" class="form-control kosong" id="ringgit1" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilring1" class="form-control kosong" id="ringgit1" data-amaun="{{ $denominasi['txtring1'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalring1" id="totalring1" class="form-control kosong" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                       <td>RM0.05</td>
                       <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen5'] }}" readonly/></td>
-                      <td><input type="text" name="ambilsen5" class="form-control kosong" id="sen5" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="ambilsen5" class="form-control kosong" id="sen5" data-amaun="{{ $denominasi['txtsen5'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                       <td><input type="text" name="totalsen5" id="totalsen5" class="form-control kosong" value="0.00" readonly/> </td>
                       <td>RM5</td>
                       <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring5'] }}" readonly/></td>
-                      <td><input type="text" name="ambilring5" class="form-control kosong" id="ringgit5" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="ambilring5" class="form-control kosong" id="ringgit5" data-amaun="{{ $denominasi['txtring5'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                       <td><input type="text" name="totalring5" id="totalring5" class="form-control kosong" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                       <td>RM0.10</td>
                       <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen10'] }}" readonly/></td>
-                      <td><input type="text" name="ambilsen10" class="form-control kosong" id="sen10" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="ambilsen10" class="form-control kosong" id="sen10" data-amaun="{{ $denominasi['txtsen10'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                       <td><input type="text" name="totalsen10" id="totalsen10" class="form-control kosong" value="0.00" readonly/> </td>
                       <td>RM10</td>
                       <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring10'] }}" readonly/></td>
-                      <td><input type="text" name="ambilring10" class="form-control kosong" id="ringgit10" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="ambilring10" class="form-control kosong" id="ringgit10" data-amaun="{{ $denominasi['txtring10'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                       <td><input type="text" name="totalring10" id="totalring10" class="form-control kosong" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                     <td>RM0.20</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen20'] }}" readonly/></td>
-                    <td><input type="text" name="ambilsen20" class="form-control kosong" id="sen20" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilsen20" class="form-control kosong" id="sen20" data-amaun="{{ $denominasi['txtsen20'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalsen20" id="totalsen20" class="form-control kosong" value="0.00" readonly/> </td>
                     <td> RM20</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring20'] }}" readonly/></td>
-                    <td><input type="text" name="ambilring20" class="form-control kosong" id="ringgit20" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilring20" class="form-control kosong" id="ringgit20" data-amaun="{{ $denominasi['txtring20'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalring20" id="totalring20" class="form-control kosong" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                     <td>RM0.50</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen50'] }}" readonly/></td>
-                    <td><input type="text" name="ambilsen50" class="form-control kosong" id="sen50" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilsen50" class="form-control kosong" id="sen50" data-amaun="{{ $denominasi['txtsen50'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalsen50" id="totalsen50" class="form-control kosong" value="0.00" readonly/> </td>
                     <td>RM50</td> 
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring50'] }}" readonly/></td>
-                    <td><input type="text" name="ambilring50" class="form-control kosong" id="ringgit50" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilring50" class="form-control kosong" id="ringgit50" data-amaun="{{ $denominasi['txtring50'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalring50" id="totalring50" class="form-control kosong" value="0.00" readonly/> </td>
                 </tr>
                 <tr>
@@ -89,7 +89,7 @@
                   <td></td>
                   <td>RM100</td> 
                   <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring100'] }}" readonly/></td>
-                  <td><input type="text" name="ambilring100" class="form-control kosong" id="ringgit100" onkeyup="kiraan(this)"/> </td>
+                  <td><input type="text" name="ambilring100" class="form-control kosong" id="ringgit100" data-amaun="{{ $denominasi['txtring100'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                   <td><input type="text" name="totalring100" id="totalring100" class="form-control kosong" value="0.00" readonly/> </td>
                 </tr>
               </table>

resources/views/penebusan/index.blade.php

@@ -926,10 +926,12 @@
             var nowakil = nw;
 
             $.ajax({
-                method:'put',
+                method:'get',
                 datatype: 'json',
-                url: api + '/api/updatetebus/' + kodcaw + '/' + norujukan,
+                url: "{{ route('tebus.penuh') }}",
                 data:{
+                    "kodcaw" : kodcaw,
+                    "norujukan" : norujukan,
                     "nopelanggan" : nopelanggan,
                     "jenistebus" : jenistebus,
                     "jbg" : jbg,
@@ -949,7 +951,7 @@
                 success:function(success_data){
 
                 
-                    if(success_data == 1)
+                    if(success_data == 'success')
                     {  
                         $.ajax({
                             method: 'put',
@@ -980,7 +982,7 @@
                         Swal.fire({
                             icon: 'error',
                             title: 'Amaran!',
-                            text: 'norujukan Sudah Ditebus Di Dalam Table Gadai!',
+                            text: 'norujukan Sudah ditebus di dalam table gadai!',
                         });
                     }
                 }

routes/web.php

@@ -96,6 +96,7 @@ Route::get('/kemaskinialirantunai',['as'=>'kemaskini.alirantunai','uses'=>'Alira
 
 
 //MAINTENANCE
+Route::get('/tebuspenuh',['as'=>'tebus.penuh','uses'=>'PenebusanController@tebuspenuh'])->middleware('auth','teller');
 Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller');
 Route::get('/tambahpinjaman',['as'=>'tambah.pinjaman','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller');
 Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@bayaransurans'])->middleware('auth','teller');