From 52fe0f9f553387affb9512e124767aa926620ad4 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Tue, 22 Apr 2025 11:39:01 +0200 Subject: [PATCH] Guest adjustments --- src/pages/Ecomerce/CatalogView.vue | 10 +++++----- src/stores/user.js | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pages/Ecomerce/CatalogView.vue b/src/pages/Ecomerce/CatalogView.vue index 714bc47c..3a689683 100644 --- a/src/pages/Ecomerce/CatalogView.vue +++ b/src/pages/Ecomerce/CatalogView.vue @@ -21,6 +21,7 @@ import { storeToRefs } from 'pinia'; import { formatDateTitle, currency } from 'src/lib/filters.js'; import useNotify from 'src/composables/useNotify.js'; import debounce from 'src/utils/debouncer.js'; +import app from 'src/boot/app'; const jApi = inject('jApi'); const api = inject('api'); @@ -671,11 +672,10 @@ onBeforeMount(async () => { if (!isGuest.value) { await appStore.check('catalog'); } else { - const resultSet = await jApi.execQuery( - 'CALL myOrder_configureForGuest(@orderId); SELECT @orderId;' - ); - resultSet.fetchResult(); - appStore.basketOrderId = resultSet.fetchValue(); + const { data } = await api.post('Orders/configureForGuest'); + const orderId = data[0]?.['@orderId'] || null; + appStore.basketOrderId = orderId; + console.log('appStore.basketOrderId', appStore.basketOrderId); } await getOrder(); await getCategories(); diff --git a/src/stores/user.js b/src/stores/user.js index 3d38fa34..e7c42879 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -8,7 +8,6 @@ const { notify } = useNotify(); const TOKEN_MULTIMEDIA = 'tokenMultimedia'; const TOKEN = 'token'; - export const useUserStore = defineStore('user', () => { const token = ref(''); const tokenMultimedia = ref(''); @@ -33,7 +32,10 @@ export const useUserStore = defineStore('user', () => { router = _router; isGuest.value = localStorage.getItem('hederaGuest') || false; await getToken(); - if (!isLoggedIn.value) { + if (isGuest.value) { + fetchUser(); + return; + } else if (!isLoggedIn.value) { const autoLoginStatus = await tryAutoLogin(); if (!autoLoginStatus) { router.push({ name: 'login' }); @@ -291,7 +293,6 @@ export const useUserStore = defineStore('user', () => { companyId.value = data.companyFk; }; - const $reset = () => { token.value = ''; tokenMultimedia.value = '';