@ozdao/martyrs 0.2.519 → 0.2.520

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/organizations/CLAUDE.md

@@ -0,0 +1,259 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Module Overview
+
+The organizations module is a Vue.js/Node.js module that manages organizations, departments, memberships, and invites within the Martyrs application. It follows a modular architecture with separate client and server components.
+
+## Architecture
+
+### Server-Side Structure
+- **Entry Point**: `organizations.server.js` - Initializes models, routes, and policies
+- **Models**: Mongoose schemas for Organization, Department, Membership, and Invite
+- **Controllers**: Handle business logic with caching support using a custom Cache class
+- **Routes**: Express routes for RESTful API endpoints
+- **Middlewares**: Access verification middleware
+- **Policies**: ABAC (Attribute-Based Access Control) policies
+
+### Client-Side Structure
+- **Entry Point**: `organizations.client.js` - Exports components and initializes stores/router
+- **Components**: Vue 3 components organized by type:
+  - `pages/`: Full page components
+  - `forms/`: Popup forms (DepartmentForm, InviteForm, AddExistingMembersForm)
+  - `blocks/`: Reusable UI blocks
+  - `sections/`: Page sections
+  - `elements/`: Small UI elements
+- **Store**: Uses Store class from globals module
+  - `membershipsStore` - manages memberships with handleMembershipUpdate method
+  - `departmentsStore` - manages departments
+  - `invitesStore` - manages invites
+- **Router**: Vue Router configuration with nested routes
+
+## Key Features
+
+1. **Organization Management**: CRUD operations for organizations with owner/member relationships
+2. **Department System**: Hierarchical department structure within organizations
+3. **Membership System**: User roles and permissions within organizations
+4. **Invite System**: Invitation workflow for adding members
+5. **Access Control**: Fine-grained permissions using ABAC
+6. **Caching**: Redis-like caching with tag-based invalidation
+
+## API Endpoints
+
+All modules now follow the standard Store class pattern:
+
+### Organizations
+- `GET /api/organizations` - List organizations with filters
+- `POST /api/organizations/create` - Create new organization
+- `POST /api/organizations/:_id/update` - Update organization
+- `DELETE /api/organizations/:_id/delete` - Delete organization
+
+### Departments
+- `GET /api/departments/read` - Read with query parameters
+- `POST /api/departments/create` - Create new department
+- `PUT /api/departments/update` - Update department
+- `POST /api/departments/delete` - Delete department (expects {_id} in body)
+
+### Memberships
+- `GET /api/memberships/read` - Read with query parameters
+- `POST /api/memberships/create` - Create new membership
+- `PUT /api/memberships/update` - Update membership
+- `POST /api/memberships/delete` - Delete membership (expects {_id} in body)
+
+### Invites
+- `GET /api/invites/read` - Read with query parameters (owner, target, search)
+- `POST /api/invites/create` - Create new invite
+- `PUT /api/invites/update` - Update invite
+- `POST /api/invites/delete` - Delete invite (expects {_id} in body)
+
+## Important Patterns
+
+1. **Aggregation Pipeline**: Complex queries use MongoDB aggregation with dynamic stages
+2. **Caching Strategy**: Results cached with tags for selective invalidation
+3. **Access Control**: Uses ABAC with policies defined in `organizations.policies.js`
+4. **Lookup Configurations**: Modular lookup configs for related data
+5. **Query Processing**: Utility functions for building dynamic queries
+
+## Model Structures
+
+### Organization Model
+```javascript
+{
+  owner: ObjectId (ref: 'User', required),
+  official: Boolean (default: false),
+  types: Array (required),
+  profile: {
+    photo: String,
+    name: String (required),
+    description: String,
+    tags: [String]
+  },
+  contacts: {
+    email: String,
+    website: String,
+    phone: String,
+    address: String
+  },
+  socials: {
+    telegram: String,
+    twitter: String,
+    facebook: String,
+    instagram: String,
+    youtube: String
+  },
+  rating: {
+    popularity: Number (0-1),
+    median: Number (0-5),
+    amount: Number
+  },
+  accesses: AccessesSchema,
+  views: Number (default: 0),
+  timestamps: true
+}
+```
+
+### Department Model
+```javascript
+{
+  owner: ObjectId (ref: 'User'),
+  organization: ObjectId (ref: 'Organization'),
+  hidden: Boolean (default: false),
+  profile: {
+    photo: String,
+    name: String (required),
+    description: String,
+    categories: [String]
+  },
+  worktime: [{
+    day: String,
+    time: { start: String, end: String }
+  }],
+  delivery: [String],
+  payment: [String],
+  members: [{
+    user: ObjectId (ref: 'User'),
+    position: String (default: 'Member')
+  }],
+  subdepartments: [ObjectId (ref: 'Department')],
+  accesses: AccessesSchema,
+  timestamps: true
+}
+```
+
+### Membership Model
+```javascript
+{
+  user: ObjectId (ref: 'User', required),
+  type: String (enum: ['organization', 'department', 'user'], required),
+  role: String (default: 'subscriber'),
+  label: String (default: 'subscriber'),
+  target: ObjectId (dynamic ref based on type),
+  timestamps: true
+}
+```
+
+### Invite Model
+```javascript
+{
+  code: String (required, unique),
+  status: String (enum: ['active', 'used', 'deactivated']),
+  role: String (default: 'member'),
+  // From credentials schema:
+  phone: String,
+  email: String,
+  apple_id: String,
+  // From ownership schema:
+  owner: { type: String, target: ObjectId },
+  creator: { type: String, target: ObjectId, hidden: Boolean },
+  timestamps: true
+}
+```
+
+### Accesses Schema
+Permission structure for modules:
+```javascript
+{
+  categories: { create, read, edit, delete },
+  rents: { create, read, edit, delete },
+  spots: { create, read, edit, delete },
+  posts: { create, read, edit, delete },
+  events: { create, read, edit, delete },
+  tickets: { create, read, edit, delete },
+  gallery: { read, create, edit, delete },
+  members: { read, edit, delete },
+  inventory: { read, edit, delete },
+  products: { read, edit, delete },
+  departments: { read, edit, delete },
+  orders: { read, confirm, delete }
+}
+```
+All permissions are Boolean fields defaulting to false.
+
+## Key Interfaces
+
+### API Request/Response Formats
+
+#### Organization Query Parameters
+- `_id`: Single organization ID
+- `types`: Filter by organization types
+- `official`: Filter official organizations
+- `search`: Text search in organization names
+- `sortParam`, `sortOrder`: Sorting options
+- `skip`, `limit`: Pagination
+- `user`: User ID for membership filtering
+- `postable`: Filter by postable status
+- `contain`: Filter by contained elements
+- `prices`: Price range filtering (when products included)
+
+#### Lookup Options
+Request related data using query parameters:
+- `memberships`: Include membership data
+- `products`: Include products
+- `spots`: Include locations
+- `members`: Include member details
+
+### Store Integration
+
+All stores use the Store class from `@martyrs/src/modules/globals/views/classes/globals.store.js`:
+
+```javascript
+import Store from '@martyrs/src/modules/globals/views/classes/globals.store.js';
+
+const membershipsStore = new Store('/api/memberships');
+const departmentsStore = new Store('/api/departments');
+const invitesStore = new Store('/api/invites');
+```
+
+#### membershipsStore.handleMembershipUpdate
+Special method for updating user state when membership changes:
+```javascript
+membershipsStore.handleMembershipUpdate(user, membership, status, target, statusName, statusNumber)
+```
+
+### Feed Component Integration
+Use v-model:items pattern for reactive state:
+```vue
+<Feed
+  v-model:items="membersList"
+  :store="{
+    read: (options) => membershipsStore.read(options)
+  }"
+  :options="{
+    target: route.params._id,
+    role: ['member','owner']
+  }"
+>
+```
+
+### Controller Response Format
+- **Read operations**: Return array of items directly
+- **Delete operations**: Return the deleted object
+- **Create/Update**: Return the created/updated object
+
+## Dependencies
+
+- Mongoose for MongoDB ODM
+- Express for routing
+- Vue 3 with Composition API
+- Custom modules from `@martyrs/src/modules/globals/`

