fix skit2
This commit is contained in:
@@ -9,6 +9,8 @@ use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Carbon\Carbon;
|
||||
|
||||
use App\Events\NotifikasiKelulusan;
|
||||
|
||||
class KelulusanController extends Controller
|
||||
{
|
||||
public function index()
|
||||
@@ -41,7 +43,6 @@ class KelulusanController extends Controller
|
||||
|
||||
$norujukan = $request->norujukan;
|
||||
|
||||
|
||||
if($request->pembatalan == null)
|
||||
{
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
|
||||
@@ -49,6 +50,7 @@ class KelulusanController extends Controller
|
||||
'siri' => $request->siri
|
||||
])->json();
|
||||
|
||||
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
|
||||
'sahkan' => 1,
|
||||
'namaoperasi' => $request->namaoperasi,
|
||||
@@ -79,9 +81,6 @@ class KelulusanController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return response()->json($updatelulus,200);
|
||||
}
|
||||
|
||||
|
||||
@@ -36,8 +36,9 @@ return [
|
||||
'secret' => env('PUSHER_APP_SECRET'),
|
||||
'app_id' => env('PUSHER_APP_ID'),
|
||||
'options' => [
|
||||
'cluster' => env('PUSHER_APP_CLUSTER'),
|
||||
'useTLS' => true,
|
||||
'cluster' => 'ap1',
|
||||
'useTLS' => false,
|
||||
'scheme' => 'http'
|
||||
],
|
||||
],
|
||||
|
||||
|
||||
Generated
+1577
-1351
File diff suppressed because it is too large
Load Diff
+12
-10
@@ -10,16 +10,16 @@
|
||||
"production": "mix --production"
|
||||
},
|
||||
"devDependencies": {
|
||||
"autoprefixer": "^10.4.2",
|
||||
"autoprefixer": "^10.4.4",
|
||||
"axios": "^0.21.4",
|
||||
"bootstrap": "^4.6.0",
|
||||
"jquery": "^3.6",
|
||||
"laravel-mix": "^6.0.39",
|
||||
"laravel-mix": "^6.0.43",
|
||||
"lodash": "^4.17.19",
|
||||
"popper.js": "^1.16.1",
|
||||
"postcss": "^8.4.5",
|
||||
"postcss": "^8.4.12",
|
||||
"resolve-url-loader": "^3.1.2",
|
||||
"sass": "^1.47.0",
|
||||
"sass": "^1.50.0",
|
||||
"sass-loader": "^11.0.1",
|
||||
"tailwindcss": "^2.2.19",
|
||||
"vue": "^2.6.12",
|
||||
@@ -29,16 +29,18 @@
|
||||
"vue-template-compiler": "^2.6.12"
|
||||
},
|
||||
"dependencies": {
|
||||
"@headlessui/vue": "^1.4.2",
|
||||
"@popperjs/core": "^2.11.2",
|
||||
"@headlessui/vue": "^1.5.0",
|
||||
"@popperjs/core": "^2.11.5",
|
||||
"@vue-hero-icons/outline": "^1.7.2",
|
||||
"@vue-hero-icons/solid": "^1.7.2",
|
||||
"@vue/composition-api": "^1.4.3",
|
||||
"alpinejs": "^3.7.1",
|
||||
"apexcharts": "^3.33.0",
|
||||
"@vue/composition-api": "^1.4.9",
|
||||
"alpinejs": "^3.9.6",
|
||||
"apexcharts": "^3.35.0",
|
||||
"jw-vue-pagination": "^1.0.3",
|
||||
"laravel-echo": "^1.11.4",
|
||||
"pusher-js": "^7.0.6",
|
||||
"vue-apexcharts": "^1.6.2",
|
||||
"vue-axios": "^3.4.0",
|
||||
"vue-axios": "^3.4.1",
|
||||
"vue-class-component": "^7.2.6",
|
||||
"vue-content-placeholders": "^0.2.1",
|
||||
"vue-moment": "^4.1.0",
|
||||
|
||||
Vendored
+21076
-4848
File diff suppressed because one or more lines are too long
@@ -4,42 +4,41 @@
|
||||
|
||||
<div v-if="this.showloader === true" class="bg-white md:items-center md:justify-between shadow rounded-lg p-4 md:p-6 xl:p-8 my-6">
|
||||
|
||||
<template v-if="showkelulusan.data.length > 0">
|
||||
<template v-if="Object.keys(showkelulusan.data).length > 0">
|
||||
<div v-for="(kelulusan,index) in showkelulusan.data" :key="index" class="flex flex-wrap w-full">
|
||||
<div class="w-full border rounded-l p-4">
|
||||
<div class="flex flex-wrap mb-4">
|
||||
<p class="font-bold text-xl w-1/3">{{ kelulusan.kelulusanall[0].norujukan }}</p>
|
||||
<p class="font-bold text-md w-1/3 text-red-500 justify-center flex text-center">{{ kelulusan.kelulusanall[0].status }}</p>
|
||||
<p class="font-bold text-xl w-1/3">{{ kelulusan.norujukan }}</p>
|
||||
<p class="font-bold text-md w-1/3 text-red-500 justify-center flex text-center">{{ kelulusan.status }}</p>
|
||||
<p class="font-bold text-xl w-1/3 text-gray-500 flex justify-end">Ar-Rahn {{ kelulusan.cawangan }}</p>
|
||||
</div>
|
||||
<div class="flex flex-wrap">
|
||||
<p class="font-bold text-green-500 w-1/2">PC/PPC: <span class="text-black font-normal text-md capitalize">{{ kelulusan.kelulusanall[0].khazanah }}</span></p>
|
||||
<p class="w-1/4 text-sm text-gray-700">Pembiayaan: RM{{ changeFormat(kelulusan.kelulusanall[0].jumpinj) }}</p>
|
||||
<p class="w-1/4 text-sm text-gray-700">Nilai Marhun: RM{{ changeFormat(kelulusan.kelulusanall[0].nilaimarhun) }}</p>
|
||||
<p class="font-bold text-green-500 w-1/2">PC/PPC: <span class="text-black font-normal text-md capitalize">{{ kelulusan.khazanah }}</span></p>
|
||||
<p class="w-1/4 text-sm text-gray-700">Pembiayaan: RM{{ changeFormat(kelulusan.jumpinj) }}</p>
|
||||
<p class="w-1/4 text-sm text-gray-700">Nilai Marhun: RM{{ changeFormat(kelulusan.nilaimarhun) }}</p>
|
||||
</div>
|
||||
<div class="flex flex-wrap">
|
||||
<p class="font-bold text-green-500 w-1/2">Teller: <span class="text-black font-normal text-md capitalize">{{ kelulusan.kelulusanall[0].teller }}</span></p>
|
||||
<p class="w-1/4 text-sm text-gray-700">Margin: {{ kelulusan.kelulusanall[0].margin }}%</p>
|
||||
<p class="w-1/4 text-sm text-gray-700">Berat: {{ kelulusan.kelulusanall[0].berat }} gm</p>
|
||||
<p class="font-bold text-green-500 w-1/2">Teller: <span class="text-black font-normal text-md capitalize">{{ kelulusan.teller }}</span></p>
|
||||
<p class="w-1/4 text-sm text-gray-700">Margin: {{ kelulusan.margin }}%</p>
|
||||
<p class="w-1/4 text-sm text-gray-700">Berat: {{ kelulusan.berat }} gm</p>
|
||||
</div>
|
||||
<div class="flex flex-wrap">
|
||||
<p class="font-bold text-green-500 w-3/4">Komen: <span class="text-black font-normal text-md w-1/4">{{ kelulusan.kelulusanall[0].komen }}</span></p>
|
||||
<p class="font-bold text-green-500 w-3/4">Komen: <span class="text-black font-normal text-md w-1/4">{{ kelulusan.komen }}</span></p>
|
||||
|
||||
</div>
|
||||
<!-- <p class="font-bold text-xl">KB2210232-00032</p> -->
|
||||
|
||||
<div class="mx-auto flex justify-between mb-auto text-sm text-gray-500 mt-4">
|
||||
<!-- 10 Jul 2018, 05:56PM -->
|
||||
{{ kelulusan.kelulusanall[0].tarikh | moment("calendar") }}
|
||||
{{ kelulusan.tarikh | moment("calendar") }}
|
||||
|
||||
<div class="pl-4">
|
||||
<button class="bg-yellow-500 hover:bg-yellow-700 text-white font-bold py-1 px-6 border border-yellow-500 rounded mr-1" @click.prevent="ApproveFunc"><i class="fas fa-thumbs-up mr-1 text-md"></i> Lulus</button>
|
||||
<button class="bg-red-500 hover:bg-red-700 text-white font-bold py-1 px-6 border border-red-500 rounded mr-1" @click.prevent="DisapproveFunc"><i class="fas fa-thumbs-down mr-1 text-md"></i> Tidak Lulus</button>
|
||||
<button class="bg-yellow-500 hover:bg-yellow-700 text-white font-bold py-1 px-6 border border-yellow-500 rounded mr-1" @click.prevent="ApproveFunc(kelulusan.norujukan,kelulusan.cawangankod,kelulusan.teller,kelulusan.siri)"><i class="fas fa-thumbs-up mr-1 text-md"></i> Lulus</button>
|
||||
<button class="bg-red-500 hover:bg-red-700 text-white font-bold py-1 px-6 border border-red-500 rounded mr-1" @click.prevent="DisapproveFunc(kelulusan.norujukan,kelulusan.cawangankod,kelulusan.teller,kelulusan.siri)"><i class="fas fa-thumbs-down mr-1 text-md"></i> Tidak Lulus</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<pagination :data="paginate" @clickEvent_="getKelulusanList"></pagination>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div class="flex place-content-center w-full">
|
||||
@@ -51,6 +50,8 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<pagination :data="paginate" @clickEvent_="getKelulusanList"></pagination>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -74,7 +75,7 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
currentPage: 1,
|
||||
showkelulusan: [],
|
||||
showkelulusan: {},
|
||||
paginate: {},
|
||||
showloader: false
|
||||
}
|
||||
@@ -87,18 +88,23 @@ export default {
|
||||
return formatter.format(data)
|
||||
},
|
||||
getKelulusanList(pageNumber) {
|
||||
this.showloader = false
|
||||
|
||||
this.axios.get(this.$hostname + '/admin/ListOperasi/Paginate', {
|
||||
params: {
|
||||
page: pageNumber
|
||||
}
|
||||
}).then(response => {
|
||||
console.log(response.data)
|
||||
this.showkelulusan = response.data
|
||||
this.paginate = response.data
|
||||
this.currentPage = pageNumber
|
||||
this.showloader = true
|
||||
});
|
||||
},
|
||||
ApproveFunc: async function () {
|
||||
ApproveFunc: async function (noruj, kcaw, tel, sir) {
|
||||
let boolkatalaluan = 0;
|
||||
console.log(noruj, kcaw, tel, sir)
|
||||
const {
|
||||
value: katalaluan
|
||||
} = await this.$swal({
|
||||
@@ -111,9 +117,19 @@ export default {
|
||||
allowOutsideClick: false
|
||||
})
|
||||
|
||||
const {
|
||||
value: komen
|
||||
} = await this.$swal({
|
||||
await this.axios.post('/mintasemulakelulusan', {
|
||||
passsemula: katalaluan
|
||||
}).then(response => {
|
||||
if (response.data === 0) {
|
||||
boolkatalaluan = 0;
|
||||
} else {
|
||||
boolkatalaluan = 1;
|
||||
}
|
||||
});
|
||||
|
||||
if (boolkatalaluan == 1) {
|
||||
|
||||
await this.$swal({
|
||||
title: 'Masukkan Komen',
|
||||
input: 'text',
|
||||
inputPlaceholder: 'Komen',
|
||||
@@ -121,20 +137,34 @@ export default {
|
||||
showCancelButton: true,
|
||||
cancelButtonText: 'Batal',
|
||||
allowOutsideClick: false
|
||||
})
|
||||
}).then((result) => {
|
||||
|
||||
if (result.isConfirmed) {
|
||||
|
||||
return this.axios.post('/api/check/kelulusan/operasi', {
|
||||
norujukan: s,
|
||||
komenkelulusan: s,
|
||||
kodcaw: s,
|
||||
namaoperasi: s,
|
||||
teller: s,
|
||||
siri:s
|
||||
norujukan: noruj,
|
||||
komenkelulusan: result.value,
|
||||
kodcaw: kcaw,
|
||||
namaoperasi: this.$attrs['namaoperasi'],
|
||||
teller: tel,
|
||||
siri: sir,
|
||||
}).then((response) =>{
|
||||
if(response.data == 1)
|
||||
{
|
||||
this.getKelulusanList(1)
|
||||
}
|
||||
});
|
||||
|
||||
} else if (result.isDenied) {
|
||||
Swal.fire('Changes are not saved', '', 'info')
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
},
|
||||
DisapproveFunc: async function () {
|
||||
|
||||
DisapproveFunc: async function (noruj, kcaw, tel, sir) {
|
||||
let boolkatalaluan = 0;
|
||||
const {
|
||||
value: katalaluan
|
||||
} = await this.$swal({
|
||||
@@ -147,6 +177,17 @@ export default {
|
||||
allowOutsideClick: false
|
||||
})
|
||||
|
||||
await this.axios.post('/mintasemulakelulusan', {
|
||||
passsemula: katalaluan
|
||||
}).then(response => {
|
||||
if (response.data === 0) {
|
||||
boolkatalaluan = 0;
|
||||
} else {
|
||||
boolkatalaluan = 1;
|
||||
}
|
||||
});
|
||||
|
||||
if (boolkatalaluan == 1) {
|
||||
const {
|
||||
value: komen
|
||||
} = await this.$swal({
|
||||
@@ -160,15 +201,17 @@ export default {
|
||||
})
|
||||
|
||||
return this.axios.post('/api/check/kelulusan/operasi', {
|
||||
norujukan: s,
|
||||
komenkelulusan: s,
|
||||
kodcaw: s,
|
||||
namaoperasi: s,
|
||||
teller: s,
|
||||
siri,
|
||||
norujukan: noruj,
|
||||
komenkelulusan: komen,
|
||||
kodcaw: kcaw,
|
||||
namaoperasi: this.$attrs['namaoperasi'],
|
||||
teller: tel,
|
||||
siri: sir,
|
||||
pembatalan: "batal"
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
},
|
||||
RedirectHome: function () {
|
||||
return window.location.href = '/';
|
||||
|
||||
Vendored
+8
-8
@@ -29,13 +29,13 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
|
||||
* allows your team to easily build robust real-time web applications.
|
||||
*/
|
||||
|
||||
// import Echo from 'laravel-echo';
|
||||
import Echo from 'laravel-echo';
|
||||
|
||||
// window.Pusher = require('pusher-js');
|
||||
window.Pusher = require('pusher-js');
|
||||
|
||||
// window.Echo = new Echo({
|
||||
// broadcaster: 'pusher',
|
||||
// key: process.env.MIX_PUSHER_APP_KEY,
|
||||
// cluster: process.env.MIX_PUSHER_APP_CLUSTER,
|
||||
// forceTLS: true
|
||||
// });
|
||||
window.Echo = new Echo({
|
||||
broadcaster: 'pusher',
|
||||
key: process.env.MIX_PUSHER_APP_KEY,
|
||||
cluster: process.env.MIX_PUSHER_APP_CLUSTER,
|
||||
forceTLS: true
|
||||
});
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
<template>
|
||||
<div class="container">
|
||||
<div id="notification" ref="notification" class="notification cursor-pointer" v-on:click="toggleDropdown()"></div>
|
||||
<div ref="popoverDropdownRef" v-bind:class="{'hidden': !dropdownShow, 'block': dropdownShow}" class="origin-top-right w-96 right-0 mt-2 w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1">
|
||||
<div v-if="this.showloader === true" ref="popoverDropdownRef" v-bind:class="{'hidden': !dropdownShow, 'block': dropdownShow}" class="origin-top-right w-96 right-0 mt-2 w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1">
|
||||
<div class="py-1 px-2" role="none">
|
||||
<template>
|
||||
<template v-if="showkelulusan.data.length > 0">
|
||||
<!-- <template v-if="showkelulusan.data.length > 0"> -->
|
||||
<div v-for="(kelulusan,index) in showkelulusan.data" :key="index" class="text-gray-700 block px-2 py-5 text-sm hover:bg-yellow-500 cursor-pointer">
|
||||
<div class="justify-between flex">
|
||||
<div class="w-4/6">
|
||||
<p class="font-bold -mt-4">Ar-Rahn {{ kelulusan.cawangan }}</p>
|
||||
<p class="font-bold text-sm text-red-500">{{ kelulusan.kelulusanall[0].status }}</p>
|
||||
<p class="font-bold text-sm text-red-500">{{ kelulusan.status }}</p>
|
||||
<!-- <p class="-mb-4 text-sm">4 hours ago</p> -->
|
||||
</div>
|
||||
<div class="w-3/6">
|
||||
<p class="font-bold -mt-4 justify-end flex">{{ kelulusan.kelulusanall[0].norujukan }}</p>
|
||||
<p class="font-bold -mt-4 justify-end flex">{{ kelulusan.norujukan }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
<!-- <a class="text-gray-700 block px-4 py-2 text-sm hover:bg-yellow-500 cursor-pointer" role="menuitem" tabindex="-1" id="menu-item-0">a<br><b>a</b></a> -->
|
||||
<!-- <template v-else> -->
|
||||
<template>
|
||||
<template v-else>
|
||||
<div class="flex place-content-center w-full">
|
||||
<div class="grid mx-auto mb-4">
|
||||
<img src="/img/notify.jpg" class="h-20 w-20 mx-auto" alt="Windster Logo">
|
||||
@@ -149,7 +149,8 @@ export default {
|
||||
dropdownShow: false,
|
||||
currentPage: 1,
|
||||
showkelulusan:[],
|
||||
paginate:{}
|
||||
paginate:{},
|
||||
showloader:false
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@@ -244,6 +245,7 @@ export default {
|
||||
this.showkelulusan = response.data
|
||||
this.paginate = response.data
|
||||
this.currentPage = pageNumber
|
||||
this.showloader = true
|
||||
});
|
||||
},
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
|
||||
<div>
|
||||
<div>
|
||||
<modal ref="modal" @clickEvent_="getDataSenaraiSAG"></modal>
|
||||
|
||||
<form :class="{ 'w-2/3' : this.showsag}" class="w-1/2 mt-10 p-6 bg-white rounded-xl shadow mx-auto">
|
||||
@@ -29,7 +28,7 @@
|
||||
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2">
|
||||
Ic No
|
||||
</label>
|
||||
<input :class="{ 'border border-red-500 focus:border-red-500': $v.icno.$error }" class="appearance-none block w-full bg-gray-200 text-gray-700 border border-gray-200 rounded py-3 px-4 leading-tight focus:outline-none focus:bg-white focus:border-gray-500" v-model.trim="$v.icno.$model" type="text" >
|
||||
<input :class="{ 'border border-red-500 focus:border-red-500': $v.icno.$error }" class="appearance-none block w-full bg-gray-200 text-gray-700 border border-gray-200 rounded py-3 px-4 leading-tight focus:outline-none focus:bg-white focus:border-gray-500" v-model.trim="$v.icno.$model" type="text">
|
||||
<div class="text-red-500 text-xs italic" v-if="!$v.icno.required">Field is required</div>
|
||||
<div class="text-red-500 text-xs italic" v-if="!$v.icno.minLength">Name must have at least {{$v.name.$params.minLength.min}} letters.</div>
|
||||
</div>
|
||||
@@ -117,7 +116,8 @@
|
||||
<option v-for="(bank,i) in jenisbank" :key="i" :value="bank.abbreviation">{{ bank.name }}</option>
|
||||
</select>
|
||||
<div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
|
||||
<svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"/></svg>
|
||||
<svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||
<path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z" /></svg>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -131,7 +131,6 @@
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="flex items-center justify-between mt-4">
|
||||
|
||||
<a class="inline-block align-baseline font-bold text-sm text-blue-500 hover:text-blue-800" href="#">
|
||||
@@ -415,7 +414,6 @@
|
||||
<pagination :data="sudahtebuspaginate" @clickEvent_="getDataSenaraiSAG"></pagination>
|
||||
</div>
|
||||
|
||||
|
||||
<div v-if="selected=='lelong'">
|
||||
<table class="min-w-full leading-normal">
|
||||
<thead class="text-center">
|
||||
@@ -535,11 +533,15 @@
|
||||
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { required, minLength, between } from 'vuelidate/lib/validators'
|
||||
import {
|
||||
required,
|
||||
minLength,
|
||||
between
|
||||
} from 'vuelidate/lib/validators'
|
||||
import modal from '../components/util/RekodBayaranModal.vue'
|
||||
import pagination from '../components/pagination.vue'
|
||||
|
||||
@@ -583,29 +585,28 @@ export default {
|
||||
kodnegeri: '',
|
||||
selectbank: (this.customer.kodbank) ? this.customer.kodbank : '',
|
||||
noakaunbank: this.customer.noakaun,
|
||||
jenisbank:[],
|
||||
jenisbank: [],
|
||||
submitStatus: '',
|
||||
responsepostdata: 0,
|
||||
showprofile: true,
|
||||
showsag: false,
|
||||
selected:'belum_tebus',
|
||||
selected: 'belum_tebus',
|
||||
currentPage: 1,
|
||||
objbelumtebus: {},
|
||||
objsudahtebus: {},
|
||||
objlelong:{},
|
||||
sudahtebuspaginate:{},
|
||||
belumtebuspaginate:{},
|
||||
lelongpaginate:{},
|
||||
objlelong: {},
|
||||
sudahtebuspaginate: {},
|
||||
belumtebuspaginate: {},
|
||||
lelongpaginate: {},
|
||||
search: ''
|
||||
}
|
||||
},
|
||||
setup: (props, context) => {
|
||||
|
||||
|
||||
},
|
||||
mounted() {
|
||||
this.axios.get(this.$hostname + '/api/poskod/' + this.poskod).then(response => {
|
||||
this.koddaerahCall(response.data.kodnegeri,response.data.koddaerah)
|
||||
this.koddaerahCall(response.data.kodnegeri, response.data.koddaerah)
|
||||
});
|
||||
|
||||
this.axios.get(this.$hostname + '/api/bank/').then(response => {
|
||||
@@ -613,22 +614,16 @@ export default {
|
||||
});
|
||||
},
|
||||
watch: {
|
||||
selected: function(val, oldVal) {
|
||||
|
||||
selected: function (val, oldVal) {
|
||||
this.showsag = false;
|
||||
this.getDataSenaraiSAG(this.currentPage);
|
||||
// for (var i = 0; i < this.cases.length; i++) {
|
||||
// if (this.cases[i].status == val) {
|
||||
// this.activeCases.push(this.cases[i]);
|
||||
// alert("Fired! " + val);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
formatexchange: function(value){
|
||||
formatexchange: function (value) {
|
||||
return formatter.format(value)
|
||||
},
|
||||
koddaerahCall: function(negeri,daerah) {
|
||||
koddaerahCall: function (negeri, daerah) {
|
||||
this.axios.get(this.$hostname + '/api/negeri/' + negeri).then(response => {
|
||||
this.kodnegeri = response.data.negeri
|
||||
});
|
||||
@@ -638,56 +633,55 @@ export default {
|
||||
});
|
||||
|
||||
},
|
||||
bankaccount(){
|
||||
bankaccount() {
|
||||
this.axios.get(this.$hostname + '/api/bank/').then(response => {
|
||||
this.jenisbank = response.data
|
||||
return response.data
|
||||
});
|
||||
},
|
||||
triggerPoskod: function(value){
|
||||
triggerPoskod: function (value) {
|
||||
|
||||
this.axios.get(this.$hostname + '/api/poskod/' + value).then(response => {
|
||||
this.koddaerahCall(response.data.kodnegeri,response.data.koddaerah)
|
||||
this.koddaerahCall(response.data.kodnegeri, response.data.koddaerah)
|
||||
});
|
||||
},
|
||||
checkAsaldanTukar(){
|
||||
checkAsaldanTukar() {
|
||||
|
||||
let sama = 0;
|
||||
|
||||
if(this.nameasal == this.name)
|
||||
if (this.nameasal == this.name)
|
||||
sama++;
|
||||
|
||||
if(this.icnoasal == this.icno)
|
||||
if (this.icnoasal == this.icno)
|
||||
sama++;
|
||||
|
||||
if(this.notel1asal == this.notel1)
|
||||
if (this.notel1asal == this.notel1)
|
||||
sama++;
|
||||
|
||||
if(this.notel2asal == this.notel2)
|
||||
if (this.notel2asal == this.notel2)
|
||||
sama++;
|
||||
|
||||
if(this.nopelasal == this.nopel)
|
||||
if (this.nopelasal == this.nopel)
|
||||
sama++;
|
||||
|
||||
if(this.alamatasal == this.alamat)
|
||||
if (this.alamatasal == this.alamat)
|
||||
sama++;
|
||||
|
||||
if(this.notaasal == this.nota)
|
||||
if (this.notaasal == this.nota)
|
||||
sama++;
|
||||
|
||||
if(this.poskodasal == this.poskod)
|
||||
if (this.poskodasal == this.poskod)
|
||||
sama++;
|
||||
|
||||
if(this.selectbankasal == this.selectbank)
|
||||
if (this.selectbankasal == this.selectbank)
|
||||
sama++;
|
||||
|
||||
if(this.noakaunbankasal == this.noakaunbank)
|
||||
if (this.noakaunbankasal == this.noakaunbank)
|
||||
sama++;
|
||||
|
||||
if(sama == 10)
|
||||
{
|
||||
if (sama == 10) {
|
||||
return false;
|
||||
}else{
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
},
|
||||
@@ -701,35 +695,32 @@ export default {
|
||||
this.submitStatus = 'PENDING'
|
||||
let kesamaan = this.checkAsaldanTukar()
|
||||
// console.log(kesamaan)
|
||||
if(kesamaan == false)
|
||||
{
|
||||
if (kesamaan == false) {
|
||||
this.$toast.info('Tiada penukaran dibuat')
|
||||
this.submitStatus = 'OK'
|
||||
}else{
|
||||
} else {
|
||||
let result = this.PostData()
|
||||
let pro1 = Promise.resolve(result)
|
||||
let self = this
|
||||
|
||||
pro1.then(function(response) {
|
||||
if(response.data == 1)
|
||||
{
|
||||
pro1.then(function (response) {
|
||||
if (response.data == 1) {
|
||||
setTimeout(() => {
|
||||
self.submitStatus = 'OK'
|
||||
self.$toast.success('Berjaya dikemaskini!')
|
||||
}, 500)
|
||||
}else{
|
||||
} else {
|
||||
self.$toast.error('Error occured')
|
||||
}
|
||||
}, function(e) {
|
||||
}, function (e) {
|
||||
console.error(e); // TypeError: Throwing
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
async PostData(){
|
||||
async PostData() {
|
||||
|
||||
let response = await this.axios.put(this.$hostname + '/api/customers/information/update/admin',
|
||||
{
|
||||
let response = await this.axios.put(this.$hostname + '/api/customers/information/update/admin', {
|
||||
icno: this.icno,
|
||||
ic_asal: this.icnoasal,
|
||||
telefon1: this.notel1,
|
||||
@@ -744,45 +735,42 @@ export default {
|
||||
|
||||
return response
|
||||
},
|
||||
TabsAndPills: function(event){
|
||||
TabsAndPills: function (event) {
|
||||
let targetId = event.currentTarget.id;
|
||||
|
||||
event.preventDefault();
|
||||
if(targetId === 'profile' && this.showprofile === false)
|
||||
{
|
||||
if (targetId === 'profile' && this.showprofile === false) {
|
||||
this.showprofile = true;
|
||||
this.showsag = false;
|
||||
}
|
||||
|
||||
if(targetId === 'senaraisag' && this.showsag === false)
|
||||
{
|
||||
if (targetId === 'senaraisag' && this.showsag === false) {
|
||||
this.getDataSenaraiSAG(this.currentPage);
|
||||
this.showprofile = false;
|
||||
this.showsag = true;
|
||||
}
|
||||
},
|
||||
getDataSenaraiSAG: function(pageNumber){
|
||||
this.axios.get(this.$hostname + '/admin/customers/' + this.icnoasal + '/gadai/' + this.selected,{params: {
|
||||
getDataSenaraiSAG: function (pageNumber) {
|
||||
this.axios.get(this.$hostname + '/admin/customers/' + this.icnoasal + '/gadai/' + this.selected, {
|
||||
params: {
|
||||
page: pageNumber
|
||||
}}).then(response => {
|
||||
if(this.selected === 'belum_tebus')
|
||||
{
|
||||
}
|
||||
}).then(response => {
|
||||
if (this.selected === 'belum_tebus') {
|
||||
this.objbelumtebus = response.data;
|
||||
this.belumtebuspaginate = response.data;
|
||||
}
|
||||
else if(this.selected === 'sudah_tebus')
|
||||
{
|
||||
} else if (this.selected === 'sudah_tebus') {
|
||||
this.objsudahtebus = response.data;
|
||||
this.sudahtebuspaginate = response.data;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
this.objlelong = response.data;
|
||||
this.lelongpaginate = response.data;
|
||||
}
|
||||
|
||||
this.showsag = true;
|
||||
});
|
||||
},
|
||||
rekodBayaran: function(norujukan,pinjaman,hargajualan,nilaimarhun,kodcaw){
|
||||
rekodBayaran: function (norujukan, pinjaman, hargajualan, nilaimarhun, kodcaw) {
|
||||
this.$refs.modal.norujukan = norujukan;
|
||||
this.$refs.modal.pinjaman = pinjaman;
|
||||
this.$refs.modal.hargajualan = hargajualan;
|
||||
@@ -792,23 +780,20 @@ export default {
|
||||
this.$refs.modal.getData();
|
||||
|
||||
},
|
||||
searchsag: function(){
|
||||
this.axios.get(this.$hostname + '/admin/customers/' + this.icnoasal + '/gadai/' + this.selected,{params: {
|
||||
searchsag: function () {
|
||||
this.axios.get(this.$hostname + '/admin/customers/' + this.icnoasal + '/gadai/' + this.selected, {
|
||||
params: {
|
||||
page: 0,
|
||||
search: this.search
|
||||
}}).then(response => {
|
||||
if(this.selected === 'belum_tebus')
|
||||
{
|
||||
}
|
||||
}).then(response => {
|
||||
if (this.selected === 'belum_tebus') {
|
||||
this.objbelumtebus = response.data;
|
||||
this.belumtebuspaginate = response.data;
|
||||
}
|
||||
else if(this.selected === 'sudah_tebus')
|
||||
{
|
||||
} else if (this.selected === 'sudah_tebus') {
|
||||
this.objsudahtebus = response.data;
|
||||
this.sudahtebuspaginate = response.data;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
this.objlelong = response.data;
|
||||
this.lelongpaginate = response.data;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
<breadcrumb :items="[{ 'title' : 'Kelulusan', 'icon' : 'fas fa-thumbs-up' }]"></breadcrumb>
|
||||
|
||||
<kelulusan-component></kelulusan-component>
|
||||
<kelulusan-component namaoperasi="{!! Auth::user()->name !!}"></kelulusan-component>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ Route::group(['prefix' => 'check'], function () {
|
||||
|
||||
Route::get('/cawangan', 'App\Http\Controllers\CawanganController@list');
|
||||
|
||||
Route::put('/kelulusan/operasi', 'App\Http\Controllers\KelulusanController@updatekelulusan');
|
||||
Route::post('/kelulusan/operasi', 'App\Http\Controllers\KelulusanController@updatekelulusan');
|
||||
Route::post('/kelulusan/pb', 'App\Http\Controllers\KelulusanController@updatePB');
|
||||
Route::get('/muatturun', 'App\Http\Controllers\KelulusanController@download');
|
||||
|
||||
|
||||
+1
-1
@@ -97,7 +97,7 @@ Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'App\H
|
||||
Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'App\Http\Controllers\ResitController@resitautotawarruq']);
|
||||
|
||||
//Katalaluan
|
||||
Route::get('/mintasemulakelulusan','App\Http\Controllers\PermohonanController@MintaKelulusan');
|
||||
Route::post('/mintasemulakelulusan','App\Http\Controllers\PermohonanController@MintaKelulusan');
|
||||
|
||||
//Permohonan Wang
|
||||
Route::get('/permohonan',['as'=>'permohonan.index','uses'=>'App\Http\Controllers\PermohonanController@index']);
|
||||
|
||||
Reference in New Issue
Block a user