@ozdao/martyrs 0.2.428 → 0.2.430

package/src/modules/orders/components/sections/FormDelivery.vue

@@ -1,60 +1,38 @@
 <template>
   <Block title="Delivery">
     <h5 class="font-second mn-b-thin">Select delivery type</h5>
-    <div class="mn-b-small flex-nowrap flex">
+    
+    <div class="mn-b-small flex-nowrap flex" v-if="availableDeliveryTypes.length">
       <Radio 
+        v-for="type in availableDeliveryTypes"
+        :key="type"
         v-model:radio="order.delivery.type"
-        label="Pickup"
-        value="pickup"
-        class="bg-white pd-medium radius-small w-100 mn-r-small"
-      />
-      <Radio 
-        v-model:radio="order.delivery.type"
-        label="Courier"
-        value="courier"
+        :label="capitalize(type)"
+        :value="type"
         class="bg-white pd-medium radius-small w-100 mn-r-small"
       />
     </div>
+    <div v-else>No delivery options available.</div>
 
     <!-- Раздел для Pickup -->
     <template v-if="order.delivery.type === 'pickup'">
       <h5 class="font-second mn-b-thin">Select pickup spot</h5>
-      <Feed
-        :states="{
-          empty: {
-            title: 'No Spots Found',
-            description: 'Currently, there are no spots available.'
-          }
-        }"
-        :store="{
-          read: (options) => spotsModule.actions.read(props.order.organization || route.params._id),
-          state: spotsModule.state
-        }"
-        :options="{
-            limit: 10
-        }"
-        v-slot="{ 
-          items 
-        }"
-        class=""
-      >
-        <CardSpot
-          v-for="(spot, index) in items"
-          :key="index"
-          :spot="spot"
-          :organization="order.organization"
-          :editAcess="false"
-          :showDeliveryOptions="false"
-          :showPaymentOptions="false"
-          :selected="order.delivery.spot === spot._id"
-          @click="() => order.delivery.spot = order.delivery.spot === spot._id ? null : spot._id"
-          class="mn-b-thin radius-medium o-hidden bg-white"
-        />
-      </Feed>
+      <CardSpot
+        v-for="(spot, index) in organization?.spots.filter(item => item.delivery?.includes('pickup'))"
+        :key="index"
+        :spot="spot"
+        :organization="order.organization"
+        :editAcess="false"
+        :showDeliveryOptions="false"
+        :showPaymentOptions="false"
+        :selected="order.delivery.spot === spot._id"
+        @click="() => order.delivery.spot = order.delivery.spot === spot._id ? null : spot._id"
+        class="mn-b-thin radius-medium o-hidden bg-white"
+      />
     </template>
 
     <!-- Раздел для Courier -->
-    <template v-else-if="order.delivery.type === 'courier'">
+    <template v-else-if="order.delivery.type === 'courier' || order.delivery.type === 'post'">
       <h5 class="font-second mn-b-thin">Address</h5>
       <Address
         label="Location"    
@@ -91,7 +69,7 @@
 </template>
 
 <script setup>
-import { watch, onMounted } from 'vue';
+import { watch, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 
 import Feed from '@martyrs/src/components/Feed/Feed.vue';
@@ -106,6 +84,7 @@ import Field from '@martyrs/src/components/Field/Field.vue';
 
 const props = defineProps({
   order: Object,
+  organization: Object,
 });
 
 const route = useRoute();
@@ -124,4 +103,17 @@ onMounted(() => {
     props.order.delivery.location = globals.state.position.location;
   }
 });
+
+const availableDeliveryTypes = computed(() => {
+  const types = new Set()
+  props.organization?.spots?.forEach(spot => {
+    spot.delivery?.forEach(type => types.add(type))
+  })
+  return Array.from(types)
+})
+
+function capitalize(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1)
+}
+
 </script>

package/src/modules/orders/components/sections/FormPayment.vue

@@ -3,12 +3,7 @@
     <div class="mn-b-small flex-nowrap flex">
       <Select 
         v-model:select="order.payment.type"
