KoPKB/erahn-click
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'second' into 'main'

Browse Source 
fix skit2

See merge request online-sistem1/arrahn-portal!6
This commit is contained in:
hafifie rahman
2022-01-23 01:55:14 +00:00
parent a1236dede9 f682a08bac
commit 2711ae5d98
7 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/includes/bayaran/pembayaransag.blade.php
+13 -5
View File
@@ -266,7 +266,7 @@
{{ $bayar['norujukan'] }}
</td>
<td>
<p id="spantransaksi{{ $counter }}"></p>
<p id="spantransaksi{{ $counter }}">0.00</p>
</td>
</tr>
@@ -293,7 +293,8 @@
</div>
<div class="d-flex justify-content-end col-12 mt-3 align-self-end">
<div class="d-flex justify-content-between col-12 mt-3 align-self-end">
<a href="{{ route('pembayaransag') }}" type="button" class="btn btn-danger">Batal</a>
<button type="submit" id="bayarsbmt" class="btn btn-primary" disabled onclick="loadingbtn();">Bayar</button>
</div>
</div>
@@ -302,6 +303,16 @@
</div>
<script>
$(document).ready(function() {
$(window).keydown(function(event){
if(event.keyCode == 13) {
event.preventDefault();
return false;
}
});
});
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
@@ -348,8 +359,6 @@
return false;
}
// let total = 0;
$("select[name=sltbayaran]").change(function(e) {
let selected = $('option:selected', this).attr('value');
let jenis = $(this).data('jenis');
@@ -488,7 +497,6 @@
window.addEventListener('pageshow', function(event) {
if (event.persisted || window.performance && window.performance.navigation.type == 2) {
$('#logout-form').submit();
// location.reload();
}
},
false);
resources/views/includes/bayaran/senaraibayaransag.blade.php
+26 -19
View File
@@ -51,7 +51,8 @@
</div>
</div> --}}
<div class="container col-11 shadow-lg p-3 bg-white rounded">
{{-- <div class="container col-11 shadow-lg p-3 bg-white rounded"> --}}
<div class="container col-11 p-3">
<div class="tab-content tab-space">
<form method="post" action="{{ route('payment.action') }}" onsubmit="return validateform()">
@csrf
@@ -111,7 +112,7 @@
<td>
@php
$namacawangan = Http::get(config('api.url') . '/api/cawangan/detail/' . $bt['kodcaw'] )->json();
echo substr($namacawangan[0]['namacaw'],8);
echo ucwords(strtolower(substr($namacawangan[0]['namacaw'],8)));
@endphp
</td>
<th scope="row">
@@ -150,8 +151,8 @@
</div>
</div>
<div class="d-flex justify-content-end mt-2">
<button type="submit" class="btn btn-primary" onclick="loadingbtn();">Checkout <span class="badge alert-warning text-light font-weight-bold" style="font-size:12px;" id="totalsag">0</span></button>
<div class="d-flex justify-content-end mt-4">
<button type="submit" class="btn btn-primary" onclick="loadingbtn();"><span class="mr-3">Checkout</span> <span class="badge alert-warning text-dark font-weight-bold" style="font-size:12px;" id="totalsag">0</span></button>
</div>
</form>
@@ -160,21 +161,21 @@
</div>
<script>
var belumtawarruqtable = $('#belum_tawarruq').DataTable({
"bLengthChange": false,
"bFilter": true,
"pagingType": "numbers",
"paging" : false,
language: {
'paginate': {
'previous': '<span class="fas fa-backward fa-1.5x"></span>',
'next': '<span class="fas fa-forward"></span>'
}
},
"pageLength": 10,
"scrollX": true
// var belumtawarruqtable = $('#belum_tawarruq').DataTable({
// "bLengthChange": false,
// "bFilter": true,
// "pagingType": "numbers",
// "paging" : false,
// language: {
// 'paginate': {
// 'previous': '<span class="fas fa-backward fa-1.5x"></span>',
// 'next': '<span class="fas fa-forward"></span>'
// }
// },
// "pageLength": 10,
// "scrollX": true
});
// });
var selepastawarruqtable = $('#selepas_tawarruq').DataTable({
"bLengthChange": false,
@@ -195,7 +196,13 @@
var count = parseInt($('#totalsag').text());
if ($(this).is(':checked')) {
var total = count + 1;
$('#totalsag').text(total);
if(total <= 3)
{
$('#totalsag').text(total);
}else{
$(this).prop('checked', false);
}
} else {
var total = count - 1;
$('#totalsag').text(total);
resources/views/includes/main/head.blade.php
+3 -3
View File
@@ -59,7 +59,7 @@
<script>
ifvisible.setIdleDuration(10000000);
ifvisible.setIdleDuration(3000);
</script>
<script>
@@ -118,8 +118,8 @@
<script>
$(function() {
setTimeout(() => {
// setTimeout(() => {
$(".portalloader").fadeOut(300);
}, 300)
// }, 300)
})
</script>
resources/views/includes/main/navigation.blade.php
+3 -3
View File
@@ -78,7 +78,7 @@
</button>
<div class="collapse navbar-collapse pt-3 pb-2 py-lg-0 w-100" id="navigation">
<ul class="navbar-nav navbar-nav-hover ms-auto">
<li class="nav-item ms-lg-auto">
{{-- <li class="nav-item ms-lg-auto">
<a class="nav-link nav-link-icon me-2" href="{{ route('semaksag') }}">
<i class="fa fa-list-alt me-1"></i>
<p class="d-inline text-sm z-index-1 font-weight-bold" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Senarai Rekod Gadaian & Tebusan">Rekod Pembelian</p>
@@ -95,7 +95,7 @@
<i class="fa fa-line-chart me-1"></i>
<p class="d-inline text-sm z-index-1 font-weight-bold" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Analisa Marhun">Analisa</p>
</a>
</li>
</li> --}}
<li class="nav-item ms-lg-auto">
<a class="nav-link nav-link-icon me-2" href="{{ route('profile.edit') }}">
<i class="fa fa-user me-1"></i>
@@ -103,7 +103,7 @@
</a>
</li>
<li class="nav-item my-auto ms-3 ms-lg-0">
<a href="{{ route('logout') }}" class="btn btn-sm bg-white mb-0 me-1 mt-2 mt-md-0" onclick="event.preventDefault();document.getElementById('logout-form').submit();">
<a href="{{ route('logout') }}" class="btn btn-sm bg-white border mb-0 me-1 mt-2 mt-md-0" onclick="event.preventDefault();document.getElementById('logout-form').submit();">
<span>{{ __('Logout') }}</span>
</a>
</div>
resources/views/includes/rekod/pilihcawangan.blade.php
+2 -2
View File
@@ -41,8 +41,8 @@
<p class="lead text-dark pe-md-5 me-md-5">
Sila pilih cawangan
</p>
<select class="form-select" aria-label="Default select example" name="sltcawangan">
<option selected disabled>Open this select menu</option>
<select class="form-select custom-select" aria-label="Default select example" name="sltcawangan">
<option selected disabled>Pilihan Cawangan</option>
@foreach($cawangan as $index1=>$caw)
<option value="{{ $caw['kodcaw'] }}">{{ $caw['namacawangan'] }}</option>
<input type="hidden" name="namacawangan" id="namacawangan" value="{{ $caw['namacawangan'] }}">
resources/views/includes/rekod/rekodsag.blade.php
+2 -6
View File
@@ -225,13 +225,9 @@
});
var selepastawarruqtable = $('#selepas_tawarruq').DataTable({
// dom: 'Bfrtip',
// buttons: [
// 'copy', 'excel', 'pdf'
// ],
"bLengthChange": false,
"bFilter": true,
"pagingType": "simple",
// "pagingType": "simple_numbers",
"pageLength": 5,
language: {
'paginate': {
@@ -247,7 +243,7 @@
var sudahtebustable = $('#saghistory').DataTable({
"bLengthChange": false,
"bFilter": true,
"pagingType": "simple",
// "pagingType": "simple",
"pageLength": 5,
language: {
'paginate': {
resources/views/penyata/penyata.blade.php
+9 -2
View File
@@ -215,6 +215,8 @@
<td>{{ number_format($gad['pinjaman'],2) }}</td>
</tr>
@endforeach
@php $total = $gad['pinjaman'];@endphp
@foreach($transaction as $index=>$trans)
<tr>
<td>@php
@@ -227,12 +229,16 @@
switch($trans['trans_type']){
case 'T': echo 'Pembayaran Tebus';
$penebusan = 'T';
break;
case 'A': echo 'Pembayaran Ansuran';
$penebusan = 'A';
break;
case 'S': echo 'Pembayaran Tebus Sebahagian';
$penebusan = 'S';
break;
case 'P': echo 'Pembayaran Tambah Pinjaman';
$penebusan = 'P';
break;
}
@@ -246,8 +252,9 @@
<td>{{ number_format($trans['duit_masuk'],2) }}</td>
<td></td>
@endif
{{-- <td>{{ number_format($trans['bakiharga'],2) }}</td> --}}
<td>@php $total = floatval($total) - floatval($trans['duit_masuk']); if($total < 0) echo '0.00'; else echo number_format($total,2); @endphp</td>
<td>{{ number_format($trans['bakiharga'],2) }}</td>
</tr>
@endforeach
<tr>
@@ -256,7 +263,7 @@
<td></td>
<td></td>
<td></td>
<td style="font-weight:bold;">{{ number_format($gad['bakipjm'],2) }}</td>
<td style="font-weight:bold;">{{ ($penebusan === 'T') ? '0.00' : number_format($gad['bakipjm'],2) }}</td>
</tr>
</table>