From f0cb6e33122423cefba68fcb2e2fdc695a0e405c Mon Sep 17 00:00:00 2001
From: "LAPTOP-DGCU80CH\\user1" <afiqzakwanhamdan@gmail.com>
Date: Wed, 2 Dec 2020 11:43:12 +0800
Subject: [PATCH] fix gadai teller

---
 app/Http/Controllers/Auth/LoginController.php |   9 +-
 app/Http/Controllers/CustomersController.php  |  27 +-
 app/Http/Controllers/GadaianController.php    |  76 ++++-
 app/Http/Controllers/HomeController.php       |   9 +-
 resources/views/customers/index.blade.php     |   6 +-
 resources/views/customers/info.blade.php      | 168 +++++++---
 resources/views/gadaian/index.blade.php       | 311 +++++++++++-------
 .../views/homepage/penilai/home.blade.php     |   3 +-
 .../views/homepage/teller/home.blade.php      |   3 +
 resources/views/layouts/app.blade.php         |   4 +-
 routes/web.php                                |   6 +-
 11 files changed, 428 insertions(+), 194 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index b183f1e..5ab28d6 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -59,22 +59,23 @@ class LoginController extends Controller
 
         if (Auth::attempt($credentials)) {
             $auth_user = Auth::user();
+            $api_url = config('api.url');
             if($auth_user['roles'] == 'teller'){
                 $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
             }elseif($auth_user['roles'] == 'penilai'){
                 $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
                 $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json();
                 $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
-                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah'));
+                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
             }
             elseif($auth_user['roles'] == 'khazanah'){
                 $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
             }
             elseif($auth_user['roles'] == 'operasi'){
                 $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
             }
         }
 
diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php
index 33e6ae2..2eb084f 100644
--- a/app/Http/Controllers/CustomersController.php
+++ b/app/Http/Controllers/CustomersController.php
@@ -14,6 +14,7 @@ use Illuminate\Support\Facades\Auth;
 
 class CustomersController extends Controller
 {
+    private $customer_ic;
     public function __construct()
     {
         $this->middleware('auth');
@@ -24,24 +25,36 @@ class CustomersController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
+    
     public function index()
     {
         $search = false;
+        $api_url = config('api.url');
         $auth_user = Auth::user();
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $bank = Http::get(config('api.url') . '/api/bank')->json();
-        return view('customers.index',compact('search','cawangan_info','bank'));
+        return view('customers.index',compact('search','cawangan_info','bank','api_url'));
     }
 
-    public function info(){
+    public function info(Request $request){
         $auth_user = Auth::user();
+        $api_url = config('api.url');
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('customers.info',compact('cawangan_info'));
+        $customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json();
+        if($customers_info){
+            $customer_info = $customers_info[0];
+        }else{
+            $customer_info = $customers_info;
+        }
+        $request->session()->forget('page_reload');
+        $request->session()->forget('norujukan');
+        return view('customers.info',compact('cawangan_info','api_url','customer_info'));
     }
 
     public function search(Request $request){
         $noic = $request->noic;
-
+        Session::put('noic', $noic);
+        $api_url = config('api.url');
         $auth_user = Auth::user();
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $bank = Http::get(config('api.url') . '/api/bank')->json();
@@ -51,13 +64,15 @@ class CustomersController extends Controller
         }else{
             $customer_info = $customers_info;
         }
+        $request->session()->forget('page_reload');
+        $request->session()->forget('norujukan');
 
         $search = true;
         if($customer_info){
             Session::put('customer_info',$customer_info);
-            return redirect()->route('customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info]);
+            return redirect()->route('customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]);
         }else{
-            return view('customers.index',compact('customer_info','search','noic','cawangan_info','bank'));
+            return view('customers.index',compact('customer_info','search','noic','cawangan_info','bank','api_url'));
         }
     }
 
diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 32d23a4..1a8d26d 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -17,8 +17,9 @@ class GadaianController extends Controller
         $this->customerService = New CustomerService();
     }
 
-    public function index(Request $request)
-    {
+    public function index(Request $request){
+    
+        $api_url = config('api.url');
         $current = Carbon::now();
         $current = new Carbon();
         $curent_year = substr($current->year,2,2);
@@ -31,15 +32,68 @@ class GadaianController extends Controller
         // $limit_pinjaman_semasa = $customer_info['limit_pinjaman'] - $customer_info['pinjaman_semasa'];
         $limit_pinjaman_semasa = 0;
         $auth_user = Auth::user();
-        $gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
-        $new_transaction = sprintf("%04d",$gadai_transaction+1);
-        $norujukan = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
-        $gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
-            'norujukan' => $norujukan,
-            'nopelanggan' => $customer_info['nopelanggan'],
-            'nokp' => $noic
-        ]);
+        // dd($request->session()->get('page_reload'));
+        if($request->session()->get('page_reload') == null){
+            $gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+            if($gadai_transaction){
+                $new_sirig = $gadai_transaction['sirig'] + 1;
+                
+            }else{
+                $new_sirig = 1;
+            }
+            $new_transaction = sprintf("%04d",$new_sirig);
+            $norujukan = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+            $request->session()->put('norujukan',$norujukan);
+            $request->session()->put('page_reload',true);
+            $gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+                'norujukan' => $norujukan,
+                'nopelanggan' => $customer_info['nopelanggan'],
+                'nokp' => $noic,
+                'sirig' => $new_sirig
+            ]);
+        }else{
+            $norujukan = $request->session()->get('norujukan');
+        }
+        
+        
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('gadaian.index',compact('customer_info','limit_pinjaman_semasa','cawangan_info','norujukan'));
+        return view('gadaian.index',compact('customer_info','limit_pinjaman_semasa','cawangan_info','norujukan','api_url'));
+    }
+    
+    public function store(Request $request){
+        $auth_user = Auth::user();
+        // dd($request);
+        $margin_pinjaman = $request->pinjaman / $request->total_nilai_marhun;
+        $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),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun_detail,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun
+        ])->json();
+        $request->session()->forget('page_reload');
+        $request->session()->forget('norujukan');
+        return redirect()->route('customer_info');
+    }
+
+    public function batal(Request $request){
+        $norujukan = $request->norujukan;
+        $auth_user = Auth::user();
+        
+        Http::delete(config('api.url').'/api/gadai/batal/'. $auth_user['cawangan'] .'/' . $norujukan);
+        $request->session()->forget('page_reload');
+        $request->session()->forget('norujukan');
+        return redirect()->route('customer_info');
     }
 }
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 3037dcb..9897ac3 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -28,22 +28,23 @@ class HomeController extends Controller
     public function index()
     {
         $auth_user = Auth::user();
+        $api_url = config('api.url');
         if($auth_user['roles'] == 'teller'){
             $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-            return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+            return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
         }elseif($auth_user['roles'] == 'penilai'){
             $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
             $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json();
             $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
-            return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah'));
+            return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
         }
         elseif($auth_user['roles'] == 'khazanah'){
             $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-            return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+            return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
         }
         elseif($auth_user['roles'] == 'operasi'){
             $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-            return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info'));
+            return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
         }
     }
 }
diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php
index 690a095..291da6e 100644
--- a/resources/views/customers/index.blade.php
+++ b/resources/views/customers/index.blade.php
@@ -14,7 +14,7 @@
                 <div class="card-body">
                     <div class="text-center">
                         <h5 class="text-uppercase">masukkan nombor kad pengenalan</h5>
-                        <form action="{{ route('customer.search','juruwang') }}" method="GET">
+                        <form action="{{ route('customer.search') }}" method="GET">
                             <input type="text" id="noic" style="width:400px" name="noic" placeholder="No Kad Pengenalan Pelanggan" autocomplete="off" value="{{$search == false ? '' : $noic ?? ''}}"/>
                             <input type="submit" class="btn btn-primary" value="SAHKAN" />
                         </form>
@@ -36,7 +36,7 @@
                             <h5 class="modal-title" id="ModalLabel">Daftar Pelanggan</h5>
                         </div>
                         <div class="modal-body">
-                            <form action="{{ route('customer.store','juruwang') }}" method="POST">
+                            <form action="{{ route('customer.store') }}" method="POST">
                                 @csrf
                                 <div class="row form-group">
                                     <div class="col-md-6">
@@ -158,7 +158,7 @@
     </div>
 </div>
 <script>
