@ozdao/martyrs 0.2.510 → 0.2.511

package/src/modules/globals/views/components/sections/Filters.vue

@@ -19,9 +19,9 @@
       class="pd-small radius-medium bg-light cursor-pointer flex-v-center flex gap-micro"
       :class="{ 'selected bg-main': isFilterActive(filter) }"
     >
-      <IconCalendar v-if="filter.type === 'date'" class="i-medium" />
-      <span class="t-nowrap h-1r">{{ filter.title }}</span>
-      <span v-if="getFilterValue(filter)" class="mn-l-micro">
+      <IconCalendar v-if="filter.type === 'date'" class="mn-r-micro i-medium" />
+      <span class="t-nowrap">{{ filter.type === 'date' && getFilterValue(filter) ? formatFilterValue(filter) : filter.title }}</span>
+      <span v-if="getFilterValue(filter) && filter.type !== 'date'" class="mn-l-micro">
         {{ formatFilterValue(filter) }}
       </span>
     </button>
@@ -100,7 +100,7 @@
               v-model:date="tempSelected[filter.value]"
               :allowRange="true"
               :disablePastDates="true"
-              class="bg-light  radius-small"
+              class="bg-light radius-small"
             />
           </div>
         </div>
@@ -180,13 +180,6 @@
 
       <!-- Date Filter -->
       <div v-else-if="filter.type === 'date'">
-        <div 
-          @click="() => { tempDateRange = tempSelected[filter.value]; tempSelected[filter.value] = tempSelected[filter.value] || null; }"
-          class="pd-small radius-small bg-light cursor-pointer flex-v-center flex gap-micro"
-        >
-          <IconCalendar class="i-small" />
-          <span>{{ tempSelected[filter.value] ? `${formatDate(tempSelected[filter.value].start, { dayMonth: true, language: 'en' })} - ${formatDate(tempSelected[filter.value].end, { dayMonth: true, language: 'en' })}` : 'Select dates'}}</span>
-        </div>
         <div class="mn-t-small">
           <Calendar
             v-model:date="tempSelected[filter.value]"
@@ -198,19 +191,20 @@
       </div>
 
       <div class="flex gap-thin mn-t-medium">
-        <button 
+         <button 
           @click="cancelFilter(filter.value)" 
-          class="w-100 button bg-light"
+          class="bg-light button flex-child-full"
         >
           Cancel
         </button>
-        <button 
+         <button 
           @click="applyFilter(filter.value)" 
-          class="w-100 button bg-main"
+          class="bg-main w-100 button flex-child-full"
         >
           Apply
         </button>
-        
+       
+       
       </div>
     </Popup>
   </div>
@@ -307,7 +301,22 @@ const isFilterActive = (filter) => {
 }
 
 const getFilterValue = (filter) => {
-  return selected.value[filter.value]
+  const value = selected.value[filter.value]
+  if (!value) return false
+  
+  if (filter.type === 'range') {
+    return value.min || value.max
+  }
+  
+  if (filter.type === 'date') {
+    return value && value.start && value.end
+  }
+  
+  if (Array.isArray(value)) {
+    return value.length > 0
+  }
+  
+  return value
 }
 
 const formatFilterValue = (filter) => {

package/src/modules/orders/models/application.model.js

@@ -25,6 +25,9 @@ export default db => {
       text: {
         type: String,
       },
+      data: {
+        type: Object,
+      },
       chat: {
         type: String,
       },

package/src/modules/products/components/pages/Products.vue

@@ -4,7 +4,7 @@
       v-if="route.name !== 'Organization' && !MOBILE_APP"
       class="pd-medium flex-v-center flex-nowrap flex"
     >
-      <h2 class="mn-r-medium">Products</h2>
+      <h2 class="mn-r-medium">{{ currentCategory ? currentCategory.name : 'All Products' }}</h2>
       <button 
         v-if="hasAccess(route.params._id, 'products', 'create', auth.state.accesses, auth.state.access.roles)"
         @click="$router.push({
@@ -157,6 +157,7 @@
             </div>
           </div>
         </div>
+
         <Feed
           :search="true"
           v-model:sort="products.state.sort"
@@ -175,7 +176,7 @@
             limit: 16,
             owner: route.name?.includes('Organization') ? route.params._id : null,
             search: route.query.search,
-            lookup: ['variants','rents'],
+            lookup: ['variants','rents','inventory'],
             categories: route.params.categoryPath ? `/${route.params.categoryPath}` : null,
             filters: processedFilters,
             priceMin: selectedFilters.price?.min,
@@ -230,22 +231,23 @@
         v-model:date="tempSelectedDates"
         :allowRange="true"
         :disablePastDates="true"
-        class="mn-b-medium bg-light"
+        class="mn-b-medium radius-small bg-light"
       />
       
       <div class="flex gap-small">
-        <button 
-          @click="applyDateFilter"
-          class="bg-main button flex-child-full"
-        >
-          Apply
-        </button>
-        <button 
+         <button 
           @click="showDatePickerPopup = false"
           class="bg-light button flex-child-full"
         >
           Cancel
         </button>
+        <button 
+          @click="applyDateFilter"
+          class="bg-main button w-100 flex-child-full"
+        >
+          Apply
+        </button>
+       
       </div>
     </Popup>
 </div>

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

@@ -119,30 +119,4 @@ export default  {
       }
     }]
   },
