Merge branch 'pipi' into 'master'

aliran tunai and fix ansurans tebus

See merge request online-sistem1/kaunter!41

app/Http/Controllers/AliranTunaiController.php

@@ -18,10 +18,33 @@ class AliranTunaiController extends Controller
     public function index(){
         $auth_user = Auth::user();
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        $alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'] . '/' . 'SAMSIANA')->json();
+        $alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'] . '/' . $auth_user['name'])->json();
         
+        // dd($alirantunai);
+        if(sizeof($alirantunai) == 0)
+        {
+            $alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
+                'kodcaw' => $auth_user['cawangan'],
+                'teller' => $auth_user['name'],
+                'bakiawal' => 0.00,
+                'masuk' => 0.00,
+                'yuran' => 0.00,
+                'keluar' => 0.00,
+                'baki' => 0.00,
+                'tambah' => 0.00,
+                'kurang' => 0.00
+            ])->json();            
+        }
+
+        $GT = Http::get(config('api.url') . '/api/countGT/' . $auth_user['cawangan'])->json();
+
+        if(sizeof($GT) > 0);
+        {
+            $GT = $GT[0];
+        }
+
         $api_url = config('api.url');
 
-        return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url'));
+        return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT'));
     }
 }

app/Http/Controllers/GadaianController.php

@@ -300,6 +300,9 @@ class GadaianController extends Controller
 
         $totaltransaction = 0;
 
+        $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
+
+
         if(sizeof($transaction) != 0)
             $transaction = $transaction[0];
 
@@ -319,10 +322,10 @@ class GadaianController extends Controller
     public function resitbelumansurans($id)
     {  
 
-        $totaltransaction = 0;
+        // $totaltransaction = 0;
 
-        if(sizeof($transaction) != 0)
-            $transaction = $transaction[0];
+        // if(sizeof($transaction) != 0)
+        //     $transaction = $transaction[0];
 
         $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
         
@@ -334,7 +337,7 @@ class GadaianController extends Controller
         if(sizeof($customers_info) != 0)
         $customers_info = $customers_info[0];
 
-        return view('print.resitansuransebelum',compact('transaction','gadai','customers_info'));
+        return view('print.resitansuransebelum',compact('gadai','customers_info'));
     }
 
     public function resittebus($id)

app/Http/Controllers/KhazanahController.php

@@ -83,6 +83,9 @@ class KhazanahController extends Controller
 
         $getVault = $getVault[0]['bakiawal'];
 
+        //Dashboardall
+        $dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json();
+
         //Marhun Terkumpul
         $marhun = Http::get(config('api.url'). '/api/marhunterkumpul/laporan/'. $auth_user['cawangan'] .'/'. $harini->toDateString())->json();
 
@@ -94,7 +97,7 @@ class KhazanahController extends Controller
         }
 
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('khazanah.dashboard',compact('cawangan_info','api_url','totalmarhun','ringkasanharian','ringkasanterkumpul','getVault','keseluruhanupahharian','keseluruhanupahterkumpul'));
+        return view('khazanah.dashboard',compact('cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','ringkasanterkumpul','getVault','keseluruhanupahharian','keseluruhanupahterkumpul'));
     }
 
     public function alirantunai()
@@ -103,10 +106,15 @@ class KhazanahController extends Controller
         $api_url = config('api.url');
 
         $tunai = Http::get( config('api.url') .'/api/TunaiController/'. $auth_user['cawangan'])->json();
-        $tunai = $tunai[0];
+
+        if(sizeof($tunai) > 0)
+            $tunai = $tunai[0];
 
         $addtunai = Http::get( config('api.url') .'/api/getAddTunai/'. $auth_user['cawangan'])->json();
 
+        // if(sizeof($addtunai) > 0)
+        //    $addtunai = $addtunai[0];
+
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
 
@@ -161,8 +169,7 @@ class KhazanahController extends Controller
         $gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
-        $reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'].'/SAMSIANA')->json();
-
+        $reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'])->json();
         
 
         foreach($reqTeller as $index=>$req)