-    
+    var api_url = "<?php echo $api_url ?>";
     
     $(document).ready(function(){
         var noic = $('#noic').val();
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 7017d02..1b10b4e 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -1,68 +1,131 @@
 @extends('layouts.app')
-
+<!-- Modal -->
+<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered modal-xl">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Maklumat Pelaggan</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div class='row form-group'>
+            <div class='col-md-6'>
+                <div class='form-group row col-md-12'>
+                    <div class='col-md-5'>
+                        Nama
+                    </div>
+                    <div class='col-md-7'>
+                        <input type="text" readonly name='' id='' value="{{ $customer_info['nama'] }}" class='form-control'>
+                    </div>
+                </div>
+                <div class='form-group row col-md-12'>
+                    <div class='col-md-5'>
+                        No KP
+                    </div>
+                    <div class='col-md-7'>
+                        <input type="text" readonly name='' id='' value="{{ $customer_info['kpbaru'] }}" class='form-control'>
+                    </div>
+                </div>
+                <div class='form-group row col-md-12'>
+                    <div class='col-md-5'>
+                        No Pelanggan
+                    </div>
+                    <div class='col-md-7'>
+                        <input type="text" readonly name='' id='' value="{{ $customer_info['nopelanggan'] }}" class='form-control'>
+                    </div>
+                </div>
+                <div class='form-group row col-md-12'>
+                    <div class='col-md-5'>
+                        No Telefon 1
+                    </div>
+                    <div class='col-md-7'>
+                        <input type="text" readonly name='' id='' value="{{ $customer_info['telefon'] }}" class='form-control'>
+                    </div>
+                </div>
+                <div class='form-group row col-md-12'>
+                    <div class='col-md-5'>
+                        No Telefon 2
+                    </div>
+                    <div class='col-md-7'>
+                        <input type="text" readonly name='' id='' value="{{ $customer_info['telefon2'] }}" class='form-control'>
+                    </div>
+                </div>
+            </div>
+            <div class='col-md-6'>
+                <div class='form-group row col-md-12'>
+                    <div class='col-md-4'>
+                        Alamat
+                    </div>
+                    <div class='col-md-8'>
+                        <textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['alamat1'] }}</textarea>
+                    </div>
+                </div>
+                <div class='form-group row col-md-12'>
+                    <div class='col-md-4'>
+                        Poskod
+                    </div>
+                    <div class='col-md-8'>
+                        <input type="text" readonly name='' id='' value="{{ $customer_info['poskod'] }}" class='form-control'>
+                    </div>
+                </div>
+                <div class='form-group row col-md-12'>
+                    <div class='col-md-4'>
+                        Daerah
+                    </div>
+                    <div class='col-md-8'>
+                        <input type="text" readonly name='' id='' value="{{ $customer_info['koddaerah'] }}" class='form-control'>
+                    </div>
+                </div>
+                <div class='form-group row col-md-12'>
+                    <div class='col-md-4'>
+                        Negeri
+                    </div>
+                    <div class='col-md-8'>
+                        <input type="text" readonly name='' id='' value="{{ $customer_info['kodnegeri'] }}" class='form-control'>
+                    </div>
+                </div>
+            </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
 @section('content')
-<?php 
-    $customer_info = Session::get('customer_info');
-?>
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12">
             <a href="{{ url('/pelanggan') }}"><i class="fas fa-arrow-left"></i> Kembali</a>
             <h3 class="text-center text-uppercase">maklumat pelanggan</h3>
             
-            <div class="form-group row col-12">
-                <div class="col-6">
+            <div class="form-group row col-md-12">
+                <div class="col-md-6">
                     <div class="form-group row">
-                        <div class="col-4">
-                            No Kad Pengenalan
-                        </div>
-                        <div class="col-8">
-                            <input type="text" class="form-control" name="noic" id="noic" readonly value="{{ $customer_info['kpbaru'] }}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-6">
-                    <div class="form-group row">
-                        <div class="col-4">
-                            No Pelanggan
-                        </div>
-                        <div class="col-8">
-                            <input type="text" class="form-control" name="no_pelanggan" readonly id="no_pelanggan" value="{{ $customer_info['nopelanggan'] }}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-6">
-                    <div class="form-group row">
-                        <div class="col-4">
+                        <div class="col-md-4">
                             Nama
                         </div>
