Merge branch 'pipiv2' into 'new-master'

fix spearuh dan tambah pinjaman

See merge request online-sistem1/kaunter!137

app/Http/Controllers/KhazanahController.php

@@ -4498,7 +4498,7 @@ class KhazanahController extends Controller
         return response($daftarpolis);
     }
 
-    public function cetakSuratAkuanGadaianHilang(Request $request)
+    public function ulangcetakSuratAkuanGadaianHilang($norujukan)
     {
         $auth_user = Auth::user();
         $api_url = config('api.url');
@@ -4506,7 +4506,12 @@ class KhazanahController extends Controller
         $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
 
+        $gadai = Http::get(config('api.url').'/api/gadai/norujukan/'.$norujukan)->json();
 
+        foreach($gadai as $index1=>$gad)
+        $customers = Http::get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
+
+        $polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan']])->json();
 
 
         return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));

resources/views/khazanah/info.blade.php

@@ -659,7 +659,8 @@
             }else{
                 $.ajax({
                     method:'get',
-                    url:'{{ route("gadai.history") }}',
+                    url:'{{ route("gadai.history.khazanah") }}',
+                    datatype:'json',
                     data:{ "norujukan" : histid},
                     success:function(data){
                         $('#historytebusModal').modal();
@@ -687,6 +688,25 @@
         }
     }
 
+    function ulangcetakagh()
+    {
+        if($("input[name='options']:checked").val() == 'belum_tebus'){
+            let histid = $('input[name="belum"]:checked').val();
+            if(histid == null){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Sila pilih salah satu SAG'
+                });
+            }else{
+                let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
+                urlroute = urlroute.replace(':id', histid);
+                window.open(urlroute, '_blank');
+                swal.close();
+            }
+        }
+    }
+
     function saghilangfunc()
     {
         if($("input[name='options']:checked").val() == 'belum_tebus'){
@@ -714,8 +734,8 @@
                                 allowEnterKey: false,
                                 showConfirmButton: false,
                                 html:   "<br>" +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1">' + 'Okay' + '</button>' +
+                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary">' + 'Ulang Cetak' + '</button>',
+                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" onclick="ulangcetakagh()">' + 'Ulang Cetak' + '</button>',
                                 icon: 'error',
                                 title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
                             });
@@ -733,43 +753,24 @@
             }
         }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
             let histid = $('input[name="sudahtebus"]:checked').val();
-
+           
-            if(histid == null){
+            Swal.fire({
-                Swal.fire({
+                icon: 'error',
-                    icon: 'error',
+                title: 'Amaran',
-                    title: 'Amaran',
+                text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
-                    text: 'Sila pilih salah satu SAG'
+            });
-                });
+            
-            }else{
+        }else if($("input[name='options']:checked").val() == 'lelong'){
-                $.ajax({
+            let histid = $('input[name="sudahtebus"]:checked').val();
-                    method:'get',
+           
-                    url: api_url + '/api/polis/get/',
+            Swal.fire({
-                    data:{ "norujukan" : histid,"kodcaw" : kodcaw},
+                icon: 'error',
-                    success:function(data){
+                title: 'Amaran',
-                        var count = Object.keys(data).length;
+                text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
-
+            });
-                        if(count > 0)
+            
-                        {
-                            Swal.fire({
-                                allowOutsideClick: false,
-                                allowEscapeKey: false,
-                                allowEnterKey: false,
-                                confirmButtonText: '<i class="fa fa-check-circle"></i> Baik Boss!',
-                                icon: 'success',
-                                title: 'Surat Akuan Gadaian Hilang telah dijana sebelum ini!'
-                            });
-                        }else{
-                            $('#AGHModal').modal('show'); 
-                            $('#norujukanhidden').val(histid);
-                        }
-
-                    },error: function(xhr, status, error) {
-                        var err = eval("(" + xhr.responseText + ")");
-                        alert(xhr.responseText);
-                    }
-                });
-            }
         }
+
     }
 
     $('#negeriagh').change(function(){

resources/views/penebusan/index.blade.php

@@ -443,6 +443,14 @@
                 dataType: 'json',
                 success:function(data){
                     $('#jumlahupah').val(formatter.format(data));
+                }
+            });
+
+            $.ajax({
+                method:'GET',
+                url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan,
+                dataType: 'json',
+                success:function(data){
                     $('#bayaranditerima').val(data);
                 }
             });
