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

fix

Browse Source
This commit is contained in:
hafifierahman
2022-03-30 08:00:17 +08:00
parent 813664d47a
commit 072a6bd955
9 changed files with 322 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PermohonanController.php
+18
View File
@@ -45,4 +45,22 @@ class PermohonanController extends Controller
return view('permohonan.cetakanpb', compact('cawangan_detail','permohonan','tarikhcetakan'));
}
public function CetakanPenuh(Request $request)
{
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. $request->cawangan)->json();
$cawangan_detail=$cawangan[0];
$current = Carbon::now();
$tarikh_cetak = $current->toDateString();
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$tarikhcetakan = $myDateTime->format('d-m-Y');
$permohonan=Http::get(config('api.url').'/admin/permohonan/get/'. $request->cawangan .'/'. $request->mohonid)->json();
return view('permohonan.cetakanfull', compact('cawangan_detail','permohonan','tarikhcetakan'));
}
}
resources/js/Permohonan/RekodMohon.vue
+18 -1
View File
@@ -70,9 +70,12 @@
<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">
Tindakan
Status
</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">
Tindakan
</th>
</tr>
@@ -228,6 +231,11 @@
<span v-else class="p-2 bg-red-500 rounded text-white">Batal</span>
</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<button @click="CetakanPenuh(mohon.kodcaw,mohon.mohonid)" 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">
CETAK
</button>
</td>
</tr>
@@ -541,6 +549,15 @@ export default {
DepositBank: function (mid) {
this.$refs.bankmodal.mohonid = mid;
this.$refs.bankmodal.showModal = true;
},
CetakanPenuh: function (caw, mid) {
let route = window.route('permohonan.cetakanpenuh', {
_query: {
cawangan: caw,
mohonid: mid
},
});
window.open(route, '_blank')
}
}
}
resources/js/Permohonan/SenaraiMohon.vue
+12 -14
View File
@@ -9,7 +9,7 @@
<h1 class="font-bold flex flex-row justify-end">Permohonan Yang Masih Aktif</h1>
<router-link to="/permohonan/rekod">
<button class="p-2 text-white bg-blue-500 rounded">Rekod Permohonan</button>
<button class="p-2 text-white bg-blue-500 rounded">Rekod Permohonan</button>
</router-link>
</div>
@@ -73,20 +73,18 @@
</thead>
<tbody>
<tr v-if="showpermohonan.data.length === 0">
<td colspan="9" 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">
Tiada Rekod Diperolehi
</p>
</div>
</div>
</td>
<tr v-if="showpermohonan.data.length === 0">
<td colspan="9" class=" px-5 py-5 border-b border-gray-200 bg-white text-sm">
<p class="text-gray-900 whitespace-no-wrap text-center mx-auto">
Tiada Rekod Diperolehi
</p>
</td>
</tr>
</tr>
</tr>
<tr v-for="(mohon,i) in showpermohonan.data" :key="i">
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
@@ -259,7 +257,7 @@
</p>
</div>
<div v-if="(mohon.tagoperasi === 1 && mohon.tagakaun === 0)" class="ml-3">
<div v-else-if="(mohon.tagoperasi === 1 && mohon.tagakaun === 0)" class="ml-3">
<button @click="funcsetuju(mohon.mohonid)" 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">
@@ -344,7 +342,7 @@ export default {
cawangan: {},
username: this.$username,
userroles: this.$userroles,
loader:false
loader: false
}
},
created() {
resources/js/Permohonan/StatusMohon.vue
+37 -3
View File
@@ -10,7 +10,7 @@
<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">{{ this.permohonan.amaun_mohon }}</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>
@@ -203,7 +203,32 @@
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="status.description">
<p v-if="status.statusid === 1" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'NAMA PEMOHON : ' + 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 }}
</p>
<p v-if="status.statusid === 3" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'NAMA AKAUN : ' + 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) }}
</p>
<p v-if="status.statusid === 5" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'JENIS BANK : ' + status[0].jenisbank }} <br> {{ 'NO RESIT :' + status[0].noresit }}
</p>
<p v-if="status.statusid === 6" class="text-gray-900 whitespace-no-wrap">
{{ status.description }} <br> {{ 'NAMA PENERIMA : ' + 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_batal }}
</p>
</div>
@@ -345,6 +370,11 @@
</style>
<script>
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
export default {
data(){
return{
@@ -362,13 +392,17 @@ export default {
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.loadstatus = true;
}
},
formatterfunction(value) {
return formatter.format(value)
},
}
}
</script>
resources/js/components/util/Bankmodal.vue
+34 -21
View File
@@ -19,22 +19,19 @@
<!--body-->
<div class="p-6">
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
Jenis Bank
</label>
<select v-model="selectedbank" 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 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" /> -->
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
No Resit
</label>
<input v-model="noresit" 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" />
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
Jenis 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 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" /> -->
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2 mt-3">
No Resit
</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>
</div>
<!--footer-->
<div class="flex items-center justify-end p-6 border-t border-solid border-blueGray-200 rounded-b">
@@ -62,6 +59,12 @@ import {
createPopper
} from "@popperjs/core";
import {
required,
minLength,
between
} from 'vuelidate/lib/validators'
export default {
props: {
@@ -77,27 +80,27 @@ export default {
mohonid: 0,
selectedbank: 'Sila Pilih Bank',
noresit: 0,
jenisbank:{}
jenisbank: {}
}
},
created(){
created() {
this.senaraiBank();
},
methods: {
toggleModal: function () {
this.showModal = false;
},
senaraiBank: function(){
senaraiBank: function () {
this.axios.get(this.$hostname + '/api/bank').then(response => {
this.jenisbank = response.data;
});
},
FuncHantar: function () {
console.log(this.selectedbank,this.noresit)
// console.log(this.selectedbank,this.noresit)
axios.put(this.$hostname + '/admin/permohonan/updatebank', {
kelulusan: 'Lulus',
jenisbank: this.selectedbank,
noresit: this.mohonid,
noresit: this.noresit,
mohonid: this.mohonid
}).then(response => {
@@ -113,7 +116,17 @@ export default {
}
});
}
}
},
validations: {
selectedbank: {
required,
minLength: minLength(4)
},
noresit: {
required,
minLength: minLength(4)
}
}
}
</script>
resources/views/auth/login.blade.php
+9 -6
View File
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Laravel</title>
<title>Ar-Rahn | Admin Page</title>
<!-- Fonts -->
<link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap" rel="stylesheet">
@@ -162,11 +162,8 @@
<div class="login-page">
<div class="form">
@if (Session::has('error'))
<div role="alert" class="mb-2">
<div class="bg-red-500 text-white font-bold rounded-t px-4 py-2">
Danger
</div>
<div class="border border-t-0 border-red-400 rounded-b bg-red-100 px-4 py-3 text-red-700">
<div role="alert" style="border: 1px solid red; border-radius:10px; background-color:#d63031;margin-bottom:10%;">
<div class="border border-t-0 border-red-400 rounded-b bg-red-100 px-4 py-3" style="color:white;">
<p>{{ Session::get('error') }}</p>
</div>
</div>
@@ -174,7 +171,13 @@
<form class="login-form" method="POST" action="{{ route('login') }}">
@csrf
<input type="text" placeholder="email" name="email"/>
@error('email')
<p style="color:#d63031;font-size: 11px;font-style: italic;font-weight: bold;margin-top:0;" >{{ $message }}</p>
@enderror
<input type="password" placeholder="password" name="password"/>
@error('password')
<p style="color:#d63031;font-size: 11px;font-style: italic;font-weight: bold;margin-top:0;">{{ $message }}</p>
@enderror
<button>DAFTAR MASUK</button>
</form>
</div>
resources/views/permohonan/cetakanfull.blade.php
+182
View File
@@ -0,0 +1,182 @@
<!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>Pengeluaran Cetakan Pengurus Besar</title>
<link rel="icon" type="image/x-icon" href="{{ asset('img/icon_pkb.png') }}" />
<link href="{{ asset('css/all.min.css') }}" rel="stylesheet">
<!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script>
<!-- Fonts -->
<link rel="dns-prefetch" href="//fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
</head>
<body class="p-2">
<div class="mb-10">
<div class="flex w-full">
<div class="w-1/12 mt-4">
<img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"/>
</div>
<div class="ml-2 w-8/12 flex flex-col justify-end">
<b>PERMODALAN KELANTAN BERHAD</b>
<p class="text-xs">{{ $cawangan_detail['namacaw'] }}</p>
<p class="text-xs">{{ $cawangan_detail['alamat1'] }}</p>
<p class="text-xs">{{ $cawangan_detail['alamat2'] }}</p>
</div>
<div class="w-3/12 flex flex-col justify-end">
<p class="text-xs">No Tel : {{ $cawangan_detail['notel'] }}</p>
<p class="text-xs">No Faks : {{ $cawangan_detail['nofaks'] }}</p>
</div>
</div>
</div>
<div class="flex mb-6">
<div class="ml-2 w-9/12 flex flex-col justify-end">
<b class="text-sm">Kepada:</b>
<p class="text-xs">Pengurus Besar Kumpulan PKB</p>
</div>
<div class="ml-2 w-3/12 flex flex-col">
<b class="text-sm">No Permohonan:</b>
<p class="text-xs">{{ $permohonan['nopermohonan'] }}</p>
</div>
</div>
<div class="flex mb-6">
<div class="ml-2 w-9/12 flex flex-col justify-end">
<b class="text-sm">Daripada:</b>
<p class="text-xs">Pengurus Cawangan {{ $cawangan_detail['namacaw'] }}</p>
<p class="text-xs">Nama : {{ $permohonan['nama_pemohon'] }}</p>
{{-- <p class="text-xs">NO KP : 970403-03-5003</p> --}}
</div>
<div class="ml-2 w-3/12 flex flex-col">
<b class="text-sm">Tarikh:</b>
<p class="text-xs">{{ $tarikhcetakan }}</p>
</div>
</div>
@if($permohonan['jenismohon'] === 'permohonanwang')
<h4 class="ml-2 text-lg font-bold underline">PERMOHONAN WANG</h4>
@else
<h4 class="ml-2 text-lg font-bold underline">BAYARAN BALIK</h4>
@endif
<div class="flex justify-content-center justify-center items-center mt-6">
<table class="border-2 text-sm border-black p-2 w-full">
<tr>
@if($permohonan['jenismohon'] === 'permohonanwang')
<td class="border-2 border-black p-2">Jumlah Dipohon</td>
@else
<td class="border-2 border-black p-2">Bayaran Balik</td>
@endif
<td class="border-2 border-black p-2 text-right">RM {{ number_format($permohonan['amaun_mohon'],2) }}</td>
</tr>
<tr>
<td class="border-2 border-black p-2">Tarikh Mohon</td>
<td class="border-2 border-black p-2 text-right">
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_permohonan']);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp
</td>
</tr>
<tr>
<td class="border-2 border-black p-2">Baki Peti Besi</td>
<td class="border-2 border-black p-2 text-right">RM {{ number_format($permohonan['baki_petibesi'],2) }}</td>
</tr>
</table>
</div>
<div class="block">
{{-- <div class="p-2 w-full h-100"></div> --}}
</div>
<div class="flex mb-6 mt-12 mx-auto justify-content-center items-center">
<div class="ml-2 w-6/12 flex flex-col justify-end">
<b class="text-sm">Disediakan oleh:</b>
<p class="h-8"></p>
<p>.........................................................</p>
<p class="text-xs font-bold ">Pengurus Cawangan {{ $cawangan_detail['namacaw'] }}</p>
<p class="text-xs">Nama : {{ $permohonan['nama_pemohon'] }}</p>
<p class="text-xs">Tarikh : {{ $tarikhcetakan }}</p>
</div>
<div class="ml-2 w-6/12 flex flex-col justify-end">
<b class="text-sm">Disahkan oleh:</b>
<p class="h-8"></p>
<p>.........................................................</p>
<p class="text-xs font-bold">Operasi Permodalan Kelantan Berhad</p>
<p class="text-xs">Nama : {{ $permohonan['nama_operasi'] }}</p>
<p class="text-xs">Tarikh : {{ $tarikhcetakan }}</p>
</div>
</div>
<h4 class="ml-2 text-lg font-bold underline">KELULUSAN DARIPADA PERMODALAN KELANTAN BERHAD</h4>
<p class="text-sm ml-2 font-bold">Jumlah yang diluluskan : RM {{ number_format($permohonan['jumlah_diluluskan'],2) }}</p>
<div class="flex mb-6 mx-auto justify-center items-center">
<div class="ml-2 w-6/12 flex flex-col justify-end">
<b class="text-sm">Disahkan oleh:</b>
<p class="h-8"></p>
<p>.........................................................</p>
<p class="text-xs font-bold ">Akaun Permodalan Kelantan Berhad</p>
<p class="text-xs">Nama : {{ $permohonan['nama_akaun'] }}</p>
<p class="text-xs">Tarikh : {{ $tarikhcetakan }}</p>
</div>
<div class="ml-2 w-6/12 flex flex-col justify-end">
<b class="text-sm">Disahkan oleh:</b>
<p class="h-8"></p>
<p>.........................................................</p>
<p class="text-xs font-bold">Pengurus Besar</p>
<p class="text-xs">Nama : Pengurus Besar</p>
<p class="text-xs">Tarikh : {{ $tarikhcetakan }}</p>
</div>
</div>
<div class="flex mb-6 mt-12">
<div class="ml-2 w-6/12 flex flex-col justify-end">
<b class="text-sm">Penerima Wang:</b>
<p class="h-8"></p>
<p>.........................................................</p>
<p class="text-xs font-bold ">Pengurus Cawangan {{ $cawangan_detail['namacaw'] }}</p>
<p class="text-xs">Nama : {{ $permohonan['nama_penerima'] }}</p>
<p class="text-xs">Tarikh Terima: {{ $permohonan['tarikh_terima'] }}</p>
</div>
<div class="ml-2 w-6/12 flex flex-col justify-end">
<b class="text-sm">Bahagian Kewangan & Akaun PKB</b>
<p class="h-8"></p>
<p class="text-xs font-bold">Bank : {{ $permohonan['jenisbank'] }}</p>
<p class="text-xs">Resit : {{ $permohonan['noresit'] }}</p>
<p class="text-xs">Tarikh Kemasukan: {{ $permohonan['tarikh_bankin'] }}</p>
</div>
</div>
<script>
window.print();
// window.onfocus=function(){ window.close();}
</script>
</body>
</html>
resources/views/permohonan/cetakanpb.blade.php
+10 -2
View File
@@ -74,12 +74,20 @@
</div>
</div>
<h4 class="ml-2 text-lg font-bold underline">PERMOHONAN WANG</h4>
@if($permohonan['jenismohon'] === 'permohonanwang')
<h4 class="ml-2 text-lg font-bold underline">PERMOHONAN WANG</h4>
@else
<h4 class="ml-2 text-lg font-bold underline">BAYARAN BALIK</h4>
@endif
<div class="flex justify-content-center justify-center items-center mt-6">
<table class="border-2 text-sm border-black p-2 w-full">
<tr>
<td class="border-2 border-black p-2">Jumlah Dipohon</td>
@if($permohonan['jenismohon'] === 'permohonanwang')
<td class="border-2 border-black p-2">Jumlah Dipohon</td>
@else
<td class="border-2 border-black p-2">Bayaran Balik</td>
@endif
<td class="border-2 border-black p-2 text-right">RM {{ number_format($permohonan['amaun_mohon'],2) }}</td>
</tr>
<tr>
routes/web.php
+2
View File
@@ -102,4 +102,6 @@ Route::get('/mintasemulakelulusan','App\Http\Controllers\PermohonanController@Mi
//Permohonan Wang
Route::get('/permohonan',['as'=>'permohonan.index','uses'=>'App\Http\Controllers\PermohonanController@index']);
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']);