fix conflict

app/Http/Controllers/GadaianController.php

@@ -96,4 +96,38 @@ class GadaianController extends Controller
         $request->session()->forget('norujukan');
         return redirect()->route('customer_info');
     }
+
+    public function cetakSAG(Request $request){
+        $auth_user = Auth::user();
+        // dd($request);
+
+        $gadai = Http::put(config('api.url').'/api/gadai/norujukan/cetak/'.$auth_user['cawangan'].'/'.$request->norujukan_modal);
+
+        return redirect()->route('home');
+    }
+
+    public function serahMarhun(Request $request){
+        // dd($request);
+        $auth_user = Auth::user();
+        $norujukan_serah = $request->norujukanpilih;
+
+        $arraynorujukan = explode(",",$norujukan_serah);
+
+        $results=array_search("",$arraynorujukan,true);
+        if($results !== false) {
+            unset($arraynorujukan[$results]);
+        }
+
+        // dd($arraynorujukan);
+
+        foreach($arraynorujukan as $index=>$norujukan){
+            $gadai = Http::put(config('api.url'). '/api/gadai/norujukan/serah/'. $auth_user['cawangan'] .'/'. $norujukan);
+
+            if($gadai->failed()){
+                break;
+            }
+        }
+
+        return redirect()->route('home');
+    }
 }

resources/views/customers/info.blade.php

@@ -184,6 +184,7 @@
         tablegadai.clear().draw();
         $.each(data,function(index,gadai){
             $.each(gadai, function(index,gadai_detail){
+                var keuntungan_semasa = (gadai_detail['kadarupah']/100)*gadai_detail['bakipjm']*gadai_detail['jbg'];
                 tablegadai.row.add([
                     counter,
                     gadai_detail['norujukan'],
@@ -191,7 +192,7 @@
                     'RM '+formatter.format(gadai_detail['pinjaman']),
                     'RM '+ formatter.format(gadai_detail['nilaimarhun']),
                     gadai_detail['jbg'],
-                    'RM '+ formatter.format((gadai_detail['kadarupah']/100)*gadai_detail['pinjaman']*gadai_detail['tempoh']),
+                    'RM '+ formatter.format(keuntungan_semasa),
                     gadai_detail['t_matang'],
                     (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
                     'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)),

resources/views/gadaian/index.blade.php

@@ -475,7 +475,12 @@
                 'nilai_marhun' : nilai_marhun
             },
             success:function(data){
-                alert('Tambah Marhun Berjaya');
+                // alert('Tambah Marhun Berjaya');
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Berjaya!',
+                    text: 'Tambah Marhun Berjaya'
+                });
                 $('#nota').val('').trigger("change");
                 $('#marhun').val(0);
                 $('#karat').val(0);
@@ -491,7 +496,12 @@
                 $('#daftar_marhun').modal('hide');
             },
             error: function(xhRequest, ErrorText, thrownError){
-                alert('Tambah Marhun Tidak Berjaya');
+                // alert('Tambah Marhun Tidak Berjaya');
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Tambah Marhun Tidak Berjaya'
+                });
                 console.log(xhRequest);
             }
         });
@@ -524,7 +534,12 @@
                 'nilai_marhun' : nilai_marhun
             },
             success:function(data){
-                alert('Tambah Marhun Berjaya');
+                // alert('Tambah Marhun Berjaya');
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Berjaya!',
+                    text: 'Tambah Marhun Berjaya'
+                });
                 $('#nota').val('').trigger("change");
                 $('#marhun').val(0);
                 $('#karat').val(0);
@@ -539,7 +554,12 @@
                 getMarhun(norujukan);
             },
             error: function(xhRequest, ErrorText, thrownError){
-                alert('Tambah Marhun Tidak Berjaya');
+                // alert('Tambah Marhun Tidak Berjaya');
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Tambah Marhun Tidak Berjaya'
+                });
                 console.log(xhRequest);
             }
         });
@@ -572,7 +592,7 @@
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
-                    text: 'Pinjaman Memerlukan Kelulusan Operasi'
+                    text: 'Pembiayaan Memerlukan Kelulusan Operasi'
                 });
                 event.preventDefault();
                 return false;
@@ -580,12 +600,17 @@
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
-                    text: 'Pinjaman Memerlukan Kelulusan Khazanah'
+                    text: 'Pembiayaan Memerlukan Kelulusan Khazanah'
                 });
                 event.preventDefault();
                 return false;
             }
         }
