npm - @ozdao/martyrs - Versions diffs - 0.2.604 → 0.2.605 - Mend

@ozdao/martyrs 0.2.604 → 0.2.605

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (833) hide show

package/dist/martyrs/src/modules/orders/orders.client.js CHANGED Viewed

@@ -34,20 +34,22 @@ function initializeOrders(app, store, router, options = {}) {
   const routeOrganizations = options.routeOrganizations || "OrganizationRoot";
   const routeUsers = options.routeUsers || "User Profile Root";
   if (typeof window !== "undefined") actions.setShopcart();
-  addRoutes(router, {
-    parentName: route,
-    basePath: "orders",
-    routes: ordersRoutes,
-    routeNamePrefix: "",
-    filterConfig: {
-      include: ["CreateOrder", "Order"]
-      // Только создание заказа на корневом уровне
-    },
-    meta: {
-      context: "root"
-    }
-  });
-  if (!options.withBackoffice) {
+  if (!options.contexts || options.contexts.includes("client")) {
+    addRoutes(router, {
+      parentName: route,
+      basePath: "orders",
+      routes: ordersRoutes,
+      routeNamePrefix: "",
+      filterConfig: {
+        include: ["CreateOrder", "Order"]
+        // Только создание заказа на корневом уровне
+      },
+      meta: {
+        context: "root"
+      }
+    });
+  }
+  if (!options.contexts || options.contexts.includes("backoffice")) {
     addRoutes(router, {
       parentName: routeBackoffice,
       basePath: "orders",
@@ -63,7 +65,7 @@ function initializeOrders(app, store, router, options = {}) {
       }
     });
   }
-  if (!options.withUserRoutes) {
+  if (!options.contexts || options.contexts.includes("user")) {
     addRoutes(router, {
       parentName: routeUsers,
       basePath: "orders",
@@ -79,7 +81,7 @@ function initializeOrders(app, store, router, options = {}) {
       }
     });
   }
-  if (!options.withOrganizationRoutes) {
+  if (!options.contexts || options.contexts.includes("organization")) {
     addRoutes(router, {
       parentName: routeOrganizations,
       basePath: "orders",
@@ -95,7 +97,7 @@ function initializeOrders(app, store, router, options = {}) {
       }
     });
   }
-  if (!options.withBackoffice) {
+  if (!options.contexts || options.contexts.includes("backoffice")) {
     addRoutes(router, {
       parentName: routeBackoffice,
       basePath: "customers",
@@ -109,7 +111,7 @@ function initializeOrders(app, store, router, options = {}) {
       }
     });
   }
-  if (!options.withOrganizationRoutes) {
+  if (!options.contexts || options.contexts.includes("organization")) {
     addRoutes(router, {
       parentName: routeOrganizations,
       basePath: "customers",
@@ -123,7 +125,7 @@ function initializeOrders(app, store, router, options = {}) {
       }
     });
   }
-  if (!options.withBackoffice) {
+  if (!options.contexts || options.contexts.includes("backoffice")) {
     addRoutes(router, {
       parentName: routeBackoffice,
       basePath: "applications",
@@ -137,7 +139,7 @@ function initializeOrders(app, store, router, options = {}) {
       }
     });
   }
-  if (!options.withOrganizationRoutes) {
+  if (!options.contexts || options.contexts.includes("organization")) {
     addRoutes(router, {
       parentName: routeOrganizations,
       basePath: "applications",

package/dist/martyrs/src/modules/orders/orders.client.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"orders.client.js","sources":["../../../../../src/modules/orders/orders.client.js"],"sourcesContent":["// Store\nimport * as storeOrders from './store/orders.js';\nimport * as storeShopcart from './store/shopcart.js';\nimport * as storeTestimonials from './store/testimonials.js';\nimport storeCustomers from './store/customers.store.js';\nimport storeApplications from './store/applications.js';\n// Router\nimport addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';\nimport routerOrders from './router/orders.router.js';\nimport routerCustomers from './router/customers.router.js';\nimport routerApplications from './router/applications.router.js';\n// Views\nimport OrderCreate from './components/pages/OrderCreate.vue';\nimport OrderCreateBackoffice from './components/pages/OrderCreateBackoffice.vue';\nimport Orders from './components/pages/Orders.vue';\nimport Customers from './components/pages/Customers.vue';\nimport Applications from './components/pages/Applications.vue';\n// import Favorites from './components/pages/Favorites.vue';\n// Importing blocks components\nimport CardOrder from './components/blocks/CardOrder.vue';\nimport CardOrderItem from './components/blocks/CardOrderItem.vue';\nimport CardOrderUser from './components/blocks/CardOrderUser.vue';\nimport CardCustomer from './components/blocks/CardCustomer.vue';\nimport StatusHistory from './components/blocks/StatusHistory.vue';\n// Importing sections components\nimport AskToLogin from './components/sections/AskToLogin.vue';\nimport EmptyState from './components/sections/EmptyState.vue';\nimport FormCustomerDetails from './components/forms/FormCustomerDetails.vue';\nimport FormDelivery from './components/sections/FormDelivery.vue';\nimport FormPayment from './components/sections/FormPayment.vue';\nimport Succes from './components/sections/Succes.vue';\n// Importing partials components\nimport ShopCart from './components/partials/ShopCart.vue';\n\nimport { i18nManager } from '@martyrs/src/modules/core/views/classes/i18n.manager.js';\nimport locales from './locales/index.js';\n\n// Пример функции инициализации для модуля заказов\nfunction initializeOrders(app, store, router, options = {}) {\n // Регистрируем локализацию для модуля orders\n i18nManager.register('orders', locales);\n const route = options.route \|\| 'Home';\n const routeBackoffice = options.routeBackoffice \|\| 'Backoffice Root';\n const routeOrganizations = options.routeOrganizations \|\| 'OrganizationRoot';\n const routeUsers = options.routeUsers \|\| 'User Profile Root';\n\n if (typeof window !== 'undefined') storeShopcart.actions.setShopcart()\n\n addRoutes(router, {\n parentName: route,\n basePath: 'orders',\n routes: routerOrders,\n routeNamePrefix: '',\n filterConfig: {\n include: ['CreateOrder', 'Order'], // Только создание заказа на корневом уровне\n },\n meta: {\n context: 'root',\n },\n });\n\n // Backoffice routes\n if (!options.withBackoffice) {\n addRoutes(router, {\n parentName: routeBackoffice,\n basePath: 'orders', // Промежуточный маршрут /backoffice/orders\n routes: routerOrders,\n routeNamePrefix: 'Backoffice',\n filterConfig: {\n include: ['OrdersList', 'AdminCreateOrder', 'Order', 'OrderEdit'], // Специфичные для бэкофиса маршруты\n },\n meta: {\n context: 'backoffice',\n },\n });\n }\n\n // User routes\n if (!options.withUserRoutes) {\n addRoutes(router, {\n parentName: routeUsers,\n basePath: 'orders', // Промежуточный маршрут /user/orders\n routes: routerOrders,\n routeNamePrefix: 'User',\n filterConfig: {\n include: ['OrdersList', 'Order'], // Специфичные для пользователя маршруты\n },\n meta: {\n context: 'user',\n },\n });\n }\n\n // Organization routes\n if (!options.withOrganizationRoutes) {\n addRoutes(router, {\n parentName: routeOrganizations,\n basePath: 'orders', // Промежуточный маршрут /organization/orders\n routes: routerOrders,\n routeNamePrefix: 'Organization',\n filterConfig: {\n include: ['OrdersList', 'Order', 'AdminCreateOrder', 'OrderEdit'], // Специфичные для организации маршруты\n },\n meta: {\n context: 'organization',\n },\n });\n }\n\n // Customer routes for backoffice\n if (!options.withBackoffice) {\n addRoutes(router, {\n parentName: routeBackoffice,\n basePath: 'customers',\n routes: routerCustomers,\n routeNamePrefix: 'Backoffice',\n filterConfig: {\n include: ['Customers'],\n },\n meta: {\n context: 'backoffice',\n },\n });\n }\n\n // Customer routes for organizations\n if (!options.withOrganizationRoutes) {\n addRoutes(router, {\n parentName: routeOrganizations,\n basePath: 'customers',\n routes: routerCustomers,\n routeNamePrefix: 'Organization',\n filterConfig: {\n include: ['Customers'],\n },\n meta: {\n context: 'organization',\n },\n });\n }\n\n // Application routes for backoffice\n if (!options.withBackoffice) {\n addRoutes(router, {\n parentName: routeBackoffice,\n basePath: 'applications',\n routes: routerApplications,\n routeNamePrefix: 'Backoffice',\n filterConfig: {\n include: ['Applications'],\n },\n meta: {\n context: 'backoffice',\n },\n });\n }\n\n // Application routes for organizations\n if (!options.withOrganizationRoutes) {\n addRoutes(router, {\n parentName: routeOrganizations,\n basePath: 'applications',\n routes: routerApplications,\n routeNamePrefix: 'Organization',\n filterConfig: {\n include: ['Applications'],\n },\n meta: {\n context: 'organization',\n },\n });\n }\n\n store.addStore('orders', storeOrders);\n store.addStore('shopcart', storeShopcart);\n store.addStore('testimonials', storeTestimonials);\n store.addStore('customers', storeCustomers);\n store.addStore('applications', storeApplications);\n}\n\nconst ModuleOrder = {\n initialize: initializeOrders,\n store: {\n storeOrders,\n storeShopcart,\n storeTestimonials,\n storeCustomers,\n storeApplications,\n },\n router: {\n routerOrders,\n routerCustomers,\n routerApplications,\n },\n components: {\n // Pages\n Orders,\n Customers,\n Applications,\n // Order,\n OrderCreate,\n OrderCreateBackoffice,\n // Favorites,\n // Blocks\n CardOrderItem,\n CardOrder,\n CardOrderUser,\n CardCustomer,\n StatusHistory,\n // Sections\n FormCustomerDetails,\n AskToLogin,\n FormDelivery,\n EmptyState,\n Succes,\n FormPayment,\n // Partials\n ShopCart,\n },\n};\n\nexport default ModuleOrder;\n"],"names":["storeShopcart.actions","routerOrders","routerCustomers","routerApplications","storeOrders","storeShopcart","storeTestimonials","storeCustomers","storeApplications","Orders","Customers","Applications","OrderCreate","OrderCreateBackoffice","CardOrderItem","CardOrderUser","CardCustomer","StatusHistory","FormCustomerDetails","AskToLogin","FormDelivery","EmptyState","Succes","FormPayment","ShopCart"],"mappings":"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"}
1	+ {"version":3,"file":"orders.client.js","sources":["../../../../../src/modules/orders/orders.client.js"],"sourcesContent":["// Store\nimport * as storeOrders from './store/orders.js';\nimport * as storeShopcart from './store/shopcart.js';\nimport * as storeTestimonials from './store/testimonials.js';\nimport storeCustomers from './store/customers.store.js';\nimport storeApplications from './store/applications.js';\n// Router\nimport addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';\nimport routerOrders from './router/orders.router.js';\nimport routerCustomers from './router/customers.router.js';\nimport routerApplications from './router/applications.router.js';\n// Views\nimport OrderCreate from './components/pages/OrderCreate.vue';\nimport OrderCreateBackoffice from './components/pages/OrderCreateBackoffice.vue';\nimport Orders from './components/pages/Orders.vue';\nimport Customers from './components/pages/Customers.vue';\nimport Applications from './components/pages/Applications.vue';\n// import Favorites from './components/pages/Favorites.vue';\n// Importing blocks components\nimport CardOrder from './components/blocks/CardOrder.vue';\nimport CardOrderItem from './components/blocks/CardOrderItem.vue';\nimport CardOrderUser from './components/blocks/CardOrderUser.vue';\nimport CardCustomer from './components/blocks/CardCustomer.vue';\nimport StatusHistory from './components/blocks/StatusHistory.vue';\n// Importing sections components\nimport AskToLogin from './components/sections/AskToLogin.vue';\nimport EmptyState from './components/sections/EmptyState.vue';\nimport FormCustomerDetails from './components/forms/FormCustomerDetails.vue';\nimport FormDelivery from './components/sections/FormDelivery.vue';\nimport FormPayment from './components/sections/FormPayment.vue';\nimport Succes from './components/sections/Succes.vue';\n// Importing partials components\nimport ShopCart from './components/partials/ShopCart.vue';\n\nimport { i18nManager } from '@martyrs/src/modules/core/views/classes/i18n.manager.js';\nimport locales from './locales/index.js';\n\n// Пример функции инициализации для модуля заказов\nfunction initializeOrders(app, store, router, options = {}) {\n // Регистрируем локализацию для модуля orders\n i18nManager.register('orders', locales);\n const route = options.route \|\| 'Home';\n const routeBackoffice = options.routeBackoffice \|\| 'Backoffice Root';\n const routeOrganizations = options.routeOrganizations \|\| 'OrganizationRoot';\n const routeUsers = options.routeUsers \|\| 'User Profile Root';\n\n if (typeof window !== 'undefined') storeShopcart.actions.setShopcart()\n\n if (!options.contexts \|\| options.contexts.includes('client')) {\n addRoutes(router, {\n parentName: route,\n basePath: 'orders',\n routes: routerOrders,\n routeNamePrefix: '',\n filterConfig: {\n include: ['CreateOrder', 'Order'], // Только создание заказа на корневом уровне\n },\n meta: {\n context: 'root',\n },\n });\n }\n\n // Backoffice routes\n if (!options.contexts \|\| options.contexts.includes('backoffice')) {\n addRoutes(router, {\n parentName: routeBackoffice,\n basePath: 'orders', // Промежуточный маршрут /backoffice/orders\n routes: routerOrders,\n routeNamePrefix: 'Backoffice',\n filterConfig: {\n include: ['OrdersList', 'AdminCreateOrder', 'Order', 'OrderEdit'], // Специфичные для бэкофиса маршруты\n },\n meta: {\n context: 'backoffice',\n },\n });\n }\n\n // User routes\n if (!options.contexts \|\| options.contexts.includes('user')) {\n addRoutes(router, {\n parentName: routeUsers,\n basePath: 'orders', // Промежуточный маршрут /user/orders\n routes: routerOrders,\n routeNamePrefix: 'User',\n filterConfig: {\n include: ['OrdersList', 'Order'], // Специфичные для пользователя маршруты\n },\n meta: {\n context: 'user',\n },\n });\n }\n\n // Organization routes\n if (!options.contexts \|\| options.contexts.includes('organization')) {\n addRoutes(router, {\n parentName: routeOrganizations,\n basePath: 'orders', // Промежуточный маршрут /organization/orders\n routes: routerOrders,\n routeNamePrefix: 'Organization',\n filterConfig: {\n include: ['OrdersList', 'Order', 'AdminCreateOrder', 'OrderEdit'], // Специфичные для организации маршруты\n },\n meta: {\n context: 'organization',\n },\n });\n }\n\n // Customer routes for backoffice\n if (!options.contexts \|\| options.contexts.includes('backoffice')) {\n addRoutes(router, {\n parentName: routeBackoffice,\n basePath: 'customers',\n routes: routerCustomers,\n routeNamePrefix: 'Backoffice',\n filterConfig: {\n include: ['Customers'],\n },\n meta: {\n context: 'backoffice',\n },\n });\n }\n\n // Customer routes for organizations\n if (!options.contexts \|\| options.contexts.includes('organization')) {\n addRoutes(router, {\n parentName: routeOrganizations,\n basePath: 'customers',\n routes: routerCustomers,\n routeNamePrefix: 'Organization',\n filterConfig: {\n include: ['Customers'],\n },\n meta: {\n context: 'organization',\n },\n });\n }\n\n // Application routes for backoffice\n if (!options.contexts \|\| options.contexts.includes('backoffice')) {\n addRoutes(router, {\n parentName: routeBackoffice,\n basePath: 'applications',\n routes: routerApplications,\n routeNamePrefix: 'Backoffice',\n filterConfig: {\n include: ['Applications'],\n },\n meta: {\n context: 'backoffice',\n },\n });\n }\n\n // Application routes for organizations\n if (!options.contexts \|\| options.contexts.includes('organization')) {\n addRoutes(router, {\n parentName: routeOrganizations,\n basePath: 'applications',\n routes: routerApplications,\n routeNamePrefix: 'Organization',\n filterConfig: {\n include: ['Applications'],\n },\n meta: {\n context: 'organization',\n },\n });\n }\n\n store.addStore('orders', storeOrders);\n store.addStore('shopcart', storeShopcart);\n store.addStore('testimonials', storeTestimonials);\n store.addStore('customers', storeCustomers);\n store.addStore('applications', storeApplications);\n}\n\nconst ModuleOrder = {\n initialize: initializeOrders,\n store: {\n storeOrders,\n storeShopcart,\n storeTestimonials,\n storeCustomers,\n storeApplications,\n },\n router: {\n routerOrders,\n routerCustomers,\n routerApplications,\n },\n components: {\n // Pages\n Orders,\n Customers,\n Applications,\n // Order,\n OrderCreate,\n OrderCreateBackoffice,\n // Favorites,\n // Blocks\n CardOrderItem,\n CardOrder,\n CardOrderUser,\n CardCustomer,\n StatusHistory,\n // Sections\n FormCustomerDetails,\n AskToLogin,\n FormDelivery,\n EmptyState,\n Succes,\n FormPayment,\n // Partials\n ShopCart,\n },\n};\n\nexport default ModuleOrder;\n"],"names":["storeShopcart.actions","routerOrders","routerCustomers","routerApplications","storeOrders","storeShopcart","storeTestimonials","storeCustomers","storeApplications","Orders","Customers","Applications","OrderCreate","OrderCreateBackoffice","CardOrderItem","CardOrderUser","CardCustomer","StatusHistory","FormCustomerDetails","AskToLogin","FormDelivery","EmptyState","Succes","FormPayment","ShopCart"],"mappings":"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"}

package/dist/martyrs/src/modules/orders/store/orders.js CHANGED Viewed

@@ -2,6 +2,7 @@ import { reactive, watch } from "vue";
 import $axios from "../../core/views/utils/axios-instance.js";
 import { setError } from "../../core/views/store/core.store.js";
 import orderInitState from "./models/order.js";
+import { calcRentTotalPrice } from "../utils/rent-price.js";
 const state = reactive({
   all: [],
   current: {
@@ -129,11 +130,8 @@ const getters = {
   getTotal(positions) {
     return Number(
       positions.reduce((total, product) => {
-        if (product.listing === "rent") {
-          const start = new Date(product.date.start);
-          const end = new Date(product.date.end);
-          const diffTime = Math.abs(end - start);
-          return total + product.price * (Math.ceil(diffTime / (1e3 * 60 * 60 * 24)) + 1);
+        if (product.listing === "rent" && product.date?.start && product.date?.end) {
+          return total + calcRentTotalPrice(product.price, product.quantity, product.date.start, product.date.end, product.rentPeriod || "day");
         } else {
           return total + product.price * (product.quantity || 1);
         }

package/dist/martyrs/src/modules/orders/store/orders.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"orders.js","sources":["../../../../../../src/modules/orders/store/orders.js"],"sourcesContent":["// Dependencies\nimport { reactive, watch } from 'vue';\n// Setup Axios\nimport $axios from '@martyrs/src/modules/core/views/utils/axios-instance.js';\n// Globals\nimport { setError } from '@martyrs/src/modules/core/views/store/core.store.js';\n// Init State\nimport orderInitState from '@martyrs/src/modules/orders/store/models/order.js';\n\nconst state = reactive({\n all: [],\n current: {\n ...orderInitState,\n },\n});\n\nconst actions = {\n async create(order) {\n try {\n const response = await $axios.post('/api/orders/create', order);\n\n state.all.push(response.data);\n\n return response.data;\n } catch (error) {\n setError(error);\n }\n },\n\n async read(options = {}) {\n try {\n console.log('options is', options);\n const response = await $axios.get('/api/orders/read', { params: options });\n\n if (options._id) {\n set(response.data[0], 'current');\n } else {\n set(response.data, 'all');\n }\n\n return response.data;\n } catch (err) {\n setError(err);\n throw err;\n }\n },\n\n async update(order) {\n try {\n const response = await $axios.post(`/api/orders/update`, order);\n\n const index = state.all.findIndex(o => o._id === order._id);\n\n if (index !== -1) {\n state.all[index] = response.data;\n }\n\n return response.data;\n } catch (error) {\n setError(error);\n }\n },\n\n async delete(orderID) {\n try {\n await $axios.delete(`/api/orders/${orderID}`);\n state.all = state.all.filter(o => o._id !== orderID);\n } catch (error) {\n setError(error);\n }\n },\n\n async changePaymentStatus(orderID, status) {\n try {\n const response = await $axios.post(`/api/orders/payment/${orderID}`, { status });\n const index = state.all.findIndex(o => o._id === orderID);\n if (index !== -1) {\n state.all[index] = response.data;\n }\n } catch (error) {\n setError(error);\n }\n },\n};\n\nconst mutations = {\n updateRentDates({ positions, productId, dates }) {\n const product = positions.find(p => p._id === productId);\n\n if (product) {\n product.date = dates; // Предполагается, что dates — объект { start, end }\n }\n },\n\n addProductToCart(state, product, organization, date) {\n const cartItem = state.positions.find(item => item._id === product._id);\n\n if (cartItem) {\n cartItem.quantity++;\n } else {\n state.positions.push({\n _id: product._id,\n images: product.images,\n name: product.name,\n listing: product.listing,\n price: product.price,\n price_currency: product.price_currency,\n quantity: 1,\n date: date,\n org_id: organization, // Добавляем _id организации к каждому продукту\n });\n }\n },\n\n removeProduct(state, _id) {\n const cartItem = state.positions.find(item => item._id === _id);\n const cartItemIndex = state.positions.indexOf(cartItem);\n\n if (cartItemIndex > -1) {\n state.positions.splice(cartItemIndex, 1);\n\n // Сохраняем весь объект корзины, а не только позиции\n localStorage.setItem(\n 'shopcart',\n JSON.stringify({\n positions: state.positions,\n organization: state.organization,\n })\n );\n }\n },\n\n decrementItemQuantity(state, _id) {\n const cartItem = state.positions.find(item => item._id === _id);\n const cartItemIndex = state.positions.indexOf(cartItem);\n\n if (cartItemIndex > -1) {\n cartItem.quantity--;\n }\n },\n\n incrementItemQuantity(state, _id) {\n const cartItem = state.positions.find(item => item._id === _id);\n\n if (cartItem) {\n cartItem.quantity++;\n }\n },\n\n resetCustomer(stateObject) {\n Object.assign(stateObject, customerInitState);\n },\n resetOrder(stateObject) {\n state.current = { ...orderInitState };\n // Object.assign(stateObject, orderInitState);\n },\n};\n\nconst getters = {\n getTotal(positions) {\n return Number(\n positions.reduce((total, product) => {\n ~~// Проверяем тип листинга\n~~ if (product.listing === 'rent') ~~{\n const~~ ~~start = new Date(~~product.date.start~~);\n const~~ ~~end~~ ~~= new Date(~~product.date.end)~~;\n const~~ ~~diffTime = Math.abs(end - start);\~~n return total + product.price * ~~(Math~~.~~ceil(diffTime~~ / ~~(1000~~ * ~~60 * 60 * 24~~)~~) + 1)~~;\n } else {\n ~~// Для обычных товаров умножаем на количество\n~~ return total + product.price * (product.quantity \|\| 1);\n }\n }, 0)\n );\n },\n getDeliveryPrice(type, distance = 0, config = {}) {\n if (type === 'pickup') return config.pickupCost \|\| 0;\n if (type === 'post') return config.mailCost \|\| 300;\n\n if (type === 'courier') {\n const base = config.courierBase \|\| 100;\n const perKm = config.courierPerKm \|\| 20;\n const discount = config.courierDiscountFactor \|\| 7.5;\n\n return Math.trunc(base + perKm * distance - discount * (distance / 10));\n }\n\n return 0;\n },\n};\n\nfunction set(eventData, property) {\n state[property] = eventData;\n}\n\nconst history = [];\n\nhistory.push(state);\n\nwatch(state, (newState, oldState) => {\n history.push(newState);\n});\n\nexport { actions, getters, mutations, state };\n"],"names":["state"],"mappings":"~~;;;;AASK~~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~~AAEnC~~,YAAI,QAAQ,YAAY,~~QAAQ;AAC9B~~,~~gBAAM,~~QAAQ,~~IAAI~~,~~KAAK~~,QAAQ,~~KAAK~~,KAAK;~~AACzC~~,~~gBAAM~~,~~MAAM~~,~~IAAI~~,~~KAAK,~~QAAQ,~~KAAK~~,~~GAAG;AACrC~~,~~gBAAM~~,~~WAAW~~,KAAK,~~IAAI~~,~~MAAM,KAAK;AACrC,iBAAO,~~QAAQ,~~QAAQ,SAAS,~~KAAK,KAAK,~~YAAY~~,~~MAAO~~,KAAK~~,KAAK,GAAG,IAAI~~;AAAA,~~QAChF~~,OAAO;~~AAEL~~,iBAAO,QAAQ,QAAQ,SAAS,QAAQ,YAAY;AAAA,QACtD;AAAA,MACF,GAAG,CAAC;AAAA,IACV;AAAA,EACE;AAAA,EACA,iBAAiB,MAAM,WAAW,GAAG,SAAS,CAAA,GAAI;AAChD,QAAI,SAAS,SAAU,QAAO,OAAO,cAAc;AACnD,QAAI,SAAS,OAAQ,QAAO,OAAO,YAAY;AAE/C,QAAI,SAAS,WAAW;AACtB,YAAM,OAAO,OAAO,eAAe;AACnC,YAAM,QAAQ,OAAO,gBAAgB;AACrC,YAAM,WAAW,OAAO,yBAAyB;AAEjD,aAAO,KAAK,MAAM,OAAO,QAAQ,WAAW,YAAY,WAAW,GAAG;AAAA,IACxE;AAEA,WAAO;AAAA,EACT;AACF;AAEA,SAAS,IAAI,WAAW,UAAU;AAChC,QAAM,QAAQ,IAAI;AACpB;AAMA,MAAM,OAAO,CAAC,UAAU,aAAa;AAErC,CAAC;"}
1	+ {"version":3,"file":"orders.js","sources":["../../../../../../src/modules/orders/store/orders.js"],"sourcesContent":["// Dependencies\nimport { reactive, watch } from 'vue';\n// Setup Axios\nimport $axios from '@martyrs/src/modules/core/views/utils/axios-instance.js';\n// Globals\nimport { setError } from '@martyrs/src/modules/core/views/store/core.store.js';\n// Init State\nimport orderInitState from '@martyrs/src/modules/orders/store/models/order.js';\n// Rent price utils\nimport { calcRentTotalPrice } from '@martyrs/src/modules/orders/utils/rent-price.js';\n\nconst state = reactive({\n all: [],\n current: {\n ...orderInitState,\n },\n});\n\nconst actions = {\n async create(order) {\n try {\n const response = await $axios.post('/api/orders/create', order);\n\n state.all.push(response.data);\n\n return response.data;\n } catch (error) {\n setError(error);\n }\n },\n\n async read(options = {}) {\n try {\n console.log('options is', options);\n const response = await $axios.get('/api/orders/read', { params: options });\n\n if (options._id) {\n set(response.data[0], 'current');\n } else {\n set(response.data, 'all');\n }\n\n return response.data;\n } catch (err) {\n setError(err);\n throw err;\n }\n },\n\n async update(order) {\n try {\n const response = await $axios.post(`/api/orders/update`, order);\n\n const index = state.all.findIndex(o => o._id === order._id);\n\n if (index !== -1) {\n state.all[index] = response.data;\n }\n\n return response.data;\n } catch (error) {\n setError(error);\n }\n },\n\n async delete(orderID) {\n try {\n await $axios.delete(`/api/orders/${orderID}`);\n state.all = state.all.filter(o => o._id !== orderID);\n } catch (error) {\n setError(error);\n }\n },\n\n async changePaymentStatus(orderID, status) {\n try {\n const response = await $axios.post(`/api/orders/payment/${orderID}`, { status });\n const index = state.all.findIndex(o => o._id === orderID);\n if (index !== -1) {\n state.all[index] = response.data;\n }\n } catch (error) {\n setError(error);\n }\n },\n};\n\nconst mutations = {\n updateRentDates({ positions, productId, dates }) {\n const product = positions.find(p => p._id === productId);\n\n if (product) {\n product.date = dates; // Предполагается, что dates — объект { start, end }\n }\n },\n\n addProductToCart(state, product, organization, date) {\n const cartItem = state.positions.find(item => item._id === product._id);\n\n if (cartItem) {\n cartItem.quantity++;\n } else {\n state.positions.push({\n _id: product._id,\n images: product.images,\n name: product.name,\n listing: product.listing,\n price: product.price,\n price_currency: product.price_currency,\n quantity: 1,\n date: date,\n org_id: organization, // Добавляем _id организации к каждому продукту\n });\n }\n },\n\n removeProduct(state, _id) {\n const cartItem = state.positions.find(item => item._id === _id);\n const cartItemIndex = state.positions.indexOf(cartItem);\n\n if (cartItemIndex > -1) {\n state.positions.splice(cartItemIndex, 1);\n\n // Сохраняем весь объект корзины, а не только позиции\n localStorage.setItem(\n 'shopcart',\n JSON.stringify({\n positions: state.positions,\n organization: state.organization,\n })\n );\n }\n },\n\n decrementItemQuantity(state, _id) {\n const cartItem = state.positions.find(item => item._id === _id);\n const cartItemIndex = state.positions.indexOf(cartItem);\n\n if (cartItemIndex > -1) {\n cartItem.quantity--;\n }\n },\n\n incrementItemQuantity(state, _id) {\n const cartItem = state.positions.find(item => item._id === _id);\n\n if (cartItem) {\n cartItem.quantity++;\n }\n },\n\n resetCustomer(stateObject) {\n Object.assign(stateObject, customerInitState);\n },\n resetOrder(stateObject) {\n state.current = { ...orderInitState };\n // Object.assign(stateObject, orderInitState);\n },\n};\n\nconst getters = {\n getTotal(positions) {\n return Number(\n positions.reduce((total, product) => {\n if (product.listing === 'rent' && product.date?.start && product.date?.end) {\n return total + calcRentTotalPrice(product.price, product.quantity, product.date.start, product.date.end, product.rentPeriod \|\| 'day');\n } else {\n return total + product.price * (product.quantity \|\| 1);\n }\n }, 0)\n );\n },\n getDeliveryPrice(type, distance = 0, config = {}) {\n if (type === 'pickup') return config.pickupCost \|\| 0;\n if (type === 'post') return config.mailCost \|\| 300;\n\n if (type === 'courier') {\n const base = config.courierBase \|\| 100;\n const perKm = config.courierPerKm \|\| 20;\n const discount = config.courierDiscountFactor \|\| 7.5;\n\n return Math.trunc(base + perKm * distance - discount * (distance / 10));\n }\n\n return 0;\n },\n};\n\nfunction set(eventData, property) {\n state[property] = eventData;\n}\n\nconst history = [];\n\nhistory.push(state);\n\nwatch(state, (newState, oldState) => {\n history.push(newState);\n});\n\nexport { actions, getters, mutations, state };\n"],"names":["state"],"mappings":"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"}

package/dist/martyrs/src/modules/orders/store/shopcart.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { computed, reactive, watch } from "vue";
 import { setSnack } from "../../core/views/store/core.store.js";
 import { Preferences } from "@capacitor/preferences";
+import { calcRentTotalPrice } from "../utils/rent-price.js";
 const state = reactive({
   organization: null,
   positions: [],
@@ -72,7 +73,9 @@ const actions = {
         images: variant.images?.length > 0 ? variant.images : product.images,
         name: product.name,
         listing: product.listing,
+        rentPeriod: product.rentPeriod || "day",
         price: variant.price || product.price,
+        cost: variant.cost || 0,
         quantity,
         unit: variant.unit || product.unit,
         date,
@@ -143,11 +146,8 @@ const getters = {
   cartTotalPrice: computed(() => {
     return Number(
       state.positions.reduce((total, product) => {
-        if (product.listing === "rent") {
-          const start = new Date(product.date.start);
-          const end = new Date(product.date.end);
-          const diffTime = Math.abs(end - start);
-          return total + product.price * (Math.ceil(diffTime / (1e3 * 60 * 60 * 24)) + 1);
+        if (product.listing === "rent" && product.date?.start && product.date?.end) {
+          return total + calcRentTotalPrice(product.price, product.quantity, product.date.start, product.date.end, product.rentPeriod || "day");
         } else {
           return total + product.price * (product.quantity || 1);
         }

package/dist/martyrs/src/modules/orders/store/shopcart.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"shopcart.js","sources":["../../../../../../src/modules/orders/store/shopcart.js"],"sourcesContent":["/////////////////////////////\n// DEPENDENCIES\n/////////////////////////////\nimport { computed, reactive, watch } from 'vue';\n// Dependencies\n// Globals\nimport { setError, setSnack } from '@martyrs/src/modules/core/views/store/core.store.js';\n// Capacitor Preferences\nimport { Preferences } from '@capacitor/preferences';\n\n/////////////////////////////\n// State\n/////////////////////////////\nconst state = reactive({\n organization: null,\n positions: [],\n currentState: false,\n});\n\n/////////////////////////////\n// Helpers\n/////////////////////////////\nconst helpers = {\n async saveToStorage() {\n try {\n await Preferences.set({\n key: CART_STORAGE_KEY,\n value: JSON.stringify({\n positions: state.positions,\n organization: state.organization,\n })\n });\n } catch (error) {\n console.warn('Could not save cart to preferences:', error);\n }\n },\n\n async validateProduct(product) {\n const serverProduct = await api.fetchProduct(product._id);\n\n if (!serverProduct) {\n return false;\n }\n\n return serverProduct.price === product.price && serverProduct.name === product.name && serverProduct.available !== false;\n },\n};\n\n/////////////////////////////\n// SYNC PRODUCT IN SHOPCART\n/////////////////////////////\n// Constants\nconst CART_STORAGE_KEY = 'shopcart';\nconst SYNC_INTERVAL = 30000; // 30 seconds in milliseconds\n\n// API service\nconst api = {\n async fetchProduct(productId) {\n try {\n const response = await fetch(`/api/products/read`, { _id: productId });\n return await response.json();\n } catch (error) {\n console.error('Failed to fetch product:', error);\n return null;\n }\n },\n};\n\nasync function syncWithServer() {\n try {\n const invalidProducts = [];\n\n for (let i = 0; i < state.positions.length; i++) {\n const product = state.positions[i];\n const serverProduct = await api.fetchProduct(product._id);\n\n if (!serverProduct \|\| serverProduct.price !== product.price \|\| serverProduct.name !== product.name \|\| serverProduct.available === false) {\n invalidProducts.push(product._id);\n }\n }\n\n if (invalidProducts.length > 0) {\n state.positions = state.positions.filter(product => !invalidProducts.includes(product._id));\n await helpers.saveToStorage();\n setError('Some products were removed from cart due to changes on server');\n }\n } catch (error) {\n console.error('Failed to sync with server:', error);\n }\n}\n// Initialize periodic sync\nlet syncInterval;\n\nconst startPeriodicSync = () => {\n syncInterval = setInterval(syncWithServer, SYNC_INTERVAL);\n};\n\nconst stopPeriodicSync = () => {\n if (syncInterval) {\n clearInterval(syncInterval);\n }\n};\n\n// Start sync when module is imported\n// startPeriodicSync();\n/////////////////////////////\n// Actions\n/////////////////////////////\nconst actions = {\n toggleShopcart() {\n state.currentState = state.currentState ? false : true;\n },\n\n async setShopcart() {\n try {\n const result = await Preferences.get({ key: 'shopcart' });\n const storedShopcart = result.value;\n\n if (storedShopcart) {\n const shopcartData = JSON.parse(storedShopcart);\n state.positions = shopcartData.positions; // Восстанавливаем продукты\n state.organization = shopcartData.organization; // Восстанавливаем _id организации\n }\n } catch (error) {\n console.error(error);\n throw error;\n }\n },\n\n async addProductToCart(product, variant, organization, date, quantity = 1) {\n console.log('Adding product with variant to cart', { product: product._id, variant: variant._id, quantity });\n \n // Убедимся, что организация установлена\n state.organization = organization;\n \n // Ищем позицию с таким же товаром и вариантом\n const cartItem = state.positions.find(\n item => item._id === product._id && item.variant === variant._id\n );\n\n if (cartItem) {\n cartItem.quantity += quantity;\n } else {\n state.positions.push({\n _id: product._id,\n images: variant.images?.length > 0 ? variant.images : product.images,\n name: product.name,\n listing: product.listing,\n price: variant.price \|\| product.price,\n quantity: quantity,\n unit: variant.unit \|\| product.unit,\n date: date,\n variant: variant._id,\n org_id: organization,\n });\n }\n\n // Сохраняем в Preferences\n await helpers.saveToStorage();\n \n // Отправляем уведомление\n setSnack('Product added to cart');\n },\n\n\n\n async removeProduct(productId, variantId = null) {\n const cartItemIndex = state.positions.findIndex(item => {\n if (variantId) {\n return item._id === productId && item.variant === variantId;\n }\n return item._id === productId;\n });\n\n if (cartItemIndex > -1) {\n state.positions.splice(cartItemIndex, 1);\n await helpers.saveToStorage();\n }\n },\n\n async decrementItemQuantity(productId, variantId = null) {\n const cartItem = state.positions.find(item => {\n if (variantId) {\n return item._id === productId && item.variant === variantId;\n }\n return item._id === productId;\n });\n\n if (cartItem) {\n cartItem.quantity--;\n\n if (cartItem.quantity < 1) {\n const index = state.positions.indexOf(cartItem);\n state.positions.splice(index, 1);\n }\n\n await helpers.saveToStorage();\n }\n },\n\n async incrementItemQuantity(productId, variantId = null) {\n const cartItem = state.positions.find(item => {\n if (variantId) {\n return item._id === productId && item.variant === variantId;\n }\n return item._id === productId;\n });\n\n if (cartItem) {\n cartItem.quantity++;\n await helpers.saveToStorage();\n }\n },\n\n async updateRentDates({ productId, variantId, dates }) {\n const product = state.positions.find(p => p._id === productId && p.variant === variantId);\n\n if (product) {\n product.date = dates;\n }\n\n helpers.saveToStorage();\n },\n\n async resetShopcart() {\n state.positions = [];\n\n try {\n await Preferences.remove({ key: 'shopcart' });\n } catch (error) {\n console.warn('Could not remove cart from preferences:', error);\n }\n },\n};\n\n/////////////////////////////\n// Getters\n/////////////////////////////\nconst getters = {\n cartTotalPrice: computed(() => {\n return Number(\n state.positions.reduce((total, product) => {\n // Проверяем тип листинга\n if (product.listing === 'rent') {\n const start = new Date(product.date.start);\n const end = new Date(product.date.end);\n const diffTime = Math.abs(end - start);\n return total + product.price * (Math.ceil(diffTime / (1000 * 60 * 60 * 24)) + 1);\n } else {\n // Для обычных товаров умножаем на количество\n return total + product.price * (product.quantity \|\| 1);\n }\n }, 0)\n );\n }),\n cartTotalAmount: computed(() => {\n return Number(\n state.positions.reduce((total, product) => {\n return total + product.quantity;\n }, 0)\n );\n }),\n getStoreCartState: computed(() => {\n return Number(state.currentState);\n }),\n};\n/////////////////////////////\n// History\n/////////////////////////////\nconst history = [];\nhistory.push(state);\n\n/////////////////////////////\n// Watch\n/////////////////////////////\nwatch(state, (newState, oldState) => {\n history.push(newState);\n});\n\n/////////////////////////////\n// Module Export\n/////////////////////////////\nexport { actions, getters, state };\n"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"shopcart.js","sources":["../../../../../../src/modules/orders/store/shopcart.js"],"sourcesContent":["/////////////////////////////\n// DEPENDENCIES\n/////////////////////////////\nimport { computed, reactive, watch } from 'vue';\n// Dependencies\n// Globals\nimport { setError, setSnack } from '@martyrs/src/modules/core/views/store/core.store.js';\n// Capacitor Preferences\nimport { Preferences } from '@capacitor/preferences';\n// Rent price utils\nimport { calcRentTotalPrice } from '@martyrs/src/modules/orders/utils/rent-price.js';\n\n/////////////////////////////\n// State\n/////////////////////////////\nconst state = reactive({\n organization: null,\n positions: [],\n currentState: false,\n});\n\n/////////////////////////////\n// Helpers\n/////////////////////////////\nconst helpers = {\n async saveToStorage() {\n try {\n await Preferences.set({\n key: CART_STORAGE_KEY,\n value: JSON.stringify({\n positions: state.positions,\n organization: state.organization,\n })\n });\n } catch (error) {\n console.warn('Could not save cart to preferences:', error);\n }\n },\n\n async validateProduct(product) {\n const serverProduct = await api.fetchProduct(product._id);\n\n if (!serverProduct) {\n return false;\n }\n\n return serverProduct.price === product.price && serverProduct.name === product.name && serverProduct.available !== false;\n },\n};\n\n/////////////////////////////\n// SYNC PRODUCT IN SHOPCART\n/////////////////////////////\n// Constants\nconst CART_STORAGE_KEY = 'shopcart';\nconst SYNC_INTERVAL = 30000; // 30 seconds in milliseconds\n\n// API service\nconst api = {\n async fetchProduct(productId) {\n try {\n const response = await fetch(`/api/products/read`, { _id: productId });\n return await response.json();\n } catch (error) {\n console.error('Failed to fetch product:', error);\n return null;\n }\n },\n};\n\nasync function syncWithServer() {\n try {\n const invalidProducts = [];\n\n for (let i = 0; i < state.positions.length; i++) {\n const product = state.positions[i];\n const serverProduct = await api.fetchProduct(product._id);\n\n if (!serverProduct \|\| serverProduct.price !== product.price \|\| serverProduct.name !== product.name \|\| serverProduct.available === false) {\n invalidProducts.push(product._id);\n }\n }\n\n if (invalidProducts.length > 0) {\n state.positions = state.positions.filter(product => !invalidProducts.includes(product._id));\n await helpers.saveToStorage();\n setError('Some products were removed from cart due to changes on server');\n }\n } catch (error) {\n console.error('Failed to sync with server:', error);\n }\n}\n// Initialize periodic sync\nlet syncInterval;\n\nconst startPeriodicSync = () => {\n syncInterval = setInterval(syncWithServer, SYNC_INTERVAL);\n};\n\nconst stopPeriodicSync = () => {\n if (syncInterval) {\n clearInterval(syncInterval);\n }\n};\n\n// Start sync when module is imported\n// startPeriodicSync();\n/////////////////////////////\n// Actions\n/////////////////////////////\nconst actions = {\n toggleShopcart() {\n state.currentState = state.currentState ? false : true;\n },\n\n async setShopcart() {\n try {\n const result = await Preferences.get({ key: 'shopcart' });\n const storedShopcart = result.value;\n\n if (storedShopcart) {\n const shopcartData = JSON.parse(storedShopcart);\n state.positions = shopcartData.positions; // Восстанавливаем продукты\n state.organization = shopcartData.organization; // Восстанавливаем _id организации\n }\n } catch (error) {\n console.error(error);\n throw error;\n }\n },\n\n async addProductToCart(product, variant, organization, date, quantity = 1) {\n console.log('Adding product with variant to cart', { product: product._id, variant: variant._id, quantity });\n \n // Убедимся, что организация установлена\n state.organization = organization;\n \n // Ищем позицию с таким же товаром и вариантом\n const cartItem = state.positions.find(\n item => item._id === product._id && item.variant === variant._id\n );\n\n if (cartItem) {\n cartItem.quantity += quantity;\n } else {\n state.positions.push({\n _id: product._id,\n images: variant.images?.length > 0 ? variant.images : product.images,\n name: product.name,\n listing: product.listing,\n rentPeriod: product.rentPeriod \|\| 'day',\n price: variant.price \|\| product.price,\n cost: variant.cost \|\| 0,\n quantity: quantity,\n unit: variant.unit \|\| product.unit,\n date: date,\n variant: variant._id,\n org_id: organization,\n });\n }\n\n // Сохраняем в Preferences\n await helpers.saveToStorage();\n \n // Отправляем уведомление\n setSnack('Product added to cart');\n },\n\n\n\n async removeProduct(productId, variantId = null) {\n const cartItemIndex = state.positions.findIndex(item => {\n if (variantId) {\n return item._id === productId && item.variant === variantId;\n }\n return item._id === productId;\n });\n\n if (cartItemIndex > -1) {\n state.positions.splice(cartItemIndex, 1);\n await helpers.saveToStorage();\n }\n },\n\n async decrementItemQuantity(productId, variantId = null) {\n const cartItem = state.positions.find(item => {\n if (variantId) {\n return item._id === productId && item.variant === variantId;\n }\n return item._id === productId;\n });\n\n if (cartItem) {\n cartItem.quantity--;\n\n if (cartItem.quantity < 1) {\n const index = state.positions.indexOf(cartItem);\n state.positions.splice(index, 1);\n }\n\n await helpers.saveToStorage();\n }\n },\n\n async incrementItemQuantity(productId, variantId = null) {\n const cartItem = state.positions.find(item => {\n if (variantId) {\n return item._id === productId && item.variant === variantId;\n }\n return item._id === productId;\n });\n\n if (cartItem) {\n cartItem.quantity++;\n await helpers.saveToStorage();\n }\n },\n\n async updateRentDates({ productId, variantId, dates }) {\n const product = state.positions.find(p => p._id === productId && p.variant === variantId);\n\n if (product) {\n product.date = dates;\n }\n\n helpers.saveToStorage();\n },\n\n async resetShopcart() {\n state.positions = [];\n\n try {\n await Preferences.remove({ key: 'shopcart' });\n } catch (error) {\n console.warn('Could not remove cart from preferences:', error);\n }\n },\n};\n\n/////////////////////////////\n// Getters\n/////////////////////////////\nconst getters = {\n cartTotalPrice: computed(() => {\n return Number(\n state.positions.reduce((total, product) => {\n if (product.listing === 'rent' && product.date?.start && product.date?.end) {\n return total + calcRentTotalPrice(product.price, product.quantity, product.date.start, product.date.end, product.rentPeriod \|\| 'day');\n } else {\n return total + product.price * (product.quantity \|\| 1);\n }\n }, 0)\n );\n }),\n cartTotalAmount: computed(() => {\n return Number(\n state.positions.reduce((total, product) => {\n return total + product.quantity;\n }, 0)\n );\n }),\n getStoreCartState: computed(() => {\n return Number(state.currentState);\n }),\n};\n/////////////////////////////\n// History\n/////////////////////////////\nconst history = [];\nhistory.push(state);\n\n/////////////////////////////\n// Watch\n/////////////////////////////\nwatch(state, (newState, oldState) => {\n history.push(newState);\n});\n\n/////////////////////////////\n// Module Export\n/////////////////////////////\nexport { actions, getters, state };\n"],"names":[],"mappings":"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"}

package/dist/martyrs/src/modules/orders/utils/rent-price.js ADDED Viewed

@@ -0,0 +1,60 @@
+function calcRentPeriods(start, end, rentPeriod = "day") {
+  const s = new Date(start);
+  const e = new Date(end);
+  const diffMs = Math.abs(e - s);
+  const diffHours = diffMs / (1e3 * 60 * 60);
+  const diffDays = diffMs / (1e3 * 60 * 60 * 24);
+  switch (rentPeriod) {
+    case "hour":
+      return Math.max(1, Math.ceil(diffHours));
+    case "4hours":
+      return Math.max(1, Math.ceil(diffHours / 4));
+    case "flat":
+      return 1;
+    case "day":
+      return Math.max(1, Math.ceil(diffDays) + 1);
+    case "week":
+      return Math.max(1, Math.ceil(diffDays / 7));
+    case "month":
+      return Math.max(1, Math.ceil(diffDays / 30));
+    default:
+      return Math.max(1, Math.ceil(diffDays) + 1);
+  }
+}
+function calcRentTotalPrice(pricePerPeriod, quantity, start, end, rentPeriod = "day") {
+  const periods = calcRentPeriods(start, end, rentPeriod);
+  return pricePerPeriod * (quantity || 1) * periods;
+}
+function formatRentDateLabel(start, end, rentPeriod = "day", formatDate) {
+  if (!start || !end) return "";
+  const isShortPeriod = ["hour", "4hours", "flat"].includes(rentPeriod);
+  if (isShortPeriod) {
+    const s = new Date(start);
+    const e = new Date(end);
+    const dateStr = formatDate(s, { dayMonth: true });
+    const startTime = `${String(s.getHours()).padStart(2, "0")}:${String(s.getMinutes()).padStart(2, "0")}`;
+    const endTime = `${String(e.getHours()).padStart(2, "0")}:${String(e.getMinutes()).padStart(2, "0")}`;
+    return `${dateStr}, ${startTime} – ${endTime}`;
+  }
+  return `${formatDate(start, { dayMonth: true })} – ${formatDate(end, { dayMonth: true })}`;
+}
+function formatRentDuration(start, end, rentPeriod = "day") {
+  const periods = calcRentPeriods(start, end, rentPeriod);
+  const labels = {
+    hour: { one: "hour", many: "hours" },
+    "4hours": { one: "4 hours", many: "4 hours" },
+    "flat": { one: "flat", many: "flat" },
+    day: { one: "day", many: "days" },
+    week: { one: "week", many: "weeks" },
+    month: { one: "month", many: "months" }
+  };
+  const label = labels[rentPeriod] || labels.day;
+  return `${periods} ${periods === 1 ? label.one : label.many}`;
+}
+export {
+  calcRentPeriods,
+  calcRentTotalPrice,
+  formatRentDateLabel,
+  formatRentDuration
+};
+//# sourceMappingURL=rent-price.js.map

package/dist/martyrs/src/modules/orders/utils/rent-price.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"rent-price.js","sources":["../../../../../../src/modules/orders/utils/rent-price.js"],"sourcesContent":["/**\n * Calculate rental duration periods count based on rentPeriod type\n * @param {Date|string} start\n * @param {Date|string} end\n * @param {string} rentPeriod - 'hour' | '4hours' | 'flat' | 'day' | 'week' | 'month'\n * @returns {number} number of periods (minimum 1)\n */\nexport function calcRentPeriods(start, end, rentPeriod = 'day') {\n const s = new Date(start)\n const e = new Date(end)\n const diffMs = Math.abs(e - s)\n const diffHours = diffMs / (1000 * 60 * 60)\n const diffDays = diffMs / (1000 * 60 * 60 * 24)\n\n switch (rentPeriod) {\n case 'hour':\n return Math.max(1, Math.ceil(diffHours))\n case '4hours':\n return Math.max(1, Math.ceil(diffHours / 4))\n case 'flat':\n return 1\n case 'day':\n return Math.max(1, Math.ceil(diffDays) + 1)\n case 'week':\n return Math.max(1, Math.ceil(diffDays / 7))\n case 'month':\n return Math.max(1, Math.ceil(diffDays / 30))\n default:\n return Math.max(1, Math.ceil(diffDays) + 1)\n }\n}\n\n/**\n * Calculate total rental price\n * @param {number} pricePerPeriod\n * @param {number} quantity\n * @param {Date|string} start\n * @param {Date|string} end\n * @param {string} rentPeriod\n * @returns {number}\n */\nexport function calcRentTotalPrice(pricePerPeriod, quantity, start, end, rentPeriod = 'day') {\n const periods = calcRentPeriods(start, end, rentPeriod)\n return pricePerPeriod * (quantity || 1) * periods\n}\n\n/**\n * Format rent duration for display\n * @param {Date|string} start\n * @param {Date|string} end\n * @param {string} rentPeriod\n * @returns {string}\n */\n/**\n * Format rent date range label for display\n * @param {Date|string} start\n * @param {Date|string} end\n * @param {string} rentPeriod\n * @param {Function} formatDate - formatDate from useGlobalMixins\n * @returns {string} e.g. \"11 Mar – 14 Mar\" or \"11 Mar, 10:00 – 14:00\"\n */\nexport function formatRentDateLabel(start, end, rentPeriod = 'day', formatDate) {\n if (!start || !end) return ''\n const isShortPeriod = ['hour', '4hours', 'flat'].includes(rentPeriod)\n if (isShortPeriod) {\n const s = new Date(start)\n const e = new Date(end)\n const dateStr = formatDate(s, { dayMonth: true })\n const startTime = `${String(s.getHours()).padStart(2, '0')}:${String(s.getMinutes()).padStart(2, '0')}`\n const endTime = `${String(e.getHours()).padStart(2, '0')}:${String(e.getMinutes()).padStart(2, '0')}`\n return `${dateStr}, ${startTime} – ${endTime}`\n }\n return `${formatDate(start, { dayMonth: true })} – ${formatDate(end, { dayMonth: true })}`\n}\n\nexport function formatRentDuration(start, end, rentPeriod = 'day') {\n const periods = calcRentPeriods(start, end, rentPeriod)\n\n const labels = {\n hour: { one: 'hour', many: 'hours' },\n '4hours': { one: '4 hours', many: '4 hours' },\n 'flat': { one: 'flat', many: 'flat' },\n day: { one: 'day', many: 'days' },\n week: { one: 'week', many: 'weeks' },\n month: { one: 'month', many: 'months' },\n }\n\n const label = labels[rentPeriod] || labels.day\n return `${periods} ${periods === 1 ? label.one : label.many}`\n}\n"],"names":[],"mappings":"AAOO,SAAS,gBAAgB,OAAO,KAAK,aAAa,OAAO;AAC9D,QAAM,IAAI,IAAI,KAAK,KAAK;AACxB,QAAM,IAAI,IAAI,KAAK,GAAG;AACtB,QAAM,SAAS,KAAK,IAAI,IAAI,CAAC;AAC7B,QAAM,YAAY,UAAU,MAAO,KAAK;AACxC,QAAM,WAAW,UAAU,MAAO,KAAK,KAAK;AAE5C,UAAQ,YAAU;AAAA,IAChB,KAAK;AACH,aAAO,KAAK,IAAI,GAAG,KAAK,KAAK,SAAS,CAAC;AAAA,IACzC,KAAK;AACH,aAAO,KAAK,IAAI,GAAG,KAAK,KAAK,YAAY,CAAC,CAAC;AAAA,IAC7C,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO,KAAK,IAAI,GAAG,KAAK,KAAK,QAAQ,IAAI,CAAC;AAAA,IAC5C,KAAK;AACH,aAAO,KAAK,IAAI,GAAG,KAAK,KAAK,WAAW,CAAC,CAAC;AAAA,IAC5C,KAAK;AACH,aAAO,KAAK,IAAI,GAAG,KAAK,KAAK,WAAW,EAAE,CAAC;AAAA,IAC7C;AACE,aAAO,KAAK,IAAI,GAAG,KAAK,KAAK,QAAQ,IAAI,CAAC;AAAA,EAChD;AACA;AAWO,SAAS,mBAAmB,gBAAgB,UAAU,OAAO,KAAK,aAAa,OAAO;AAC3F,QAAM,UAAU,gBAAgB,OAAO,KAAK,UAAU;AACtD,SAAO,kBAAkB,YAAY,KAAK;AAC5C;AAiBO,SAAS,oBAAoB,OAAO,KAAK,aAAa,OAAO,YAAY;AAC9E,MAAI,CAAC,SAAS,CAAC,IAAK,QAAO;AAC3B,QAAM,gBAAgB,CAAC,QAAQ,UAAU,MAAM,EAAE,SAAS,UAAU;AACpE,MAAI,eAAe;AACjB,UAAM,IAAI,IAAI,KAAK,KAAK;AACxB,UAAM,IAAI,IAAI,KAAK,GAAG;AACtB,UAAM,UAAU,WAAW,GAAG,EAAE,UAAU,KAAI,CAAE;AAChD,UAAM,YAAY,GAAG,OAAO,EAAE,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC,IAAI,OAAO,EAAE,WAAU,CAAE,EAAE,SAAS,GAAG,GAAG,CAAC;AACrG,UAAM,UAAU,GAAG,OAAO,EAAE,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC,IAAI,OAAO,EAAE,WAAU,CAAE,EAAE,SAAS,GAAG,GAAG,CAAC;AACnG,WAAO,GAAG,OAAO,KAAK,SAAS,MAAM,OAAO;AAAA,EAC9C;AACA,SAAO,GAAG,WAAW,OAAO,EAAE,UAAU,KAAI,CAAE,CAAC,MAAM,WAAW,KAAK,EAAE,UAAU,KAAI,CAAE,CAAC;AAC1F;AAEO,SAAS,mBAAmB,OAAO,KAAK,aAAa,OAAO;AACjE,QAAM,UAAU,gBAAgB,OAAO,KAAK,UAAU;AAEtD,QAAM,SAAS;AAAA,IACb,MAAM,EAAE,KAAK,QAAQ,MAAM,QAAO;AAAA,IAClC,UAAU,EAAE,KAAK,WAAW,MAAM,UAAS;AAAA,IAC3C,QAAQ,EAAE,KAAK,QAAQ,MAAM,OAAM;AAAA,IACnC,KAAK,EAAE,KAAK,OAAO,MAAM,OAAM;AAAA,IAC/B,MAAM,EAAE,KAAK,QAAQ,MAAM,QAAO;AAAA,IAClC,OAAO,EAAE,KAAK,SAAS,MAAM,SAAQ;AAAA,EACzC;AAEE,QAAM,QAAQ,OAAO,UAAU,KAAK,OAAO;AAC3C,SAAO,GAAG,OAAO,IAAI,YAAY,IAAI,MAAM,MAAM,MAAM,IAAI;AAC7D;"}

package/dist/martyrs/src/modules/organizations/components/blocks/CardDepartment.vue.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { createElementBlock, openBlock, createElementVNode, createCommentVNode, Fragment, renderList, createBlock } from "vue";
 /* empty css                                         */
 import "../../organizations.client.js";
-import _sfc_main$1 from "../../../auth/views/components/blocks/CardUser.vue.js";
+import _sfc_main$1 from "../../../core/views/components/blocks/CardUser.vue.js";
 /* empty css                    */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const _hoisted_1 = { class: "" };
@@ -41,7 +41,7 @@ const _sfc_main = {
     };
   }
 };
-const CardDepartment = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d65c246b"]]);
+const CardDepartment = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-51fb183f"]]);
 export {
   CardDepartment as default
 };

package/dist/martyrs/src/modules/organizations/components/blocks/CardOrganization.vue.js CHANGED Viewed

@@ -1,44 +1,40 @@
-import { computed, createElementBlock, openBlock, createElementVNode, createCommentVNode, createBlock, toDisplayString, withCtx, createVNode, Fragment, renderList, withModifiers } from "vue";
+import { computed, createElementBlock, openBlock, createElementVNode, createCommentVNode, createBlock, toDisplayString, createVNode, Fragment, renderList, withModifiers } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import _sfc_main$4 from "../../../orders/components/blocks/CardOrderItem.vue.js";
-import _sfc_main$1 from "../../../../components/Chips/Chips.vue.js";
+import _sfc_main$2 from "../../../../components/Chips/Chips.vue.js";
 import PlaceholderOrganizationPic from "../../../icons/placeholders/PlaceholderOrganizationPic.vue.js";
 import _sfc_main$3 from "../../../icons/entities/IconShopcart.vue.js";
 import IconTime from "../../../icons/entities/IconTime.vue.js";
-import _sfc_main$2 from "../elements/ButtonToggleMembership.vue.js";
+import _sfc_main$1 from "../elements/ButtonToggleMembership.vue.js";
 /* empty css                      */
 const _hoisted_1 = { class: "h-4r flex pos-relative" };
 const _hoisted_2 = ["src"];
 const _hoisted_3 = { class: "pos-relative w-100 flex-h-center flex flex-column flex-child-1 flex-child mn-l-thin w-100" };
-const _hoisted_4 = { class: "h4 truncate w-100" };
+const _hoisted_4 = { class: "h4 mn-b-thin flex-child-default truncate w-100" };
 const _hoisted_5 = {
   key: 0,
-  class: "mn-t-micro gap-micro flex-nowrap flex"
+  class: "truncate mn-r-nano flex-child-default w-max p-regular pd-thin radius-thin fw-medium bg-white"
 };
-const _hoisted_6 = {
-  key: 0,
-  class: "truncate pos-relative p-regular mn-r-nano d-inline-block w-max pd-b-micro pd-t-micro pd-r-thin pd-l-thin radius-small fw-medium bg-white"
-};
-const _hoisted_7 = { class: "truncate" };
-const _hoisted_8 = {
+const _hoisted_6 = { class: "truncate" };
+const _hoisted_7 = {
   key: 0,
   class: "mn-b-small ws-nowrap mn-t-small w-100 flex-nowrap flex flex-v-center pd-small bg-white radius-medium"
 };
-const _hoisted_9 = { class: "mn-r-micro" };
-const _hoisted_10 = {
+const _hoisted_8 = { class: "mn-r-micro" };
+const _hoisted_9 = {
   key: 0,
-  class: "t-transp t-dark mn-r-micro"
+  class: "opacity-50 t-dark mn-r-micro"
 };
-const _hoisted_11 = {
+const _hoisted_10 = {
   key: 1,
   class: "mn-r-thin"
 };
-const _hoisted_12 = { class: "mn-r-thin" };
-const _hoisted_13 = {
+const _hoisted_11 = { class: "mn-r-thin" };
+const _hoisted_12 = {
   key: 1,
   class: "w-100 o-scroll scroll-hide radius-medium"
 };
-const _hoisted_14 = { class: "w-max flex-nowrap flex gap-thin" };
+const _hoisted_13 = { class: "w-max flex-nowrap flex gap-thin" };
 const _sfc_main = {
   __name: "CardOrganization",
   props: {
@@ -72,7 +68,7 @@ const _sfc_main = {
     const emits = __emit;
     const route = useRoute();
     useRouter();
-    computed(() => {
+    const routePrefix = computed(() => {
       const ctx = route.meta.context;
       if (ctx === "user") return "User";
       if (ctx === "backoffice") return "Backoffice";
@@ -81,59 +77,53 @@ const _sfc_main = {
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: "o-hidden pos-relative cursor-pointer bg-light",
-        onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$router.push({ name: "OrganizationProfile", params: { _id: __props.organization._id } }))
+        onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$router.push({ name: `${routePrefix.value}OrganizationProfile`, params: { _id: __props.organization._id } }))
       }, [
         createElementVNode("div", _hoisted_1, [
           __props.organization.profile.photo && __props.organization.profile.photo.length > 0 ? (openBlock(), createElementBlock("img", {
             key: 0,
             loading: "lazy",
             src: (_ctx.FILE_SERVER_URL || "") + __props.organization.profile.photo,
-            class: "h-4r w-4r radius-extra bg-white",
+            class: "h-4r w-4r radius-small bg-white",
             style: { "flex": "0 1 auto" }
           }, null, 8, _hoisted_2)) : (openBlock(), createBlock(PlaceholderOrganizationPic, {
             key: 1,
-            class: "w-4r h-max radius-medium",
+            class: "w-4r h-max radius-regular",
             style: { "flex": "0 1 auto" }
           })),
           createElementVNode("div", _hoisted_3, [
             createElementVNode("p", _hoisted_4, toDisplayString(__props.organization.profile.name), 1),
-            __props.showFollowers || __props.showTags ? (openBlock(), createElementBlock("div", _hoisted_5, [
-              __props.showTags && __props.organization.profile.tags?.length > 0 ? (openBlock(), createBlock(_sfc_main$1, {
+            __props.showFollowers ? (openBlock(), createElementBlock("div", _hoisted_5, [
+              createElementVNode("p", _hoisted_6, toDisplayString(__props.organization.numberOfSubscribers) + " followers", 1),
+              __props.user?._id && __props.organization.owner !== __props.user._id ? (openBlock(), createBlock(_sfc_main$1, {
                 key: 0,
-                chips: __props.organization.profile.tags.slice(0, 3),
-                class: "pos-relative t-trimmed"
-              }, {
-                default: withCtx(() => [
-                  __props.showFollowers ? (openBlock(), createElementBlock("div", _hoisted_6, [
-                    createElementVNode("p", _hoisted_7, toDisplayString(__props.organization.numberOfSubscribers) + " followers", 1),
-                    __props.user?._id && __props.organization.owner !== __props.user._id ? (openBlock(), createBlock(_sfc_main$2, {
-                      key: 0,
-                      user: __props.user._id,
-                      type: "organization",
-                      role: "subscriber",
-                      target: __props.organization._id,
-                      status: __props.organization.isSubscriber,
-                      text: { create: "+", remove: "-" },
-                      onUpdateMembership: _cache[0] || (_cache[0] = (event) => emits("updateMembership", event, "isSubscriber", "numberOfSubscribers")),
-                      class: "i-medium"
-                    }, null, 8, ["user", "target", "status"])) : createCommentVNode("", true)
-                  ])) : createCommentVNode("", true)
-                ]),
-                _: 1
-              }, 8, ["chips"])) : createCommentVNode("", true)
-            ])) : createCommentVNode("", true)
+                user: __props.user._id,
+                type: "organization",
+                role: "subscriber",
+                target: __props.organization._id,
+                status: __props.organization.isSubscriber,
+                text: { create: "+", remove: "-" },
+                onUpdateMembership: _cache[0] || (_cache[0] = (event) => emits("updateMembership", event, "isSubscriber", "numberOfSubscribers")),
+                class: "i-medium"
+              }, null, 8, ["user", "target", "status"])) : createCommentVNode("", true)
+            ])) : createCommentVNode("", true),
+            __props.showTags && __props.organization.profile.tags?.length > 0 ? (openBlock(), createBlock(_sfc_main$2, {
+              key: 1,
+              chips: __props.organization.profile.tags.slice(0, 3),
+              class: "pos-relative t-trimmed"
+            }, null, 8, ["chips"])) : createCommentVNode("", true)
           ])
         ]),
-        __props.showProducts && __props.organization.products ? (openBlock(), createElementBlock("div", _hoisted_8, [
-          createVNode(IconTime, { class: "i-medium t-transp mn-r-micro" }),
-          createElementVNode("span", _hoisted_9, toDisplayString(__props.organization.distance ? __props.organization.distance > 50 ? "3-5 days" : Math.ceil((5 + 5 + 3 * __props.organization.distance) / 5) * 5 + "-" + Math.ceil((15 + 5 + 3 * __props.organization.distance) / 5) * 5 + " MIN" : "Unavailable"), 1),
-          __props.organization.distance && __props.organization.distance < 50 ? (openBlock(), createElementBlock("span", _hoisted_10, "|")) : createCommentVNode("", true),
-          __props.organization.distance && __props.organization.distance < 50 ? (openBlock(), createElementBlock("span", _hoisted_11, toDisplayString(__props.organization.distance ? __props.organization.distance.toFixed(1) + "KM" : ""), 1)) : createCommentVNode("", true),
-          createVNode(_sfc_main$3, { class: "i-medium t-transp mn-r-micro" }),
-          createElementVNode("span", _hoisted_12, toDisplayString(__props.organization.products.length) + " products", 1)
+        __props.showProducts && __props.organization.products ? (openBlock(), createElementBlock("div", _hoisted_7, [
+          createVNode(IconTime, { class: "i-medium opacity-50 mn-r-micro" }),
+          createElementVNode("span", _hoisted_8, toDisplayString(__props.organization.distance ? __props.organization.distance > 50 ? "3-5 days" : Math.ceil((5 + 5 + 3 * __props.organization.distance) / 5) * 5 + "-" + Math.ceil((15 + 5 + 3 * __props.organization.distance) / 5) * 5 + " MIN" : "Unavailable"), 1),
+          __props.organization.distance && __props.organization.distance < 50 ? (openBlock(), createElementBlock("span", _hoisted_9, "|")) : createCommentVNode("", true),
+          __props.organization.distance && __props.organization.distance < 50 ? (openBlock(), createElementBlock("span", _hoisted_10, toDisplayString(__props.organization.distance ? __props.organization.distance.toFixed(1) + "KM" : ""), 1)) : createCommentVNode("", true),
+          createVNode(_sfc_main$3, { class: "i-medium opacity-50 mn-r-micro" }),
+          createElementVNode("span", _hoisted_11, toDisplayString(__props.organization.products.length) + " products", 1)
         ])) : createCommentVNode("", true),
-        __props.showProducts && __props.organization.products?.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_13, [
-          createElementVNode("div", _hoisted_14, [
+        __props.showProducts && __props.organization.products?.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_12, [
+          createElementVNode("div", _hoisted_13, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(__props.organization.products.slice(0, 5), (product) => {
               return openBlock(), createBlock(_sfc_main$4, {
                 onClick: withModifiers(($event) => _ctx.$router.push(`/organizations/${__props.organization._id}/products/${product._id}`), ["stop"]),