-        :property="'value'"
-        :options="[
-          {name: 'Cash',  value: 'cash'}, 
-          {name: 'Card', value: 'card'}, 
-          {name: 'Bank Transfer', value: 'bank'},
-        ]"
+        :options="availablePaymentTypes"
         placeholder="Select type of payment" 
         size="small"
         class="bg-white pd-medium radius-small w-100"
@@ -18,10 +13,25 @@
 </template>
 
 <script setup>
+
+import { computed } from 'vue';
+
 import Block from '@martyrs/src/components/Block/Block.vue'
 import Select from '@martyrs/src/components/Select/Select.vue'
 
-defineProps({
+const props = defineProps({
   order: Object,
+  organization: Object,
 });
+
+const availablePaymentTypes = computed(() => {
+  const types = new Set()
+  props.organization?.spots?.forEach(spot => {
+    spot.payment?.forEach(type => types.add(type))
+  })
+  return Array.from(types)
+})
+
+
+
 </script>

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

@@ -113,6 +113,7 @@ const controllerFactory = (db) => {
 
     // Start a database transaction
     const session = await db.mongoose.startSession();
+    
     session.startTransaction();
 
     try {
@@ -192,7 +193,7 @@ const controllerFactory = (db) => {
       await session.commitTransaction();
 
       // Send notification
-      await sendOrderMessage(orderData);
+      sendOrderMessage(orderData);
       
       // Return the created order
       res.status(201).send(createdOrder);
@@ -324,7 +325,17 @@ const controllerFactory = (db) => {
       // }
       
       // Save the order first
+      if (req.body.payment?.type && req.body.payment.type !== order.payment?.type) {
+        order.payment.type = req.body.payment.type;
+      }
+
+      // Update payment.status if changed
+      if (req.body.payment?.status && req.body.payment.status !== order.payment?.status) {
+        order.payment.status = req.body.payment.status;
+      }
+
       await order.save();
+
       
       // Send notification if status changed
       if (statusChanged) {

package/src/modules/orders/store/orders.js

@@ -94,6 +94,71 @@ const mutations = {
     }
   },
 
+
+  addProductToCart(state, product, organization, date) {
+    const cartItem = state.positions.find(
+      (item) => item._id === product._id
+    );
+
+    if (cartItem) {
+      cartItem.quantity++;
+    } else {
+      state.positions.push({
+        _id: product._id,
+        images: product.images,
+        name: product.name,
+        listing: product.listing,
+        price: product.price,
+        price_currency: product.price_currency,
+        quantity: 1,
+        date: date, 
+        org_id: organization, // Добавляем _id организации к каждому продукту
+      });
+    }
+  },
+
+
+  removeProduct(state, _id) {
+    const cartItem = state.positions.find(
+      (item) => item._id === _id
+    );
+    const cartItemIndex = state.positions.indexOf(cartItem);
+
+    if (cartItemIndex > -1) {
+      state.positions.splice(cartItemIndex, 1);
+      
+      // Сохраняем весь объект корзины, а не только позиции
+      localStorage.setItem('shopcart', JSON.stringify({
+        positions: state.positions,
+        organization: state.organization
+      }));
+    }
+  },
+
+
+  decrementItemQuantity(state, _id) {
+    const cartItem = state.positions.find(
+      (item) => item._id === _id
+    );
+    const cartItemIndex = state.positions.indexOf(cartItem);
+    
+    if (cartItemIndex > -1) {
+      cartItem.quantity--;
+    }
+  },
+
+
+  incrementItemQuantity(state, _id) {
+    const cartItem = state.positions.find(
+      (item) => item._id === _id
+    );
+
+    if (cartItem) {
+      cartItem.quantity++;
+    }
+  },
+
+
   resetCustomer(stateObject) {  
     Object.assign(stateObject, customerInitState);
   },  

package/src/modules/organizations/components/pages/Organization.vue

@@ -69,55 +69,57 @@
 				/>
 			</transition>
 
-			<Block
-				v-if="tabOrganization === 'products' && hasAccess(route.params._id, null, null, auth.state.accesses, auth.state.access.roles)"
-				class="o-scroll mn-b-small "
-			>
-			<div class="w-100 gap-thin flex flex-nowrap	 o-x-scroll">
-				<router-link 
-					class="bg-black t-nowrap t-white uppercase t-semi pd-thin radius-extra "
-					:to="{
-						name:'Organization_ProductAdd', 
-						params: {
-							_id: route.params._id
-						}
-					}"
-					>
-					Add Product
-				</router-link>
-
-				<router-link 
-					class=" uppercase t-nowrap t-semi  pd-thin radius-extra "
-					:to="{
-						name:'Leftovers', 
-						params: {
-							_id: route.params._id
-						}
-					}"
-					>
-					Change Invetory
-				</router-link>
-
-				
-				<router-link 
-					class="d-block t-nowrap  mn-l-auto uppercase t-semi bg-white pd-thin radius-extra "
-					:to="{
-						name:'Backoffice', 
-						params: {
-							_id: route.params._id
-						}
-					}"
-					>
-					Go to Backoffice
-				</router-link>
-			</div>
-			</Block>
+			
 
 			<transition name="slide-fade">
 				<Products 
 					v-if="tabOrganization === 'products'"
 					:organization="organization.state.current"
-				/>
+				>
+					<Block
+						v-if="hasAccess(route.params._id, null, null, auth.state.accesses, auth.state.access.roles)"
+						class="o-y-scroll w-100 pos-relative mn-b-small"
+					>
+						<div class="w-100 gap-thin flex flex-nowrap	 o-x-scroll">
+							<router-link 
+								class="bg-black t-nowrap t-white uppercase t-semi pd-thin radius-extra "
+								:to="{
+									name:'Organization_ProductAdd', 
+									params: {
+										_id: route.params._id
+									}
+								}"
+								>
+								Add Product
+							</router-link>
+
+							<router-link 
+								class=" uppercase t-nowrap t-semi  pd-thin radius-extra "
+								:to="{
+									name:'Leftovers', 
+									params: {
+										_id: route.params._id
+									}
+								}"
+								>
+								Change Invetory
+							</router-link>
+
+							
+							<router-link 
+								class="d-block t-nowrap  mn-l-auto uppercase t-semi bg-white pd-thin radius-extra "
+								:to="{
+									name:'Backoffice', 
+									params: {
+										_id: route.params._id
+									}
+								}"
+								>
+								Go to Backoffice
+							</router-link>
+						</div>
+					</Block>
+				</Products>
 
 			</transition>
 
