@ozdao/martyrs 0.2.564 → 0.2.566

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

@@ -1,11 +1,13 @@
 import Cache from '@martyrs/src/modules/core/controllers/classes/core.cache.js';
 import Logger from '@martyrs/src/modules/core/controllers/classes/core.logger.js';
 import globalsQuery from '@martyrs/src/modules/core/controllers/utils/queryProcessor.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 
 const controllerFactory = db => {
   const Category = db.category;
   const logger = new Logger(db);
   const cache = new Cache();
+  const abac = coreabac.getInstance(db);
 
   // Генерация уникального slug
   const generateSlug = async (name, parentId = null) => {
@@ -174,17 +176,30 @@ const controllerFactory = db => {
         const depthNum = parseInt(depth, 10);
         const isTree = tree === 'true' || tree === true;
         const isRoot = root === 'true' || root === true;
-        
-        console.log('🚀 Read categories params:', { url, depth: depthNum, tree: isTree, root });
-        
-        const cacheKey = JSON.stringify(req.query);
+
+        const cacheKey = JSON.stringify({ query: req.query, userId: req.userId });
         const cached = await cache.get(cacheKey);
         if (cached) return res.json(cached);
 
+        // Проверка прав на просмотр всех статусов
+        let canViewAllStatuses = false;
+        if (req.userId) {
+          const accessCheck = await abac.checkAccess({
+            user: req.userId,
+            resource: 'category',
+            action: 'read',
+            data: {
+              body: owner ? { owner: { type: 'organization', target: owner } } : {}
+            }
+          });
+
+          canViewAllStatuses = accessCheck.allow;
+        }
+
         // Базовая фильтрация
         const match = {
           ...(_id && { _id: new db.mongoose.Types.ObjectId(_id) }),
-          ...(status && { status }),
+          ...(status !== undefined ? { status } : (canViewAllStatuses ? {} : { status: 'published' })),
           ...(search && { name: { $regex: search, $options: 'i' } }),
           ...(type && { 'owner.type': type }),
           ...(owner && { 'owner.target': new db.mongoose.Types.ObjectId(owner) }),
@@ -214,19 +229,13 @@ const controllerFactory = db => {
           match.url = { $regex: '^/[^/]+$' };
         }
 
-        console.log('🔎 Match object:', JSON.stringify(match, null, 2));
-
         const pipeline = [
           { $match: match },
           ...globalsQuery.getSortingOptions(sortParam, sortOrder),
-          // ...(skip || limit ? globalsQuery.getPaginationOptions(skip, limit) : []),
+          ...(!isTree && (skip || limit) ? globalsQuery.getPaginationOptions(skip, limit) : []),
         ];
-        
-        console.log('🔧 Pipeline:', JSON.stringify(pipeline, null, 2));
 
         let results = await Category.aggregate(pipeline);
-        console.log('🔍 Aggregate results:', results.length, 'categories found');
-        console.log('🔍 Results URLs:', results.map(r => r.url));
 
         // Фильтрация по глубине если указан depth > 1 и url
         if (url && depthNum > 1) {
@@ -235,31 +244,28 @@ const controllerFactory = db => {
             const catLevel = cat.url.split('/').filter(Boolean).length;
             return cat.url === url || catLevel <= maxLevel;
           });
-          console.log('🔍 After depth filter:', results.length, 'categories');
         }
 
         // Построение дерева
         if (isTree && results.length > 0) {
-          console.log('🌳 Building tree from results');
           results = buildTreeFromUrl(results, sortParam, sortOrder);
+
+          // Пагинация корневых элементов
+          const skipNum = parseInt(skip, 10) || 0;
+          const limitNum = parseInt(limit, 10) || 0;
+          if (limitNum > 0) {
+            results = results.slice(skipNum, skipNum + limitNum);
+          }
         } else if (!isTree && depthNum === 1 && url && results.length > 0) {
-          console.log('📋 Processing tree=false, depth=1');
-          console.log('📋 Looking for main category with url:', url);
-          
           const mainCategory = results.find(c => c.url === url);
-          console.log('📋 Main category found:', !!mainCategory, mainCategory?.url);
-          
+
           if (mainCategory) {
-            const children = results.filter(c => 
+            const children = results.filter(c =>
               c.url !== url && c.url.startsWith(url + '/')
             );
-            console.log('📋 Children found:', children.length, children.map(c => c.url));
-            
+
             mainCategory.children = children;
             results = [mainCategory];
-            console.log('📋 Final result with children:', results[0].url, 'children:', results[0].children.length);
-          } else {
-            console.log('❌ Main category not found in results!');
           }
         }
 
@@ -267,8 +273,7 @@ const controllerFactory = db => {
         const tags = ['categories'];
         if (owner) tags.push(`organization_${owner}`);
         await cache.setWithTags(cacheKey, results, tags);
-        
-        console.log('✅ Final results count:', results.length);
+
         res.json(results);
       } catch (err) {
         logger.error(`Error reading categories: ${err.message}`);

package/src/modules/products/routes/categories.routes.js

@@ -1,5 +1,5 @@
 import jwtFactory from '@martyrs/src/modules/auth/controllers/middlewares/authJwt.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import controllerFactory from '../controllers/categories.controller.js';
 import verifierFactory from '../middlewares/categories.verifier.js';
 const { getInstance } = coreabac;

package/src/modules/rents/controllers/routes/rents.routes.js

@@ -1,5 +1,5 @@
 import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import controllerFactory from '../services/rents.services.js';
 // const middlewareFactoryRents = require('../middlewares/rent');
 // ABAC

package/src/modules/rents/views/components/pages/RentsEdit.vue

@@ -4,30 +4,102 @@
       <h2>{{ route.params._id ? 'Edit' : 'Add' }} Rent</h2>
     </header>
 
-    <Popup 
-      title="Add Product to Rent" 
-      @close-popup="closeProductsPopup" 
+    <Popup
+      title="Add Product to Rent"
+      @close-popup="closeProductsPopup"
       :isPopupOpen="isOpenProductsPopup"
-      class="bg-white w-min-30r w-max-30r radius-big pd-medium"
+      class="bg-white w-100 w-max-30r radius-medium pd-medium"
     >
-      <div class="bg-light mn-b-thin h-min-20r h-max-20r o-scroll pd-medium radius-big">
-        <Feed
-          :search="true"
-          :states="{ empty: { title: 'No Products Found', description: 'No products available for rent.' } }"
-          :store="{ read: (options) => products.actions.read(options) }"
-          :options="{ organization: route.params._id, listing: 'rent' }"
-          v-slot="{ items }"
-        >
-          <CardOrderItem
-            v-for="product in items" 
-            :key="product._id"
-            :editable="false" 
-            :product="product" 
-            @click="addProduct(product)"
-            class="bg-white pd-thin radius-medium w-100 mn-b-thin"
-          />
-        </Feed>
-      </div>
+      <Feed
+        :search="{
+          class: 'bg-light radius-small'
+        }"
+        :states="{
+          empty: {
+            title: 'No Products Found',
+            description: 'No products available for rent.'
+          }
+        }"
+        :store="{
+          read: (options) => products.actions.read(options),
+          state: null
+        }"
+        :options="{
+          owner: route.params._id,
+          listing: 'rent'
+        }"
+        v-slot="{ items }"
+        class="flex-column flex gap-thin h-max-20r o-scroll"
+      >
+        <CardOrderItem
+          v-for="(product, index) in items"
+          :key="`${product._id}_${product.variant || 'no-variant'}_${index}`"
+          :editable="false"
+          :productId="product._id"
+          :variantId="product.variant"
+          :images="product.images"
+          :name="product.name"
+          :quantity="product.quantity || 1"
+          :unit="product.unit"
+          :dates="product.date"
+          :listing="product.listing"
+          :price="product.price"
+          @click="() => selectProduct(product)"
+          class="bg-light pd-small radius-small w-100"
+        />
+      </Feed>
+    </Popup>
+
+    <!-- Popup for selecting variant of the product -->
+    <Popup
+      title="Select variant"
+      @close-popup="closeVariantsPopup"
+      :isPopupOpen="isVariantsPopupOpen"
+      class="bg-white w-100 w-max-30r radius-medium pd-medium"
+    >
+      <Feed
+        :store="variants"
+        :options="{
+          product: selectedProduct._id,
+        }"
+        :skeleton="{
+          structure: [
+            { block: 'text', size: 'small' },
+            { block: 'text', size: 'medium' },
+            { block: 'text', size: 'small' }
+          ]
+        }"
+        :states="{
+          empty: {
+            title: 'No variants',
+            description: 'Create your first variant'
+          }
+        }"
+         v-slot="{ items }"
+      >
+        <div class="gap-thin flex flex-column">
+          <div
+            v-for="(variant, index) in items"
+            :key="index"
+            @click="addVariantToRent(variant)"
+            class="w-100 cursor-pointer hover-scale-1 bg-light pd-small radius-small flex-v-center flex-nowrap flex gap-thin"
+          >
+            <div v-if="variant.images && variant.images.length" class="aspect-1x1 h-3r radius-small o-hidden">
+              <img
+                :src="(FILE_SERVER_URL || '') + variant.images[0]"
+                class="w-100 h-100 object-fit-cover"
+              />
+            </div>
+            <div>
+              <p class="t-medium">{{ variant.name || 'Default variant' }}</p>
+              <p v-if="variant.attributes && variant.attributes.length" class="t-small t-transp">
+                {{ variant.attributes.map(attr => `${attr.name}: ${attr.value}`).join(', ') }}
+              </p>
+            </div>
+            <p class="mn-l-auto">{{ formatPrice(variant.price || variant.cost) }}</p>
+          </div>
+        </div>
+      </Feed>
     </Popup>
 
     <Block title="Rent Period" class="mn-b-semi">