+        Swal.fire({
+            icon: 'success',
+            title: 'Berjaya!',
+            text: 'Gadaian Berjaya Disimpan'
+        });
         return true;
 
     }

resources/views/homepage/penilai/home.blade.php

@@ -21,16 +21,23 @@
                             <th>Berat</th>
                             <th>Karat</th>
                             <th>Nilai Marhun</th>
+                            <th>Nota</th>
                         </tr>
                     </thead>
                     <tbody id="tablemarhun">
                     </tbody>
                 </table>
-                <div class="row">
+                <div class="row form-group">
                     <div class="col-md-12 text-center">
-                        <a href="" class="btn btn-primary disabled">Cetak SAG</a>
+                        <form action="{{ route('gadaian.cetak') }}" method="post">
-                        <a href="" class="btn btn-primary">Pembelian Komuditi</a>
+                            @csrf
+                            <input type="text" hidden name="norujukan_modal" id="norujukan_modal">
+                            <input type="submit" class="btn btn-primary" id="cetak_sag" value="Cetak SAG">
+                        </form>
                     </div>
+                    <!-- <div class="col-md-6">
+                        <button class="btn btn-primary" id="pembelian_komuditi">Pembelian Komuditi</button>
+                    </div> -->
                 </div>
           </div>
 
@@ -42,6 +49,44 @@
       </div>
   </div>
 </div>
+
+<div class="modal fade" id="belum_serah_modal">
+    <div class="modal-dialog modal-xl modal-dialog-centered">
+        <div class="modal-content">
+
+          <!-- Modal Header -->
+            <div class="modal-header">
+                <h4 class="modal-title"></h4>
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+            </div>
+
+          <!-- Modal body -->
+            <div class="modal-body">
+                <h4>Marhun</h4>
+                <table id="biasa" class="table table-striped table-bordered text-center" style="width:100%">
+                    <thead>
+                        <tr>
+                            <th>Bil</th>
+                            <th>Jenis Marhun</th>
+                            <th>Berat</th>
+                            <th>Karat</th>
+                            <th>Nilai Marhun</th>
+                            <th>Nota</th>
+                        </tr>
+                    </thead>
+                    <tbody id="belum_serah">
+                    </tbody>
+                </table>
+          </div>
+
+          <!-- Modal footer -->
+          <div class="modal-footer">
+              <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+          </div>
+
+      </div>
+  </div>
+</div>
 @section('content')
 <div class="container">
     <div class="row justify-content-center">
@@ -65,6 +110,8 @@
                                 <thead>
                                     <tr>
                                         <th>Bil</th>
+                                        <th>Nama</th>
+                                        <th>No KP</th>
                                         <th>No Rujukan</th>
                                         <th>Pembiayaan (RM)</th>
                                         <th>Nilai Marhun (RM)</th>
@@ -79,7 +126,14 @@
                                                 <td>{{ $count }}</td>
                                                 <td>
                                                     @php
-                                                        $marhun = Http::get('http://localhost:8000/api/marhun/' . $gadaian['norujukan'] )->json();
+                                                        $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json();
+                                                        echo ($customer_info[0]['nama']);
+                                                    @endphp
+                                                </td>
+                                                <td>{{ $gadaian['nokp'] }}</td>
+                                                <td>
+                                                    @php
+                                                        $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json();
                                                     @endphp
                                                     <a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-target="#marhunModal"> {{$gadaian['norujukan']}}</a>
                                                 </td>
@@ -99,6 +153,8 @@
                                 <thead>
                                     <tr>
                                         <th>Bil</th>
+                                        <th>Nama</th>
+                                        <th>No KP</th>
                                         <th>No Rujukan</th>
                                         <th>Pembiayaan (RM)</th>
                                         <th>Nilai Marhun (RM)</th>
@@ -110,12 +166,17 @@
                                     @if (is_array($gadaian_belumserah) || is_object($gadaian_belumserah))
                                         @foreach($gadaian_belumserah as $index=>$gadaian)
                                             <tr>
