From 18cb578ba211a7d9ebf465b0f0e46ca2a4383ca5 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 13 Apr 2022 10:59:43 +0800 Subject: [PATCH 1/9] fix skit2 --- .../views/homepage/khazanah/home.blade.php | 2 +- .../views/khazanah/permohonanwang.blade.php | 77 +------------------ resources/views/modal/CITModal.blade.php | 51 ++++++++++++ routes/web.php | 2 + 4 files changed, 56 insertions(+), 76 deletions(-) create mode 100644 resources/views/modal/CITModal.blade.php diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index 01d2769..67d64d5 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -180,7 +180,7 @@ Unjuran
- Permohonan + Permohonan
diff --git a/resources/views/khazanah/permohonanwang.blade.php b/resources/views/khazanah/permohonanwang.blade.php index 573d5c0..8228604 100644 --- a/resources/views/khazanah/permohonanwang.blade.php +++ b/resources/views/khazanah/permohonanwang.blade.php @@ -1,6 +1,7 @@ @extends('layouts.app') @section('content') @include('modal.permohonanwang') +@include('modal.CITModal')
@@ -73,7 +74,7 @@ echo ''; }else if(($mohon['tagcit'] === 0 && $mohon['jenismohon'] === 'bayaranbalik')) { - echo ''; + echo ''; } else{ echo 'DALAM PROSES'; @@ -188,79 +189,5 @@ }); }); - $(document).on('click', '#btncit', function(e) { - - let mid = $(this).data("mohonid"); - - var bank = @php echo json_encode($bank) @endphp; - var options = {}; - $.map(bank, - function(o) { - options[o.abbreviation] = o.name; - }); - - Swal.fire({ - title: 'BANK CIT', - text: 'Sila Pilih Bank', - input: 'select', - inputOptions: options, - showCancelButton: true, - animation: 'slide-from-top', - inputPlaceholder: 'Sila Pilih Bank', - allowOutsideClick: false, - preConfirm: (value) => { - if(!value){ - Swal.showValidationMessage( - `Pilih Bank yang dinyatakan` - ); - } - } - }).then(function (result) { - if (result) { - if (result.isConfirmed) { - - let cit = result.value; - - Swal.fire({ - title: 'Masukkan No Resit', - input: 'text', - animation: 'slide-from-top', - inputPlaceholder: 'No Resit', - allowOutsideClick: false, - preConfirm: (value) => { - if(!value){ - Swal.showValidationMessage( - `Masukkan No Resit Di dalam kotak disediakan` - ); - } - } - }).then(function (response) { - if(response){ - $.ajax({ - method:"put", - url: api_url + '/admin/permohonan/tagcit', - data: { - "mohonid" : mid, - "bank" : cit, - "resitcit" : response.value - }, - success:function(data) - { - if(data === 1) - Swal.fire('Diterima!', '', 'success') - } - }); - } - - - }); - }else{ - - } - - } - }); - }); - @endsection diff --git a/resources/views/modal/CITModal.blade.php b/resources/views/modal/CITModal.blade.php new file mode 100644 index 0000000..f8c34aa --- /dev/null +++ b/resources/views/modal/CITModal.blade.php @@ -0,0 +1,51 @@ + + + + + diff --git a/routes/web.php b/routes/web.php index 395b8bd..3b37090 100644 --- a/routes/web.php +++ b/routes/web.php @@ -141,6 +141,8 @@ Route::get('/permohonan',['as'=>'permohonan.index','uses' => 'KhazanahController Route::get('/permohonan/rekod',['as'=>'permohonan.rekod','uses' => 'KhazanahController@RekodPermohonan'])->middleware('auth','khazanah'); Route::post('/permohonan/simpan',['as'=>'permohonan.simpan','uses' => 'KhazanahController@SimpanPermohonan'])->middleware('auth','khazanah'); Route::get('/permohonan/status/{mohonid}',['as'=>'permohonan.status','uses' => 'KhazanahController@StatusPermohonan'])->middleware('auth','khazanah'); +Route::get('/permohonan/cit/{mohonid}',['as'=>'permohonan.cit','uses' => 'KhazanahController@CITPermohonan'])->middleware('auth','khazanah'); + Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah'); Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']); From 54c83c70229e528f39d3ce7cdc15c1bfec53396f Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 14 Apr 2022 11:26:54 +0800 Subject: [PATCH 2/9] fix permohonan --- app/Http/Controllers/KhazanahController.php | 44 ++++++++++++++ .../views/khazanah/permohonanwang.blade.php | 7 +++ resources/views/khazanah/status.blade.php | 59 ++++++++++++++----- resources/views/modal/CITModal.blade.php | 8 ++- routes/web.php | 4 +- 5 files changed, 103 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 2ec148f..46e694e 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3578,5 +3578,49 @@ class KhazanahController extends Controller return view('khazanah.status', compact('cawangan_info','api_url','permohonan','getdescription')); } + + public function CITPermohonan(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + + $resitname = time().'.'.$request->resit->extension(); + $resitdata = base64_encode($request->resit->get()); + + $invoicename = time().'.'.$request->invoice->extension(); + $invoicedata = base64_encode($request->invoice->get()); + + $updatelulus = Http::accept('application/'.$request->resit->extension() . ',application/'.$request->invoice->extension())->post(config('api.url') . '/admin/permohonan/tagcit',[ + 'resitcit' => $request->noresit, + 'bank' => $request->selectedbank, + 'mohonid' => $request->mohonid, + 'dataresit' => $resitdata, + 'datainvoice' => $invoicedata, + 'resittype' => $request->resit->extension(), + 'invoicetype' => $request->invoice->extension(), + 'resitname' => $resitname, + 'invoicename' => $invoicename, + + ])->json(); + + if($updatelulus) + return redirect()->back()->with('message', 'Berjaya mengemaskini CIT Permohonan!'); + else + return redirect()->back()->with('error', 'Ralat dalam menjana sebarang kemaskini!'); + + } + + public function DownloadFiles(Request $request){ + + $download = Http::get(config('api.url').'/admin/permohonan/viewfiles',[ + 'files_id' => $request->files_id + ])->json(); + + return response(base64_decode($download['data']), 200, [ + 'Content-type' => 'application/' . $download['type'], + 'Content-Disposition' => 'inline; filename='.$download['filename'] + ]); + } } diff --git a/resources/views/khazanah/permohonanwang.blade.php b/resources/views/khazanah/permohonanwang.blade.php index 8228604..823540c 100644 --- a/resources/views/khazanah/permohonanwang.blade.php +++ b/resources/views/khazanah/permohonanwang.blade.php @@ -114,6 +114,13 @@ }) + $('#CITModal').on('shown.bs.modal', function (e) { + + let mohon = $('#btncit').data('mohonid'); + $('#mohonid').val(mohon); + + }); + function funcpermohonan(){ let amaun = $('#jumlahmohon').val(); diff --git a/resources/views/khazanah/status.blade.php b/resources/views/khazanah/status.blade.php index 3ce88dd..4dfdf77 100644 --- a/resources/views/khazanah/status.blade.php +++ b/resources/views/khazanah/status.blade.php @@ -125,6 +125,21 @@ @section('content')
+
+ @csrf + +
+ +
+ @csrf + +
+ +
+ @csrf + +
+
@@ -181,12 +196,12 @@
@else
-
-
    -
  • -
  • -
  • -
  • +
    +
      +
    • +
    • +
    • +
@@ -238,26 +253,26 @@
@else -
-
+
+

Permohonan
Cawangan

-
+

CIT Selesai Deposit ke Bank

-
+

Pengesahan
Operasi

-
+

Akaun

@@ -290,15 +305,15 @@ break; case 3: echo $desc['description'] . '
' . 'NAMA AKAUN :' . $desc[0]['nama_akaun']; break; - case 4: echo $desc['description'] . '
' . 'JUMLAH DILULUSKAN :RM' . number_format($desc[0]['jumlah_diluluskan'],2); + case 4: echo $desc['description'] . '
' . 'JUMLAH DILULUSKAN :RM' . number_format($desc[0]['jumlah_diluluskan'],2) . '
'; break; - case 5: echo $desc['description'] . '
' . 'JENIS BANK :' . $desc[0]['jenisbank'] . '
' . 'NO RESIT :' . $desc[0]['noresit']; + case 5: echo $desc['description'] . '
' . 'JENIS BANK :' . $desc[0]['jenisbank'] . 'JENIS CIT:' . $desc[0]['jeniscit'] . '
' . 'NO RESIT :' . $desc[0]['noresit'] . 'NAMA SYARIKAT:' . $desc[0]['namasyarikat']; break; case 6: echo $desc['description'] . '
' . 'NAMA PENERIMA :' . $desc[0]['nama_penerima']; break; case 7: echo $desc['description']; break; - case 8: echo $desc['description'] . '
' . 'JENIS BANK :' . $desc[0]['jenisbank']; + case 8: echo $desc['description'] . '
' . 'JENIS BANK :' . $desc[0]['jenisbank'] .'
'; break; } @@ -319,5 +334,21 @@
@endsection diff --git a/resources/views/modal/CITModal.blade.php b/resources/views/modal/CITModal.blade.php index f8c34aa..941ee8a 100644 --- a/resources/views/modal/CITModal.blade.php +++ b/resources/views/modal/CITModal.blade.php @@ -12,7 +12,9 @@
-
+ @csrf + +
+ +
diff --git a/routes/web.php b/routes/web.php index 3b37090..f5939b4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -141,8 +141,8 @@ Route::get('/permohonan',['as'=>'permohonan.index','uses' => 'KhazanahController Route::get('/permohonan/rekod',['as'=>'permohonan.rekod','uses' => 'KhazanahController@RekodPermohonan'])->middleware('auth','khazanah'); Route::post('/permohonan/simpan',['as'=>'permohonan.simpan','uses' => 'KhazanahController@SimpanPermohonan'])->middleware('auth','khazanah'); Route::get('/permohonan/status/{mohonid}',['as'=>'permohonan.status','uses' => 'KhazanahController@StatusPermohonan'])->middleware('auth','khazanah'); -Route::get('/permohonan/cit/{mohonid}',['as'=>'permohonan.cit','uses' => 'KhazanahController@CITPermohonan'])->middleware('auth','khazanah'); - +Route::post('/permohonan/cit',['as'=>'permohonan.cit','uses' => 'KhazanahController@CITPermohonan'])->middleware('auth','khazanah'); +Route::post('/permohonan/download',['as'=>'permohonan.download','uses' => 'KhazanahController@DownloadFiles'])->middleware('auth','khazanah'); Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah'); Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']); From 4cc1220a1a024532d1d49f6525b07c7e48b0aea6 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 17 Apr 2022 11:24:55 +0800 Subject: [PATCH 3/9] fix --- .../views/khazanah/permohonanwang.blade.php | 18 +++++++++++++----- .../views/khazanah/rekodpermohonan.blade.php | 4 ++-- resources/views/modal/permohonanwang.blade.php | 10 +++++----- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/resources/views/khazanah/permohonanwang.blade.php b/resources/views/khazanah/permohonanwang.blade.php index 823540c..641f0a6 100644 --- a/resources/views/khazanah/permohonanwang.blade.php +++ b/resources/views/khazanah/permohonanwang.blade.php @@ -38,7 +38,7 @@
Senarai Permohonan Masih Aktif
- + Rekod Permohonan
@@ -64,17 +64,17 @@ {{ $mohon['tarikh_permohonan'] }} {{ number_format($mohon['amaun_mohon'],2) }} - + {{ $mohon['jenismohon'] }} @php if($mohon['tagdeposit'] === 1) { - echo ''; + echo ''; }else if(($mohon['tagcit'] === 0 && $mohon['jenismohon'] === 'bayaranbalik')) { - echo ''; + echo ''; } else{ echo 'DALAM PROSES'; @@ -106,11 +106,14 @@ $(this) .find("input[name='jumlahmohon']") .val('') + .removeClass('is-invalid') .end() .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + $("#erroramaun").hide(); + $("#pilihper").hide(); }) @@ -135,6 +138,11 @@ $("#erroramaun").show(); // $("[name='erroramaun']").text("*Isikan amaun dalam input!"); $("[name='jumlahmohon']").addClass('is-invalid'); + boolamaun = true; + }else{ + $("#erroramaun").hide(); + $("[name='jumlahmohon']").removeClass('is-invalid'); + boolamaun = false; } if(!jenis) @@ -143,7 +151,7 @@ booljenis = true; }else{ - $("pilihper").hide(); + $("#pilihper").hide(); booljenis = false; } diff --git a/resources/views/khazanah/rekodpermohonan.blade.php b/resources/views/khazanah/rekodpermohonan.blade.php index a33a894..fcbce70 100644 --- a/resources/views/khazanah/rekodpermohonan.blade.php +++ b/resources/views/khazanah/rekodpermohonan.blade.php @@ -55,11 +55,11 @@ {{ number_format($mohon['amaun_mohon'],2) }} {{ number_format($mohon['jumlah_diluluskan'],2) }} - + {{ $mohon['jenismohon'] }} @php - if($mohon['tagterima'] === 1) + if($mohon['tagterima'] === 1 || ($mohon['jenismohon'] == 'bayaranbalik' && $mohon['tagoperasi'] === 1 && $mohon['tagcit'] === 1 && $mohon['tagakaun'] === 1)) echo 'BERJAYA'; else echo 'BATAL'; @endphp diff --git a/resources/views/modal/permohonanwang.blade.php b/resources/views/modal/permohonanwang.blade.php index 72234b6..a45435d 100644 --- a/resources/views/modal/permohonanwang.blade.php +++ b/resources/views/modal/permohonanwang.blade.php @@ -18,21 +18,21 @@
- -
+ +
*Nyatakan Jumlah Permohonan
- +

{{ $tarikhsemasa }}

- +

RM {{ number_format($getVault,2) }}

@@ -43,7 +43,7 @@
--}}
- +

