diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 8936cea..5296352 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -166,9 +166,9 @@ class KhazanahController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $petibesi = Http::get(config('api.url') . '/api/VaultController/all/'. $auth_user['cawangan'])->json(); - - return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser')); + return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi')); } public function gadaian() @@ -943,6 +943,7 @@ class KhazanahController extends Controller if($amount>$baki_awal) { //WI ERROR MESSAGE SKIT + dd($baki_awal); } else { diff --git a/public/js/main.js b/public/js/main.js index 93d03c9..943061b 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -283,8 +283,18 @@ async function openuptambahdanserah(e) confirmButtonText: 'Terima', showCancelButton:true, cancelButtonText:'Batal', - allowOutsideClick: true - }) + allowOutsideClick: true, + inputValidator: (value) => { + if (!value) { + return 'Isikan tempat kosong diatas!' + } + + if(isNaN(value)) + { + return 'Amaun hendaklah dalam nombor!' + } + } + }); if (amaun) { // Swal.fire(`Entered email: ${amaun}`) @@ -346,11 +356,11 @@ async function openuptambahdanserah(e) } } - else{ - Swal.fire('error','Isikan kotak kosong diatas!','error'); - } + }else if(id == 'serahanmodal') { + let bakiakhir = parseFloat($('#bakiakhir').text().substring(2).replace(/[^0-9.-]+/g,"")); + const { value: amaun } = await Swal.fire({ title: 'Masukkan Amaun Serahan', input: 'text', @@ -358,16 +368,24 @@ async function openuptambahdanserah(e) confirmButtonText: 'Terima', showCancelButton:true, cancelButtonText:'Batal', - allowOutsideClick: true - }) + allowOutsideClick: true, + inputValidator: (value) => { + if (!value) { + return 'Isikan tempat kosong diatas!' + } - let bakiakhir = parseFloat($('#bakiakhir').text().substring(2).replace(/[^0-9.-]+/g,"")); + if(value > bakiakhir) + { + return 'Amaun serahan hendaklah tidak lebih daripada baki akhir tunai!'; + } + + if(isNaN(value)) + { + return 'Amaun hendaklah dalam nombor!' + } + } + }); - if(amaun > bakiakhir) - { - Swal.fire('error','Amaun serahan hendaklah tidak lebih daripada baki akhir tunai!','error'); - return false; - } if (amaun) { // Swal.fire(`Entered email: ${amaun}`) @@ -386,9 +404,6 @@ async function openuptambahdanserah(e) } } - else{ - Swal.fire('error','Isikan kotak kosong diatas!','error'); - } } diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index a611c99..72d08bf 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -117,17 +117,63 @@
- - - - - - - - - - -
BilMasaDebitKreditNota
+ + + +
+ + + +
+
@@ -136,7 +182,15 @@ @endsection diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 8e1c056..87edb06 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -14,210 +14,63 @@
-

Aliran Tunai - Peti Besi

+

Aliran Tunai

+ +
+
+
-
- {{-- {{ dd($arraytunai) }} --}} +
- - -
+
- @foreach($listUser as $index1=>$ls) - {{-- {{ dd(empty($arraytunai[1])) }} --}} - @if($index1 == 0) -
+ {{-- {{ dd($arraytunai) }} --}} -
-
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}
- -

Baki Awal Tunai

-
-
-
-
-
- -
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
- -

Tunai Diterima

-
-
-
-
-
- -
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}
- -

Tunai Dikeluar

-
-
-
-
-
-
- -
-
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}
- -

Baki Akhir Tunai

-
-
-
-
-
- -
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}
- -

Gadaian

-
-
-
-
-
- -
- -
-
-
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
- -

Tebusan

