@ozdao/martyrs 0.2.508 → 0.2.510

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

@@ -13,11 +13,10 @@
         :key="product._id" 
         :image="product.images?.[0] ? (FILE_SERVER_URL || '') + product.images[0] : ''"
         :name="product.name"
-        :title="`${returnCurrency()}${product.price}`"
         :showThumbnail="true"
         :actions="[
           {
-            icon: IconDelete,
+            component: IconDelete,
             class: 'bg-red',
             handler: () => {
               globals.actions.delete(recommended, product, index);
@@ -60,7 +59,6 @@
           v-for="(product, index) in items" :key="product._id"
           :image="product.images?.[0] ? (FILE_SERVER_URL || '') + product.images[0] : ''"
           :name="product.name"
-          :title="`${returnCurrency()}${product.price}`"
           :showThumbnail="true"
           @click="globals.actions.add(recommended, product); closeRecommendedPopup();"
           class="bg-white pd-thin radius-medium w-100 mn-b-thin cursor-pointer hover-scale-1"

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

@@ -1,18 +1,23 @@
 <template>
   <Carousel
     :store="{
-      read: products.actions.read
+      read: (options) => products.actions.read(options)
     }"
     :options="{ 
-      limit: 10 
+      limit: 16,
+      sortParam: 'views',
+      owner: $route.name?.includes('Organization') ? $route.params._id : null,
+      lookup: ['variants'],
     }"
     :text="{ title: 'No products available' }"
     :showDots="true"
     class="popupar_products"
+    v-slot="{ 
+      item
+    }"
   >
-    <template #default="{ item }">
       <router-link  
-        :to="{ name: 'Organization_Product', params: { _id: item.owner.target, product: item._id } }"
+        :to="{ name: 'Organization_Product', params: { _id: item.owner.target._id || item.owner.target, product: item._id } }"
         class="h-100 pos-relative block"
       >
         <CardProduct  
@@ -20,7 +25,6 @@
           class="h-max-40r h-100 bg-light"
         />
       </router-link>
-    </template>
   </Carousel>
 </template>
 

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

@@ -139,7 +139,7 @@ const addSelectedToCart = async () => {
 <template>
   <div>
     <h3 class="mn-b-small">Frequently Bought Together</h3>
-    <div class="recommended-products cols-4 mobile:cols-2 gap-thin">
+    <div class="recommended-products cols-4 rows-auto-1fr mobile:cols-2 gap-thin">
       
       <CardProduct  
         v-for="(product, index) in products" 
@@ -166,7 +166,10 @@ const addSelectedToCart = async () => {
         <p class="mn-b-small">Total price:</p>
         <p class="mn-b-medium h3 t-medium">${{ totalPrice }}</p>
         <Button 
+          :disabled="selectedProducts.length < 1"
           class="bg-main gap-micro"
+          :showSuccess="false"
+          :showLoader="false"
           :submit="canAddToCart ? addSelectedToCart : undefined"
         >
           <IconShopcartAdd class="i-semi"/>

package/src/modules/products/controllers/configs/products.lookup.config.js

@@ -81,7 +81,17 @@ export default  {
       from: 'products',
       localField: 'recommended',
       foreignField: '_id',
-      as: 'recommended'
+      as: 'recommended',
+      pipeline: [
+        {
+          $lookup: {
+            from: 'variants',
+            localField: '_id',
+            foreignField: 'product',
+            as: 'variants'
+          }
+        }
+      ]
     }
   },
   // Лукап для категорий продукта
@@ -109,13 +119,30 @@ export default  {
       }
     }]
   },
-  // Лукап для аренд продукта
+  // Лукап для аренд продуктов (статичный без дат)
   rents: {
     lookup: {
       from: 'rents',
       localField: '_id',
       foreignField: 'product',
-      as: 'rents'
+      as: 'rents',
+      pipeline: [
+        {
+          $match: {
+            status: { $in: ['confirmed', 'active'] }
+          }
+        },
+        {
+          $project: {
+            _id: 1,
+            product: 1,
+            startDate: 1,
+            endDate: 1,
+            quantity: 1,
+            status: 1
+          }
+        }
+      ]
     }
-  }
+  },
 };

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

