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

Merge branch 'fasa2lelong' into 'main'

Browse Source 
Fasa2lelong

See merge request online-sistem1/admin-portal!14
This commit is contained in:
hafifie rahman
2022-06-09 06:51:04 +00:00
parent dc80bcff75 be8fe26745
commit 1489d568e7
13 changed files with 1022 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+1 -1
View File
@@ -170,7 +170,7 @@ class AliranTunaiController extends Controller
{
$auth_user = Auth::user();
$alirantunai = Http::get($request->hostname . '/api/GetTunaiByTarikh/' . $request->kodcaw,['kodlaluan' => $request->teller, 'tarikh' => $request->tarikh])->json();
$alirantunai = Http::get($request->hostname . '/admin/GetTunaiByTarikh/' . $request->kodcaw,['kodlaluan' => $request->teller, 'tarikh' => $request->tarikh])->json();
$keluar = $alirantunai['keluar'];
$baki = $alirantunai['baki'];
public/js/app.js
Vendored
+596 -149
View File
File diff suppressed because it is too large Load Diff
resources/js/Logout.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div>
<div class="hidden lg:flex items-center">
<button @click.prevent="logout()" class="bg-transparent hover:bg-blue-500 text-blue-700 font-semibold hover:text-white py-2 px-4 border border-blue-500 hover:border-transparent rounded md:invisible lg:visible xl:visible">
Log out
Log Keluar
</button>
<button @click.prevent="logout()" class="bg-transparent hover:bg-blue-500 text-blue-700 font-semibold hover:text-white py-2 px-4 border border-blue-500 hover:border-transparent rounded md:visible lg:invisible xl:invisible">
<i class= "fas fa-sign-out-alt"></i>
resources/js/Permohonan/RekodMohon.vue
+24 -2
View File
@@ -5,7 +5,7 @@
<bankmodal ref="bankmodal" @clickEvent_="getSenaraiMohon"></bankmodal>
<router-link to="/permohonan">
<i class="fas fa-backspace text-yellow-500"></i>
<i class="fas fa-backspace fa-3x text-yellow-500"></i>
</router-link>
<div class="mx-auto flex justify-between mb-4">
@@ -28,7 +28,13 @@
<th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
PetiBesi (RM)
Baki Peti Besi (RM)
</th>
<th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Outstanding (RM)
</th>
@@ -119,6 +125,22 @@
</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="formatterfunction(mohon.outstandingsemasa)">
</p>
</div>
</div>
</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
resources/js/Permohonan/SenaraiMohon.vue
+70 -36
View File
@@ -28,7 +28,13 @@
<th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
PetiBesi (RM)
Baki Peti Besi (RM)
</th>
<th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Outstanding (RM)
</th>
@@ -115,6 +121,22 @@
</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="formatterfunction(mohon.outstandingsemasa)">
</p>
</div>
</div>
</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
@@ -271,7 +293,7 @@
<p class="text-white whitespace-no-wrap p-2 rounded bg-green-500">
Telah Lulus
Telah disahkan
</p>
@@ -283,7 +305,7 @@
<div v-if="mohon.tagoperasi === 0">
<p class="text-white whitespace-no-wrap p-2 rounded bg-blue-500">
DALAM PROCESS
DALAM PROSES
</p>
</div>
@@ -317,9 +339,14 @@
</div>
<div v-else-if="mohon.tagprint === 1 && mohon.tagakaun === 1 && mohon.tagpb === 0">
<button @click="KelulusanPB(mohon.nopermohonan,formatterfunction(mohon.amaun_mohon))" class="border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
<button @click="KelulusanPB(mohon.nopermohonan,formatterfunction(mohon.amaun_mohon))" class="border mb-2 border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
PB
</button>
<button @click="CetakanPB(mohon.kodcaw,mohon.nopermohonan)" class="mt-2 border border-blue-600 text-blue-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-blue-600 hover:text-white transition-all duration-300">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
<path stroke-linecap="round" stroke-linejoin="round" d="M17 17h2a2 2 0 002-2v-4a2 2 0 00-2-2H5a2 2 0 00-2 2v4a2 2 0 002 2h2m2 4h6a2 2 0 002-2v-4a2 2 0 00-2-2H9a2 2 0 00-2 2v4a2 2 0 002 2zm8-12V5a2 2 0 00-2-2H9a2 2 0 00-2 2v4h10z" />
</svg>
</button>
</div>
<div v-else-if="mohon.tagpb === 1 && mohon.tagdeposit === 0">
@@ -499,7 +526,7 @@ export default {
refer2.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan',
text: 'Berjaya mengemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -508,7 +535,7 @@ export default {
refer2.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Data pelanggan tidak berjaya dikemaskini',
text: 'tidak berjaya dikemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -526,7 +553,7 @@ export default {
refer2.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan',
text: 'Berjaya mengemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -535,7 +562,7 @@ export default {
refer2.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Data pelanggan tidak berjaya dikemaskini',
text: 'tidak berjaya dikemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -596,7 +623,7 @@ export default {
this.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan',
text: 'Berjaya mengemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -606,7 +633,7 @@ export default {
this.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Data pelanggan tidak berjaya dikemaskini',
text: 'tidak berjaya dikemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -624,7 +651,7 @@ export default {
this.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan',
text: 'Berjaya mengemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -634,7 +661,7 @@ export default {
this.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Data pelanggan tidak berjaya dikemaskini',
text: 'tidak berjaya dikemaskini',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
@@ -660,33 +687,38 @@ export default {
},
CetakanPB: function (caw, mid) {
let refer = this;
this.axios.put(this.$hostname + '/admin/permohonan/updatecetak', {
mohonid: mid,
namaprint: this.username
}).then(response => {
if (response.data === 1) {
this.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Cetakan Berjaya Dijana!',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
});
} else {
this.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Cetakan Tidak Berjaya!',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
});
this.axios.get(this.$hostname + '/admin/permohonan/get/' + caw + '/' + mid).then(response => {
console.log(response.data.tagprint);
if (response.data.tagprint !== 1) {
this.axios.put(this.$hostname + '/admin/permohonan/updatecetak', {
mohonid: mid,
namaprint: this.username
}).then(response => {
if (response.data === 1) {
this.$swal({
icon: 'success',
title: 'Berjaya',
text: 'Cetakan Berjaya Dijana!',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
});
} else {
this.$swal({
icon: 'warning',
title: 'Tidak Berjaya',
text: 'Cetakan Tidak Berjaya!',
allowOutsideClick: false
}).then(function () {
refer.getSenaraiMohon(refer.currentPage);
});
}
});
}
});
})
let route = window.route('permohonan.cetakanpenuh', {
_query: {
cawangan: caw,
@@ -694,6 +726,8 @@ export default {
},
});
window.open(route, '_blank')
return;
},
KelulusanPB: function (mid, mohon) {
this.$refs.modal.mohonid = mid;
resources/js/Permohonan/StatusMohon.vue
+289 -272
View File
@@ -1,320 +1,310 @@
<template>
<div class="container px-1 px-md-4 py-5 mx-auto">
<router-link to="/permohonan">
<i class="fas fa-backspace text-yellow-500"></i>
</router-link>
<div class="container px-1 px-md-4 py-5 mx-auto">
<div v-if="this.loadstatus == true" class="card">
<div class="row flex justify-between px-3 top">
<div class="d-flex">
<h5>NO PERMOHONAN : <span class="text-primary font-weight-bold">{{ this.permohonan.nopermohonan }}</span></h5>
<h5>JUMLAH MOHON : <span class="text-primary font-weight-bold">RM {{ formatterfunction(this.permohonan.amaun_mohon) }}</span></h5>
</div>
<div>
<span class="text-white rounded font-weight-bold bg-green-500 p-3">{{ this.permohonan.jenismohon }}</span>
</div>
<button class="fas fa-backspace fa-3x text-yellow-500" @click="$router.go(-1)"></button>
<div v-if="this.loadstatus == true" class="card">
<div class="row flex justify-between px-3 top">
<div class="d-flex">
<h5>NO PERMOHONAN : <span class="text-primary font-weight-bold">{{ this.permohonan.nopermohonan }}</span></h5>
<h5>JUMLAH MOHON : <span class="text-primary font-weight-bold">RM {{ formatterfunction(this.permohonan.amaun_mohon) }}</span></h5>
</div>
<div v-if="this.permohonan.jenismohon === 'bayaranbalik'" class="flex mt--8">
<div class="w-full">
<ul id="progressbar" class="text-center flex justify-center items-center">
<li :class="this.permohonan.tarikh_permohonan !== null ? 'active' : ''" class="step0 w-1/4"></li>
<li :class="this.permohonan.tagcit === 1 ? 'active' : ''" class="step0 w-1/4"></li>
<li :class="this.permohonan.tagoperasi === 1 ? 'active' : ''" class="step0 w-1/4"></li>
<li :class="this.permohonan.tagakaun === 1 ? 'active' : ''" class="step0 w-1/4"></li>
</ul>
</div>
<div>
<span class="text-black rounded font-extrabold">{{ (this.permohonan.jenismohon == 'permohonanwang') ? 'Permohonan Wang' : 'Bayaran Balik' }}</span>
</div>
<div v-if="this.permohonan.jenismohon === 'bayaranbalik'" class="w-4/6 flex items-center mx-auto">
<div class="row flex flex-col justify-center items-center icon-content w-1/4"> <img class="icon mx-auto" src="/img/proposal.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Permohonan <br>Cawangan</p>
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/4"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">CIT selesai Deposit ke bank</p>
<img v-if="this.permohonan.tagoperasi == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/4"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Pengesahan<br>Operasi</p>
<img v-if="this.permohonan.tagoperasi == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/4"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Akaun</p>
<img v-if="this.permohonan.tagakaun == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
</div>
<div v-if="this.permohonan.jenismohon === 'permohonanwang'" class="flex mt--8">
<div class="w-full">
<ul id="progressbar" class="text-center flex">
<li :class="this.permohonan.tarikh_permohonan !== null ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagoperasi === 1 ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagakaun === 1 ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagpb === 1 ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagdeposit === 1 ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagterima === 1 ? 'active' : ''" class="step0 w-1/6"></li>
</ul>
</div>
</div>
<div v-if="this.permohonan.jenismohon === 'permohonanwang'" class="flex w-full">
<div class="row flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/proposal.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Permohonan <br>Cawangan</p>
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Pengesahan<br>Operasi</p>
<img v-if="this.permohonan.tagoperasi == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Akaun</p>
<img v-if="this.permohonan.tagakaun == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/leaderapproval.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Kelulusan <br>Pengurus Besar</p>
<img v-if="this.permohonan.tagpb == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/chequetick.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Akaun <br> Deposit Ke Bank <br>Selesai</p>
<img v-if="this.permohonan.tagdeposit == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/money.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Cawangan<br> Terima Wang</p>
</div>
</div>
</div>
</div>
<div v-if="this.loadstatus == true" class="">
<div class="p-4 flex justify-center items-center">
<table class="w-2/3 leading-normal">
<thead class="text-center">
<tr>
<th class="w-1/5 px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Tarikh
</th>
<th class="w-1/5 px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Masa
</th>
<th class="w-3/5 px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Status Permohonan
</th>
</tr>
</thead>
<tbody>
<tr v-for="(status,i) in statusdescription" :key="i">
<div v-if="this.permohonan.jenismohon === 'bayaranbalik'" class="flex mt--8">
<div class="w-full">
<ul id="progressbar" class="text-center flex justify-center items-center">
<li :class="this.permohonan.tarikh_permohonan !== null ? 'active' : ''" class="step0 w-1/4"></li>
<li :class="this.permohonan.tagcit === 1 ? 'active' : ''" class="step0 w-1/4"></li>
<li :class="this.permohonan.tagoperasi === 1 ? 'active' : ''" class="step0 w-1/4"></li>
<li :class="this.permohonan.tagakaun === 1 ? 'active' : ''" class="step0 w-1/4"></li>
</ul>
</div>
</div>
<div v-if="this.permohonan.jenismohon === 'bayaranbalik'" class="w-4/6 flex items-center mx-auto">
<div class="row flex flex-col justify-center items-center icon-content w-1/4"> <img class="icon mx-auto" src="/img/proposal.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Permohonan <br>Cawangan</p>
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/4"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">CIT selesai Deposit ke bank</p>
<img v-if="this.permohonan.tagoperasi == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/4"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Pengesahan<br>Operasi</p>
<img v-if="this.permohonan.tagoperasi == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/4"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Akaun</p>
<img v-if="this.permohonan.tagakaun == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
</div>
<div v-if="this.permohonan.jenismohon === 'permohonanwang'" class="flex mt--8">
<div class="w-full">
<ul id="progressbar" class="text-center flex">
<li :class="this.permohonan.tarikh_permohonan !== null ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagoperasi === 1 ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagakaun === 1 ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagpb === 1 ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagdeposit === 1 ? 'active' : ''" class="step0 w-1/6"></li>
<li :class="this.permohonan.tagterima === 1 ? 'active' : ''" class="step0 w-1/6"></li>
</ul>
</div>
</div>
<div v-if="this.permohonan.jenismohon === 'permohonanwang'" class="flex w-full">
<div class="row flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/proposal.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Permohonan <br>Cawangan</p>
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="flex flex-column">
<p class="font-weight-bold text-center">Pengesahan<br>Operasi</p>
<img v-if="this.permohonan.tagoperasi == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/operasicek.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Akaun</p>
<img v-if="this.permohonan.tagakaun == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/leaderapproval.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Kelulusan <br>Pengurus Besar</p>
<img v-if="this.permohonan.tagpb == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/chequetick.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Akaun <br> Deposit Ke Bank <br>Selesai</p>
<img v-if="this.permohonan.tagdeposit == 2" class="absolute icon mx-auto top-1/3 mt-10" src="/img/batal.png">
</div>
</div>
<div class="flex flex-col justify-center items-center icon-content w-1/6"> <img class="icon mx-auto" src="/img/money.png">
<div class="d-flex flex-column">
<p class="font-weight-bold text-center">Cawangan<br> Terima Wang</p>
</div>
</div>
</div>
</div>
<div v-if="this.loadstatus == true" class="">
<div class="p-4 flex justify-center items-center">
<table class="w-2/3 leading-normal">
<thead class="text-center">
<tr>
<th class="w-1/5 px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Tarikh
</th>
<th class="w-1/5 px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Masa
</th>
<th class="w-3/5 px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Status Permohonan
</th>
</tr>
</thead>
<tbody>
<tr v-for="(status,i) in statusdescription" :key="i">
<td class="text-center px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="status[0].tarikh">
</p>
</div>
</div>
</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="text-center flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="status[0].masa">
</p>
</div>
</div>
</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div>
<div class="ml-3">
<p v-if="status.statusid === 1" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'NAMA PEMOHON : ' + status[0].nama_pemohon }}
{{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_pemohon) }}
</p>
<p v-if="status.statusid === 2" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'NAMA OPERASI : ' + status[0].nama_operasi }}
{{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_operasi) }}
</p>
<p v-if="status.statusid === 3" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'NAMA AKAUN : ' + status[0].nama_akaun }}
{{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_akaun) }}
</p>
<p v-if="status.statusid === 4" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'JUMLAH DILULUSKAN : RM ' + formatterfunction(status[0].jumlah_diluluskan) }}
{{ status.description }} <br> <b> {{ 'Jumlah Diluluskan : RM ' + formatterfunction(status[0].jumlah_diluluskan) }} </b>
<br>
<button class="text-white p-2 bg-blue-500 rounded mr-1 mt-2" @click.prevent="downloadpb(status[0].pbfiles)">Muat Turun</button>
</p>
<div v-if="status.statusid === 5" class="text-gray-900 whitespace-no-wrap">
{{ status.description }}
{{ status.description }}
<br>
<div class="w-full">
<span class="w-1/2">{{ 'JENIS BANK : ' + status[0].jenisbank }}</span>
<span class="w-1/2">{{ 'JENIS CIT : ' + status[0].jeniscit }}</span>
</div>
<br>
<div class="w-full">
<span class="w-1/2">{{ 'NO RESIT :' + status[0].noresit }}</span>
<span class="w-1/2">{{ 'NAMA SYARIKAT :' + status[0].namasyarikat }}</span>
<div class="w-full">{{ 'Nama Bank : ' + fullnamebank(status[0].jenisbank) }}</div>
<div class="w-full">{{ 'Kaedah Penghantaran : ' + status[0].jeniscit }}</div>
<div class="w-full">{{ 'No Rujukan :' + status[0].noresit }}</div>
<div class="w-full">{{ 'Nota :' + status[0].namasyarikat }}</div>
</div>
</div>
<p v-if="status.statusid === 6" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'NAMA PENERIMA : ' + status[0].nama_penerima }}
{{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_penerima) }}
</p>
<p v-if="status.statusid === 7" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'KOMEN : ' + status[0].komen }}
{{ status.description }} <br> {{ 'Komen : ' + status[0].komen }}
</p>
<p v-if="status.statusid === 8" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'JENIS BANK : ' + status[0].jenisbank }}
<p v-if="status.statusid === 8" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'Nama Bank : ' + status[0].jenisbank }}
<br>
<button class="text-white p-2 bg-blue-500 rounded mr-1 mt-2" @click.prevent="downloadresit(status[0].resitfiles)">Muat Turun Resit</button>
<button class="text-white p-2 bg-blue-500 rounded mt-2" @click.prevent="downloadinvoice(status[0].invoicefiles)">Muat Turun Invoice</button>
<button class="text-white p-2 bg-blue-500 rounded mr-1 mt-2" @click.prevent="downloadresit(status[0].resitfiles)">Muat Turun Resit</button>
<button class="text-white p-2 bg-blue-500 rounded mt-2" @click.prevent="downloadinvoice(status[0].invoicefiles)">Muat Turun Invoice</button>
</p>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</template>
<style scoped>
@@ -439,34 +429,38 @@
</style>
<script>
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
export default {
data(){
return{
data() {
return {
mohonid: this.$route.params.mohonid,
statusdescription:{},
permohonan:{},
statusdescription: {},
permohonan: {},
cawangan: 'KB2',
loadstatus: false
loadstatus: false,
bank: {}
}
},
created(){
this.GetStatusData(this.mohonid,this.cawangan);
created() {
this.GetStatusData(this.mohonid, this.cawangan);
},
methods:{
async GetStatusData(mohonid,cawangan){
methods: {
async GetStatusData(mohonid, cawangan) {
await this.axios.get(this.$hostname + '/admin/permohonan/description/' + mohonid).then(response => {
this.statusdescription = response.data;
console.log(this.statusdescription)
});
await this.axios.get(this.$hostname + '/admin/permohonan/get/' + cawangan + '/' + mohonid).then(response => {
this.permohonan = response.data;
});
this.axios.get(this.$hostname + '/api/bank').then(response => {
this.bank = response.data;
});
this.loadstatus = true;
},
formatterfunction(value) {
@@ -480,6 +474,29 @@ export default {
},
downloadpb(pbid) {
window.open('/api/check/muatturun?files_id=' + pbid, '_blank');
},
pembesarannama(value) {
const str = value.toLowerCase().replace(/\b[a-z]/g, function (response) {
return response.toUpperCase();
});
return str;
},
fullnamebank(value) {
let name = '';
if(this.bank.length > 0)
{
this.bank.some(function(res, key) {
if(value === res.abbreviation)
{
name = res.name
}
});
}
return name;
}
}
}
resources/js/app.js
Vendored
+3 -4
View File
@@ -119,18 +119,18 @@ Vue.use(require('vue-pusher'), {
}
});
Vue.prototype.$api1 = 'http://api.arrahn'
Vue.prototype.$api1 = 'http://localhost:8000'
Vue.prototype.$username = document.querySelector("meta[name='user_name']").getAttribute('content');
Vue.prototype.$userroles = document.querySelector("meta[name='user_roles']").getAttribute('content');
let initial = 'KB2';
let initialhostname = 'http://api.arrahn';
let initialhostname = 'http://localhost:8000';
const store = new Vuex.Store({
state: {
$kodcaw: 'KB2',
$hostname: 'http://api.arrahn'
$hostname: 'http://localhost:8000'
},
plugins: [createPersistedState()],
mutations: {
@@ -181,7 +181,6 @@ Vue.component('pemb-chart', require('./components/Chart/PembiayaanChart.vue').de
Vue.component('peny-chart', require('./components/Chart/PenyelesaianChart.vue').default)
Vue.component('keun-chart', require('./components/Chart/KeuntunganChart.vue').default)
Vue.component('sidebar', require('./components/Sidebar.vue').default)
Vue.component('breadcrumb', require('./components/Breadcrumb.vue').default)
Vue.component('dashboard', require('./pages/dashboard.vue').default)
Vue.component('tunai-component', require('./components/Tunai.vue').default)
resources/js/components/Cawangan.vue
+2 -2
View File
@@ -84,7 +84,7 @@
case 'JLI':
case 'ARP':
case '020303':{
this.sethostname('http://api.arrahn')
this.sethostname('http://localhost:8000')
break;
}
case '010621':
@@ -114,7 +114,7 @@
this.sethostname('http://api3.arrahn')
break;
}
default: this.sethostname('http://api.arrahn')
default: this.sethostname('http://localhost:8000')
break;
}
}
resources/js/components/Sidebar.vue
-154
View File
@@ -1,154 +0,0 @@
<template>
<div>
<div class="flex h-screen antialiased text-gray-900 bg-gray-100 dark:bg-dark dark:text-light">
<!-- Sidebar -->
<div v-show="isSidebarOpen" class="fixed inset-y-0 z-10 flex w-80">
<!-- Curvy shape -->
<svg
class="absolute inset-0 w-full h-full text-white"
style="filter: drop-shadow(10px 0 10px #00000030)"
preserveAspectRatio="none"
viewBox="0 0 309 800"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M268.487 0H0V800H247.32C207.957 725 207.975 492.294 268.487 367.647C329 243 314.906 53.4314 268.487 0Z" />
</svg>
<!-- Sidebar content -->
<div class="z-10 flex flex-col flex-1">
<div class="flex items-center justify-between flex-shrink-0 w-64 p-4">
<!-- Logo -->
<a href="#">
<span class="sr-only">K-UI</span>
<svg
aria-hidden="true"
class="w-16 h-auto text-blue-600"
viewBox="0 0 96 53"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M7.69141 34.7031L13.9492 28.1992L32.0898 52H40.1758L18.4492 23.418L38.5938 0.8125H30.4375L7.69141 26.125V0.8125H0.941406V52H7.69141V34.7031ZM35.3008 26.9102H52.457V21.6016H35.3008V26.9102ZM89.1914 13V35.5117C89.1914 39.2148 88.1719 42.0859 86.1328 44.125C84.1172 46.1641 81.1992 47.1836 77.3789 47.1836C73.6055 47.1836 70.6992 46.1641 68.6602 44.125C66.6211 42.0625 65.6016 39.1797 65.6016 35.4766V0.8125H58.9219V35.6875C58.9688 40.9844 60.6562 45.1445 63.9844 48.168C67.3125 51.1914 71.7773 52.7031 77.3789 52.7031L79.1719 52.6328C84.3281 52.2578 88.4062 50.5352 91.4062 47.4648C94.4297 44.3945 95.9531 40.4453 95.9766 35.6172V13H89.1914ZM89 8H96V1H89V8Z"
/>
</svg>
</a>
<!-- Close btn -->
<button
@click="isSidebarOpen = false"
class="p-1 rounded-lg focus:outline-none focus:ring"
>
<svg
class="w-6 h-6"
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M6 18L18 6M6 6l12 12"
/>
</svg>
<span class="sr-only">Close sidebar</span>
</button>
</div>
<nav class="flex flex-col flex-1 w-64 p-4 mt-4">
<a href="#" class="flex items-center space-x-2">
<svg
class="w-6 h-6"
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"
/>
</svg>
<span>Home</span>
</a>
</nav>
<div class="flex-shrink-0 p-4">
<button class="flex items-center space-x-2">
<svg
aria-hidden="true"
class="w-6 h-6"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"
/>
</svg>
<span>Logout</span>
</button>
</div>
</div>
</div>
<main class="flex flex-col items-center justify-center flex-1">
<!-- Page content -->
<button
@click="isSidebarOpen = true"
class="fixed p-2 text-white bg-black rounded-lg top-5 left-5"
>
<svg
class="w-6 h-6"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M4 6h16M4 12h16M4 18h16"
/>
</svg>
<span class="sr-only">Open menu</span>
</button>
<h1 class="sr-only">Home</h1>
<a href="https://github.com/kamona-ui" target="_blank">
<span class="sr-only">Kamona ui</span>
<svg
aria-hidden="true"
class="w-20 h-auto text-blue-600"
viewBox="0 0 96 53"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M7.69141 34.7031L13.9492 28.1992L32.0898 52H40.1758L18.4492 23.418L38.5938 0.8125H30.4375L7.69141 26.125V0.8125H0.941406V52H7.69141V34.7031ZM35.3008 26.9102H52.457V21.6016H35.3008V26.9102ZM89.1914 13V35.5117C89.1914 39.2148 88.1719 42.0859 86.1328 44.125C84.1172 46.1641 81.1992 47.1836 77.3789 47.1836C73.6055 47.1836 70.6992 46.1641 68.6602 44.125C66.6211 42.0625 65.6016 39.1797 65.6016 35.4766V0.8125H58.9219V35.6875C58.9688 40.9844 60.6562 45.1445 63.9844 48.168C67.3125 51.1914 71.7773 52.7031 77.3789 52.7031L79.1719 52.6328C84.3281 52.2578 88.4062 50.5352 91.4062 47.4648C94.4297 44.3945 95.9531 40.4453 95.9766 35.6172V13H89.1914ZM89 8H96V1H89V8Z"
/>
</svg>
</a>
</main>
</div>
</div>
</template>
<script>
export default {
data() {
return {
isSidebarOpen: false,
};
},
};
</script>
resources/js/components/Tunai.vue
+3
View File
@@ -20,6 +20,9 @@
</ul>
</nav>
<br>
<span><b>PETUGAS</b> : {{ this.kodlaluan }}</span>
<transition
enter-active-class="transition-all transform duration-200 ease-out"
leave-active-class="transition-all transform duration-200 ease-in"
resources/js/components/util/Bankmodal.vue
+15 -11
View File
@@ -8,7 +8,7 @@
<!--header-->
<div class="flex items-start bg-gray-200 justify-between p-5 border-b border-solid border-blueGray-200 rounded-t">
<h3 class="text-xl font-semibold">
Deposit Akaun Bank
Maklumat Penghantaran
</h3>
<button class="p-1 ml-auto border-0 text-black float-right text-3xl leading-none font-semibold outline-none focus:outline-none" v-on:click="toggleModal()">
<span class=" text-black h-6 w-6 text-2xl block outline-none focus:outline-none">
@@ -20,32 +20,36 @@
<div class="p-6">
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
Jenis Bank
Nama Bank
</label>
<select v-model.trim="$v.selectedbank.$model" class="w-full p-2 rounded-md border bg-white border-gray-400 focus:outline-none rounded-md focus:ring-1 ring-cyan-500 uppercase">
<option value="" selected disabled hidden>Sila Pilih Bank Anda***</option>
<option v-for="(bank,i) in jenisbank" :key="i" :value="bank.abbreviation">{{ bank.name }}</option>
</select>
<!-- <input v-model="selectedbank" type="text" class="mr-2 bg-white appearance-none border-2 border-gray-400 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-blue-500 border-black" /> -->
<div class="text-red-500 text-xs italic" v-if="!$v.selectedbank.required">Field is required</div>
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
No Resit
No Rujukan
</label>
<input v-model.trim="$v.noresit.$model" type="text" class="mr-2 bg-white appearance-none border-2 border-gray-400 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-blue-500 border-black" />
<div class="text-red-500 text-xs italic" v-if="!$v.noresit.required">Field is required</div>
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
Jenis Cash-In-Transit(CIT)
Kaedah Penghantaran
</label>
<select v-model.trim="$v.selectedjeniscit.$model" class="w-full p-2 rounded-md border bg-white border-gray-400 focus:outline-none rounded-md focus:ring-1 ring-cyan-500 uppercase">
<option value="CIT">Cash Diambil oleh CIT</option>
<option value="TT">tellygraphic transfer oleh PC</option>
<option value="" selected disabled hidden>Sila Pilih Kaedah Penghantaranr***</option>
<option value="CIT">Cash-in-Transit</option>
<option value="TT">tellygraphic Transfer</option>
</select>
<div class="text-red-500 text-xs italic" v-if="!$v.selectedjeniscit.required">Field is required</div>
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
Nama Syarikat Cash-In-Transit(CIT)
Nota
</label>
<input v-model.trim="$v.namacit.$model" type="text" class="mr-2 bg-white appearance-none border-2 border-gray-400 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-blue-500 border-black" />
<div class="text-red-500 text-xs italic" v-if="!$v.noresit.required">Field is required</div>
<div class="text-red-500 text-xs italic" v-if="!$v.namacit.required">Field is required</div>
</div>
<!--footer-->
<div class="flex items-center justify-end p-6 border-t border-solid border-blueGray-200 rounded-b">
@@ -92,9 +96,9 @@ export default {
return {
showModal: false,
mohonid: 0,
selectedbank: 'Sila Pilih Bank',
selectedjeniscit: 'Sila Pilih Jenis Transfer',
noresit: 0,
selectedbank: '',
selectedjeniscit: '',
noresit: '',
namacit: '',
jenisbank: {}
}
resources/views/permohonan/cetakanfull.blade.php
+15 -7
View File
@@ -66,7 +66,7 @@
<div class="flex mb-6">
<div class="ml-2 w-1/2 flex flex-col justify-end">
<b class="text-xs border border-black pl-1">Daripada</b>
<p class="text-xs">Pengurus Cawangan {{ $cawangan_detail['namacaw'] }}</p>
<p class="text-xs">{{ ($permohonan['jawatan_pemohon'] == 'pc') ? 'Pengurus Cawangan' : 'Pen. Peng. Cawangan' }} {{ $cawangan_detail['namacaw'] }}</p>
<p class="text-xs">Nama : {{ $permohonan['nama_pemohon'] }}</p>
{{-- <p class="text-xs">NO KP : 970403-03-5003</p> --}}
@@ -87,7 +87,7 @@
<p class="text-xs w-2/3 border border-gray-400 text-right">RM {{ number_format($permohonan['amaun_mohon'],2) }}</p>
</div>
<div class="flex">
<p class="text-xs w-full">Tarikh serahan</p>
<p class="text-xs w-full">Tarikh mohon</p>
<p class="text-xs w-2/3 border border-gray-400 text-right">
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_permohonan']);
@@ -108,7 +108,7 @@
<p class="text-xs w-2/3 border border-gray-400 text-right"></p>
</div>
<div class="flex">
<p class="text-xs w-full">Tarikh serahan</p>
<p class="text-xs w-full">Tarikh mohon</p>
<p class="text-xs w-2/3 border border-gray-400 text-right">
</p>
@@ -164,13 +164,17 @@
<div class="ml-2 w-1/2 flex flex-col justify-end">
<b class="text-xs border border-black pl-1">Disediakan oleh</b>
<p class="h-14"></p>
<div class="flex">
{{-- <div class="w-2/3"></div> --}}
<p class="text-xs w-full text-right italic text-black">{{ $permohonan['nama_pemohon'] }}</p>
</div>
<div class="flex">
<div class="w-2/3"></div>
<div class="text-right border-t border-gray-300 w-1/3"></div>
</div>
<div class="flex">
<div class="w-2/3"></div>
<p class="text-xs w-1/3 text-center">Pengurus Cawangan</p>
<p class="text-xs w-2/3 text-right">{{ ($permohonan['jawatan_pemohon'] == 'pc') ? 'Pengurus Cawangan' : 'Pen. Peng. Cawangan' }}</p>
</div>
<div class="flex">
<p class="text-xs text-center w-2/3">Tarikh</p>
@@ -189,6 +193,10 @@
<b class="text-xs border border-black pl-1">Disahkan oleh</b>
<p class="h-14"></p>
<div class="flex">
{{-- <div class="w-2/3"></div> --}}
<p class="text-xs w-full text-right italic">{{ $permohonan['nama_operasi'] }}</p>
</div>
<div class="flex">
<div class="w-2/3"></div>
<div class="text-right border-t border-gray-300 w-1/3"></div>
@@ -341,11 +349,11 @@
<b class="text-xs border border-black pl-1 text-center">Bahagian Kewangan & Akaun PKB</b>
<div class="flex">
<p class="text-xs w-full">Bank</p>
<p class="text-xs w-2/3 border border-gray-400 text-right">{{ $permohonan['jenisbank'] }}</p>
<p class="text-xs w-2/3 border border-gray-400 text-right"></p>
</div>
<div class="flex">
<p class="text-xs w-full">No. Resit</p>
<p class="text-xs w-2/3 border border-gray-400 text-right">{{ $permohonan['noresit'] }}</p>
<p class="text-xs w-full">No. Rujukan</p>
<p class="text-xs w-2/3 border border-gray-400 text-right"></p>
</div>
<div class="flex">
<p class="text-xs w-full">Tarikh kemasukan</p>
routes/web.php
+3 -1
View File
@@ -110,4 +110,6 @@ Route::get('/permohonan',['as'=>'permohonan.index','uses'=>'App\Http\Controllers
Route::get('/permohonan/cetakanpb',['as'=>'permohonan.cetakanpb','uses'=>'App\Http\Controllers\PermohonanController@CetakanPB']);
Route::get('/permohonan/cetakanpenuh',['as'=>'permohonan.cetakanpenuh','uses'=>'App\Http\Controllers\PermohonanController@CetakanPenuh']);
Route::get('{any}', function () {
return view('home');
})->where('any','.*');