@@ -38,24 +110,27 @@
     </Block>
 
     <Block
-      title="Rented Products"
-      :actions="[{ label: '+', function: openProductsPopup }]"
+      title="Rented Product"
+      :actions="rents.state.current.product ? [] : [{ label: '+', function: openProductsPopup }]"
       placeholder="No products added yet"
       class="mn-b-semi"
     >
       <CardOrderItem
         v-if="rents.state.current.product"
-        :key="rents.state.current.product._id" 
+        :key="rents.state.current.product._id"
         :productId="rents.state.current.product._id"
         :variantId="rents.state.current.product.variant"
         :images="rents.state.current.product.images"
         :name="rents.state.current.product.name"
         :quantity="rents.state.current.product.quantity || 1"
         :unit="rents.state.current.product.unit"
-        :dates="rents.state.current.product.date"
+        :dates="{
+          start: rents.state.current.startDate,
+          end: rents.state.current.endDate
+        }"
         :listing="rents.state.current.product.listing"
         :price="rents.state.current.product.price"
-        :editable="false" 
+        :editable="false"
         @click="() => rents.state.current.product = null"
         class="mn-b-small radius-medium bg-white pd-small"
       />
@@ -68,9 +143,28 @@
     <Block>
       <section class="gap-thin flex-v-center flex-nojustify flex">
         <h3 class="mn-r-auto">Total Days: {{ totalDays }}</h3>
