@ozdao/martyrs 0.2.548 → 0.2.550

package/src/modules/notifications/notifications.client.js

@@ -1,11 +1,11 @@
 import { toRefs, watch } from 'vue';
 // Router import
-import routerNotifications from './router/notifications.router.js';
+import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
+import { getRoutes } from './notifications.router.js';
 // Store
 import * as storeNotifications from './store/notifications.store.js';
-// Auth store import
 // Global WebSocket import
-import globalWebSocket from '@martyrs/src/modules/globals/views/classes/globals.websocket.js';
+import globalWebSocket from '@martyrs/src/modules/core/views/classes/core.websocket.js';
 // Capacitor Preferences
 import { Preferences } from '@capacitor/preferences';
 // Layouts
@@ -145,7 +145,7 @@ class CapacitorPushHandler {
       }
 
       // For anonymous users, add anonymousId
-      if (!this.store.auth.state.user?._id) {
+      if (!this.store.core.state.session.userId) {
         let anonymousId = null;
         try {
           const result = await Preferences.get({ key: 'notifications_anonymous_id' });
@@ -271,7 +271,7 @@ class NotificationManager {
     };
 
     // For anonymous users, get or generate anonymousId
-    if (!store.auth.state.user?._id) {
+    if (!store.core.state.session.userId) {
       let anonymousId = null;
       try {
         const result = await Preferences.get({ key: 'notifications_anonymous_id' });
@@ -322,7 +322,7 @@ class NotificationManager {
   async initialize() {
     if (this.initialized || this.isServer) return;
 
-    const userId = this.store.auth.state.user?._id;
+    const userId = this.store.core.state.session.userId;
     
     // Connect WebSocket only for authenticated users
     if (userId) {
@@ -383,7 +383,7 @@ const SSRUtils = {
    */
   async prefetchNotifications(store, context) {
     try {
-      const userId = store.auth.state.user?._id;
+      const userId = store.core.state.session.userId;
       if (userId) {
         // Fetch notifications without WebSocket or push setup
         await store.notifications.actions.getNotifications(userId);
@@ -403,8 +403,11 @@ const SSRUtils = {
  */
 function initializeNotifications(app, store, router, options = {}) {
   // Add routes and store
-  const route = options.route || 'User Profile Root';
-  router.addRoute(route, routerNotifications);
+  const routes = getRoutes(options);
+  routes.forEach(({ parentName, config }) => {
+    addRoutes(router, { ...config, parentName });
+  });
+
   store.addStore('notifications', storeNotifications);
 
   // Initialize global WebSocket if needed
@@ -431,23 +434,21 @@ function initializeNotifications(app, store, router, options = {}) {
     // Initialize immediately (supports both authenticated and anonymous users)
     notificationManager.initialize();
 
-    // Watch for user login/logout using auth store
-    if (!store.auth) {
-      console.error('[Notifications] Auth store not found! Cannot set up watcher.');
-      return;
-    }
-    
+    // Watch for user login/logout using store.core.state.session
     watch(
-      () => store.auth.state.access.status,
-      async (isAuthenticated) => {
-        if (isAuthenticated) {
+      () => store.core.state.session.token,
+      async (token, oldToken) => {
+        const isAuthenticated = !!token;
+        const wasAuthenticated = !!oldToken;
+
+        if (isAuthenticated && !wasAuthenticated) {
           // Re-register device for authenticated user
           console.log('[Notifications] User logged in, re-registering device...');
           await store.notifications.actions.reregisterDeviceAfterLogin();
           // Reinitialize notifications for authenticated user
           notificationManager.disconnect();
           await notificationManager.initialize();
-        } else {
+        } else if (!isAuthenticated && wasAuthenticated) {
           // Keep notifications active for anonymous users, just reset user-specific data
           console.log('[Notifications] User logged out, resetting notifications...');
           store.notifications.mutations.resetNotifications();
@@ -480,7 +481,7 @@ const ModuleNotifications = {
       storeNotifications,
     },
     router: {
-      routerNotifications,
+      getRoutes,
     },
     components: {
       // Elements

package/src/modules/notifications/notifications.router.js

@@ -0,0 +1,47 @@
+function buildNotificationRoutes() {
+  return [
+    {
+      path: '',
+      name: 'Notifications',
+      component: () => import(
+        /* webpackChunkName: 'notifications-page' */
+        './components/pages/Notifications.vue'
+      ),
+      meta: {
+        title: 'Notifications',
+      },
+    },
+    {
+      path: 'preferences',
+      name: 'NotificationPreferences',
+      component: () => import(
+        /* webpackChunkName: 'notifications-preferences' */
+        './components/sections/NotificationPreferences.vue'
+      ),
+      meta: {
+        title: 'Notification Preferences',
+      },
+    },
+  ];
+}
+
+export function getRoutes(options = {}) {
+  const routes = [];
+  const routeUsers = options.routeUsers || 'User Profile Root';
+
+  routes.push({
+    parentName: routeUsers,
+    config: {
+      basePath: options.basePath || 'notifications',
+      component: options.layoutComponent || (() => import(
+        /* webpackChunkName: 'notifications-layout' */
+        './components/layouts/NotificationsLayout.vue'
+      )),
+      routes: buildNotificationRoutes(options),
+    },
+  });
+
+  return routes;
+}
+
+export default { getRoutes };

package/src/modules/notifications/notifications.server.js

@@ -1,4 +1,4 @@
-import globalsabac from '@martyrs/src/modules/globals/controllers/classes/globals.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
 import NotificationsController from './controllers/notifications.controller.js';
 import NotificationLogModel from './models/notification-log.model.js';
 import NotificationPreferenceModel from './models/notification-preference.model.js';
@@ -6,7 +6,7 @@ import NotificationModel from './models/notification.model.js';
 import UserDeviceModel from './models/user-device.model.js';
 import notificationsRoutes from './routes/notifications.routes.js';
 import NotificationService from './services/notification.service.js';
-const { getInstance } = globalsabac;
+const { getInstance } = coreabac;
 function initializeNotifications(app, db, wss, origins, publicPath) {
   // Set up models in the database object
   db.notification = NotificationModel(db);

package/src/modules/notifications/services/email.service.js

@@ -1,4 +1,4 @@
-import mailing from '@martyrs/src/modules/globals/controllers/utils/mailing.js';
+import mailing from '@martyrs/src/modules/core/controllers/utils/mailing.js';
 // services/email.service.js
 const { sendEmail } = mailing;
 const EmailService = {

package/src/modules/notifications/services/sms.service.js

@@ -1,4 +1,4 @@
-import mailing from '@martyrs/src/modules/globals/controllers/utils/mailing.js';
+import mailing from '@martyrs/src/modules/core/controllers/utils/mailing.js';
 // services/sms.service.js
 const { sendSms } = mailing;
 const SmsService = {

package/src/modules/notifications/services/telegram.service.js

@@ -1,4 +1,4 @@
-import mailing from '@martyrs/src/modules/globals/controllers/utils/mailing.js';
+import mailing from '@martyrs/src/modules/core/controllers/utils/mailing.js';
 // services/telegram.service.js
 const { sendChatMessageTelegram } = mailing;
 const TelegramService = {

package/src/modules/notifications/store/notifications.store.js

@@ -1,9 +1,9 @@
 // Dependencies
 import { computed, reactive, watch } from 'vue';
 // Setup Axios
-import $axios from '@martyrs/src/modules/globals/views/utils/axios-instance.js';
+import $axios from '@martyrs/src/modules/core/views/utils/axios-instance.js';
 // Globals
-import { setError } from '@martyrs/src/modules/globals/views/store/globals.js';
+import { setError } from '@martyrs/src/modules/core/views/store/core.store.js';
 // Auth
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 // Capacitor Preferences

package/src/modules/orders/components/blocks/CardOrderBackoffice.vue

@@ -76,7 +76,7 @@
 
 <script setup>
 import { ref } from 'vue';
-import CardHeader from '@martyrs/src/modules/globals/views/components/blocks/CardHeader.vue';
+import CardHeader from '@martyrs/src/modules/core/views/components/blocks/CardHeader.vue';
 import IconTime from '@martyrs/src/modules/icons/entities/IconTime.vue';
 
 const props = defineProps({

package/src/modules/orders/components/blocks/CardOrderItem.vue

@@ -95,7 +95,7 @@ import IconMinus from '@martyrs/src/modules/icons/navigation/IconMinus.vue'
 import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue'
 import IconCalendar from '@martyrs/src/modules/icons/entities/IconCalendar.vue'
 import PlaceholderImage from '@martyrs/src/modules/icons/placeholders/PlaceholderImage.vue'
-import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js'
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js'
 
 const router = useRouter()
 const { locale } = useI18n()

package/src/modules/orders/components/blocks/CardOrderVar1.vue

@@ -98,7 +98,7 @@
 </template>
 
 <script setup>
-import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js'
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js'
 
 const { returnCurrency } = useGlobalMixins()
 

package/src/modules/orders/components/elements/FieldSubscribeNewsletter.vue

@@ -61,7 +61,7 @@ import IconYoutube from '@martyrs/src/modules/icons/socials/youtube.vue'
 import IconLinkedin from '@martyrs/src/modules/icons/socials/linkedin.vue'
 import IconWhatsapp from '@martyrs/src/modules/icons/socials/whatsapp.vue'
 
-import * as globals from '@martyrs/src/modules/globals/views/store/globals.js'
+import * as core from '@martyrs/src/modules/core/views/store/core.store.js'
 import applications from '@martyrs/src/modules/orders/store/applications.js'
 
 const props = defineProps({
@@ -148,12 +148,12 @@ function showSuccessPopup() {
 async function sendApplication() {
   // Валидация email перед отправкой
   if (!email.value || !email.value.trim()) {
-    globals.setError({ message: t('validation.email.required') || 'Email is required' })
+    core.setError({ message: t('validation.email.required') || 'Email is required' })
     return Promise.reject(new Error('Email is required'))
   }
 
   if (!validateEmail(email.value.trim())) {
-    globals.setError({ message: t('validation.email.invalid') || 'Invalid email format' })
+    core.setError({ message: t('validation.email.invalid') || 'Invalid email format' })
     return Promise.reject(new Error('Invalid email format'))
   }
 
@@ -189,7 +189,7 @@ async function sendApplication() {
     return Promise.resolve(result);
   } catch (error) {
     console.log(error)
-    globals.setError(error)
+    core.setError(error)
     return Promise.reject(error);
   }
 }

package/src/modules/orders/components/forms/FormSelectCustomer.vue

@@ -84,8 +84,8 @@ import Button from '@martyrs/src/components/Button/Button.vue'
 import Popup from '@martyrs/src/components/Popup/Popup.vue'
 import Feed from '@martyrs/src/components/Feed/Feed.vue'
 
-import BlockSearch from '@martyrs/src/modules/globals/views/components/blocks/BlockSearch.vue'
-import Card from '@martyrs/src/modules/globals/views/components/blocks/Card.vue'
+import BlockSearch from '@martyrs/src/modules/core/views/components/blocks/BlockSearch.vue'
+import Card from '@martyrs/src/modules/core/views/components/blocks/Card.vue'
 import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue'
 import CardCustomer from '@martyrs/src/modules/orders/components/blocks/CardCustomer.vue'
 import FormCustomerDetails from '@martyrs/src/modules/orders/components/forms/FormCustomerDetails.vue'
@@ -93,7 +93,7 @@ import FormCustomerDetails from '@martyrs/src/modules/orders/components/forms/Fo
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 import customers from '@martyrs/src/modules/orders/store/customers.store';
 import customerInitState from "@martyrs/src/modules/orders/store/models/customer.js"
-import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 
 const { formatDate } = useGlobalMixins();
 

package/src/modules/orders/components/pages/Applications.vue

@@ -103,7 +103,7 @@
   import Block from '@martyrs/src/components/Block/Block.vue';
   import Popup from '@martyrs/src/components/Popup/Popup.vue';
   import applications from '@martyrs/src/modules/orders/store/applications.js';
-  import SectionPageTitle from '@martyrs/src/modules/globals/views/components/sections/SectionPageTitle.vue'
+  import SectionPageTitle from '@martyrs/src/modules/core/views/components/sections/SectionPageTitle.vue'
   import Feed from '@martyrs/src/components/Feed/Feed.vue'
   import CardApplication from '@martyrs/src/modules/orders/components/blocks/CardApplication.vue'
   import FormApplicationDetails from '@martyrs/src/modules/orders/components/forms/FormApplicationDetails.vue'

package/src/modules/orders/components/pages/Customers.vue

@@ -104,7 +104,7 @@
   import Block from '@martyrs/src/components/Block/Block.vue';
   import Popup from '@martyrs/src/components/Popup/Popup.vue';
   import customers from '@martyrs/src/modules/orders/store/customers.store.js';
-  import SectionPageTitle from '@martyrs/src/modules/globals/views/components/sections/SectionPageTitle.vue'
+  import SectionPageTitle from '@martyrs/src/modules/core/views/components/sections/SectionPageTitle.vue'
   import Feed from '@martyrs/src/components/Feed/Feed.vue'
   import CardCustomer from '@martyrs/src/modules/orders/components/blocks/CardCustomer.vue'
   import FormCustomerDetails from '@martyrs/src/modules/orders/components/forms/FormCustomerDetails.vue'

package/src/modules/orders/components/pages/OrderBackoffice.vue

@@ -9,7 +9,7 @@
 			</div>
 
 	  	<div class="flex-nowrap flex gap-thin pos-relative ">
-		    <div v-for="(status, index) in globals.state.options.orders.statuses" :key="index" class="w-20">
+		    <div v-for="(status, index) in core.state.options.orders.statuses" :key="index" class="w-20">
 		      <div
 		      	class="bg-white br-anim br-glow radius-extra h-1r w-100"
 		        :class="
@@ -99,10 +99,10 @@
       <PriceTotal 
         :totalPrice="cartTotalPrice"
         :currency="returnCurrency()"
-        :showFees="globals.state.options?.orders?.showFees"
-        :feesRate="globals.state.options?.orders?.feesRate || 0"
-        :showVat="globals.state.options?.orders?.showVat"
-        :vatRate="globals.state.options?.orders?.vatRate || 0"
+        :showFees="core.state.options?.orders?.showFees"
+        :feesRate="core.state.options?.orders?.feesRate || 0"
+        :showVat="core.state.options?.orders?.showVat"
+        :vatRate="core.state.options?.orders?.vatRate || 0"
       />
 
     	<Button :submit="setNextStatus"  class="t-white w-100 bg-second">
@@ -268,11 +268,11 @@
           :totalPrice="cartTotalPrice"
           :deliveryRate="deliveryCost"
           :currency="returnCurrency()"
-          :showFees="globals.state.options?.orders?.showFees"
-          :feesRate="globals.state.options?.orders?.feesRate || 0"
-          :showVat="globals.state.options?.orders?.showVat"
-          :vatRate="globals.state.options?.orders?.vatRate || 0"
-				  :showDeliveryFee="globals.state.options?.orders.showDeliveryFee"
+          :showFees="core.state.options?.orders?.showFees"
+          :feesRate="core.state.options?.orders?.feesRate || 0"
+          :showVat="core.state.options?.orders?.showVat"
+          :vatRate="core.state.options?.orders?.vatRate || 0"
+				  :showDeliveryFee="core.state.options?.orders.showDeliveryFee"
 
         />
      	</div>
@@ -304,14 +304,14 @@
 	import PriceTotal from '@martyrs/src/modules/orders/components/elements/PriceTotal.vue';
 	import FormPayment from '@martyrs/src/modules/orders/components/sections/FormPayment.vue'
 
-	import * as globals 	from '@martyrs/src/modules/globals/views/store/globals.js'
+	import * as globals 	from '@martyrs/src/modules/core/views/store/core.store.js'
 	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 	import * as orders 	from '@martyrs/src/modules/orders/store/orders.js'
 	import * as products 	from '@martyrs/src/modules/products/store/products.js'
 	import * as organizations 	from '@martyrs/src/modules/organizations/store/organizations.js'
 
 	import { useI18n } from 'vue-i18n';
-	import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+	import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 	
 	const { locale } = useI18n();
 	const { returnCurrency } = useGlobalMixins();
@@ -323,7 +323,7 @@
 	const productsOrganization = ref(null)
 	const orderOrganization = ref(null)
 
-	const statuses = globals.state.options.orders.statuses
+	const statuses = core.state.options.orders.statuses
 	const statusLabels = ['Created', 'Confirmed', 'Preparing', 'In use', 'Finished'];
 
   if (route.meta.context === 'user' && 
@@ -371,7 +371,7 @@
 
 	  orderOrganization.value = await organizations.actions.read({
 	    _id: order.value?.owner.target._id,
-	    location: globals.state.position?.location,
+	    location: core.state.position?.location,
 	    lookup: ['spots']
 	  });
 
@@ -381,7 +381,7 @@
 const deliveryCost = computed(() => {
   const type = orders.state.current.delivery.type
   const distance = orderOrganization.value[0]?.distance || 0
-  const config = globals.state.options?.orders?.delivery_formula || {}
+  const config = core.state.options?.orders?.delivery_formula || {}
 
   return orders.getters.getDeliveryPrice(type, distance, config)
 })
@@ -417,16 +417,16 @@ const deliveryCost = computed(() => {
 
 
 	function getNextStatus(currentStatus) {
-	  const currentIndex = globals.state.options.orders.statuses.findIndex(status => status.value === currentStatus);
+	  const currentIndex = core.state.options.orders.statuses.findIndex(status => status.value === currentStatus);
 
 	  if (currentIndex !== -1 && currentIndex + 1 < statuses.length) {
-	    return globals.state.options.orders.statuses[currentIndex + 1];
+	    return core.state.options.orders.statuses[currentIndex + 1];
 	  }
 	  return null; // If next status doesn't exist
 	}
 
 	const isActiveStatus = (index) => {
-	  return globals.state.options.orders.statuses.slice(index).some(status => status.value === order.value.status);
+	  return core.state.options.orders.statuses.slice(index).some(status => status.value === order.value.status);
 	};
 
   async function changePaymentStatus() {

package/src/modules/orders/components/pages/OrderCreate.vue

@@ -83,11 +83,11 @@
           :totalPrice="cartTotalPrice"
           :deliveryRate="deliveryCost"
           :currency="returnCurrency()"
-          :showFees="globals.state.options?.orders.showFees"
-          :feesRate="globals.state.options?.orders.feesRate || 0"
-          :showVat="globals.state.options?.orders.showVat"
-          :vatRate="globals.state.options?.orders.vatRate || 0"
-          :showDeliveryFee="globals.state.options?.orders.showDeliveryFee"
+          :showFees="core.state.options?.orders.showFees"
+          :feesRate="core.state.options?.orders.feesRate || 0"
+          :showVat="core.state.options?.orders.showVat"
+          :vatRate="core.state.options?.orders.vatRate || 0"
+          :showDeliveryFee="core.state.options?.orders.showDeliveryFee"
         />
 			</div>
 			<!-- Send order -->
@@ -148,10 +148,10 @@ import FormPayment from '@martyrs/src/modules/orders/components/sections/FormPay
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 import { ref, computed, onMounted, watch } from 'vue'
 import { useRoute,useRouter } from 'vue-router'
-import { useGlobalMixins } from "@martyrs/src/modules/globals/views/mixins/mixins.js"
+import { useGlobalMixins } from "@martyrs/src/modules/core/views/mixins/mixins.js"
 
 // Store
-import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
+import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 import * as shopcart from '@martyrs/src/modules/orders/store/shopcart.js';
 import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js';
@@ -177,7 +177,7 @@ const cartTotalPrice = shopcart.getters.cartTotalPrice
 const deliveryCost = computed(() => {
   const type = orders.state.current.delivery.type
   const distance = orderOrganization.value[0]?.distance || 0
-  const config = globals.state.options?.orders?.delivery_formula || {}
+  const config = core.state.options?.orders?.delivery_formula || {}
 
   return orders.getters.getDeliveryPrice(type, distance, config)
 })
@@ -238,7 +238,7 @@ function checkIsOpenNow(worktime) {
 }
 
 
-if (!globals.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id) { 
+if (!core.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id) { 
 	router.push({name: 'Sign In'})	
 }
 
@@ -260,7 +260,7 @@ onMounted(async()=> {
 	
 	orderOrganization.value = await organizations.actions.read({
 	  _id: shopcart.state.organization,
-	  location: globals.state.position?.location,
+	  location: core.state.position?.location,
 	  lookup: ['spots']
 	})
 	
@@ -290,7 +290,7 @@ onMounted(async()=> {
         item_brand: orderOrganization.value.profile?.name || ''
       })),
       organization: orderOrganization.value.profile?.name || '',
-      location: globals.state.position?.location || 'unknown'
+      location: core.state.position?.location || 'unknown'
     });
   }
 })
@@ -400,7 +400,7 @@ async function handleCreate() {
 	        item_category: item.product?.category || ''
 	      })),
 	      organization: orderOrganization.value?.profile?.name,
-	      location: globals.state.position?.location || 'unknown',
+	      location: core.state.position?.location || 'unknown',
 	      referral_code: referralCode || null,
 	      user_id: auth.state.user._id || 'anonymous'
 	    });

package/src/modules/orders/components/pages/OrderCreateBackoffice.vue

@@ -211,14 +211,14 @@
   import CardPosition from '@martyrs/src/modules/products/components/blocks/CardPosition.vue';
   import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue'
 
-  import BlockSearch from '@martyrs/src/modules/globals/views/components/blocks/BlockSearch.vue'
+  import BlockSearch from '@martyrs/src/modules/core/views/components/blocks/BlockSearch.vue'
 
   import FormSelectCustomer from '@martyrs/src/modules/orders/components/forms/FormSelectCustomer.vue'
   import FormDelivery from '@martyrs/src/modules/orders/components/sections/FormDelivery.vue'
   import FormPayment from '@martyrs/src/modules/orders/components/sections/FormPayment.vue'
 
   // Import your store
-  import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
+  import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
   import * as orders from '@martyrs/src/modules/orders/store/orders.js';
   import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js';
@@ -227,7 +227,7 @@
 
   import customers from '@martyrs/src/modules/orders/store/customers.store';
   
-  import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 	
   // Accessing router
   const route = useRoute()
@@ -327,7 +327,7 @@
         org_id: route.params._id
       };
       
-      globals.actions.add(orders.state.current.positions, position);
+      core.actions.add(orders.state.current.positions, position);
       closeVariantsPopup();
     } catch (error) {
       console.error('Error adding variant to order:', error);

package/src/modules/orders/components/pages/Orders.vue

@@ -111,12 +111,12 @@
   import CardOrderUser from '@martyrs/src/modules/orders/components/blocks/CardOrderUser.vue'
   import CardOrderBackoffice from '@martyrs/src/modules/orders/components/blocks/CardOrderBackoffice.vue'
 
-  import SectionPageTitle from '@martyrs/src/modules/globals/views/components/sections/SectionPageTitle.vue'
+  import SectionPageTitle from '@martyrs/src/modules/core/views/components/sections/SectionPageTitle.vue'
 
   import Feed from '@martyrs/src/components/Feed/Feed.vue'
 
   import IconTime  from '@martyrs/src/modules/icons/entities/IconTime.vue'
-  import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js'
+  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js'
 
   const route = useRoute();
   const router = useRouter();

package/src/modules/orders/components/partials/ShopCart.vue

@@ -44,10 +44,10 @@
        <PriceTotal 
           :totalPrice="cartTotalPrice"
           :currency="returnCurrency()"
-          :showFees="globals.state.options?.orders.showFees"
-          :feesRate="globals.state.options?.orders.feesRate"
-          :showVat="globals.state.options?.orders.showVat"
-          :vatRate="globals.state.options?.orders.vatRate"
+          :showFees="core.state.options?.orders.showFees"
+          :feesRate="core.state.options?.orders.feesRate"
+          :showVat="core.state.options?.orders.showVat"
+          :vatRate="core.state.options?.orders.vatRate"
         />
       </div>
       <button v-if="shopcart.state.positions.length > 0" @click="openOrder()" class="bg-main t-black w-100 button">{{ t('fastorder') }}</button>
@@ -87,10 +87,10 @@
 
   import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue';
 
-  import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
+  import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
   import * as shopcart from '@martyrs/src/modules/orders/store/shopcart.js';
-  import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
   /////////////////////////////
   // CREATED
   /////////////////////////////
@@ -139,7 +139,7 @@
   function openOrder() {
     // store.dispatch("shopcart/toggleShopCart");
     // store.dispatch("shopcart/setSearch");
-    !globals.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id ?  router.push({name: 'Sign In', query: { returnUrl: '/orders/form'}}) :   router.push({name: 'CreateOrder'}) 
+    !core.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id ?  router.push({name: 'Sign In', query: { returnUrl: '/orders/form'}}) :   router.push({name: 'CreateOrder'}) 
     shopcart.actions.toggleShopcart();
   }
 </script>

package/src/modules/orders/components/sections/ApplicationDetails.vue

@@ -70,7 +70,7 @@
 import Block from '@martyrs/src/components/Block/Block.vue';
 import StatusBadge from '@martyrs/src/components/Table/StatusBadge.vue';
 import Button from '@martyrs/src/components/Button/Button.vue';
-import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 
 const { formatDate } = useGlobalMixins();
 

package/src/modules/orders/components/sections/CustomerDetails.vue

@@ -86,7 +86,7 @@
 import Block from '@martyrs/src/components/Block/Block.vue';
 import StatusBadge from '@martyrs/src/components/Table/StatusBadge.vue';
 import Button from '@martyrs/src/components/Button/Button.vue';
-import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 
 const { formatDate } = useGlobalMixins();
 

package/src/modules/orders/components/sections/FormDelivery.vue

@@ -75,7 +75,7 @@ import { useRoute } from 'vue-router';
 import Feed from '@martyrs/src/components/Feed/Feed.vue';
 import CardSpot from '@martyrs/src/modules/spots/components/blocks/CardSpot.vue';  
 import * as spotsModule from '@martyrs/src/modules/spots/store/spots.js';
-import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
+import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
 import Block from '@martyrs/src/components/Block/Block.vue';
 import Address from '@martyrs/src/components/Address/Address.vue';
 import LocationMarker from '@martyrs/src/components/LocationMarker/LocationMarker.vue';
@@ -98,9 +98,9 @@ watch(() => props.order.delivery.type, (newType) => {
 
 // Устанавливаем начальные данные из globals при монтировании
 onMounted(() => {
-  if (globals.state.position) {
-    props.order.delivery.address = globals.state.position.address;
-    props.order.delivery.location = globals.state.position.location;
+  if (core.state.position) {
+    props.order.delivery.address = core.state.position.address;
+    props.order.delivery.location = core.state.position.location;
   }
 });