server latest

app/Http/Controllers/AliranTunaiController.php

@@ -352,7 +352,7 @@ class AliranTunaiController extends Controller
         $lelong = Http::get(config('api.url').'/api/lelong/harini/'.$auth_user['cawangan'])->json();
 
         $lelongan = 0;
-        if(strtoupper($Auth::user()->name) === 'LELONG')
+        if(strtoupper(Auth::user()->name) === 'LELONG')
         {
             $lelongan = floatval($lelong);
         }else{
@@ -445,10 +445,10 @@ class AliranTunaiController extends Controller
         $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
         $gadaian = floatval($totalgadai);
 
-        if(strtoupper($Auth::user()->name) === 'LELONG'){
-            $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
+        if(strtoupper(Auth::user()->name) === 'LELONG'){
+	    $bakisemasa = $lelongan;         
         }else{
-            $bakisemasa = $lelongan;
+            $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
         }
 
         $errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;

app/Http/Controllers/KhazanahController.php

@@ -1394,9 +1394,9 @@ class KhazanahController extends Controller
 
       $amount = $request->amt;
 
-      if($amount>$baki_awal){
-        return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
-      }else{
+//      if($amount>$baki_awal){
+//        return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
+//      }else{
         $tarikh=$request->tarikh;
         $kodlaluan=$request->teller;
     
@@ -1508,7 +1508,7 @@ class KhazanahController extends Controller
 
         }    
 
-      }
+  //    }
 
       $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
       $sumBaki=$GetLatestBakiTunai;
@@ -2627,7 +2627,7 @@ class KhazanahController extends Controller
     //print lejer_AM
     public function cetak_lejer_am(Request $request)
     {
-
+	
         $auth_user = Auth::user();
         $api_url = config('api.url');
     

resources/views/aliran_tunai/index.blade.php

@@ -355,6 +355,8 @@
                             icon: 'warning',
                             title: 'Peringatan',
                             text: 'Aliran tunai selari dengan sistem!'
+                        }).then(function() {
+                            location.reload();
                         });
 
                     }else{

resources/views/khazanah/info.blade.php

@@ -721,7 +721,7 @@
 
     function saghilangfunc()
     {
-        if($("input[name='options']:checked").val() == 'belum_tebus'){
+        if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
             let histid = $('input[name="belum"]:checked').val();
             if(histid == null){
                 Swal.fire({
@@ -772,17 +772,19 @@
                 title: 'Amaran',
                 text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
             });
+	}
+
             
-        }else if($("input[name='options']:checked").val() == 'lelong'){
-            let histid = $('input[name="sudahtebus"]:checked').val();
-           
-            Swal.fire({
-                icon: 'error',
-                title: 'Amaran',
-                text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
-            });
-            
-        }
+//        }else if($("input[name='options']:checked").val() == 'lelong'){
+//            let histid = $('input[name="sudahtebus"]:checked').val();
+//           
+//            Swal.fire({
+//                icon: 'error',
+//                title: 'Amaran',
+//                text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
+//            });
+//            
+//        }
 
     }
 

resources/views/khazanah/serahan.blade.php

@@ -15,6 +15,13 @@
                   </nav>
 
                 <div class="card-body text-center">
+
+                    @if(session()->has('message'))
+                        <div class="alert alert-danger">
+                            {{ session()->get('message') }}
+                        </div>
+                    @endif
+
                     
                     <div class="row mb-4">
                         <div class="col-2 justify-content-start">

resources/views/lelongan/index.blade.php

@@ -260,7 +260,7 @@
             buttonsStyling: false
         });
 
-        let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
+        //let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
 
         swalWithBootstrapButtons.fire({
             title: 'Dapatkan Pengesahan Khazanah',
@@ -327,7 +327,7 @@
                                             encrypted: true
                                             });
 
-                        let teller = "{{ Auth::user()->name }}";
+                        //let teller = "{{ Auth::user()->name }}";
                         
                         var channel = pusher.subscribe('notice-ubahhapus');
                         channel.bind('my-ubahhapus', function(data) {

resources/views/print/laporan_lejer_am.blade.php

@@ -354,7 +354,7 @@
   @endforeach
 
 @foreach($Debit as $index=>$deb)
-  @if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019')
+  @if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019' || $deb['glcode'] == '3000/020')
     <tr>
       <td style="width:10px">{{ $deb['glcode'] }}</td>
       <td colspan="2" style="width:50px">{{ $deb['descpt'] }}</td>
@@ -366,7 +366,7 @@
 @endforeach
 
 @foreach($Kredit as $index=>$kred)
-  @if($kred['glcode'] == '5000/241'  || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102')
+  @if($kred['glcode'] == '5000/241'  || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102' || $kred['glcode'] == '7000/090')
     <tr>
       <td style="width:10px">{{ $kred['glcode'] }}</td>
       <td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>
@@ -429,4 +429,4 @@
  <td> </td>
  </tr>
 
-</table>
+</table>