-                        <div class="col-8">
+                        <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-6">
+                <div class="col-md-6">
                     <div class="form-group row">
-                        <div class="col-4">
-                            Alamat
+                        <div class="col-md-4">
+                            No Kad Pengenalan
                         </div>
-                        <div class="col-8">
-                            <textarea style="resize:none" class="form-control" name="alamat" id="alamat" cols="30" rows="2" readonly>{{ $customer_info['alamat1'].','.$customer_info['alamat2'].','.$customer_info['alamat3'].','.$customer_info['alamat4'] }}</textarea>
+                        <div class="col-md-8">
+                            <input type="text" class="form-control" name="noic" id="noic" readonly value="{{ $customer_info['kpbaru'] }}">
                         </div>
                     </div>
                 </div>
-                <div class="col-6">
-                    <div class="form-group row">
-                        <div class="col-4">
-                            No Telefon
-                        </div>
-                        <div class="col-8">
-                            <input type="text" class="form-control" readonly name="no_phone" id="no_phone" value="{{ $customer_info['telefon'] }}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 mt-3 justify-content-between form-group row">
-                    <div class="btn-group btn-group-toggle col-6" data-toggle="buttons">
+                
+                <div class="col-md-12 mt-md-3 justify-content-between form-group row">
+                    <div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
                         <label class="btn btn-primary">
                             <input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Belum Tebus
                         </label>
@@ -73,7 +136,10 @@
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
                         </label>
                     </div>
-                    <div class="col-6 text-right">
+                    <div class='col-md-3'>
+                        <button class='btn btn-primary' data-toggle="modal" data-target="#exampleModal">Maklumat Pelanggan</button>
+                    </div>
+                    <div class="col-md-3 text-right">
                         <a class="button btn btn-primary" style="margin-right:-50px" href="{{ route('gadaian',['noic'=>$customer_info['kpbaru'] ]) }}">Daftar Gadai</a>
                     </div>
                 </div>
@@ -104,6 +170,8 @@
     </div>
 </div>
 <script>
+    var api_url = "<?php echo $api_url ?>";
+
     var tablegadai = $('#myTable').DataTable({
         "scrollX": true
     });
