From fb0040575bda5a1a45e1671a4a84e709809b1ef0 Mon Sep 17 00:00:00 2001
From: Afiq <afiq@arrahns.local>
Date: Tue, 29 Dec 2020 08:06:27 +0800
Subject: [PATCH] fix gadai

---
 resources/views/gadaian/index.blade.php | 150 ++++++++----------------
 1 file changed, 52 insertions(+), 98 deletions(-)

diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 27e6ca8..70672a2 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -38,58 +38,6 @@
                         </div>
                     </div>
                 </div>
-
-                <!-- <div class="col-md-6">
-                    <div class="form-group row">
-                        
-                        <div class="col-md-4">
-                            Nama
-                        </div>
-                        <div class="col-md-8">
-                            <input type="text" class="form-control" name="name" id="name" readonly value="{{ $customer_info['nama'] }}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="form-group row">
-                        <div class="col-md-4">
-                            No Pelanggan
-                        </div>
-                        <div class="col-md-8">
-                        <input type="text" class="form-control" name="nopelanggan" readonly id="nopelanggan" value="{{ $customer_info['nopelanggan'] }}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="form-group row">
-                        <div class="col-md-4">
-                            No Rujukan
-                        </div>
-                        <div class="col-md-8">
-                            <input type="text" class="form-control" name="norujukan" id="norujukan" readonly value="{{ $norujukan }}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="form-group row">
-                        <div class="col-md-4">
-                            Jumlah Pembiayaan Semasa
-                        </div>
-                        <div class="col-md-8">
-                            <input type="text" class="form-control" name="pinjaman_semasa" id="pinjaman_semasa" readonly value="">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="form-group row">
-                        <div class="col-md-4">
-                            Limit Pembiayaan Semasa
-                        </div>
-                        <div class="col-md-8">
-                            <input type="text" class="form-control" name="limit_pinjaman" id="limit_pinjaman" readonly value="{{ $limit_pinjaman_semasa }}">
-                        </div>
-                    </div>
-                </div> -->
             </div>
             <div class="col-12 text-right mb-2">
                 <button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button>
@@ -455,59 +403,61 @@
         var berat_emas = $('#berat_emas').val();
         var harga = $('#harga').val();
         var nilaimarhun = $('#nilai_marhun').val();
+        var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,""));
         var nota_array = $('#nota').val();
-        var nota = nota_array.toString();
+        if(nota_array != null){
+            var nota = nota_array.toString();
+        }else{
+            var nota = '';
+        }
 
         if(marhun == null && karat == null && berat_emas == ''){
             $('#daftar_marhun').modal('hide');
         }
         else{
             $.ajax({
-            method:'POST',
-            url: api_url + '/api/marhun/'+kodcaw,
-            dataType:'json',
-            data:{
-                'norujukan': norujukan,
-                'marhun' : marhun,
-                'nota':nota,
-                'karat' : karat,
-                'berat_emas' :berat_emas,
-                'harga' : harga,
-                'nilai_marhun' : nilaimarhun
-            },
-            success:function(successdata){
-                Swal.fire({
-                    icon: 'success',
-                    title: 'Berjaya!',
-                    text: 'Tambah Marhun Berjaya'
-                });
-                $('#nota').val('').trigger("change");
-                $('#marhun').val(0);
-                $('#karat').val(0);
-                $('#berat_emas').val("");
-                $('#harga').val("");
-                $('#nilai_marhun').val("");
-                
-                jumlah_marhun += 1;
-                jumlah_nilai_marhun += Number(nilai_marhun);
-                $('#bilangan_marhun').val(jumlah_marhun);
-                $('#jumlah_nilai_marhun').val(jumlah_nilai_marhun);
-                getMarhun(norujukan);
-                $('#daftar_marhun').modal('hide');
-            },
-            error: function(xhRequest, ErrorText, thrownError){
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Amaran!',
-                    text: 'Tambah Marhun Tidak Berjaya'
-                });
-                console.log(xhRequest);
-            }
-        });
-
+                method:'POST',
+                url: api_url + '/api/marhun/'+kodcaw,
+                dataType:'json',
+                data:{
+                    'norujukan': norujukan,
+                    'marhun' : marhun,
+                    'nota':nota,
+                    'karat' : karat,
+                    'berat_emas' :berat_emas,
+                    'harga' : harga,
+                    'nilai_marhun' : nilai_marhun
+                },
+                success:function(successdata){
+                    Swal.fire({
+                        icon: 'success',
+                        title: 'Berjaya!',
+                        text: 'Tambah Marhun Berjaya'
+                    });
+                    $('#nota').val('').trigger("change");
+                    $('#marhun').val(0);
+                    $('#karat').val(0);
+                    $('#berat_emas').val("");
+                    $('#harga').val("");
+                    $('#nilai_marhun').val("");
+                    
+                    jumlah_marhun += 1;
+                    jumlah_nilai_marhun += Number(nilai_marhun);
+                    $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
+                    $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
+                    getMarhun(norujukan);
+                    $('#daftar_marhun').modal('hide');
+                },
+                error: function(xhRequest, ErrorText, thrownError){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Tambah Marhun Tidak Berjaya'
+                    });
+                    console.log(xhRequest);
+                }
+            });
         }
-
-
     });
 
     $('#tambah_marhun').click(function(){
@@ -520,7 +470,11 @@
         var nilaimarhun = $('#nilai_marhun').val();
         var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,""));
         var nota_array = $('#nota').val();
-        var nota = nota_array.toString();
+        if(nota_array != null){
+            var nota = nota_array.toString();
+        }else{
+            var nota = '';
+        }
 
         $.ajax({
             method:'POST',