@ozdao/martyrs 0.2.548 → 0.2.550

package/src/modules/pages/pages.client.js

@@ -1,8 +1,8 @@
 // Store
 import * as storePages from './views/store/pages.js';
 // Router
-import routerPagesBackoffice from './views/router/pages.backoffice.router.js';
-import routerPages from './views/router/pages.router.js';
+import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
+import { getRoutes } from './pages.router.js';
 // Views
 import Page from './views/components/pages/Page.vue';
 import PageEdit from './views/components/pages/PageEdit.vue';
@@ -10,11 +10,10 @@ import Pages from './views/components/pages/Pages.vue';
 
 // Пример функции инициализации для модуля страниц
 function initializePages(app, store, router, options = {}) {
-  const routeHome = options.route?.home || 'Home';
-  const routeBO = options.route?.backoffice || 'Backoffice Root';
-
-  router.addRoute(routeHome, routerPages);
-  router.addRoute(routeBO, routerPagesBackoffice);
+  const routes = getRoutes(options);
+  routes.forEach(({ parentName, config }) => {
+    addRoutes(router, { ...config, parentName });
+  });
 
   store.addStore('pages', storePages);
 }
@@ -26,7 +25,7 @@ const ModulePages = {
       storePages,
     },
     router: {
-      routerPages,
+      getRoutes,
     },
     components: {
       // Pages

package/src/modules/pages/pages.router.js

@@ -0,0 +1,105 @@
+import layoutEmpty from '@martyrs/src/modules/core/views/components/layouts/Empty.vue';
+import Sidebar from '@martyrs/src/modules/backoffice/components/partials/Sidebar.vue';
+import SidebarPages from './views/components/partials/SidebarPages.vue';
+
+function createPublicRoutes(options = {}) {
+  return [
+    {
+      path: ':url+',
+      name: options.publicRouteName || 'Page',
+      meta: {
+        title: {
+          en: 'Page',
+          ru: 'Страница',
+        },
+      },
+      component: () => import(
+        /* webpackChunkName: 'Page' */
+        './views/components/pages/Page.vue'
+      ),
+    },
+  ];
+}
+
+function createBackofficeRoutes(options = {}) {
+  return [
+    {
+      path: '',
+      name: 'Pages',
+      component: () => import(
+        /* webpackChunkName: 'Pages' */
+        './views/components/pages/Pages.vue'
+      ),
+    },
+    {
+      path: 'add',
+      name: 'Pages Add',
+      meta: {
+        title: {
+          en: 'New Page',
+        },
+        sidebar: SidebarPages,
+      },
+      component: () => import(
+        /* webpackChunkName: 'Pages' */
+        './views/components/pages/PageEdit.vue'
+      ),
+    },
+    {
+      path: ':url+',
+      name: 'Pages Edit',
+      meta: {
+        title: {
+          en: 'Edit Page',
+        },
+        sidebar: SidebarPages,
+      },
+      component: () => import(
+        /* webpackChunkName: 'Pages' */
+        './views/components/pages/PageEdit.vue'
+      ),
+    },
+  ];
+}
+
+export function getRoutes(options = {}) {
+  const routes = [];
+  const routeHome = options.route?.home || options.routeHome || 'Home';
+  const routeBackoffice = options.route?.backoffice || options.routeBackoffice || 'Backoffice Root';
+
+  routes.push({
+    parentName: routeHome,
+    config: {
+      basePath: options.publicBasePath || 'pages',
+      component: options.publicLayout || layoutEmpty,
+      meta: {
+        title: {
+          en: 'Pages',
+          ru: 'Информация',
+        },
+      },
+      routes: createPublicRoutes(options),
+    },
+  });
+
+  if (!options.withBackoffice) {
+    routes.push({
+      parentName: routeBackoffice,
+      config: {
+        basePath: options.backofficeBasePath || 'pages',
+        routeNamePrefix: options.backofficeRouteNamePrefix || 'Backoffice ',
+        meta: {
+          title: {
+            en: 'Pages',
+          },
+          sidebar: Sidebar,
+        },
+        routes: createBackofficeRoutes(options),
+      },
+    });
+  }
+
+  return routes;
+}
+
+export default { getRoutes };

package/src/modules/pages/views/components/pages/Page.vue

@@ -90,7 +90,7 @@
   import * as pages from '../../store/pages';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 
-  import { useGlobalMixins } from "@martyrs/src/modules/globals/views/mixins/mixins.js"
+  import { useGlobalMixins } from "@martyrs/src/modules/core/views/mixins/mixins.js"
 
   const isMenuOpen = ref(false)
 

package/src/modules/pages/views/components/pages/PageEdit.vue

@@ -35,7 +35,7 @@
 import { ref, computed, onMounted } 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"
 
 const { 
   normalizeUrlParam, 

package/src/modules/pages/views/components/pages/Pages.vue

@@ -24,14 +24,14 @@
   import { useRoute,useRouter } from 'vue-router'
 
   import Block from '@martyrs/src/components/Block/Block.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 CardPage from '../blocks/CardPage.vue'
 
   import * as pages from '../../store/pages.js'
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 
-  import { useGlobalMixins } from "@martyrs/src/modules/globals/views/mixins/mixins.js"
+  import { useGlobalMixins } from "@martyrs/src/modules/core/views/mixins/mixins.js"
 
   const { 
     normalizeUrlParam, 

package/src/modules/pages/views/components/partials/SidebarPages.vue

@@ -49,7 +49,7 @@
   import * as pages from '../../store/pages.js'
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 
-  import { useGlobalMixins } from "@martyrs/src/modules/globals/views/mixins/mixins.js"
+  import { useGlobalMixins } from "@martyrs/src/modules/core/views/mixins/mixins.js"
 
   const { 
     normalizeUrlParam, 

package/src/modules/pages/views/router/pages.router.js

@@ -1,4 +1,4 @@
-import layoutEmpty from '@martyrs/src/modules/globals/views/components/layouts/Empty.vue';
+import layoutEmpty from '@martyrs/src/modules/core/views/components/layouts/Empty.vue';
 
 const pages = {
   path: '/pages',

package/src/modules/pages/views/store/pages.js

@@ -1,7 +1,7 @@
-import { setError } from '@martyrs/src/modules/globals/views/store/globals.js';
+import { setError } from '@martyrs/src/modules/core/views/store/core.store.js';
 import { reactive, watch } from 'vue';
 
-import $axios from '@martyrs/src/modules/globals/views/utils/axios-instance.js';
+import $axios from '@martyrs/src/modules/core/views/utils/axios-instance.js';
 
 const state = reactive({
   all: [],

package/src/modules/pages/views/store/pages.store.js

@@ -1,4 +1,4 @@
-import Store from '@martyrs/src/modules/globals/views/classes/globals.store.js';
+import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
 
 const pages = new Store(`${process.env.API_URL}/api/pages`);
 

package/src/modules/products/components/blocks/CardCategory.vue

@@ -7,22 +7,22 @@
       <router-link
        v-if="access"
        :to="{
-          name: 'Category Edit', 
-          params: { 
+          name: route.meta.context === 'backoffice' ? 'BackofficeCategoryEdit' : 'Organization_CategoryEdit',
+          params: {
             _id: route.params._id,
             category: category._id
-          } 
+          }
         }"
         class="
           i-medium
-          cursor-pointer 
+          cursor-pointer
           card-page-actions
           radius-extra pd-micro bg-second
           flex-child-default
         "
       >
         <IconEdit
-          class="w-100 h-100" 
+          class="w-100 h-100"
           classes="fill-white"
         />
       </router-link>

package/src/modules/products/components/blocks/CardPosition.vue

@@ -59,7 +59,7 @@
 <script setup>
 import { defineProps } from '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 { formatPrice } = useGlobalMixins();
 

package/src/modules/products/components/blocks/CardProduct.vue

@@ -31,8 +31,8 @@
 			<div class="w-100  h-100 pos-relative">
 				<!-- Image Wrappers  -->
 				<img loading="lazy" 
-					v-if="product.images[0]" 
-					:src="(FILE_SERVER_URL || '') + product.images[0].split('/').slice(0, -1).join('/') + '/thumbnail_' + product.images[0].split('/').pop()"
+					v-if="product.images?.[0]" 
+					:src="(FILE_SERVER_URL || '') + (product.images?.[0] || '').split('/').slice(0, -1).join('/') + '/thumbnail_' + (product.images?.[0] || '').split('/').pop()"
 					class="pos-absolute object-fit-cover radius-small h-max-100 h-100  w-100"
 				>
 
@@ -48,11 +48,11 @@
 		<!-- Product Info Start -->
 		<div  class="pd-small cols-1 t-left">
 			<!-- Detail -->
-			<p 
-				v-if="product.attributes.length > 0"  
+			<p
+				v-if="product.attributes?.length > 0"
 				class="t-semi t-transp p-small mn-b-thin"
 			>
-				{{product.attributes[0].value}}
+				{{product.attributes[0]?.value}}
 			</p>
 			<!-- Name -->
 			<span style=" hyphens: auto;" class="word-break t-truncate p-regular mn-b-micro w-100 w-max-100 ">

package/src/modules/products/components/blocks/ProductDiscounts.vue

@@ -36,7 +36,7 @@ import { computed } from 'vue';
 import IconDiscount from '@martyrs/src/modules/icons/entities/IconDiscount.vue'
 import Chips from '@martyrs/src/components/Chips/Chips.vue';
 import Tooltip from '@martyrs/src/components/Tooltip/Tooltip.vue';
-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/products/components/elements/Price.vue

@@ -32,7 +32,7 @@
 
 <script setup>
 import { computed } from 'vue';
-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/products/components/pages/Categories.vue

@@ -7,12 +7,12 @@
         Categories
       </h2>
 
-      <router-link 
+      <router-link
         :to="{
-          name: 'Category Add', 
-          params: { 
+          name: route.meta.context === 'backoffice' ? 'BackofficeCategoryAdd' : 'Organization_CategoryAdd',
+          params: {
             _id: $route.params._id
-          } 
+          }
         }"
         class="uppercase t-medium pd-small radius-medium bg-white nav-link"
       >
@@ -68,10 +68,10 @@
   import { onMounted, onUnmounted, computed, ref,reactive } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
 
-  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 categories from '@martyrs/src/modules/products/store/categories.js';
-  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();
@@ -103,17 +103,20 @@
     }]
   })
 
-  globals.state.navigation_bar.actions = [{
+  core.state.navigation_bar.actions = [{
     component: IconPlus,
     props: {
-      fill: "rgb(var(--main))" 
+      fill: "rgb(var(--main))"
     },
     condition: () => auth.state.user && auth.state.user._id,
-    action: () => route.params._id ? router.push({ name: 'Category Add', params: { _id: route.params._id} }) : router.push({ name: 'Category Add' })
+    action: () => {
+      const routeName = route.meta.context === 'backoffice' ? 'BackofficeCategoryAdd' : 'Organization_CategoryAdd';
+      route.params._id ? router.push({ name: routeName, params: { _id: route.params._id} }) : router.push({ name: routeName });
+    }
   }],
 
   onUnmounted(() => {
-    globals.state.navigation_bar.actions = [];
+    core.state.navigation_bar.actions = [];
   });
 
   onMounted(async () => {

package/src/modules/products/components/pages/CategoryEdit.vue

@@ -177,7 +177,7 @@
   import IconCheckmark from '@martyrs/src/modules/icons/navigation/IconCheckmark.vue'
 
   // Import the new store structure
-  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 categories from '@martyrs/src/modules/products/store/categories.js';
 
@@ -205,7 +205,7 @@
   const routePath = computed(() => route.name)
 
   // Navigation Bar
-  globals.state.navigation_bar.actions = [{
+  core.state.navigation_bar.actions = [{
     component: IconCheckmark,
     props: {
       fill: "rgb(var(--main))" 
@@ -215,7 +215,7 @@
   }],
 
  onUnmounted(() => {
-    globals.state.navigation_bar.actions = [];
+    core.state.navigation_bar.actions = [];
   });
 
 

package/src/modules/products/components/pages/Product.vue

@@ -111,10 +111,10 @@
 import { computed, ref, onMounted, getCurrentInstance } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 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"
 
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.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 * as products from '@martyrs/src/modules/products/store/products.js'
 import * as categories from '@martyrs/src/modules/products/store/categories.js'
 import * as shopcart from '@martyrs/src/modules/orders/store/shopcart.js'

package/src/modules/products/components/pages/ProductEdit.vue

@@ -294,7 +294,7 @@ import Button from "@martyrs/src/components/Button/Button.vue";
 import Tree from "@martyrs/src/components/Tree/Tree.vue";
 import EditImages from '@martyrs/src/components/EditImages/EditImages.vue';
 
-import BlockMultiselect from '@martyrs/src/modules/globals/views/components/blocks/BlockMultiselect.vue';
+import BlockMultiselect from '@martyrs/src/modules/core/views/components/blocks/BlockMultiselect.vue';
 import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue';
 import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue';
 
@@ -305,12 +305,12 @@ import EditCategories from '@martyrs/src/modules/products/components/sections/Ed
 import EditRecommended from '@martyrs/src/modules/products/components/sections/EditRecommended.vue';
 
 // Accessing router and 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 products from '@martyrs/src/modules/products/store/products.js';
 import * as categories from '@martyrs/src/modules/products/store/categories.js';
 
-import { setError } from '@martyrs/src/modules/globals/views/store/globals.js'
+import { setError } from '@martyrs/src/modules/core/views/store/core.store.js'
 
 const route = useRoute()
 const router = useRouter()

package/src/modules/products/components/pages/Products.vue

@@ -264,8 +264,8 @@
   import Feed from '@martyrs/src/components/Feed/Feed.vue'
 
   import FilterProducts from '@martyrs/src/modules/products/components/sections/FilterProducts.vue'
-  import BlockSearch from '@martyrs/src/modules/globals/views/components/blocks/BlockSearch.vue'
-  import Filters  from '@martyrs/src/modules/globals/views/components/sections/Filters.vue'
+  import BlockSearch from '@martyrs/src/modules/core/views/components/blocks/BlockSearch.vue'
+  import Filters  from '@martyrs/src/modules/core/views/components/sections/Filters.vue'
   import Spoiler from "@martyrs/src/components/Spoiler/Spoiler.vue"
   import Field from "@martyrs/src/components/Field/Field.vue"
   import Calendar from "@martyrs/src/components/Calendar/Calendar.vue"
@@ -281,10 +281,10 @@
 
   // Accessing router and store
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.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 * as products from '@martyrs/src/modules/products/store/products.js';
   import * as categories from '@martyrs/src/modules/products/store/categories.js';
-  import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 
   const emits = defineEmits(['page-loading', 'page-loaded']);
   const route = useRoute()
@@ -447,7 +447,7 @@
   };
 
   if (route.params?._id) {
-    globals.state.navigation_bar.actions = [{
+    core.state.navigation_bar.actions = [{
       component: IconPlus,
       props: {
         fill: "rgb(var(--main))" 
@@ -464,7 +464,7 @@
   });
 
   onUnmounted(() => {
-    globals.state.navigation_bar.actions = [];
+    core.state.navigation_bar.actions = [];
   });
 
 </script>

package/src/modules/products/components/sections/EditIngredients.vue

@@ -16,15 +16,15 @@
         :products="Products"
         :showPrice="false"
         @add="(item) => {
-          globals.actions.add(ingredients, item);
+          core.actions.add(ingredients, item);
           closeIngredientPopup();
         }"
         @update="(item) => {
-          globals.actions.update(ingredients, item, index);
+          core.actions.update(ingredients, item, index);
           closeIngredientPopup();
         }"
         @delete="(item) => {
-          globals.actions.delete(ingredients, item, index);
+          core.actions.delete(ingredients, item, index);
           closeIngredientPopup();
         }"
       />
@@ -75,7 +75,7 @@
             let p = { ...product };
             p.quantity = 1;
             p.type = 'pcs'
-            globals.actions.add(ingredients, p);
+            core.actions.add(ingredients, p);
             closeIngredientPopup();
           }"
           class="bg-white pd-thin radius-medium w-100 mn-b-thin"
@@ -95,7 +95,7 @@ import Popup from '@martyrs/src/components/Popup/Popup.vue';
 import Feed from '@martyrs/src/components/Feed/Feed.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 products from '@martyrs/src/modules/products/store/products.js';
 

package/src/modules/products/components/sections/EditRecommended.vue

@@ -19,7 +19,7 @@
             component: IconDelete,
             class: 'bg-red',
             handler: () => {
-              globals.actions.delete(recommended, product, index);
+              core.actions.delete(recommended, product, index);
             }
           }
         ]"
@@ -60,7 +60,7 @@
           :image="product.images?.[0] ? (FILE_SERVER_URL || '') + product.images[0] : ''"
           :name="product.name"
           :showThumbnail="true"
-          @click="globals.actions.add(recommended, product); closeRecommendedPopup();"
+          @click="core.actions.add(recommended, product); closeRecommendedPopup();"
           class="bg-white pd-thin radius-medium w-100 mn-b-thin cursor-pointer hover-scale-1"
         />
       </Feed>
@@ -71,7 +71,7 @@
 <script setup>
 import { ref, computed, onMounted, defineModel } 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"
 
 // Импорт компонентов
 import Block from '@martyrs/src/components/Block/Block.vue';
@@ -79,7 +79,7 @@ import Popup from '@martyrs/src/components/Popup/Popup.vue';
 import Feed from '@martyrs/src/components/Feed/Feed.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 products from '@martyrs/src/modules/products/store/products.js';
 

package/src/modules/products/components/sections/EditVariants.vue

@@ -257,7 +257,7 @@ import PlaceholderImage from '@martyrs/src/modules/icons/placeholders/Placeholde
 import IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue';
 import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue';
 import IconDuplicate from '@martyrs/src/modules/icons/actions/IconDuplicate.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 { returnCurrency } = useGlobalMixins();

package/src/modules/products/components/sections/SectionProduct.vue

@@ -38,12 +38,12 @@
 			<IconEdit
 				v-if="accesses && hasAccess(route.params._id, 'products', 'edit', accesses)"
 				@click="$router.push({
-					name: 'ProductEdit', 
+					name: route.meta.context === 'backoffice' ? 'BackofficeProductEdit' : 'Organization_ProductEdit',
 					params: {
 						_id: product.owner.target,
 						product: product._id
 					}
-				})" 
+				})"
 				class="pos-absolute pos-t-regular pos-r-regular i-medium t-transp"
 			/>
 

package/src/modules/products/controllers/categories.controller.js

@@ -1,6 +1,6 @@
-import Cache from '@martyrs/src/modules/globals/controllers/classes/globals.cache.js';
-import Logger from '@martyrs/src/modules/globals/controllers/classes/globals.logger.js';
-import globalsQuery from '@martyrs/src/modules/globals/controllers/utils/queryProcessor.js';
+import Cache from '@martyrs/src/modules/core/controllers/classes/core.cache.js';
+import Logger from '@martyrs/src/modules/core/controllers/classes/core.logger.js';
+import globalsQuery from '@martyrs/src/modules/core/controllers/utils/queryProcessor.js';
 
 const controllerFactory = db => {
   const Category = db.category;

package/src/modules/products/controllers/products.controller.js

@@ -1,6 +1,6 @@
 import ChatGPT from '@martyrs/src/modules/integrations/openai/openai.globals.js';
 
-import queryProcessorGlobals from '@martyrs/src/modules/globals/controllers/utils/queryProcessor.js';
+import queryProcessorCore from '@martyrs/src/modules/core/controllers/utils/queryProcessor.js';
 import queryProcessorProducts from '@martyrs/src/modules/products/controllers/queries/products.queries.js';
 
 import productLookupConfigs from '@martyrs/src/modules/products/controllers/configs/products.lookup.config.js';
@@ -59,7 +59,7 @@ const controllerFactory = db => {
   // Read products
   const Read = async (req, res) => {
     try {
-      const requestedLookups = queryProcessorGlobals.getRequestedLookups(req.query);
+      const requestedLookups = queryProcessorCore.getRequestedLookups(req.query);
       
       if (req.query.dateStart || req.query.dateEnd) {
           console.log('Availability filter params:', {
@@ -70,30 +70,30 @@ const controllerFactory = db => {
           });
       }
       const stages = [
-        ...queryProcessorGlobals.getBasicOptions(req.query),
-        ...queryProcessorGlobals.getSearchOptions(req.query.search, {
+        ...queryProcessorCore.getBasicOptions(req.query),
+        ...queryProcessorCore.getSearchOptions(req.query.search, {
           fields: ['name', 'description']
         }),
         ...queryProcessorProducts.getCategoriesFilterStage(req.query.categories),
         ...queryProcessorProducts.getDeliveryFilterStage(req.query.delivery),
         ...queryProcessorProducts.getAttributeFiltersStage(req.query.filters),
         
-        ...queryProcessorGlobals.getLookupStages(requestedLookups, productLookupConfigs),
+        ...queryProcessorCore.getLookupStages(requestedLookups, productLookupConfigs),
 
         ...queryProcessorProducts.getVariantPriceFilterStage(req.query.priceMin, req.query.priceMax),
         ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         
-        queryProcessorGlobals.getCreatorUserLookupStage(),
-        queryProcessorGlobals.getCreatorOrganizationLookupStage(),
-        queryProcessorGlobals.getOwnerUserLookupStage(),
-        queryProcessorGlobals.getOwnerOrganizationLookupStage(),
-        queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+        queryProcessorCore.getCreatorUserLookupStage(),
+        queryProcessorCore.getCreatorOrganizationLookupStage(),
+        queryProcessorCore.getOwnerUserLookupStage(),
+        queryProcessorCore.getOwnerOrganizationLookupStage(),
+        queryProcessorCore.getAddFieldsCreatorOwnerStage(),
         
-        ...queryProcessorGlobals.getSortingOptions(req.query.sortParam, req.query.sortOrder),
-        ...queryProcessorGlobals.getPaginationOptions(req.query.skip, req.query.limit),
+        ...queryProcessorCore.getSortingOptions(req.query.sortParam, req.query.sortOrder),
+        ...queryProcessorCore.getPaginationOptions(req.query.skip, req.query.limit),
         
         // Удаление временных полей
-        queryProcessorGlobals.removeTempPropeties(),
+        queryProcessorCore.removeTempPropeties(),
         
         // Дополнительные очистки для lookup-ов
         ...(requestedLookups.includes('inventory') ? [{ $project: { availability: 0 } }] : [])