From 3bf4e8e009725f6b0a39629dccd3cc1f7e4c3af9 Mon Sep 17 00:00:00 2001
From: "LAPTOP-DGCU80CH\\user1" <afiqzakwanhamdan@gmail.com>
Date: Tue, 8 Dec 2020 07:59:23 +0800
Subject: [PATCH] otp

---
 app/Http/Controllers/GadaianController.php |   8 +-
 resources/views/customers/index.blade.php  |   6 +-
 resources/views/gadaian/index.blade.php    |  71 ++-------
 resources/views/layouts/app.blade.php      |   2 +-
 resources/views/marhun/index.blade.php     | 174 ---------------------
 5 files changed, 26 insertions(+), 235 deletions(-)
 delete mode 100644 resources/views/marhun/index.blade.php

diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 7347a78..d86e5e1 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -63,14 +63,18 @@ class GadaianController extends Controller
     public function store(Request $request){
         $auth_user = Auth::user();
         // dd($request);
-        $margin_pinjaman = $request->pinjaman / $request->total_nilai_marhun;
+        $total_nilai_marhun = $request->total_nilai_marhun;
+        $total_nilai_marhun = str_replace(',','',$total_nilai_marhun);
+        
+        $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
+        // dd($margin_pinjaman);
         $kadarupah = $request->kadarkeuntungan * 100;
         $keuntungan6bulan = $request->keuntungan_6bln;
         $keuntungan12bulan = $request->keuntungan_sebulan*12;
         $hargajualan = $request->pinjaman + $keuntungan12bulan;
         $gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $request->norujukan_gadai,[
             'kodcaw' => $auth_user['cawangan'],
-            'nilaimarhun' => round($request->total_nilai_marhun, 2),
+            'nilaimarhun' => round($total_nilai_marhun, 2),
             'berat' => round($request->total_berat, 2),
             'pinjaman' => round($request->pinjaman, 2),
             'kadarupah' => round($kadarupah, 2),
diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php
index fda97c1..bc6c530 100644
--- a/resources/views/customers/index.blade.php
+++ b/resources/views/customers/index.blade.php
@@ -189,20 +189,20 @@
 
         $.ajax({
             method:'GET',
-            url:'http://localhost:8000/api/poskod/'+poskod,
+            url:api_url+'/api/poskod/'+poskod,
             success:function(poskod_detail){
                 // console.log(poskod_detail);
                 var koddaerah = poskod_detail['koddaerah'];
                 var kodnegeri = poskod_detail['kodnegeri'];
                 $.ajax({
-                    url:'http://localhost:8000/api/negeri/'+kodnegeri,
+                    url:api_url+'/api/negeri/'+kodnegeri,
                     method:'GET',
                     success:function(negeri){
                         $('#negeri').val(negeri['negeri']);
                     }
                 });
                 $.ajax({
-                    url:'http://localhost:8000/api/daerah/'+koddaerah,
+                    url:api_url+'/api/daerah/'+koddaerah,
                     method:'GET',
                     success:function(daerah){
                         $('#daerah').val(daerah['namadaerah']);
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 3ce01c5..daf7b83 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -348,7 +348,7 @@
                 
                 var nilai_marhun = data['harga2'] * berat;
                 $('#harga').val(data['harga2']);
-                $('#nilai_marhun').val(nilai_marhun);
+                $('#nilai_marhun').val(formatter.format(nilai_marhun));
             }
         })
     }
@@ -384,9 +384,9 @@
                 tablemarhun.row.add([
                     counter,
                     marhun_detail['marhun'],
-                    'RM ' + marhun_detail['n_marhun'],
+                    'RM ' + formatter.format(marhun_detail['n_marhun']),
                     marhun_detail['karat'],
-                    marhun_detail['berat'],
+                    formatter.format(marhun_detail['berat']),
                     marhun_detail['nota']
                 ]).draw();
                 counter = counter + 1;
@@ -399,11 +399,11 @@
         }else if(total_nilai_marhun >= 2001 ){
             kadarupah = 1.7/100;
         }
-        $('#total_nilai_marhun').val(total_nilai_marhun);
+        $('#total_nilai_marhun').val(formatter.format(total_nilai_marhun));
         $('#marhun_detail').val(marhun_details);
-        $('#total_berat').val(total_berat);
-        $('#kadarkeuntungan').val(kadarupah);
-        $('#kuantiti_marhun').val(jumlah_marhun);
+        $('#total_berat').val(formatter.format(total_berat));
+        $('#kadarkeuntungan').val(formatter.format(kadarupah));
+        $('#kuantiti_marhun').val(formatter.format(jumlah_marhun));
         
         $.ajax({
             method:'GET',
@@ -419,12 +419,12 @@
                         pinjaman_pelulus = Number(pinjaman['max']);
                     }
                 });
-                $('.span-pinjaman-max-pelulus').text(pinjaman_pelulus + ' %');
-                $('.span-pinjaman-max').text(pinjaman_teller + ' %');
+                $('.span-pinjaman-max-pelulus').text(formatter.format(pinjaman_pelulus) + ' %');
+                $('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %');
                 var max_teller = total_nilai_marhun * (pinjaman_teller/100);
                 var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100);
-                $('#pembiayaan_max_teller').val(max_teller);
-                $('#pembiyaan_max_pelulus').val(max_pelulus);
+                $('#pembiayaan_max_teller').val(formatter.format(max_teller));
+                $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus));
             }
         });
     }
