added split autoserahan and modal biasa

app/Http/Controllers/KhazanahController.php

@@ -13,6 +13,7 @@ use App\Events\NotifikasiKelulusan;
 use App\Events\NotifikasiUbahHapus;
 use App\Events\NotifikasiAGH;
 use App\Events\NotifikasiPetiBesi;
+use App\Events\AutoSerahan;
 
 use App\User;
 use App\Cawangan;
@@ -4375,6 +4376,8 @@ class KhazanahController extends Controller
 
         // Step 3: Check if both API v3 and API v2 were successful
         if ($call_approval_v2['status'] === 'success' && $call_approval_v3['status'] === 'success' && $call_set_approval_v3['status'] === 'success') {
+            event(new AutoSerahan("Operasi",$call_approval_v3['id'],$request->arraysend['kodcaw'],$request->arraysend['teller']));
+            
             return response()->json([
                 'status' => 'success',
                 'message' => 'Approval process completed successfully',

resources/views/components/auto-serah.blade.php

@@ -1,2 +1,2 @@
   <!-- Modal Auto Serah -->
-<button class="btn btn-info mt-4" data-toggle="modal" data-target="#pendahuluanserahanModal" data-input="AutoSerahan">Serahan V3</button>
+<button class="btn btn-info mt-4" data-toggle="modal" data-target="#autoSerahanModal" data-input="AutoSerahan">Serahan V3</button>

resources/views/khazanah/pendahuluanserahanmain.blade.php

@@ -3,6 +3,7 @@
 @section('content')
 
 @include('modal.pendahuluanserahan')
+@include('modal.autoserahan')
 @include('modal.denominasimodalpendahuluanserahan')
 
 @if(count($proses) > 0)
@@ -232,6 +233,7 @@
                 $('#jenisserahan').val('auto');
                 $('input[name="radwang"][value="pendahuluan"]').prop('disabled', true);
                 $('input[name="radwang"][value="serahan"]').prop('checked', true);
+                $('input[name="radwang"][value="serahan"]').prop('disabled', true);
                 $('#keterangan').val('Serahan Kepada V3');
                 $('#keterangan').attr('readonly', true);
                 $('#dtacct').val('1000/010');
@@ -568,17 +570,8 @@
                     }).then(function(){
                         location.reload(); 
                     });
-                }else{
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Auto Serahan Mengalami Ralat',
-                        text: 'Auto Serahan tidak berjaya!'
-                    }).then(function(){
-                        location.reload(); 
-                    });
                 }
 
-
             });
         }
 
@@ -663,5 +656,74 @@
             });
     }
 
+    const getCurrentDate = () => {
+        const today = new Date();
+        const day = String(today.getDate()).padStart(2, '0');
+        const month = String(today.getMonth() + 1).padStart(2, '0');
+        const year = today.getFullYear();
+
+        return `${day}/${month}/${year}`;
+    };
+
+    function triggerValue(){
+        let form = $('form[name="autoserah"]');
+        form.find('[name="tarikh"]').val(getCurrentDate());
+    }
+
+    $('#autoSerahanModal').on('shown.bs.modal', function () {
+        $('input[name="denominasi"]').attr('style','display: block');
+        $('.denominasi').attr('style','display: block');
+        triggerValue();
+    });
+
+    function terima_autoserah(){
+        let form = $('form[name="autoserah"]');
+
+        let amaun = form.find('[name="amaun"]').val();
+        let keterangan = form.find('[name="keterangan"]').val();
+        let dtacct = form.find('[name="dtacct"]').val();
+        let ktacct = form.find('[name="ktacct"]').val();
+
+        if(!amaun){
+            $("[name='erroramaun']").show();
+            $("[name='erroramaun']").text("*Isikan amaun dalam input!");
+            $("[name='amaun']").addClass('is-invalid');
+            boolamaun = true;
+        }else{
+            $("[name='erroramaun']").hide();
+            $("[name='amaun']").removeClass('is-invalid');
+            boolamaun = false;
+        }
+
+        if(!keterangan){
+            $("[name='errorketerangan']").show();
+            $("[name='errorketerangan']").text("*Isikan keterangan dalam input!");
+            $("[name='keterangan']").addClass('is-invalid');
+            boolketerangan = true;
+        }else{
+            $("[name='errorketerangan']").hide();
+            $("[name='keterangan']").removeClass('is-invalid');
+            boolketerangan = false;
+        }
+
+        // If all validations pass
+        if(boolamaun === false && boolketerangan === false) {
+            // Carry all validated values, including auth_user
+
+            $('#amaundiminta').val(amaun);
+            $('#denominasiHQModal').modal('show');
+            $('#autoSerahanModal').modal('hide');
+            $('#jenisjenis').val('serahan');
+            $('#jenisserahan').val('auto');
+
+            return true;
+        }else{
+            $("#terima_transaksi_autoserah").prop('disabled', false);
+            event.preventDefault();
+            return false;
+        }
+    }
+
+
     </script>
 @endsection

resources/views/modal/autoserahan.blade.php

@@ -0,0 +1,49 @@
+  <!-- Modal Wakil -->
+  <div class="modal fade" id="autoSerahanModal" tabindex="-1" role="dialog" aria-labelledby="autoSerahanModalCenterTitle" aria-hidden="true">
+    <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="autoSerahanModalTitle">Daftar Serahan V3</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <form name="autoserah" onsubmit="return false;">
+          <div class="modal-body">
+              <div class="text-center mx-auto mt-4">
+                <div class="row">
+                  <label class="col-2 mt-2">Tarikh</label>
+                  <input type="text" class="form-control col-4 mt-2" name="tarikh" readonly/>
+                </div>
+                <div class="row"> 
+                  <label class="col-2 mt-2">Debit Akaun</label>
+                  <input type="text" class="form-control col-4 mt-2" value="1000/010" name="dtacct" readonly/>
+                </div>
+                <div class="row">
+                  <label class="col-2 mt-2">Kredit Akaun</label>
+                  <input type="text" class="form-control col-4 mt-2" value="1000/020" name="ktacct" readonly/>
+                </div>
+                <div class="row">
+                  <label class="col-2 mt-2">Keterangan</label>
+                  <input type="text" class="form-control col-8 mt-2" value="Serahan Kepada V3" name="keterangan" readonly/>
+                  <span name="errorketerangan" style="color:red;margin-left:130px;" class="col-12 text-left"></span>
+                </div>
+                <div class="row"> 
+                  <label class="col-2 mt-2">Amaun (RM)</label>
+                  <input type="text" class="form-control col-4 mt-2" name="amaun" onkeypress="return validateformat(event)"/>
+                  <span name="erroramaun" style="color:red;margin-left:130px;" class="col-12 text-left"></span>
+                </div>
+              </div>
+
+              <input type="hidden" id="auth_user" name="auth_user" value="{{ Auth::user()->id }}">
+
+          </div>
+
+          <div class="modal-footer">
+              <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
+              <button type="button" id="terima_transaksi_autoserah" onclick="terima_autoserah()" class="btn btn-success btn-lg">Terima</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>