@ozdao/martyrs 0.2.477 → 0.2.479

package/src/modules/globals/views/components/partials/NavigationBar.vue

@@ -79,9 +79,9 @@
 
 	import Button 				from '@martyrs/src/components/Button/Button.vue'
 
-	import * as globals from '@martyrs/src/modules/globals/views/store/globals'
-	import * as shopcart from '@martyrs/src/modules/orders/store/shopcart'
-	import * as auth from '@martyrs/src/modules/auth/views/store/auth'
+	import * as globals from '@martyrs/src/modules/globals/views/store/globals.js'
+	import * as shopcart from '@martyrs/src/modules/orders/store/shopcart.js'
+	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 
 		// Props
 	const props = defineProps({

package/src/modules/globals/views/components/partials/Sidebar.vue

@@ -3,7 +3,7 @@ import { ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { useGlobalMixins } from "@martyrs/src/modules/globals/views/mixins/mixins.js"
 
-import * as globals from '@martyrs/src/modules/globals/views/store/globals'
+import * as globals from '@martyrs/src/modules/globals/views/store/globals.js'
 
 const props = defineProps({
   theme: {

package/src/modules/globals/views/localization/get-browser-locale.js

@@ -1,20 +1,15 @@
 export default function getBrowserLocale(options = {}) {
-  const defaultOptions = { countryCodeOnly: false }
+  const defaultOptions = { countryCodeOnly: false };
 
-  const opt = { ...defaultOptions, ...options }
+  const opt = { ...defaultOptions, ...options };
 
-  const navigatorLocale =
-    navigator.languages !== undefined
-      ? navigator.languages[0]
-      : navigator.language
+  const navigatorLocale = navigator.languages !== undefined ? navigator.languages[0] : navigator.language;
 
   if (!navigatorLocale) {
-    return undefined
+    return undefined;
   }
 
-  const trimmedLocale = opt.countryCodeOnly
-    ? navigatorLocale.trim().split(/-|_/)[0]
-    : navigatorLocale.trim()
+  const trimmedLocale = opt.countryCodeOnly ? navigatorLocale.trim().split(/-|_/)[0] : navigatorLocale.trim();
 
-  return trimmedLocale
-}
+  return trimmedLocale;
+}

package/src/modules/globals/views/middlewares/localization.js

@@ -2,15 +2,12 @@ function setLocale(to, from, next) {
   const locale = to.params.locale;
 
   if (locale && this.$i18n.availableLocales.includes(locale)) {
-    console.log('true')
+    console.log('true');
     app.config.globalProperties.$i18n.locale = locale;
-  return next();
+    return next();
   }
 
   next();
 }
 
-
-export  {
-  setLocale
-}
+export { setLocale };

package/src/modules/globals/views/mixins/mixins.js

@@ -1,34 +1,32 @@
-import * as globals from '@martyrs/src/modules/globals/views/store/globals'
+import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
 
 // useGlobalMixins.js
 export function useGlobalMixins() {
-
-
-  const isAdmin = (roles) => {
+  const isAdmin = roles => {
     if (roles) {
       const isAdmin = roles.includes('ROLE_ADMIN') ? roles.includes('ROLE_ADMIN') : false;
 
       if (isAdmin !== true) {
-        return false
+        return false;
       }
 
-      return true
+      return true;
     } else {
-      return false
+      return false;
     }
-  }
-  
+  };
+
   const hasAccess = (organizationId, rightCategory = null, rightType = null, accesses, roles) => {
     // Если пользователь админ, то сразу даем доступ
     if (isAdmin(roles)) {
       return true;
     }
-    
+
     const accessArray = accesses;
-    
+
     // Проверяем существование записи для организации
     const organizationAccess = accessArray.find(access => access.organization === organizationId);
-    
+
     // Если переданы только organizationId и accesses - проверяем только членство
     if (rightCategory === null && rightType === null) {
       return Boolean(organizationAccess); // если организация найдена - значит член
@@ -46,105 +44,129 @@ export function useGlobalMixins() {
     return categoryAccess[rightType] === true;
   };
 
-
   const returnCurrency = () => {
-    const currency = globals.state.options.currency || '$'
-    return currency
-  }
-
-  const formatPrice = (number) => {
-    const currency = returnCurrency();
-    let formattedNumber = number.toFixed(2).replace('.', ',').replace(/\B(?=(\d{3})+(?!\d))/g, ' ');
-    return `${currency}${formattedNumber}`;
-  }
-
-const formatDate = (d, options = {}) => {
-  var fixedDate = new Date(d);
-
-  // Определяем параметры локализации
-  const formatOptions = {
-    year: 'numeric',
-    month: 'long', // название месяца
-    day: '2-digit', // день с ведущим нулем
-    hour: '2-digit', // часы с ведущим нулем
-    minute: '2-digit', // минуты с ведущим нулем
-    hour12: false, // 24-часовой формат времени
-    ...options // дополнительные настройки
+    const currency = globals.state.options.currency || '$';
+    return currency;
   };
 
-  // Язык, по умолчанию "ru" (русский)
-  const locale = options.language || 'ru';
-
-  // Используем Intl.DateTimeFormat для локализации
-  const dateFormatter = new Intl.DateTimeFormat(locale, formatOptions);
-
-  var format = {
-    dateOnly: options.dateOnly || false,
-    timeOnly: options.timeOnly || false,
-    dayMonth: options.dayMonth || false,
-    dayTime: options.dayTime || false,
-    monthYear: options.monthYear || false,
-    yearOnly: options.yearOnly || false,
-    custom: options.custom || "",
-    monthName: options.monthName || false, // Новый параметр для вывода названия месяца
-    language: options.language || 'ru' // Язык, по умолчанию русский
-  };
+   const formatPrice = number => {
+  try {
+    if (number == null) {
+      throw new TypeError('formatPrice: ожидается число, но получено null или undefined');
+    }
 
-  if (format.dateOnly) {
-    return dateFormatter.format(fixedDate).split(',')[0]; // Выводим только дату
-  } else if (format.timeOnly) {
-    return new Intl.DateTimeFormat(locale, { hour: '2-digit', minute: '2-digit', hour12: false }).format(fixedDate); // Выводим только время
-  } else if (format.dayMonth) {
-    return new Intl.DateTimeFormat(locale, { day: '2-digit', month: 'short' }).format(fixedDate); // день и месяц
-  } else if (format.dayTime) {
-    return new Intl.DateTimeFormat(locale, { day: '2-digit', month: 'short', hour: '2-digit', minute: '2-digit', hour12: false }).format(fixedDate); // день и время
-  } else if (format.monthYear) {
-    return new Intl.DateTimeFormat(locale, { month: 'long', year: 'numeric' }).format(fixedDate); // месяц и год
-  } else if (format.yearOnly) {
-    return new Intl.DateTimeFormat(locale, { year: 'numeric' }).format(fixedDate); // только год
-  } else if (format.custom) {
-    // Для пользовательского формата с подстановкой
-    return format.custom.replace("yyyy", fixedDate.getFullYear())
-      .replace("mm", ("0" + (fixedDate.getMonth() + 1)).slice(-2)) // добавление ведущего нуля
-      .replace("dd", ("0" + fixedDate.getDate()).slice(-2)) // добавление ведущего нуля
-      .replace("hh", ("0" + fixedDate.getHours()).slice(-2)) // добавление ведущего нуля
-      .replace("min", ("0" + fixedDate.getMinutes()).slice(-2)); // добавление ведущего нуля
+    const currency = returnCurrency();
+    const absNumber = Math.abs(number)
+      .toFixed(2)
+      .replace('.', ',')
+      .replace(/\B(?=(\d{3})+(?!\d))/g, ' ');
+
+    const sign = number < 0 ? '-' : '';
+    return `${sign} ${currency}${absNumber}`;
+  } catch (err) {
+    console.error(err);
+    return 'null';
   }
+};
+
+
+  const formatDate = (d, options = {}) => {
+    var fixedDate = new Date(d);
+
+    // Определяем параметры локализации
+    const formatOptions = {
+      year: 'numeric',
+      month: 'long', // название месяца
+      day: '2-digit', // день с ведущим нулем
+      hour: '2-digit', // часы с ведущим нулем
+      minute: '2-digit', // минуты с ведущим нулем
+      hour12: false, // 24-часовой формат времени
+      ...options, // дополнительные настройки
+    };
+
+    // Язык, по умолчанию "ru" (русский)
+    const locale = options.language || 'ru';
+
+    // Используем Intl.DateTimeFormat для локализации
+    const dateFormatter = new Intl.DateTimeFormat(locale, formatOptions);
+
+    var format = {
+      dateOnly: options.dateOnly || false,
+      timeOnly: options.timeOnly || false,
+      dayMonth: options.dayMonth || false,
+      dayTime: options.dayTime || false,
+      monthYear: options.monthYear || false,
+      yearOnly: options.yearOnly || false,
+      custom: options.custom || '',
+      monthName: options.monthName || false, // Новый параметр для вывода названия месяца
+      language: options.language || 'ru', // Язык, по умолчанию русский
+    };
+
+    if (format.dateOnly) {
+      return dateFormatter.format(fixedDate).split(',')[0]; // Выводим только дату
+    } else if (format.timeOnly) {
+      return new Intl.DateTimeFormat(locale, {
+        hour: '2-digit',
+        minute: '2-digit',
+        hour12: false,
+      }).format(fixedDate); // Выводим только время
+    } else if (format.dayMonth) {
+      return new Intl.DateTimeFormat(locale, { day: '2-digit', month: 'short' }).format(fixedDate); // день и месяц
+    } else if (format.dayTime) {
+      return new Intl.DateTimeFormat(locale, {
+        day: '2-digit',
+        month: 'short',
+        hour: '2-digit',
+        minute: '2-digit',
+        hour12: false,
+      }).format(fixedDate); // день и время
+    } else if (format.monthYear) {
+      return new Intl.DateTimeFormat(locale, { month: 'long', year: 'numeric' }).format(fixedDate); // месяц и год
+    } else if (format.yearOnly) {
+      return new Intl.DateTimeFormat(locale, { year: 'numeric' }).format(fixedDate); // только год
+    } else if (format.custom) {
+      // Для пользовательского формата с подстановкой
+      return format.custom
+        .replace('yyyy', fixedDate.getFullYear())
+        .replace('mm', ('0' + (fixedDate.getMonth() + 1)).slice(-2)) // добавление ведущего нуля
+        .replace('dd', ('0' + fixedDate.getDate()).slice(-2)) // добавление ведущего нуля
+        .replace('hh', ('0' + fixedDate.getHours()).slice(-2)) // добавление ведущего нуля
+        .replace('min', ('0' + fixedDate.getMinutes()).slice(-2)); // добавление ведущего нуля
+    }
 
-  // Вернуть полную дату в стандартном формате
-  return dateFormatter.format(fixedDate);
-}
+    // Вернуть полную дату в стандартном формате
+    return dateFormatter.format(fixedDate);
+  };
 
   const formateText = (text, maxLength = 16) => {
     // Return empty string if text is undefined or null
     if (!text) return '';
-    
+
     // If text is shorter than or equal to maxLength, return it as is
     if (text.length <= maxLength) {
       return text;
     }
-    
+
     // Otherwise truncate and add ellipsis
     return text.substring(0, maxLength) + '...';
-  }
-
+  };
 
-  const normalizeUrlParam = (param) => {
-    if (!param) param = ''
+  const normalizeUrlParam = param => {
+    if (!param) param = '';
 
     return param
       .toLowerCase()
       .replace(/ /g, '-')
       .replace(/[^a-z0-9-]/g, '');
-  }
+  };
 
-  const joinArrayToUrl = (arr) => {
-    return arr.join('/')
-  }
+  const joinArrayToUrl = arr => {
+    return arr.join('/');
+  };
 
   function generateFilters(selectedFilters) {
     const filters = [];
-    
+
     // Process all selected filters
     for (const [key, values] of Object.entries(selectedFilters)) {
       if (values && values.length > 0) {
@@ -153,12 +175,12 @@ const formatDate = (d, options = {}) => {
           filters.push({
             parameter: key,
             caseSensitive: false,
-            values: Array.isArray(values) ? values : [values]
+            values: Array.isArray(values) ? values : [values],
           });
         }
       }
     }
-    
+
     return filters.length > 0 ? JSON.stringify(filters) : undefined;
   }
 
@@ -173,11 +195,11 @@ const formatDate = (d, options = {}) => {
     base += country_normalized && state_normalized && city_normalized ? `/${city_normalized}` : '';
 
     if (categories && categories.length) {
-      base += `?categories=${categories.join(",")}`;
+      base += `?categories=${categories.join(',')}`;
     }
 
     return base;
-  }
+  };
 
   const getSpotsLink = (country, state, city) => {
     let country_normalized = country ? normalizeUrlParam(country) : '';
@@ -190,63 +212,60 @@ const formatDate = (d, options = {}) => {
     base += country_normalized && state_normalized && city_normalized ? `/${city_normalized}` : '';
 
     return base;
-  }
+  };
 
-  const isClientSide = typeof window !== 'undefined' && typeof document !== 'undefined'
+  const isClientSide = typeof window !== 'undefined' && typeof document !== 'undefined';
 
-  const getCssVar = (name) => {
-    if (!isClientSide) return '' // SSR fallback
-    return getComputedStyle(document.documentElement)
-      .getPropertyValue(name)
-      .trim()
-  }
+  const getCssVar = name => {
+    if (!isClientSide) return ''; // SSR fallback
+    return getComputedStyle(document.documentElement).getPropertyValue(name).trim();
+  };
 
-  const matchMediaSafe = (query) => {
-    if (!isClientSide) return { matches: false }
-    return window.matchMedia(query)
-  }
+  const matchMediaSafe = query => {
+    if (!isClientSide) return { matches: false };
+    return window.matchMedia(query);
+  };
 
-  const isMediaMax = (varName) => {
-    const maxWidth = getCssVar(varName)
-    return matchMediaSafe(`(max-width: ${maxWidth})`).matches
-  }
+  const isMediaMax = varName => {
+    const maxWidth = getCssVar(varName);
+    return matchMediaSafe(`(max-width: ${maxWidth})`).matches;
+  };
 
-  const isMediaMin = (varName) => {
-    const minWidth = getCssVar(varName)
-    return matchMediaSafe(`(min-width: ${minWidth})`).matches
-  }
+  const isMediaMin = varName => {
+    const minWidth = getCssVar(varName);
+    return matchMediaSafe(`(min-width: ${minWidth})`).matches;
+  };
 
-  const isFlipPhone = () => isMediaMax('--flip-phone-max')
-  const isPhone = () => isMediaMax('--phone-landscape-max')
+  const isFlipPhone = () => isMediaMax('--flip-phone-max');
+  const isPhone = () => isMediaMax('--phone-landscape-max');
 
   const isTabletPortrait = () => {
-    const min = getCssVar('--tablet-portrait-min')
-    const max = getCssVar('--tablet-portrait-max')
-    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches
-  }
+    const min = getCssVar('--tablet-portrait-min');
+    const max = getCssVar('--tablet-portrait-max');
+    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches;
+  };
 
   const isTabletLandscape = () => {
-    const min = getCssVar('--tablet-landscape-min')
-    const max = getCssVar('--tablet-landscape-max')
-    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches
-  }
+    const min = getCssVar('--tablet-landscape-min');
+    const max = getCssVar('--tablet-landscape-max');
+    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches;
+  };
 
-  const isTablet = () => isTabletPortrait() || isTabletLandscape()
+  const isTablet = () => isTabletPortrait() || isTabletLandscape();
 
   const isDesktop = () => {
-    const min = getCssVar('--desktop-min')
-    const max = getCssVar('--desktop-max')
-    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches
-  }
+    const min = getCssVar('--desktop-min');
+    const max = getCssVar('--desktop-max');
+    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches;
+  };
 
   const isXLDesktop = () => {
-    const min = getCssVar('--xl-desktop-min')
-    const max = getCssVar('--xl-desktop-max')
-    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches
-  }
-
-  const isXXLDesktop = () => isMediaMin('--xxl-desktop-min')
+    const min = getCssVar('--xl-desktop-min');
+    const max = getCssVar('--xl-desktop-max');
+    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches;
+  };
 
+  const isXXLDesktop = () => isMediaMin('--xxl-desktop-min');
 
   return {
     isAdmin,
@@ -272,11 +291,10 @@ const formatDate = (d, options = {}) => {
     isDesktop,
     isXLDesktop,
     isXXLDesktop,
-
-  }
+  };
 }
 
 // Экспорт для глобальной регистрации
 export const globalMixins = {
-  methods: useGlobalMixins()
-}
+  methods: useGlobalMixins(),
+};

package/src/modules/globals/views/plugins/alert.plugin.js

@@ -1,65 +1,65 @@
 // alertPlugin.js
-import { reactive, h, render } from 'vue'
-import AlertDialog from './AlertDialog.vue' // Компонент диалога
+import { h, reactive, render } from 'vue';
+  
+import AlertDialog from '@martyrs/src/modules/globals/views/components/blocks/AlertDialog.vue';
 
 // Глобальное реактивное состояние для алерта
 const alertState = reactive({
   visible: false,
   title: '',
   message: '',
-  actions: []
-})
+  actions: [],
+});
 