@@ -438,9 +438,9 @@
 
         percent_pinjaman = (Number(pinjaman)/Number(total_nilai_marhun))*100;
 
-        $('.span-pinjaman').text(percent_pinjaman.toFixed(2) + ' %');
-        $('#keuntungan_sebulan').val(keuntungan_sebulan.toFixed(2));
-        $('#keuntungan_6bln').val(keuntungan_6bln.toFixed(2));
+        $('.span-pinjaman').text(formatter.format(percent_pinjaman.toFixed(2)) + ' %');
+        $('#keuntungan_sebulan').val(formatter.format(keuntungan_sebulan.toFixed(2)));
+        $('#keuntungan_6bln').val(formatter.format(keuntungan_6bln.toFixed(2)));
     });
 
     const formatter = new Intl.NumberFormat('en-US', {
@@ -536,7 +536,6 @@
                 'nilai_marhun' : nilai_marhun
             },
             success:function(data){
-                // alert('Tambah Marhun Berjaya');
                 Swal.fire({
                     icon: 'success',
                     title: 'Berjaya!',
@@ -551,12 +550,11 @@
                 
                 jumlah_marhun += 1;
                 jumlah_nilai_marhun += Number(nilai_marhun);
-                $('#bilangan_marhun').val(jumlah_marhun);
-                $('#jumlah_nilai_marhun').val(jumlah_nilai_marhun);
+                $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
+                $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
                 getMarhun(norujukan);
             },
             error: function(xhRequest, ErrorText, thrownError){
-                // alert('Tambah Marhun Tidak Berjaya');
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -578,9 +576,7 @@
         var pembiyaan_max_pelulus = $('#pembiyaan_max_pelulus').val();
         var min_pinjaman = total_nilai_marhun * 0.10;
 
-        // console.log(min_pinjaman);
         if(pinjaman < min_pinjaman){
-            // alert('Sila Masukan Pembiayaan, Minimal Pembiayaan');
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -616,40 +612,5 @@
         return true;
 
     }
-
-    // $('#terima_gadai').click(function(){
-    //     var kodcaw = $('#kodcaw').val();
-    //     var nokp = $('#nokp').val();
-    //     var jantina = $('#jantina').val();
-    //     var bangsa = $('#bangsa').val();
-    //     var nopelanggan = $('#nopelanggan').val();
-    //     var norujukan = $('#norujukan').val();
-    //     var pinjaman = Number($('#pinjaman').val());
-
-    //     var percentpinj = Number(pinjaman)/Number(total_nilai_marhun);
-    //     $.ajax({
-    //         method:'PUT',
-    //         url:  api_url + '/api/gadai/norujukan/'+kodcaw+'/'+norujukan,
-    //         dataType:'json',
-    //         data:{
-    //             'kodcaw': kodcaw,
-    //             'nilaimarhun' : total_nilai_marhun.toFixed(2),
-    //             'berat' : total_berat,
-    //             'pinjaman' : pinjaman.toFixed(2),
-    //             'kadarupah' : kadarupah,
-    //             'marhun' : marhun_details,
-    //             'jantina' : jantina,
-    //             'bangsa' : bangsa,
-    //             'percentpinj' : percentpinj.toFixed(2)
-    //         },
-    //         success:function(data){
-    //             alert('Gadai Berjaya');
-    //         },
-    //         error: function(xhRequest, ErrorText, thrownError){
-    //             alert('Gadai Tidak Berjaya');
-    //             console.log(xhRequest);
-    //         }
-    //     });
-    // })
 </script>
 @endsection
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 4ff81fd..ad3a424 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -66,7 +66,7 @@
 <body onload="startTime()">
     <div id="app">
         <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm">
-            <div class="container-fluid">
+            <div class="container">
                 <a class="navbar-brand" href="{{ url('/') }}">
                 <img src="{{ asset('img/logo_arrahn_baru.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" /> ar-rahn
                 </a>
diff --git a/resources/views/marhun/index.blade.php b/resources/views/marhun/index.blade.php
deleted file mode 100644
index 5a2c7ec..0000000
--- a/resources/views/marhun/index.blade.php
+++ /dev/null
@@ -1,174 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-10">
-            <h3 class="text-center text-uppercase">MAKLUMAT MARHUN</h3>
-            <div class="card">
-                <div class="card-body">
-                    <form action="" id="maklumat_marhun" method="post">
-                        <div class="row">
-                            <div class="col-md-6">
-                                <div class="form-group row">
-                                    <input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
-                                    <div class="col-md-4">No Rujukan</div>
-                                    <div class="col-md-8"><input type="text" name="norujukan" id="norujukan" value="{{ $norujukan }}"></div>
-                                    <div class="col-md-4">Marhun</div>
-                                    <div class="col-md-8">
-                                        <select name="marhun" id="marhun">
-                                            <option disabled selected value> -- select an option -- </option>
-                                            @foreach($jemas as $j)
-                                                <option value="{{$j['marhun']}}">{{$j['descpt']}}</option>
-                                            @endforeach
-                                        </select>
-                                    </div>
-                                    <div class="col-md-12">
-                                        <div class="form-group row">
-                                            <div class="form-check form-check-inline">
-                                                <input class="form-check-input" type="checkbox" id="rosak" value="rosak">
-                                                <label class="form-check-label" for="rosak">Rosak</label>
-                                            </div>
-                                            <div class="form-check form-check-inline">
-                                                <input class="form-check-input" type="checkbox" id="putus" value="putus">
-                                                <label class="form-check-label" for="putus">Putus</label>
-                                            </div>
-                                            <div class="form-check form-check-inline">
-                                                <input class="form-check-input" type="checkbox" id="patah" value="patah">
-                                                <label class="form-check-label" for="patah">Patah</label>
-                                            </div>
-                                            <div class="form-check form-check-inline">
-                                                <input class="form-check-input" type="checkbox" id="permata" value="permata">
-                                                <label class="form-check-label" for="permata">Permata</label>
-                                            </div>
-                                            <div class="form-check form-check-inline">
-                                                <input class="form-check-input" type="checkbox" id="sebelah" value="sebelah">
-                                                <label class="form-check-label" for="sebelah">Sebelah</label>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-4">Karat</div>
-                                    <div class="col-md-8">
-                                        <select name="karat" id="karat">
-                                            <option disabled selected value> -- select an option -- </option>
-                                            @foreach($hargaemas as $emas)
-                                                <option value="{{$emas['karat']}}">{{$emas['karat'].' - '.$emas['keterangan']}}</option>
-                                            @endforeach
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">Berat</div>
-                                    <div class="col-md-8"><input type="text" name="berat_emas" id="berat_emas"></div>
-                                    <div class="col-md-4">Harga</div>
-                                    <div class="col-md-8"><input type="text" name="harga" id="harga" readonly></div>
-                                    <div class="col-md-4">Nilai Marhun</div>
-                                    <div class="col-md-8"><input type="text" name="nilai_marhun" id="nilai_marhun" readonly></div>
-                                </div>
-                            </div>
-                            <div class="col-md-6">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <img style="width:200px" src="{{ asset('img/logo_arrahn_baru.png') }}" alt="">
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="form-group row" style="margin-right:auto;margin-left:auto">
-                                        <button class="btn btn-primary mr-2">KAMERA</button>
-                                        <button class="btn btn-primary">MUAT NAIK</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-                            <div class="form-group row" style="margin-right:auto;margin-left:auto">
-                                <input class="btn btn-primary mr-2" type="button" name="tambah_marhun" id="tambah_marhun" value="Tambah">
-                                <input class="btn btn-primary mr-2" type="submit" name="terima_marhun" id="terima_marhun" value="Terima">
-                                <input class="btn btn-danger mr-2" type="button" name="batal_marhun" id="batal_marhun" value="Batal">
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    $('#karat').change(function(){
-        var karat = this.value;
-        karat = karat.replace(/\./g,'-');
-        var berat = $('#berat_emas').val();
-        getHargaEmas(karat,berat)
-    });
-
-    $('#berat_emas').change(function(){
-        var berat = this.value;
-        var karat = $('#karat').val();
-        karat = karat.replace(/\./g,'-');
-        getHargaEmas(karat,berat)
-    })
-
-    $('#tambah_marhun').click(function(){
-        var kodcaw = $('#kodcaw').val();
-        var norujukan = $('#norujukan').val();
-        var marhun = $('#marhun').val();
-        var rosak = $('#rosak').val();
-        var putus = $('#putus').val();
-        var patah = $('#patah').val();
-        var permata = $('#permata').val();
-        var sebelah = $('#sebelah').val();
-        var karat = $('#karat').val();
-        var berat_emas = $('#berat_emas').val();
-        var harga = $('#harga').val();
-        var nilai_marhun = $('#nilai_marhun').val();
-
-        $.ajax({
-            method:'POST',
-            url:'http://localhost:8000/api/marhun/'+kodcaw,
-            dataType:'json',
-            data:{
-                'norujukan': norujukan,
-                'marhun' : marhun,
-                'rosak' : rosak,
-                'putus' : putus,
-                'patah' : patah,
-                'permata' : permata,
-                'sebelah' : sebelah,
-                'karat' : karat,
-                'berat_emas' :berat_emas,
-                'harga' : harga,
-                'nilai_marhun' : nilai_marhun
-            },
-            success:function(data){
-                alert('Tambah Marhun Berjaya');
-                $('#marhun').prop("selected", false);
-                $('#rosak').prop('checked', false);
-                $('#putus').prop('checked', false);
-                $('#patah').prop('checked', false);
-                $('#permata').prop('checked', false);
-                $('#sebelah').prop('checked', false);
-                $('#karat').prop("selected", false);
-                $('#berat_emas').val("");
-                $('#harga').val("");
-                $('#nilai_marhun').val("");
-            },
-            error: function(xhRequest, ErrorText, thrownError){
-                alert('Tambah Marhun Tidak Berjaya');
-                console.log(xhRequest);
-            }
-        });
-    })
-
-    function getHargaEmas(karat,berat){
-        $.ajax({
-            method:'GET',
-            url:'http://localhost:8000/api/harga_emas/'+karat,
-            success:function(data){
-                
-                var nilai_marhun = data['harga2'] * berat;
-                $('#harga').val(data['harga2']);
-                $('#nilai_marhun').val(nilai_marhun);
-            }
-        })
-    }
-</script>
-@endsection