@ozdao/martyrs 0.2.429 → 0.2.431

package/src/modules/notifications/services/websocket.service.js

@@ -1,61 +1,44 @@
 // services/websocket.service.js
-class WebSocketService {
-  constructor() {
-    this.connections = new Map();
-    this.wss = null;
-  }
-
-  initialize(wss) {
-    this.wss = wss;
+const WebSocketService = (wss) => {
+  const connections = new Map();
+  
+  // Добавление соединения
+  const addConnection = (userId, ws) => {
+    if (!connections.has(userId)) {
+      connections.set(userId, new Set());
+    }
+    connections.get(userId).add(ws);
     
-    // Setup connection handler for notifications
-    this.wss.on('connection', (ws, req) => {
-      // If the user ID is available from authentication
-      if (req.userId) {
-        // Mark this connection as a notification connection
-        ws.type = 'notification';
-        this.addConnection(req.userId, ws);
-        
-        ws.on('close', () => {
-          this.removeConnection(req.userId, ws);
-        });
-      }
+    // Отслеживаем закрытие соединения
+    ws.on('close', () => {
+      removeConnection(userId, ws);
     });
-  }
-
-  // Store a new connection
-  addConnection(userId, ws) {
-    if (!this.connections.has(userId)) {
-      this.connections.set(userId, new Set());
-    }
-    this.connections.get(userId).add(ws);
-  }
+  };
   
-  // Remove a connection
-  removeConnection(userId, ws) {
-    if (this.connections.has(userId)) {
-      this.connections.get(userId).delete(ws);
-      if (this.connections.get(userId).size === 0) {
-        this.connections.delete(userId);
+  // Удаление соединения
+  const removeConnection = (userId, ws) => {
+    if (connections.has(userId)) {
+      connections.get(userId).delete(ws);
+      if (connections.get(userId).size === 0) {
+        connections.delete(userId);
       }
     }
-  }
+  };
   
-  // Send message to a specific user
-  sendToUser(userId, data) {
+  // Отправка сообщения конкретному пользователю
+  const sendToUser = (userId, data) => {
     return new Promise((resolve) => {
       try {
-        if (!this.connections.has(userId)) {
-          // User not connected
+        if (!connections.has(userId)) {
+          // Пользователь не подключен
           return resolve({ delivered: false, reason: 'user-not-connected' });
         }
         
-        const userSockets = this.connections.get(userId);
+        const userSockets = connections.get(userId);
         let delivered = 0;
         
         userSockets.forEach((ws) => {
-          // Only send to notification-type connections
-          if (ws.type === 'notification' && ws.readyState === 1) { // 1 = OPEN
+          if (ws.readyState === 1) { // 1 = OPEN
             ws.send(JSON.stringify({
               type: 'notification',
               data
@@ -63,23 +46,24 @@ class WebSocketService {
             delivered++;
           }
         });
+
+        console.log(userSockets)
         
         resolve({ delivered: delivered > 0, connections: delivered });
       } catch (error) {
-        console.error('Error sending notification:', error);
+        console.error('Ошибка отправки уведомления:', error);
         resolve({ delivered: false, reason: 'error', error: error.message });
       }
     });
-  }
+  };
   
-  // Broadcast to all connected clients
-  broadcast(data) {
+  // Рассылка всем подключенным клиентам
+  const broadcast = (data) => {
     return new Promise((resolve) => {
       let count = 0;
       
-      this.wss.clients.forEach((ws) => {
-        // Only send to notification-type connections
-        if (ws.type === 'notification' && ws.readyState === 1) { // 1 = OPEN
+      wss.clients.forEach((ws) => {
+        if (ws.readyState === 1) { // 1 = OPEN
           try {
             ws.send(JSON.stringify({
               type: 'notification',
@@ -87,16 +71,30 @@ class WebSocketService {
             }));
             count++;
           } catch (e) {
-            console.error('Error broadcasting to client:', e);
+            console.error('Ошибка рассылки клиенту:', e);
           }
         }
       });
       
       resolve({ delivered: count > 0, connections: count });
     });
-  }
-}
+  };
+  
+  // Настраиваем обработчик подключений для нашего сервиса
+  wss.on('connection', (ws, req) => {
+    // Если у соединения есть userId (аутентифицированный пользователь)
+    if (req.userId) {
+      // Просто добавляем соединение в наш трекер
+      addConnection(req.userId, ws);
+    }
+  });
+  
+  return {
+    addConnection,
+    removeConnection,
+    sendToUser,
+    broadcast
+  };
+};
 
-// Singleton instance
-const webSocketService = new WebSocketService();
-module.exports = webSocketService;
+module.exports = WebSocketService;

package/src/modules/orders/components/blocks/CardOrderBackoffice.vue

@@ -0,0 +1,106 @@
+<template>
+  <div class="bg-light pos-relative pd-medium radius-medium">
+    <CardHeader 
+      :entity="order"
+      :entityType="'order'"
+      :user="user"
+      :owner="order.creator" 
+      :creator="order.creator"
+      :date="order.createdAt"
+      class="mn-b-small"
+    />
+
+    <div class="mn-b-small pd-small bg-white radius-small flex-nowrap flex"> 
+      <div class="w-100">
+        <p class="t-truncate">{{order.delivery.address || 'Not specified'}}</p> 
+      </div>
+
+      <div class="w-100 t-right">
+        <h3 class="mn-b-thin">{{currency}}{{getTotal(order.positions)}}</h3>
+        <p>#{{order._id.slice(0, 4) + '...' + order._id.slice(-4)}}</p> 
+      </div>
+    </div>
+ 
+    <div class="cols-1 pos-relative mn-b-small gap-thin pd-small bg-white radius-small">
+		  <!-- Всегда отображаем первые две позиции -->
+		  <template v-for="(position, index) in order.positions">
+		  	<transition name="moveFromTop">
+			    <div 
+			      v-if="index < 2 || (spoiler && index >= 2)" 
+			      :key="index" 
+			      class="w-100 flex"
+			    >
+			      <p class="mn-r-auto">{{ position.name }}</p>
+			      <p class="t-right">
+			        {{ position.quantity }} {{ position.type }}
+			        x
+			        <span class="t-transp">{{ currency }} {{ position.price }}</span>
+			      </p>
+			    </div>
+	      </transition>
+		  </template>
+		
+		  <!-- Кнопка переключения для дополнительных позиций, видна только если есть больше двух позиций -->
+		  <button
+		    v-if="order.positions.length > 2"
+		    @click.prevent="spoiler = !spoiler"
+		    class="cursor-pointer radius-big bg-light-transp-50 pd-nano w-100 flex-center flex"
+		  >
+		    {{ !spoiler ? `+${order.positions.length - 2} more` : `Hide` }}
+		  </button>
+		</div>
+
+    <div class="pd-small bg-white radius-small gap-micro flex-v-center flex-nowrap flex"> 
+      <IconTime class="i-semi t-transp" fill="rgb(var(--black)" />
+      <p class="t-medium mn-r-auto">{{formatDate(order.deadline)}}</p>
+
+      <span 
+        class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin bg-main"
+      >
+        {{order.status}}
+      </span>
+
+      <span 
+        class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin t-white bg-red"
+      >
+        {{order.payment.status || 'Not defined'}}
+      </span>
+    </div>
+
+    <div v-if="order.comment" class="pos-relative radius-small bg-fifth-transp-10 mn-t-thin pd-small">
+      <p class="mn-b-thin t-transp uppercase p-small t-medium">Comment</p>
+      <p>{{order.comment}}</p>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import CardHeader from '@martyrs/src/modules/globals/views/components/blocks/CardHeader.vue';
+import IconTime from '@martyrs/src/modules/icons/entities/IconTime.vue';
+
+const props = defineProps({
+  order: {
+    type: Object,
+    required: true
+  },
+  user: {
+    type: Object,
+    required: true
+  },
+  formatDate: {
+    type: Function,
+    required: true
+  },
+  getTotal: {
+    type: Function,
+    required: true
+  },
+  currency: {
+    type: String,
+    default: ''
+  }
+});
+
+const spoiler = ref(false);
+</script>

package/src/modules/orders/components/blocks/CardOrderUser.vue

@@ -148,17 +148,24 @@ const statusText = computed(() => {
     case 'canceled':
       return `Canceled, ${updatedDate}`;
     default:
-      // Расчет задержки
-      if (props.positions?.length) {
-        const lastEndDate = new Date(props.positions[props.positions.length - 1].date.end);
+    // Расчет задержки
+    if (props.positions?.length) {
+      const lastPosition = props.positions[props.positions.length - 1];
+      const lastEndDateRaw = lastPosition?.date?.end;
+
+      if (lastEndDateRaw) {
+        const lastEndDate = new Date(lastEndDateRaw);
         const now = new Date();
-        const diffTime = Math.abs(now - lastEndDate);
+        const diffTime = Math.abs(now.getTime() - lastEndDate.getTime());
         const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+
         if (diffDays > 0 && props.status !== 'finished' && props.status !== 'canceled') {
           return `Delay ${diffDays} day${diffDays > 1 ? 's' : ''}`;
         }
       }
-      return `Created, ${createdDate}`;
+    }
+    return `Created, ${createdDate}`;
+
   }
 });
 
@@ -192,16 +199,16 @@ threeDaysFromNow.setDate(today.getDate() + 3);
 // Показывать ли уведомление о возврате
 const showReturnNotice = computed(() => {
   return props.positions.some(position => {
-    const endDate = getDateWithoutTime(position.date.end);
-    return endDate <= threeDaysFromNow;
+    const endDate = position?.date?.end ? getDateWithoutTime(position.date.end) : null;
+    return endDate !== null && endDate <= threeDaysFromNow;
   });
 });
 
 // Есть ли просроченные позиции
 const hasOverdue = computed(() => {
   return props.positions.some(position => {
-    const endDate = getDateWithoutTime(position.date.end);
-    return endDate < today;
+    const endDate = position?.date?.end ? getDateWithoutTime(position.date.end) : null;
+    return endDate !== null && endDate < today;
   });
 });
 

package/src/modules/orders/components/pages/OrderCreate.vue

@@ -260,14 +260,14 @@ async function handleCreate() {
   let order = await orders.actions.create(orders.state.current);
 
   if (order) {
-  	shopcart.actions.resetShopcart()
-
-  	router.push({
+  	await router.push({
   		name: 'Order',
   		params: {
   			order: order._id
   		}
   	})
+  		
+  	shopcart.actions.resetShopcart()
   } else {
   	alert('something wrong')
   }

package/src/modules/orders/components/pages/OrderCreateBackoffice.vue

@@ -53,7 +53,7 @@
             state: null
           }"
           :options="{
-            organization: route.params._id
+            owner: route.params._id
           }"
           v-slot="{ 
             items 
@@ -165,12 +165,14 @@
 
     <FormDelivery  
       v-if="tabOrderCreate === 'delivery'" 
-      :order="orders.state.current"  
+      :order="orders.state.current"
+      :organization="orderOrganization[0]" 
     />
 
     <FormPayment  
       v-if="tabOrderCreate === 'payment'"
       :order="orders.state.current"  
+      :organization="orderOrganization[0]" 
     />
 
     <Popup 
@@ -223,6 +225,7 @@
   import * as globals from '@martyrs/src/modules/globals/views/store/globals';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth';
   import * as orders from '@martyrs/src/modules/orders/store/orders';
+  import * as organizations from '@martyrs/src/modules/organizations/store/organizations';
   import * as products from '@martyrs/src/modules/products/store/products';
 
   import customers from '@martyrs/src/modules/orders/store/customers.store';
@@ -296,7 +299,16 @@
     })
   }
 
-  onMounted(() => {
+  const orderOrganization = ref({})
+
+
+
+  onMounted(async() => {
+
+    orderOrganization.value = await organizations.actions.read({
+      _id: route.params._id,
+      lookup: ['spots']
+    })
 
     // await orders.actions.fetchOrder(route.params.id) // Implement this action in your store
 

package/src/modules/orders/components/pages/Orders.vue

@@ -4,8 +4,9 @@
       v-if="!MOBILE_APP"
       title="Orders"
       :actions="[
-        ...(route.meta.context !== 'user' ? [{ to: { name: 'BackofficeAdminCreateOrder'}, label: 'Create Order' }] : [])
-      ]"
+        route.meta.context === 'backoffice' && { to: { name: 'BackofficeAdminCreateOrder' }, label: 'Create Order' },
+        route.meta.context === 'organization' && { to: { name: 'OrganizationAdminCreateOrder', params: { _id: route.params._id}}, label: 'Create Order' }
+      ].filter(Boolean)"
       class="mn-b-small"
     />
 
@@ -44,7 +45,7 @@
       }"
       :options="{
         limit: 15,
-        ...(route.meta.context === 'organization' && { organization: route.params._id }),
+        ...(route.meta.context === 'organization' && { owner: route.params._id }),
         ...(route.meta.context === 'user' && { customer: route.params._id }),
         ...(tab !== 'all' && { status: tab })
       }"
@@ -62,98 +63,14 @@
             ? { order: order._id } 
             : { order: order._id, organization: order.owner.target || order.owner._id  }
         }" 
-        class="bg-light pos-relative pd-medium radius-big"
       >
-        <CardHeader 
-          :entity="order"
-          :entityType="'order'"
+        <CardOrderBackoffice 
+          :order="order"
           :user="auth.state.user"
-          :owner="order.creator" 
-          :creator="order.creator"
-          :date="order.createdAt"
-          class="mn-b-small"
+          :formatDate="formatDate"
+          :getTotal="orders.getters.getTotal"
+          :currency="returnCurrency()"
         />
-
-        <div class="mn-b-small pd-small bg-white radius-small flex-nowrap flex"> 
-          <div class="w-100">
-            <!-- <h3 class="mn-b-thin">{{order.customer.target.profile?.name || order.customer.target.phone || order.customer.target.email || 'No name'}}</h3> -->
-            <p class="t-truncate">{{order.delivery.address || 'Not specified'}}</p> 
-          </div>
-
-          <div class=" w-100 t-right">
-            <h3 class="mn-b-thin">{{returnCurrency()}}{{orders.getters.getTotal(order.positions)}}</h3>
-            <p>#{{order._id.slice(0, 4) + '...' + order._id.slice(-4)}}</p> 
-          </div>
-        </div>
-     
-        <div class="cols-1 mn-b-small gap-thin pd-small bg-white radius-small">
-          <!-- Always display the first two positions -->
-          <div
-            v-for="(position, index) in order.positions.slice(0, 2)"
-            :key="index"
-            class="w-100 flex"
-          >
-            <p class="mn-r-auto">{{ position.name }}</p>
-            <p class="t-right">
-              {{ position.quantity }} {{ position.type }}
-              x
-              {{ position.price }}
-              <span class="t-transp">{{ returnCurrency() }}</span>
-            </p>
-          </div>
-
-          <transition name="fade">
-            <!-- Display the rest of the positions if there are more than two and spoiler is true -->
-            <div v-if="spoiler && order.positions.length > 2">
-              <div
-                v-for="(position, index) in order.positions.slice(2)"
-                :key="index + 2"
-                class="w-100 flex"
-              >
-                <p class="mn-r-auto">{{ position.name }}</p>
-                <p class="t-right">
-                  {{ position.quantity }} {{ position.type }}
-                  x
-                  {{ position.price }}
-                  <span class="t-transp">{{ returnCurrency() }}</span>
-                </p>
-              </div>
-            </div>
-          </transition>
-
-          <!-- Toggle button for additional positions, visible only if there are more than two positions -->
-          <button
-            v-if="order.positions.length > 2"
-            @click.prevent="spoiler = !spoiler"
-            class="radius-big bg-light-transp-50 pd-nano w-100 flex-center flex"
-          >
-            {{ !spoiler ? `+${order.positions.length - 2} more` : `Hide` }} 
-          </button>
-        </div>
-
-
-        <div class="pd-small bg-white radius-small gap-micro flex-v-center flex-nowrap flex"> 
-          <IconTime class="i-semi t-transp" fill="rgb(var(--black)" />
-          <p class="t-medium mn-r-auto">{{formatDate(order.deadline)}}</p>
-
-          <span 
-            class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin bg-main"
-          >
-            {{order.status}}
-          </span>
-
-          <span 
-            class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin t-white bg-red"
-          >
-            Unpaid
-          </span>
-        </div>
-      
-
-        <div v-if="order.comment" class="pos-relative radius-small bg-fifth-transp-10 mn-t-thin pd-small">
-          <p class="mn-b-thin t-transp uppercase p-small t-medium">Comment</p>
-          <p>{{order.comment}}</p>
-        </div>
       </router-link>
 
       <router-link 
@@ -192,7 +109,7 @@
   import CardOrder from '@martyrs/src/modules/orders/components/blocks/CardOrder.vue'
 
   import CardOrderUser from '@martyrs/src/modules/orders/components/blocks/CardOrderUser.vue'
-  import CardHeader  from '@martyrs/src/modules/globals/views/components/blocks/CardHeader.vue'
+  import CardOrderBackoffice from '@martyrs/src/modules/orders/components/blocks/CardOrderBackoffice.vue'
 
   import SectionPageTitle from '@martyrs/src/modules/globals/views/components/sections/SectionPageTitle.vue'
 

package/src/modules/orders/components/partials/ShopCart.vue

@@ -3,7 +3,7 @@
     <!-- ---------------------------------------------------------------- -->
     <!-- 01. Popup Header  -->
     <!-- ---------------------------------------------------------------- -->
-    <div class="mn-t-medium flex-nowrap flex">
+    <div class="flex-nowrap flex">
       <div class="mn-b-medium w-100">
         <h4 class="mn-b-thin p-big">{{t('title')}}</h4>
         <p class="t-transp p-small">{{t('subtitle')}} {{ t('positions', { count: StoreCartAmount }) }}</p>
@@ -13,7 +13,7 @@
     <!-- ---------------------------------------------------------------- -->
     <!-- 02. Popup Content  -->
     <!-- ---------------------------------------------------------------- -->
-    <div class="rows-1 gap-small mn-b-big shopcart-content">
+    <div class="h-100 flex flex-column w-100 pos-relative o-x-hidden o-y-scroll gap-small shopcart-content">
       <!-- Empty State -->
       <p v-if="!(shopcart.state.positions.length > 0)" class="mn-t-medium"><i>{{t('emptystate')}}</i></p>
       <!-- Shopcart positions -->

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 {
@@ -125,7 +126,6 @@ const controllerFactory = (db) => {
         }
       }
 
-
       console.log(orderData)
 
       // Create the order first
@@ -192,7 +192,7 @@ const controllerFactory = (db) => {
       await session.commitTransaction();
 
       // Send notification
-      await sendOrderMessage(orderData);
+      // sendOrderMessage(orderData);
       
       // Return the created order
       res.status(201).send(createdOrder);

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-small "
+								:to="{
+									name:'Organization_ProductAdd', 
+									params: {
+										_id: route.params._id
+									}
+								}"
+								>
+								Add Product
+							</router-link>
+
+							<router-link 
+								class=" uppercase t-nowrap t-semi  pd-thin"
+								: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-small "
+								: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="{