@@ -138,7 +206,7 @@
         var noic = $("#noic").val();
         $.ajax({
             method:"GET",
-            url:"http://localhost:8000/api/customers/"+noic+"/gadai/belum_tebus",
+            url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus",
             success: function(data){
                 gadaiTable(data);
             }
@@ -154,7 +222,7 @@
             // console.log(noic);
             $.ajax({
                 method:"GET",
-                url:"http://localhost:8000/api/customers/"+noic+"/gadai/belum_tebus",
+                url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus",
                 success: function(data){
                     gadaiTable(data);
                 }
@@ -163,7 +231,7 @@
         if($("input[name='options']:checked").val() == 'sudah_tebus'){
             $.ajax({
                 method:"GET",
-                url:"http://localhost:8000/api/customers/"+noic+"/gadai/sudah_tebus",
+                url: api_url + "/api/customers/"+noic+"/gadai/sudah_tebus",
                 success: function(data){
                     gadaiTable(data);
                 }
@@ -172,7 +240,7 @@
         if($("input[name='options']:checked").val() == 'lelong'){
             $.ajax({
                 method:"GET",
-                url:"http://localhost:8000/api/customers/"+noic+"/gadai/lelong",
+                url: api_url + "/api/customers/"+noic+"/gadai/lelong",
                 success: function(data){
                     gadaiTable(data);
                 }
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 42ed935..c448646 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -6,64 +6,93 @@
         <div class="col-md-12 col-lg-12">
             <h3 class="text-center text-uppercase">gadaian</h3>
             <div class="form-group row col-12">
-                <div class="col-6">
+                <input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
+                <input type="hidden" name="nokp" id="nokp" value="{{ $customer_info['kpbaru'] }}">
+                <div class="col-md-4">
                     <div class="form-group row">
-                        <input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
-                        <input type="hidden" name="nokp" id="nokp" value="{{ $customer_info['kpbaru'] }}">
-                        <input type="hidden" name="jantina" id="jantina" value="{{ $customer_info['jantina'] }}">
-                        <div class="col-4">
-                            Nama
-                        </div>
-                        <div class="col-8">
-                            <input type="text" class="form-control" name="name" id="name" readonly value="{{ $customer_info['nama'] }}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-6">
-                    <div class="form-group row">
-                        <div class="col-4">
-                            No Pelanggan
-                        </div>
-                        <div class="col-8">
-                        <input type="text" class="form-control" name="nopelanggan" readonly id="nopelanggan" value="{{ $customer_info['nopelanggan'] }}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-6">
-                    <div class="form-group row">
-                        <div class="col-4">
+                        <div class="col-md-4">
                             No Rujukan
                         </div>
-                        <div class="col-8">
+                        <div class="col-md-8">
                             <input type="text" class="form-control" name="norujukan" id="norujukan" readonly value="{{ $norujukan }}">
                         </div>
                     </div>
                 </div>
-                <div class="col-6">
+                <div class="col-md-4">
                     <div class="form-group row">
-                        <div class="col-4">
-                            Jumlah Pinjaman Semasa
+                        <div class="col-md-4">
+                            Jumlah Pembiayaan Semasa
                         </div>
-                        <div class="col-8">
+                        <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-6">
+                <div class="col-md-4">
                     <div class="form-group row">
-                        <div class="col-4">
-                            Limit Pinjaman Semasa
+                        <div class="col-md-4">
+                            Limit Pembiayaan Semasa
                         </div>
-                        <div class="col-8">
+                        <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 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>
+                <button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button>
             </div>
             <div class="card">
                 <div class="card-body">
@@ -83,15 +112,17 @@
             </div>
             <div class="card">
                 <div class="card-body">
-                    <form action="">
+                    <form action="{{ route('gadai.store') }}" method='post' onsubmit="verifyGadai()">
+                    <!-- <form action="{{ route('gadai.store') }}" method='post'> -->
+                        @csrf
                         <div class="col-12 form-group row">
-                            <div class="col-4">
+                            <div class="col-md-4">
                                 <div class="form-group row">
                                     <div class="col-5">
-                                        Pinjaman Max
+                                        Pembiayaan Max
                                     </div>
                                     <div class="col-7 input-group">
-                                        <input type="text" class="form-control" readonly name="pinjaman_max_teller" id="pinjaman_max_teller">
+                                        <input type="text" style="height:50px !important" class="form-control" readonly name="pembiayaan_max_teller" id="pembiayaan_max_teller">
                                         <div class="input-group-append">
                                             <span class="input-group-text span-pinjaman-max"></span>
                                         </div>
@@ -100,11 +131,11 @@
                             </div>
                             <div class="col-3">
                                 <div class="form-group row">
-                                    <div class="col-6">
-                                        Upah Sebulan
+                                    <div class="col-md-6">
+                                        Keuntungan Sebulan
                                     </div>
-                                    <div class="col-6">
-                                        <input type="text" class="form-control" readonly name="upah_sebulan" id="upah_sebulan">
+                                    <div class="col-md-6">
+                                        <input type="text" class="form-control" readonly name="keuntungan_sebulan" id="keuntungan_sebulan">
                                     </div>
                                 </diV>
                             </div>
@@ -112,10 +143,10 @@
                                 <div class="form-group row">
                                 </diV>
                             </div>
-                            <div class="col-4">
+                            <div class="col-md-4">
                                 <div class="form-group row">
                                     <div class="col-5">
-                                        Pinjaman
+                                        Pembiayaan
                                     </div>
                                     <div class="col-7 input-group">
                                         <input type="text" class="form-control" name="pinjaman" id="pinjaman">
@@ -127,21 +158,21 @@
                             </div>
                             <div class="col-3">
                                 <div class="form-group row">
-                                    <div class="col-6">
-                                        Upah 6 Bulan
+                                    <div class="col-md-6">
+                                        Keuntungan 6 Bulan
                                     </div>
-                                    <div class="col-6">
-                                        <input type="text" class="form-control" readonly name="upah_6bln" id="upah_6bln">
+                                    <div class="col-md-6">
+                                        <input type="text" class="form-control" readonly name="keuntungan_6bln" id="keuntungan_6bln">
                                     </div>
                                 </diV>
                             </div>
                             <div class="col-5">
                                 <div class="form-group row">
-                                    <div class="col-6">
-                                        Pinjaman Max Pelulus
+                                    <div class="col-md-6">
+                                        Pembiayaan Max Pelulus
                                     </div>
-                                    <div class="col-6 input-group">
-                                        <input type="text" class="form-control" readonly name="pinjaman_max_pelulus" id="pinjaman_max_pelulus">
+                                    <div class="col-md-6 input-group">
+                                        <input type="text" class="form-control" readonly name="pembiyaan_max_pelulus" id="pembiyaan_max_pelulus">
                                         <div class="input-group-append">
                                             <span class="input-group-text span-pinjaman-max-pelulus"></span>
                                         </div>
@@ -149,8 +180,14 @@
                                 </diV>
                             </div>
                             <div class="col-12">
-                                <a href="{{ url('/pelanggan') }}" class="float-right btn btn-danger mr-2">Batal</a>
-                                <input type="button" name="terima_gadai" id="terima_gadai" class="float-right btn btn-primary mr-2" value="Terima">
+                                <input type="text" name="norujukan_gadai" id="norujukan_gadai" value="{{ $norujukan }}" hidden>
+                                <input type="text" name="marhun_detail" id="marhun_detail" value="" hidden>
+                                <input type="text" name="total_berat" id="total_berat" value="" hidden>
+                                <input type="text" name="kadarkeuntungan" id="kadarkeuntungan" value="" hidden>
+                                <input type="text" name="kuantiti_marhun" id="kuantiti_marhun" value="" hidden>
+                                <input type="text" name="total_nilai_marhun" id="total_nilai_marhun" value="" hidden>
+                                <a href="{{ route('gadai.batal',['norujukan'=>$norujukan]) }}" class="float-right btn btn-danger mr-2">Batal</a>
+                                <input type="submit" name="terima_gadai" id="terima_gadai" class="float-right btn btn-primary mr-2" value="Terima">
                                 <input type="button" class="float-right btn btn-primary mr-2" value="Tambah Gadai">
                             </div>
                         </div>
@@ -238,6 +275,8 @@
     </div>
 </div>
 <script>
+    var api_url = "<?php echo $api_url ?>";
+
     function disableF5(e) { if ((e.which || e.keyCode) == 116) e.preventDefault(); };
     $(document).ready( function () {
         $(document).on("keydown", disableF5);
@@ -246,7 +285,7 @@
 
         $.ajax({
             method:'GET',
-            url:'http://localhost:8000/api/jemas',
+            url: api_url + '/api/jemas',
             success:function(data){
                 $.each(data,function(index,jemas){
                     $("#marhun").append(new Option(jemas['descpt'], jemas['marhun']));
@@ -256,7 +295,7 @@
 
         $.ajax({
             method:'GET',
-            url:'http://localhost:8000/api/harga_emas',
+            url: api_url + '/api/harga_emas',
             success:function(data){
                 $.each(data,function(index,harga_emas){
                     var text = harga_emas['karat']+' - '+harga_emas['keterangan'];
@@ -269,7 +308,7 @@
     function getMarhun(norujukan){
         $.ajax({
             method:'GET',
-            url:'http://localhost:8000/api/marhun/'+norujukan,
+            url: api_url + '/api/marhun/'+norujukan,
             success:function(data){
                 marhuntable(data);
             }
@@ -304,12 +343,12 @@
     function getHargaEmas(karat,berat){
         $.ajax({
             method:'GET',
-            url:'http://localhost:8000/api/harga_emas/'+karat,
+            url: api_url + '/api/harga_emas/'+karat,
             success:function(data){
                 
                 var nilai_marhun = data['harga2'] * berat;
-                $('#harga').val(formatter.format(data['harga2']));
-                $('#nilai_marhun').val(formatter.format(nilai_marhun));
+                $('#harga').val(data['harga2']);
+                $('#nilai_marhun').val(nilai_marhun);
             }
         })
     }
@@ -345,18 +384,30 @@
                 tablemarhun.row.add([
                     counter,
                     marhun_detail['marhun'],
-                    'RM ' + formatter.format(marhun_detail['n_marhun']),
+                    'RM ' + marhun_detail['n_marhun'],
                     marhun_detail['karat'],
-                    formatter.format(marhun_detail['berat']),
+                    marhun_detail['berat'],
                     marhun_detail['nota']
                 ]).draw();
                 counter = counter + 1;
             });
         });
+        if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
+            kadarupah = 1.25/100;
+        }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
+            kadarupah = 1.5/100;
+        }else if(total_nilai_marhun >= 2001 ){
+            kadarupah = 1.7/100;
+        }
+        $('#total_nilai_marhun').val(total_nilai_marhun);
+        $('#marhun_detail').val(marhun_details);
+        $('#total_berat').val(total_berat);
+        $('#kadarkeuntungan').val(kadarupah);
+        $('#kuantiti_marhun').val(jumlah_marhun);
         
         $.ajax({
             method:'GET',
-            url:'http://localhost:8000/api/maxpinjaman',
+            url: api_url + '/api/maxpinjaman',
             success:function(data){
                 var pinjaman_pelulus = 0;
                 var pinjaman_teller = 0;
@@ -364,7 +415,7 @@
                     if(pinjaman['user_type'] == 'teller'){
                         pinjaman_teller = Number(pinjaman['max']);
                     }
-                    if(pinjaman['user_type'] == 'ppc'){
+                    if(pinjaman['user_type'] == 'khazanah'){
                         pinjaman_pelulus = Number(pinjaman['max']);
                     }
                 });
@@ -372,31 +423,24 @@
                 $('.span-pinjaman-max').text(pinjaman_teller + ' %');
                 var max_teller = total_nilai_marhun * (pinjaman_teller/100);
                 var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100);
-                $('#pinjaman_max_teller').val(formatter.format(max_teller));
-                $('#pinjaman_max_pelulus').val(formatter.format(max_pelulus));
+                $('#pembiayaan_max_teller').val(max_teller);
+                $('#pembiyaan_max_pelulus').val(max_pelulus);
             }
         });
     }
 
     $('#pinjaman').on('input',function(){
         var pinjaman = Number(this.value);
+        var nilaimarhun = Number($('#jumlah_nilai_marhun').val());
 
-        if(pinjaman > 0 && pinjaman < 401){
-            kadarupah = 1.25/100;
-        }else if(pinjaman >= 401 && pinjaman < 2001){
-            kadarupah = 1.5/100;
-        }else if(pinjaman >= 2001 ){
-            kadarupah = 1.7/100;
-        }
-
-        var upah_sebulan = pinjaman * kadarupah;
-        var upah_6bln = upah_sebulan * 6;
+        var keuntungan_sebulan = pinjaman * kadarupah;
+        var keuntungan_6bln = keuntungan_sebulan * 6;
 
         percent_pinjaman = (Number(pinjaman)/Number(total_nilai_marhun))*100;
 
         $('.span-pinjaman').text(percent_pinjaman.toFixed(2) + ' %');
-        $('#upah_sebulan').val(formatter.format(upah_sebulan.toFixed(2)));
-        $('#upah_6bln').val(formatter.format(upah_6bln.toFixed(2)));
+        $('#keuntungan_sebulan').val(keuntungan_sebulan.toFixed(2));
+        $('#keuntungan_6bln').val(keuntungan_6bln.toFixed(2));
     });
 
     const formatter = new Intl.NumberFormat('en-US', {
@@ -419,7 +463,7 @@
         else{
             $.ajax({
             method:'POST',
-            url:'http://localhost:8000/api/marhun/'+kodcaw,
+            url: api_url + '/api/marhun/'+kodcaw,
             dataType:'json',
             data:{
                 'norujukan': norujukan,
@@ -468,7 +512,7 @@
 
         $.ajax({
             method:'POST',
-            url:'http://localhost:8000/api/marhun/'+kodcaw,
+            url: api_url + '/api/marhun/'+kodcaw,
             dataType:'json',
             data:{
                 'norujukan': norujukan,
@@ -491,7 +535,7 @@
                 jumlah_marhun += 1;
                 jumlah_nilai_marhun += Number(nilai_marhun);
                 $('#bilangan_marhun').val(jumlah_marhun);
-                $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
+                $('#jumlah_nilai_marhun').val(jumlah_nilai_marhun);
                 getMarhun(norujukan);
             },
             error: function(xhRequest, ErrorText, thrownError){
@@ -501,39 +545,84 @@
         });
     })
 
-    $('#terima_gadai').click(function(){
+    function verifyGadai(){
         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 total_nilai_marhun = Number($('#total_nilai_marhun').val());
+        var pembiayaan_max_teller = $('#pembiayaan_max_teller').val();
+        var pembiyaan_max_pelulus = $('#pembiyaan_max_pelulus').val();
+        var min_pinjaman = total_nilai_marhun * 0.10;
 
-        var percentpinj = Number(pinjaman)/Number(total_nilai_marhun);
-        $.ajax({
-            method:'PUT',
-            url: 'http://localhost:8000/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);
+        // console.log(min_pinjaman);
+        if(pinjaman < min_pinjaman){
+            // alert('Sila Masukan Pembiayaan, Minimal Pembiayaan');
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukan Pembiayaan, Minimal Pembiayaan ialah RM '+ min_pinjaman
+            });
+            event.preventDefault();
+            return false;
+        }
+        else{
+            if(pinjaman > Number(pembiyaan_max_pelulus)+10){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Pinjaman Memerlukan Kelulusan Operasi'
+                });
+                event.preventDefault();
+                return false;
+            }else if(pinjaman > Number(pembiayaan_max_teller)+10){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Pinjaman Memerlukan Kelulusan Khazanah'
+                });
+                event.preventDefault();
+                return false;
             }
-        });
-    })
+        }
+        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/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index e9ccbab..bcbfc96 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -144,6 +144,7 @@
     </div>
 </div>
 <script>
+    var api_url = "<?php echo $api_url ?>";
 
     function timedRefresh(timeoutPeriod) {
         setTimeout("location.reload(true);",timeoutPeriod);
@@ -174,7 +175,7 @@
                 var marhun_name;
                 $.ajax({
                     method:'GET',
-                    url:'http://localhost:8000/api/jemas/nama_marhun',
+                    url: api_url + '/api/jemas/nama_marhun',
                     dataType: 'json',
                     data:{
                         marhun:marhun_detail['marhun']
diff --git a/resources/views/homepage/teller/home.blade.php b/resources/views/homepage/teller/home.blade.php
index a57007d..a0b7fb1 100644
--- a/resources/views/homepage/teller/home.blade.php
+++ b/resources/views/homepage/teller/home.blade.php
@@ -17,4 +17,7 @@
         </div>
     </div>
 </div>
+<script>
+    var api_url = "<?php echo $api_url ?>";
+</script>
 @endsection
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 584a81b..f7c7da8 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -66,10 +66,10 @@
                 </a>
                 <div id="displaytime"></div>
                 <div class="navbar-brand ml-md-3">
-                    Cawangan = <span>{{ $cawangan_info["details_caw"] }}</span>
+                    Cawangan : <span>{{ $cawangan_info["details_caw"] }}</span>
                 </div>
                 <div class="navbar-brand">
-                    Kod Cawangan = <span>{{ $cawangan_info['kodcaw'] }}</span>
+                    Kod Cawangan : <span>{{ $cawangan_info['kodcaw'] }}</span>
                 </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>
diff --git a/routes/web.php b/routes/web.php
index 6c78655..7a2cd8d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -37,8 +37,10 @@ Route::get('/penebusan','PenebusanController@index')->middleware('auth','teller'
 Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller');
 Route::get('/harga_emas','HargaEmasController@index')->middleware('auth','teller');
 Route::get('/profile',['as'=>'profile','uses'=>'UserController@index'])->middleware('auth','teller');
-Route::get('{user_type}/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search'])->middleware('auth','teller');
-Route::post('{user_type}/customer/store',['as'=>'customer.store','uses'=>'CustomersController@store'])->middleware('auth','teller');
+Route::get('/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search'])->middleware('auth','teller');
+Route::post('/customer/store',['as'=>'customer.store','uses'=>'CustomersController@store'])->middleware('auth','teller');
+Route::post('/gadai/store',['as'=>'gadai.store','uses'=>'GadaianController@store'])->middleware('auth','teller');
+Route::get('/gadai/batal',['as'=>'gadai.batal','uses'=>'GadaianController@batal'])->middleware('auth','teller');
 
 //Penilai
 Route::get('/gadaiansemasa',['as'=>'gadaian.semasa','uses'=>'GadaianController@gadaiansemasa'])->middleware('auth','penilai');
\ No newline at end of file