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

fix skit2

Browse Source
This commit is contained in:
hafifierahman
2021-09-27 22:14:29 +08:00
parent f7d2430246
commit 2e41e124e4
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+10 -6
View File
@@ -2837,7 +2837,7 @@ class KhazanahController extends Controller
foreach($gadai as $index1=>$gad)
$customers = Http::get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
$kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
// $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
$polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
@@ -2852,10 +2852,12 @@ class KhazanahController extends Controller
'kodcaw' =>$auth_user['cawangan'],
'norujukan' => $request->norujukanhidden,
'komen1' => $request->alasan,
'komen2' => $kodnegeridandaerah,
'komen2' => 'Surat Dijana',
'tebus' => 0,
'teller' => $auth_user['name'],
'caj' => 0.00
'caj' => 0.00,
'kodnegeri' => $request->negeriagh,
'koddaerah' => $request->daerahagh
]);
@@ -2892,7 +2894,7 @@ class KhazanahController extends Controller
foreach($gadai as $index1=>$gad)
$customers = Http::get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
$kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
// $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
$polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
@@ -2903,8 +2905,10 @@ class KhazanahController extends Controller
'kodcaw' =>$auth_user['cawangan'],
'norujukan' => $request->norujukanhidden,
'komen1' => $request->alasan,
'komen2' => $kodnegeridandaerah,
'teller' => $auth_user['name']
'komen2' => 'Surat dikemaskini',
'teller' => $auth_user['name'],
'kodnegeri' => $request->negeriagh,
'koddaerah' => $request->daerahagh
]);
resources/views/khazanah/info.blade.php
+6 -3
View File
@@ -693,10 +693,13 @@
function ulangcetakagh(e)
{
var komen2 = $(e).data('komen2');
var kodnegeri = $(e).data('kodnegeri');
var koddaerah = $(e).data('koddaerah');
var noruj = $(e).data('histid');
if(komen2 !== null)
console.log(kodnegeri);
if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '')
{
if($("input[name='options']:checked").val() == 'belum_tebus'){
let histid = $('input[name="belum"]:checked').val();
@@ -751,7 +754,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" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-komen2="' + data[0].komen2 + '">' + 'Ulang Cetak' + '</button>',
'<button type="button" role="button" tabindex="0" class="btn btn-primary" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-koddaerah="' + data[0].koddaerah + '" data-kodnegeri="' + data[0].kodnegeri + '">' + 'Ulang Cetak' + '</button>',
icon: 'error',
title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
});
resources/views/khazanah/kelulusan.blade.php
+10 -2
View File
@@ -304,13 +304,21 @@
const { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen!',
input: 'text',
inputPlaceholder: 'Komen',
// input: 'checkbox',
// inputPlaceholder: 'Komen',
input: 'radio',
inputOptions: {
'#ff0000': 'Red',
'#00ff00': 'Green',
'#0000ff': 'Blue'
},
confirmButtonText: 'Hantar',
showCancelButton:false,
allowOutsideClick: false
})
return 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();
resources/views/print/suratgadaianhilang.blade.php
+2 -1
View File
@@ -82,7 +82,8 @@
<td style="text-align: right;">........................................................</td>
</tr>
@php
list($negeriagh, $daerahagh) = explode('|', $polis[0]['komen2']);
$negeriagh = $polis[0]['kodnegeri'];
$daerahagh = $polis[0]['koddaerah'];
$negeri = Http::get($api_url . '/api/negeri/' . $negeriagh)->json();
$daerah = Http::get($api_url . '/api/daerah/' . $daerahagh)->json();