Merge branch 'fixkaunter' of https://gitlab.com/online-sistem1/kaunter into fixkaunter

app/Console/Commands/initiateTunai.php

@@ -12,7 +12,7 @@ class initiateTunai extends Command
      *
      * @var string
      */
-    protected $signature = 'initiate:tunai';
+    protected $signature = 'initiate:tunai {--all : all zone} {--1 : update zone 1} {--2 : update zone 2} {--3 : update zone3}';
 
     /**
      * The console command description.
@@ -38,7 +38,19 @@ class initiateTunai extends Command
      */
     public function handle()
     {
-        $updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/initiate/tunai')->json();
+        if($this->option('all')){
+            $zone = 'all';
+        }else if($this->option('1')){
+            $zone = '1';
+        }else if ($this->option('2')){
+            $zone = '2';
+        }else if ($this->option('3')){
+            $zone = '3';
+        }
+
+        $updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/initiate/tunai',[
+            'zone' => $zone
+        ])->json();
         if($updateOnline == 'successful'){
             return 0;
         }else{

app/Console/Commands/keluarLelong.php

@@ -12,7 +12,7 @@ class keluarLelong extends Command
      *
      * @var string
      */
-    protected $signature = 'keluar:lelong';
+    protected $signature = 'keluar:lelong {--all : all zone} {--1 : update zone 1} {--2 : update zone 2} {--3 : update zone3}';
 
     /**
      * The console command description.
@@ -38,8 +38,22 @@ class keluarLelong extends Command
      */
     public function handle()
     {
-        $updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/keluar/lelong')->json();
+        if($this->option('all')){
-        $updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/keluar/lelong/tawarruq')->json();
+            $zone = 'all';
+        }else if($this->option('1')){
+            $zone = '1';
+        }else if ($this->option('2')){
+            $zone = '2';
+        }else if ($this->option('3')){
+            $zone = '3';
+        }
+
+        $updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/keluar/lelong',[
+            'zone' => $zone
+        ])->json();
+        $updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/keluar/lelong/tawarruq',[
+            'zone' => $zone
+        ])->json();
         if($updateOnline == 'successful'){
             return 0;
         }else{

app/Console/Commands/updateJbg.php

@@ -50,7 +50,9 @@ class updateJbg extends Command
         $updatejbg = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/updatejbgsemasa',[
             'zone' => $zone
         ])->json();
-        $updatejbgLelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/updatejbglelong')->json();
+        $updatejbgLelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/updatejbglelong',[
+            'zone' => $zone
+        ])->json();
         $hapusGadaiNull = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/hapus/gadai/null')->json();
         if($updatejbg == 'successful'){
             $this->info('Success');

app/Http/Controllers/KhazanahController.php

@@ -3524,7 +3524,17 @@ class KhazanahController extends Controller
         $permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/get/'.$auth_user['cawangan'])->json();
         $bank = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/bank')->json();
 
-        return view('khazanah.permohonanwang', compact('bank','cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan'));
+        $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
+
+        if(sizeof($denominasi) == 0)
+        {
+            $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
+        }
+        else
+        {
+            $denominasi=$denominasi[0];
+        }
+        return view('khazanah.permohonanwang', compact('bank','cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan','denominasi'));
     }
 
     public function RekodPermohonan()

resources/views/khazanah/laporan/datalejer_am.blade.php

@@ -25,7 +25,7 @@
                       <form method="post">
                       @csrf
                     <div class="row">
-                      
+
                     <div class="col-sm-2">Mula</div>
                      <div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1"    autocomplete="off"  aria-describedby="basic-addon1"></div>
                       </div>
@@ -33,22 +33,22 @@
                   <div class="col-sm-2">Hingga</div>
                  <div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2"    autocomplete="off"  aria-describedby="basic-addon1"></div>
                  </div>
-                    <br> 
+                    <br>
                     <div class="row">
                     <div class="col-sm-1"> </div>   <div class="col-sm-6"></div>
                     <div class="col-sm-3"></div>
-                    <div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM" formtarget="_blank"  formaction="{{route('cetak.lejer_am')}}">  
+                    <div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM" formtarget="_blank"  formaction="{{route('cetak.lejer_am')}}">
                       </div>
                     </div>
 
                        <br>
                      <div class="row">
