WIP

src/pages/Ecomerce/CatalogView.vue

@@ -328,6 +328,7 @@ import useNotify from 'src/composables/useNotify.js';
 import debounce from 'src/utils/debouncer.js';
 
 const jApi = inject('jApi');
+const api = inject('api');
 const { t } = useI18n();
 const appStore = useAppStore();
 const userStore = useUserStore();
@@ -621,14 +622,29 @@ const debouncedGetFilters = debounce(getFilters, 400);
 const getOrder = async () => {
     try {
         if (!basketOrderId.value) return;
-        const [data] = await jApi.query(
-            `SELECT o.id, o.sent, ad.nickname, o.addressFk, o.agencyModeFk
-				    FROM myOrder o
-				    LEFT JOIN myAddress ad ON ad.id = o.addressFk
-				    WHERE o.id = #orderId`,
-            { orderId: basketOrderId.value }
-        );
+
         order.value = data;
+        const filter = {
+            include: [
+                {
+                    relation: 'address',
+                    scope: {
+                        fields: ['nickname', 'city', 'street']
+                    }
+                }
+            ],
+            where: {
+                id: basketOrderId.value
+            },
+            fields: ['id', 'sent', 'addressFk', 'agencyModeFk', 'nickname']
+        };
+
+        const { data } = await api.get('Orders', {
+            params: {
+                filter: JSON.stringify(filter),
+                orderFk: basketOrderId.value
+            }
+        });
     } catch (error) {
         console.error('Error getting order:', error);
     }