diff --git a/src/boot/axios.js b/src/boot/axios.js index 64de7177..b923ccdc 100644 --- a/src/boot/axios.js +++ b/src/boot/axios.js @@ -21,7 +21,7 @@ const onRequestError = error => { }; const onResponseError = error => { - let message = ''; + let message = error.message; const response = error.response; const responseData = response && response.data; @@ -35,12 +35,6 @@ const onResponseError = error => { return Promise.reject(error); }; -const jApiErrorInterceptor = error => { - if (error.message) { - notify(error.message, 'negative'); - } -}; - export default boot(({ app }) => { const userStore = useUserStore(); function addToken(config) { @@ -53,7 +47,7 @@ export default boot(({ app }) => { api.interceptors.response.use(response => response, onResponseError); jApi.use(addToken); - jApi.useErrorInterceptor(jApiErrorInterceptor); + jApi.useErrorInterceptor(onResponseError); // for use inside Vue files (Options API) through this.$axios and this.$api diff --git a/src/components/ui/ChangePasswordForm.vue b/src/components/ui/ChangePasswordForm.vue index cf132704..3f5afd86 100644 --- a/src/components/ui/ChangePasswordForm.vue +++ b/src/components/ui/ChangePasswordForm.vue @@ -37,7 +37,7 @@ const repeatPassword = ref(''); const passwordRequirements = ref(null); const formData = ref({ - userId: userStore.user.id, + userId: userStore?.user?.id, oldPassword: '', newPassword: '' }); @@ -102,12 +102,12 @@ onMounted(async () => { diff --git a/src/pages/Account/AccountConfig.vue b/src/pages/Account/AccountConfig.vue index aef488df..b2727bf6 100644 --- a/src/pages/Account/AccountConfig.vue +++ b/src/pages/Account/AccountConfig.vue @@ -20,7 +20,7 @@ const vnFormRef = ref(null); const changePasswordFormDialog = ref(null); const showChangePasswordForm = ref(false); const langOptions = ref([]); -const pks = computed(() => ({ id: userStore.user.id })); +const pks = computed(() => ({ id: userStore?.user?.id })); const fetchConfigDataSql = { query: ` SELECT u.id, u.name, u.email, u.nickname, @@ -67,11 +67,11 @@ onMounted(() => fetchLanguagesSql()); diff --git a/src/pages/Ecomerce/OrdersView.vue b/src/pages/Ecomerce/OrdersView.vue index d7e60c43..f7a2c081 100644 --- a/src/pages/Ecomerce/OrdersView.vue +++ b/src/pages/Ecomerce/OrdersView.vue @@ -137,6 +137,7 @@ const onConfirmPay = async () => { class="full-width" type="number" min="0" + :max="debt * -1" />