-  // Лукап для аренд продуктов (статичный без дат)
-  rents: {
-    lookup: {
-      from: 'rents',
-      localField: '_id',
-      foreignField: 'product',
-      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

@@ -36,21 +36,15 @@ const controllerFactory = db => {
               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, {
           fields: ['name', 'description']
         }),
-        ...queryProcessorGlobals.getFilterDate(req.query.dateStart, req.query.dateEnd, {
-          start: 'startDate',
-          end: 'endDate',
-        }),
         ...queryProcessorProducts.getCategoriesFilterStage(req.query.categories),
         ...queryProcessorProducts.getDeliveryFilterStage(req.query.delivery),
         ...queryProcessorProducts.getAttributeFiltersStage(req.query.filters),
+        
         ...queryProcessorGlobals.getLookupStages(requestedLookups, productLookupConfigs),
 
         ...queryProcessorProducts.getVariantPriceFilterStage(req.query.priceMin, req.query.priceMax),
@@ -72,9 +66,11 @@ const controllerFactory = db => {
         ...(requestedLookups.includes('inventory') ? [{ $project: { availability: 0 } }] : [])
       ].filter(Boolean);
       
+      
       // Выполнение агрегации
       const products = await Product.aggregate(stages);
       
+      
       // Возвращаем только количество, если запрошено
       if (req.query.count) {
         return res.status(200).json({ count: products.length });

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

@@ -181,6 +181,7 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
     return [];
   }
   
+  
   return [
     {
       $lookup: {
@@ -196,7 +197,7 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
               $expr: {
                 $and: [
                   { $eq: ['$product', '$$productId'] },
-                  { $in: ['$status', ['confirmed', 'active']] },
+                  { $in: ['$status', ['pending', 'confirmed', 'active']] },
                   {
                     $or: [
                       {
@@ -226,7 +227,7 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
           {
             $group: {
               _id: null,
-              totalRented: { $sum: { $ifNull: ['$quantity', 1] } }
+              totalRented: { $sum: { $ifNull: ['$available', 1] } }
             }
           }
         ],
@@ -243,18 +244,22 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
             { $ifNull: ['$available', 0] },
             { $ifNull: [{ $arrayElemAt: ['$rentInfo.totalRented', 0] }, 0] }
           ]
-        }
+        },
       }
     },
     {
       $match: {
-        availableQuantity: { $gt: 0 }
+        $or: [
+          { availableQuantity: { $gt: 0 } },
+          { $and: [{ rentedQuantity: 0 }, { $or: [{ available: { $gt: 0 } }, { available: { $exists: false } }] }] }
+        ]
       }
     },
     {
       $project: {
         rentInfo: 0,
-        rentedQuantity: 0
+        rentedQuantity: 0,
+        availableQuantity: 0
       }
     }
   ];

package/dist/martyrs/src/components/Loader/Loader.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Loader.vue2.cjs","sources":["../../../../../src/components/Loader/Loader.vue"],"sourcesContent":["<template>\n  <div class=\"circular-loader pos-relative z-index-1 w-100 h-100 w-max-2r h-max-2r h-min-1r w-min-1r\" :class=\"{ 'circular-loader-centered': centered }\">\n    <svg viewBox=\"25 25 50 50\">\n      <circle class=\"circular-loader-fill\" cx=\"50\" cy=\"50\" r=\"20\" fill=\"none\" stroke-width=\"4\" stroke-miterlimit=\"10\" />\n      <circle class=\"circular-loader-circle\" cx=\"50\" cy=\"50\" r=\"20\" fill=\"none\" stroke-width=\"4\" stroke-miterlimit=\"10\" />\n    </svg>\n    <div v-if=\"progress\" class=\"progress-text\">{{ progress }}</div>\n    <div v-if=\"status\" class=\"uppercase t-semi w-m-10r status-text\">{{ status }}</div>\n  </div>\n</template>\n\n<script>\nexport default {\n  props: {\n    progress: {\n      type: Number,\n      default: null,\n    },\n    status: {\n      type: String,\n      default: null,\n    },\n    centered: {\n      type: Boolean,\n      default: true, // По умолчанию лоадер центрирован (для обратной совместимости)\n    },\n  },\n};\n</script>\n\n<style>\n.circular-loader-centered {\n  top: calc(50% - 1rem);\n  left: calc(50% - 1rem);\n}\n\n.circular-loader svg {\n  animation: rotate 2s linear infinite;\n}\n\n.circular-loader-circle {\n  stroke-dasharray: 1, 200;\n  stroke-dashoffset: 0;\n  stroke-linecap: round;\n  stroke: rgb(var(--main));\n  animation: dash 1.5s ease-in-out infinite;\n}\n\n.circular-loader-fill {\n  stroke-linecap: round;\n  stroke: rgba(var(--black),0.2);\n}\n\n.progress-text {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  font-size: 0.8rem;\n  color: rgb(var(--main));;\n}\n\n.status-text {\n  position: absolute;\n  top: 120%;\n  left: calc(50% - 5rem);\n  font-size: 0.8rem;\n  width: 10rem !important;\n  text-align: center;\n}\n\n@keyframes rotate {\n  100% {\n    transform: rotate(360deg);\n  }\n}\n\n@keyframes dash {\n  0% {\n    stroke-dasharray: 1, 200;\n    stroke-dashoffset: 0;\n  }\n  50% {\n    stroke-dasharray: 89, 200;\n    stroke-dashoffset: -35;\n  }\n  100% {\n    stroke-dasharray: 1, 200;\n    stroke-dashoffset: -124;\n  }\n}\n</style>"],"names":["_createElementBlock","_normalizeClass","_createElementVNode","_toDisplayString","_createCommentVNode"],"mappings":";;;;;AAYA,MAAK,YAAU;AAAA,EACb,OAAO;AAAA,IACL,UAAU;AAAA,MACR,MAAM;AAAA,MACN,SAAS;AAAA;IAEX,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,SAAS;AAAA;IAEX,UAAU;AAAA,MACR,MAAM;AAAA,MACN,SAAS;AAAA;AAAA;;AAGf;;EA3BA,KAAA;AAAA,EAMyB,OAAM;;;EAN/B,KAAA;AAAA,EAOuB,OAAM;;;0BAN3BA,IAAAA,mBAOM,OAAA;AAAA,IAPD,OADPC,IAAAA,eAAA,CACa,0FAAwF,EAAA,4BAAuC,OAAA,UAAQ,CAAA;AAAA;8BAChJC,IAAAA,mBAGM,OAAA,EAHD,SAAQ,iBAAa;AAAA,MACxBA,IAAAA,mBAAkH,UAAA;AAAA,QAA1G,OAAM;AAAA,QAAuB,IAAG;AAAA,QAAK,IAAG;AAAA,QAAK,GAAE;AAAA,QAAK,MAAK;AAAA,QAAO,gBAAa;AAAA,QAAI,qBAAkB;AAAA;MAC3GA,IAAAA,mBAAoH,UAAA;AAAA,QAA5G,OAAM;AAAA,QAAyB,IAAG;AAAA,QAAK,IAAG;AAAA,QAAK,GAAE;AAAA,QAAK,MAAK;AAAA,QAAO,gBAAa;AAAA,QAAI,qBAAkB;AAAA;;IAEpG,OAAA,6BAAXF,IAAAA,mBAA+D,OAA/D,YAA+DG,IAAAA,gBAAjB,OAAA,QAAQ,GAAA,CAAA,KAN1DC,IAAAA,mBAAA,IAAA,IAAA;AAAA,IAOe,OAAA,2BAAXJ,IAAAA,mBAAkF,OAAlF,YAAkFG,IAAAA,gBAAf,OAAA,MAAM,GAAA,CAAA,KAP7EC,IAAAA,mBAAA,IAAA,IAAA;AAAA;;;;"}

package/dist/martyrs/src/components/Tab/Tab.vue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Tab.vue.js","sources":["../../../../../src/components/Tab/Tab.vue"],"sourcesContent":["<template>\n  <div class=\"flex-nowrap flex-v-center flex pos-relative\">\n    <button  \n      v-for=\"(tab, index) in tabs\" \n      :key=\"index\" \n      @click=\"handleTabClick(index, tab)\" \n      class=\"z-index-1 t-center cursor-pointer\"\n      :style=\"isSelected(index, tab) ? 'background: rgb(var(--main)) !important' : ''\"\n      :class=\"[\n        isSelected(index, tab) ? 'bg-main' : '',\n        replaceClasses('pd-small pd-r-medium pd-l-medium w-max pd-small radius-small', classTab)\n      ]\"\n    >\n      {{tab.name || tab.label}}\n    </button>\n  </div>\n</template>\n\n<script setup>\nimport { ref, computed, watch } from 'vue'\n\nconst emit = defineEmits(['update:selected', 'tab-click']);\n\nconst props = defineProps({\n  tabs: Array,\n  classTab: String,\n  selected: [String, Number],\n  modelValue: [String, Number],\n  callback: Function\n})\n\nconst selectedTab = ref(0)\n\n// Handle both v-model and selected prop for backward compatibility\nconst updateSelectedIndex = () => {\n  if (props.modelValue !== undefined) {\n    const selectedIndex = props.tabs.findIndex(tab => tab.value === props.modelValue)\n    if (selectedIndex !== -1) {\n      selectedTab.value = selectedIndex\n    }\n  } else if (props.selected !== undefined) {\n    const selectedIndex = props.tabs.findIndex(tab => tab.value === props.selected)\n    if (selectedIndex !== -1) {\n      selectedTab.value = selectedIndex\n    }\n  }\n}\n\n// Initial setup\nupdateSelectedIndex()\n\n// Watch for changes in selected or modelValue props\nwatch(() => props.selected, updateSelectedIndex)\nwatch(() => props.modelValue, updateSelectedIndex)\n\n// Check if tab is selected\nconst isSelected = (index, tab) => {\n  if (props.modelValue !== undefined) {\n    return tab.value === props.modelValue\n  } else if (props.selected !== undefined) {\n    return tab.value === props.selected\n  }\n  return index === selectedTab.value\n}\n\n// Handle tab click\nfunction handleTabClick(index, tab) {\n  selectedTab.value = index\n  \n  // Emit both events for flexibility\n  emit('update:selected', tab.value)\n  emit('tab-click', { index, tab })\n  \n  // For v-model support\n  if (props.modelValue !== undefined) {\n    emit('update:modelValue', tab.value)\n  }\n  \n  // Call callback if provided\n  if (props.callback) props.callback(tab)\n}\n</script>\n\n<style lang=\"scss\">\n.tab-selector {\n  position: absolute;\n  width: 50%;\n  height: 100%;\n  left: 0;\n  top: 0;\n  z-index: 0;\n  transition: left 0.3s cubic-bezier(0.4, 0, 0.2, 1);\n}\n</style>"],"names":[],"mappings":";;;;;;;;;;;;;;;AAqBA,UAAM,OAAO;AAEb,UAAM,QAAQ;AAQd,UAAM,cAAc,IAAI,CAAC;AAGzB,UAAM,sBAAsB,MAAM;AAChC,UAAI,MAAM,eAAe,QAAW;AAClC,cAAM,gBAAgB,MAAM,KAAK,UAAU,SAAO,IAAI,UAAU,MAAM,UAAU;AAChF,YAAI,kBAAkB,IAAI;AACxB,sBAAY,QAAQ;AAAA,QACtB;AAAA,MACF,WAAW,MAAM,aAAa,QAAW;AACvC,cAAM,gBAAgB,MAAM,KAAK,UAAU,SAAO,IAAI,UAAU,MAAM,QAAQ;AAC9E,YAAI,kBAAkB,IAAI;AACxB,sBAAY,QAAQ;AAAA,QACtB;AAAA,MACF;AAAA,IACF;AAGA,wBAAmB;AAGnB,UAAM,MAAM,MAAM,UAAU,mBAAmB;AAC/C,UAAM,MAAM,MAAM,YAAY,mBAAmB;AAGjD,UAAM,aAAa,CAAC,OAAO,QAAQ;AACjC,UAAI,MAAM,eAAe,QAAW;AAClC,eAAO,IAAI,UAAU,MAAM;AAAA,MAC7B,WAAW,MAAM,aAAa,QAAW;AACvC,eAAO,IAAI,UAAU,MAAM;AAAA,MAC7B;AACA,aAAO,UAAU,YAAY;AAAA,IAC/B;AAGA,aAAS,eAAe,OAAO,KAAK;AAClC,kBAAY,QAAQ;AAGpB,WAAK,mBAAmB,IAAI,KAAK;AACjC,WAAK,aAAa,EAAE,OAAO,IAAG,CAAE;AAGhC,UAAI,MAAM,eAAe,QAAW;AAClC,aAAK,qBAAqB,IAAI,KAAK;AAAA,MACrC;AAGA,UAAI,MAAM,SAAU,OAAM,SAAS,GAAG;AAAA,IACxC;;;;;;;;;;;;;;;;;;"}