-                                                <td><input type="checkbox" id="checkgadai" autocomplete="off" data-norujukan="{{$gadaian['norujukan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-marhun="{{$gadaian['nilaimarhun']}}"></input></td>
+                                                @php
+                                                    $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json();
+                                                @endphp
+                                                <td><input type="checkbox" id="checkgadai" autocomplete="off" data-nokp="{{ $gadaian['nokp'] }}" data-nama="{{ $customer_info[0]['nama'] }}" data-norujukan="{{$gadaian['norujukan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-marhun="{{$gadaian['nilaimarhun']}}"></input></td>
+                                                <td>{{ $customer_info[0]['nama'] }}</td>
+                                                <td>{{ $gadaian['nokp'] }}</td>
                                                 <td>
                                                     @php
-                                                        $marhun = Http::get('http://localhost:8000/api/marhun/' . $gadaian['norujukan'] )->json();
+                                                        $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json();
                                                     @endphp
-                                                    <a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-target="#marhunModal"> {{$gadaian['norujukan']}}</a>
+                                                    <a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-target="#belum_serah_modal"> {{$gadaian['norujukan']}}</a>
                                                 </td>
                                                 <td>{{ $gadaian['pinjaman'] }}</td>
                                                 <td>{{ $gadaian['nilaimarhun'] }}</td>
@@ -132,8 +193,11 @@
                                     <div class='col-md-3'>
                                         <input type="text" name="marhunpilih" id="marhunpilih" readonly class='form-control'>
                                     </div>
-                                    
+                                    <form action="{{ route('marhun.serah') }}" method="post">
-                                    <a href="" class='btn btn-primary'>Serah Marhun</a>
+                                        @csrf
+                                        <input type="text" name="norujukanpilih" id="norujukanpilih" hidden>
+                                        <button type="submit" id="btn-serah" class='btn btn-primary' disabled>Serah Marhun</button>
+                                    </form>
                                 </div>
                             </div>
                         </div>
@@ -150,7 +214,7 @@
         setTimeout("location.reload(true);",timeoutPeriod);
     }
 
-    window.onload = timedRefresh(60000);
+    window.onload = timedRefresh(300000);
     var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
         "ordering": false
     });
@@ -161,6 +225,66 @@
         minimumFractionDigits: 2
     });
 