@@ -596,7 +604,7 @@
 
                         let bakihargajual = $('#bakihargajualan').val().replace(/[^0-9.-]+/g,"");
 
-                        $('#perludibayar').val(formatter.format(Number(success) +  parseFloat($('#jumlahupah').val())));
+                        $('#perludibayar').val(formatter.format(Number(success) +  parseFloat($('#bayaranditerima').val())));
 
                         let totalbakipinjam = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) - success;
                         $('#bakipinjaman').val(formatter.format(totalbakipinjam));
@@ -613,7 +621,7 @@
                 });
 
             }else{
-                $('#perludibayar').val(parseFloat($('#jumlahupah').val()));
+                $('#perludibayar').val(parseFloat($('#bayaranditerima').val()));
                 $('#bakipinjaman').val(0);
                 $('#basic-separuh').text(0)
                 $('#bayaran').val(0);
@@ -693,6 +701,7 @@
     $("#sltjenistebus").change(function(){
     
         var jumupah = parseFloat($('#jumlahupah').val());
+        var jumupahrebet = parseFloat($('#bayaranditerima').val());
 
         switch($(this).val()) {
             case "T":
@@ -760,7 +769,7 @@
                 $('#divbayaran').show();
                 $('#divperludibayar').show();
 
-                $('#perludibayar').val(formatter.format(jumupah));
+                $('#perludibayar').val(formatter.format(jumupahrebet));
                 break;
 
             case "P":
@@ -849,10 +858,10 @@
                 totalnilaimarhunseparuh += parseFloat(value);
             });
 
-            if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val()))){
+            if(byr < (bayaranseparuhasal + parseFloat($('#bayaranditerima').val()))){
                 $('#bayaran').val(bayaranseparuhasal.toFixed(2));
             }else{
-                totalseparuh = byr - parseFloat($('#jumlahupah').val());
+                totalseparuh = byr - parseFloat($('#bayaranditerima').val());
                 $('#bayaran').val(totalseparuh.toFixed(2));
             }
 
@@ -2247,7 +2256,7 @@
                 //yang lama
                 "norujukan" : norujukan,
                 "nopelanggan" : nopelanggan,
-                "jenistebus" : jenistebus,
+                "jenistebus" : jenisbayarantebus,
                 "jbg" : jbg,
                 "kadarupah" : kadarupah,
                 "nilai_marhun" : nilai_marhun_lama,

routes/web.php

@@ -91,6 +91,7 @@ Route::get('/cari',['as'=>'wakil.caricustomer','uses'=>'CustomersController@cari
 Route::post('/createwakil',['as'=>'wakil.create','uses'=>'PenebusanController@createWakil'])->middleware('auth','teller');
 Route::get('/firstwakil',['as'=>'wakil.first','uses'=>'PenebusanController@getfirstWakil'])->middleware('auth','teller');
 Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history'])->middleware('auth','teller');
+Route::get('/history/khazanah',['as'=>'gadai.history.khazanah','uses'=>'GadaianController@history'])->middleware('auth','khazanah');
 
 //Kemaskini Upah
 Route::get('/kemaskiniupah',['as'=>'kemaskini.upah','uses'=>'AliranTunaiController@kemaskiniupah'])->middleware('auth','teller');
@@ -244,6 +245,8 @@ Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController
 Route::get('/komoditi/rekod/print',['as'=>'komoditi.rekod.print','uses'=>'KomuditiController@printRekodTransaksi']);
 
 Route::post('/khazanah/suratakuangadaian',['as'=>'agh.create','uses'=>'KhazanahController@SuratAkuanGadaian'])->middleware('auth','khazanah');
+Route::get('/khazanah/ulangcetakagh/{norujukan}',['as'=>'agh.ulangcetak','uses'=>'KhazanahController@ulangcetakSuratAkuanGadaianHilang'])->middleware('auth','khazanah');
+
 
 Route::get('/laporan/stokauditbersih', ['as'=>'laporan.stokauditbersih', 'uses'=>'KhazanahController@stokAuditBersih'])->middleware('auth','khazanah');
 Route::post('/laporan/stokauditbersih_cetak',['as' =>'stokauditbersih.cetakstokauditbersih', 'uses'=>'KhazanahController@cetakStok_AuditBersih'])->middleware('auth','khazanah');