diff --git a/.dockerignore b/.dockerignore
index ebf83b0b..aee456a4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,5 @@
debian
-node_modules
\ No newline at end of file
+node_modules
+.quasar
+build
+.vscode
diff --git a/src/pages/Agencies/PackagesView.vue b/src/pages/Agencies/PackagesView.vue
index 922db3e6..fd2d1ab4 100644
--- a/src/pages/Agencies/PackagesView.vue
+++ b/src/pages/Agencies/PackagesView.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
import VnTable from 'src/components/ui/VnTable.vue';
-const jApi = inject('jApi');
+const api = inject('api');
const { t } = useI18n();
const packages = ref([]);
@@ -43,7 +43,12 @@ const columns = computed(() => [
const getPackages = async () => {
try {
- const data = await jApi.query('CALL vn.agencyVolume()');
+ const { data } = await api.post(
+ 'applications/agencyVolume/execute-proc',
+ {
+ schema: 'vn'
+ }
+ );
packages.value = data;
} catch (error) {
console.error(error);
diff --git a/src/pages/Ecomerce/OrdersView.vue b/src/pages/Ecomerce/OrdersView.vue
index 67daeb1c..a5d6d9d9 100644
--- a/src/pages/Ecomerce/OrdersView.vue
+++ b/src/pages/Ecomerce/OrdersView.vue
@@ -8,6 +8,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import VnConfirm from 'src/components/ui/VnConfirm.vue';
import VnList from 'src/components/ui/VnList.vue';
+import { onUserId } from 'src/utils/onUserId';
import useNotify from 'src/composables/useNotify.js';
import { currency, formatDateTitle } from 'src/lib/filters.js';
import { tpvStore } from 'stores/tpv';
@@ -16,7 +17,7 @@ import { storeToRefs } from 'pinia';
const { t } = useI18n();
const route = useRoute();
-const jApi = inject('jApi');
+const api = inject('api');
const { notify } = useNotify();
const appStore = useAppStore();
const { isHeaderMounted } = storeToRefs(appStore);
@@ -30,8 +31,16 @@ const tpv = tpvStore();
onMounted(async () => {
await tpv.check(route);
- orders.value = await jApi.query('CALL myTicket_list(NULL, NULL)');
- debt.value = await jApi.getValue('SELECT -myClient_getDebt(NULL)');
+ const myTickets = await api.post('applications/myTicket_list/execute-proc', {
+ schema: 'hedera',
+ params: [null, null],
+ });
+ orders.value = myTickets.data;
+});
+
+onUserId(async (userId) => {
+ const myClientDebt = await api.get(`clients/${userId}/getDebt`);
+ debt.value = -myClientDebt.data;
});
const onPayClick = async () => {
diff --git a/src/pages/Ecomerce/PendingOrders.vue b/src/pages/Ecomerce/PendingOrders.vue
index c9257cb2..a8657174 100644
--- a/src/pages/Ecomerce/PendingOrders.vue
+++ b/src/pages/Ecomerce/PendingOrders.vue
@@ -1,5 +1,5 @@
@@ -93,11 +117,11 @@ onMounted(async () => {
>
- {{ formatDateTitle(order.sent) }}
+ {{ formatDateTitle(order.landed) }}
#{{ order.id }}
- {{ order.nickname }}
- {{ order.agency }}
+ {{ order.address.nickname }}
+ {{ order.agencyMode.description }}
{{ currency(order.taxableBase) }}
diff --git a/src/utils/onUserId.js b/src/utils/onUserId.js
new file mode 100644
index 00000000..2ea4189f
--- /dev/null
+++ b/src/utils/onUserId.js
@@ -0,0 +1,18 @@
+import { watch } from 'vue';
+
+import { useUserStore } from 'stores/user';
+
+const userStore = useUserStore();
+
+export const onUserId = (cb) => watch(
+ () => userStore?.user?.id,
+ async userId => {
+ if (!userId) return;
+ try {
+ await cb(userId);
+ } catch (error) {
+ console.error(error);
+ }
+ },
+ { immediate: true }
+);