KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

hari ini

Browse Source
This commit is contained in:
hafifierahman
2021-03-28 16:47:06 +08:00
parent 14ae96d86c
commit 068ce88579
22 changed files with 393 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+2 -2
View File
@@ -395,7 +395,7 @@ class GadaianController extends Controller
foreach($transaction as $trans) foreach($transaction as $trans)
{ {
$totaltransaction += $trans['duit_masuk']; $totaltransaction += $trans['duit_masuk'];
} }
if(sizeof($gadai) != 0) if(sizeof($gadai) != 0)
@@ -434,7 +434,7 @@ class GadaianController extends Controller
foreach($transaction as $trans) foreach($transaction as $trans)
{ {
$totaltransaction += $trans['duit_masuk']; $totaltransaction += $trans['duit_masuk'];
} }
app/Http/Controllers/KhazanahController.php
+38 -15
View File
@@ -1768,9 +1768,6 @@ class KhazanahController extends Controller
])->json(); ])->json();
} }
return $this->denominasipendahuluanserahan($request); return $this->denominasipendahuluanserahan($request);
} }
@@ -1794,12 +1791,25 @@ class KhazanahController extends Controller
if($request->jenisgldetail == 'pendahuluan') if($request->jenisgldetail == 'pendahuluan')
{ {
$rekodb1 += intval($request->bundle1); // $rekodb1 += intval($request->bundle1);
$rekodb5 += intval($request->bundle5); // $rekodb5 += intval($request->bundle5);
$rekodb10 += intval($request->bundle10); // $rekodb10 += intval($request->bundle10);
$rekodb20 += intval($request->bundle20); // $rekodb20 += intval($request->bundle20);
$rekodb50 += intval($request->bundle50); // $rekodb50 += intval($request->bundle50);
$rekodb100 += intval($request->bundle100); // $rekodb100 += intval($request->bundle100);
$rekodsen1 += intval($request->ambilansen1);
$rekodsen5 += intval($request->ambilansen5);
$rekodsen10 += intval($request->ambilansen10);
$rekodsen20 += intval($request->ambilansen20);
$rekodsen50 += intval($request->ambilansen50);
$rekodring1 += intval($request->ambilanring1);
$rekodring5 += intval($request->ambilanring5);
$rekodring10 += intval($request->ambilanring10);
$rekodring20 += intval($request->ambilanring20);
$rekodring50 += intval($request->ambilanring50);
$rekodring100 += intval($request->ambilanring100);
$denominasiupdate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[ $denominasiupdate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[
@@ -1829,12 +1839,25 @@ class KhazanahController extends Controller
}else if($request->jenisgldetail == 'serahan') }else if($request->jenisgldetail == 'serahan')
{ {
$rekodb1 -= intval($request->bundle1); // $rekodb1 -= intval($request->bundle1);
$rekodb5 -= intval($request->bundle5); // $rekodb5 -= intval($request->bundle5);
$rekodb10 -= intval($request->bundle10); // $rekodb10 -= intval($request->bundle10);
$rekodb20 -= intval($request->bundle20); // $rekodb20 -= intval($request->bundle20);
$rekodb50 -= intval($request->bundle50); // $rekodb50 -= intval($request->bundle50);
$rekodb100 -= intval($request->bundle100); // $rekodb100 -= intval($request->bundle100);
$rekodsen1 -= intval($request->ambilansen1);
$rekodsen5 -= intval($request->ambilansen5);
$rekodsen10 -= intval($request->ambilansen10);
$rekodsen20 -= intval($request->ambilansen20);
$rekodsen50 -= intval($request->ambilansen50);
$rekodring1 -= intval($request->ambilanring1);
$rekodring5 -= intval($request->ambilanring5);
$rekodring10 -= intval($request->ambilanring10);
$rekodring20 -= intval($request->ambilanring20);
$rekodring50 -= intval($request->ambilanring50);
$rekodring100 -= intval($request->ambilanring100);
$denominasiupdate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[ $denominasiupdate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[
public/js/main.js
Vendored
+12 -4
View File
@@ -289,6 +289,10 @@ async function openuptambahdanserah(e)
return 'Isikan tempat kosong diatas!' return 'Isikan tempat kosong diatas!'
} }
if(value <= 0){
return 'Masukkan jumlah yang munasabah sahaja!';
}
if(isNaN(value)) if(isNaN(value))
{ {
return 'Amaun hendaklah dalam nombor!' return 'Amaun hendaklah dalam nombor!'
@@ -329,7 +333,7 @@ async function openuptambahdanserah(e)
allowEnterKey: false allowEnterKey: false
}) })
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
@@ -382,7 +386,11 @@ async function openuptambahdanserah(e)
allowOutsideClick: true, allowOutsideClick: true,
inputValidator: (value) => { inputValidator: (value) => {
if (!value) { if (!value) {
return 'Isikan tempat kosong diatas!' return 'Isikan tempat kosong diatas!';
}
if(value <= 0){
return 'Masukkan jumlah yang munasabah sahaja!';
} }
if(value > bakiakhir) if(value > bakiakhir)
@@ -392,7 +400,7 @@ async function openuptambahdanserah(e)
if(isNaN(value)) if(isNaN(value))
{ {
return 'Amaun hendaklah dalam nombor!' return 'Amaun hendaklah dalam nombor!';
} }
} }
}); });
@@ -489,7 +497,7 @@ function tambahdanserahanfunc(e)
allowEnterKey: false allowEnterKey: false
}) })
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
resources/views/aliran_tunai/index.blade.php
+4 -4
View File
@@ -158,8 +158,8 @@
<tr> <tr>
<td> {{ $loop->iteration }} </td> <td> {{ $loop->iteration }} </td>
<td> {{ $gt['norujukan'] }} </td> <td> {{ $gt['norujukan'] }} </td>
<td> {{ $gt['pinjaman'] }} </td> <td> {{ number_format($gt['pinjaman'],2) }} </td>
<td> {{ $gt['nilaimarhun'] }} </td> <td> {{ number_format($gt['nilaimarhun'],2) }} </td>
<td> @php if($gt['jenistebus'] == ''){ <td> @php if($gt['jenistebus'] == ''){
echo '<h4><span class="badge badge-success">Gadai</span></h4>'; echo '<h4><span class="badge badge-success">Gadai</span></h4>';
}else{ }else{
@@ -191,8 +191,8 @@
<tr> <tr>
<td> {{ $loop->iteration }} </td> <td> {{ $loop->iteration }} </td>
<td> {{ $tb['tarikh'] }} </td> <td> {{ $tb['tarikh'] }} </td>
<td> {{ $tb['cajlelong'] }} </td> <td> {{ number_format($tb['cajlelong'],2) }} </td>
<td> {{ $tb['jumlah'] }} </td> <td> {{ number_format($tb['jumlah'],2) }} </td>
<td> @php if($tb['jenis'] == 'T'){ <td> @php if($tb['jenis'] == 'T'){
echo '<h4><span class="badge badge-success">Baki Lelong</span></h4>'; echo '<h4><span class="badge badge-success">Baki Lelong</span></h4>';
}else{ }else{
resources/views/customers/info.blade.php
+1 -1
View File
@@ -845,7 +845,7 @@
} }
}); });
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
resources/views/gadaian/edit.blade.php
+2 -2
View File
@@ -920,7 +920,7 @@
} }
}); });
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
@@ -1025,7 +1025,7 @@
} }
}); });
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
resources/views/gadaian/index.blade.php
+2 -2
View File
@@ -822,7 +822,7 @@
} }
}); });
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
@@ -956,7 +956,7 @@
//Try Pusher //Try Pusher
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
resources/views/homepage/khazanah/home.blade.php
+42 -43
View File
@@ -212,7 +212,11 @@
</div> </div>
<script> <script>
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
@@ -242,65 +246,60 @@
$.each(data, function(key,val) { $.each(data, function(key,val) {
$('#bundle1').val(parseFloat(val.bd1).toFixed(2)); $('#bundle1').val(val.bd1);
$('#totalb1').val(parseFloat(val.b1).toFixed(2)); $('#totalb1').val(formatter.format(val.b1));
$('#bundle20').val(parseFloat(val.bd20).toFixed(2)); $('#bundle20').val(val.bd20);
$('#totalb20').val(parseFloat(val.b20).toFixed(2)); $('#totalb20').val(formatter.format(val.b20));
$('#bundle5').val(parseFloat(val.bd5).toFixed(2)); $('#bundle5').val(val.bd5);
$('#totalb5').val(parseFloat(val.b5).toFixed(2)); $('#totalb5').val(formatter.format(val.b5));
$('#bundle50').val(parseFloat(val.bd50).toFixed(2)); $('#bundle50').val(val.bd50);
$('#totalb50').val(parseFloat(val.b50).toFixed(2)); $('#totalb50').val(formatter.format(val.b50));
$('#bundle10').val(parseFloat(val.bd10).toFixed(2)); $('#bundle10').val(val.bd10);
$('#totalb10').val(parseFloat(val.b10).toFixed(2)); $('#totalb10').val(formatter.format(val.b10));
$('#bundle100').val(parseFloat(val.bd100).toFixed(2)); $('#bundle100').val(val.bd100);
$('#totalb100').val(parseFloat(val.b100).toFixed(2)); $('#totalb100').val(formatter.format(val.b100));
$('#sen1').val(parseFloat(val.txtsen1).toFixed(2)); $('#sen1').val(val.txtsen1);
$('#totalsen1').val(parseFloat(val.k01).toFixed(2)); $('#totalsen1').val(formatter.format(val.k01));
$('#sen5').val(parseFloat(val.txtsen5).toFixed(2)); $('#sen5').val(val.txtsen5);
$('#totalsen5').val(parseFloat(val.k05).toFixed(2)); $('#totalsen5').val(formatter.format(val.k05));
$('#sen10').val(parseFloat(val.txtsen10).toFixed(2)); $('#sen10').val(val.txtsen10);
$('#totalsen10').val(parseFloat(val.k010).toFixed(2)); $('#totalsen10').val(formatter.format(val.k010));
$('#sen20').val(parseFloat(val.txtsen20).toFixed(2)); $('#sen20').val(val.txtsen20);
$('#totalsen20').val(parseFloat(val.k020).toFixed(2)); $('#totalsen20').val(formatter.format(val.k020));
$('#sen50').val(parseFloat(val.txtsen50).toFixed(2)); $('#sen50').val(val.txtsen50);
$('#totalsen50').val(parseFloat(val.k050).toFixed(2)); $('#totalsen50').val(formatter.format(val.k050));
$('#ringgit1').val(parseFloat(val.txtring1).toFixed(2)); $('#ringgit1').val(val.txtring1);
$('#totalring1').val(parseFloat(val.k1).toFixed(2)); $('#totalring1').val(formatter.format(val.k1));
$('#ringgit5').val(parseFloat(val.txtring5).toFixed(2)); $('#ringgit5').val(val.txtring5);
$('#totalring5').val(parseFloat(val.k5).toFixed(2)); $('#totalring5').val(formatter.format(val.k5));
$('#ringgit10').val(parseFloat(val.txtring10).toFixed(2)); $('#ringgit10').val(val.txtring10);
$('#totalring10').val(parseFloat(val.k10).toFixed(2)); $('#totalring10').val(formatter.format(val.k10));
$('#ringgit20').val(parseFloat(val.txtring20).toFixed(2)); $('#ringgit20').val(val.txtring20);
$('#totalring20').val(parseFloat(val.k20).toFixed(2)); $('#totalring20').val(formatter.format(val.k20));
$('#ringgit50').val(parseFloat(val.txtring50).toFixed(2));
$('#totalring50').val(parseFloat(val.k50).toFixed(2));
$('#ringgit100').val(parseFloat(val.txtring100).toFixed(2));
$('#totalring100').val(parseFloat(val.k100).toFixed(2));
$('#amaunkeping').val(parseFloat(val.jumlahkeping).toFixed(2));
$('#amaunbundle').val(parseFloat(val.jumlahbundle).toFixed(2));
$('#amaunkeseluruhan').val(parseFloat(val.txtjumlah).toFixed(2));
$('#ringgit50').val(val.txtring50);
$('#totalring50').val(formatter.format(val.k50));
$('#ringgit100').val(val.txtring100);
$('#totalring100').val(formatter.format(val.k100));
$('#amaunkeping').val(formatter.format(val.jumlahkeping));
$('#amaunbundle').val(formatter.format(val.jumlahbundle));
$('#amaunkeseluruhan').val(formatter.format(val.txtjumlah));
}); });
} }
resources/views/khazanah/alirantunai.blade.php
+113 -106
View File
@@ -5,7 +5,7 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-12"> <div class="col-md-12">
<div class="card"> <div class="card">
<div class="card-header">{{ __('Dashboard') }}</div> <div class="card-header">{{ __('Aliran Tunai') }}</div>
{{-- {{ dd($tunai) }} --}} {{-- {{ dd($tunai) }} --}}
<div class="card-body text-center"> <div class="card-body text-center">
@@ -147,121 +147,128 @@
</div> </div>
</div> </div>
<nav> <div class="card">
<div class="nav nav-tabs mb-4" id="nav-tab" role="tablist"> <div class="card-header">
<a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-history" role="tab" aria-controls="nav-history" aria-selected="true">History Tunai</a>
<a class="nav-item nav-link" id="nav-home-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-addtunai" role="tab" aria-controls="nav-addtunai" aria-selected="true">Tunai</a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-gt" role="tab" aria-controls="nav-gt" aria-selected="false">Gadai / Tebus</a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-tuntutbaki" role="tab" aria-controls="nav-tuntutbaki" aria-selected="false">Tuntut Baki</a>
</div> </div>
</nav> <div class="card-body">
<nav>
<div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-history" role="tab" aria-controls="nav-history" aria-selected="true">History Tunai</a>
<a class="nav-item nav-link" id="nav-home-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-addtunai" role="tab" aria-controls="nav-addtunai" aria-selected="true">Tunai</a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-gt" role="tab" aria-controls="nav-gt" aria-selected="false">Gadai / Tebus</a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-tuntutbaki" role="tab" aria-controls="nav-tuntutbaki" aria-selected="false">Tuntut Baki</a>
</div>
</nav>
<div class="tab-content" id="nav-tabContent"> <div class="tab-content" id="nav-tabContent">
<div class="mt-3"> <div class="mt-3">
<div class="tab-pane fade show active" id="nav-{{ $ls->id }}-history" role="tabpanel" aria-labelledby="nav-history-tab"> <div class="tab-pane fade show active" id="nav-{{ $ls->id }}-history" role="tabpanel" aria-labelledby="nav-history-tab">
<table class='table' id='table-{{ $ls->id }}' style="width:100%;"> <table class='table' id='table-{{ $ls->id }}' style="width:100%;">
<thead> <thead>
<tr> <tr>
<th>bil</th> <th>bil</th>
<th>Tarikh</th> <th>Tarikh</th>
<th>Baki Awal Tunai</th> <th>Baki Awal Tunai</th>
<th>Tunai Diterima</th> <th>Tunai Diterima</th>
<th>Tunai Dikeluar</th> <th>Tunai Dikeluar</th>
<th>Gadaian</th> <th>Gadaian</th>
<th>Tebusan</th> <th>Tebusan</th>
<th>Baki Akhir Tunai</th> <th>Baki Akhir Tunai</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach ($arraytunai[$index1] as $tunai) @foreach ($arraytunai[$index1] as $tunai)
<tr> <tr>
<td>{{ $loop->iteration }}</td> <td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td> <td>{{ $tunai['tarikh'] }}</td>
<td>{{ number_format($tunai['bakiawal'],2) }}</td> <td>{{ number_format($tunai['bakiawal'],2) }}</td>
<td>{{ number_format($tunai['tambah'],2) }}</td> <td>{{ number_format($tunai['tambah'],2) }}</td>
<td>{{ number_format($tunai['kurang'],2) }}</td> <td>{{ number_format($tunai['kurang'],2) }}</td>
<td>{{ number_format($tunai['keluar'],2) }}</td> <td>{{ number_format($tunai['keluar'],2) }}</td>
<td>{{ number_format($tunai['masuk'],2) }}</td> <td>{{ number_format($tunai['masuk'],2) }}</td>
<td>{{ number_format($tunai['baki'],2) }}</td> <td>{{ number_format($tunai['baki'],2) }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tunai" role="tabpanel" aria-labelledby="nav-tunai-tab"> <div class="tab-pane fade" id="nav-{{ $ls->id }}-tunai" role="tabpanel" aria-labelledby="nav-tunai-tab">
..... .....
</div> </div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="nav-gt-tab"> <div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="nav-gt-tab">
<table class="table text-center" id="tablegadaitebus-{{ $ls->id }}"> <table class="table text-center" id="tablegadaitebus-{{ $ls->id }}">
<thead> <thead>
<tr> <tr>
<th>Bil</th> <th>Bil</th>
<th>No Rujukan</th> <th>No Rujukan</th>
<th>Pinjaman (RM)</th> <th>Pinjaman (RM)</th>
<th>Nilai Marhun (RM)</th> <th>Nilai Marhun (RM)</th>
<th>Jenis Transaksi</th> <th>Jenis Transaksi</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@if(is_object($arraygadaitebus) || is_array($arraygadaitebus)) @if(is_object($arraygadaitebus) || is_array($arraygadaitebus))
@foreach($arraygadaitebus[$index1] as $gt) @foreach($arraygadaitebus[$index1] as $gt)
<tr> <tr>
<td> {{ $loop->iteration }} </td> <td> {{ $loop->iteration }} </td>
<td> {{ $gt['norujukan'] }} </td> <td> {{ $gt['norujukan'] }} </td>
<td> {{ number_format($gt['pinjaman'],2) }} </td> <td> {{ number_format($gt['pinjaman'],2) }} </td>
<td> {{ number_format($gt['nilaimarhun'],2) }} </td> <td> {{ number_format($gt['nilaimarhun'],2) }} </td>
<td> @php if($gt['jenistebus'] == ''){ <td> @php if($gt['jenistebus'] == ''){
echo '<h4><span class="badge badge-success">Gadai</span></h4>'; echo '<h4><span class="badge badge-success">Gadai</span></h4>';
}else{ }else{
echo '<h4><span class="badge badge-danger">Tebus</span></h4>'; echo '<h4><span class="badge badge-danger">Tebus</span></h4>';
} }
@endphp </td> @endphp </td>
</tr> </tr>
@endforeach @endforeach
@endif @endif
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="nav-tuntutbaki-tab"> <div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="nav-tuntutbaki-tab">
<table class="table text-center" id="tabletuntutbaki-{{ $ls->id }}"> <table class="table text-center" id="tabletuntutbaki-{{ $ls->id }}">
<thead> <thead>
<tr> <tr>
<th>Bil</th> <th>Bil</th>
<th>Tarikh</th> <th>Tarikh</th>
<th>Caj Lelong (RM)</th> <th>Caj Lelong (RM)</th>
<th>Jumlah (RM)</th> <th>Jumlah (RM)</th>
<th>Jenis</th> <th>Jenis</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@if(is_object($arraytuntutbaki) || is_array($arraytuntutbaki)) @if(is_object($arraytuntutbaki) || is_array($arraytuntutbaki))
@foreach($arraytuntutbaki[$index1] as $tb) @foreach($arraytuntutbaki[$index1] as $tb)
<tr> <tr>
<td> {{ $loop->iteration }} </td> <td> {{ $loop->iteration }} </td>
<td> {{ $tb['tarikh'] }} </td> <td> {{ $tb['tarikh'] }} </td>
<td> {{ number_format($tb['cajlelong'],2) }} </td> <td> {{ number_format($tb['cajlelong'],2) }} </td>
<td> {{ number_format($tb['jumlah'],2) }} </td> <td> {{ number_format($tb['jumlah'],2) }} </td>
<td> @php if($tb['jenis'] == 'T'){ <td> @php if($tb['jenis'] == 'T'){
echo '<h4><span class="badge badge-success">Baki Lelong</span></h4>'; echo '<h4><span class="badge badge-success">Baki Lelong</span></h4>';
}else{ }else{
echo '<h4><span class="badge badge-danger">Rugi Lelong</span></h4>'; echo '<h4><span class="badge badge-danger">Rugi Lelong</span></h4>';
} }
@endphp </td> @endphp </td>
</tr> </tr>
@endforeach @endforeach
@endif @endif
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@else @else
resources/views/khazanah/gadaian.blade.php
+1 -1
View File
@@ -89,7 +89,7 @@
<div class="col-2"> <div class="col-2">
</div> </div>
<div class="col-8 justify-content-center"> <div class="col-8 justify-content-center">
<h4 class="mt-4 mb-4">Masuk Gadaian Untuk Kelulusan</h4> <h4 class="mt-4 mb-4">Kelulusan Gadaian</h4>
</div> </div>
<div class="col-2 justify-content-end"> <div class="col-2 justify-content-end">
<h5 class="mt-4 mb-4">Gadaian : <span class="badge badge-success"></span></h5> <h5 class="mt-4 mb-4">Gadaian : <span class="badge badge-success"></span></h5>
resources/views/khazanah/khazanahserahan.blade.php
+42 -20
View File
@@ -37,22 +37,22 @@
<div class="col-6"> <div class="col-6">
<button type="button" data-toggle="modal" data-target="#marhunModal" class="btn btn-info">Panduan Format Bundle</button> <button type="button" data-toggle="modal" data-target="#marhunModal" class="btn btn-info">Panduan Format Bundle</button>
<input type="button" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/> <input type="button" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
<a href="{{ url('/serahan') }}" class="btn btn-danger">Batal</a> <a onclick="triggerbatal();" class="btn btn-danger">Batal</a>
</div> </div>
</div> </div>
<br> <br>
<ul class="nav nav-tabs" id="myTab" role="tablist"> <ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Bundle</a> <a class="nav-link" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Bundle</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">Keping</a> <a class="nav-link active" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">Keping</a>
</li> </li>
</ul> </ul>
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab"> <div class="tab-pane fade" id="home" role="tabpanel" aria-labelledby="home-tab">
<h4>Wang Bundle Dari Peti Besi</h4> <h4>Wang Bundle Dari Peti Besi</h4>
<table class="table table-bordered"> <table class="table table-bordered">
@@ -111,7 +111,7 @@
</div> </div>
<div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab"> <div class="tab-pane fade show active" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<h4>Wang Keping Dari Peti Besi</h4> <h4>Wang Keping Dari Peti Besi</h4>
<table class="table table-bordered"> <table class="table table-bordered">
@@ -130,51 +130,51 @@
<td>RM0.01</td> <td>RM0.01</td>
<td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['0']['txtsen1'] }}" readonly/></td> <td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['0']['txtsen1'] }}" readonly/></td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" value="{{ $array_reqteller['txtsen1'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilansen1" class="form-control" id="sen1" value="{{ $array_reqteller['txtsen1'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['0']['k01'] }}" readonly/> </td> <td><input type="text" name="totalsen1" class="form-control" value="{{ number_format($denominasi['0']['k01'],2) }}" readonly/> </td>
<td>RM1</td> <td>RM1</td>
<td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['0']['txtring1'] }}" readonly/></td> <td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['0']['txtring1'] }}" readonly/></td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" value="{{ $array_reqteller['txtring1'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" value="{{ $array_reqteller['txtring1'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['0']['k1'] }}" readonly/> </td> <td><input type="text" name="totalring1" class="form-control" value="{{ number_format($denominasi['0']['k1'],2) }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.05</td> <td>RM0.05</td>
<td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['0']['txtsen5'] }}" readonly/> </td> <td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['0']['txtsen5'] }}" readonly/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" value="{{ $array_reqteller['txtsen5'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilansen5" class="form-control" id="sen5" value="{{ $array_reqteller['txtsen5'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['0']['k05'] }}" readonly/> </td> <td><input type="text" name="totalsen5" class="form-control" value=" {{ number_format($denominasi['0']['k05'],2) }}" readonly/> </td>
<td>RM5</td> <td>RM5</td>
<td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['0']['txtring5'] }}" readonly/> </td> <td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['0']['txtring5'] }}" readonly/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" value="{{ $array_reqteller['txtring5'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" value="{{ $array_reqteller['txtring5'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['0']['k5'] }}" readonly/> </td> <td><input type="text" name="totalring5" class="form-control" value=" {{ number_format($denominasi['0']['k5'],2) }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.10</td> <td>RM0.10</td>
<td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['0']['txtsen10'] }}" readonly/> </td> <td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['0']['txtsen10'] }}" readonly/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" value="{{ $array_reqteller['txtsen10'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilansen10" class="form-control" id="sen10" value="{{ $array_reqteller['txtsen10'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen10" class="form-control" value=" {{ $denominasi['0']['k010'] }}" readonly/> </td> <td><input type="text" name="totalsen10" class="form-control" value=" {{ number_format($denominasi['0']['k010'],2) }}" readonly/> </td>
<td>RM10</td> <td>RM10</td>
<td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['0']['txtring10'] }}" readonly/> </td> <td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['0']['txtring10'] }}" readonly/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" value="{{ $array_reqteller['txtring10'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" value="{{ $array_reqteller['txtring10'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring10" class="form-control" value=" {{ $denominasi['0']['k10'] }}" readonly/> </td> <td><input type="text" name="totalring10" class="form-control" value=" {{ number_format($denominasi['0']['k10'],2) }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.20</td> <td>RM0.20</td>
<td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['0']['txtsen20'] }}" readonly/> </td> <td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['0']['txtsen20'] }}" readonly/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" value="{{ $array_reqteller['txtsen20'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilansen20" class="form-control" id="sen20" value="{{ $array_reqteller['txtsen20'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen20" class="form-control" value=" {{ $denominasi['0']['k020'] }}" readonly/> </td> <td><input type="text" name="totalsen20" class="form-control" value=" {{ number_format($denominasi['0']['k020'],2) }}" readonly/> </td>
<td> RM20</td> <td> RM20</td>
<td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['0']['txtring20'] }}" readonly/> </td> <td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['0']['txtring20'] }}" readonly/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" value="{{ $array_reqteller['txtring20'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" value="{{ $array_reqteller['txtring20'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring20" class="form-control" value=" {{ $denominasi['0']['k20'] }}" readonly/> </td> <td><input type="text" name="totalring20" class="form-control" value=" {{ number_format($denominasi['0']['k20'],2) }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.50</td> <td>RM0.50</td>
<td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['0']['txtsen50'] }}" readonly/> </td> <td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['0']['txtsen50'] }}" readonly/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" value="{{ $array_reqteller['txtsen50'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilansen50" class="form-control" id="sen50" value="{{ $array_reqteller['txtsen50'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen50" class="form-control" value=" {{ $denominasi['0']['k050'] }}" readonly/> </td> <td><input type="text" name="totalsen50" class="form-control" value=" {{ number_format($denominasi['0']['k050'],2) }}" readonly/> </td>
<td>RM50</td> <td>RM50</td>
<td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['0']['txtring50'] }}" readonly/> </td> <td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['0']['txtring50'] }}" readonly/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" value="{{ $array_reqteller['txtring50'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" value="{{ $array_reqteller['txtring50'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring50" class="form-control" value=" {{ $denominasi['0']['k50'] }}" readonly/> </td> <td><input type="text" name="totalring50" class="form-control" value=" {{ number_format($denominasi['0']['k50'],2) }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
@@ -184,7 +184,7 @@
<td>RM100 </td> <td>RM100 </td>
<td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['0']['txtring100'] }}" readonly/> </td> <td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['0']['txtring100'] }}" readonly/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" data-jenis="serahan"value="{{ $array_reqteller['txtring100'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td> <td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" data-jenis="serahan"value="{{ $array_reqteller['txtring100'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['0']['k100'] }}" readonly/> </td> <td><input type="text" name="totalring100" class="form-control" value=" {{ number_format($denominasi['0']['k100'],2) }}" readonly/> </td>
</tr> </tr>
</table> </table>
<br> <br>
@@ -192,7 +192,7 @@
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th colspan="6"> Total Wang Tunai Keping (RM) </th> <th colspan="6"> Total Wang Tunai Keping (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['jumlahkeping'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ number_format($denominasi['0']['jumlahkeping'],2) }}" readonly/> </th>
</tr> </tr>
@@ -205,15 +205,15 @@
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th> Total Keseluruhan (RM) </th> <th> Total Keseluruhan (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['txtjumlah'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ number_format($denominasi['0']['txtjumlah'],2) }}" readonly/> </th>
</tr> </tr>
<tr> <tr>
<th> Baki Akhir Sistem (RM) </th> <th> Baki Akhir Sistem (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['txtjumlah'] - $denominasi['0']['lebihan'] }}" readonly/> </th> <th> <input type="text" class="form-control" value="@php $bakiakhirsistem = $denominasi['0']['txtjumlah'] - $denominasi['0']['lebihan']; echo number_format($bakiakhirsistem,2); @endphp" readonly/> </th>
</tr> </tr>
<tr> <tr>
<th> Lebihan/Kekurangan (RM) </th> <th> Lebihan/Kekurangan (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['lebihan'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ number_format($denominasi['0']['lebihan'],2) }}" readonly/> </th>
</tr> </tr>
</table> </table>
@@ -341,6 +341,28 @@
$('#form-pendahuluan').trigger('submit'); $('#form-pendahuluan').trigger('submit');
} }
function triggerbatal()
{
let nom = $('#no').val();
let teller = $('#teller').val();
let kodcaw = "{{ Auth::user()->cawangan }}";
$.ajax({
method: 'get',
url: "{{ route('request.pembatalan') }}",
data:{
'kodcaw' : kodcaw,
'no' : nom,
'kodlaluan' : teller
},
success:function(data){
window.location.href = "{{ route('khazanah.serahan') }}";
}
});
}
</script> </script>
<script type="text/javascript" src="{{ asset('js/main.js') }}"></script> <script type="text/javascript" src="{{ asset('js/main.js') }}"></script>
resources/views/khazanah/laporan/marhunterkumpul.blade.php
+12 -12
View File
@@ -35,21 +35,21 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var api_url = "<?php echo $api_url ?>"; var api_url = "<?php echo $api_url ?>";
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>"; var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
alert(btoa(api_url)); // alert(btoa(api_url));
var tablecustomers = $('#myTable').DataTable({ var tablecustomers = $('#myTable').DataTable({
"ordering": false "ordering": false
}); });
$(document).ready( function () { $(document).ready( function () {
$('#datetimepicker1').datepicker({ $('#datetimepicker1').datepicker({
format: 'dd-mm-yyyy' format: 'dd-mm-yyyy'
});
}); });
});
</script> </script>
@endsection @endsection
resources/views/khazanah/pendahuluanserah.blade.php
+16 -16
View File
@@ -135,51 +135,51 @@
<td>RM0.01</td> <td>RM0.01</td>
<td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td> <td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" data-deno="{{ $denominasi['txtsen1'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen1" class="form-control" id="sen1" data-deno="{{ $denominasi['txtsen1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['k01'] }}" readonly/> </td> <td><input type="text" name="totalsen1" class="form-control" value="{{ number_format($denominasi['k01'],2) }}" readonly/> </td>
<td>RM1</td> <td>RM1</td>
<td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td> <td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" data-deno="{{ $denominasi['txtring1'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" data-deno="{{ $denominasi['txtring1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['k1'] }}" readonly/> </td> <td><input type="text" name="totalring1" class="form-control" value="{{ number_format($denominasi['k1'],2) }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.05</td> <td>RM0.05</td>
<td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['txtsen5'] }}" readonly/> </td> <td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['txtsen5'] }}" readonly/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" data-deno="{{ $denominasi['txtsen5'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen5" class="form-control" id="sen5" data-deno="{{ $denominasi['txtsen5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['k05'] }}" readonly/> </td> <td><input type="text" name="totalsen5" class="form-control" value=" {{ number_format($denominasi['k05'],2) }}" readonly/> </td>
<td>RM5</td> <td>RM5</td>
<td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['txtring5'] }}" readonly/> </td> <td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['txtring5'] }}" readonly/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" data-deno="{{ $denominasi['txtring5'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" data-deno="{{ $denominasi['txtring5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['k5'] }}" readonly/> </td> <td><input type="text" name="totalring5" class="form-control" value=" {{ number_format($denominasi['k5'],2) }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.10</td> <td>RM0.10</td>
<td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['txtsen10'] }}" readonly/> </td> <td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['txtsen10'] }}" readonly/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" data-deno="{{ $denominasi['txtsen10'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen10" class="form-control" id="sen10" data-deno="{{ $denominasi['txtsen10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen10" class="form-control" value=" {{ $denominasi['k010'] }}" readonly/> </td> <td><input type="text" name="totalsen10" class="form-control" value=" {{ number_format($denominasi['k010'],2) }}" readonly/> </td>
<td>RM10</td> <td>RM10</td>
<td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['txtring10'] }}" readonly/> </td> <td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['txtring10'] }}" readonly/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" data-deno="{{ $denominasi['txtring10'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" data-deno="{{ $denominasi['txtring10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring10" class="form-control" value=" {{ $denominasi['k10'] }}" readonly/> </td> <td><input type="text" name="totalring10" class="form-control" value=" {{ number_format($denominasi['k10'],2) }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.20</td> <td>RM0.20</td>
<td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['txtsen20'] }}" readonly/> </td> <td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['txtsen20'] }}" readonly/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" data-deno="{{ $denominasi['txtsen20'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen20" class="form-control" id="sen20" data-deno="{{ $denominasi['txtsen20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen20" class="form-control" value=" {{ $denominasi['k020'] }}" readonly/> </td> <td><input type="text" name="totalsen20" class="form-control" value=" {{ number_format($denominasi['k020'],2) }}" readonly/> </td>
<td> RM20</td> <td> RM20</td>
<td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['txtring20'] }}" readonly/> </td> <td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['txtring20'] }}" readonly/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" data-deno="{{ $denominasi['txtring20'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" data-deno="{{ $denominasi['txtring20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring20" class="form-control" value=" {{ $denominasi['k20'] }}" readonly/> </td> <td><input type="text" name="totalring20" class="form-control" value=" {{ number_format($denominasi['k20'],2)}}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td>RM0.50</td> <td>RM0.50</td>
<td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['txtsen50'] }}" readonly/> </td> <td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['txtsen50'] }}" readonly/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" data-deno="{{ $denominasi['txtsen50'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilansen50" class="form-control" id="sen50" data-deno="{{ $denominasi['txtsen50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen50" class="form-control" value=" {{ $denominasi['k050'] }}" readonly/> </td> <td><input type="text" name="totalsen50" class="form-control" value=" {{ number_format($denominasi['k050'],2) }}" readonly/> </td>
<td>RM50</td> <td>RM50</td>
<td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['txtring50'] }}" readonly/> </td> <td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['txtring50'] }}" readonly/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" data-deno="{{ $denominasi['txtring50'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" data-deno="{{ $denominasi['txtring50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring50" class="form-control" value=" {{ $denominasi['k50'] }}" readonly/> </td> <td><input type="text" name="totalring50" class="form-control" value=" {{ number_format($denominasi['k50'],2) }}" readonly/> </td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
@@ -189,7 +189,7 @@
<td>RM100 </td> <td>RM100 </td>
<td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['txtring100'] }}" readonly/> </td> <td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['txtring100'] }}" readonly/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" data-deno="{{ $denominasi['txtring100'] }}" onkeyup="totalkey(this)"/> </td> <td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" data-deno="{{ $denominasi['txtring100'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['k100'] }}" readonly/> </td> <td><input type="text" name="totalring100" class="form-control" value=" {{ number_format($denominasi['k100'],2) }}" readonly/> </td>
</tr> </tr>
</table> </table>
<br> <br>
@@ -197,7 +197,7 @@
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th colspan="6"> Total Wang Tunai Keping (RM) </th> <th colspan="6"> Total Wang Tunai Keping (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['jumlahkeping'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ number_format($denominasi['jumlahkeping'],2) }}" readonly/> </th>
</tr> </tr>
@@ -210,15 +210,15 @@
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th> Total Keseluruhan (RM) </th> <th> Total Keseluruhan (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['txtjumlah'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ number_format($denominasi['txtjumlah'],2) }}" readonly/> </th>
</tr> </tr>
<tr> <tr>
<th> Baki Akhir Sistem (RM) </th> <th> Baki Akhir Sistem (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['txtjumlah'] - $denominasi['lebihan'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" @php $bakiakhirsistem = ($denominasi['txtjumlah'] - $denominasi['lebihan']); echo number_format($bakiakhirsistem,2); @endphp" readonly/> </th>
</tr> </tr>
<tr> <tr>
<th> Lebihan/Kekurangan (RM) </th> <th> Lebihan/Kekurangan (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['lebihan'] }}" readonly/> </th> <th> <input type="text" class="form-control" value=" {{ number_format($denominasi['lebihan'],2) }}" readonly/> </th>
</tr> </tr>
</table> </table>
@@ -367,7 +367,7 @@
window.location.href = "{{ route('khazanah.pendahulu') }}"; window.location.href = "{{ route('khazanah.pendahulu') }}";
} }
}); });
} }
function validateamaun() function validateamaun()
resources/views/khazanah/pendahuluanserahanmain.blade.php
+24 -8
View File
@@ -32,8 +32,8 @@
<tr> <tr>
<td>{{ $gldetail['tarikh'] }}</td> <td>{{ $gldetail['tarikh'] }}</td>
<td>{{ $gldetail['descpt'] }}</td> <td>{{ $gldetail['descpt'] }}</td>
<td>{{ number_format($gldetail['pendahuluan'],2) }}</td> <td>{{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }}</td>
<td>{{ number_format($gldetail['serahan'],2) }}</td> <td>{{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@@ -184,6 +184,11 @@
let bundle1 = $('#bundle1').val();let bundle5 = $('#bundle5').val();let bundle10 = $('#bundle10').val(); let bundle1 = $('#bundle1').val();let bundle5 = $('#bundle5').val();let bundle10 = $('#bundle10').val();
let bundle20 = $('#bundle20').val();let bundle50 = $('#bundle50').val();let bundle100 = $('#bundle100').val(); let bundle20 = $('#bundle20').val();let bundle50 = $('#bundle50').val();let bundle100 = $('#bundle100').val();
//denominasi keping
let sen1 = $('#sen1').val();let sen5 = $('#sen5').val();let sen10 = $('#sen10').val();let sen20 = $('#sen20').val();let sen50 = $('#sen50').val();
let ringgit1 = $('#ringgit1').val();let ringgit5 = $('#ringgit5').val();let ringgit10 = $('#ringgit10').val();let ringgit20 = $('#ringgit20').val();let ringgit50 = $('#ringgit50').val();
let ringgit100 = $('#ringgit100').val();
$.ajax({ $.ajax({
method: 'post', method: 'post',
url: '{{ route("khazanah.pendahuluanserahanHQ") }}', url: '{{ route("khazanah.pendahuluanserahanHQ") }}',
@@ -196,12 +201,23 @@
'teller' : teller, 'teller' : teller,
'dtacct' : dtacct, 'dtacct' : dtacct,
'ktacct' : ktacct, 'ktacct' : ktacct,
'bundle1' : bundle1, 'ambilansen1' : sen1,
'bundle5' : bundle5, 'ambilansen5' : sen5,
'bundle10' : bundle10, 'ambilansen10' : sen10,
'bundle20' : bundle20, 'ambilansen20' : sen20,
'bundle50' : bundle50, 'ambilansen50' : sen50,
'bundle100' : bundle100 'ambilanring1' : ringgit1,
'ambilanring5' : ringgit5,
'ambilanring10' : ringgit10,
'ambilanring20' : ringgit20,
'ambilanring50' : ringgit50,
'ambilanring100' : ringgit100
// 'bundle1' : bundle1,
// 'bundle5' : bundle5,
// 'bundle10' : bundle10,
// 'bundle20' : bundle20,
// 'bundle50' : bundle50,
// 'bundle100' : bundle100
}, },
success:function(data){ success:function(data){
if(data == 'LULUS'){ if(data == 'LULUS'){
resources/views/khazanah/serahan.blade.php
+1
View File
@@ -55,6 +55,7 @@
<th>Modal</th> <th>Modal</th>
<th>Serahan</th> <th>Serahan</th>
<th>Tarikh</th> <th>Tarikh</th>
<th>Masa</th>
<th>Action</th> <th>Action</th>
</thead> </thead>
resources/views/khazanah/tebus.blade.php
+1 -1
View File
@@ -146,7 +146,7 @@
</div> </div>
<div class="row mt-5"> <div class="row mt-5">
<div class="mx-auto"> <div class="mx-auto">
<h4>Jumlah Surat Gadai : <span class="badge badge-secondary">{{ count($listserah) + count($senaraitebus) }} </span></h4> <h4>Jumlah SAG : <span class="badge badge-secondary">{{ count($listserah) + count($senaraitebus) }} </span></h4>
</div> </div>
<div class="form-group d-flex justify-content-end mr-4"> <div class="form-group d-flex justify-content-end mr-4">
<a href="{{ url('menu') }}" class="btn btn-primary">Cetak</a> <a href="{{ url('menu') }}" class="btn btn-primary">Cetak</a>
resources/views/layouts/app.blade.php
+2 -2
View File
@@ -118,7 +118,7 @@
// Enable pusher logging - don't include this in production // Enable pusher logging - don't include this in production
// Pusher.logToConsole = true; // Pusher.logToConsole = true;
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
@@ -183,7 +183,7 @@
// Enable pusher logging - don't include this in production // Enable pusher logging - don't include this in production
// Pusher.logToConsole = true; // Pusher.logToConsole = true;
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
resources/views/layouts/app_operasi.blade.php
+3 -3
View File
@@ -109,7 +109,7 @@
// Enable pusher logging - don't include this in production // Enable pusher logging - don't include this in production
Pusher.logToConsole = true; Pusher.logToConsole = true;
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
@@ -163,7 +163,7 @@
// Enable pusher logging - don't include this in production // Enable pusher logging - don't include this in production
Pusher.logToConsole = true; Pusher.logToConsole = true;
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
@@ -219,7 +219,7 @@
// Enable pusher logging - don't include this in production // Enable pusher logging - don't include this in production
Pusher.logToConsole = false; Pusher.logToConsole = false;
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
resources/views/lelongan/index.blade.php
+1 -1
View File
@@ -265,7 +265,7 @@
} }
}); });
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
resources/views/modal/denominasimodalpendahuluanserahan.blade.php
+64 -4
View File
@@ -5,7 +5,7 @@
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Bundle</a> <a class="nav-link active" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Keping</a>
</li> </li>
</ul> </ul>
@@ -22,7 +22,7 @@
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab"> <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
<table class="table"> <table class="table text-center">
<tr> <tr>
<th></th> <th></th>
<th style="display:none;" name="denominasi" class="denominasi">Peti Besi</th> <th style="display:none;" name="denominasi" class="denominasi">Peti Besi</th>
@@ -33,7 +33,7 @@
<th>Ambilan</th> <th>Ambilan</th>
<th>Total (RM)</th> <th>Total (RM)</th>
</tr> </tr>
<tr> {{-- <tr>
<td>RM1</td> <td>RM1</td>
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd1'] }}" readonly/></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="ambilanb1" class="form-control" id="bundle1" onkeyup="kiraan(this)"/> </td>
@@ -62,8 +62,68 @@
<td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd100'] }}" readonly/></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="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> <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" 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" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly/> </td>
</tr> </tr>
</table> <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" 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" 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" 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" 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" 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" 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" 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" 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>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>
</div> </div>
resources/views/penebusan/index.blade.php
+2 -2
View File
@@ -1245,7 +1245,7 @@
} }
}); });
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
@@ -1373,7 +1373,7 @@
}); });
var pusher = new Pusher('26b0ec2f297f94b7aa9b', { var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1', cluster: 'ap1',
encrypted: true encrypted: true
}); });
resources/views/print/laporan_imbanduga.blade.php
+5 -7
View File
@@ -9,7 +9,7 @@
#header td, #customers th { #header td, #customers th {
padding:4px; padding:4px;
font-size:10px; font-size:12px;
} }
#header tr:nth-child(even){background-color: #ffffff;} #header tr:nth-child(even){background-color: #ffffff;}
@@ -39,7 +39,7 @@
#scan td, #scan th { #scan td, #scan th {
padding: 8px; padding: 8px;
font-size:12px; font-size:20px;
} }
#scan tr:nth-child(even){background-color: #ffffff;} #scan tr:nth-child(even){background-color: #ffffff;}
@@ -96,7 +96,7 @@
#details td, #details th { #details td, #details th {
padding: 8px; padding: 8px;
font-size:11px; font-size:16px;
} }
#details tr:nth-child(even){background-color: #ffffff;} #details tr:nth-child(even){background-color: #ffffff;}
@@ -181,7 +181,7 @@
#details td, #details th { #details td, #details th {
padding:4px; padding:4px;
font-size:12px; font-size:16px;
border: 1px solid #ddd; border: 1px solid #ddd;
} }
@@ -244,9 +244,7 @@
#data td, #data th { #data td, #data th {
padding:4px; padding:4px;
font-size:12px; font-size:16px;
font-size:12px;
} }