RM {{ number_format($dashboard[0]['outstanding'],2) }}

From b5620745286819f6d9036866a00b491e5f56a1f1 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 20 Apr 2022 15:10:44 +0800 Subject: [PATCH 4/9] fix ayat lelong --- resources/views/print/notislelong.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/print/notislelong.blade.php b/resources/views/print/notislelong.blade.php index 73a2e73..a556826 100644 --- a/resources/views/print/notislelong.blade.php +++ b/resources/views/print/notislelong.blade.php @@ -175,7 +175,7 @@ KEPADA : - {{ $lel['nama'] }}
{{ strtoupper($lel['alamat']) }} {!! ($lel['alamat2'] === null || $lel['alamat2'] === '') ? '' : '
' . strtoupper($lel['alamat2']) !!}
{{ ' ' . $lel['poskod'] . ' ' . strtoupper($lel['daerah']) . ' ' . strtoupper($lel['negeri'])}} + {{ $lel['nama'] }}
{{ strtoupper($lel['alamat']) }}
{{ ' ' . $lel['poskod'] . ' ' . strtoupper($lel['daerah']) . ' ' . strtoupper($lel['negeri'])}} NO K/P : @@ -191,7 +191,7 @@ echo($datez); @endphp -

Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di atas akan dilelong.

+

Dengan hormatnya kami ingin memaklumkan bahawa barang-barang cagaran tuan/puan yang digadai di cawangan seperti di {{ ($fasa == 'fasa1') ? 'atas akan dilelong.' : 'akan/telah tamat kontrak dan akan dilelong.' }}

Butiran lelongan adalah seperti berikut :-

From 0b597341097282f90965076c593e74b2a36ce71d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 9 May 2022 11:04:21 +0800 Subject: [PATCH 5/9] fix skit --- app/Http/Controllers/KhazanahController.php | 12 +- .../views/khazanah/permohonanwang.blade.php | 32 +++- .../modal/denominasipermohonan.blade.php | 146 ++++++++++++++++++ resources/views/print/notislelong.blade.php | 2 +- 4 files changed, 189 insertions(+), 3 deletions(-) create mode 100644 resources/views/modal/denominasipermohonan.blade.php diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 46e694e..26283c7 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3524,7 +3524,17 @@ class KhazanahController extends Controller $permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/get/'.$auth_user['cawangan'])->json(); $bank = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/bank')->json(); - return view('khazanah.permohonanwang', compact('bank','cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan')); + $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json(); + + if(sizeof($denominasi) == 0) + { + $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json(); + } + else + { + $denominasi=$denominasi[0]; + } + return view('khazanah.permohonanwang', compact('bank','cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan','denominasi')); } public function RekodPermohonan() diff --git a/resources/views/khazanah/permohonanwang.blade.php b/resources/views/khazanah/permohonanwang.blade.php index 641f0a6..883fd32 100644 --- a/resources/views/khazanah/permohonanwang.blade.php +++ b/resources/views/khazanah/permohonanwang.blade.php @@ -2,6 +2,7 @@ @section('content') @include('modal.permohonanwang') @include('modal.CITModal') +@include('modal.denominasimodalpendahuluanserahan')
@@ -71,7 +72,7 @@ @php if($mohon['tagdeposit'] === 1) { - echo ''; + echo ''; }else if(($mohon['tagcit'] === 0 && $mohon['jenismohon'] === 'bayaranbalik')) { echo ''; @@ -94,6 +95,7 @@
+ @endsection diff --git a/resources/views/modal/denominasipermohonan.blade.php b/resources/views/modal/denominasipermohonan.blade.php index 9ea7e5b..8eee8d8 100644 --- a/resources/views/modal/denominasipermohonan.blade.php +++ b/resources/views/modal/denominasipermohonan.blade.php @@ -132,11 +132,12 @@ +
- +
From 2506c59b1feb340401db0587f9f4377ec6c966fd Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 7 Jun 2022 10:50:17 +0800 Subject: [PATCH 7/9] fix --- app/Http/Controllers/KhazanahController.php | 3 ++- resources/views/khazanah/permohonanwang.blade.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 65e038b..845af22 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3623,7 +3623,8 @@ class KhazanahController extends Controller 'tarikhmohon' => $request->tarikhmohon, 'bakipetibesi' => $request->bakipetibesi, 'outstanding' => $request->outstanding, - 'namapemohon' => $auth_user['name'] + 'namapemohon' => $auth_user['name'], + 'jawatanpemohon' => $auth_user['roles'] ])->json(); if($permohonan == true) diff --git a/resources/views/khazanah/permohonanwang.blade.php b/resources/views/khazanah/permohonanwang.blade.php index d6e891c..6f0caa8 100644 --- a/resources/views/khazanah/permohonanwang.blade.php +++ b/resources/views/khazanah/permohonanwang.blade.php @@ -72,7 +72,7 @@ @php if($mohon['tagdeposit'] === 1) { - echo ''; + echo ''; }else if(($mohon['tagcit'] === 0 && $mohon['jenismohon'] === 'bayaranbalik')) { echo ''; From c84b1420965793e08f82b5e34fc7293fd5d5d634 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 10 Jun 2022 00:09:46 +0800 Subject: [PATCH 8/9] fix --- resources/views/homepage/khazanah/home.blade.php | 2 +- resources/views/khazanah/permohonanwang.blade.php | 2 +- resources/views/modal/CITModal.blade.php | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index 67d64d5..bcd415b 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -180,7 +180,7 @@ Unjuran
- Permohonan + Permohonan
diff --git a/resources/views/khazanah/permohonanwang.blade.php b/resources/views/khazanah/permohonanwang.blade.php index d6e891c..995e4fb 100644 --- a/resources/views/khazanah/permohonanwang.blade.php +++ b/resources/views/khazanah/permohonanwang.blade.php @@ -72,7 +72,7 @@ @php if($mohon['tagdeposit'] === 1) { - echo ''; + echo ''; }else if(($mohon['tagcit'] === 0 && $mohon['jenismohon'] === 'bayaranbalik')) { echo ''; diff --git a/resources/views/modal/CITModal.blade.php b/resources/views/modal/CITModal.blade.php index 941ee8a..f725fb0 100644 --- a/resources/views/modal/CITModal.blade.php +++ b/resources/views/modal/CITModal.blade.php @@ -1,6 +1,6 @@