-
-
-
-
-
-
- -
+
+ @if($index1 == 0) +
  • + {{ $ls->name }} +
    • + @else +
  • + {{ $ls->name }} +
    • + @endif -
    - @else -
    + @endforeach + + +
    -
    -
    - -
    -
    -
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}
    - -

    Baki Awal Tunai

    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
    - -

    Tunai Diterima

    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}
    - -

    Tunai Dikeluar

    -
    -
    -
    -
    -
    -
    - -
    + @foreach($listUser as $index1=>$ls) + {{-- {{ dd(empty($arraytunai[1])) }} --}} + @if($index1 == 0) +
    + +
    -
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}
    -

    Baki Akhir Tunai

    +

    Baki Awal Tunai

    @@ -228,9 +81,9 @@
    -
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
    -

    Gadaian

    +

    Tunai Diterima

    @@ -241,62 +94,261 @@
    -
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}
    -

    Tebusan

    +

    Tunai Dikeluar

    +
    + +
    +
    + +
    +
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}
    + +

    Baki Akhir Tunai

    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}
    + +

    Gadaian

    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
    + +

    Tebusan

    +
    +
    +
    +
    +
    +
    + +
    + + + + + + + + + + + + + + + + @foreach ($arraytunai[$index1] as $tunai) + + + + + + + + + + + @endforeach + +
    bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
    {{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ $tunai['bakiawal'] }}{{ $tunai['tambah'] }}{{ $tunai['kurang'] }}{{ $tunai['keluar'] }}{{ $tunai['masuk'] }}{{ $tunai['baki'] }}
    + +
    +
    + @else +
    - -
    - - - - - - - - - - - - - - - - {{-- {{ dd($arraytunai) }} --}} - @foreach ($arraytunai[$index1] as $tunai) - {{-- {{ dd($tunai) }} --}} - - - - - - - - - - - @endforeach - -
    bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
    {{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ $tunai['bakiawal'] }}{{ $tunai['tambah'] }}{{ $tunai['kurang'] }}{{ $tunai['keluar'] }}{{ $tunai['masuk'] }}{{ $tunai['baki'] }}
    - -
    - -
    - @endif - - @endforeach - +
    +
    + +
    +
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}
    + +

    Baki Awal Tunai

    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
    + +

    Tunai Diterima

    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}
    + +

    Tunai Dikeluar

    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}
    +

    Baki Akhir Tunai

    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}
    + +

    Gadaian

    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
    + +

    Tebusan

    +
    +
    +
    +
    +
    +
    + + +
    + + + + + + + + + + + + + + + + {{-- {{ dd($arraytunai) }} --}} + @foreach ($arraytunai[$index1] as $tunai) + {{-- {{ dd($tunai) }} --}} + + + + + + + + + + + @endforeach + +
    bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
    {{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ $tunai['bakiawal'] }}{{ $tunai['tambah'] }}{{ $tunai['kurang'] }}{{ $tunai['keluar'] }}{{ $tunai['masuk'] }}{{ $tunai['baki'] }}
    + +
    + +
    + @endif + + @endforeach + + +
    + + +
    +
    + + + + + + + + + + + + + + + + + {{-- {{ dd($petibesi) }} --}} + @foreach ($petibesi as $tunai) + + + + + + + + + + + + @endforeach + +
    bilTarikhBaki Awal TunaiKeluarMasukBaki EODBaki Akhir TunaiPendahuluanSerahan
    {{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ $tunai['bakiawal'] }}{{ $tunai['keluar'] }}{{ $tunai['masuk'] }}{{ $tunai['bakieod'] }}{{ $tunai['bakiakhir'] }}{{ $tunai['pendahuluan'] }}{{ $tunai['serahan'] }}
    + +
    +
    -
    @@ -309,6 +361,10 @@ // "scrollX": true // }); + var tablecapaian = $('#table-PetiBesi').DataTable({ + }); + + let namefordatatable = "{{ $listUser }}"; console.log(namefordatatable); diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 32d4b33..2d0bdfb 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -681,6 +681,10 @@ let pdbyr = 0; let totalseparuh = 0; + console.log($('#jumlahupah').val()); + console.log(bayaranseparuhasal); + console.log(byr); + if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val()))){ $('#bayaran').val(bayaranseparuhasal.toFixed(2)); }else{ @@ -690,7 +694,7 @@ // pdbyr = parseFloat(byr); pdbyr = $('#bayaran').val(); - total = $('#pinjaman').val() - pdbyr; + total = $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - pdbyr; // $('#perludibayar').val(pdbyr); $('#bakipinjaman').val(total.toFixed(2));