-let resolvePromise = null
+let resolvePromise = null;
 
 function closeAlert(result = null) {
-  alertState.visible = false
+  alertState.visible = false;
 
   // Гарантируем, что промис всегда будет резолвлен
   if (resolvePromise) {
-    resolvePromise(result)
-    resolvePromise = null
+    resolvePromise(result);
+    resolvePromise = null;
   }
 }
 
 function showAlert({ title = '', message = '', actions = null } = {}) {
-  return new Promise((resolve) => {
-    resolvePromise = resolve
+  return new Promise(resolve => {
+    resolvePromise = resolve;
 
     if (!actions || !actions.length) {
-      actions = [{ label: 'OK', value: true }]
+      actions = [{ label: 'OK', value: true }];
     }
 
-    alertState.title = title
-    alertState.message = message
-    alertState.actions = actions
-    alertState.visible = true
-  })
+    alertState.title = title;
+    alertState.message = message;
+    alertState.actions = actions;
+    alertState.visible = true;
+  });
 }
 
 function handleAction(action) {
   if (action && typeof action.handler === 'function') {
-    action.handler()
+    action.handler();
   }
 
-  const result = (action.value === undefined ? action.label : action.value)
+  const result = action.value === undefined ? action.label : action.value;
 
-  closeAlert(result)
+  closeAlert(result);
 }
 
 export default {
   install(app) {
-    app.config.globalProperties.$alert = showAlert
+    app.config.globalProperties.$alert = showAlert;
 
     // Avoid running DOM operations during SSR
     if (typeof window !== 'undefined' && typeof document !== 'undefined') {
-      const container = document.createElement('div')
-      document.body.appendChild(container)
-      const vnode = h(AlertDialog, { alertState, handleAction, closeAlert })
-      render(vnode, container)
+      const container = document.createElement('div');
+      document.body.appendChild(container);
+      const vnode = h(AlertDialog, { alertState, handleAction, closeAlert });
+      render(vnode, container);
     }
-  }
-}
-
+  },
+};
 