@@ -131,13 +133,12 @@
 			        }
 			      }"
 			      :store="{
-			        read: (options) => spots.actions.read(route.params._id),
+			        read: (options) => spots.actions.read(options),
 			        state: organization.state
 			      }"
 			      :options="{
 			        	user: auth.state.user._id,
-								sort: 'numberOfMemberships',
-								contain: ['blogposts'],
+								organization: route.params._id,
 								limit: 10
 			      }"
 			      v-slot="{ 

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

@@ -1,5 +1,7 @@
 const jwt = require("jsonwebtoken");
 
+const Cache = require('@martyrs/src/modules/globals/controllers/classes/globals.cache');
+
 const queryProcessorGlobals = require('@martyrs/src/modules/globals/controllers/utils/queryProcessor');
 
 const {
@@ -23,25 +25,33 @@ const controllerFactory = (db) => {
   const Department = db.department;
   const Membership = db.membership;
 
-  const read = async (req, res) => {
+  // Создаем экземпляр вашего кэша с TTL 5 минут (по умолчанию)
+  const cache = new Cache({ ttlSeconds: 60 * 5 });
 
-    console.log('controler query', req.query)
+  const read = async (req, res) => {
+    console.log('controller query', req.query);
 
     try {
+      const cacheKey = JSON.stringify(req.query); // Ключ кэша на основе запроса
+
+      // Проверяем, есть ли данные в кэше
+      let cachedResult = await cache.get(cacheKey);
+      if (cachedResult) {
+        // Если данные в кэше есть, возвращаем их
+        return res.status(200).send(cachedResult);
+      }
+
       const requestedLookups = getRequestedLookups(req.query);
       const matchConditions = getBasicMatchConditions(req.query);
 
       const stages = [
         ...getLookupStages(requestedLookups, lookupConfigs),
-      
         ...getPostableConditions(req.query.postable),
         ...getContainConditions(req.query.contain),
-      
         ...queryProcessorGlobals.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('spots') ? (await getLocationStages(req.query)).stages : []),
         ...(requestedLookups.includes('memberships') ? [
@@ -56,50 +66,17 @@ const controllerFactory = (db) => {
       console.log(JSON.stringify(stages, null, 2));
 
       const organizations = await Organization.aggregate(stages);
-      res.status(200).send(organizations);
-    } catch (err) {
-      console.error(err);
-      res.status(500).send({ message: err.message });
-    }
-  };
 
-  const fetch = async (req, res) => {
-    const Organization = db.organization;
-    
-    let query = {};
-
-    console.log(req.query)
-
-    // Fetch by website
-    if (req.query._id) {
-      query['_id'] = req.query._id;
-    }
-
-    if (req.query.owner) {
-      query['owner'] = req.query.owner;
-    }
-
-    // Fetch by type
-    if (req.query.type) {
-      query.types = req.query.type;
-    }
-
-    // Pagination options
-    let options = {};
-    options.skip = parseInt(req.query.skip) || 0;
-    options.limit = parseInt(req.query.limit) || 10;
-
-    try {
-      const organizations = await Organization.find(query, null, options);
-      
-      if (!organizations || organizations.length === 0) {
-        return res.status(404).send({ message: "Organizations not found." });
+      // Кэшируем результат с тегами для каждой организации
+      for (const org of organizations) {
+        const orgTag = `organization_${org._id}`; // Уникальный тег для каждой организации
+        await cache.setWithTags(cacheKey, organizations, [orgTag, 'organizations']); // Добавляем оба тега
       }
 
-      // Send fetched organizations
       res.status(200).send(organizations);
-    } catch(err) {
-      return res.status(500).send({ message: err });
+    } catch (err) {
+      console.error(err);
+      res.status(500).send({ message: err.message });
     }
   };
 
@@ -122,6 +99,14 @@ const controllerFactory = (db) => {
       
       const savedMembership = await membership.save();
 
+      // Очищаем кэш для этой организации
+      const orgTag = `organization_${savedOrganization._id}`;
+      await cache.delByTag(orgTag);
+
+      // Обновляем кэш, добавляя новую организацию
+      const newCacheKey = JSON.stringify({ _id: savedOrganization._id }); // Ключ для новой записи
+      await cache.setWithTags(newCacheKey, [savedOrganization], [orgTag, 'organizations']);
+
       res.status(201).json(savedOrganization);
     } catch (error) {
       console.error('Error:', error);
@@ -144,6 +129,14 @@ const controllerFactory = (db) => {
         return res.status(404).json({ message: 'Organization not found' });
       }
 
+      // Очищаем кэш для этой организации
+      const orgTag = `organization_${organizationId}`;
+      await cache.delByTag(orgTag);
+
+      // Обновляем кэш новой версией организации
+      const updateCacheKey = JSON.stringify({ _id: organizationId }); // Ключ для обновленной записи
+      await cache.setWithTags(updateCacheKey, [organization], [orgTag, 'organizations']);
+
       res.status(200).json({ message: 'Organization updated successfully', organization });
     } catch (error) {
       res.status(500).json({ error: error.message });
@@ -167,6 +160,10 @@ const controllerFactory = (db) => {
               expiresIn: 86400 // 24 hours
             });
 
+            // Очищаем кэш для этой организации
+            const orgTag = `organization_${req.params._id}`;
+            cache.delByTag(orgTag);
+
             res.send({ newToken });
           })
           .catch(err => {
@@ -181,6 +178,14 @@ const controllerFactory = (db) => {
   const checkAccesses = async (req, res) => {
     try {
       const uid = new db.mongoose.Types.ObjectId(req.userId);
+      const cacheKey = `accesses_${uid.toString()}`; // Уникальный ключ для кэша на основе userId
+
+      // Проверяем, есть ли данные в кэше
+      const cachedResult = await cache.get(cacheKey);
+      if (cachedResult) {
+        return res.status(200).json(cachedResult);
+      }
+
       const depts = await Department.find({ 'members.user': uid });
       const ownedOrgs = await Organization.find({ owner: uid });
       const ownedOrgIds = ownedOrgs.map(org => org._id.toString());
@@ -200,8 +205,8 @@ const controllerFactory = (db) => {
             rights[key] = {};
           }
           const accessRights = accessData[key];
-          Object.keys(accessRights).forEach(right => {
-            rights[key][right] = isOwner || rights[key][right] || accessRights[right];
+          Object.entries(accessRights).forEach(([right, value]) => {
+            rights[key][right] = isOwner || rights[key][right] || value;
           });
         });
       };
@@ -239,6 +244,11 @@ const controllerFactory = (db) => {
       });
 
       const accessArray = Object.values(accesses);
+
+      // Кэшируем результат с тегами: уникальный тег для пользователя и общий тег для всех доступов
+      const userTag = `access_${uid.toString()}`; // Тег для конкретного пользователя
+      await cache.setWithTags(cacheKey, accessArray, [userTag, 'accesses']);
+
       res.status(200).json(accessArray);
     } catch (err) {
       console.error('Error getting accesses:', err);

package/src/modules/organizations/store/organizations.js

@@ -141,13 +141,13 @@ const actions = {
   }
 }
 
-const history = []
-history.push(state) 
+// const history = []
+// history.push(state) 
 
-// // Watch
-watch(state, (newState, oldState) => {
-  history.push(newState)
-})
+// // // Watch
+// watch(state, (newState, oldState) => {
+//   history.push(newState)
+// })
 
 // Module Export
 export {

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

@@ -48,11 +48,12 @@
   </div>
 
     <div class="z-index-3 bg-white radius-tl-big radius-tr-big">
-      <div class="pd-thin z-index-3 radius-tl-big radius-tr-big">
+      <slot></slot>
+      <div class="  z-index-3 radius-tl-big radius-tr-big">
         <BlockSearch 
           @search="updateSearch"
           placeholder="Enter product name"
-          class="bg-light h-4r"
+          class="bg-light mn-b-thin h-4r"
         />
       </div>
       <Feed
@@ -82,7 +83,7 @@
         v-slot="{ 
           items 
         }"
-        class="cols-4 rows-1 pd-t-zero pd-thin gap-thin mn-b-thin"
+        class="cols-4 rows-1 gap-thin"
        
       >
         <router-link  

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

@@ -10,7 +10,7 @@
       class="aspect-1x1 h-100 w-auto"
     />
 
-    <div class="pd-medium w-100">
+    <div class="pd-small w-100">
 
         <!-- v-if="user === event.creator.target._id" -->
       <IconEdit
@@ -31,12 +31,13 @@
         class="z-index-2 pos-absolute pos-t-regular pos-r-regular radius-extra bg-second pd-thin i-semi"
       />
    
-    
-      <p 
-        class="pd-thin bg-light radius-small mn-b-thin p-small w-max"
-      >
-        {{spot.address}}
-      </p>
+      <div class="bg-light radius-small pd-thin mn-b-thin radius-small">
+        <p 
+          class=" p-small w-100 t-truncate"
+        >
+          {{spot.address}}
+        </p>
+      </div>
 
       <h3 
         class="mn-b-thin w-100"