package/src/modules/organizations/components/blocks/CardDepartment.vue

@@ -3,28 +3,7 @@
 
     <div class="pd-medium w-100">
 
-      <router-link 
-        :to="{
-          name: 'Department Edit', 
-          params: {
-            _id: props.organization,
-            department: department._id
-          }
-        }" 
-        class="
-          cursor-pointer 
-          pos-absolute pos-t-regular pos-r-regular
-          radius-extra pd-thin bg-second
-        "
-      >
-        <IconEdit
-          class="i-regular"
-          classes="fill-white"
-        />
-      </router-link>
-
       <h3 
-        @click="$router.push(`/organizations/${props.organization}/departments/${department._id}`)"
         class="mn-b-small w-100"
         v-html="department.profile.name"
       />
@@ -39,7 +18,7 @@
           :photo="member.user.profile.photo"
           :name="member.user.profile.name || member.user.phone || member.user.email || member.user._id"
           :position="member.position" 
-          @click="$router.push(`/app/profile/${member.user._id}`)" 
+          @click="$router.push({ name: 'User Profile', params: { _id: member.user._id } })" 
         />
       </ul>
     </div>

package/src/modules/organizations/components/blocks/Socials.vue

@@ -7,7 +7,7 @@
             target="_blank" 
             class="i-big bg-second t-white flex-nowrap flex-center flex radius-extra"
         >
-            <component :is="resolveSocialIcon(social.name)" class="i-medium"></component>
+            <component :is="resolveSocialIcon(social.name)" :fill="'rgb(var(--white))'" class="i-medium"></component>
         </a> 
     </div>
 </template>

package/src/modules/organizations/components/elements/ButtonToggleMembership.vue

@@ -13,7 +13,7 @@
   
   import { ref } from 'vue'
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
-  import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js'
+  import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js'
 
   const emits = defineEmits(['updateMembership'])
 
@@ -64,7 +64,7 @@
         target: props.target
       };
 
-      const response = await memberships.actions.create(membershipData);
+      const response = await membershipsStore.create(membershipData);
 
       emits('updateMembership', { 
         membership: response, 
@@ -86,7 +86,7 @@
     };
 
     try {
-      const response = await memberships.actions.delete(membershipData);
+      const response = await membershipsStore.delete(membershipData);
 
       emits('updateMembership', {
         membership: response,