+    // $('#cetak_sag').click(function(){
+    //     var kodcaw = $('#kodcaw').val();
+    //     var norujukan = $('#norujukan_modal').val();
+    //     $.ajax({
+    //         url: api_url + '/api/gadai/norujukan/cetak/'+ kodcaw + '/' + norujukan,
+    //         method: 'put',
+    //         success: function(data){
+                
+    //             Swal.fire({
+    //                 icon: 'success',
+    //                 title: 'Berjaya!',
+    //                 text: 'Cetak SAG Berjaya'
+    //             });
+    //         },
+    //         error: function(xhRequest, ErrorText, thrownError){
+    //             Swal.fire({
+    //                 icon: 'error',
+    //                 title: 'Amaran!',
+    //                 text: 'Cetak SAG Tidak Berjaya'
+    //             });
+    //             console.log(xhRequest);
+    //         }
+    //     });
+    // });
+
+    // $('#pembelian_komuditi').click(function(){
+    //     var kodcaw = $('#kodcaw').val();
+    //     var norujukan = $('#norujukan_modal').val();
+    //     $.ajax({
+    //         url: api_url + '/api/gadai/norujukan/komuditi/'+ kodcaw + '/' + norujukan,
+    //         method: 'put',
+    //         success: function(data){
+                
+    //             Swal.fire({
+    //                 icon: 'success',
+    //                 title: 'Berjaya!',
+    //                 text: 'Pembelian Komuditi Berjaya'
+    //             });
+    //         },
+    //         error: function(xhRequest, ErrorText, thrownError){
+    //             Swal.fire({
+    //                 icon: 'error',
+    //                 title: 'Amaran!',
+    //                 text: 'Pembelian Komuditi Tidak Berjaya'
+    //             });
+    //             console.log(xhRequest);
+    //         }
+    //     });
+    // });
+
+    function cetakSAG(kodcaw,norujukan){
+        $.ajax({
+            url: api_url + 'gadai/norujukan/' + kodcaw + '/' + norujukan,
+            method:'get',
+            success: function(data){
+                console.log(data);
+            }
+        });
+    }
+
     //modal
     $('#marhunModal').on('show.bs.modal', function(event) {
         var button = $(event.relatedTarget); // button yg trigger
@@ -169,6 +293,35 @@
         var kodcaw = button.data('kodcaw');
         var hargajualan = button.data('hargajualan');
 
+        $('#norujukan_modal').val(norujukan);
+        cetakSAG(kodcaw,norujukan);
+        $('#tablemarhun').empty();
+        $.each(arraymarhun,function(index,marhun){
+            $.each(marhun, function(index,marhun_detail){
+                var marhun_name;
+                $.ajax({
+                    method:'GET',
+                    url: api_url + '/api/jemas/nama_marhun',
+                    dataType: 'json',
+                    data:{
+                        marhun:marhun_detail['marhun']
+                    },
+                    success:function(marhun_ajax){
+                        $("#tablemarhun").append("<tr><td>" + marhun_detail['bil'] + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
+                    }
+                });
+            });
+        });
+
+    });
+
+    $('#belum_serah_modal').on('show.bs.modal', function(event) {
+        var button = $(event.relatedTarget); // button yg trigger
+        var arraymarhun = button.data('marhun');
+        var norujukan = button.data('norujukan');
+        var kodcaw = button.data('kodcaw');
+        var hargajualan = button.data('hargajualan');
+
         $('#tablemarhun').empty();
         $.each(arraymarhun,function(index,marhun){
             $.each(marhun, function(index,marhun_detail){
@@ -181,7 +334,7 @@
                         marhun:marhun_detail['marhun']
                     },
                     success:function(marhun_ajax){
-                        $("#tablemarhun").append("<tr><td>" + marhun_detail['bil'] + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td></tr>");
+                        $("#belum_serah").append("<tr><td>" + marhun_detail['bil'] + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
                     }
                 });
             });
@@ -194,11 +347,19 @@
             var norujukan = $(this).data("norujukan");
             var kodcaw = $(this).data("kodcaw");
             var marhun = $(this).data("marhun");
-
+            
             total_marhun_pilih += Number(marhun);
 
             $('#marhunpilih').val(total_marhun_pilih.toFixed(2));
 
+            $("#btn-serah").prop('disabled', false);
+
+            var norujukanpilih = $('#norujukanpilih').val();
+
+            norujukanpilih += norujukan + ",";
+            
+            $('#norujukanpilih').val(norujukanpilih);
+
         }else {
             var norujukan = $(this).data("norujukan");
             var kodcaw = $(this).data("kodcaw");
@@ -207,6 +368,19 @@
             total_marhun_pilih -= Number(marhun);
 
             $('#marhunpilih').val(total_marhun_pilih.toFixed(2));
+
+            var norujukanpilih = $('#norujukanpilih').val();
+            
+            var sag;
+            sag = norujukan + ",";
+
+            norujukanpilih = norujukanpilih.replace('ALS201203-0001,', "");
+
+            $('#norujukanpilih').val(norujukanpilih);
+        }
+        var legchecked = $('input[id^=checkgadai]:checked').length;
+        if(legchecked == 0){
+            $("#btn-serah").prop('disabled', true);
         }
     });
 </script>

resources/views/layouts/app.blade.php

@@ -70,6 +70,7 @@
                 </div>
                 <div class="navbar-brand">
                     Kod Cawangan : <span>{{ $cawangan_info['kodcaw'] }}</span>
+                    <input type="text" hidden name="kodcaw" id="kodcaw" value="{{ $cawangan_info['kodcaw'] }}">
                 </div>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
                     <span class="navbar-toggler-icon"></span>

routes/web.php

@@ -44,6 +44,9 @@ Route::get('/gadai/batal',['as'=>'gadai.batal','uses'=>'GadaianController@batal'
 
 //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');
+Route::post('/serahmarhun',['as'=>'marhun.serah','uses'=>'GadaianController@serahMarhun'])->middleware('auth','penilai');
+
 
 //Khazanah
 Route::get('/menu','KhazanahController@menu')->middleware('auth','khazanah');
@@ -51,4 +54,6 @@ Route::get('/khazanahgadaian','KhazanahController@gadaian')->middleware('auth','
 Route::get('/khazanahtebus','KhazanahController@tebus')->middleware('auth','khazanah');
 Route::get('/kelulusan','KhazanahController@kelulusan')->middleware('auth','khazanah');
 Route::get('/pendahuluan','KhazanahController@pendahuluan')->middleware('auth','khazanah');
-Route::get('/serahan','KhazanahController@serahan')->middleware('auth','khazanah');
+Route::get('/serahan','KhazanahController@serahan')->middleware('auth','khazanah');
+
+