From 04d2b96136463c2aa8cc5e4fba1f49ac9638d5a1 Mon Sep 17 00:00:00 2001
From: faiqahzaman <zmnfqh@gmail.com>
Date: Wed, 15 Jun 2022 11:32:53 +0800
Subject: [PATCH] update cdm n tunai

---
 resources/views/account/sahsagonline.blade.php |  4 ++--
 resources/views/includes/sidebar.blade.php     |  2 +-
 .../views/pembayaran/SAGBidItem.blade.php      | 13 +++++++------
 .../pembayaran/kaunterpembayaran.blade.php     | 18 ++++++++++++++++--
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php
index 1a396b12..e9689eef 100644
--- a/resources/views/account/sahsagonline.blade.php
+++ b/resources/views/account/sahsagonline.blade.php
@@ -84,7 +84,7 @@
 </div>
 
 <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-dialog modal-dialog-centered modal-lg">
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title" id="exampleModalLabel">Resit Bayaran CDM</h5>
@@ -95,7 +95,7 @@
         <div class="modal-body text-center" style="padding:3rem">
           @foreach($getresit as $resit)
             <div class=".col-6 .col-sm-4 form-check form-check-inline">
-                <img src="data:image/png;base64, {{ $resit['filename'] }}" alt="Image Preview" style="width:350px; height:450px; border: 1px solid #dee2e6"/>
+                <img src="data:image/png;base64, {{ $resit['filename'] }}" alt="Image Preview" style="max-width:700px; maxheight:650px; border: 1px solid #dee2e6"/>
             </div>
           @endforeach
         </div>
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 726df17c..9f79d67b 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -253,7 +253,7 @@
         <a href="/home">Home</a>
       </li> --}}
       <li class="{{ (request()->is('account/*')) ? 'active' : '' }}">
-        <a href="{{url('account/senarailelongan')}}">Bayaran Online</a>
+        <a href="{{url('account/senarailelongan')}}">Bayaran Atas Talian</a>
       </li>
       @endhasrole
       @hasrole('pembida')
diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php
index d692b87a..602f1657 100644
--- a/resources/views/pembayaran/SAGBidItem.blade.php
+++ b/resources/views/pembayaran/SAGBidItem.blade.php
@@ -46,7 +46,6 @@
                                             <span class="btn btn-warning btn-sm hovernone-warning">TUNGGU PENGESAHAN</span>
                                         @else
                                             <span class="btn btn-success btn-sm hovernone-success">PAID</span>
-
                                         @endif
                                     </td>
                                 </tr>
@@ -176,7 +175,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-danger" onclick="funcbatal()">Batal</button>
-        <button type="button" class="btn btn-success" data-toggle="modal"  data-target=".bd-example-modal-sm" onclick="terimadeno()" >Terima</button>
+        <button type="button" class="btn btn-success" data-toggle="modal"  data-target=".bd-example-modal-sm" id="buttonterima" onclick="terimadeno()">Terima</button>
       </div>
     </div>
     </form>
@@ -223,7 +222,7 @@
 </div>
 
 <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-dialog modal-dialog-centered modal-lg">
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title" id="exampleModalLabel">Resit Bayaran CDM</h5>
@@ -234,7 +233,7 @@
         <div class="modal-body text-center" style="padding:3rem">
           @foreach($getresit as $resit)
             <div class=".col-6 .col-sm-4 form-check form-check-inline">
-                <img src="data:image/png;base64, {{ $resit['filename'] }}" alt="Image Preview" style="width:350px; height:450px; border: 1px solid #dee2e6"/>
+                <img src="data:image/png;base64, {{ $resit['filename'] }}" alt="Image Preview" style="max-width:700px; maxheight:650px; border: 1px solid #dee2e6"/>
             </div>
           @endforeach
         </div>
@@ -258,6 +257,7 @@
     }
     function functerima()
     {
+        $("#buttonterima").prop("disabled", true);
         $('#denominasiHQModal').modal('show');
         var total_sum = parseFloat($('#total').val());
         $('#amaundiminta').val(parseFloat(total_sum).toFixed(2));
@@ -417,10 +417,11 @@
                 title: 'Perhatian!',
                 content: 'Amaun Kiraan Melebihi Amaun Sebenar',
             });
+            $("#buttonterima").prop("disabled", true);
         }
-        else
+        else if($amount = validate)
         {
-            
+            $("#buttonterima").prop("disabled", false);
             $('#amaunkiraan').val(parseFloat(amount).toFixed(2));
 
         }
diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index c849af99..ca6c6ccc 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -10,6 +10,7 @@
                     <p>{{ $message }}</p>
                 </div>
         @endif
+        <h4> Senarai Bayaran Pemenang </h4>
         <table class="table table-striped  table-xl text-center" id="tablekaunter" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
@@ -20,6 +21,7 @@
                         <th>Bilangan Surat</th>
                         <th>Jumlah Bidaan(RM)</th>
                         <th>Amaun Telah Dibayar(RM)</th>
+                        <th>Status Bayaran</th>
                         <th>Penyata Bayaran</th>
                         <th>Resit Bayaran</th>
                         <th class="text-center">Action</th>
@@ -35,6 +37,14 @@
                             <td>{{ $winner['total_surat']}}</td>
                             <td>{{ $winner['totalBid']}}</td>
                             <td>{{ $winner['totalPay']}}</td>
+                            <td>
+                                @if($winner['totalPay'] < $winner['totalBid'])
+                                    <button class="btn btn-warning btn-sm" disabled>BELUM SELESAI</button>
+                                @elseif($winner['totalPay'] == $winner['totalBid'])
+                                    <button class="btn btn-success btn-sm" disabled>SELESAI</button>
+                                @endif
+                            </td>
+                            <td></td>
                             <td>
                                 <a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
                             </td>
@@ -69,11 +79,15 @@
                 "orderable": false
                 }, 
                 {
-                "targets": 7,
+                "targets": 8,
                 "orderable": false
                 },
                 {
-                "targets": 8,
+                "targets": 9,
+                "orderable": false
+                },
+                {
+                "targets": 10,
                 "orderable": false
                 }
             ],