@ozdao/martyrs 0.2.473 → 0.2.474

package/src/modules/globals/controllers/utils/queryProcessor.js

@@ -155,7 +155,11 @@ function getCreatorUserLookupStage() {
           }
         },
         {
-          $project: { password: 0 }
+          $project: {
+            username: 1,
+            profile: 1,
+            _id: 1
+          }
         }
       ],
       as: "creatorUser"
@@ -163,13 +167,25 @@ function getCreatorUserLookupStage() {
   };
 }
 
-
 function getCreatorOrganizationLookupStage() {
   return {
     $lookup: {
       from: "organizations",
-      localField: "creator.target",
-      foreignField: "_id",
+      let: { creatorId: "$creator.target" },
+      pipeline: [
+        {
+          $match: {
+            $expr: { $eq: ["$_id", "$$creatorId"] }
+          }
+        },
+        {
+          $project: {
+            name: 1, // если нужно, можешь оставить только нужные поля
+            profile: 1,
+            _id: 1
+          }
+        }
+      ],
       as: "creatorOrganization"
     }
   };
@@ -179,14 +195,26 @@ function getCreatorCustomerLookupStage() {
   return {
     $lookup: {
       from: "customers",
-      localField: "creator.target",
-      foreignField: "_id",
+      let: { creatorId: "$creator.target" },
+      pipeline: [
+        {
+          $match: {
+            $expr: { $eq: ["_id", "$$creatorId"] }
+          }
+        },
+        {
+          $project: {
+            username: 1, // если есть, можно заменить на нужные поля у customer
+            profile: 1,
+            _id: 1
+          }
+        }
+      ],
       as: "creatorCustomer"
     }
   };
 }
 
-
 function getOwnerUserLookupStage() {
   return {
     $lookup: {
@@ -199,7 +227,13 @@ function getOwnerUserLookupStage() {
           }
         },
         {
-          $project: { password: 0 }
+          $project: {
+            username: 1,
+            profile: 1,
+            email: 1,
+            phone: 1,
+            _id: 1
+          }
         }
       ],
       as: "ownerUser"
@@ -207,19 +241,33 @@ function getOwnerUserLookupStage() {
   };
 }
 
-
 function getOwnerOrganizationLookupStage() {
   return {
     $lookup: {
       from: "organizations",
-      localField: "owner.target",
-      foreignField: "_id",
+      let: { ownerId: "$owner.target" },
+      pipeline: [
+        {
+          $match: {
+            $expr: { $eq: ["$_id", "$$ownerId"] }
+          }
+        },
+        {
+          $project: {
+            official: 1, // если нужно
+            owner: 1, // если нужно
+            profile: 1,
+            _id: 1
+          }
+        }
+      ],
       as: "ownerOrganization"
     }
   };
 }
 
 
+
 function getAddFieldsCreatorOwnerStage() {
   return {
     $addFields: {

package/src/modules/globals/models/schemas/ownership.schema.js

@@ -1,14 +1,17 @@
-module.exports = function applyOwnershipSchema(schema,db) {
+module.exports = function applyOwnershipSchema(schema, db) {
   schema.add({
     owner: {
       type: {
         type: String,
-        required: true
+        required: true,
+        enum: ['user', 'organization', 'platform']
       },
       target: {
         type: db.mongoose.Schema.Types.ObjectId,
         refPath: 'owner.type',
-        required: true,
+        required: function() {
+          return this.owner.type !== 'platform';
+        }
       },
     },
     creator: {
@@ -18,16 +21,18 @@ module.exports = function applyOwnershipSchema(schema,db) {
       },
       type: {
         type: String,
-        required: true
+        required: true,
+        enum: ['user', 'organization', 'platform']
       },
       target: {
         type: db.mongoose.Schema.Types.ObjectId,
         refPath: 'creator.type',
-        required: true,
+        required: function() {
+          return this.creator.type !== 'platform';
+        }
       }
     }
   });
-
   schema.index({ 
     'owner.target': 1,
     'creator.target': 1 

package/src/modules/globals/models/schemas/profile.schema.js

@@ -13,10 +13,6 @@ module.exports = function applyProfileSchema(schema,db) {
         type: String,
         default: null
       },
-      birthday: {
-        type: Date,
-        default: null
-      }
     },
   })
 }

package/src/modules/music/components/layouts/MusicLayout.vue

@@ -22,60 +22,21 @@
           <SearchForm @search="handleSearch" placeholder="Search music..." />
         </div>
         
-        <div class="music-user-menu pos-relative">
-          <Button 
-            v-if="isAuthenticated"
-            @click="showUserMenu = !showUserMenu" 
-            class="bg-black radius-extra flex-v-center flex pd-thin hover-bg-dark"
-            :showLoader="false"
-            :showSucces="false"
-          >
-            <span v-if="user && user.profile" class="t-nowrap t-medium t-truncate w-max-10r mn-r-thin">{{ user.profile.name }}</span>
-            <IconProfile class="i-medium" fill="rgb(var(--white))"/>
-          </Button>
+        <div class="music-user-menu flex-nowrap  flex pos-relative">
+   
+          <router-link :to="{ name: 'music-library' }" class="t-white pd-thin w-100 d-block hover-bg-dark radius-small">
+            My Library
+          </router-link>
+          <router-link :to="{ name: 'music-upload' }" class="t-white pd-thin w-100 d-block hover-bg-dark radius-small">
+            Upload Music
+          </router-link>
           
-          <!-- User dropdown menu -->
-          <Dropdown 
-            v-if="showUserMenu" 
-            class="pos-absolute pos-t-100 pos-r-0 mn-t-thin pd-small bg-dark radius-small z-index-5"
-            :align="'right'"
-          >
-            <ul class="w-max-15r">
-              <li class="mn-b-thin w-100">
-                <router-link :to="{ name: 'music-library' }" class="t-white pd-thin w-100 d-block hover-bg-dark-medium radius-small">
-                  My Library
-                </router-link>
-              </li>
-              <li class="mn-b-thin w-100">
-                <router-link :to="{ name: 'music-upload' }" class="t-white pd-thin w-100 d-block hover-bg-dark-medium radius-small">
-                  Upload Music
-                </router-link>
-              </li>
-              <li class="w-100">
-                <button @click="logout" class="t-white bg-transparent border-none w-100 t-left pd-thin hover-bg-dark-medium radius-small cursor-pointer">
-                  Logout
-                </button>
-              </li>
-            </ul>
-          </Dropdown>
-          
-          <Button 
-            v-else 
-            @click="login" 
-            class="bg-main radius-extra pd-small t-white hover-scale-1"
-            :showLoader="false"
-            :showSucces="false"
-          >
-            Login
-          </Button>
         </div>
       </header>
       
       <!-- Main Content Area -->
-      <main class="flex-child-1 o-y-scroll o-x-hidden bg-black-transp-95">
-        <div class="mn-small">
-          <router-view></router-view>
-        </div>
+      <main class="o-y-scroll o-x-hidden">
+        <router-view></router-view>
       </main>
       
       <!-- Music Player Fixed at Bottom -->
@@ -125,13 +86,4 @@ const handleSearch = (query) => {
   router.push({ name: 'music-search', query: { q: query } });
 };
 
-const login = () => {
-  router.push({ name: 'Sign In', query: { redirect: router.currentRoute.value.fullPath } });
-};
-
-const logout = async () => {
-  await authActions.logout();
-  showUserMenu.value = false;
-  router.push({ name: 'music-home' });
-};
 </script>

package/src/modules/music/components/pages/MusicHome.vue

@@ -1,6 +1,6 @@
 <!-- components/pages/MusicHome.vue -->
 <template>
-  <div class="music-home-page">
+  <div class="music-home-page pd-medium mobile:pd-thin">
     <!-- Hero Section -->
     <section class="bg-gradient-dark pd-medium radius-medium mn-b-medium">
       <h1 class="t-white mn-b-small">Welcome to Music</h1>
@@ -10,7 +10,7 @@
     <!-- Featured Playlists Section -->
     <section class="mn-b-medium">
       <div class="flex-between flex mn-b-small">
-        <h2 class="t-white">Featured Playlists</h2>
+        <h2 class="">Featured Playlists</h2>
         <router-link :to="{ path: '/music/playlists' }" class="t-main t-small hover-opacity">See all</router-link>
       </div>
       
@@ -39,7 +39,7 @@
     <!-- New Releases Section -->
     <section class="mn-b-medium">
       <div class="flex-between flex mn-b-small">
-        <h2 class="t-white">New Releases</h2>
+        <h2 class="">New Releases</h2>
         <router-link :to="{ path: '/music/albums' }" class="t-main t-small hover-opacity">See all</router-link>
       </div>
       
@@ -68,7 +68,7 @@
     <!-- Popular Tracks Section -->
     <section class="mn-b-medium">
       <div class="flex-between flex mn-b-small">
-        <h2 class="t-white">Popular Tracks</h2>
+        <h2 class="">Popular Tracks</h2>
         <router-link :to="{ path: '/music/tracks' }" class="t-main t-small hover-opacity">See all</router-link>
       </div>
       
@@ -98,7 +98,7 @@
     <!-- Top Artists Section -->
     <section>
       <div class="flex-between flex mn-b-small">
-        <h2 class="t-white">Top Artists</h2>
+        <h2 class="">Top Artists</h2>
         <router-link :to="{ path: '/music/artists' }" class="t-main t-small hover-opacity">See all</router-link>
       </div>
       

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

@@ -4,17 +4,27 @@
 
 	<!-- Ask to login  -->
 	<AskToLogin class="mn-b-thin" v-if="auth.state.access.status === false" /> 
+
+	<!-- Empty State   -->
+	<EmptyState  
+		v-if="shopcart.state.positions < 1" 
+	/>	
+	<Succes 
+		v-if="order.status === true && shopcart.state.positions.length > 0" 
+		:order="order" 
+	/>
+	<!-- Уведомления о минимальной сумме заказа и времени работы -->
+	<div v-if="shopcart.state.positions.length > 0 && orders.state.current.status !== true" class="w-100 gap-thin cols-1 mn-b-thin">
+		<div v-if="!isOpen" class="bg-fifth-nano pd-small radius-medium t-center">
+			<p class="t-fourth">⚠️ This spot is currently closed. You can place an order, but it will be processed when the spot opens.</p>
+		</div>
+		<div v-if="cartTotalPrice < minOrderAmount" class="bg-fourth-nano pd-small radius-medium t-center">
+			<p class="t-fourth">⚠️ Minimum order amount is {{ formatPrice(minOrderAmount) }}. Your current total is {{ formatPrice(cartTotalPrice) }}.</p>
+		</div>
+	</div>
+	
 	<!-- Order form -->
 	<div class="gap-small mn-b-thin cols-2">
-		<!-- Empty State   -->
-		<EmptyState  
-			v-if="shopcart.state.positions < 1" 
-		/>	
-
-		<Succes 
-			v-if="order.status === true && shopcart.state.positions.length > 0" 
-			:order="order" 
-		/>
 		<!-- Order Form -->
 		<div
 			v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0" 
@@ -84,6 +94,7 @@
 		      || errorDelivery 
 		      || errorPayment
 		      || isLocationLoading
+		      || cartTotalPrice < minOrderAmount
 		    "
       >
         <span>Place an Order</span>
@@ -147,7 +158,7 @@ const isLocationLoading = ref(false)
 // Accessing router and store
 const route = useRoute()
 const router = useRouter()
-const { returnCurrency } = useGlobalMixins()
+const { returnCurrency, formatPrice } = useGlobalMixins()
 // COMPUTED
 const order = computed(() => orders.state.current)
 const user = computed(() => users.state.current)
@@ -164,6 +175,58 @@ const deliveryCost = computed(() => {
 
 // Organization
 const orderOrganization = ref({})
+const spotOrganization = ref({})
+const isOpen = ref(true)
+
+// Новые переменные для проверки минимальной суммы заказа и времени работы
+const minOrderAmount = ref(0)
+
+function checkIsOpenNow(worktime) {
+  try {
+    console.log('[checkIsOpenNow] worktime:', worktime);
+
+    if (
+      !worktime ||
+      typeof worktime !== 'object' ||
+      Array.isArray(worktime) ||
+      !worktime.regular
+    ) {
+      console.log('[checkIsOpenNow] invalid, returning true');
+      return true;
+    }
+
+    const now = new Date();
+    const currentDay = now.getDay();
+    const currentTime = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
+    const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+
+    console.log('[checkIsOpenNow] currentDay:', currentDay);
+    console.log('[checkIsOpenNow] currentTime:', currentTime);
+
+    const specialDay = worktime.special?.find(s => {
+      const d = new Date(s.date);
+      return (
+        d.getFullYear() === today.getFullYear() &&
+        d.getMonth() === today.getMonth() &&
+        d.getDate() === today.getDate()
+      );
+    });
+
+    if (specialDay) {
+      console.log('[checkIsOpenNow] specialDay:', specialDay);
+      if (!specialDay.isOpen) return false;
+      return specialDay.periods?.some(p => p.open <= currentTime && p.close > currentTime);
+    }
+
+    const regularDay = worktime.regular.find(d => d.dayOfWeek === currentDay);
+    if (!regularDay || !regularDay.isOpen) return false;
+
+    return regularDay.periods?.some(p => p.open <= currentTime && p.close > currentTime);
+  } catch (err) {
+    console.error('[checkIsOpenNow] error:', err);
+    return true;
+  }
+}
 
 
 if (!globals.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id) { 
@@ -185,13 +248,23 @@ onMounted(async()=> {
 		orders.state.current.customer.phone = users.state.current.phone
 		orders.state.current.customer.phone = users.state.current.phone
 	}
-
+	
 	orderOrganization.value = await organizations.actions.read({
 	  _id: shopcart.state.organization,
 	  location: globals.state.position?.location,
 	  lookup: ['spots']
 	})
 	
+	// Получаем информацию о минимальной сумме заказа и времени работы из spot
+	if (orderOrganization.value && orderOrganization.value[0]?.spots?.length > 0) {
+	  spotOrganization.value = orderOrganization.value[0].spots[0];
+		isOpen.value = checkIsOpenNow(spotOrganization.value.worktime);
+	  console.log(spotOrganization.value)
+	  minOrderAmount.value = spotOrganization.value || 0;
+	}
+
+
+	
  	isLocationLoading.value = false
   emits('page-loaded');
 
@@ -225,7 +298,7 @@ watch(
         location: newVal.location,
         lookup: ['spots']
       })
-
+      
       isLocationLoading.value = false
     }
   },

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

@@ -370,6 +370,9 @@ const controllerFactory = (db) => {
           console.log('notifiocatio data', JSON.stringify(notificationData))
           
           // Send notification using the notification service
+
+          console.log('notification api is', `${process.env.API_URL || ''}/api/notifications`)
+
           const notificationResponse = await fetch(`${process.env.API_URL || ''}/api/notifications`, {
             method: 'POST',
             headers: {

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

@@ -160,6 +160,7 @@ const actions = {
         org_id: organization, // Добавляем _id организации к каждому продукту
       });
     }
+    state.organization = organization
 
     // Обновляем объект корзины в localStorage, включая _id организации
     localStorage.setItem('shopcart', JSON.stringify({

package/src/modules/organizations/models/schemas/accesses.schema.js

@@ -1,4 +1,22 @@
 const accessesSchema = {
+  categories: {
+    create: {
+      type: Boolean,
+      default: false,
+    },
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
   rents: {
     create: {
       type: Boolean,