From ea0b8afa35400aedd49f318cd20f4b2a68241a64 Mon Sep 17 00:00:00 2001
From: nishaMuhd <nurulnisha84@gmail.com>
Date: Wed, 3 May 2023 14:56:00 +0800
Subject: [PATCH 1/2] updated 030523

---
 .../includes/bayaran/pembayaransag.blade.php   | 18 ++++++++++++------
 .../views/includes/login/loginportal.blade.php |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php
index 9cb6b87..8b5b69f 100644
--- a/resources/views/includes/bayaran/pembayaransag.blade.php
+++ b/resources/views/includes/bayaran/pembayaransag.blade.php
@@ -97,13 +97,18 @@
                                                 </select>
 
                                                 <input type="text" value="{{ old('txtbayarantawarruq') ? old('txtbayarantawarruq') : '' }}" data-bakipjm="{{ $bayar['bakipjm'] }}" data-taglel="{{ $bayar['taglel'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="tawarruq" name="txtbayarantawarruq" class="form-control txtbayaran" style="text-align: center; border: outset;" />
-                                                --><input type="hidden" name="txtbayaranhidden[]" class="bayaran" style="text-align: center;" />
+                                                <input type="hidden" name="txtbayaranhidden[]" class="bayaran" style="text-align: center;" />
                                                 <input type="hidden" name="txtjenisbayaran[]" value="{{ $jenisbayaran }}" style="text-align: center;" />
                                                 <input type="hidden" name="txtnorujukanhidden[]" value="{{ $bayar['norujukan'] }}" style="text-align: center;" />
                                                 <input type="hidden" name="txtkodcawhidden[]" value="{{ $bayar['kodcaw'] }}" style="text-align: center;" />
-                                                </td> 
-                                                <td><input name="txtbayarantawarruq" type="text" value="{{ $upahtawarruq }}" class="form-control" style="text-align: center; border: outset;" data-bakipjm="{{ $bayar['bakipjm'] }}" data-upah="{{ $upahtawarruq }}"></td>
-                                                                                      
+                                                </td>--> 
+                                                <td><input name="txtbayarantawarruq" type="text" value="{{ $upahtawarruq }}" class="form-control" style="text-align: center; border: outset;" data-bakipjm="{{ $bayar['bakipjm'] }}" data-upah="{{ $upahtawarruq }}">
+                                                    <input type="text" name="txtbayaranhidden[]" value="{{ $upahtawarruq }}" class="bayaran" style="text-align: center;" />
+                                                    <input type="hidden" name="txtjenisbayaran[]" value="{{ $jenisbayaran }}" style="text-align: center;" />
+                                                    <input type="hidden" name="txtnorujukanhidden[]" value="{{ $bayar['norujukan'] }}" style="text-align: center;" />
+                                                    <input type="hidden" name="txtkodcawhidden[]" value="{{ $bayar['kodcaw'] }}" style="text-align: center;" /> 
+                                                </td>
+
                                             <td>
                                                 <input style="border: none; text-align: center;" type="text" value="{{ number_format($bayar['bakipjm'],2) }}" class="bakibaru" readonly>
                                             </td>
@@ -287,8 +292,8 @@
 
     });
 
