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

fix skit bug

Browse Source
This commit is contained in:
hafifierahman
2021-11-02 01:15:59 +08:00
parent 0044a0bc57
commit dd4954b9c2
13 changed files with 254 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Events/Dashboard/GadaiNotify.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace App\Events;
namespace App\Events\Dashboard;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
app/Events/Dashboard/KeuntunganNotify.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace App\Events;
namespace App\Events\Dashboard;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
app/Events/Dashboard/PetibesiNotify.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace App\Events;
namespace App\Events\Dashboard;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
app/Events/Dashboard/TebusNotify.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace App\Events;
namespace App\Events\Dashboard;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
public/js/ifvisible.js
Vendored
+26
View File
File diff suppressed because one or more lines are too long
resources/js/ifvisible.js
Vendored
+26
View File
File diff suppressed because one or more lines are too long
resources/views/homepage/penilai/home.blade.php
+125 -41
View File
@@ -167,15 +167,15 @@
</table>
</div>
<div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
<div class="float-right mb-3">
{{-- <div class="float-right mb-3">
<button class="btn btn-primary mt-4 pull-left" onclick="checkallfunc()" disabled>Check All</button>
<button class="btn btn-primary mt-4 pull-left" onclick="uncheckallfunc()" disabled>Uncheck All</button>
<input type="checkbox" id="selectallcheck" onclick="checkallfunction()"/>
</div>
</div> --}}
<table class='table table-striped table-hover' id='table-gadaian-belum-serah'>
<thead class="thead-dark">
<tr>
<th>Bil</th>
<th>Bil <input type="checkbox" id="selectallcheck" onclick="checkallfunction()"/></th>
<th>Nama</th>
<th>No KP</th>
<th>No Rujukan</th>
@@ -192,7 +192,7 @@
@php
$customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json();
@endphp
<td><input type="checkbox" id="checkgadai" autocomplete="off" data-nokp="{{ $gadaian['nokp'] }}" data-nama="{{ $customer_info['nama'] }}" data-norujukan="{{$gadaian['norujukan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-marhun="{{$gadaian['nilaimarhun']}}"></input></td>
<td><input type="checkbox" id="checkgadai" name="checkgadai" autocomplete="off" data-nokp="{{ $gadaian['nokp'] }}" data-nama="{{ $customer_info['nama'] }}" data-norujukan="{{$gadaian['norujukan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-marhun="{{$gadaian['nilaimarhun']}}"></input></td>
<td>{{ $customer_info['nama'] }}</td>
<td>{{ $gadaian['nokp'] }}</td>
<td>
@@ -218,7 +218,7 @@
</div>
<form action="{{ route('marhun.serah') }}" method="post">
@csrf
<input type="text" name="norujukanpilih" id="norujukanpilih" hidden>
<input type="text" name="norujukanpilih" id="norujukanpilih" >
<button type="submit" id="btn-serah" class='btn btn-primary' disabled>Serah Marhun</button>
</form>
</div>
@@ -259,19 +259,40 @@
</div>
<script>
var api_url = "<?php echo $api_url ?>";
var cawangan = "{{ Auth::user()->cawangan }}";
function timedRefresh(timeoutPeriod) {
setTimeout("location.reload(true);",timeoutPeriod);
}
var total_marhun_pilih = 0;
window.onload = timedRefresh(100000);
// function timedRefresh(timeoutPeriod) {
// setTimeout("console.log('refresh');fetchGadaianEverytime();",timeoutPeriod);
// fetchGadaianEverytime();
// console.log('refresh');
// }
// window.onload = timedRefresh(3000);
//Pusher
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
});
var channel = pusher.subscribe('gadai-notify');
channel.bind('trigger-gadai', function(data) {
console.log('push');
fetchGadaianEverytime();
});
var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
"ordering": true
});
var table_gadaian_belum_serah = $('#table-gadaian-belum-serah').DataTable({
"ordering": true
"order": [],
// "ordering": true,
"columnDefs": [ { orderable: false, targets: [0] }]
});
var table_rekod_gadaian = $('#table-rekod-gadaian').DataTable({
@@ -293,49 +314,66 @@
function checkallfunction(){
let totalmarhun = 0;
let checked = $('#selectallcheck').prop("checked");
let marhunpilih = $('#marhunpilih').val();
let norujukanpilih = $('#norujukanpilih').val();
if(this.checked) {
if(!table_gadaian_belum_serah.data().any())
{
$('#selectallcheck').prop('checked', false);
return false;
}
if(checked) {
// Iterate each checkbox
$(':checkbox').each(function() {
let marhun = Number($(this).data("marhun"));
totalmarhun += marhun;
this.checked = true;
if($(this).attr("name") == 'checkgadai')
{
let norujukan = $(this).data("norujukan");
if(norujukanpilih.indexOf(norujukan) === -1)
{
norujukanpilih += norujukan + ",";
console.log(norujukanpilih);
let marhun = Number($(this).data("marhun"));
totalmarhun += marhun;
// this.checked = true;
$(this).prop('checked', true);
}
}
});
$('#norujukanpilih').val(norujukanpilih);
total_marhun_pilih = totalmarhun;
$("#btn-serah").prop('disabled', false);
$('#marhunpilih').val(formatter.format(totalmarhun.toFixed(2)));
} else {
$(':checkbox').each(function() {
let marhun = Number($(this).data("marhun"));
totalmarhun -= marhun;
this.checked = false;
if($(this).attr("name") == 'checkgadai')
{
let norujukan = $(this).data("norujukan");
let sag;
sag = norujukan + ",";
norujukanpilih = norujukanpilih.replace(sag, "");
$(this).prop('checked', false);
}
});
$('#norujukanpilih').val(norujukanpilih);
$('#marhunpilih').val(0);
total_marhun_pilih = 0;
$("#btn-serah").prop('disabled', true);
}
}
function checkallfunc(){
let totalmarhun = 0;
$(':checkbox').each(function() {
let marhun = Number($(this).data("marhun"));
totalmarhun += marhun;
this.checked = true;
});
$("#btn-serah").prop('disabled', false);
$('#marhunpilih').val(formatter.format(totalmarhun.toFixed(2)));
}
function uncheckallfunc(){
let totalmarhun = 0;
$(':checkbox').each(function() {
let marhun = Number($(this).data("marhun"));
totalmarhun -= marhun;
this.checked = false;
});
$('#marhunpilih').val(0);
$("#btn-serah").prop('disabled', true);
}
function fetchRekodGadaian(){
var tarikh_rekod = $('#tarikh_rekod').val();
@@ -381,6 +419,44 @@
});
}
function fetchGadaianEverytime(){
table_gadaian_semasa.clear().draw();
$.ajax({
method:'get',
url: api_url + '/api/gadaiansemasa/' + cawangan,
success:function(data){
var count = 0;
$.each(data,function(index,gadaiansemasa){
$.ajax({
url: api_url + '/api/customers/' + gadaiansemasa['nokp'],
method:'get',
success:function(rekodcustomer){
$.ajax({
url: api_url + '/api/marhun/' + gadaiansemasa['norujukan'],
method:'get',
success:function(rekodmarhun){
count++;
table_gadaian_semasa.row.add([
count,
rekodcustomer['nama'],
gadaiansemasa['nokp'],
'<a href="#" data-toggle="modal" data-marhun=' + JSON.stringify(rekodmarhun) + ' data-pinjaman=' + gadaiansemasa['pinjaman'] + ' data-norujukan=' + gadaiansemasa['norujukan'] + ' data-hargajualan=' + gadaiansemasa['hargajualan'] + ' data-kodcaw=' + gadaiansemasa['kodcaw'] + ' data-target="#marhunModal"> ' + gadaiansemasa['norujukan'] + '</a>',
formatter.format(gadaiansemasa['pinjaman']),
formatter.format(gadaiansemasa['nilaimarhun']),
formatter.format(gadaiansemasa['berat'])
]).draw();
}
});
}
});
});
}
});
}
//modal
$('#marhunModal').on('show.bs.modal', function(event) {
var button = $(event.relatedTarget); // button yg trigger
@@ -448,7 +524,6 @@
});
});
var total_marhun_pilih = 0;
$(document).on('click', '#checkgadai', function(e) {
if ($(this).is(':checked')) {
var norujukan = $(this).data("norujukan");
@@ -467,6 +542,10 @@
$('#norujukanpilih').val(norujukanpilih);
if($('input[name=checkgadai]:checked').length == $('input[name=checkgadai]').length) {
$('#selectallcheck').prop("checked",true);
}
}else {
var norujukan = $(this).data("norujukan");
var kodcaw = $(this).data("kodcaw");
@@ -474,6 +553,7 @@
total_marhun_pilih -= Number(marhun);
$('#marhunpilih').val(total_marhun_pilih.toFixed(2));
var norujukanpilih = $('#norujukanpilih').val();
@@ -481,9 +561,13 @@
var sag;
sag = norujukan + ",";
norujukanpilih = norujukanpilih.replace('ALS201203-0001,', "");
norujukanpilih = norujukanpilih.replace(sag, "");
$('#norujukanpilih').val(norujukanpilih);
if($('input[name=checkgadai]:unchecked').length == $('input[name=checkgadai]').length) {
$('#selectallcheck').prop("checked",false);
}
}
var legchecked = $('input[id^=checkgadai]:checked').length;
if(legchecked == 0){
resources/views/khazanah/info.blade.php
+25 -8
View File
@@ -459,6 +459,10 @@
"ordering": false
});
var bayaranupah = $('#tablehistoryupah').DataTable({
"ordering": false
});
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
@@ -559,7 +563,20 @@
function checkAGH()
{
$('AGHModalEdit').hide();
$('#AGHModalEdit').modal('hide');
var daerahagh = $('#daerahagh').val();
if(daerahagh == 'No-Data')
{
$('#errordaerah').addClass('visible');
$('#errordaerah').removeClass('invisible');
return false;
}else{
$('#errordaerah').addClass('invisible');
$('#errordaerah').removeClass('visible');
return true;
}
}
function checktuntutbaki(e)
@@ -624,7 +641,7 @@
}else{
$.ajax({
method:'get',
url:'{{ route("gadai.history") }}',
url:'{{ route("gadai.history.khazanah") }}',
data:{ "norujukan" : histid},
success:function(data)
{
@@ -874,7 +891,7 @@
historybayarandatatable.clear().draw();
$.each(data,function(index,bayaran){
var urlroute = '{{ route("resit.ansuran", ":id") }}';
var urlroute = '{{ route("resit.khazanah.ansuran", ":id") }}';
urlroute = urlroute.replace(':id', bayaran['id']);
historybayarandatatable.row.add([
counter,
@@ -899,28 +916,28 @@
switch(tebusaz['jenistebus']) {
case 'P':
var urlroute = '{{ route("resit.tambahpinjam", ":id") }}';
var urlroute = '{{ route("resit.khazanah.tambahpinjam", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
case 'T':
if(tebusaz['hargajualan'] === '')
{
var urlroute = '{{ route("resit.belumtebus", ":id") }}';
var urlroute = '{{ route("resit.khazanah.belumtebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}else{
var urlroute = '{{ route("resit.tebus", ":id") }}';
var urlroute = '{{ route("resit.khazanah.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}
break;
case 'A':
var urlroute = '{{ route("resit.belumansurans", ":id") }}';
var urlroute = '{{ route("resit.khazanah.belumansurans", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
case 'S':
var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
var urlroute = '{{ route("resit.khazanah.tebusseparuh", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
}
resources/views/khazanah/laporan/pendahuluanserahan.blade.php
+8 -6
View File
@@ -102,14 +102,16 @@
<br><br>
<div class="row">
<div class="btn-group-toggle col-md-12 col-sm-12 mb-4 radiostyle" data-toggle="buttons">
<label class="btn btn-lg radio-yellow">
<div class="col-md-12 col-sm-12 mb-4">
<input autocomplete="off" type="radio" name="radpendser" id="option1" value="pendahuluan" autocomplete="off" checked>
<span>Pendahuluan</span>
</label>
<label class="btn btn-lg radio-green">
<input autocomplete="off" type="radio" name="radpendser" id="option2" value="serahan" autocomplete="off"><span>Serahan</span>
</label>
<input autocomplete="off" type="radio" name="radpendser" id="option2" value="serahan" autocomplete="off">
<span>Serahan</span>
<input autocomplete="off" type="radio" name="radpendser" id="option3" value="Online" autocomplete="off">
<span>Serahan-Online</span>
</div>
</div>
resources/views/modal/agh.blade.php
+5 -4
View File
@@ -17,7 +17,7 @@
<div class="col-12 row">
<div class="col-5"><label class="mt-1">Jenis Alasan :</label></div>
<div class="col-7">
<select name="alasan" id="alasan" class="form-control">
<select name="alasan" id="alasan" class="form-control" required>
<option value="Simpanan">Simpanan</option>
<option value="Bencana alam">Bencana alam</option>
<option value="Kecurian">Kecurian</option>
@@ -31,7 +31,7 @@
<div class="col-12 row mt-2">
<div class="col-5"><label class="mt-1">Negeri :</label></div>
<div class="col-7">
<select name="negeriagh" id="negeriagh" class="form-control">
<select name="negeriagh" id="negeriagh" class="form-control" required>
@foreach($negeri as $neg)
<option value="{{ $neg['kodnegeri'] }}">{{ $neg['negeri'] }}</option>
@endforeach
@@ -43,10 +43,11 @@
<div class="col-12 row mt-2">
<div class="col-5"><label class="mt-1">Daerah :</label></div>
<div class="col-7">
<select name="daerahagh" id="daerahagh" class="form-control" disabled>
<option value="No Data">Sila Pilih Negeri *</option>
<select name="daerahagh" id="daerahagh" class="form-control" disabled required>
<option value="No-Data">Sila Pilih Daerah *</option>
</select>
</div>
<span id="errordaerah" class="invisible text-red text-center mx-auto text-bold pt-2">Sila pilih daerah dalam kotak disediakan*</span>
</div>
</div>
resources/views/print/laporan_ringkasanharian.blade.php
+13 -14
View File
@@ -158,18 +158,17 @@
</div>
<div class="row">
<div class="col-12">
<table class="table text-center" style="font-size:14px;">
<table class="table text-center" style="font-size:15px;">
<thead>
<tr>
<th></th>
<th></th>
<th>Pembiayaan (RM)</th>
<th>Pinjaman (RM)</th>
<th>Ansuran Pemb. (RM)</th>
<th>NM Pemb. (RM)</th>
<th>NM Pinj. (RM)</th>
<th>Bil Pemb.</th>
<th>Bil Pinj.</th>
<th class="text-uppercase">Pembiayaan (RM)</th>
<th class="text-uppercase">Pinjaman (RM)</th>
<th class="text-uppercase">Ansuran Pemb. (RM)</th>
<th class="text-uppercase">NM Pemb. (RM)</th>
<th class="text-uppercase">Bil Pemb.</th>
<th class="text-uppercase">Bil Pinj.</th>
</tr>
</thead>
<tbody>
@@ -179,8 +178,7 @@
<td>{{ number_format($laporan['rekodpemb'],2) }}</td>
<td>{{ number_format($laporan['rekodpinj'],2) }} </td>
<td>{{ number_format($laporan['bayaranpend'],2) }} </td>
<td>{{ number_format($laporan['rekodpembnm'],2) }}</td>
<td>{{ number_format($laporan['rekodpinjnm'],2) }}</td>
<td>{{ number_format(($laporan['rekodpembnm'] + $laporan['rekodpinjnm']),2) }}</td>
<td>{{ number_format($laporan['rekodpembbil'],0) }}</td>
<td>{{ number_format($laporan['rekodpinjbil'],0) }}</td>
</tr>
@@ -192,7 +190,6 @@
<td></td>
<td>{{ number_format($laporan['stokauditnilaimarhun'],2) }} </td>
<td> </td>
<td> </td>
<td>{{ number_format($laporan['stokauditcount']) }}</td>
</tr>
<tr class="d-none">
@@ -203,7 +200,6 @@
<td>{{ number_format($totalbilkawalanstok,0) }}</td>
<td> Not Applicable </td>
<td> Not Applicable </td>
<td> Not Applicable </td>
</tr>
</tbody>
</table>
@@ -215,9 +211,12 @@
<div class="row pl-4 pr-4 pb-4">
<div class="col-12 box">
<div class="row form-group">
<div class="col-12">
<div class="col-6">
<p><b>F) LELONG</b></p>
</div>
<div class="col-6">
<p><b>G) BAYARAN LELONG</b></p>
</div>
<div class="col-4">1. LELONG HARI INI</div>
<div class="col-4">{{ 'RM '. number_format($laporan['jumlah_lelong'],2) }}</div>
<div class="col-4"></div>
@@ -252,7 +251,7 @@
<div class="col-12 box">
<div class="row">
<div class="col-12">
<p><b>G) PERATUSAN PEMBIAYAAN</b></p>
<p><b>H) PERATUSAN PEMBIAYAAN</b></p>
</div>
</div>
<div class="row">
resources/views/print/laporan_stokaudit.blade.php
+1 -1
View File
@@ -214,7 +214,7 @@
<tr>
<td>{{ $counter }}</td>
<td>{{$item['norujukan']}}</td>
<td>{{ $item['jbg'] }}</td>
<td>{{ $item['tempoh'] }}</td>
<td>{{$item['nokp']}}</td>
<td>{{ number_format($item['berat'],2) }}</td>
<td>{{ number_format($item['nilaimarhun'],2) }}</td>
routes/web.php
+21 -3
View File
@@ -25,9 +25,12 @@ Route::get('test', function () {
// event(new App\Events\StatusLiked('KOK LANAS','KOK KELI'));
// return "Event has been try je sent!";
$actionId = 'score_update';
$actionData = array('team1_score' => 46);
event(new App\Events\ActionEvent($actionId, $actionData));
event(new App\Events\Dashboard\GadaiNotify('lulus','KB2'));
// $actionId = 'score_update';
// $actionData = array('team1_score' => 46);
// event(new App\Events\ActionEvent($actionId, $actionData));
// event(new App\Events\ActionEvent('1234','test'));
@@ -241,6 +244,21 @@ Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'Gadai
Route::get('/resit/tuntutbaki/{id}',['as'=>'resit.tuntutbaki','uses'=>'LelongController@resittuntutbaki'])->middleware('auth','teller');
Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'GadaianController@resitautotawarruq'])->middleware('auth','teller');
Route::group(['middleware' => ['khazanah']], function() {
Route::get('/khazanah/resit/{id}',['as'=>'resit.khazanah.ansuran','uses'=>'GadaianController@resit']);
Route::get('/khazanah/resitansurans/{id}',['as'=>'resit.khazanah.ansurans','uses'=>'GadaianController@resitansurans']);
Route::get('/khazanah/resitbelumansurans/{id}',['as'=>'resit.khazanah.belumansurans','uses'=>'GadaianController@resitbelumansurans']);
Route::get('/khazanah/resit/tebus/{id}',['as'=>'resit.khazanah.tebus','uses'=>'GadaianController@resittebus']);
Route::get('/khazanah/resit/advansur/{id}',['as'=>'resit.khazanah.advansur','uses'=>'GadaianController@resitadvansur']);
Route::get('/khazanah/resit/tebusseparuh/{id}',['as'=>'resit.khazanah.tebusseparuh','uses'=>'GadaianController@resittebusseparuh']);
Route::get('/khazanah/resit/belumtebus/{id}',['as'=>'resit.khazanah.belumtebus','uses'=>'GadaianController@resitbelumtebus']);
Route::get('/khazanah/resit/tambahpinjam/{id}',['as'=>'resit.khazanah.tambahpinjam','uses'=>'GadaianController@resittambahpinjam']);
Route::get('/khazanah/resit/tuntutbaki/{id}',['as'=>'resit.khazanah.tuntutbaki','uses'=>'LelongController@resittuntutbaki']);
Route::get('/khazanah/resit/tebusautotawarruq/{id}',['as'=>'resit.khazanah.autotawarruq','uses'=>'GadaianController@resitautotawarruq']);
});
Route::post('/barcodescanned',['as'=>'barcode.scanned','uses'=>'KhazanahController@barcodescanned'])->middleware('auth','khazanah');