-export { showAlert, closeAlert, handleAction }
+export { closeAlert, handleAction, showAlert };

package/src/modules/globals/views/plugins/date-picker.plugin.js

@@ -0,0 +1,85 @@
+// date-selector.plugin.js
+import { reactive, markRaw, defineComponent, h, render } from 'vue'
+import PopupDateSelector from '@martyrs/src/modules/globals/views/components/blocks/PopupDateSelector.vue'
+import * as globals from '@martyrs/src/modules/globals/views/store/globals.js'
+
+// 1) Общее состояние и API
+const state = reactive({
+  isOpen: false,
+  product: null,
+  options: { showFees: false, feesRate: 0.15, showVat: false, vatRate: 0 },
+  resolve: null,
+  reject: null
+})
+
+function getDefaultOptions() {
+  return {
+    showFees: globals.state.options?.orders?.showFees || false,
+    feesRate: globals.state.options?.orders?.feesRate || 0.15,
+    showVat: globals.state.options?.orders?.showVat || false,
+    vatRate: globals.state.options?.orders?.vatRate || 0
+  }
+}
+
+export function showDateSelector(product, customOptions = {}) {
+  return new Promise((res, rej) => {
+    state.resolve = res
+    state.reject  = rej
+    state.product = markRaw(product)
+    state.options = { ...getDefaultOptions(), ...customOptions }
+    state.isOpen  = true
+  })
+}
+
+function confirmSelection(dates) {
+  state.isOpen = false
+  state.resolve?.(dates)
+  state.resolve = state.reject = null
+}
+
+function cancelSelection() {
+  state.isOpen = false
+  state.reject?.(new Error('Date selection cancelled'))
+  state.resolve = state.reject = null
+}
+
+// 2) Хост-компонент
+const DateSelectorHost = defineComponent({
+  name: 'DateSelectorHost',
+  setup() {
+    return () =>
+      state.isOpen
+        ? h(PopupDateSelector, {
+            product: state.product,
+            isOpen: state.isOpen,
+            showFees: state.options.showFees,
+            feesRate: state.options.feesRate,
+            showVat: state.options.showVat,
+            vatRate: state.options.vatRate,
+            onConfirm: confirmSelection,
+            onCancel: cancelSelection,
+            'onClose-popup': cancelSelection
+          })
+        : null
+  }
+})
+
+// 3) Плагин
+export default {
+  install(app) {
+    // 3.1) Глобальный метод
+    app.config.globalProperties.$dateSelector = showDateSelector
+
+    // 3.2) Контейнер в body
+    if (typeof window !== 'undefined' && typeof document !== 'undefined') {
+      const container = document.createElement('div')
+      container.id = 'date-selector-host'
+      document.body.appendChild(container)
+
+      // 3.3) Рендерим VNode в контексте основного app
+      const vnode = h(DateSelectorHost)
+      vnode.appContext = app._context    // <-- ключевой момент
+      render(vnode, container)
+    }
+  }
+}