@ozdao/martyrs 0.2.561 → 0.2.563

package/dist/martyrs.es.js

@@ -1,4 +1,4 @@
-import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, p as h, L as b, q as k, M as x, r as B, I, s as T, t as U, u as f, v as w, S as D, w as E, x as L, y as P, z as q, A as y, B as A, D as G, E as j, U as v, G as z, H, m as R } from "./main-DQtUY5ma.js";
+import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, p as h, L as b, q as k, M as x, r as B, I, s as T, t as U, u as f, v as w, S as D, w as E, x as L, y as P, z as q, A as y, B as A, D as G, E as j, U as v, G as z, H, m as R } from "./main-CmjWiDVF.js";
 export {
   e as Address,
   o as Breadcrumbs,

package/dist/music.server.js

@@ -1,7 +1,8 @@
 import { c as coreabac } from "./core.abac-DUPBnlk6.js";
-import { L as LoggerNamespaced, C as CacheNamespaced } from "./core.logger-VRHh-WUW.js";
-import { C as CRUD } from "./crud-DFFgLl09.js";
-import { A as ABAC } from "./abac-DC2x92Pa.js";
+import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
+import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
+import { C as CRUD } from "./crud-C7FSTUes.js";
+import { A as ABAC } from "./abac-DYoheWuc.js";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 import fs$1 from "fs";
 import path$1 from "path";

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/core/utils.js

@@ -1,4 +1,4 @@
-import { __exports as utils } from "../../../../../../../_virtual/utils2.js";
+import { __exports as utils } from "../../../../../../../_virtual/utils.js";
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/utils.js

@@ -1,4 +1,4 @@
-import { __exports as utils } from "../../../../../../../_virtual/utils.js";
+import { __exports as utils } from "../../../../../../../_virtual/utils2.js";
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;

package/dist/orders.server.js

@@ -4,8 +4,8 @@ import "./mailing-DuEFRsa3.js";
 import { m as modelsFactory, a as applyProfileSchema } from "./profile.schema-CjLOfG7b.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { a as applyCredentialsSchema } from "./credentials.schema--2vvcu8c.js";
-import { C as CRUD } from "./crud-DFFgLl09.js";
-import { A as ABAC } from "./abac-DC2x92Pa.js";
+import { C as CRUD } from "./crud-C7FSTUes.js";
+import { A as ABAC } from "./abac-DYoheWuc.js";
 import axios from "axios";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";

package/dist/organizations.server.js

@@ -1,4 +1,4 @@
-import { A as ABAC } from "./abac-DC2x92Pa.js";
+import { A as ABAC } from "./abac-DYoheWuc.js";
 import { a as applyCredentialsSchema } from "./credentials.schema--2vvcu8c.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { a as applyEngagementSchema } from "./engagement.schema-fh6W1fb_.js";
@@ -8,10 +8,10 @@ import { uuid } from "uuidv4";
 import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
 import { Types } from "mongoose";
 import { c as coreabac } from "./core.abac-DUPBnlk6.js";
-import { C as CacheNamespaced } from "./core.logger-VRHh-WUW.js";
+import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
 import { a as addUserStatusFields, b as addMembersQuantity } from "./addUserStatusFields-Cc-JpmPo.js";
 import jwt from "jsonwebtoken";
-import * as googleMapsServicesJs from "@googlemaps/google-maps-services-js";
+import { g as getRequestedLookups, a as getBasicMatchConditions, b as getLookupStages, c as getPostableConditions, d as getContainConditions, e as getPriceConditions, f as getLocationStages } from "./queryProcessorOrganizations-BB11WFpc.js";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 const controllerFactory$2 = (db) => {
   const Department = db.department;
@@ -666,7 +666,7 @@ const invitesRoutes = (function(app, db) {
   app.put("/api/invites/update", controller.update);
   app.post("/api/invites/delete", controller.delete);
 });
-const ObjectId$1 = { Types }.Types.ObjectId;
+const ObjectId = { Types }.Types.ObjectId;
 const controllerFactory$1 = (db) => {
   const Membership = db.membership;
   const Department = db.department;
@@ -694,9 +694,9 @@ const controllerFactory$1 = (db) => {
         },
         {
           $match: {
-            ...req.query.user && { user: new ObjectId$1(req.query.user) },
+            ...req.query.user && { user: new ObjectId(req.query.user) },
             ...req.query.type && { type: req.query.type },
-            ...req.query.target && { target: new ObjectId$1(req.query.target) },
+            ...req.query.target && { target: new ObjectId(req.query.target) },
             ...req.query.role && { role: { $in: req.query.role } },
             ...req.query.search && {
               $or: [
@@ -777,10 +777,10 @@ const controllerFactory$1 = (db) => {
     const { _id, type, target, user, role } = req.body;
     console.log("Delete membership request:", { _id, type, target, user, role });
     try {
-      const query = _id ? { _id: new ObjectId$1(_id) } : {
+      const query = _id ? { _id: new ObjectId(_id) } : {
         type,
-        target: new ObjectId$1(target),
-        user: new ObjectId$1(user),
+        target: new ObjectId(target),
+        user: new ObjectId(user),
         role
       };
       console.log("Delete query:", query);
@@ -881,211 +881,6 @@ const lookupConfigs = {
     }
   }
 };
-const ObjectId = { Types }.Types.ObjectId;
-const { Client } = googleMapsServicesJs;
-const client = new Client({});
-const getRequestedLookups = (query) => query.lookup ? Array.isArray(query.lookup) ? query.lookup : [query.lookup] : [];
-const getLookupStages = (requestedLookups, configs) => {
-  if (!requestedLookups) return [];
-  const lookupsArray = Array.isArray(requestedLookups) ? requestedLookups : requestedLookups.split(",");
-  return lookupsArray.map((lookup) => configs[lookup]).filter(Boolean).flatMap((config) => [
-    { $lookup: config.lookup },
-    // Оберните lookup в объект с $lookup
-    ...config.additionalStages || []
-  ]);
-};
-const getLocationStages = async (query) => {
-  if (!hasLocationParams(query)) {
-    return { stages: [], userLocation: null };
-  }
-  const location = await resolveLocation(query);
-  const radius = getRadius(query);
-  const geoStages = radius ? [
-    {
-      $match: {
-        "spots.location.coordinates": {
-          $geoWithin: {
-            $centerSphere: [[location.coordinates[0], location.coordinates[1]], radius]
-          }
-        }
-      }
-    }
-  ] : [];
-  return {
-    stages: [...geoStages, ...getDistanceStages(location)],
-    userLocation: location
-  };
-};
-const getRadius = (query) => {
-  if (query.locationRadius) return parseFloat(query.locationRadius) / 6378.1;
-  if (query.city) return 25 / 6378.1;
-  if (query.state) return 50 / 6378.1;
-  return null;
-};
-const hasLocationParams = (query) => query.location || query.address || query.city || query.state || query.country;
-const resolveLocation = async (query) => {
-  if (query.location) {
-    const parsedLocation = typeof query.location === "string" ? JSON.parse(query.location) : query.location;
-    const coordinates = parsedLocation.lng ? [parsedLocation.lng, parsedLocation.lat] : parsedLocation.coordinates;
-    return { coordinates: coordinates.map((coord) => parseFloat(coord)) };
-  }
-  const searchString = [query.address, query.city, query.state, query.country].filter(Boolean).join(", ");
-  try {
-    const geoResponse = await client.geocode({
-      params: {
-        address: searchString,
-        key: process.env.GOOGLE_MAPS_API_KEY
-      }
-    });
-    if (!geoResponse.data.results?.length) {
-      throw new Error("Unable to geocode the provided location.");
-    }
-    const { lng, lat } = geoResponse.data.results[0].geometry.location;
-    return { coordinates: [lng, lat] };
-  } catch (err) {
-    throw new Error("Error occurred while geocoding.");
-  }
-};
-const getDistanceStages = (location) => [
-  {
-    $addFields: {
-      spots: {
-        $map: {
-          input: "$spots",
-          as: "spot",
-          in: {
-            $mergeObjects: [
-              "$$spot",
-              {
-                distance: {
-                  $function: {
-                    body: `function(spotCoords, userCoords, isMiles) {
-                      function toRad(x) {
-                        return x * Math.PI / 180;
-                      }
-                      var lon1 = spotCoords[0];
-                      var lat1 = spotCoords[1];
-                      var lon2 = userCoords[0];
-                      var lat2 = userCoords[1];
-                      var R = 6371;
-                      if (isMiles) R = 3959;
-                      var x1 = lat2 - lat1;
-                      var dLat = toRad(x1);
-                      var x2 = lon2 - lon1;
-                      var dLon = toRad(x2);
-                      var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-                              Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) *
-                              Math.sin(dLon / 2) * Math.sin(dLon / 2);
-                      var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-                      var d = R * c;
-                      return d;
-                    }`,
-                    args: ["$$spot.location.coordinates", location.coordinates, false],
-                    lang: "js"
-                  }
-                }
-              }
-            ]
-          }
-        }
-      }
-    }
-  },
-  {
-    $addFields: {
-      distance: { $min: "$spots.distance" },
-      distanceExist: {
-        $cond: {
-          if: { $eq: [{ $type: "$distance" }, "double"] },
-          then: true,
-          else: false
-        }
-      }
-    }
-  }
-];
-const getPriceConditions = (prices) => {
-  if (!prices) return [];
-  const priceRanges = prices.split(",");
-  const priceConditions = priceRanges.map((priceRange) => {
-    if (priceRange.startsWith("<")) return { "products.price": { $lt: parseInt(priceRange.slice(1)) } };
-    if (priceRange.startsWith(">")) return { "products.price": { $gt: parseInt(priceRange.slice(1)) } };
-    const [min, max] = priceRange.split("-").map(Number);
-    return { "products.price": { $gte: min, $lte: max } };
-  });
-  return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
-};
-const getContainConditions = (contain) => {
-  if (!contain) return [];
-  const conditions = contain.map((property) => ({
-    [property]: { $exists: true, $not: { $size: 0 } }
-  }));
-  return conditions.length > 0 ? [{ $match: { $and: conditions } }] : [];
-};
-const getBasicMatchConditions = (query) => [
-  ...query._id ? [{ _id: new ObjectId(query._id) }] : [],
-  ...query.owner ? [{ owner: new ObjectId(query.owner) }] : [],
-  ...query.types ? [{ types: { $in: query.types } }] : [],
-  ...query.member ? [
-    {
-      memberships: {
-        $elemMatch: {
-          user: new ObjectId(query.member),
-          role: "member"
-        }
-      }
-    }
-  ] : [],
-  ...query.subscriber ? [
-    {
-      memberships: {
-        $elemMatch: {
-          user: new ObjectId(query.subscriber),
-          role: "subscriber"
-        }
-      }
-    }
-  ] : [],
-  ...query.categories?.split(",").length > 0 ? [{ "products.category": { $in: query.categories?.split(",") } }] : [],
-  ...query.delivery?.split(",").length > 0 ? [{ "spots.delivery": { $all: query.delivery?.split(",") } }] : []
-];
-const getPostableConditions = (postableId) => {
-  if (!postableId) return [];
-  return [
-    {
-      $match: {
-        $or: [
-          { owner: new ObjectId(postableId) },
-          {
-            $and: [
-              { types: { $elemMatch: { $eq: "public" } } },
-              {
-                memberships: {
-                  $elemMatch: {
-                    user: new ObjectId(postableId)
-                  }
-                }
-              }
-            ]
-          },
-          {
-            $and: [
-              { types: { $elemMatch: { $in: ["exclusive", "hidden"] } } },
-              {
-                memberships: {
-                  $elemMatch: {
-                    user: new ObjectId(postableId),
-                    role: { $ne: "subscriber" }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  ];
-};
 const controllerFactory = (db) => {
   const Organization = db.organization;
   const Department = db.department;
@@ -1108,7 +903,7 @@ const controllerFactory = (db) => {
         ...queryProcessorCore.getSearchOptions(req.query.search, {
           fields: requestedLookups.includes("products") ? ["profile.name", "products.name"] : ["profile.name"]
         }),
-        ...requestedLookups.includes("products") && req.query.prices ? getPriceConditions(req.query.prices) : [],
+        ...requestedLookups.includes("products") && (req.query.prices || req.query.priceMin || req.query.priceMax) ? getPriceConditions(req.query.prices, req.query.priceMin, req.query.priceMax) : [],
         ...requestedLookups.includes("spots") ? (await getLocationStages(req.query)).stages : [],
         ...requestedLookups.includes("memberships") ? [addUserStatusFields(req.query.user), addMembersQuantity(req.query.user)] : [],
         ...matchConditions.length > 0 ? [{ $match: { $and: matchConditions } }] : [],

package/dist/products.server.js

@@ -1,4 +1,5 @@
-import { L as LoggerNamespaced, C as CacheNamespaced } from "./core.logger-VRHh-WUW.js";
+import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
+import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
 import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
 import OpenAI from "openai";
 import { Types } from "mongoose";
@@ -9,8 +10,8 @@ import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { m as middlewareFactory } from "./authJwt-J1csaMWA.js";
 import { c as coreabac } from "./core.abac-DUPBnlk6.js";
 import { a as Validator, V as Verifier } from "./core.verifier-gPPX_jhf.js";
-import { C as CRUD } from "./crud-DFFgLl09.js";
-import { A as ABAC } from "./abac-DC2x92Pa.js";
+import { C as CRUD } from "./crud-C7FSTUes.js";
+import { A as ABAC } from "./abac-DYoheWuc.js";
 const controllerFactory$1 = (db) => {
   const Category = db.category;
   const logger = new LoggerNamespaced(db);

package/dist/queryProcessorOrganizations-BB11WFpc.js

@@ -0,0 +1,221 @@
+import * as googleMapsServicesJs from "@googlemaps/google-maps-services-js";
+import { Types } from "mongoose";
+const ObjectId = { Types }.Types.ObjectId;
+const { Client } = googleMapsServicesJs;
+const client = new Client({});
+const getRequestedLookups = (query) => query.lookup ? Array.isArray(query.lookup) ? query.lookup : [query.lookup] : [];
+const getLookupStages = (requestedLookups, configs) => {
+  if (!requestedLookups) return [];
+  const lookupsArray = Array.isArray(requestedLookups) ? requestedLookups : requestedLookups.split(",");
+  return lookupsArray.map((lookup) => configs[lookup]).filter(Boolean).flatMap((config) => [
+    { $lookup: config.lookup },
+    // Оберните lookup в объект с $lookup
+    ...config.additionalStages || []
+  ]);
+};
+const getLocationStages = async (query) => {
+  if (!hasLocationParams(query)) {
+    return { stages: [], userLocation: null };
+  }
+  const location = await resolveLocation(query);
+  const radius = getRadius(query);
+  const geoStages = radius ? [
+    {
+      $match: {
+        "spots.location.coordinates": {
+          $geoWithin: {
+            $centerSphere: [[location.coordinates[0], location.coordinates[1]], radius]
+          }
+        }
+      }
+    }
+  ] : [];
+  return {
+    stages: [...geoStages, ...getDistanceStages(location)],
+    userLocation: location
+  };
+};
+const getRadius = (query) => {
+  if (query.locationRadius) return parseFloat(query.locationRadius) / 6378.1;
+  if (query.city) return 25 / 6378.1;
+  if (query.state) return 50 / 6378.1;
+  return null;
+};
+const hasLocationParams = (query) => query.location || query.address || query.city || query.state || query.country;
+const resolveLocation = async (query) => {
+  if (query.location) {
+    const parsedLocation = typeof query.location === "string" ? JSON.parse(query.location) : query.location;
+    const coordinates = parsedLocation.lng ? [parsedLocation.lng, parsedLocation.lat] : parsedLocation.coordinates;
+    return { coordinates: coordinates.map((coord) => parseFloat(coord)) };
+  }
+  const searchString = [query.address, query.city, query.state, query.country].filter(Boolean).join(", ");
+  try {
+    const geoResponse = await client.geocode({
+      params: {
+        address: searchString,
+        key: process.env.GOOGLE_MAPS_API_KEY
+      }
+    });
+    if (!geoResponse.data.results?.length) {
+      throw new Error("Unable to geocode the provided location.");
+    }
+    const { lng, lat } = geoResponse.data.results[0].geometry.location;
+    return { coordinates: [lng, lat] };
+  } catch (err) {
+    throw new Error("Error occurred while geocoding.");
+  }
+};
+const getDistanceStages = (location) => [
+  {
+    $addFields: {
+      spots: {
+        $map: {
+          input: "$spots",
+          as: "spot",
+          in: {
+            $mergeObjects: [
+              "$$spot",
+              {
+                distance: {
+                  $function: {
+                    body: `function(spotCoords, userCoords, isMiles) {
+                      function toRad(x) {
+                        return x * Math.PI / 180;
+                      }
+                      var lon1 = spotCoords[0];
+                      var lat1 = spotCoords[1];
+                      var lon2 = userCoords[0];
+                      var lat2 = userCoords[1];
+                      var R = 6371;
+                      if (isMiles) R = 3959;
+                      var x1 = lat2 - lat1;
+                      var dLat = toRad(x1);
+                      var x2 = lon2 - lon1;
+                      var dLon = toRad(x2);
+                      var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                              Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) *
+                              Math.sin(dLon / 2) * Math.sin(dLon / 2);
+                      var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+                      var d = R * c;
+                      return d;
+                    }`,
+                    args: ["$$spot.location.coordinates", location.coordinates, false],
+                    lang: "js"
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  {
+    $addFields: {
+      distance: { $min: "$spots.distance" },
+      distanceExist: {
+        $cond: {
+          if: { $eq: [{ $type: "$distance" }, "double"] },
+          then: true,
+          else: false
+        }
+      }
+    }
+  }
+];
+const getPriceConditions = (prices, priceMin, priceMax) => {
+  if (priceMin && priceMin.trim() !== "" || priceMax && priceMax.trim() !== "") {
+    const min = priceMin && priceMin.trim() !== "" ? priceMin : "0";
+    const max = priceMax && priceMax.trim() !== "" ? priceMax : "999999";
+    prices = `${min}-${max}`;
+  }
+  if (!prices) return [];
+  const priceRanges = prices.split(",");
+  const priceConditions = priceRanges.map((priceRange) => {
+    if (priceRange.startsWith("<")) return { "products.price": { $lt: parseInt(priceRange.slice(1)) } };
+    if (priceRange.startsWith(">")) return { "products.price": { $gt: parseInt(priceRange.slice(1)) } };
+    const [min, max] = priceRange.split("-").map(Number);
+    return { "products.price": { $gte: min, $lte: max } };
+  });
+  return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
+};
+const getContainConditions = (contain) => {
+  if (!contain) return [];
+  const conditions = contain.map((property) => ({
+    [property]: { $exists: true, $not: { $size: 0 } }
+  }));
+  return conditions.length > 0 ? [{ $match: { $and: conditions } }] : [];
+};
+const getBasicMatchConditions = (query) => [
+  ...query._id ? [{ _id: new ObjectId(query._id) }] : [],
+  ...query.owner ? [{ owner: new ObjectId(query.owner) }] : [],
+  ...query.types ? [{ types: { $in: query.types } }] : [],
+  ...query.member ? [
+    {
+      memberships: {
+        $elemMatch: {
+          user: new ObjectId(query.member),
+          role: "member"
+        }
+      }
+    }
+  ] : [],
+  ...query.subscriber ? [
+    {
+      memberships: {
+        $elemMatch: {
+          user: new ObjectId(query.subscriber),
+          role: "subscriber"
+        }
+      }
+    }
+  ] : [],
+  ...query.categories?.split(",").length > 0 ? [{ "products.category": { $in: query.categories?.split(",") } }] : [],
+  ...query.delivery?.split(",").length > 0 ? [{ "spots.delivery": { $all: query.delivery?.split(",") } }] : []
+];
+const getPostableConditions = (postableId) => {
+  if (!postableId) return [];
+  return [
+    {
+      $match: {
+        $or: [
+          { owner: new ObjectId(postableId) },
+          {
+            $and: [
+              { types: { $elemMatch: { $eq: "public" } } },
+              {
+                memberships: {
+                  $elemMatch: {
+                    user: new ObjectId(postableId)
+                  }
+                }
+              }
+            ]
+          },
+          {
+            $and: [
+              { types: { $elemMatch: { $in: ["exclusive", "hidden"] } } },
+              {
+                memberships: {
+                  $elemMatch: {
+                    user: new ObjectId(postableId),
+                    role: { $ne: "subscriber" }
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ];
+};
+export {
+  getBasicMatchConditions as a,
+  getLookupStages as b,
+  getPostableConditions as c,
+  getContainConditions as d,
+  getPriceConditions as e,
+  getLocationStages as f,
+  getRequestedLookups as g
+};

package/dist/rents.server.js

@@ -1,6 +1,7 @@
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";
 import { c as coreabac } from "./core.abac-DUPBnlk6.js";
-import { L as LoggerNamespaced, C as CacheNamespaced } from "./core.logger-VRHh-WUW.js";
+import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
+import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
 const queryValidatorConfig = {

package/dist/style.css

@@ -801,11 +801,20 @@ button[data-v-54787afa]:disabled {
   transform: translate(-50%, -100%);
   margin-top: -8px;
 }
+.filter-checkbox[data-v-d3175613] {
+  max-height: 300px;
+  overflow-y: auto;
+}
+
 .icon-custom { 
   background: white;
 }
 
-.filters-content[data-v-ac09bf09] {
+.filter-date-range[data-v-dbe77cee] {
+  width: 100%;
+}
+
+.filters-content[data-v-2c930cac] {
   max-height: 60vh;
   overflow-y: auto;
 }

package/dist/{web-Cyc6i_pv.js → web-cNKIl_cL.js}

@@ -1,4 +1,4 @@
-import { W as p } from "./main-DQtUY5ma.js";
+import { W as p } from "./main-CmjWiDVF.js";
 class f extends p {
   constructor() {
     super(...arguments), this.group = "CapacitorStorage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.561",
+  "version": "0.2.563",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/Button/Button.vue

@@ -137,7 +137,7 @@ async function Submit() {
     </Transition>
     
     <!-- Counter -->
-    <div v-if="counter" class="button-counter flex flex-center">
+    <div v-if="counter" class="button-counter font-second flex flex-center">
       <span>{{ counter }}</span>
     </div>
   </button>

package/src/components/Checkbox/Checkbox.vue

@@ -40,7 +40,7 @@
   }
 </script>
 <template>
-  <label class="flex-v-center flex-nowrap flex">
+  <label class="flex-v-center cursor-pointer flex-nowrap flex">
     <div v-if="label" class="mn-r-auto t-transp mn-r-small">
       <span>{{label}}</span>
     </div>

package/src/modules/core/views/components/layouts/Client.vue

@@ -354,15 +354,11 @@
 	   });
 	 	}
 
-		const savedPosition = localStorage.getItem('position');
-
-	  if (savedPosition) {
-	    store.core.state.position = JSON.parse(savedPosition);
-	  } else if (route.meta.location) {
-  		store.core.state.isOpenLocationPopup = true;
-	  } else {
-	  	store.core.state.isOpenLocationPopup = false;
-	  }
+		if (!store.core.state.position && route.meta.location) {
+      store.core.state.isOpenLocationPopup = true;
+    } else {
+      store.core.state.isOpenLocationPopup = false;
+    }
 
 		if (referalCode.value) {
 		  localStorage.setItem('referalCode', referalCode.value);
@@ -373,11 +369,11 @@
 
 	const componentKey = computed(() => {
 	  // Собираем только значимые параметры (ID сущностей)
-	  const significantParams = ['_id', 'product', 'organization', 'categoryPath']
+	  const significantParams = ['_id', 'product', 'organization', 'categoryPath', 'country', 'state', 'city']
 	    .map(param => route.params[param])
 	    .filter(Boolean)
 	    .join('-');
-	  
+
 	  return significantParams || route.name;
 	});
 </script>

package/src/modules/core/views/components/partials/Header.vue

@@ -116,7 +116,7 @@
     	class="
     		cursor-pointer
     		bg-transp 
-    		pd-l-micro pd-r-micro
+    		pd-micro
     		radius-extra 
     		uppercase 
     		t-semi