-    // $("input[name=txtbayarantawarruq]").change(function(e) {
-    $("input[name=txtbayarantawarruq]").click(function(e) {
+    $("input[name=txtbayarantawarruq]").change(function(e) {
+    // $("input[name=txtbayarantawarruq]").click(function(e) {
         
         let upah = parseFloat($(this).data('upah').replace(",",""));
         let bakipinjam = $(this).data('bakipjm');
@@ -305,6 +310,7 @@
                 var lebihbyr = inputvalue.toFixed(2) - upahasal.toFixed(2);
                 let bakipinjambaru = parseFloat(bakipinjam - lebihbyr.toFixed(2));
                 $(this).closest('tr').find('.bakibaru').val(bakipinjambaru.toFixed(2));
+                $(this).closest('tr').find('.bayaran').val(inputvalue.toFixed(2));
             // }
 
         if (bayar > parseFloat(errorlebih)) {
diff --git a/resources/views/includes/login/loginportal.blade.php b/resources/views/includes/login/loginportal.blade.php
index 79537ba..ed5ca0c 100644
--- a/resources/views/includes/login/loginportal.blade.php
+++ b/resources/views/includes/login/loginportal.blade.php
@@ -41,7 +41,8 @@
         <button type="submit" class="btn bg-gradient-dark w-100 my-4 mb-2" onclick="loadingbtn();this.disabled=true;this.form.submit();" style="background: #4A4E59;">Masuk</button>
     </div>
     <div class="text-center mt-3" style="margin: 0% 10%;">
-        <a href="https://spare.arrahn.com.my/pembayaransegera" id="buttonspare" title="Pembayaran Pantas SPARE" style="color: #12B652; border: 1px solid #12B652;" class="btn my-4 mb-2" target="_blank">Bayaran Pantas (SPARE)</a href="#">
+        <!-- <a href="https://spare.arrahn.com.my/pembayaransegera" id="buttonspare" title="Pembayaran Pantas SPARE" style="color: #12B652; border: 1px solid #12B652;" class="btn my-4 mb-2" target="_blank">Bayaran Pantas (SPARE)</a href="#"> -->
+        <a href="http://e-arrahn.test/pembayaransegera" id="buttonspare" title="Pembayaran Pantas SPARE" style="color: #12B652; border: 1px solid #12B652;" class="btn my-4 mb-2" target="_blank">Bayaran Pantas (SPARE)</a href="#">
     </div>
     <p class="text-sm text-center">
 

From 3c6c02dff449ea3aeb1532fbb7a0210f74f567dd Mon Sep 17 00:00:00 2001
From: nishaMuhd <nurulnisha84@gmail.com>
Date: Wed, 3 May 2023 15:52:31 +0800
Subject: [PATCH 2/2] update pembayaransag

---
 resources/views/includes/bayaran/pembayaransag.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php
index 8b5b69f..dc55820 100644
--- a/resources/views/includes/bayaran/pembayaransag.blade.php
+++ b/resources/views/includes/bayaran/pembayaransag.blade.php
@@ -103,7 +103,7 @@
                                                 <input type="hidden" name="txtkodcawhidden[]" value="{{ $bayar['kodcaw'] }}" style="text-align: center;" />
                                                 </td>--> 
                                                 <td><input name="txtbayarantawarruq" type="text" value="{{ $upahtawarruq }}" class="form-control" style="text-align: center; border: outset;" data-bakipjm="{{ $bayar['bakipjm'] }}" data-upah="{{ $upahtawarruq }}">
-                                                    <input type="text" name="txtbayaranhidden[]" value="{{ $upahtawarruq }}" class="bayaran" style="text-align: center;" />
+                                                    <input type="hidden" name="txtbayaranhidden[]" value="{{ $upahtawarruq }}" class="bayaran" style="text-align: center;" />
                                                     <input type="hidden" name="txtjenisbayaran[]" value="{{ $jenisbayaran }}" style="text-align: center;" />
                                                     <input type="hidden" name="txtnorujukanhidden[]" value="{{ $bayar['norujukan'] }}" style="text-align: center;" />
                                                     <input type="hidden" name="txtkodcawhidden[]" value="{{ $bayar['kodcaw'] }}" style="text-align: center;" /> 
@@ -136,7 +136,7 @@
                             </div>
 
                             <div class="col-6">
-                                <span class="text-primary"><strong>RM <span>1.00</span></strong></span>
+                                <span class="text-primary"><strong>RM<span>1.00</span></strong></span>
                             </div>
                         </div>
                         <div class="row pb-4 font-weight-light">
@@ -145,7 +145,7 @@
                             </div>
 
                             <div class="col-6">
-                                <span class="text-primary"><strong>RM <span id="spanjumlah">{{ number_format($totalupahasal,2) }}</span></strong></span>
+                                <span class="text-primary"><strong>RM<span id="spanjumlah">{{ number_format($totalupahasal,2) }}</span></strong></span>
                             </div>
                         </div>