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

fix skit2

Browse Source
This commit is contained in:
hafifierahman
2021-09-27 10:59:10 +08:00
parent 8862212d54
commit 2b53de7007
16 changed files with 193 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/analisa/index.blade.php
+8 -4
View File
@@ -230,15 +230,19 @@
<tr>
<th>Karat</th>
<th>Harga (RM)</th>
<th>Kenaikan</th>
<th>Perubahan (%)</th>
</tr>
</thead>
<tbody>
@foreach($harga_emas as $index=>$hm)
@foreach($hargaemasterdahulu as $index=>$hm)
<tr>
<td>{{ $hm['karat'] }}</td>
<td>{{ $hm['harga'] }}</td>
<td><i class="fas fa-arrow-down text-warning mr-3"></i></td>
<td>{{ $hm['hargasemasa'] }}</td>
@if($hm['percent'] > 0)
<td><i class="fas fa-arrow-up text-success mr-3"></i><span class="text-success">({{ number_format($hm['percent'],2) }})</span></td>
@else
<td><i class="fas fa-arrow-down text-warning mr-3"></i><span class="text-warning">({{ number_format($hm['percent']*-1,2) }})</span></td>
@endif
</tr>
@endforeach
</tbody>
resources/views/auth/login.blade.php
+2 -1
View File
@@ -56,7 +56,8 @@
<div class="col-sm-12 col-xs-12 forgetpassword">
<center>
<div class="forgot-password">
<a href="{{ route('auth.registerfirst') }}" class="text-light"><font color="#3598dc">Pertama Kali</font></a> |@if (Route::has('password.request')) <a href="{{ route('password.request') }}" class="text-light"><font color="#3598dc">Lupa Katalaluan</font></a>@endif
<a href="{{ route('auth.registerfirst') }}" class="text-light"><font color="#3598dc">Pertama Kali</font></a> |@if (Route::has('password.request')) <a href="#" class="text-light"><font color="#3598dc">Lupa Katalaluan</font></a>@endif
{{-- <a href="{{ route('auth.registerfirst') }}" class="text-light"><font color="#3598dc">Pertama Kali</font></a> |@if (Route::has('password.request')) <a href="{{ route('password.request') }}" class="text-light"><font color="#3598dc">Lupa Katalaluan</font></a>@endif --}}
</div>
<div style="font-size: 10px;"><br><br>Paparan terbaik menggunakan Mozilla Firefox, Google Chrome & Internet Explorer 9.0 ke atas dengan resolusi 1920 x 1080</div>
</center>
resources/views/auth/pertama-kali/pertamakalistep1.blade.php
+27 -5
View File
@@ -202,6 +202,7 @@
{
var otp_verify = $('#login-otp').val();
var otp_icno = $('#login-icno').val();
var boolotp = false;var boolicno = false;
if(otp_verify == null || otp_verify == '')
{
@@ -209,11 +210,13 @@
$('#errorotp').text('sila isikan otp anda!');
$('#spanotp').addClass('visible');
$('#spanotp').removeClass('invisible');
boolotp = true;
}
else{
$('#errorotp').text('');
$('#spanotp').addClass('invisible');
$('#spanotp').removeClass('visible');
boolotp = false;
}
if(otp_icno == null || otp_icno == '')
@@ -221,13 +224,17 @@
$('#erroricno').text('sila isikan icno anda!');
$('#spanic').addClass('visible');
$('#spanic').removeClass('invisible');
boolicno = true;
}else{
$('#erroricno').text('');
$('#spanic').addClass('invisible');
$('#spanic').removeClass('visible');
boolicno = false;
}
$.ajax({
if(boolotp === false && boolicno === false)
{
$.ajax({
url: api_url + '/api/otp/check/'+ otp_verify,
method:'GET',
success:function(data){
@@ -276,13 +283,28 @@
}
});
}
else{
$.notify({
icon: 'fas fa-exclamation-triangle fa-2x',
newest_on_top: true,
message: "<strong style='font-size:15px;text-align:center;margin-left:100px;'>Pelanggan tidak membuat sebarang login!</strong>"
},{
type: 'danger',
allow_dismiss: false,
placement:{ align:'center',from:'bottom'},
animate: {
enter: 'animate__animated animate__bounce',
exit: 'animate__animated animate__bounceOutDown'
}
});
}
}
});
});
}
}
function backfunc()
resources/views/auth/slides/slidespage.blade.php
+3 -5
View File
@@ -3,13 +3,12 @@
<!-- Full-width images with number and caption text -->
<div class="mySlides ">
<div class="numbertext">1 / 3</div>
<div class="numbertext">1 / 2</div>
<img class="login-bg" src="{{ asset('argon') }}/login/backg1.jpg">
{{-- <div class="headtext">Caption Text</div> --}}
<div class="text" style="text-align:center">
<span class="dot" onclick="currentSlide(1)"></span>
<span class="dot" onclick="currentSlide(2)"></span>
<span class="dot" onclick="currentSlide(3)"></span>
</div>
</div>
@@ -25,13 +24,12 @@
</div> --}}
<div class="mySlides ">
<div class="numbertext">3 / 3</div>
<img class="login-bg" src="{{ asset('argon') }}/login/backg4.jpeg">
<div class="numbertext">2 / 2</div>
<img class="login-bg" src="{{ asset('argon') }}/login/backg4.jpg">
{{-- <div class="headtext">Caption Three</div> --}}
<div class="text" style="text-align:center">
<span class="dot" onclick="currentSlide(1)"></span>
<span class="dot" onclick="currentSlide(2)"></span>
<span class="dot" onclick="currentSlide(3)"></span>
</div>
</div>
resources/views/dashboard.blade.php
+22 -1
View File
@@ -66,7 +66,7 @@
<div class="col-xl-2 col-sm-12">
<div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
<a href="#"><div class="card mb-sm-0 mb-5 bg-primary mt-2">
<a href="#" onclick="onclicktebus();"><div class="card mb-sm-0 mb-5 bg-primary mt-2">
<div class="card-body text-center">
<div class="col-auto">
<div class="icon icon-shape bg-yellow text-white rounded-circle shadow">
@@ -163,6 +163,27 @@
</div>
<script>
function onclicktebus()
{
$.notify({
icon: 'fas fa-exclamation-triangle fa-2x',
newest_on_top: true,
message: "<strong style='font-size:15px;text-align:center;margin-left:100px;'>Halaman ini masih dalam pembinaan!</strong>"
},{
type: 'warning',
allow_dismiss: false,
placement:{ align:'center',from:'bottom'},
animate: {
enter: 'animate__animated animate__bounce',
exit: 'animate__animated animate__bounceOutDown'
}
});
}
</script>
@endsection
resources/views/layouts/app.blade.php
+7 -4
View File
@@ -4,6 +4,9 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Expires" content="0">
<meta name="csrf-token" content="{{ csrf_token() }}">
@@ -64,7 +67,7 @@
}
}
.btn-primary {
/* .btn-primary {
color: #fff !important;
background-color: #282460 !important;
border-color: #357ebd !important;
@@ -77,7 +80,7 @@
color: #385d8a !important;
background-color: #3598dc !important;
border-color: #3598dc !important;
}
} */
/* body {
font-family: "Noto Sans", sans-serif !important;
@@ -159,9 +162,9 @@
transition: background-color 0.6s ease;
}
.active {
/* .active {
background-color: #717171;
}
} */
/* Fading animation */
.fade {
resources/views/modal/marhun.blade.php
+49
View File
@@ -0,0 +1,49 @@
<div class="modal animate__animated animate__bounceInDown" id="marhunModal">
<div class="modal-dialog modal-lg modal-dialog-centered">
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<h2 class="modal-title">Senarai Marhun</h2>
<button type="button" class="close" data-dismiss="modal">&times;</button>
</div>
<!-- Modal body -->
<div class="modal-body">
<table id="biasa" class="table table-striped table-bordered text-center" style="width:100%">
<thead class="thead-dark">
<tr>
<th>Bil</th>
<th>Jenis Marhun</th>
<th>Berat</th>
<th>Karat</th>
<th>Nilai Marhun</th>
<th>Nota</th>
</tr>
</thead>
<tbody id="tablemarhun">
<tr>
<td>dassad</td>
<td>dassad</td>
<td>dassad</td>
<td>dassad</td>
<td>dassad</td>
<td>dassad</td>
</tr>
</tbody>
</table>
</div>
<!-- Modal footer -->
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Tutup</button>
</div>
</div>
</div>
</div>
resources/views/pembayaran/result/berjaya.blade.php
+2 -2
View File
@@ -42,9 +42,9 @@
allow_dismiss: false,
placement:{ align:'center',from:'bottom'},
animate: {
enter: 'animated bounceInDown',
enter: 'animate__animated animate__bounce',
exit: 'animated bounceOutUp'
exit: 'animate__animated animate__bounceOutDown'
}
});
</script>
resources/views/pembayaran/result/gagal.blade.php
+2 -2
View File
@@ -42,9 +42,9 @@
allow_dismiss: false,
placement:{ align:'center',from:'bottom'},
animate: {
enter: 'animated bounceInDown',
enter: 'animate__animated animate__bounce',
exit: 'animated bounceOutUp'
exit: 'animate__animated animate__bounceOutDown'
}
});
</script>
resources/views/pembayaran/senaraibayaran.blade.php
+51 -12
View File
@@ -2,6 +2,7 @@
@section('content')
@include('layouts.headers.cards')
@include('modal.marhun')
@error('chkboxsag')
<script>
@@ -14,9 +15,9 @@
allow_dismiss: false,
placement:{ align:'center',from:'bottom'},
animate: {
enter: 'animated bounceInDown',
enter: 'animate__animated animate__bounce',
exit: 'animated bounceOutUp'
exit: 'animate__animated animate__bounceOutDown'
}
});
</script>
@@ -63,15 +64,15 @@
<table class="table align-items-center table-flush" id="belum_tawarruq">
<thead class="thead-light">
<tr>
<th scope="col" class="sort" data-sort="name">No Rujukan</th>
<th scope="col" class="sort" data-sort="budget">Pembiayaan</th>
<th scope="col" class="sort" data-sort="status">Keuntungan</th>
<th scope="col" class="sort" data-sort="status">Nilai Marhun</th>
<th scope="col" class="sort" data-sort="status">Berat</th>
<th scope="col" class="sort" data-sort="status">Marhun</th>
<th scope="col" class="sort" data-sort="status">JBG</th>
<th scope="col" class="sort" data-sort="status">Kadar Upah</th>
<th scope="col" class="sort" data-sort="status">Tindakan</th>
<th>No Rujukan</th>
<th>Pembiayaan</th>
<th>Keuntungan</th>
<th>Nilai Marhun</th>
<th>Berat</th>
<th>Marhun</th>
<th>JBG</th>
<th>Kadar Upah</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody class="list">
@@ -81,7 +82,10 @@
<th scope="row">
<div class="media align-items-center">
<div class="media-body">
<a href="{{ route('penyata.show',$bt['norujukan']) }}" target="_blank"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
@php
$marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json();
@endphp
<a href="#" class="linktarget" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-pinjaman="{{$bt['pinjaman']}}" data-norujukan="{{$bt['norujukan']}}" data-hargajualan="{{$bt['hargajualan']}}" data-kodcaw="{{ $bt['kodcaw'] }}" data-target="#marhunModal"><span class="name mb-0 text-sm">{{ $bt['norujukan'] }}</span></a>
</div>
</div>
</th>
@@ -158,6 +162,41 @@
return true;
}
var api_url = "{{ config('api.url') }}";
$('.linktarget').on('click', function(event) {
var arraymarhun = $(this).data('marhun');
var norujukan = $(this).data('norujukan');
var kodcaw = $(this).data('kodcaw');
var hargajualan = $(this).data('hargajualan');
var pinjaman = $(this).data('pinjaman');
$('#norujukan_modal').val(norujukan);
$('#pinjaman_modal').val(pinjaman);
$('#tablemarhun').empty();
var bil_count = 0;
$.each(arraymarhun,function(index,marhun){
$.each(marhun, function(index2,marhun_detail){
var marhun_name;
$.ajax({
method:'GET',
url: api_url + '/api/jemas/nama_marhun',
dataType: 'json',
data:{
marhun:marhun_detail['marhun']
},
success:function(marhun_ajax){
bil_count++;
$("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
}
});
});
});
});
</script>
resources/views/semak/semaksag.blade.php
+2 -2
View File
@@ -42,9 +42,9 @@
allow_dismiss: false,
placement:{ align:'center',from:'bottom'},
animate: {
enter: 'animated bounceInDown',
enter: 'animate__animated animate__bounce',
exit: 'animated bounceOutUp'
exit: 'animate__animated animate__bounceOutDown'
}
});
</script>