@ozdao/martyrs 0.2.486 → 0.2.488

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

@@ -25,11 +25,13 @@ const queryValidatorConfig = {
     default: 10,
   },
   productId: { rule: 'optional', validator: Validator.schema().string(), default: null },
+  variantId: { rule: 'optional', validator: Validator.schema().string(), default: null },
 };
 const bodyValidatorConfig = {
   // _id: { rule: 'optional', validator: Validator.schema().string() },
   // order: { rule: 'optional', validator: Validator.schema().string() },
   product: { rule: 'optional', validator: Validator.schema().string().required() },
+  variant: { rule: 'optional', validator: Validator.schema().string() },
   // quantity: { rule: 'optional', validator: Validator.schema().number().integer().min(1).required() },
   startDate: { rule: 'optional', validator: Validator.schema().date().required() },
   endDate: { rule: 'optional', validator: Validator.schema().date().required() },
@@ -286,7 +288,7 @@ const controller = db => {
       const validationResult = queryVerifier.verify(req.query, {
         applyDefaults: true,
         removeInvalid: true,
-        only: ['productId', 'startDate', 'endDate'],
+        only: ['productId', 'variantId', 'startDate', 'endDate'],
       });
       if (!validationResult || !validationResult.isValid) {
         await logger.info(`Invalid query parameters: ${JSON.stringify(validationResult.verificationErrors)}`);
@@ -296,26 +298,46 @@ const controller = db => {
           details: validationResult.verificationErrors,
         });
       }
-      const { productId, startDate, endDate } = validationResult.verifiedData;
+      const { productId, variantId, startDate, endDate } = validationResult.verifiedData;
       if (!productId || !startDate || !endDate) {
         return res.status(400).json({
           errorCode: 'MISSING_REQUIRED_PARAMS',
           message: 'productId, startDate, and endDate are required parameters.',
         });
       }
-      const cacheKey = `availability:${productId}:${startDate}:${endDate}`;
+      const cacheKey = `availability:${productId}:${variantId || 'no-variant'}:${startDate}:${endDate}`;
       const cachedResult = await cache.get(cacheKey);
       if (cachedResult) {
         await logger.info(`Cache hit for availability: ${cacheKey}`);
         return res.status(200).json(cachedResult);
       }
-      // Получаем информацию о продукте
-      const product = await db.product.findById(productId);
-      if (!product) {
-        await logger.info(`Product not found: ${productId}`);
-        return res.status(404).json({ errorCode: 'PRODUCT_NOT_FOUND', message: 'Product not found.' });
+      // Получаем информацию о количестве из stockavailabilities
+      let totalAvailable = 0;
+      
+      if (variantId) {
+        // Если указан вариант, получаем quantity для этого варианта
+        const stockAvailabilities = await db.stockAvailability.find({ variant: variantId });
+        totalAvailable = stockAvailabilities.reduce((sum, stock) => sum + (stock.available || 0), 0);
+        
+        if (totalAvailable === 0) {
+          await logger.info(`Variant not found or no stock available: ${variantId}`);
+          return res.status(404).json({ errorCode: 'VARIANT_NOT_FOUND', message: 'Variant not found or no stock available.' });
+        }
+      } else {
+        // Если вариант не указан, получаем quantity для продукта
+        const stockAvailabilities = await db.stockAvailability.find({ product: productId, variant: { $exists: false } });
+        totalAvailable = stockAvailabilities.reduce((sum, stock) => sum + (stock.available || 0), 0);
+        
+        if (totalAvailable === 0) {
+          // Fallback на старую логику для совместимости
+          const product = await db.product.findById(productId);
+          if (!product) {
+            await logger.info(`Product not found: ${productId}`);
+            return res.status(404).json({ errorCode: 'PRODUCT_NOT_FOUND', message: 'Product not found.' });
+          }
+          totalAvailable = product.quantity || 1;
+        }
       }
-      const totalAvailable = product.quantity || 1;
       // Парсим даты как UTC
       const start = new Date(`${startDate}T00:00:00Z`);
       const end = new Date(`${endDate}T23:59:59Z`);
@@ -325,11 +347,18 @@ const controller = db => {
         dateRange.push(new Date(dt));
       }
       // Ищем активные ренты, пересекающиеся с диапазоном
-      const activeRents = await Rent.find({
+      const rentQuery = {
         product: productId,
         status: { $in: ['pending', 'confirmed', 'active'] },
         $or: [{ startDate: { $lte: end }, endDate: { $gte: start } }],
-      });
+      };
+      
+      // Если указан вариант, фильтруем по варианту
+      if (variantId) {
+        rentQuery.variant = variantId;
+      }
+      
+      const activeRents = await Rent.find(rentQuery);
       // Вычисляем доступность для каждой даты
       const availabilityByDate = dateRange.map(date => {
         const dateStr = date.toISOString().split('T')[0];
@@ -352,6 +381,7 @@ const controller = db => {
       });
       const result = {
         productId,
+        variantId: variantId || null,
         period: {
           startDate: start.toISOString().split('T')[0],
           endDate: end.toISOString().split('T')[0],

package/src/modules/rents/models/rent.model.js

@@ -6,6 +6,7 @@ export default (db, additionalFields = {}) => {
       default: null,
     },
     product: { type: db.mongoose.Schema.Types.ObjectId, ref: 'Product', required: true },
+    variant: { type: db.mongoose.Schema.Types.ObjectId, ref: 'Variant', default: null },
     quantity: {
       type: Number,
       required: true,

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

@@ -8,7 +8,7 @@
           :tabs="viewOptions"
           @tab-click="switchView($event.tab.value)"
           class="mn-r-auto h-100 flex-child-default o-hidden p-small pd-nano radius-small bg-white"
-          tabClass=" pd-thin radius-thin"
+          classTab=" pd-thin radius-thin"
         />
 
         <button @click="navigatePrevious" class="h-100 bg-white aspect-1x1 pd-x-small radius-small bg-light mn-r-x-small">

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

@@ -45,8 +45,16 @@
     >
       <CardOrderItem
         v-if="rents.state.current.product"
-        :key="rents.state.current.product" 
-        :product="rents.state.current.product"
+        :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"
+        :listing="rents.state.current.product.listing"
+        :price="rents.state.current.product.price"
         :editable="false" 
         @click="() => rents.state.current.product = null"
         class="mn-b-small radius-medium bg-white pd-small"

package/src/modules/spots/components/blocks/CardSpot.vue

@@ -1,9 +1,8 @@
 <template>
-  <div class="pos-relative pd-small rows-1">
-
-
+  <div class="pos-relative pd-small rows-1" :class="{'selected': selected }">
     <div class="w-100 flex-nowrap flex gap-thin">
       <div
+        v-if="spot.address"
         class="aspect-1x1 h-100"
       >
         <Map 
@@ -17,8 +16,8 @@
        
         />
       </div>
-      <div>
 
+      <div>
         <!-- Edit Button -->
         <router-link
           v-if="editAccess"
@@ -32,8 +31,11 @@
           class="
             z-index-2
             cursor-pointer 
-            pos-absolute pos-t-regular pos-r-regular
+            pos-absolute pos-t-thin pos-r-thin
             radius-extra pd-thin bg-second
+            i-semi
+            flex
+            flex-center
           "
         >
           <IconEdit
@@ -45,34 +47,35 @@
         <IconCheckmark
           v-if="selected"
           :fill="'rgb(var(--white))'"
-          class="z-index-2 pos-absolute pos-t-regular pos-r-regular radius-extra bg-second pd-thin i-semi"
+          class="z-index-2 pos-absolute pos-t-thin pos-r-thin radius-extra bg-second pd-thin i-semi"
         />
      
         <p
-          class="mn-b-thin p-medium t-medium d-inline-block w-100"
+          class="p-medium t-medium d-inline-block w-100"
           v-html="spot.profile.name"
         />
         
-        <p v-if="spot.profile.description" class="d-block p-big mn-b-thin">
+        <p v-if="spot.profile.description" class="d-block p-semi mn-t-thin">
           {{spot.profile.description}}
         </p>
 
-        <div class="bg-light pd-thin radius-thin">
+        <div v-if="spot.address" class="bg-light mn-t-thin pd-thin radius-thin">
           <p class="text-box-trim-end  p-small w-100 t-truncate">
             {{spot.address}}
           </p>
         </div>
 
-        <p class="uppercase t-medium mn-t-small mn-b-thin" v-if="showDeliveryOptions">Delivery</p>
+        <p class="uppercase t-medium mn-t-small mn-t-thin" v-if="showDeliveryOptions  && spot.delivery.length > 0">Delivery</p>
         <Chips 
           v-if="showDeliveryOptions && spot.delivery.length > 0" 
           :chips="spot.delivery"
         />
 
-        <p class="uppercase t-medium  mn-t-small mn-b-thin"  v-if="showPaymentOptions">Accepted Payment</p>
+        <p class="uppercase t-medium  mn-t-small mn-t-thin"  v-if="showPaymentOptions && spot.payment.length > 0">Accepted Payment</p>
         <Chips 
           v-if="showPaymentOptions && spot.payment.length > 0" 
           :chips="spot.payment"
+          class="mn-t-thin"
         />
       </div>
 

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

@@ -15,7 +15,7 @@
 
        <p 
         @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}`)"
-        class="mn-b-small p-big w-100"
+        class="mn-b-small p-semi w-100"
         v-html="spot.address"
       />
 

package/src/modules/wallet/views/components/pages/Wallet.vue

@@ -3,7 +3,7 @@
     <section class="bg-black t-white mn-b-thin radius-big pd-big">
       <h1 class="mn-b-medium">{{ t('wallet.title') }}</h1>
 
-      <p class="mn-b-semi t-transp p-big">
+      <p class="mn-b-semi t-transp p-semi">
         {{ t('wallet.subtitle') }}
       </p>
 
@@ -35,7 +35,7 @@
       >
         <p class="t-transp t-medium mn-b-thin">You own:</p>
         <p class="h1 mn-b-small">{{state.share}}%</p>
-        <p class="t-white p-big t-medium mn-b-semi">of all shares</p>
+        <p class="t-white p-semi t-medium mn-b-semi">of all shares</p>
 
           <div
             class="flex-v-center mn-b-small flex-nowrap flex pd-small bg-black-transp-5 radius-extra"

package/src/styles/base/all.scss

@@ -211,7 +211,12 @@ body {
 		> *:only-child {
 	    grid-column: 1 / -1;
 		}
-	}  
+	} 
+	.cols-auto-1fr {
+		display: grid;
+	  grid-template-columns: auto 1fr;
+		align-items: stretch;
+	} 
 	.cols-2-fit-content {display: grid; grid-template-columns: fit-content(100%) 1fr; }  
 	.cols-3 {display: grid; grid-template-columns: 1fr 1fr 1fr; } 
 	.cols-4 {display: grid; grid-template-columns: 1fr 1fr 1fr 1fr; }  	
@@ -254,6 +259,10 @@ body {
 	// Rows
 	.rows-1 {display: grid; grid-template-rows: auto 1fr; }
 	.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;}
 	// REFACTOR THIS SHIT
 	.grid {
 	  display: grid;