@@ -177,12 +184,17 @@ class KhazanahController extends Controller
 
         $array_reqteller = $array_reqteller[0]['teller'];
 
-        // dd($array_reqteller);
-
 
         $listUser=User::where('cawangan',$auth_user['cawangan'] )->get();
         $denominasi=Http::get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
 
+        if(sizeof($denominasi) == 0)
+        {
+            $denominasi=Http::post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
+        }
+        
+        // dd($denominasi);
+
         return view('khazanah.pendahuluanserah',compact('cawangan_info','api_url','listUser','denominasi','array_reqteller'));
     }
 
@@ -195,7 +207,7 @@ class KhazanahController extends Controller
       $auth_user = Auth::user();
       $api_url = config('api.url');
 
-      $reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'].'/SAMSIANA')->json();
+      $reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'])->json();
 
       $gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
       $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
@@ -407,6 +419,7 @@ class KhazanahController extends Controller
         $api_url = config('api.url');
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $tunai=Http::get(config('api.url').'/api/TunaiController/'.$auth_user['cawangan'])->json();
+
       
         return view('khazanah.pendahuluan',compact('cawangan_info','api_url','auth_user','tunai'));
 
@@ -472,6 +485,7 @@ class KhazanahController extends Controller
 
     public function denominasicalculationpendahuluan($request)
     {
+
         $auth_user = Auth::user();
 
         $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
@@ -536,7 +550,7 @@ class KhazanahController extends Controller
 
           ]);
 
