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

Merge branch 'new-pipi' into 'new-super'

Browse Source 
New pipi

See merge request online-sistem1/kaunter!149
This commit is contained in:
hafifie rahman
2021-07-15 05:15:27 +00:00
parent c476811955 3f9ca92dde
commit 66314e5842
18 changed files with 297 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Events/NotifikasiKelulusan.php
+3 -2
View File
@@ -11,14 +11,15 @@ class NotifikasiKelulusan implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $norujukan,$kelulusan,$siri,$komen;
public $norujukan,$kelulusan,$siri,$komen,$teller;
public function __construct($norujukan,$kelulusan,$siri,$komen)
public function __construct($norujukan,$kelulusan,$siri,$komen,$teller)
{
$this->norujukan = $norujukan;
$this->kelulusan = $kelulusan;
$this->siri = $siri;
$this->komen = $komen;
$this->teller = $teller;
}
public function broadcastOn()
app/Events/NotifikasiUbahHapus.php
+3 -2
View File
@@ -11,13 +11,14 @@ class NotifikasiUbahHapus implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $norujukan,$kelulusan,$komen;
public $norujukan,$kelulusan,$komen,$teller;
public function __construct($norujukan,$kelulusan,$komen)
public function __construct($norujukan,$kelulusan,$komen,$teller)
{
$this->norujukan = $norujukan;
$this->kelulusan = $kelulusan;
$this->komen = $komen;
$this->teller = $teller;
}
public function broadcastOn()
app/Events/OperasiNotice.php
+1 -1
View File
@@ -11,7 +11,7 @@ class OperasiNotice implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $cawangan,$namateller;
public $cawangan,$namakhazanah;
public function __construct($cawangan,$namakhazanah)
{
app/Http/Controllers/AliranTunaiController.php
+15 -1
View File
@@ -349,6 +349,16 @@ class AliranTunaiController extends Controller
$tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] . '/teller/',['teller' => Auth::user()->name])->json();
$advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
$lelong = Http::get(config('api.url').'/api/lelong/harini/'.$auth_user['cawangan'])->json();
$lelongan = 0;
if(strtoupper($Auth::user()->name) === 'LELONG')
{
$lelongan = floatval($lelong);
}else{
$lelongan = 0;
}
$totalserahan = 0;
$totalpendahuluan = 0;
foreach($addtunai as $index1=>$at)
@@ -435,7 +445,11 @@ class AliranTunaiController extends Controller
$penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
$gadaian = floatval($totalgadai);
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
if(strtoupper($Auth::user()->name) === 'LELONG'){
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
}else{
$bakisemasa = $lelongan;
}
$errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;
app/Http/Controllers/KhazanahController.php
+69 -14
View File
@@ -559,6 +559,7 @@ class KhazanahController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$getlulus = Http::get(config('api.url') . '/api/GetLulus/'. $auth_user['cawangan'],['norujukan' => $norujukan])->json();
if($request->khazanah != null)
{
@@ -572,7 +573,7 @@ class KhazanahController extends Controller
if($updatelulus)
{
event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus));
event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$request->teller));
}
}else{
@@ -582,7 +583,7 @@ class KhazanahController extends Controller
if($updatelulus)
{
event(new NotifikasiUbahHapus($norujukan,"lulus","tiada"));
event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$request->teller));
}
}
}
@@ -595,24 +596,28 @@ class KhazanahController extends Controller
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "khazanah",
"namakhazanah" => $request->namakhazanah,
'siri' => $request->siri
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$request->teller));
}
}else{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "khazanah",
'siri' => $request->siri,
"namakhazanah" => $request->namakhazanah,
"pembatalan" => "batal"
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller));
}
}
@@ -629,6 +634,7 @@ class KhazanahController extends Controller
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "operasi",
'siri' => $request->siri,
'namaoperasi' => $request->namaoperasi
])->json();
}else{
@@ -636,10 +642,11 @@ class KhazanahController extends Controller
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "operasi",
'siri' => $request->siri,
"pembatalan" => "batal"
"pembatalan" => "batal",
'namaoperasi' => $request->namaoperasi
])->json();
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller));
}
@@ -2535,7 +2542,7 @@ class KhazanahController extends Controller
//array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
if($keuntungan > 0) array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
if($bayaranpendahuluan > 0) array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/240','descpt' => 'Rebet 1','amaun' => ($rebet * -1)]);
if($imbangduga['serahan'] > 0) array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
@@ -2555,14 +2562,14 @@ class KhazanahController extends Controller
if($keuntungan > 0) array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
if($keuntungansebenar > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet 2','amaun' => ($rebet * -1)]);
if($imbangduga['pendahuluan'] > 0) array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]);
if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'Panjar - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'Panjar - Belanja AM','amaun' => -$panjar['perubatan']]);
if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'Panjar - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
if($bakilelong['bakilelong'] != 0) array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'Wang Tak Dituntut','amaun' => $wtd]);
if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
@@ -2572,7 +2579,7 @@ class KhazanahController extends Controller
if($rugilelongxtra != 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]);
if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
$totaltanggungansemasa = 0;
foreach($tanggungansemasa as $index => $ts)
@@ -2581,7 +2588,7 @@ class KhazanahController extends Controller
}
$untungrugifield = [];
array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]);
array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan Sebenar', 'amaun' => $untungrugi]);
$totaluntungrugi = 0;
@@ -2863,6 +2870,54 @@ class KhazanahController extends Controller
return response($daftarpolis);
}
public function SuratAkuanGadaianUpdate(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$gadai = Http::get(config('api.url').'/api/gadai/norujukan/'.$request->norujukanhidden)->json();
foreach($gadai as $index1=>$gad)
$customers = Http::get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
$kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
$polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
$daftar = 0;
$daftarpolis = Http::put(config('api.url').'/api/polis/edit/',[
'kodcaw' =>$auth_user['cawangan'],
'norujukan' => $request->norujukanhidden,
'komen1' => $request->alasan,
'komen2' => $kodnegeridandaerah,
'teller' => $auth_user['name']
]);
$daftar = $daftarpolis->getStatusCode();
if($daftar == 200)
{
$polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
event(new NotifikasiAGH($auth_user['cawangan'],'Surat Akuan Gadaian Hilang berjaya dijana.','success',$auth_user['name']));
// return redirect()->route('khazanah.customer_info')->with('aghinformation','Surat Akuan Gadaian Hilang berjaya dijana.|success');
return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
}else{
event(new NotifikasiAGH($auth_user['cawangan'],'Mengalami masalah dalam menjana.','error',$auth_user['name']));
// return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
}
return response($daftar);
}
public function ulangcetakSuratAkuanGadaianHilang($norujukan)
{
$auth_user = Auth::user();
app/Http/Controllers/OperasiController.php
+4 -2
View File
@@ -88,24 +88,26 @@ class OperasiController extends Controller
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$request->teller));
}
}
else
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 2,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller));
}
}
resources/views/customers/info.blade.php
+10 -5
View File
@@ -564,7 +564,7 @@
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -1206,10 +1206,12 @@
encrypted: true
});
let teller = "{{ Auth::user()->name }}";
var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) {
if(data.norujukan == norujukan)
if(data.norujukan == norujukan && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -1419,10 +1421,12 @@
encrypted: true
});
let teller = "{{ Auth::user()->name }}";
var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) {
if(data.norujukan == ubahid)
if(data.norujukan == ubahid && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -1568,6 +1572,8 @@
}
});
let teller = "{{ Auth::user()->name }}";
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
@@ -1576,7 +1582,7 @@
var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) {
if(data.norujukan == id)
if(data.norujukan == id && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -1586,7 +1592,6 @@
title: 'Telah Disahkan'
}).then(function(){
let teller = "{{ Auth::user()->name }}";
if($("input[name='options']:checked").val() == 'belum_tebus'){
$.ajax({
resources/views/gadaian/edit.blade.php
+2 -2
View File
@@ -924,7 +924,7 @@
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -1031,7 +1031,7 @@
// console.log(message);
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
resources/views/gadaian/index.blade.php
+2 -5
View File
@@ -841,9 +841,8 @@
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -959,9 +958,7 @@
channel.bind('my-kelulusan', function(data) {
// let message = JSON.stringify(data);
// console.log(message);
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
resources/views/khazanah/info.blade.php
+54 -15
View File
@@ -556,7 +556,7 @@
function checkAGH()
{
$('AGHModalEdit').hide();
}
function checktuntutbaki(e)
@@ -688,23 +688,35 @@
}
}
function ulangcetakagh()
function ulangcetakagh(e)
{
if($("input[name='options']:checked").val() == 'belum_tebus'){
var komen2 = $(e).data('komen2');
var noruj = $(e).data('histid');
if(komen2 !== null)
{
if($("input[name='options']:checked").val() == 'belum_tebus'){
let histid = $('input[name="belum"]:checked').val();
if(histid == null){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Sila pilih salah satu SAG'
});
}else{
let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
urlroute = urlroute.replace(':id', histid);
window.open(urlroute, '_blank');
swal.close();
if(histid == null){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Sila pilih salah satu SAG'
});
}else{
let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
urlroute = urlroute.replace(':id', histid);
window.open(urlroute, '_blank');
swal.close();
}
}
}else{
$('#AGHModalEdit').modal('show');
$('#norujukanhiddenedit').val(noruj);
swal.close();
}
return;
}
function saghilangfunc()
@@ -724,6 +736,7 @@
data:{ "norujukan" : histid,"kodcaw" : kodcaw},
success:function(data)
{
var count = Object.keys(data).length;
if(count > 0)
@@ -735,7 +748,7 @@
showConfirmButton: false,
html: "<br>" +
'<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
'<button type="button" role="button" tabindex="0" class="btn btn-primary" onclick="ulangcetakagh()">' + 'Ulang Cetak' + '</button>',
'<button type="button" role="button" tabindex="0" class="btn btn-primary" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-komen2="' + data[0].komen2 + '">' + 'Ulang Cetak' + '</button>',
icon: 'error',
title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
});
@@ -791,6 +804,24 @@
});
$('#negeriaghedit').change(function(){
var daerahselect = document.getElementById("daerahaghedit");
$('#daerahaghedit').attr('disabled', false);
$(daerahagh).empty();
$.ajax({
method:'get',
url: api_url + '/api/daerahkodnegeri/' + this.value,
success:function(data){
$.each(data, function( index, daerah ){
addOptionEdit(daerah.koddaerah,daerah.namadaerah);
});
}
});
});
function addOption(textopt,valueopt) {
optionText = textopt;
@@ -799,6 +830,14 @@
$('#daerahagh').append(`<option value='${optionText}'>${optionValue}</option>`);
}
function addOptionEdit(textopt,valueopt) {
optionText = textopt;
optionValue = valueopt;
$('#daerahaghedit').append(`<option value='${optionText}'>${optionValue}</option>`);
}
function rekodasal(gadaian){
resources/views/khazanah/kelulusan.blade.php
+27 -5
View File
@@ -264,7 +264,7 @@
async function updatelulus(e)
{
let api = "{{ config('api.url') }}";
let kodcaw = " {{ Auth::user()->cawangan }}";
let kodcaw = "{{ Auth::user()->cawangan }}";
const { value: katalaluan } = await Swal.fire({
title: 'Masukkan Katalaluan Semula',
@@ -311,6 +311,7 @@
allowOutsideClick: false
})
let teller = $(e).closest('tr').children('td:eq(1)').text();
let nm = $(e).closest('tr').children('td:eq(4)').text();
let ber = $(e).closest('tr').children('td:eq(5)').text();
let marg = $(e).closest('tr').children('td:eq(6)').text();
@@ -320,6 +321,9 @@
let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus');
let siri = $(e).data('siri');
let namakhazanah = "{{ Auth::user()->name }}";
teller = String(teller);
$.ajax({
method:'put',
@@ -329,7 +333,9 @@
"norujukan" : norujukan,
"pelulus" : pelulus,
"siri" : siri,
'komen' : komen
'komen' : komen,
'namakhazanah' : namakhazanah,
'teller' : teller
},
success:function(data){
Swal.fire({
@@ -394,9 +400,13 @@
allowOutsideClick: false
})
let teller = $(e).closest('tr').children('td:eq(1)').text();
let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus');
let siri = $(e).data('siri');
let namakhazanah = "{{ Auth::user()->name }}";
teller = String(teller);
$.ajax({
method:'put',
@@ -407,7 +417,10 @@
"pelulus" : pelulus,
"siri" : siri,
"komenkelulusan" : komenkelulusan,
"pembatalan" : "batal"
"pembatalan" : "batal",
'namakhazanah' : namakhazanah,
'teller' : teller
},
success:function(data){
Swal.fire({
@@ -467,15 +480,19 @@
let norujukan = $(e).data('norujukan');
let teller = $(e).closest('tr').children('td:eq(1)').text();
let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
teller = String(teller);
$.ajax({
method:'put',
url: "{{ route('khazanah.updatekelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"khazanah" : namakhazanah
"khazanah" : namakhazanah,
'teller' : teller
},
success:function(data){
@@ -543,6 +560,9 @@
let norujukan = $(e).data('norujukan');
let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
let teller = $(e).closest('tr').children('td:eq(1)').text();
teller = String(teller);
$.ajax({
method:'put',
@@ -552,7 +572,9 @@
"norujukan" : norujukan,
"khazanah" : namakhazanah,
"komenubahhapus" : komenkelulusan,
"batal" : 'batal'
"batal" : 'batal',
'teller' : teller
},
success:function(data){
resources/views/khazanah/laporan/datalejer_am.blade.php
-2
View File
@@ -26,8 +26,6 @@
@csrf
<div class="row">
<div class="col-sm-2">Mula</div>
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" autocomplete="off" aria-describedby="basic-addon1"></div>
</div>
resources/views/lelongan/index.blade.php
+3 -1
View File
@@ -307,11 +307,13 @@
encrypted: true
});
let teller = "{{ Auth::user()->name }}";
var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) {
if(data.norujukan == norujukan)
if(data.norujukan == norujukan && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
resources/views/modal/agh.blade.php
+65
View File
@@ -63,4 +63,69 @@
</div>
<!-- Modal HistoryBayaran -->
<div class="modal fade" id="AGHModalEdit" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title text-center" id="ModalTitle">Surat Akuan Gadaian Hilang</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="container">
<form name="frmagh" target="_blank" action="{{ route('agh.update') }}" onsubmit="return checkAGH();" method="POST">
@csrf
<input type="hidden" name="norujukanhidden" id="norujukanhiddenedit"/>
<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="alasanedit" class="form-control">
<option value="Simpanan">Simpanan</option>
<option value="Bencana alam">Bencana alam</option>
<option value="Kecurian">Kecurian</option>
<option value="Di Ragut">Di Ragut</option>
<option value="Kes Polis">Kes Polis</option>
<option value="Hilang">Hilang</option>
</select>
</div>
</div>
<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="negeriaghedit" class="form-control">
@foreach($negeri as $neg)
<option value="{{ $neg['kodnegeri'] }}">{{ $neg['negeri'] }}</option>
@endforeach
</select>
</div>
</div>
<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="daerahaghedit" class="form-control" disabled>
<option value="No Data">Sila Pilih Negeri *</option>
</select>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
<button type="submit" class="btn btn-success">Hantar</button>
</div>
</form>
</div>
</div>
</div>
resources/views/operasi/kelulusan.blade.php
+16 -2
View File
@@ -313,7 +313,14 @@
let norujukan = $(e).data('norujukan');
let cawangankod = $(e).data('kodcaw');
let siri = $(e).data('siri');
let namaoperasi = "{{ Auth::user()->name }}";
let teller = $(e).closest('tr').children('td:eq(1)').text();
teller = String(teller);
console.log(teller);
return;
$.ajax({
method:'put',
url: "{{ route('operasi.updatekelulusan') }}",
@@ -322,7 +329,8 @@
"norujukan" : norujukan,
"kodcaw" : cawangankod,
"komenkelulusan" : komenkelulusan,
"siri" : siri
"siri" : siri,
'namaoperasi' : namaoperasi
},
success:function(data){
console.log(data);
@@ -391,6 +399,10 @@
let norujukan = $(e).data('norujukan');
let siri = $(e).data('siri');
let cawangankod = $(e).data('kodcaw');
let namaoperasi = "{{ Auth::user()->name }}";
let teller = $(e).closest('tr').children('td:eq(1)').text();
teller = String(teller);
$.ajax({
method:'put',
@@ -401,7 +413,9 @@
"siri" : siri,
"kodcaw" : cawangankod,
"komenkelulusan" : komenkelulusan,
"pembatalan" : "batal"
"pembatalan" : "batal",
'namaoperasi' : namaoperasi,
'teller' : teller
},
success:function(data){
Swal.fire({
resources/views/penebusan/index.blade.php
+13 -9
View File
@@ -1294,9 +1294,9 @@
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
console.log(data);
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -1424,7 +1424,7 @@
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -1570,7 +1570,7 @@
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -1698,7 +1698,7 @@
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -1914,7 +1914,7 @@
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -2042,7 +2042,7 @@
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -2429,7 +2429,11 @@
{
let wakil = $('#wakiltxt').val();
if(wakil.length == 12)
var patternregex = /\s+|[-,\/]/g;
wakil = wakil.replace(patternregex,"").toUpperCase();
if(wakil.length <= 12)
{
$.ajax({
method:'GET',
@@ -2477,7 +2481,7 @@
{
Swal.fire({
icon: 'error',
titleText: 'Kad Pengenalan',
titleText: 'Kad Pengenalan dan Passport',
text: 'mestilah tidak melebihi dan kurang daripada 12 patah perkataan'
});
}
resources/views/print/laporan_penebusan.blade.php
+9 -7
View File
@@ -207,21 +207,21 @@
<th width="6%;">Bayaran(RM)</th>
<th width="6%;">Jumlah(RM)</th>
</tr>
@php $counter = 1; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
@php $counter = 1;$totalnm = 0; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
@foreach($tebus as $index=>$item)
@php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah'];@endphp
@php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah']; $totalnm += $item['nilaimarhun'];@endphp
@if($index > 0)
@if($item['teller'] != $tebus[$index - 1]['teller'])
<tr>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
@php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
@endif
@else
<tr>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
@php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
@endif
<tr>
<td>{{ $counter }}</td>
@@ -246,13 +246,13 @@
<td>@php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
</tr>
@php $counter++; @endphp
@php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
@php $totalnmteller += $item['nilaimarhun']; $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
@php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
@if($index+1 < sizeof($tebus))
@if($item['teller'] != $tebus[$index + 1]['teller'])
<tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td></td>
<td><b>{{ number_format($totalnmteller,2) }} </b></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
@@ -263,7 +263,7 @@
@else
<tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td></td>
<td><b>{{ number_format($totalnmteller,2) }}</b></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
@@ -277,12 +277,14 @@
<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
<tr>
<th colspan="9"></th>
<th style="text-align:center;">Nilai Marhun (RM)</th>
<th style="text-align:center;">Pembiayaan (RM)</th>
<th style="text-align:center;">Upah/Keuntungan (RM)</th>
<th style="text-align:center;">Jumlah (RM)</th>
</tr>
<tr>
<td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ number_format($totalnm,2) }}</td>
<td>{{ number_format($totalpinjaman,2) }}</td>
<td>{{ number_format($totalupah,2) }}</td>
<td>{{ number_format($totalbayaran,2) }}</td>
routes/web.php
+1
View File
@@ -249,6 +249,7 @@ Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController
Route::get('/komoditi/rekod/print',['as'=>'komoditi.rekod.print','uses'=>'KomuditiController@printRekodTransaksi']);
Route::post('/khazanah/suratakuangadaian',['as'=>'agh.create','uses'=>'KhazanahController@SuratAkuanGadaian'])->middleware('auth','khazanah');
Route::post('/khazanah/suratakuangadaianedit',['as'=>'agh.update','uses'=>'KhazanahController@SuratAkuanGadaianUpdate'])->middleware('auth','khazanah');
Route::get('/khazanah/ulangcetakagh/{norujukan}',['as'=>'agh.ulangcetak','uses'=>'KhazanahController@ulangcetakSuratAkuanGadaianHilang'])->middleware('auth','khazanah');
Route::get('/laporan/stokauditbersih', ['as'=>'laporan.stokauditbersih', 'uses'=>'KhazanahController@stokAuditBersih'])->middleware('auth','khazanah');