@@ -28,6 +28,17 @@ const controllerFactory = db => {
     try {
       const requestedLookups = queryProcessorGlobals.getRequestedLookups(req.query);
       
+      if (req.query.dateStart || req.query.dateEnd) {
+          console.log('Availability filter params:', {
+              dateStart: req.query.dateStart,
+              dateEnd: req.query.dateEnd,
+              dateStartType: typeof req.query.dateStart,
+              dateEndType: typeof req.query.dateEnd
+          });
+      }
+
+     console.log('availability variant',  JSON.stringify(...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd), null, 2))
+
       const stages = [
         ...queryProcessorGlobals.getBasicOptions(req.query),
         ...queryProcessorGlobals.getSearchOptions(req.query.search, {
@@ -40,9 +51,10 @@ const controllerFactory = db => {
         ...queryProcessorProducts.getCategoriesFilterStage(req.query.categories),
         ...queryProcessorProducts.getDeliveryFilterStage(req.query.delivery),
         ...queryProcessorProducts.getAttributeFiltersStage(req.query.filters),
-        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.prices),
-        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         ...queryProcessorGlobals.getLookupStages(requestedLookups, productLookupConfigs),
+
+        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.priceMin, req.query.priceMax),
+        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         
         queryProcessorGlobals.getCreatorUserLookupStage(),
         queryProcessorGlobals.getCreatorOrganizationLookupStage(),

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

@@ -122,48 +122,41 @@ function getAttributeFiltersStage(filtersString) {
 
 /**
  * Обрабатывает фильтрацию по цене вариантов
- * @param {string} prices - строка с ценовыми диапазонами
+ * @param {string} priceMin - минимальная цена
+ * @param {string} priceMax - максимальная цена
  * @returns {Array} этапы агрегации для фильтрации по ценам вариантов
  */
-function getVariantPriceFilterStage(prices) {
-  if (!prices) return [];
+function getVariantPriceFilterStage(priceMin, priceMax) {
+  // Проверяем что хотя бы одно значение существует и не пустое
+  const hasValidMin = priceMin && priceMin.trim() !== '';
+  const hasValidMax = priceMax && priceMax.trim() !== '';
+  
+  if (!hasValidMin && !hasValidMax) return [];
   
   try {
-    const priceRanges = prices.split(',');
-    const priceConditions = [];
-    
-    priceRanges.forEach(priceRange => {
-      if (priceRange.startsWith('<')) {
-        priceConditions.push({
-          variants: {
-            $elemMatch: {
-              price: { $lt: parseFloat(priceRange.slice(1)) }
-            }
-          }
-        });
-      } else if (priceRange.startsWith('>')) {
-        priceConditions.push({
-          variants: {
-            $elemMatch: {
-              price: { $gt: parseFloat(priceRange.slice(1)) }
-            }
-          }
-        });
-      } else {
-        const [min, max] = priceRange.split('-').map(Number);
-        if (!isNaN(min) && !isNaN(max)) {
-          priceConditions.push({
-            variants: {
-              $elemMatch: {
-                price: { $gte: min, $lte: max }
-              }
-            }
-          });
+    const priceCondition = {
+      variants: {
+        $elemMatch: {
+          price: {}
         }
       }
-    });
+    };
     
-    return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
+    if (hasValidMin) {
+      const minPrice = parseFloat(priceMin);
+      if (!isNaN(minPrice)) {
+        priceCondition.variants.$elemMatch.price.$gte = minPrice;
+      }
+    }
+    
+    if (hasValidMax) {
+      const maxPrice = parseFloat(priceMax);
+      if (!isNaN(maxPrice)) {
+        priceCondition.variants.$elemMatch.price.$lte = maxPrice;
+      }
+    }
+    
+    return [{ $match: priceCondition }];
   } catch (error) {
     console.error('Error parsing price filters:', error);
     return [];
@@ -182,11 +175,21 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
   const startDate = new Date(dateStart);
   const endDate = new Date(dateEnd);
   
+  // Проверяем валидность дат
+  if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
+    console.warn('Invalid dates provided for availability filter:', { dateStart, dateEnd });
+    return [];
+  }
+  
   return [
     {
       $lookup: {
         from: 'rents',
-        let: { productId: '$_id' },
+        let: { 
+          productId: '$_id',
+          dateStart: startDate,
+          dateEnd: endDate
+        },
         pipeline: [
           {
             $match: {
@@ -198,20 +201,20 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
                     $or: [
                       {
                         $and: [
-                          { $gte: ['$startDate', startDate] },
-                          { $lte: ['$startDate', endDate] }
+                          { $gte: ['$startDate', '$$dateStart'] },
+                          { $lte: ['$startDate', '$$dateEnd'] }
                         ]
                       },
                       {
                         $and: [
-                          { $gte: ['$endDate', startDate] },
-                          { $lte: ['$endDate', endDate] }
+                          { $gte: ['$endDate', '$$dateStart'] },
+                          { $lte: ['$endDate', '$$dateEnd'] }
                         ]
                       },
                       {
                         $and: [
-                          { $lte: ['$startDate', startDate] },
-                          { $gte: ['$endDate', endDate] }
+                          { $lte: ['$startDate', '$$dateStart'] },
+                          { $gte: ['$endDate', '$$dateEnd'] }
                         ]
                       }
                     ]
@@ -237,7 +240,7 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
         },
         availableQuantity: {
           $subtract: [
-            { $ifNull: ['$quantity', 1] },
+            { $ifNull: ['$available', 0] },
             { $ifNull: [{ $arrayElemAt: ['$rentInfo.totalRented', 0] }, 0] }
           ]
         }

package/src/modules/products/models/product.model.js

@@ -1,8 +1,11 @@
 import applyCommonSchema from '@martyrs/src/modules/globals/models/schemas/common.schema.js';
 import applyOwnershipSchema from '@martyrs/src/modules/globals/models/schemas/ownership.schema.js';
+import applyEngagementSchema from '@martyrs/src/modules/globals/models/schemas/engagement.schema.js';
 
 import discountschema from './schemas/discount.schema.js';
 
+
+
 export default db => {
   const DiscountSchema = discountschema(db);
 
@@ -51,6 +54,7 @@ export default db => {
 
   applyCommonSchema(ProductSchema, db);
   applyOwnershipSchema(ProductSchema, db);
+  applyEngagementSchema(ProductSchema, db);
 
    // Текстовый индекс для поиска
   ProductSchema.index({ name: 'text', description: 'text' });

package/src/modules/products/store/products.js

@@ -49,20 +49,20 @@ const state = reactive({
     ],
   },
   sort: {
-    param: 'distance',
+    param: 'popularity',
     order: 'asc',
     options: [
       {
-        label: 'Distance',
-        value: 'distance',
+        label: 'Price',
+        value: 'variants.price',
       },
       {
         label: 'Popularity',
         value: 'views',
       },
       {
-        label: 'Products',
-        value: 'numberOfProducts',
+        label: 'New',
+        value: 'createdAt',
       },
     ],
   },

package/src/styles/base/all.scss

@@ -259,10 +259,15 @@ body {
 	}
 	.rows-1 {display: grid;  grid-template-columns: 100%; grid-auto-rows: minmax(auto, max-content); }
 	.rows-1-min0_max1 {display: grid; grid-template-rows: minmax(0, 1fr); }
-	.rows-auto {   grid-auto-flow: row;
-  grid-auto-columns: auto;
-  grid-template-rows: auto;
-  grid-auto-rows: auto;}
+	.rows-auto {   
+		grid-auto-flow: row;
+	  grid-auto-columns: auto;
+	  grid-template-rows: auto;
+	  grid-auto-rows: auto;
+	}
+	.rows-auto-1fr {
+		grid-auto-rows: 1fr;
+	}
 	// REFACTOR THIS SHIT
 	.grid {
 	  display: grid;

package/src/styles/config.scss

@@ -336,6 +336,12 @@ $display-values: (
   'table-cell': table-cell
 );
 
+$text-align-values: (
+  'left': left,
+  'center': center,
+  'right': right,
+);
+
 $order: (
   '1': 1,
   '2': 2,
@@ -395,6 +401,10 @@ body {
   @include generate-utility-classes('o-y', 'overflow-y', null, $overflow-xy-values, $breakpoints);
   @include generate-utility-classes('d', 'display', null, $display-values, $breakpoints);
 
+  /* Typography */
+  @include generate-utility-classes('t', 'text-align', null, $text-align-values, $breakpoints);
+
+
 
 	@include generate-utility-classes('cols', 'grid-template-columns', null, $cols, $breakpoints);
 	

package/src/styles/responsive.scss

@@ -65,7 +65,8 @@ $xxl-desktop-min:                   1921px;
     }
     
      // Cols
-    .cols-1, .cols-2, .cols-4,  .cols-2-2_1, .cols-2-1_2, .cols-2-1_3, .cols-2-golden-ration   { display: grid !important; grid-template-columns: 1fr !important;  }
+/*     .cols-2,*/
+    .cols-1,  .cols-4,  .cols-2-2_1, .cols-2-1_2, .cols-2-1_3, .cols-2-golden-ration   { display: grid !important; grid-template-columns: 1fr !important;  }
     .cols-4.no-responsive { grid-template-columns: 1fr 1fr 1fr 1fr !important }
     .cols-2 { >.col { width: 100% !important;  } }
 

package/src/styles/typography.scss

@@ -80,11 +80,6 @@ a:hover   { cursor: pointer;}
   -ms-user-select: none; /* IE 10 and IE 11 */
   user-select: none; /* Standard syntax */  
 }
-// Text align
-
-.t-left   	{ text-align: left; 	}
-.t-center   { text-align: center; }
-.t-right  	{ text-align: right; 	}
 // Font weights
 .t-bold   	{ font-weight: 900;}
 .t-demi   	{ font-weight: 700;}