-          $updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . "SAMSIANA",[
+          $updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . $request->teller,[
                 
             'no'=>$request->no
       
@@ -548,6 +562,8 @@ class KhazanahController extends Controller
 
     public function denominasicalculationserahan($request)
     {
+
+        
         $auth_user = Auth::user();
 
         $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
@@ -612,7 +628,7 @@ class KhazanahController extends Controller
 
           ]);
 
-          $updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . "SAMSIANA",[
+          $updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . $request->teller,[
                 
             'no'=>$request->no
       
@@ -625,19 +641,27 @@ class KhazanahController extends Controller
     public function kemaskiniPendahuluan(Request $request)       //Daftar Pendahuluan kepada Kaunter
     {
        
-      return $this->denominasicalculationpendahuluan($request);
+    //   return $this->denominasicalculationpendahuluan($request);
 
       $auth_user = Auth::user();
       $api_url = config('api.url');
       $peti_besi_terkini=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
-      $baki_akhir=$peti_besi_terkini[0]["bakiakhir"];
 
-     
+      if(sizeof($peti_besi_terkini) == 0)
+      {
+          $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
+          $baki_awal=$peti_besi_terkini["bakiawal"];
+      }
+      else
+      {
+        $baki_awal=$peti_besi_terkini[0]["bakiawal"];
+      }
+
+      
+
       $amount = $request->amt;
 
-    //   dd($baki_akhir);
-
-      if($amount>$baki_akhir)
+      if($amount>$baki_awal)
       {
         dd($amount);
         //WI ERROR MESSAGE SKIT
@@ -645,6 +669,8 @@ class KhazanahController extends Controller
      else
      {
 
+   
+
       $tarikh=$request->tarikh;
       $kodlaluan=$request->teller;
       $tambah=$request->amt;
@@ -652,44 +678,36 @@ class KhazanahController extends Controller
       $nota=$request->nota;
       $kodcaw=$auth_user['cawangan'];
 
-      
       $addTunai=Http::post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[
        'kodcaw'=>$kodcaw,
-       'KodLaluan'=>$kodlaluan,
+       'kodlaluan'=>$kodlaluan,
        'tambah'=>$tambah,
        'kurang'=>$kurang,
        'nota'=>$nota 
        ]);
 
-      $getTunai=Http::get(config('api.url').'/api/TunaiController/'.$auth_user['cawangan'])->json();
-
-  
-
+       $getTunai=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
+      
        if(sizeof($getTunai) == 0)
        {
-        dd($getTunai);
+            dd($getTunai);
        }
        else
        {
-          $bakiawal=0;$masuk=0;$yuran=0;$keluar=0;$baki=0;$tmbh=0;$kurang=0;
+            $bakiawal=0;$masuk=0;$yuran=0;$keluar=0;$baki=0;$tmbh=0;$kurang=0;
 
-        $daftarTunai=Http::post(config('api.url').'/api/tunai/daftarTunai/'.$auth_user['cawangan'],[
-        'teller'=>$request->teller
-        ]);
-
-        
+        // $daftarTunai=Http::post(config('api.url').'/api/tunai/daftarTunai/'.$auth_user['cawangan'],[
+        // 'teller'=>$request->teller
+        // ]);
 
              $BakiAkhirT=0;$BakiAwalT=0;$tambahT=0;
 
-             $getTunai2=Http::get(config('api.url').'/api/TunaiController/'.$auth_user['cawangan'])->json();
+             $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
+             $bakiAwal=$getTunai2['bakiawal'];
+             $keluar=$getTunai2['keluar'];
+             $baki=$getTunai2['baki'];
+             $tam=$getTunai2['tambah'];
 
-          
-
-             $bakiAwal=$getTunai2[0]['bakiawal'];
-             $keluar=$getTunai2[0]['keluar'];
-
-        
-            
               if($bakiAwal==0)
               {
                 $BakiAwalT=0;
@@ -700,7 +718,7 @@ class KhazanahController extends Controller
               }
               if($keluar==0)
               {
-                $tambahT=$tambah;
+                $tambahT=$tambah + $tam;
               }
               else
                 $tambahT=$keluar;
@@ -714,8 +732,6 @@ class KhazanahController extends Controller
             'kurang'=>$kurang,
             'bakiakhir'=>$BakiAkhirT
              ]);
-
-
              
             $latestVault=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
             $masukV=$latestVault[0]['masuk'];
@@ -723,8 +739,7 @@ class KhazanahController extends Controller
             $pendahuluanV=$latestVault[0]['pendahuluan'];
             $serahanV=$latestVault[0]['serahan'];
             $BakiAwalV=$latestVault[0]['bakiawal'];
-
-            // dd($latestVault);
+                
             // return;
 
              $keluarV=$keluarV+$tambahT;
@@ -733,12 +748,16 @@ class KhazanahController extends Controller
              $bakiTerkini=$GetLatestBakiTunai;
              $bakiAwalV=$BakiAwalV;
              $bakiAkhirV=$bakiAwalV-$keluarV+$masukV+$pendahuluanV-$serahanV; 
-             $bakiEOD=$bakiAkhirV+$GetLatestBakiTunai;
-             $createTempVault=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan']);
+            //  $bakiEOD=$bakiAkhirV+$GetLatestBakiTunai; //try test
+            $bakiEOD = $bakiAkhirV;
 
+            //  dd($bakiEOD);
+            //  $createTempVault=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan']);
+            
+            //  dd($bakiAkhirV);
             //get temporary latest vault/ petibesi
 
-            $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
+
 
             $updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[
                 
@@ -766,7 +785,7 @@ class KhazanahController extends Controller
     public function KemaskiniSerahan(Request $request)
     {
 
-      return $this->denominasicalculationserahan($request);
+    
 
       $auth_user = Auth::user();
       $api_url = config('api.url');
@@ -869,6 +888,8 @@ class KhazanahController extends Controller
          else
             $serahan_V=$serahanV;
 
+       
+
       }
 
       $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
@@ -894,6 +915,7 @@ class KhazanahController extends Controller
    //--FINAL RESULT...KENA RIDERECT KE PAGE SEBELUMNYA..
 
        dd($updateVault);
+       return $this->denominasicalculationserahan($request);
     }
 
     

public/js/main.js

@@ -120,11 +120,28 @@ function totalkey(datakeyin)
 }
 
 
+function openuptambahdanserah(e)
+{
+    var id = $(e).attr('id');
+    var kodcaw = $(e).data('kodcaw');
+    var teller = $(e).data('teller');
+
+    $('#txtmodal').val('');
+    $('#tambahserahanModal').modal();
+    $('#jenisjenis').val(id);
+    $('#kodcawangan').val(kodcaw);
+    $('#tellerla').val(teller);
+}
+
 //Pendahuluan
 function tambahdanserahanfunc(e)
 {
 
-    var id = $(e).attr('id');
+    var id = $('#jenisjenis').val();
+    var kodcaw = $('#kodcawangan').val();
+    var teller = $('#tellerla').val();
+
+    var api_url = $('#api').val();
 
     if(id == "tambahmodal")
     {
@@ -132,14 +149,19 @@ function tambahdanserahanfunc(e)
 
         $.ajax({
             method:"POST",
-            url: api_url + '/api/requestTeller/ALS/SAMSIANA',
+            url: api_url + '/api/requestTeller/' + kodcaw + '/' + teller,
             data: {
                 "modal" : txt,
                 "serahan" : 0
             },
             success:function(data)
             {
-                alert('success');
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Tambah Pendahuluan',
+                    text: 'Tambah Pendahuluan berjaya dipohon!'
+                  })
+                  $('#tambahserahanModal').modal('hide');
             },
             error: function(xhRequest, ajaxOptions, thrownError){
                 console.log(xhRequest);
@@ -155,14 +177,19 @@ function tambahdanserahanfunc(e)
 
         $.ajax({
             method:"POST",
-            url: api_url + '/api/requestTeller/ALS/SAMSIANA',
+            url: api_url + '/api/requestTeller/' + kodcaw + '/' + teller,
             data: {
                 'modal' : 0,
                 'serahan' : txt
             },
             success:function(data)
             {
-                alert('success');
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Serahan Modal',
+                    text: 'Serahan modal berjaya dipohon!'
+                  })
+                  $('#tambahserahanModal').modal('hide');
             },
             error: function(xhRequest, ajaxOptions, thrownError){
                 console.log(xhRequest);

resources/views/aliran_tunai/index.blade.php

@@ -1,8 +1,12 @@
 @extends('layouts.app')
 
+@include('modal.tambahserahan')
+
 @section('content')
 <div class="container">
     <div class="row justify-content-center">
+        @php $auth_user = Auth::user();@endphp
+        <input type="hidden" id="api" value="{{ $api_url }}"/>
         <div class="col-md-12">
             <a href="{{ url('/') }}"><i class="fas fa-arrow-left"></i> Kembali</a>
             <h3 class="text-uppercase text-center">aliran tunai</h3>
@@ -22,7 +26,7 @@
                 <div class="col-lg-4 col-md-6 col-sm-12">
                     <div class="small-box bg-success">
                         <div class="inner">
-                            <h3>RM {{ number_format($alirantunai['masuk'],2) }}</h3>
+                            <h3>RM {{ number_format($alirantunai['tambah'],2) }}</h3>
 
                             <p>Tunai Diterima</p>
                         </div>
@@ -34,7 +38,7 @@
                 <div class="col-lg-4 col-md-6 col-sm-12">
                     <div class="small-box bg-warning">
                         <div class="inner">
-                            <h3>RM {{ number_format($alirantunai['keluar'],2) }}</h3>
+                            <h3>RM {{ number_format($alirantunai['kurang'],2) }}</h3>
 
                             <p>Tunai Dikeluar</p>
                         </div>
@@ -48,7 +52,7 @@
                 <div class="col-lg-4 col-md-6 col-sm-12">
                     <div class="small-box bg-danger">
                         <div class="inner">
-                            <h3 style="margin-bottom:60px !important">RM {{ number_format($alirantunai['baki'],2) }}</h3>
+                            <h3>RM {{ number_format($alirantunai['baki'],2) }}</h3>
                             <p>Baki Akhir Tunai</p>
                         </div>
                         <div class="icon">
@@ -59,9 +63,9 @@
                 <div class="col-lg-4 col-md-6 col-sm-12">
                     <div class="small-box bg-danger">
                         <div class="inner">
-                            <h3>RM {{ number_format($alirantunai['tambah'],2) }}</h3>
-                            <h3>23</h3>
-                            <p>Gadaian</p>
+                            {{-- <h3>RM {{ number_format($GT['gjumlah'],2) }}</h3> --}}
+                            <h3>{{ $GT['gcount'] }}</h3>
+                            <p>Bilangan Gadaian</p>
                         </div>
                         <div class="icon">
                             <i class="ion ion-android-contacts"></i>
@@ -71,9 +75,9 @@
                 <div class="col-lg-4 col-md-6 col-sm-12">
                     <div class="small-box bg-danger">
                         <div class="inner">
-                            <h3>RM {{ number_format($alirantunai['kurang'],2) }}</h3>
-                            <h3>18</h3>
-                            <p>Penebusan</p>
+                            {{-- <h3>RM {{ number_format($GT['tjumlah'],2) }}</h3> --}}
+                            <h3>{{ $GT['tcount'] }}</h3>
+                            <p>Bilangan Penebusan</p>
                         </div>
                         <div class="icon">
                             <i class="ion ion-pie-graph"></i>
@@ -82,25 +86,21 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-4 mx-auto mb-3">
-                    <input type="text" id="txtmodal" class="form-control"/>
-                </div>
                 <div class="col-md-12 text-center">
-                    <input type="button" class="btn btn-lg btn-primary" value="TAMBAH MODAL" id="tambahmodal" onclick="tambahdanserahanfunc(this)">
-                    <input type="button" class="btn btn-lg btn-primary" value="SERAHAN MODAL" id="serahanmodal" onclick="tambahdanserahanfunc(this)">
+                    <input type="button" class="btn btn-lg btn-primary" value="TAMBAH MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="tambahmodal" onclick="openuptambahdanserah(this)">
+                    <input type="button" class="btn btn-lg btn-primary" value="SERAHAN MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="serahanmodal" onclick="openuptambahdanserah(this)">
                 </div>
             </div>
             <div class="row mt-3">
                 <div class="card col-12">
                     <div class="card-body">
-                        <table class="table" id="myTable">
+                        <table class="table" id="tableaddtunai">
                             <thead>
                                 <tr>
                                     <th>Bil</th>
                                     <th>Masa</th>
                                     <th>Debit</th>
                                     <th>Kredit</th>
-                                    <th>Baki</th>
                                     <th>Nota</th>
                                 </tr>
                             </thead>
@@ -112,12 +112,60 @@
     </div>
 </div>
 <script>
+
+var tableaddtunai = $('#tableaddtunai').DataTable({
+    //   "scrollX": true
+    });
+
     $(document).ready( function () {
         var api = '{{ $api_url }}';
+        var kodcaw = "{{ $auth_user['cawangan'] }}";
+        var tele = "{{ $auth_user['name'] }}";
+
+   
+
+        function getData(){
+            $.ajax({
+                type: 'get',
+                url: api + '/api/getAddTunai/' + kodcaw + '/' + tele,
+                success: function(data){
+                    gettable(data);
+                }
+            });
+        }
 
 
-        $('#myTable').DataTable();
-    } );
+        getData();
+        setInterval(function () {
+            getData(); 
+        }, 10000);  
+
+
+
+    });
+
+    function gettable(datala)
+    {
+    var counter = 1;
+    tableaddtunai.clear().draw();
+
+    $.each(datala, function(index,arr){
+
+        var urlroute = "{{ route('pendahuluan.serah', ':no_id') }}";
+        
+        urlroute = urlroute.replace(':no_id', arr['no']);
+      
+        tableaddtunai.row.add([
+                    counter,
+                    arr['tarikh'],
+                    'RM ' + arr['tambah'],
+                    'RM ' + arr['kurang'],
+                    arr['nota']
+                ]).draw();
+                counter = counter + 1;
+
+    });
+}    
 </script>
 <script src="{{ asset('js/main.js') }}"></script>
 @endsection

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

@@ -19,7 +19,10 @@
             </div>
             <div class="row">
                 <a href="{{ url('kelulusan') }}" class="btn btn-primary btn-lg btn-block  mb-3">Kelulusan</a>
-                 </div>
+            </div>
+            <div class="row">
+                <a href="{{ url('unjuran') }}" class="btn btn-danger btn-lg btn-block mb-3">Unjuran</a>
+            </div>
                  </div>
 
                 <div class="col-3 mx-1">
@@ -32,9 +35,7 @@
             <div class="row">
                 <a href="{{ url('menu') }}" class="btn btn-primary btn-lg btn-block mb-3">Khazanah</a>
             </div>
-            <div class="row">
-                <a href="{{ url('unjuran') }}" class="btn btn-danger btn-lg btn-block mb-3">Unjuran</a>
-                </div>
+        
             </div>
                 <div class="col-3 mx-1">
             <div class="row">
@@ -43,9 +44,6 @@
             <div class="row">
                 <a href="{{ route('lelong') }}" class="btn btn-danger btn-lg btn-block mb-3">Lelong</a>
             </div>
-            <div class="row">
-                <a href="{{ url('hargaemas') }}" class="btn btn-primary btn-lg btn-block mb-3">Harga Emas</a>
-            </div>
             <div class="row">
                 <a href="{{ url('panjar') }}" class="btn btn-primary btn-lg btn-block mb-3">Panjar</a>
             </div>

resources/views/khazanah/alirantunai.blade.php

@@ -6,9 +6,10 @@
         <div class="col-md-12">
             <div class="card">
                 <div class="card-header">{{ __('Dashboard') }}</div>
-
+                {{-- {{ dd($tunai) }} --}}
                 <div class="card-body text-center">
                     
+                 
                     <div class="row mb-4">
                         <div class="col-2 justify-content-start">
                         <a href="{{ url('/') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
@@ -39,7 +40,7 @@
                             <!-- small box -->
                             <div class="small-box bg-primary">
                               <div class="inner">
-                                <h5>RM {{ number_format($tunai['masuk'],2) }}</h5>
+                                <h5>RM {{ number_format($tunai['tambah'],2) }}</h5>
           
                                 <p>Tunai Diterima</p>
                               </div>
@@ -53,7 +54,7 @@
                             <!-- small box -->
                             <div class="small-box bg-primary">
                               <div class="inner">
-                                <h5>RM {{ number_format($tunai['keluar'],2) }}</h5>
+                                <h5>RM {{ number_format($tunai['kurang'],2) }}</h5>
           
                                 <p>Tunai Dikeluar</p>
                               </div>
@@ -108,7 +109,6 @@
                           </div>
                     </div>
 
-
                     <div class="mt-3">
                         
                         <table class='table mt-4' id='table-capaian' style="width:100%;">

resources/views/khazanah/dashboard.blade.php

@@ -71,12 +71,11 @@
                           {{-- End First Column --}}
 
                           {{-- Second Column --}}
-
                           <div class="col-lg-6 col-xl-4 col-12">
                             <!-- small box -->
                             <div class="small-box bg-primary">
                               <div class="inner">
-                                <h3>RM {{ ($ringkasanterkumpul['gadai'][0]['jumlahpinjaman']) ? number_format($ringkasanterkumpul['gadai'][0]['jumlahpinjaman'],2) : "0.00" }}</h3>
+                                <h3>RM {{ ($dashboard[0]['gadai']) ? number_format((float)$dashboard[0]['gadai'],2) : "0.00" }}</h3>
           
                                 <p>Gadai Terkumpul</p>
                               </div>
@@ -90,7 +89,7 @@
                             <!-- small box -->
                             <div class="small-box bg-primary">
                               <div class="inner">
-                                <h3>RM {{ ($ringkasanterkumpul['tebus'][0]['jumlahpinjaman']) ? number_format($ringkasanterkumpul['tebus'][0]['jumlahpinjaman'],2) : "0.00" }}</h3>
+                                <h3>RM {{ ($dashboard[0]['tebus']) ? number_format((float)$dashboard[0]['tebus'],2) : "0.00" }}</h3>
           
                                 <p>Tebus Terkumpul</p>
                               </div>
@@ -122,7 +121,7 @@
                             <!-- small box -->
                             <div class="small-box bg-primary">
                               <div class="inner">
-                                <h3>RM 1,200.00</h3>
+                                <h3>RM {{ ($dashboard[0]['variasi']) ? number_format((float)$dashboard[0]['variasi'],2) : "0.00" }}</h3>
           
                                 <p>Variasi</p>
                               </div>
@@ -150,7 +149,7 @@
                             <!-- small box -->
                             <div class="small-box bg-primary">
                               <div class="inner">
-                                <h3>RM 3,240.20</h3>
+                                <h3>RM {{ ($dashboard[0]['outstanding']) ? number_format((float)$dashboard[0]['outstanding'],2) : "0.00" }}</h3>
           
                                 <p>Outstanding</p>
                               </div>

resources/views/khazanah/pendahuluan.blade.php

@@ -33,8 +33,6 @@
                                 <th>Action</th>
                             
                         </thead>
-                        <tbody>                           
-                        </tbody>
                     </table>
                 
 <br>
@@ -102,11 +100,13 @@
 
 <script>
     var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "{{ Auth::user()->cawangan }}";
+
     $(document).ready(function(){
         function getData(){
             $.ajax({
                 type: 'get',
-                url: api_url + '/api/requestTeller/get/ALS/SAMSIANA',
+                url: api_url + '/api/requestTeller/get/' + kodcaw,
                 success: function(data){
                     gettable(data);
                 }

resources/views/khazanah/pendahuluanserah.blade.php

@@ -23,7 +23,7 @@
  <br>
  <div class="row">
   <div class="col-2">Teller ID </div>
-  <div class="col-3"><input type="text" class="form-control" name="teller" value="{{ $array_reqteller['KodLaluan'] }}" readonly/></div>
+  <div class="col-3"><input type="text" class="form-control" name="teller" value="{{ $array_reqteller['kodlaluan'] }}" readonly/></div>
   <div class="col-4"></div>  <div class="col-4"></div>
 </div>
 <br>

resources/views/khazanah/serahan.blade.php

@@ -102,11 +102,13 @@
 
 <script>
     var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "{{ Auth::user()->cawangan }}";
+
     $(document).ready(function(){
         function getData(){
             $.ajax({
                 type: 'get',
-                url: api_url + '/api/requestTeller/get/ALS/SAMSIANA',
+                url: api_url + '/api/requestTeller/get/' + kodcaw,
                 success: function(data){
                     gettable(data);
                 }

resources/views/modal/tambahserahan.blade.php

@@ -0,0 +1,29 @@
+  <!-- Modal HistoryBayaran -->
+  <div class="modal fade" id="tambahserahanModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="ModalTitle">Tambah Dan Serahan Input</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="col-4 mx-auto mb-3">
+              <input type="text" id="txtmodal" class="form-control"/>
+              <input type="hidden" id="jenisjenis"/>
+              <input type="hidden" id="kodcawangan"/>
+              <input type="hidden" id="tellerla"/>
+            </div>
+          </div>
+
+        <div class="modal-footer">
+            <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
+            <button type="button" onclick="tambahdanserahanfunc()" class="btn btn-success btn-lg">Terima</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+

resources/views/penebusan/index.blade.php

@@ -320,7 +320,7 @@ function tebusan()
     
     if(tarikhgadai >= tarikhtawarruq)
     {   
-        let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}";
+        let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['bakipjm'] }}";
                                
         $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));                            
 
@@ -356,7 +356,7 @@ function tebusan()
     }
     else if(tarikhgadai < tarikhtawarruq)
     {
-        let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['pinjaman'] }}";
+        let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['pinjaman'] }}";
 
         $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));