From d7c3a528d1e5d5e95c6d476e91090770e73253c3 Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Tue, 26 Jan 2021 15:09:04 +0800
Subject: [PATCH] fix bug

---
 resources/views/customers/info.blade.php | 108 +++++++++++------------
 resources/views/print/sag.blade.php      |   4 +-
 2 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index e448857..1153a17 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -360,7 +360,7 @@
 </div>
 <script>
     var api_url = "<?php echo $api_url ?>";
-
+    var kodcaw = "{{ $cawangan_info['kodcaw'] }}";
     $('#daftar_gadai').on('click',function(){
         event.preventDefault();
         $.ajax({
@@ -417,56 +417,53 @@
         tabledahtebus.clear().draw();
         tablelelong.clear().draw();
 
-        $.each(data,function(index,gadai){
-            $.each(gadai, function(index,gadai_detail){
-                if(jenistebus == "belum_tebus"){
-                        
-                    var urlroute = '{{ route("penebusan", ":id") }}';
-                    urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
+        $.each(data,function(index,gadai_detail){
+            if(jenistebus == "belum_tebus"){  
+                var urlroute = '{{ route("penebusan", ":id") }}';
+                urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
 
-                    tablegadai.row.add([
-                        '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
-                        '<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
-                        gadai_detail['t_gadai'],
-                        gadai_detail['t_matang'],
-                        'RM '+ formatter.format(gadai_detail['nilaimarhun']),
-                        'RM '+formatter.format(gadai_detail['pinjaman']),
-                        (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                        gadai_detail['jbg'],
-                        'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
-                        'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
-                    ]).draw();
-                }else if(jenistebus == "sudah_tebus"){
-                    
-                    tabledahtebus.row.add([
-                            '<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
-                        gadai_detail['norujukan'],
-                        gadai_detail['t_gadai'],
-                        gadai_detail['t_matang'],
-                        'RM '+ formatter.format(gadai_detail['nilaimarhun']),
-                        'RM '+formatter.format(gadai_detail['pinjaman']),
-                        (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                        gadai_detail['jbg'],
-                        'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
-                        'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
-                    ]).draw();
-                }else if(jenistebus == "lelong"){
-                    
-                    tablelelong.row.add([
-                        counter,
-                        gadai_detail['norujukan'],
-                        gadai_detail['t_gadai'],
-                        gadai_detail['t_matang'],
-                        'RM '+ formatter.format(gadai_detail['nilaimarhun']),
-                        'RM '+formatter.format(gadai_detail['pinjaman']),
-                        (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                        gadai_detail['jbg'],
-                        'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
-                        'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
-                    ]).draw();
-                }
-                counter = counter + 1;
-            });
+                tablegadai.row.add([
+                    '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
+                    '<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
+                    gadai_detail['t_gadai'],
+                    gadai_detail['t_matang'],
+                    'RM '+ formatter.format(gadai_detail['nilaimarhun']),
+                    'RM '+formatter.format(gadai_detail['pinjaman']),
+                    (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                    gadai_detail['jbg'],
+                    'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
+                    'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
+                ]).draw();
+            }else if(jenistebus == "sudah_tebus"){
+                
+                tabledahtebus.row.add([
+                        '<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
+                    gadai_detail['norujukan'],
+                    gadai_detail['t_gadai'],
+                    gadai_detail['t_matang'],
+                    'RM '+ formatter.format(gadai_detail['nilaimarhun']),
+                    'RM '+formatter.format(gadai_detail['pinjaman']),
+                    (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                    gadai_detail['jbg'],
+                    'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
+                    'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
+                ]).draw();
+            }else if(jenistebus == "lelong"){
+                
+                tablelelong.row.add([
+                    counter,
+                    gadai_detail['norujukan'],
+                    gadai_detail['t_gadai'],
+                    gadai_detail['t_matang'],
+                    'RM '+ formatter.format(gadai_detail['nilaimarhun']),
+                    'RM '+formatter.format(gadai_detail['pinjaman']),
+                    (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                    gadai_detail['jbg'],
+                    'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
+                    'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
+                ]).draw();
+            }
+            counter = counter + 1;
         });
 
 
@@ -481,11 +478,12 @@
         $('#btnsave').css('display','none');
 
         var noic = $("#noic").val();
-
+        
         $.ajax({
             method:"GET",
-            url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus",
+            url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus/"+kodcaw,
             success: function(data){
+                console.log(data);
                 $('#myTable').parents('div.dataTables_wrapper').first().show();
                 gadaiTable(data,"belum_tebus");
             }
@@ -920,7 +918,7 @@
 
             $.ajax({
                 method:"GET",
-                url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus",
+                url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus/"+kodcaw,
                 success: function(data){
                     gadaiTable(data,"belum_tebus");
                 }
@@ -934,7 +932,7 @@
 
             $.ajax({
                 method:"GET",
-                url: api_url + "/api/customers/"+noic+"/gadai/sudah_tebus",
+                url: api_url + "/api/customers/"+noic+"/gadai/sudah_tebus/"+kodcaw,
                 success: function(data){
                     gadaiTable(data,"sudah_tebus");
                 }
@@ -948,7 +946,7 @@
 
             $.ajax({
                 method:"GET",
-                url: api_url + "/api/customers/"+noic+"/gadai/lelong",
+                url: api_url + "/api/customers/"+noic+"/gadai/lelong/"+kodcaw,
                 success: function(data){
                     gadaiTable(data,"lelong");
                 }
diff --git a/resources/views/print/sag.blade.php b/resources/views/print/sag.blade.php
index b3ea420..70c2b18 100644
--- a/resources/views/print/sag.blade.php
+++ b/resources/views/print/sag.blade.php
@@ -392,7 +392,7 @@
       <td>TARIKH MATANG</td>
       <td>
         @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang']);
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate)
         @endphp
@@ -798,7 +798,7 @@
       <td>TARIKH MATANG</td>
       <td>
         @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang']);
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate)
         @endphp