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

fix cawangan selection

Browse Source
This commit is contained in:
fifi97
2022-01-02 10:01:01 +08:00
parent a1fbeeceed
commit b5cacca3a6
29 changed files with 3269 additions and 27360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+6 -8
View File
@@ -22,8 +22,8 @@ class AliranTunaiController extends Controller
$current = Carbon::now();
$current = new Carbon();
$alirantunai = Http::get(config('api.url') . '/api/GetTunaiByTarikh/' . $request->kodcaw,['kodlaluan' => $request->teller, 'tarikh' => $request->tarikh])->json();
$alirantunai = Http::get(config('api.url') . '/admin/GetTunaiByTarikh/' . $request->kodcaw,['kodlaluan' => $request->teller, 'tarikh' => $request->tarikh])->json(); //
// dd($alirantunai);
$keluar = $alirantunai['keluar'];
$baki = $alirantunai['baki'];
$masuk = $alirantunai['masuk'];
@@ -31,14 +31,13 @@ class AliranTunaiController extends Controller
$pendahuluan = $alirantunai['tambah'];
$serahan = $alirantunai['kurang'];
$addtunai = Http::get(config('api.url') . '/api/getAddTunaiDateKodlaluan/' . $request->kodcaw,['kodlaluan' => $request->teller, 'tarikh' => $request->tarikh])->json();
$addtunai = Http::get(config('api.url') . '/admin/getAddTunaiDateKodlaluan/' . $request->kodcaw,['kodlaluan' => $request->teller, 'tarikh' => $request->tarikh])->json();//
$gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $request->kodcaw .'/'. $request->tarikh)->json();
$tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $request->kodcaw .'/'. $request->tarikh)->json();
$ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $request->kodcaw,['tarikh' => $request->tarikh])->json();
$tuntutbaki = Http::get(config('api.url'). '/api/TuntutBakiTarikhTeller/'. $request->kodcaw,['teller' => $request->teller, 'tarikh' => $request->tarikh])->json();
$advansur = Http::get(config('api.url').'/api/AdvansurSearchByTarikh/'.$request->kodcaw,['kodlaluan' => $request->teller, 'tarikh' => $request->tarikh ])->json();
$lelong = Http::get(config('api.url').'/api/lelong/tarikh/'.$request->kodcaw,['tarikh' => $request->tarikh])->json();
$tuntutbaki = Http::get(config('api.url'). '/admin/TuntutBakiTarikhTeller/'. $request->kodcaw,['teller' => $request->teller, 'tarikh' => $request->tarikh])->json();//
$advansur = Http::get(config('api.url').'/admin/AdvansurSearchByTarikh/'.$request->kodcaw,['kodlaluan' => $request->teller, 'tarikh' => $request->tarikh ])->json();//
$lelong = Http::get(config('api.url').'/api/lelong/tarikh/'.$request->kodcaw,['tarikh' => $request->tarikh])->json();//
$lelongan = 0;
if(strtoupper($request->teller) === 'LELONG')
{
@@ -102,7 +101,6 @@ class AliranTunaiController extends Controller
}
$totalansuran = 0;
foreach($ansuran as $index1=>$ans)
{
app/Http/Controllers/CawanganController.php
+22
View File
@@ -0,0 +1,22 @@
<?php
namespace App\Http\Controllers;
use App\Models\Cawangan;
use Illuminate\Http\Request;
class CawanganController extends Controller
{
// public function __construct()
// {
// $this->middleware('auth');
// }
public function list(Request $request){
$cawangan = Cawangan::get();
return response()->json($cawangan);
}
}
app/Models/Cawangan.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Cawangan extends Model
{
protected $table = 'cawangan';
protected $fillable = [
'caw_id',
'details_caw',
'kodcaw'
];
protected $primaryKey = 'caw_id';
public $timestamps = false;
}
app/Models/UserCaw.php
+17
View File
@@ -0,0 +1,17 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class UserCaw extends Model
{
protected $table = 'users_caw';
protected $fillable = [
'user_id',
'caw_id'
];
public $timestamps = false;
}
package-lock.json
Generated
+91 -16331
View File
File diff suppressed because it is too large Load Diff
package.json
+4 -1
View File
@@ -39,12 +39,15 @@
"vue-apexcharts": "^1.6.2",
"vue-axios": "^3.4.0",
"vue-class-component": "^7.2.6",
"vue-content-placeholders": "^0.2.1",
"vue-global-var": "^1.0.0",
"vue-loading-spinner": "^1.0.11",
"vue-property-decorator": "^9.1.2",
"vue-pusher": "^1.1.0",
"vue-router": "^3.5.3",
"vue-toastification": "^1.7.14",
"vuejs-datetimepicker": "^1.1.13",
"vuelidate": "^0.7.7"
"vuelidate": "^0.7.7",
"vuex": "^3.6.2"
}
}
public/js/app.js
Vendored
+2792 -10910
View File
File diff suppressed because one or more lines are too long
resources/js/Bajet/KemaskiniBajet.vue
+2 -2
View File
@@ -139,7 +139,7 @@ export default {
},
methods: {
getData: function(value){
this.axios.get("http://localhost:8000/admin/senaraiKemaskiniBajet",
this.axios.get(this.$hostname + "/admin/senaraiKemaskiniBajet",
{
params:{
bajetid: value
@@ -193,7 +193,7 @@ export default {
async PostData(){
let response = await this.axios.put('http://localhost:8000/admin/kemaskiniBajet',
let response = await this.axios.put(this.$hostname + '/admin/kemaskiniBajet',
{
bajetid: this.$route.params.id,
bajetjanuari: this.nilaijanuari,
resources/js/Bajet/Senaraibajet.vue
+1 -1
View File
@@ -69,7 +69,7 @@ export default {
this.getData()
},
getData: function(){
this.axios.get('http://localhost:8000/admin/senaraiBajet',{
this.axios.get(this.$hostname + '/admin/senaraiBajet',{
params: {
kodcaw: this.$props.kodcaw,
year: this.pilihantahun
resources/js/Online/SearchSAG.vue
+1 -1
View File
@@ -230,7 +230,7 @@ export default{
if(inputvalue)
{
return this.axios.get('http://localhost:8000/admin/searchSAGOnline', {
return this.axios.get(this.$hostname + '/admin/searchSAGOnline', {
params: {
norujukan: inputvalue
}
resources/js/app.js
Vendored
+42 -2
View File
@@ -7,6 +7,7 @@
import VueApexCharts from 'vue-apexcharts'
import Alpine from 'alpinejs'
import Vue from 'vue'
import Vuex from 'vuex'
import VueCompositionAPI from '@vue/composition-api'
import VueAxios from 'vue-axios'
import axios from 'axios'
@@ -16,14 +17,16 @@ import Toast from "vue-toastification"
import "vue-toastification/dist/index.css"
import router from './routes'
import Vuelidate from 'vuelidate'
import {RotateSquare2} from 'vue-loading-spinner'
import datetime from 'vuejs-datetimepicker';
import VueContentPlaceholders from 'vue-content-placeholders'
import VueGlobalVar from 'vue-global-var'
require('./bootstrap');
window.Vue = require('vue').default;
window.Alpine = Alpine;
Vue.use(Vuex)
const options = {
transition: "Vue-Toastification__fade",
@@ -49,6 +52,8 @@ Vue.component('jw-pagination', JwPagination)
// Vue.use(createPopper)
Vue.use(Toast, options)
Vue.use(datetime)
Vue.use(VueContentPlaceholders)
Alpine.start()
Vue.use(require('vue-pusher'), {
@@ -59,6 +64,40 @@ Vue.use(require('vue-pusher'), {
}
});
Vue.prototype.$hostname = 'http://localhost:8000'
// Vue.prototype.$kodcaw = Vue.observable({
// kodcaw: '020306'
// });
// const cawanganstore = new Vuex.Store({
// kodcaw: 'KB2'
// })
// let globalData = new Vue({
// data: { $kodcaw: '020306' }
// });
// const store = new Vuex.Store({
// state: { $kodcaw: 'KB2' },
// mutations: { update$kodcaw: function(state, newKodcaw) { state.$kodcaw = newKodcaw; } }
// });
// Vue.mixin({
// computed: {
// $kodcaw: {
// get: function () { return store.state.$kodcaw },
// set: function(newKodcaw) { return store.commit('update$kodcaw', newKodcaw); }
// }
// }
// })
Vue.use(VueGlobalVar, {
globals: {
$kodcaw: 'KB2'
},
});
//Chart
Vue.component('pemb-chart', require('./components/Chart/PembiayaanChart.vue').default)
@@ -71,7 +110,7 @@ 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)
Vue.component('petibesi-component', require('./components/Petibesi.vue').default)
Vue.component('cawangan-component', require('./components/cawangan.vue').default)
Vue.component('cawangan-component', require('./components/Cawangan.vue').default)
Vue.component('modal-component', require('./components/util/Modal.vue').default)
Vue.component('searchpelanggan-component', require('./components/Searchpelanggan.vue').default)
Vue.component('laporanakaun-component', require('./Akaun/Laporan.vue').default)
@@ -111,4 +150,5 @@ Vue.component('apexchart', VueApexCharts)
const app = new Vue({
router,
el: '#app',
// store
});
resources/js/components/Analisa/Harian copy.vue
+3 -3
View File
@@ -134,7 +134,7 @@ export default {
},
methods: {
getDataPembiayaan() {
this.axios.get('http://localhost:8000/admin/pembiayaanToday', {
this.axios.get(this.$hostname + '/admin/pembiayaanToday', {
params: {
kodcaw: this.$props.kodcaw
}
@@ -147,7 +147,7 @@ export default {
})
},
getDataPenebusan(){
this.axios.get('http://localhost:8000/admin/penebusanToday', {
this.axios.get(this.$hostname + '/admin/penebusanToday', {
params: {
kodcaw: this.$props.kodcaw
}
@@ -160,7 +160,7 @@ export default {
})
},
getDataKeuntungan(){
this.axios.get('http://localhost:8000/admin/keuntunganToday', {
this.axios.get(this.$hostname + '/admin/keuntunganToday', {
params: {
kodcaw: this.$props.kodcaw
}
resources/js/components/Analisa/Harian.vue
+45 -12
View File
@@ -1,6 +1,12 @@
<template>
<div class="mb-4 w-full grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8">
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadypemb === false">
<content-placeholders>
<content-placeholders-heading :img="true" />
<content-placeholders-text :lines="3" />
</content-placeholders>
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadypemb === true">
<div class="mb-3 mx-auto justify-center flex">
<h3 class="text-3xl font-bold text-gray-500">Pembiayaan</h3>
@@ -55,7 +61,14 @@
</div>
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadypeny === false">
<content-placeholders>
<content-placeholders-heading :img="true" />
<content-placeholders-text :lines="3" />
</content-placeholders>
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 " v-if="datareadypeny === true">
<div class="mb-3 mx-auto justify-center flex">
<h3 class="text-3xl font-bold text-gray-500">Penebusan</h3>
@@ -113,7 +126,14 @@
</div>
</div>
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadykeun === false">
<content-placeholders>
<content-placeholders-heading :img="true" />
<content-placeholders-text :lines="3" />
</content-placeholders>
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 " v-if="datareadykeun === true">
<div class="mb-3 mx-auto justify-center flex">
<h3 class="text-3xl font-bold text-gray-500">Keuntungan</h3>
@@ -184,9 +204,9 @@ const formatter = new Intl.NumberFormat('en-US', {
export default {
props:{
kodcaw: String
},
// props:{
// kodcaw: String
// },
data() {
return {
keuntunganharian:0,
@@ -205,6 +225,9 @@ export default {
percentgadaian:0,
percentcumgadai:0,
bulan:'',
datareadypemb: false,
datareadypeny: false,
datareadykeun: false,
};
},
created() {
@@ -214,9 +237,9 @@ export default {
},
methods: {
getDataPembiayaan() {
this.axios.get('http://localhost:8000/admin/pembiayaanToday', {
this.axios.get(this.$hostname + '/admin/pembiayaanToday', {
params: {
kodcaw: this.$props.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
this.gadaianharian = formatter.format(response.data[0].gadaiToday),
@@ -225,14 +248,18 @@ export default {
this.bulan = response.data[0].bulan,
this.gadaianremaining = formatter.format(response.data[0].remaining.toFixed(2)),
this.percentcumgadai = (100 - response.data[0].percentcum)
if(this.datareadypemb == false)
this.datareadypemb = true;
}).catch(error => {
console.log(error)
})
},
getDataPenebusan(){
this.axios.get('http://localhost:8000/admin/penebusanToday', {
this.axios.get(this.$hostname + '/admin/penebusanToday', {
params: {
kodcaw: this.$props.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
this.penebusanharian = formatter.format(response.data[0].tebusToday),
@@ -240,14 +267,17 @@ export default {
this.percentpenebusan = response.data[0].percentDiff,
this.tebusremaining = formatter.format(response.data[0].remaining.toFixed(2)),
this.percentcumtebus = (100 - response.data[0].percentcum)
if(this.datareadypeny == false)
this.datareadypeny = true;
}).catch(error => {
console.log(error)
})
},
getDataKeuntungan(){
this.axios.get('http://localhost:8000/admin/keuntunganToday', {
this.axios.get(this.$hostname + '/admin/keuntunganToday', {
params: {
kodcaw: this.$props.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
this.keuntunganharian = formatter.format(response.data[0].upahToday),
@@ -255,6 +285,9 @@ export default {
this.percentkeuntungan = response.data[0].percentDiff,
this.keuntunganremaining = formatter.format(response.data[0].remaining.toFixed(2)),
this.percentcumkeuntungan = (100 - response.data[0].percentcum)
if(this.datareadykeun == false)
this.datareadykeun = true;
}).catch(error => {
console.log(error)
})
resources/js/components/Analisa/Tahunan.vue
+44 -10
View File
@@ -1,6 +1,13 @@
<template>
<div class="mb-4 w-full grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4 mt-4">
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8">
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadypemb === false">
<content-placeholders>
<!-- <content-placeholders-heading :img="true" /> -->
<content-placeholders-text :lines="2" />
</content-placeholders>
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadypemb === true">
<div class="mb-3 mx-auto justify-center flex">
<h3 class="text-3xl font-bold text-gray-500">Pembiayaan Terkumpul</h3>
</div>
@@ -12,7 +19,13 @@
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8">
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadypeny === false">
<content-placeholders>
<!-- <content-placeholders-heading :img="true" /> -->
<content-placeholders-text :lines="2" />
</content-placeholders>
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadypeny === true">
<div class="mb-3 mx-auto justify-center flex">
<h3 class="text-3xl font-bold text-gray-500">Penebusan Terkumpul</h3>
</div>
@@ -23,7 +36,13 @@
</div>
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8">
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadykeun === false">
<content-placeholders>
<!-- <content-placeholders-heading :img="true" /> -->
<content-placeholders-text :lines="2" />
</content-placeholders>
</div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8" v-if="datareadykeun === true">
<div class="mb-3 mx-auto justify-center flex">
<h3 class="text-3xl font-bold text-gray-500">Keuntungan Terkumpul</h3>
</div>
@@ -52,7 +71,11 @@ export default {
penebusanterkumpul:0,
penebusanbajet:0,
keuntunganterkumpul:0,
keuntunganbajet:0
keuntunganbajet:0,
datareadypemb:false,
datareadypeny:false,
datareadykeun:false,
}
},
created() {
@@ -62,38 +85,49 @@ export default {
},
methods: {
getDataPembiayaan() {
this.axios.get('http://localhost:8000/admin/pembiayaanTahunan', {
this.axios.get(this.$hostname + '/admin/pembiayaanTahunan', {
params: {
kodcaw: this.$props.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
this.pembiayaanterkumpul = formatter.format(response.data[0].total);
this.pembiayaanbajet = formatter.format(response.data[0].bajet);
if(this.datareadypemb == false)
this.datareadypemb = true;
}).catch(error => {
console.log(error)
})
},
getDataPenebusan(){
this.axios.get('http://localhost:8000/admin/penebusanTahunan', {
this.axios.get(this.$hostname + '/admin/penebusanTahunan', {
params: {
kodcaw: this.$props.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
this.penebusanterkumpul = formatter.format(response.data[0].total);
this.penebusanbajet = formatter.format(response.data[0].bajet);
if(this.datareadypeny == false)
this.datareadypeny = true;
}).catch(error => {
console.log(error)
})
},
getDataKeuntungan(){
this.axios.get('http://localhost:8000/admin/keuntunganTahunan', {
this.axios.get(this.$hostname + '/admin/keuntunganTahunan', {
params: {
kodcaw: this.$props.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
this.keuntunganterkumpul = formatter.format(response.data[0].total);
this.keuntunganbajet = formatter.format(response.data[0].bajet);
if(this.datareadykeun == false)
this.datareadykeun = true;
}).catch(error => {
console.log(error)
})
resources/js/components/Cawangan.vue
+43 -4
View File
@@ -1,13 +1,18 @@
<template>
<div class="mx-auto">
<a class="text-yellow-200 rounded bg-gray-400 px-6 py-3 font-bold mr-4 uppercase md:invisible xl:visible">
CAWANGAN : {{this.cawangan.details_caw }}
CAWANGAN :
<select v-model="caw" class="rounded-md border bg-gray-400 font-bold border-gray-400 focus:outline-none rounded-md focus:ring-1 ring-cyan-500 uppercase">
<option v-for="(caw,i) in cawangan" :key="i" :value="caw.kodcaw" >{{ caw.details_caw }}</option>
</select>
<!-- {{this.cawangan.details_caw }} -->
</a>
<a class="text-yellow-200 rounded bg-gray-400 px-4 py-3 font-bold mr-4 uppercase md:invisible xl:visible">
<i v-if="this.roles == 'admin'" class="fas fa-1x fa-user-lock"></i>
<i v-if="this.roles == 'akaun'" class="fas fa-1x fa-calculator"></i>
<i v-if="this.roles == 'operasi'" class="fas fa-1x fa-user-cog"></i>
</a>
<p>{{ answer }}</p>
</div>
</template>
<script>
@@ -19,13 +24,47 @@
},
data: function(){
return{
cawangan:{}
cawangan:{},
caw:this.$kodcaw,
answer:'I cannot give you an answer until you ask a question!'
}
},
watch: {
// whenever question changes, this function will run
caw: function (newQuestion, oldQuestion) {
this.answer = 'Waiting for you to stop typing...'
this.debouncedtukarcawangan()
}
},
// beforeCreate: function () {
// this.caw = this.$kodcaw
// console.log(this.caw)
// },
created() {
this.axios.get('http://localhost:8000/api/cawangan/' + this.status).then(response => {
// console.log('created',this.$kodcaw)
// this.axios.get(this.$hostname + '/api/cawangan/' + this.status).then(response => {
// this.cawangan = response.data;
// });
// console.log(this.$kodcaw)
this.caw = this.$kodcaw
this.axios.get('/api/check/cawangan').then(response => {
this.cawangan = response.data;
});
});
this.debouncedtukarcawangan = _.debounce(this.tukarcawangan, 500)
},
methods:{
tukarcawangan: function(){
console.log(this.caw);
this.answer = 'stop'
$kodcaw = this.caw
console.log('store',$kodcaw)
// console.log('prototype',this.$kodcaw)
}
}
}
</script>
resources/js/components/Chart/BilanganChart.vue
+20 -12
View File
@@ -1,14 +1,17 @@
<template>
<div class="mt-4 bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 2xl:col-span-1 w-2/3 mx-auto">
<div class="flex items-center justify-between mb-4">
<content-placeholders v-show="dataready === false">
<content-placeholders-heading :img="true" />
<content-placeholders-text :lines="3" />
</content-placeholders>
<div class="flex items-center justify-between mb-4" v-show="dataready === true">
<div class="flex-shrink-0">
<h3 class="text-base font-normal text-gray-500">Bilangan Orang Bulanan</h3>
</div>
</div>
<div id="chart">
<apexchart type="bar" height="350" :options="chartOptions" :series="series"></apexchart>
<apexchart v-show="dataready == true" type="bar" height="350" :options="chartOptions" :series="series"></apexchart>
</div>
</div>
@@ -16,9 +19,9 @@
</template>
<script>
export default {
props:{
kodcaw: String
},
// props:{
// kodcaw: String
// },
data: () => ({
series: [{
name: 'Gadai',
@@ -115,6 +118,7 @@ export default {
}
}
},
dataready:false
}),
@@ -125,18 +129,19 @@ export default {
methods: {
getData(){
this.axios.all([
axios.get(`http://localhost:8000/admin/bilangan/gadai`, {
axios.get(this.$hostname + `/admin/bilangan/gadai`, {
params: {
kodcaw: this.kodcaw
kodcaw: this.$kodcaw
}
}),
axios.get(`http://localhost:8000/admin/bilangan/tebus`, {
axios.get(this.$hostname + `/admin/bilangan/tebus`, {
params: {
kodcaw: this.kodcaw
kodcaw: this.$kodcaw
}
})
])
.then(this.axios.spread((datagadai, datatebus) => {
this.$apexcharts.exec('bilangan-bulanan', 'updateSeries', [
{
name: 'Gadai',
@@ -147,6 +152,9 @@ export default {
data: datatebus.data
},
])
this.dataready = true;
}));
}
},
@@ -154,7 +162,7 @@ export default {
var channel = this.$pusher.subscribe('gadai-notify');
channel.bind('trigger-gadai', ({ response }) => {
if(response.cawangan = this.kodcaw)
if(response.cawangan = this.$kodcaw)
this.getData()
});
@@ -162,7 +170,7 @@ export default {
channel2.bind('trigger-tebus', ({ response }) => {
if(response.cawangan = this.kodcaw)
if(response.cawangan = this.$kodcaw)
this.getData()
});
}
resources/js/components/Chart/KeuntunganChart.vue
+15 -7
View File
@@ -1,6 +1,10 @@
<template>
<div class="mx-auto rounded-lg">
<!-- <content-placeholders v-show="dataready === false">
<content-placeholders-heading :img="true" />
<content-placeholders-text :lines="3" />
</content-placeholders> -->
<apexchart
width="500" type="bar"
:options="chartOptions" :series="series">
@@ -19,9 +23,9 @@ const formatter = new Intl.NumberFormat('en-US', {
let self = this;
export default {
name: 'Chart',
props:{
kodcaw: String
},
// props:{
// kodcaw: String
// },
data: () => ({
series: [
{
@@ -82,7 +86,9 @@ export default {
}
}
},
dataready : false,
}),
created() {
this.getDatakeuntungan()
@@ -90,9 +96,9 @@ export default {
},
methods: {
getDatakeuntungan () {
this.axios.get('http://localhost:8000/admin/keuntunganBulanan', {
this.axios.get(this.$hostname + '/admin/keuntunganBulanan', {
params: {
kodcaw: this.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
@@ -105,6 +111,8 @@ export default {
data: keuntungan
}])
this.dataready = true;
}).catch(error => {
console.log(error)
})
@@ -115,7 +123,7 @@ export default {
channel.bind('trigger-keuntungan', ({ response }) => {
// console.log(`${response}`);
if(response.cawangan == this.kodcaw)
if(response.cawangan == this.$kodcaw)
this.getDatakeuntungan()
});
@@ -123,7 +131,7 @@ export default {
channel2.bind('trigger-tebus', ({ response }) => {
// console.log(`${response}`);
if(response.cawangan == this.kodcaw)
if(response.cawangan == this.$kodcaw)
this.getDatakeuntungan()
});
}
resources/js/components/Chart/PembiayaanChart copy.vue
+1 -1
View File
@@ -60,7 +60,7 @@ export default {
}),
created() {
this.axios.get('http://localhost:8000/admin/financeMonth', {
this.axios.get(this.$hostname + '/admin/financeMonth', {
params: {
kodcaw: this.kodcaw
}
resources/js/components/Chart/PembiayaanChart.vue
+16 -6
View File
@@ -1,10 +1,16 @@
<template>
<div class="mx-auto rounded-lg">
<!-- <content-placeholders v-show="dataready === false">
<content-placeholders-heading :img="true" />
<content-placeholders-text :lines="3" />
</content-placeholders> -->
<div>
<apexchart
width="500" type="bar"
:options="chartOptions" :series="series">
</apexchart>
</div>
</div>
@@ -18,9 +24,9 @@ const formatter = new Intl.NumberFormat('en-US', {
export default {
name: 'Chart',
props:{
kodcaw: String
},
// props:{
// kodcaw: String
// },
data: () => ({
series: [
@@ -83,6 +89,7 @@ export default {
}
}
},
dataready:false,
}),
created() {
this.getDataPembiayaan()
@@ -90,9 +97,9 @@ export default {
},
methods: {
getDataPembiayaan () {
this.axios.get('http://localhost:8000/admin/pembiayaanBulanan', {
this.axios.get(this.$hostname + '/admin/pembiayaanBulanan', {
params: {
kodcaw: this.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
@@ -105,6 +112,9 @@ export default {
data: pembiayaan
}])
if(this.dataready === false)
this.dataready = true;
}).catch(error => {
console.log(error)
})
@@ -116,7 +126,7 @@ export default {
channel.bind('trigger-gadai', ({ response }) => {
// console.log(`${response}`);
if(response.cawangan == this.kodcaw)
if(response.cawangan == this.$kodcaw)
this.getDataPembiayaan()
});
}
resources/js/components/Chart/PenyelesaianChart.vue
+14 -6
View File
@@ -1,6 +1,11 @@
<template>
<div class="mx-auto rounded-lg">
<!-- <content-placeholders v-show="dataready === false">
<content-placeholders-heading :img="true" />
<content-placeholders-text :lines="3" />
</content-placeholders> -->
<apexchart
width="500" type="bar"
:options="chartOptions" :series="series">
@@ -18,9 +23,9 @@ const formatter = new Intl.NumberFormat('en-US', {
export default {
name: 'Chart',
props:{
kodcaw: String
},
// props:{
// kodcaw: String
// },
data: () => ({
series: [
@@ -82,15 +87,16 @@ export default {
}
}
},
dataready:false,
}),
created(){
this.getDataPenebusan()
},
methods:{
getDataPenebusan(){
this.axios.get('http://localhost:8000/admin/penebusanBulanan', {
this.axios.get(this.$hostname + '/admin/penebusanBulanan', {
params: {
kodcaw: this.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
@@ -103,6 +109,8 @@ export default {
data: penebusan
}])
this.dataready = true;
}).catch(error => {
console.log(error)
})
@@ -113,7 +121,7 @@ export default {
channel.bind('trigger-tebus', ({ response }) => {
// console.log(`${response}`);
if(response.cawangan == this.kodcaw)
if(response.cawangan == this.$kodcaw)
this.getDataPenebusan()
});
}
resources/js/components/Petibesi.vue
+10 -5
View File
@@ -119,7 +119,10 @@
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<button @click="action(petibesi.tarikh,petibesi.kodcaw)" class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-card-checklist" viewBox="0 0 16 16">
<button @click="action(petibesi.tarikh,petibesi.kodcaw)" class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300">
<i width="16" height="16" class="animate-spin fas fa-spinner" v-if="submitStatus === 'PENDING'" id="tekan-action"></i>
<svg v-else xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-card-checklist" viewBox="0 0 16 16">
<path d="M14.5 3a.5.5 0 0 1 .5.5v9a.5.5 0 0 1-.5.5h-13a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h13zm-13-1A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h13a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2h-13z"/>
<path d="M7 5.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 1 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0zM7 9.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 0 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0z"/>
</svg>
@@ -176,10 +179,10 @@ export default {
totalPage: 0,
currentPage: 1,
lastPage: 5,
kodcaw:'',
showpetibesi:[],
paginate:{},
activePage: 1
activePage: 1,
submitStatus:''
};
},
created() {
@@ -212,7 +215,7 @@ export default {
// },
getPetibesi(pageNumber){
this.axios.get('http://localhost:8000/admin/getPetiBesiPaginate/' + this.$props.kodcaw,{
this.axios.get(this.$hostname + '/admin/getPetiBesiPaginate/' + this.$kodcaw,{
params: {
page: pageNumber
}
@@ -223,6 +226,7 @@ export default {
});
},
action(tarikh,kodcaw){
this.submitStatus = 'PENDING';
axios.get('/api/check/periksapetibesi', {
params: {
tarikh: tarikh,
@@ -234,6 +238,7 @@ export default {
if(response.data === 'sama')
{
this.$toast("Nilai Tunai sama dengan nilat tunai")
this.submitStatus = 'okay';
}else{
this.aliranpetibesi = response.data;
@@ -248,7 +253,7 @@ export default {
this.$refs.modal.serahan = formatter.format(this.aliranpetibesi.serahanpkb);
this.$refs.modal.pendahuluan = formatter.format(this.aliranpetibesi.pendahuluanpkb);
this.submitStatus = 'okay';
}
});
resources/js/components/Searchpelanggan.vue
+2 -2
View File
@@ -74,7 +74,7 @@ export default{
{
if(this.hasNumber(inputvalue))
{
this.axios.get('http://localhost:8000/admin/searchByIC', {
this.axios.get(this.$hostname + '/admin/searchByIC', {
params: {
ic: inputvalue
}
@@ -88,7 +88,7 @@ export default{
}else{
this.axios.get('http://localhost:8000/admin/searchByName', {
this.axios.get(this.$hostname + '/admin/searchByName', {
params: {
nama: inputvalue
}
resources/js/components/Tunai.vue
+20 -12
View File
@@ -4,7 +4,7 @@
<nav>
<ul class="flex flex-wrap -ml-2 -mt-2">
<li v-for="(item, index) in $props.items" :key="index" class="mt-2 pl-2">
<li v-for="(item, index) in items" :key="index" class="mt-2 pl-2">
<button
:class="[
'relative px-4 py-2 overflow-hidden',
@@ -188,15 +188,15 @@ export default {
pagination
},
props: {
items: {
type: Array
},
// items: {
// type: Array
// },
arraytunai: {
type: Array
},
kodcaw:{
type:String
}
// kodcaw:{
// type:String
// }
},
data() {
@@ -211,17 +211,25 @@ export default {
currentPage: 1,
lastPage: 5,
activePage: 1,
kodcaw:'',
// kodcaw:'',
items:[],
kodlaluan:''
};
},
created() {
this.kodlaluan = this.$props.items[0].kodlaluan
this.getTunai(this.currentPage)
this.getItems().then((response) => {
this.items = response.data
this.kodlaluan = this.items[0].kodlaluan
this.getTunai(this.currentPage)
})
},
methods: {
active(){
getItems(){
// $teller = Http::get( config('api.url') .'/api/get/tellerwork/'. $auth_user['cawangan'])->json();
console.log('kodcaw',this.$kodcaw)
return this.axios.get(this.$hostname + '/api/get/tellerwork/' + this.$kodcaw);
},
setActive(index){
@@ -270,7 +278,7 @@ export default {
},
getTunai(pageNumber){
this.axios.get('http://localhost:8000/admin/getTunaiPaginate/' + this.$props.kodcaw,{
this.axios.get(this.$hostname + '/admin/getTunaiPaginate/' + this.$kodcaw,{
params: {
page: pageNumber,
kodlaluan: this.kodlaluan
resources/js/components/util/BlacklistModal.vue
+7 -7
View File
@@ -125,7 +125,7 @@ export default {
document.removeEventListener('click', this.onClick);
},
created(){
// console.log('kodcaw',this.kodcaw)
// console.log('kodcaw',this.$kodcaw)
},
methods: {
toggleModal: function(){
@@ -157,10 +157,10 @@ export default {
{
if(this.hasNumber(inputvalue))
{
this.axios.get('http://localhost:8000/admin/searchByIC', {
this.axios.get(this.$hostname + '/admin/searchByIC', {
params: {
ic: inputvalue,
kodcaw: this.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
this.arrayCustomer = response.data
@@ -172,10 +172,10 @@ export default {
}else{
this.axios.get('http://localhost:8000/admin/searchByName', {
this.axios.get(this.$hostname + '/admin/searchByName', {
params: {
nama: inputvalue,
kodcaw: this.kodcaw
kodcaw: this.$kodcaw
}
}).then(response => {
@@ -233,9 +233,9 @@ export default {
},
kemaskinifunc: function(){
axios.post('http://localhost:8000/admin/AddSenaraiHitam',
axios.post(this.$hostname + '/admin/AddSenaraiHitam',
{
kodcaw: this.kodcaw,
kodcaw: this.$kodcaw,
nokp: (this.specCust.kpbaru) ? this.specCust.kpbaru : this.specCust.kplama,
nota: this.nota
resources/js/components/util/ModalTransaction.vue
+1 -1
View File
@@ -94,7 +94,7 @@ export default {
},
postData: function(){
return this.axios.post('http://localhost:8000/admin/simpanStatus',
return this.axios.post(this.$hostname + '/admin/simpanStatus',
{
id: this.statusid,
status: this.referencestatus,
resources/js/pages/Blacklist.vue
+2 -2
View File
@@ -114,7 +114,7 @@ export default {
},
methods:{
getBlacklist(pageNumber){
this.axios.get('http://localhost:8000/admin/SenaraiBlacklist/' + this.kodcaw,{
this.axios.get(this.$hostname + '/admin/SenaraiBlacklist/' + this.kodcaw,{
params: {
page: pageNumber
}
@@ -125,7 +125,7 @@ export default {
});
},
searchname(){
this.axios.get('http://localhost:8000/admin/SenaraiBlacklist/' + this.kodcaw,{
this.axios.get(this.$hostname + '/admin/SenaraiBlacklist/' + this.kodcaw,{
params: {
page: 0,
search: this.search
resources/js/pages/Detailspelanggan.vue
+7 -7
View File
@@ -172,34 +172,34 @@ export default {
},
mounted() {
this.axios.get('http://localhost:8000/api/poskod/' + this.poskod).then(response => {
this.axios.get(this.$hostname + '/api/poskod/' + this.poskod).then(response => {
this.koddaerahCall(response.data.kodnegeri,response.data.koddaerah)
});
this.axios.get('http://localhost:8000/api/bank/').then(response => {
this.axios.get(this.$hostname + '/api/bank/').then(response => {
this.jenisbank = response.data
});
},
methods: {
koddaerahCall: function(negeri,daerah) {
this.axios.get('http://localhost:8000/api/negeri/' + negeri).then(response => {
this.axios.get(this.$hostname + '/api/negeri/' + negeri).then(response => {
this.kodnegeri = response.data.negeri
});
this.axios.get('http://localhost:8000/api/daerah/' + daerah).then(response => {
this.axios.get(this.$hostname + '/api/daerah/' + daerah).then(response => {
this.koddaerah = response.data.namadaerah
});
},
bankaccount(){
this.axios.get('http://localhost:8000/api/bank/').then(response => {
this.axios.get(this.$hostname + '/api/bank/').then(response => {
this.jenisbank = response.data
return response.data
});
},
triggerPoskod: function(value){
this.axios.get('http://localhost:8000/api/poskod/' + value).then(response => {
this.axios.get(this.$hostname + '/api/poskod/' + value).then(response => {
this.koddaerahCall(response.data.kodnegeri,response.data.koddaerah)
});
},
@@ -281,7 +281,7 @@ export default {
},
async PostData(){
let response = await this.axios.put('http://localhost:8000/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,
resources/views/layouts/sidebar.blade.php
+12 -1
View File
@@ -82,6 +82,17 @@
</li>
</a>
{{-- <a href="#" class="rounded mb-2 mr-2 {{ Route::is('online') || Route::is('online.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
<li class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
<div class="flex items-center">
<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z" />
</svg>
<span class="text-sm ml-2 text-lg">Permissions</span>
</div>
</li>
</a> --}}
@elseif(Auth::user()->roles == 'operasi')
@@ -120,7 +131,7 @@
<span class="text-sm ml-2 text-lg">Blacklist</span>
</div>
</li>
</a>
</a>
@endif
routes/api.php
+3
View File
@@ -24,4 +24,7 @@ Route::group(['prefix' => 'check'], function () {
Route::put('/kemaskinialirantunai', 'App\Http\Controllers\AliranTunaiController@kemaskiniAliranTunai');
Route::put('/kemaskinipetibesi', 'App\Http\Controllers\PetiBesiController@kemaskiniPetiBesi');
Route::get('/cawangan', 'App\Http\Controllers\CawanganController@list');
});