-        <a @click="onSubmit" class="bg-main button">Save</a> 
-        <a @click="onReset" class="t-white bg-second button">Reset</a>
-        <a v-if="route.params._id" @click="onDelete" class="t-white bg-red button">Delete</a>
+
+        <Button
+          :submit="onSubmit"
+          class="pd-small radius-medium bg-main t-black uppercase t-medium"
+        >
+          Save
+        </Button>
+
+        <Button
+          :submit="onReset"
+          class="pd-small radius-medium t-white bg-second uppercase t-medium"
+        >
+          Reset
+        </Button>
+
+        <Button
+          v-if="route.params._id"
+          :submit="onDelete"
+          class="pd-small radius-medium t-white bg-red uppercase t-medium"
+        >
+          Delete
+        </Button>
       </section>
     </Block>
   </div>
@@ -78,6 +172,7 @@
 
 <script setup>
 import Block from '@martyrs/src/components/Block/Block.vue';
+import Button from '@martyrs/src/components/Button/Button.vue';
 import Field from '@martyrs/src/components/Field/Field.vue';
 import Feed from '@martyrs/src/components/Feed/Feed.vue';
 import Popup from '@martyrs/src/components/Popup/Popup.vue';
@@ -86,15 +181,21 @@ import CardOrderItem from '@martyrs/src/modules/orders/components/blocks/CardOrd
 
 import { computed, onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
+
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 import * as rents from '@martyrs/src/modules/rents/views/store/rents.store';
 import * as products from '@martyrs/src/modules/products/store/products.js';
+import variants from '@martyrs/src/modules/products/store/variants.store.js';
 
 const route = useRoute();
 const router = useRouter();
+const { formatPrice } = useGlobalMixins();
 
 const Products = ref(products.state.all);
 const isOpenProductsPopup = ref(false);
+const isVariantsPopupOpen = ref(false);
+const selectedProduct = ref({});
 
 const totalDays = computed(() => {
   const start = new Date(rents.state.current.startDate);
@@ -104,12 +205,60 @@ const totalDays = computed(() => {
   return Math.ceil(diffTime / (1000 * 60 * 60 * 24));
 });
 
-function openProductsPopup() { isOpenProductsPopup.value = true; }
-function closeProductsPopup() { isOpenProductsPopup.value = false; }
+function openProductsPopup() {
+  isOpenProductsPopup.value = true;
+}
+
+function closeProductsPopup() {
+  isOpenProductsPopup.value = false;
+}
 
-function addProduct(product) {
-  rents.state.current.product = product
+function closeVariantsPopup() {
+  isVariantsPopupOpen.value = false;
+  selectedProduct.value = {};
+}
+
+function selectProduct(product) {
+  selectedProduct.value = product;
   closeProductsPopup();
+
+  // If product has only one variant, add it directly without showing popup
+  if (product.variants && product.variants.length === 1) {
+    addVariantToRent(product.variants[0]);
+    return;
+  }
+
+  // If product has multiple variants or no variants defined, show popup
+  isVariantsPopupOpen.value = true;
+}
+
+function formatProductName(product, variant) {
+  if (!variant || product.variants?.length === 1 && !(variant.attributes?.length))
+    return product.name;
+
+  const attrs = variant.attributes?.map(a => a.value).filter(Boolean);
+  if (attrs?.length) {
+    return `${product.name} / ${attrs.join(' / ')}`;
+  }
+
+  // Если variant.name уже содержит product.name, не дублируем
+  return variant.name || product.name;
+}
+
+function addVariantToRent(variant) {
+  // Create product object with variant information
+  rents.state.current.product = {
+    _id: selectedProduct.value._id,
+    variant: variant._id,
+    name: formatProductName(selectedProduct.value, variant),
+    images: variant.images || selectedProduct.value.images || [],
+    price: variant.price || variant.cost || 0,
+    unit: variant.unit || 'pcs',
+    quantity: 1,
+    listing: 'rent'
+  };
+
+  closeVariantsPopup();
 }
 
 function updateItem(index, updatedItem) {
@@ -132,7 +281,7 @@ onMounted(async () => {
       rents.mutations.clean();
     }
 
-    await products.actions.read({ organization: route.params._id, listing: 'rent', limit: 100 });
+    await products.actions.read({ owner: route.params._id, listing: 'rent', limit: 100 });
     Products.value = products.state.all;
   } catch (error) {
     console.error('Ошибка при загрузке данных:', error);
@@ -142,22 +291,32 @@ onMounted(async () => {
 async function onSubmit() {
   try {
     if (route.params.rent) {
-      let newProduct = rents.state.current
-      newProduct.product = rents.state.current.product._id
-      newProduct.startDate = new Date(rents.state.current.startDate);
-      newProduct.endDate = new Date(rents.state.current.endDate);
-      await rents.actions.update(newProduct);
+      // Update existing rent
+      const rentData = {
+        _id: rents.state.current._id,
+        product: rents.state.current.product._id,
+        variant: rents.state.current.product.variant,
+        startDate: new Date(rents.state.current.startDate),
+        endDate: new Date(rents.state.current.endDate),
+        comment: rents.state.current.comment,
+        status: rents.state.current.status
+      };
+      await rents.actions.update(rentData);
     } else {
-      rents.state.current.creator = { type: 'user', target: auth.state.user._id };
-      rents.state.current.owner = { type: 'organization', target: route.params._id };
-      rents.state.current.owner = { type: 'organization', target: route.params._id };
-      let newProduct = rents.state.current
-      newProduct.product = rents.state.current.product._id
-      newProduct.startDate = new Date(rents.state.current.startDate);
-      newProduct.endDate = new Date(rents.state.current.endDate);
-      await rents.actions.create(newProduct);
+      // Create new rent - БЕЗ _id!
+      const rentData = {
+        product: rents.state.current.product._id,
+        variant: rents.state.current.product.variant,
+        startDate: new Date(rents.state.current.startDate),
+        endDate: new Date(rents.state.current.endDate),
+        comment: rents.state.current.comment || '',
+        status: rents.state.current.status || 'active',
+        creator: { type: 'user', target: auth.state.user._id },
+        owner: { type: 'organization', target: route.params._id }
+      };
+      await rents.actions.create(rentData);
     }
-    // router.push({ name: 'Rents', params: { _id: route.params._id } });
+    router.push({ name: 'Rents', params: { _id: route.params._id } });
   } catch (error) {
     console.error('Ошибка при отправке данных:', error);
   }

package/src/modules/spots/components/pages/Map.vue

@@ -495,7 +495,7 @@ onMounted(async () => {
 
           // Add click listener to the marker
           marker.addListener('click', () => {
-            router.push({name: 'Organization', params: {_id: org._id}});
+            router.push('/organizations/' + org._id);
           });
 
           return marker;
@@ -568,7 +568,7 @@ const searchInCurrentLocation = async () => {
 
         // Add click listener to the marker
         marker.addListener('click', () => {
-          router.push({ name: 'Organization', params: { _id: org._id } });
+          router.push('/organizations/' + org._id);
         });
 
         return marker;

package/src/styles/config.scss

@@ -406,12 +406,12 @@ $order: (
 );
 
 $cols: (
-	'1': 1fr,
-	'2': 1fr 1fr,
-	'3': 1fr 1fr 1fr,
-	'4': 1fr 1fr 1fr 1fr,
-	'5': 1fr 1fr 1fr 1fr 1fr,
-	'6': 1fr 1fr 1fr 1fr 1fr 1fr,
+	'1': minmax(0, 1fr),
+	'2': minmax(0, 1fr) minmax(0, 1fr),
+	'3': minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr),
+	'4': minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr),
+	'5': minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr),
+	'6': minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr),
 );
 
 body {