@ozdao/martyrs 0.2.518 → 0.2.520

package/src/modules/inventory/workers/inventory.availability.worker.js

@@ -14,13 +14,13 @@ class AvailabilityWorker {
   }
   
   /**
-   * Initialize change stream to watch for stock balance changes
+   * Initialize change stream to watch for stock availability changes
    */
   initChangeStream() {
     try {
-      const stockBalance = this.db.stockBalance;
+      const stockAvailability = this.db.stockAvailability;
       
-      stockBalance.collection.watch(
+      stockAvailability.collection.watch(
         [{ $match: { operationType: { $in: ['insert', 'update', 'replace'] } } }],
         { fullDocument: 'updateLookup' } // Critical to get the complete document after updates
       ).on('change', async (event) => {
@@ -43,7 +43,7 @@ class AvailabilityWorker {
         }
       });
       
-      this.logger.info('Stock balance change stream initialized');
+      this.logger.info('Stock availability change stream initialized');
     } catch (error) {
       this.logger.error('Error initializing change stream:', error);
       // If change streams aren't supported, fall back to timer-based updates
@@ -59,11 +59,11 @@ class AvailabilityWorker {
     
     setInterval(async () => {
       try {
-        const stockBalance = this.db.stockBalance;
+        const stockAvailability = this.db.stockAvailability;
         
-        // Find recently updated balances (in the last interval)
+        // Find recently updated availability records (in the last interval)
         // Use index on updatedAt for efficient querying
-        const recentUpdates = await stockBalance.find({
+        const recentUpdates = await stockAvailability.find({
           updatedAt: { $gte: new Date(Date.now() - REFRESH_INTERVAL * 2) }
         })
         .sort({ updatedAt: -1 })
@@ -71,9 +71,9 @@ class AvailabilityWorker {
         
         // Group by product+storage to avoid duplicate recalcs
         const updates = new Map();
-        recentUpdates.forEach(balance => {
-          const key = `${balance.product.toString()}_${balance.storage.toString()}`;
-          updates.set(key, { product: balance.product, storage: balance.storage });
+        recentUpdates.forEach(item => {
+          const key = `${item.product.toString()}_${item.storage.toString()}`;
+          updates.set(key, { product: item.product, storage: item.storage });
         });
         
         // Process each unique product+storage asynchronously
@@ -101,7 +101,6 @@ class AvailabilityWorker {
   async recalcByProduct(product, storage, session = null) {
     try {
       const Product = this.db.product;
-      const StockBalance = this.db.stockBalance;
       const StockAvailability = this.db.stockAvailability;
       
       // Get the product with its variants - using $lookup instead of populate for better performance
@@ -140,8 +139,8 @@ class AvailabilityWorker {
       // Add explicit base product (no variant) - better than null for indexing
       const explicitBaseVariantId = '000000000000000000000000'; // ObjectId for base variant
       
-      // Get all balances for this product's variants at this storage
-      const balances = await StockBalance.find({
+      // Get all availability records for this product's variants at this storage
+      const availabilityItems = await StockAvailability.find({
         product,
         $or: [
           { variant: { $in: variantIds } },
@@ -151,10 +150,10 @@ class AvailabilityWorker {
       }).session(session).lean();
       
       // Create a map for quick lookup
-      const balanceMap = new Map();
-      balances.forEach(balance => {
-        const key = balance.variant ? balance.variant.toString() : explicitBaseVariantId;
-        balanceMap.set(key, balance);
+      const availabilityMap = new Map();
+      availabilityItems.forEach(item => {
+        const key = item.variant ? item.variant.toString() : explicitBaseVariantId;
+        availabilityMap.set(key, item);
       });
       
       // Get all ingredient IDs from product and variants
@@ -174,19 +173,19 @@ class AvailabilityWorker {
         });
       }
       
-      // Get ingredient balances if needed
-      let ingredientBalances = [];
+      // Get ingredient availability if needed
+      let ingredientItems = [];
       if (ingredientIds.size > 0) {
-        ingredientBalances = await StockBalance.find({
+        ingredientItems = await StockAvailability.find({
           product: { $in: Array.from(ingredientIds).map(id => this.db.mongoose.Types.ObjectId(id)) },
           storage
         }).session(session).lean();
       }
       
-      // Create ingredient balance map
+      // Create ingredient availability map
       const ingredientMap = new Map();
-      ingredientBalances.forEach(balance => {
-        ingredientMap.set(balance.product.toString(), balance);
+      ingredientItems.forEach(item => {
+        ingredientMap.set(item.product.toString(), item);
       });
       
       // Prepare bulk operations for StockAvailability updates
@@ -199,7 +198,7 @@ class AvailabilityWorker {
         null, // null variant for base product
         storage,
         productData, 
-        balanceMap.get(explicitBaseVariantId), 
+        availabilityMap.get(explicitBaseVariantId), 
         ingredientMap
       );
       
@@ -211,7 +210,7 @@ class AvailabilityWorker {
           variant._id, 
           storage,
           variant, 
-          balanceMap.get(variant._id.toString()), 
+          availabilityMap.get(variant._id.toString()), 
           ingredientMap
         );
       }
@@ -232,9 +231,9 @@ class AvailabilityWorker {
   /**
    * Helper to process a single variant's availability
    */
-  _processVariantAvailability(bulkOps, productId, variantId, storageId, variant, balance, ingredientMap) {
-    // Default values if no balance found
-    const stockQuantity = balance ? balance.quantity : 0;
+  _processVariantAvailability(bulkOps, productId, variantId, storageId, variant, availabilityItem, ingredientMap) {
+    // Default values if no availability item found
+    const stockQuantity = availabilityItem ? availabilityItem.quantity : 0;
     
     // Start with direct stock
     let availableQuantity = stockQuantity;
@@ -251,8 +250,8 @@ class AvailabilityWorker {
         // Skip optional ingredients
         if (ingredient.optional) continue;
         
-        const ingBalance = ingredientMap.get(ingId);
-        const stockIng = ingBalance ? ingBalance.quantity : 0;
+        const ingAvailability = ingredientMap.get(ingId);
+        const stockIng = ingAvailability ? ingAvailability.quantity : 0;
         
         // Calculate how many products can be made with this ingredient
         if (requiredQty > 0) {

package/src/modules/marketplace/views/components/layouts/Marketplace.vue

@@ -1,13 +1,127 @@
 <template>
 	 <div class="cols-2-1_3 z-index-3 pos-relative radius-big">
 
-		<div class="o-y-scroll br-r br-solid br-light  z-index-2 desktop-only h-100 pos-relative">
-     	<BlockFilter
-        v-model:filter="marketplace.state.filter"
-        :options="marketplace.state.filter.options"
-        class="h-100 w-100 pd-medium"
-	    />
-	  </div>
+		<div class="o-y-scroll br-r br-solid br-light pd-medium z-index-2 desktop-only h-100 pos-relative">
+			<div class="w-100 o-y-scroll h-100">
+				<!-- Categories -->
+				<div class="mn-b-medium" v-if="currentCategories.length > 0">
+					<h4 class="mn-b-small">
+						{{ route.params.categoryPath ? 'Subcategories' : 'Categories' }}
+					</h4>
+					<div class="gap-micro">
+						<div
+							v-for="category in currentCategories"
+							:key="category._id"
+							@click="selectCategory(category)"
+							class="pd-small radius-small cursor-pointer hover-bg-light transition-all"
+						>
+							{{ category.name }}
+						</div>
+					</div>
+				</div>
+
+				<!-- Location Filter -->
+				<Spoiler 
+					class="o-hidden mn-b-medium"
+					:status="true"
+				>
+					<template #header="{ isOpen }">
+						<div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
+							<h4 class="w-100">Location</h4>
+							<div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
+								<IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-regular"/>
+							</div>
+						</div>
+					</template>
+
+					<template #content>
+						<div class="mn-t-small">
+							<Field
+								v-model="searchLocation"
+								placeholder="Search location..."
+								type="text"
+								class="w-100 bg-light pd-small radius-small mn-b-small"
+							/>
+							<Checkbox 
+								v-for="location in locationOptions"
+								:key="location"
+								v-model:radio="selectedLocation"
+								:label="location"
+								:value="location"
+								mode="radio"
+								class="mn-b-micro"
+							/>
+						</div>
+					</template>
+				</Spoiler>
+
+				<!-- Delivery Options -->
+				<Spoiler 
+					class="o-hidden mn-b-medium"
+					:status="true"
+				>
+					<template #header="{ isOpen }">
+						<div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
+							<h4 class="w-100">Delivery Options</h4>
+							<div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
+								<IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-regular"/>
+							</div>
+						</div>
+					</template>
+
+					<template #content>
+						<div class="mn-t-small">
+							<Checkbox 
+								v-for="option in deliveryOptions"
+								:key="option.value"
+								v-model:checkbox="selectedDeliveryOptions"
+								:label="option.label"
+								:value="option.value"
+								mode="checkbox"
+								class="mn-b-micro"
+							/>
+						</div>
+					</template>
+				</Spoiler>
+
+				<!-- Payment Options -->
+				<Spoiler 
+					class="o-hidden mn-b-medium"
+					:status="true"
+				>
+					<template #header="{ isOpen }">
+						<div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
+							<h4 class="w-100">Payment Options</h4>
+							<div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
+								<IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-regular"/>
+							</div>
+						</div>
+					</template>
+
+					<template #content>
+						<div class="mn-t-small">
+							<Checkbox 
+								v-for="option in paymentOptions"
+								:key="option.value"
+								v-model:checkbox="selectedPaymentOptions"
+								:label="option.label"
+								:value="option.value"
+								mode="checkbox"
+								class="mn-b-micro"
+							/>
+						</div>
+					</template>
+				</Spoiler>
+
+				<!-- Clear Filters Button -->
+				<button 
+					@click="clearFilters"
+					class="bg-main w-100 button mn-t-medium"
+				>
+					Clear Filters
+				</button>
+				</div>
+		</div>
 
 		<!-- Catalog wrapper -->
 		<div class="pd-thin">
@@ -45,7 +159,10 @@
 	import { useRoute, useRouter,onBeforeRouteLeave } from 'vue-router'
 	import { useI18n } from 'vue-i18n'
 
-	import BlockFilter  from '@martyrs/src/modules/globals/views/components/blocks/BlockFilter.vue'
+	import Spoiler from "@martyrs/src/components/Spoiler/Spoiler.vue"
+	import Field from "@martyrs/src/components/Field/Field.vue"
+	import Checkbox from "@martyrs/src/components/Checkbox/Checkbox.vue"
+	import IconChevronBottom from '@martyrs/src/modules/icons/navigation/IconChevronBottom.vue'
 
 	import * as globals from '@martyrs/src/modules/globals/views/store/globals.js'
   import * as categories from '@martyrs/src/modules/products/store/categories.js';
@@ -65,6 +182,41 @@
 
 	const desktopFilters = ref(null)
 
+	// Categories
+	const currentCategories = ref([]);
+	const searchLocation = ref('');
+	const selectedLocation = ref('All');
+	const locationOptions = ref(['All', 'Phuket', 'Bangkok', 'Chiang Mai', 'Pattaya']);
+
+	// Delivery options
+	const deliveryOptions = ref([
+		{ label: 'Pickup', value: 'pickup' },
+		{ label: 'Delivery', value: 'delivery' },
+		{ label: 'Dine-in', value: 'dinein' }
+	]);
+	const selectedDeliveryOptions = ref([]);
+
+	// Payment options
+	const paymentOptions = ref([
+		{ label: 'Cash', value: 'cash' },
+		{ label: 'Card', value: 'card' },
+		{ label: 'Crypto', value: 'crypto' },
+		{ label: 'Bank Transfer', value: 'transfer' }
+	]);
+	const selectedPaymentOptions = ref([]);
+
+	const selectCategory = (category) => {
+		// Implementation for category selection
+		console.log('Category selected:', category);
+	};
+
+	const clearFilters = () => {
+		selectedLocation.value = 'All';
+		selectedDeliveryOptions.value = [];
+		selectedPaymentOptions.value = [];
+		searchLocation.value = '';
+	};
+
 	function denormalizeUrlParam(param) {
 	  return param
 	    .replace(/-/g, ' ') // Замена дефисов на пробелы

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

@@ -14,22 +14,16 @@ const NotificationsController = (db, wss, notificationService) => {
   
   // Create multiple notifications at once
   const createBatch = async (req, res) => {
-    console.log('=== Batch notifications endpoint ===');
-    console.log('Request body:', JSON.stringify(req.body, null, 2));
     
     try {
       const { notifications } = req.body;
       
       if (!notifications || !Array.isArray(notifications)) {
-        console.error('Invalid request: notifications array is required');
         return res.status(400).json({ message: 'notifications array is required' });
       }
 
-      console.log('Creating notifications count:', notifications.length);
-
       // Create all notifications
       const createdNotifications = await db.notification.insertMany(notifications);
-      console.log('Created notifications:', createdNotifications.map(n => n._id));
       
       // Fire and forget with error tracking
       setImmediate(() => {

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

@@ -43,12 +43,6 @@ export default (function (db, wss) {
         userId: new ObjectId(userId),
         isActive: true,
       });
-      console.log('=== CHANNEL SELECTION DEBUG ===');
-      console.log('userDevices found:', userDevices.length);
-      console.log('userDevices:', userDevices);
-      console.log('user.email:', user.email);
-      console.log('user.phoneNumber:', user.phoneNumber);
-      console.log('preferences.length:', preferences.length);
       
       // Default channels if no preferences set
       let channels = ['web']; // Web is always on by default
@@ -56,7 +50,6 @@ export default (function (db, wss) {
       // If user has devices, add push to default channels
       if (userDevices.length > 0) {
         channels.push('push');
-        console.log('Added push channel - devices found');
       } else {
         console.log('No push channel - no devices found');
       }
@@ -64,24 +57,20 @@ export default (function (db, wss) {
       // If user has email, add it to default channels
       if (user.email) {
         channels.push('email');
-        console.log('Added email channel');
       }
       // If user has phone, add SMS to default channels
       if (user.phoneNumber) {
         channels.push('sms');
-        console.log('Added SMS channel');
       }
       // Override with user preferences if they exist
       if (preferences.length > 0) {
         channels = preferences.filter(pref => pref.isEnabled).map(pref => pref.channelType);
-        console.log('Overridden with user preferences:', channels);
       }
-      console.log('=== FINAL CHANNELS ===', channels);
+      
       // Send to each enabled channel - parallel processing
       const channelPromises = [];
 
       for (const channel of channels) {
-        console.log(`=== PREPARING CHANNEL: ${channel} ===`);
         const sendFunc = channelRouters[channel];
         if (!sendFunc) {
           channelPromises.push(Promise.resolve({
@@ -93,17 +82,14 @@ export default (function (db, wss) {
         }
 
         if (channel === 'push') {
-          console.log(`Preparing push to ${userDevices.length} devices`);
           // Each device as separate promise for true parallelism
           for (const device of userDevices) {
             channelPromises.push(
               sendFunc(notification, user, device)
                 .then(() => {
-                  console.log(`Push sent successfully to device ${device.deviceId}`);
                   return { channel: 'push', deviceId: device.deviceId, success: true };
                 })
                 .catch(err => {
-                  console.error(`Push failed for device ${device.deviceId}:`, err);
                   return { channel: 'push', deviceId: device.deviceId, success: false, error: err.message };
                 })
             );
@@ -123,7 +109,6 @@ export default (function (db, wss) {
         }
       }
 
-      console.log(`=== PROCESSING ${channelPromises.length} PARALLEL OPERATIONS ===`);
       const results = await Promise.allSettled(channelPromises);
       
       // Process results and create batch logs
@@ -180,7 +165,6 @@ export default (function (db, wss) {
   };
   // Send websocket notifications
   const sendWebNotification = async (notification, user) => {
-    console.log(`[WebSocket][notification] sending to user ${user._id}`);
     const result = await wss.sendToUserInModule('notification', user._id, {
       type: 'notification',
       data: notification,

package/src/modules/notifications/services/web-push.service.js

@@ -17,10 +17,8 @@ const WebPushService = {
         badge: process.env.NOTIFICATION_BADGE_URL || '/favicon.ico',
         data: data,
       });
-      console.log('payload is', payload);
       // Send the notification
       const result = await webpush.sendNotification(subscription, payload);
-      console.log('web push is', result);
       return { success: true, statusCode: result.statusCode };
     } catch (error) {
       console.error('Web Push service error:', error);

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

@@ -55,13 +55,13 @@
       <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"
+        class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-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"
+        class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-thin t-white bg-red"
       >
         {{order.payment.status || 'Not defined'}}
       </span>

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

@@ -26,7 +26,7 @@
               Order: #{{order._id}}
 
               <span 
-                class="flex-child flex-child-shrink-0 capitalize w-max mn-r-thin t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin bg-main"
+                class="flex-child flex-child-shrink-0 capitalize w-max mn-r-thin t-medium radius-big pd-thin bg-main"
               >
                 {{order.status}}
               </span>

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

@@ -505,11 +505,9 @@ const controllerFactory = db => {
         console.log('Sending notification for status change...');
         try {
           const usersWithAccess = await getUsersWithOrdersConfirmAccess(order.owner.target);
-          const filteredUsers = usersWithAccess.filter(userId => 
-            userId.toString() !== order.creator.target.toString()
-          );
           
-          await sendOrderNotifications(order, 'order_status', filteredUsers, {
+          // Отправляем уведомления всем пользователям с доступом, включая создателя
+          await sendOrderNotifications(order, 'order_status', usersWithAccess, {
             oldStatus: oldStatus,
             newStatus: order.status,
             organization: order.owner.target

package/src/modules/orders/orders.client.js

@@ -115,7 +115,7 @@ function initializeOrders(app, store, router, options = {}) {
       routes: routerCustomers,
       routeNamePrefix: 'Backoffice',
       filterConfig: {
-        include: ['CustomersList'],
+        include: ['Customers'],
       },
       meta: {
         context: 'backoffice',
@@ -131,7 +131,7 @@ function initializeOrders(app, store, router, options = {}) {
       routes: routerCustomers,
       routeNamePrefix: 'Organization',
       filterConfig: {
-        include: ['CustomersList'],
+        include: ['Customers'],
       },
       meta: {
         context: 'organization',

package/src/modules/orders/router/customers.router.js

@@ -3,7 +3,7 @@ import Customers from '@martyrs/src/modules/orders/components/pages/Customers.vu
 const customersRoutes = [
   {
     path: '',
-    name: 'CustomersList',
+    name: 'Customers',
     component: Customers,
     meta: {
       title: {