-                     
+
-                     <div class="col-sm-1"> </div>  
+                     <div class="col-sm-1"> </div>
-                     <div class="col-sm-6"> </div>  
+                     <div class="col-sm-6"> </div>
-                     <div class="col-sm-6"> </div>  
+                     <div class="col-sm-6"> </div>
-             
+
-                    
+
                      </div>
 
 
@@ -75,7 +75,7 @@
             format: 'dd-mm-yyyy'
         });
 
-      
+
 
         var current = new Date();
         var current_date = current.getDate();
@@ -105,11 +105,11 @@
             }
         });
     });
-    
 
 
 
-  
+
+
 </script>
 
 
@@ -157,7 +157,7 @@ $(document).ready( function () {
 <div class="modal" id="myModal">
   <div class="modal-dialog">
     <div class="modal-content">
- 
+
       <!-- Modal Header -->
       <div class="modal-header">
         <h5 class="modal-title">Laporan Imbangan Duga Cawangan</h5>
@@ -176,7 +176,7 @@ $(document).ready( function () {
 }
 
 #details td, #details th {
- 
+
   padding: 8px;
   font-size:11px;
 }
@@ -196,25 +196,25 @@ $(document).ready( function () {
 </style>
 
 <form action="{{route('imbangduga.cetak')}}" method="post">
-  
+
 @csrf
-   
+
    <table id="details">
    <tr>
    <td>  <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker3" name="datetimepicker3"    autocomplete="off"  aria-describedby="basic-addon1">     </td>
    </tr>
-   
+
    <tr>
    <td>    <input type="submit" class="btn btn-success ml-md-5" id="submit_button" name="submit_button" value="Jana Laporan" >   </td>
    </tr>
-   
-   
-   
-   
 
-   
+
-   
+
-   
+
+
+
+
+
    </table>
 
 </form>
@@ -224,7 +224,7 @@ $(document).ready( function () {
 
 
 
- 
+
       </div>
 
       <!-- Modal footer -->

resources/views/khazanah/laporan/imbangduga.blade.php

@@ -27,7 +27,7 @@
                       <div class="col-sm-2">Tarikh</div>
                       <div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2"    autocomplete="off"  aria-describedby="basic-addon1"></div>
                     </div>
-                    <br> 
+                    <br>
                     <div class="row">
                       <div class="col-sm-3"></div>
                       <div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Laporan "   formaction="{{route('imbangduga.cetak')}}"></div>

resources/views/khazanah/laporan/ringkasanharian.blade.php

@@ -34,7 +34,7 @@
                             </form>
                         </div>
                     </div>
-                  
+
                 </div>
             </div>
         </div>

resources/views/khazanah/laporan/stokaudit.blade.php

@@ -30,18 +30,18 @@
 
         .radiostyle .radio-green:hover {
             box-shadow: 5px 5px #888888;
-            
+
-            
+
         }
 
         .radiostyle .radio-red:hover {
             box-shadow: 5px 5px #888888;
-            
+
         }
 
         .radiostyle .radio-yellow:hover {
             box-shadow: 5px 5px #888888;
-            
+
         }
 
         .radiostyle .radio-green input[type="radio"]:checked{
@@ -92,12 +92,12 @@
                                         <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
                                         <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
                                     </div>
-                                
+
                             </div>
                         </div>
                         <br><br>
                         <div class="row">
-                            
+
                             <div class="btn-group-toggle col-md-12 col-sm-12 mb-4 radiostyle" data-toggle="buttons">
                                 <label class="btn btn-lg radio-yellow">
                                     <input autocomplete="off" type="radio" name="radaktif" id="option1" value="aktif" autocomplete="off" checked>
@@ -128,7 +128,7 @@
             format: 'dd-mm-yyyy'
         });
     });
-   
+
 </script>
 @endsection
 

resources/views/khazanah/permohonanwang.blade.php

@@ -2,6 +2,7 @@
 @section('content')
 @include('modal.permohonanwang')
 @include('modal.CITModal')
+@include('modal.denominasimodalpendahuluanserahan')
 
 <div class="container">
     <div class="row justify-content-center">
@@ -71,7 +72,7 @@
                                             @php
                                                 if($mohon['tagdeposit'] === 1)
                                                 {
-                                                    echo '<button data-mohonid="' . $mohon["nopermohonan"] . '" id="btnterima" class="btn btn-success"><i class="fas fa-check"></i></button>';
+                                                    echo '<button data-amaun="' . $mohon["amaun_mohon"] . '" data-mohonid="' . $mohon["nopermohonan"] . '" id="btnterima" class="btn btn-success"><i class="fas fa-check"></i></button>';
                                                 }else if(($mohon['tagcit'] === 0 && $mohon['jenismohon'] === 'bayaranbalik'))
                                                 {
                                                     echo '<button data-mohonid="' . $mohon["nopermohonan"] . '" id="btncit" class="btn btn-secondary"  data-toggle="modal" data-backdrop="static" data-keyboard="false" data-target="#CITModal">CIT</button>';
@@ -94,6 +95,7 @@
         </div>
     </div>
 </div>
+<script src="{{ asset('js/main.js') }}"></script>
 <script type="text/javascript">
 
     var tablemohon = $('#permohonantable').DataTable({
@@ -124,6 +126,28 @@
 
     });
 
+    function funcbatal()
+        {
+            $('#denominasiHQModal').modal('hide');
+            // $('#pendahuluanserahanModal').modal('show');
+
+            $("#terima_transaksi").prop('disabled', false);
+
+            $('#bundle1').val('');
+            $('#totalb1').val(0.00);
+            $('#bundle5').val('');
+            $('#totalb5').val(0.00);
+            $('#bundle10').val('');
+            $('#totalb10').val(0.00);
+            $('#bundle20').val('');
+            $('#totalb20').val(0.00);
+            $('#bundle50').val('');
+            $('#totalb50').val(0.00);
+            $('#bundle100').val('');
+            $('#totalb100').val(0.00);
+            $('#amaunkiraan').val('');
+        }
+
     function funcpermohonan(){
 
         let amaun = $('#jumlahmohon').val();
@@ -174,6 +198,7 @@
     $(document).on('click', '#btnterima', function(e) {
         let nama = "{{ Auth::user()->name }}";
         let mid = $(this).data("mohonid");
+        let amaun = $(this).data("amaun");
 
         Swal.fire({
             title: 'Adakah Wang sudah diterima?',
@@ -185,6 +210,11 @@
             }).then((result) => {
             /* Read more about isConfirmed, isDenied below */
             if (result.isConfirmed) {
+
+                $('#denominasiHQModal').modal('show');
+                $('#amaundiminta').val(amaun);
+
+                return;
                 $.ajax({
                         method:"put",
                         url: api_url + '/admin/permohonan/tagterima',

resources/views/modal/denominasipermohonan.blade.php

@@ -0,0 +1,146 @@
+<div class="modal fade" id="denominasiPermohonan" tabindex="-1" role="dialog" aria-labelledby="denominasiPermohonanModalCenterTitle" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+
+          <ul class="nav nav-pills">
+            <li class="nav-item">
+              <a class="nav-link active" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Keping</a>
+            </li>
+          </ul>
+
+          <label class="mt-2 ml-3">Amaun Sebenar:</label><input type="text" class="form-control col-3 ml-3" id="amaundiminta" placeholder="0.00" readonly>
+          <label class="mt-2 ml-3">Amaun Kiraan:</label><input type="text" class="form-control col-3 ml-3" id="amaunkiraan" placeholder="0.00" readonly>
+          
+          <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="tab-content">
+            <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
+              
+              <table class="table text-center"> 
+                    <tr>
+                          <th></th>
+                          <th style="display:none;" name="denominasi" class="denominasi">Peti Besi</th>
+                          <th>Ambilan</th>
+                          <th>Jumlah (RM)</th>
+                          <th></th>
+                          <th style="display:none;" name="denominasi" class="denominasi">Peti Besi</th>
+                          <th>Ambilan</th>
+                          <th>Jumlah (RM)</th>
+                    </tr>
+                    {{-- <tr>
+                      <td>RM1</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd1'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb1" class="form-control" id="totalb1" value="0.00" readonly/> </td>
+                      <td> RM20</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd20'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb20" class="form-control" id="totalb20" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                      <td>RM5</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd5'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb5" class="form-control" id="totalb5" value="0.00" readonly/> </td>
+                      <td>RM50</td> 
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd50'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb50" class="form-control" id="totalb50" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                      <td>RM10</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd10'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb10" class="form-control" id="totalb10" value="0.00" readonly/> </td>
+                      <td>RM100 </td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd100'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb100" class="form-control" id="totalb100" value="0.00" readonly/> </td>
+                  </tr> --}}
+
+                  <tr>
+                    <td>RM0.01</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td>
+                    <td><input type="text" name="ambilansen1" class="form-control" id="sen1" data-deno="{{ $denominasi['txtsen1'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly/> </td>
+                    <td>RM1</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td>
+                    <td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" data-deno="{{ $denominasi['txtring1'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                      <td>RM0.05</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen5'] }}" readonly/></td>
+                      <td><input type="text" name="ambilansen5" class="form-control" id="sen5" data-deno="{{ $denominasi['txtsen5'] }}" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly/> </td>
+                      <td>RM5</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring5'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" data-deno="{{ $denominasi['txtring5'] }}" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                      <td>RM0.10</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen10'] }}" readonly/></td>
+                      <td><input type="text" name="ambilansen10" class="form-control" id="sen10" data-deno="{{ $denominasi['txtsen10'] }}" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly/> </td>
+                      <td>RM10</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring10'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" data-deno="{{ $denominasi['txtring10'] }}" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                    <td>RM0.20</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen20'] }}" readonly/></td>
+                    <td><input type="text" name="ambilansen20" class="form-control" id="sen20" data-deno="{{ $denominasi['txtsen20'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly/> </td>
+                    <td> RM20</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring20'] }}" readonly/></td>
+                    <td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" data-deno="{{ $denominasi['txtring20'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                    <td>RM0.50</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen50'] }}" readonly/></td>
+                    <td><input type="text" name="ambilansen50" class="form-control" id="sen50" data-deno="{{ $denominasi['txtsen50'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly/> </td>
+                    <td>RM50</td> 
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring50'] }}" readonly/></td>
+                    <td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" data-deno="{{ $denominasi['txtring50'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly/> </td>
+                </tr>
+                <tr>
+                  <td></td>
+                  <td></td>
+                  <td></td>
+                  <td td style="display:none;" name="denominasi" class="denominasi"></td>
+                  <td>RM100 </td> 
+                  <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring100'] }}" readonly/></td>
+                  <td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="kiraan(this)"/> </td>
+                  <td><input type="text" name="totalring100" id="totalring100" class="form-control" value="0.00" readonly/> </td>
+                </tr>
+              </table>
+
+            </div>
+          </div>
+
+          <input type="hidden" id="jenisjenis"/>
+          <input type="hidden" id="kodcawangan"/>
+          <input type="hidden" id="tellerla"/>
+
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-danger btn-lg" onclick="funcbatal()">Batal</button>
+            <button type="button" class="btn btn-success btn-lg" onclick="terimapost()">Terima</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+

resources/views/penebusan/index.blade.php

@@ -68,7 +68,7 @@
                             <select class="form-control" id="sltjenistebus">
                                 <option value="T">T = Tebus</option>
                                 @if($gadai['hargajualan'] != null)
-                                    <option value="A">A = Ansuran</option>
+                                    <option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran</option>
                                     <option value="S">S = Separuh</option>
                                     <option value="P">P = Tambah Pembiayaan</option>
                                 @endif
@@ -79,16 +79,6 @@
                         </div>
                     </div>
                 </div>
-                {{-- <div class="col-4"><b>
-                    <div class="form-group row" >
-                        <div class="col-4<b>">
-                            <b>NO SIRI TEBUS</b>
-                        </div>
-                        <div class="col-8">
-                            <input type="text" class="form-control">
-                        </div>
-                    </div>
-                </div> --}}
                 <div class="col-6">
                     <div class="form-group row">
                         <div class="col-4">
@@ -172,7 +162,6 @@
                     </table>
                 </div>
             </div>
-            {{-- {{dd($gadai)}} --}}
             <div class="card">
                 <div class="card-body">
                     <form action="">

resources/views/print/notislelong.blade.php

@@ -175,7 +175,7 @@
       <tr>
         <td style="vertical-align:top;">KEPADA</td>
         <td style="vertical-align:top;">:</td>
-        <td style="vertical-align:top;">{{ $lel['nama'] }}<br> {{ strtoupper($lel['alamat']) }} {!! ($lel['alamat2'] === null || $lel['alamat2'] === '') ? '' : '<br>' . strtoupper($lel['alamat2']) !!} <br> {{ ' ' . $lel['poskod'] . ' ' . strtoupper($lel['daerah']) . ' ' . strtoupper($lel['negeri'])}}</td>
+        <td style="vertical-align:top;">{{ $lel['nama'] }}<br> {{ strtoupper($lel['alamat']) }} <br> {{ ' ' . $lel['poskod'] . ' ' . strtoupper($lel['daerah']) . ' ' . strtoupper($lel['negeri'])}}</td>
         <td></td>
         <td style="vertical-align:top;">NO K/P</td>
         <td style="vertical-align:top;">:</td>
@@ -191,7 +191,7 @@
           echo($datez);
 
       @endphp</h4>
-    <p>Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas akan dilelong.</p>
+    <p>Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas {!! ($fasa == 'fasa1') ? 'akan dilelong.' : '<b>akan/telah tamat kontrak dan akan dilelong.</b>' !!}</p>
 
     <p>Butiran lelongan adalah seperti berikut :-</p>
     

resources/views/print/sag.blade.php

@@ -5,10 +5,10 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 <script>
-    // $(document).ready(function () {
+    $(document).ready(function () {
-    //   window.print();
+      window.print();
-    //   window.onfocus=function(){ window.close();}
+      window.onfocus=function(){ window.close();}
-    // });
+    });
 </script>
 
 <style>
@@ -415,7 +415,8 @@
 <body>
   <div class="grid-container">
     <div id="header_surat1">
-      <p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
+      <p>PERMODALAN KELANTAN BERHAD (70168-U)</p>
+      <p>KOPERASI PERMODALAN KELANTAN BERHAD (D-5-0228)</p>
       <p>{{ $cawangan_detail['namacaw'] }}</p>
       <p>{{ $cawangan_detail['alamat1'] }}</p>
       <p>{{ $cawangan_detail['alamat2'] }}</p>
@@ -873,12 +874,13 @@
 
   <div class="grid-container">
     <div id="header_surat1">
-      <p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
+        <p>PERMODALAN KELANTAN BERHAD (70168-U)</p>
-      <p>{{ $cawangan_detail['namacaw'] }}</p>
+        <p>KOPERASI PERMODALAN KELANTAN BERHAD (D-5-0228)</p>
-      <p>{{ $cawangan_detail['alamat1'] }}</p>
+        <p>{{ $cawangan_detail['namacaw'] }}</p>
-      <p>{{ $cawangan_detail['alamat2'] }}</p>
+        <p>{{ $cawangan_detail['alamat1'] }}</p>
+        <p>{{ $cawangan_detail['alamat2'] }}</p>
 
-      <p>{{ $cawangan_detail['notel'] }}</p>
+        <p>{{ $cawangan_detail['notel'] }}</p>
     </div>
     <div id="header_surat2">
       <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px;" alt="User Image" class="center" >
@@ -1333,11 +1335,12 @@
   <div class='page-break'>  </div>
   <div class="grid-container">
     <div id="header_surat1">
-      <p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
+        <p>PERMODALAN KELANTAN BERHAD (70168-U)</p>
-      <p>{{ $cawangan_detail['namacaw'] }}</p>
+        <p>KOPERASI PERMODALAN KELANTAN BERHAD (D-5-0228)</p>
-      <p>{{ $cawangan_detail['alamat1'] }}</p>
+        <p>{{ $cawangan_detail['namacaw'] }}</p>
-      <p>{{ $cawangan_detail['alamat2'] }}</p>
+        <p>{{ $cawangan_detail['alamat1'] }}</p>
-      <p>{{ $cawangan_detail['notel'] }}</p>
+        <p>{{ $cawangan_detail['alamat2'] }}</p>
+        <p>{{ $cawangan_detail['notel'] }}</p>
     </div>
     <div id="header_surat2">