@ozdao/martyrs 0.2.481 → 0.2.483

package/src/modules/products/components/sections/ProductConfigurator.vue

@@ -16,18 +16,34 @@
       :selectedVariant="selectedVariant"
       :productVariants="productVariants"
       @select-discount="handleDiscountSelected"
+      class="mn-b-medium"
     />
-    
-    <!-- Quantity Selection -->
-    <div class="w-100 mn-b-medium">
-      <div class="flex flex-nowrap flex-v-center mn-b-thin">
-        <p class="t-medium">Quantity</p>
-        <span v-if="selectedVariant" class="t-small t-transp mn-l-thin">
-          (Max: {{ maxQuantity }})
-        </span>
+      
+    <!-- Показываем цену, если нет вариантов или не выбран ни один вариант -->
+    <div class="flex-nowrap flex gap-thin">
+      <div class="">
+        <p class="t-medium mn-b-thin">Price</p>
+        <Price 
+          v-if="!selectedVariant"
+          :product="product"
+          :variants="productVariants" 
+          size="big" 
+          class="flex gap-micro flex-center pd-small bg-second t-white w-max mn-b-medium" 
+        />
       </div>
+     
       
-      <QuantitySelector v-model="quantity" :maxValue="maxQuantity" />
+      <!-- Quantity Selection -->
+      <div class="w-100">
+        <div class="flex flex-nowrap flex-v-center mn-b-thin">
+          <p class="t-medium">Quantity</p>
+          <span v-if="selectedVariant" class="t-small t-transp mn-l-thin">
+            (Max: {{ maxQuantity }})
+          </span>
+        </div>
+        
+        <QuantitySelector v-model="quantity" :maxValue="maxQuantity" />
+      </div>
     </div>
 
     <!-- Out of stock notice -->
@@ -38,25 +54,21 @@
     </div>
 
     <!-- Add to cart button -->
-    <div class="w-100 mn-b-small">
+    <div class="w-100 mn-b-medium">
       <Button
-        v-if="isVariantAvailable"
-        :submit="addVariantToCart"
+        :submit="isVariantAvailable ? addVariantToCart : undefined"
+        :disabled="!isVariantAvailable"
         class="cursor-pointer pd-medium radius-big w-100 bg-main button h-3r"
       >
-        <div class="gap-micro flex flex-center flex-nowrap">
+        <div v-if="isVariantAvailable" class="gap-micro flex flex-center flex-nowrap">
           <IconShopcartAdd class="i-semi"/>
           <span class="t-nowrap">{{ t('addtoorder') }}</span>
         </div>
+        <template v-else>
+          <span v-if="!selectedVariant && productVariants.length > 1">Select variant</span>
+          <span v-else>Out of Stock</span>
+        </template>
       </Button>
-
-      <div
-        v-else
-        class="flex-center flex uppercase radius-big t-black w-100 pd-medium t-medium bg-grey h-3r"
-      >
-        <span v-if="!selectedVariant && productVariants.length > 1">Select variant</span>
-        <span v-else>Out of Stock</span>
-      </div>
     </div>
   </div>
 </template>
@@ -71,6 +83,8 @@ import ProductVariants from '../blocks/ProductVariants.vue';
 import ProductDiscounts from '../blocks/ProductDiscounts.vue';
 import QuantitySelector from '../elements/QuantitySelector.vue';
 
+import Price from '@martyrs/src/modules/products/components/elements/Price.vue'
+
 const props = defineProps({
   productVariants: { type: Array, default: () => [] },
   productId: { type: String, required: true },

package/src/modules/products/components/sections/ProductsPopular.vue

@@ -0,0 +1,45 @@
+<template>
+  <Carousel
+    :store="{
+      read: products.actions.read
+    }"
+    :options="{ 
+      limit: 10 
+    }"
+    :text="{ title: 'No products available' }"
+    :showDots="true"
+    class="popupar_products"
+  >
+    <template #default="{ item }">
+      <router-link  
+        :to="{ name: 'Organization_Product', params: { _id: item.owner.target, product: item._id } }"
+        class="h-100 pos-relative block"
+      >
+        <CardProduct  
+          :product="item"
+          class="h-max-40r h-100 bg-light"
+        />
+      </router-link>
+    </template>
+  </Carousel>
+</template>
+
+<script setup>
+import Carousel from '@martyrs/src/components/Feed/Carousel.vue'
+import CardProduct from '@martyrs/src/modules/products/components/blocks/CardProduct.vue'
+
+import * as products from '@martyrs/src/modules/products/store/products.js'
+</script>
+
+<style lang="scss">
+.popupar_products .carousel__slide {
+  flex: 0 0 25%;
+  min-width: 0;
+}
+@media screen and (max-width: 1025px) {
+  .popupar_products .carousel__slide {
+    flex: 0 0 75%;
+    min-width: 0;
+  }
+}
+</style>

package/src/modules/products/components/sections/ProductsRecommended.vue

@@ -0,0 +1,134 @@
+<script setup>
+import { ref, computed } from 'vue'
+import { useRouter } from 'vue-router'
+
+import Button from '@martyrs/src/components/Button/Button.vue'
+import Checkbox from '@martyrs/src/components/Checkbox/Checkbox.vue'
+
+import CardProduct from '@martyrs/src/modules/products/components/blocks/CardProduct.vue'
+
+import IconShopcart from '@martyrs/src/modules/icons/entities/IconShopcart.vue';
+import IconProducts from '@martyrs/src/modules/icons/entities/IconProducts.vue';
+import IconShopcartAdd from '@martyrs/src/modules/icons/actions/IconShopcartAdd.vue'
+
+import * as shopcart from '@martyrs/src/modules/orders/store/shopcart.js'
+
+const router = useRouter()
+
+// Props
+const props = defineProps({
+  products: {
+    type: Array,
+    required: true,
+    default: () => []
+  }
+})
+
+// Состояние выбранных товаров - массив id товаров с вариантами
+const selectedProducts = ref(props.products.filter(p => p.variants?.length > 0).map(p => p._id))
+
+// Вычисляемая общая цена
+const totalPrice = computed(() => {
+  return props.products
+    .filter(p => selectedProducts.value.includes(p._id))
+    .reduce((sum, p) => {
+      const price = p.variants?.[0]?.price || 0
+      return sum + price
+    }, 0)
+    .toFixed(2)
+})
+
+// Проверка возможности добавления в корзину
+const canAddToCart = computed(() => {
+  const selected = props.products.filter(p => selectedProducts.value.includes(p._id))
+  return selected.length > 0 && selected.some(p => p.variants?.length > 0)
+})
+
+const handleProductClick = (product) => {
+  if (product?._id && product?.owner?.target) {
+    router.push({
+      name: 'Organization_Product', 
+      params: { 
+        _id: product.owner.target, 
+        product: product._id 
+      } 
+    })
+  }
+}
+
+// Добавление выбранных товаров в корзину
+const addSelectedToCart = async () => {
+  const selected = props.products.filter(p => selectedProducts.value.includes(p._id))
+  
+  if (selected.length === 0) return
+  
+  try {
+    // Берем организацию первого товара
+    const firstProduct = selected[0]
+    const organizationId = firstProduct.owner?.target?._id || firstProduct.owner?.target
+    
+    // Проверяем, что в корзине товары той же организации
+    if (shopcart.state.organization && shopcart.state.organization !== organizationId) {
+      // Можно добавить подтверждение замены корзины
+      shopcart.state.positions = []
+    }
+    
+    shopcart.state.organization = organizationId
+    
+    // Добавляем каждый выбранный товар
+    for (const product of selected) {
+      // Проверяем наличие варианта
+      if (!product.variants || product.variants.length === 0) continue
+      
+      await shopcart.actions.addProductToCart(
+        product, 
+        organizationId,
+        null // selectedDates для rent листинга
+      )
+    }
+  } catch (error) {
+    console.error('Error adding to cart:', error)
+  }
+}
+</script>
+
+<template>
+  <div>
+    <h3 class="mn-b-small">Frequently Bought Together</h3>
+    <div class="recommended-products cols-4 mobile:cols-2 gap-thin">
+      
+      <CardProduct  
+        v-for="(product, index) in products" 
+        :key="product?._id || index"
+        :product="product"
+        class="h-100 bg-light"
+        @click="handleProductClick(product)"
+        :showAddToCart="false"
+      >
+        <Checkbox
+          v-model:radio="selectedProducts"
+          :value="product._id"
+          mode="checkbox"
+          :validation="!product.variants || product.variants.length === 0"
+          class="pos-r-small pos-t-small pos-absolute"
+          @click.stop
+        />
+      </CardProduct>
+
+      <div class="flex-center flex flex-column pd-small radius-small br-solid br-1px br-light">
+        <div class="mn-b-thin i-extra pd-small bg-light radius-extra">
+          <IconProducts class="i-big"/>
+        </div>
+        <p class="mn-b-small">Total price:</p>
+        <p class="mn-b-medium h3 t-medium">${{ totalPrice }}</p>
+        <Button 
+          class="bg-main gap-micro"
+          :submit="canAddToCart ? addSelectedToCart : undefined"
+        >
+          <IconShopcartAdd class="i-semi"/>
+          <span>Add to Cart</span>
+        </Button>
+      </div>
+    </div>
+  </div>
+</template>

package/src/modules/products/controllers/configs/products.lookup.config.js

@@ -104,6 +104,14 @@ export default  {
       }
     ]
   },
+  recommended: {
+    lookup: {
+      from: 'products',
+      localField: 'recommended',
+      foreignField: '_id',
+      as: 'recommended'
+    }
+  },
   // Лукап для категорий продукта
   categories: {
     lookup: {
@@ -112,24 +120,21 @@ export default  {
       foreignField: '_id',
       as: 'category'
     },
-    additionalStages: [
-      // Проецируем только нужные поля для каждой категории
-      {
-        $addFields: {
-          category: {
-            $map: {
-              input: '$category',
-              as: 'cat',
-              in: {
-                _id: '$$cat._id',
-                name: '$$cat.name',
-                description: '$$cat.description',
-                url: '$$cat.url'
-              }
+    additionalStages: [{
+      $addFields: {
+        category: {
+          $map: {
+            input: '$category',
+            as: 'cat',
+            in: {
+              _id: '$$cat._id',
+              name: '$$cat.name',
+              description: '$$cat.description',
+              url: '$$cat.url'
             }
           }
         }
       }
-    ]
+    }]
   }
 };

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

@@ -72,7 +72,7 @@ const controllerFactory = db => {
   const Update = async (req, res) => {
     try {
       const { _id } = req.params;
-      
+
       const updateData = {
         name: req.body.name,
         status: req.body.status,
@@ -81,8 +81,10 @@ const controllerFactory = db => {
         category: req.body.category?.map(cat => cat._id) || [],
         images: req.body.images,
         attributes: req.body.attributes,
+        recommended: req.body.recommended,
         localization: req.body.translations,
         discounts: req.body.discounts,
+        included: req.body.included
       };
       
       const updatedProduct = await Product.findOneAndUpdate({ _id }, updateData, { new: true });
@@ -90,7 +92,9 @@ const controllerFactory = db => {
       if (!updatedProduct) {
         return res.status(404).send({ message: 'Something wrong when updating product.' });
       }
+
       res.status(200).send(updatedProduct);
+
     } catch (err) {
       res.status(500).send({ message: err.message });
     }
@@ -108,6 +112,7 @@ const controllerFactory = db => {
       res.status(500).send({ message: err.message });
     }
   };
+  
   const getProductRecommendation = async (req, res) => {
     const { mood } = req.body;
     try {
@@ -155,32 +160,12 @@ const controllerFactory = db => {
       res.status(500).send({ message: err });
     }
   };
-  const getProductsPopular = (req, res) => {
-    Product.find({
-      status: 'published',
-      views: { $gt: 10 },
-    })
-      // .populate('variants')
-      .limit(10)
-      .exec((err, products) => {
-        // If error
-        if (err) {
-          return res.status(500).send({ message: err });
-        }
-        // If not found
-        if (!products) {
-          return res.status(404).send({ message: 'Products not found.' });
-        }
-        // If succes
-        res.status(200).send(products);
-      });
-  };
+
   return {
     Create,
     Read,
     Update,
     Delete,
-    getProductsPopular,
     getProductRecommendation,
   };
 };

package/src/modules/products/models/category.model.js

@@ -24,8 +24,35 @@ export default db => {
   ownership(CategorySchema, db);
   metadata(CategorySchema, db);
   engagement(CategorySchema, db);
-  CategorySchema.index({ parent: 1 });
+
+   
+  // Текстовый индекс для поиска
   CategorySchema.index({ name: 1 });
+  CategorySchema.index({ name: 'text', description: 'text' });
+  
+  // Основные составные индексы (покрывают префиксные запросы)
+  CategorySchema.index({ 'owner.type': 1, 'owner.target': 1, status: 1, parent: 1 });
+  CategorySchema.index({ 'owner.type': 1, 'owner.target': 1, order: 1 });
+  CategorySchema.index({ parent: 1, status: 1, order: 1 });
+  CategorySchema.index({ parent: 1, status: 1, 'owner.type': 1 });
+  CategorySchema.index({ parent: 1, name: 1 });
+  CategorySchema.index({ parent: 1, createdAt: -1 });
+  CategorySchema.index({ parent: 1, updatedAt: -1 });
+  
+  // Индексы для сортировки без parent
+  CategorySchema.index({ status: 1, order: 1 });
+  CategorySchema.index({ status: 1, name: 1 });
+  CategorySchema.index({ status: 1, createdAt: -1 });
+  CategorySchema.index({ status: 1, updatedAt: -1 });
+  
+  // Специальный индекс для graphLookup
+  CategorySchema.index({ _id: 1, parent: 1 });
+  
+  // Отдельные индексы для полей без префиксов в составных
+  CategorySchema.index({ order: 1 });
+  CategorySchema.index({ createdAt: -1 });
+  CategorySchema.index({ updatedAt: -1 });
+
   const Category = db.mongoose.model('Category', CategorySchema, 'categories');
   return Category;
 };

package/src/modules/products/models/leftover.model.js

@@ -65,7 +65,39 @@ export default db => {
 
   applyOwnershipSchema(LeftoverSchema, db);
 
+  // Существующий составной индекс
   LeftoverSchema.index({ storage: 1, order: 1, type: 1 });
+  
+  // Текстовый индекс для поиска по позициям
+  LeftoverSchema.index({ 'positions.name': 'text', comment: 'text' });
+  
+  // Основные составные индексы (покрывают префиксные запросы)
+  LeftoverSchema.index({ 'owner.type': 1, 'owner.target': 1, type: 1, storage: 1 });
+  LeftoverSchema.index({ 'owner.type': 1, 'owner.target': 1, createdAt: -1 });
+  LeftoverSchema.index({ 'owner.type': 1, 'owner.target': 1, updatedAt: -1 });
+  LeftoverSchema.index({ type: 1, 'owner.type': 1, 'owner.target': 1, createdAt: -1 });
+  LeftoverSchema.index({ type: 1, storage: 1 });
+  LeftoverSchema.index({ type: 1, order: 1 });
+  LeftoverSchema.index({ type: 1, createdAt: -1 });
+  LeftoverSchema.index({ type: 1, updatedAt: -1 });
+  LeftoverSchema.index({ type: 1, 'positions._id': 1 });
+  
+  // Индексы для позиций с составными
+  LeftoverSchema.index({ 'positions._id': 1, type: 1, createdAt: -1 });
+  LeftoverSchema.index({ storage: 1, 'positions._id': 1, type: 1 });
+  LeftoverSchema.index({ storage: 1, createdAt: -1 });
+  LeftoverSchema.index({ order: 1, type: 1 });
+  LeftoverSchema.index({ order: 1, createdAt: -1 });
+  
+  // Индексы для позиций
+  LeftoverSchema.index({ 'positions._id': 1 });
+  LeftoverSchema.index({ 'positions.product': 1 });
+  LeftoverSchema.index({ 'positions.variant._id': 1 });
+  LeftoverSchema.index({ 'positions.name': 1 });
+  
+  // Отдельные индексы для полей без префиксов в составных
+  LeftoverSchema.index({ createdAt: -1 });
+  LeftoverSchema.index({ updatedAt: -1 });
 
   const Leftover = db.mongoose.model('Leftover', LeftoverSchema);
 

package/src/modules/products/models/product.model.js

@@ -28,10 +28,17 @@ export default db => {
     description: {
       type: String,
     },
+    included: {
+      type: String
+    },
     attributes: [{
       name: { type: String },
       value: { type: String },
     }],
+    recommended: [{ 
+      type: db.mongoose.Schema.Types.ObjectId, 
+      ref: 'Product' 
+    }],
     translations: {
       type: Array,
     },
@@ -45,9 +52,38 @@ export default db => {
   applyCommonSchema(ProductSchema, db);
   applyOwnershipSchema(ProductSchema, db);
 
-  ProductSchema.index({ category: 1 });
+   // Текстовый индекс для поиска
   ProductSchema.index({ name: 'text', description: 'text' });
 
+  // Основные составные индексы (покрывают префиксные запросы)
+  ProductSchema.index({ 'owner.type': 1, 'owner.target': 1, status: 1, category: 1 });
+  ProductSchema.index({ category: 1, status: 1, delivery: 1, price: 1 });
+  ProductSchema.index({ category: 1, status: 1, price: -1 });
+  ProductSchema.index({ category: 1, status: 1, views: -1 });
+  ProductSchema.index({ category: 1, status: 1, createdAt: -1 });
+  ProductSchema.index({ category: 1, status: 1, updatedAt: -1 });
+  ProductSchema.index({ category: 1, delivery: 1, price: 1 });
+  
+  // Индексы для атрибутов
+  ProductSchema.index({ 'attributes.name': 1, 'attributes.value': 1 });
+  
+  // Индексы для сортировки без категории
+  ProductSchema.index({ status: 1, delivery: 1, price: 1 });
+  ProductSchema.index({ status: 1, price: -1 });
+  ProductSchema.index({ status: 1, views: -1 });
+  ProductSchema.index({ status: 1, createdAt: -1 });
+  ProductSchema.index({ status: 1, updatedAt: -1 });
+  ProductSchema.index({ status: 1, name: 1 });
+  ProductSchema.index({ status: 1, 'attributes.name': 1, 'attributes.value': 1 });
+  
+  // Отдельные индексы для полей без префиксов в составных
+  ProductSchema.index({ listing: 1 });
+  ProductSchema.index({ recommended: 1 });
+  ProductSchema.index({ price: 1 });
+  ProductSchema.index({ views: -1 });
+  ProductSchema.index({ createdAt: -1 });
+  ProductSchema.index({ updatedAt: -1 });
+
   const Product = db.mongoose.model('Product', ProductSchema);
 
   return Product;

package/src/modules/products/models/variant.model.js

@@ -58,7 +58,42 @@ export default db => {
   applyCommonSchema(VariantSchema, db);
   applyOwnershipSchema(VariantSchema, db);
 
+  // Существующий индекс
   VariantSchema.index({ Variant: 1, name: 1 });
+  
+  // Текстовый индекс для поиска
+  VariantSchema.index({ name: 'text', sku: 'text' });
+  
+  // Основные составные индексы (покрывают префиксные запросы)
+  VariantSchema.index({ 'owner.type': 1, 'owner.target': 1, product: 1, status: 1 });
+  VariantSchema.index({ product: 1, status: 1, price: 1 });
+  VariantSchema.index({ product: 1, status: 1, quantity: 1 });
+  VariantSchema.index({ product: 1, sku: 1 });
+  VariantSchema.index({ product: 1, 'ingredients._id': 1 });
+  
+  // Индексы для атрибутов
+  VariantSchema.index({ 'attributes.name': 1, 'attributes.value': 1 });
+  
+  // Составные индексы для сортировки
+  VariantSchema.index({ status: 1, price: 1 });
+  VariantSchema.index({ status: 1, price: -1 });
+  VariantSchema.index({ status: 1, quantity: 1 });
+  VariantSchema.index({ status: 1, quantity: -1 });
+  VariantSchema.index({ status: 1, createdAt: -1 });
+  VariantSchema.index({ status: 1, updatedAt: -1 });
+  VariantSchema.index({ status: 1, quantity: 1, product: 1 });
+  
+  // Индексы для ингредиентов
+  VariantSchema.index({ 'ingredients._id': 1 });
+  VariantSchema.index({ 'ingredients.quantity': 1 });
+  
+  // Отдельные индексы для полей без префиксов в составных
+  VariantSchema.index({ sku: 1 });
+  VariantSchema.index({ name: 1 });
+  VariantSchema.index({ price: 1 });
+  VariantSchema.index({ quantity: 1 });
+  VariantSchema.index({ createdAt: -1 });
+  VariantSchema.index({ updatedAt: -1 });
 
   const Variant = db.mongoose.model('Variant', VariantSchema);
 

package/src/modules/products/products.client.js

@@ -20,7 +20,7 @@ import ProductImages from './components/blocks/ProductImages.vue';
 import EditVariants from './components/sections/EditVariants.vue';
 import FilterProducts from './components/sections/FilterProducts.vue';
 import HeroRecommendation from './components/sections/HeroRecommendation.vue';
-import PopularProducts from './components/sections/PopularProducts.vue';
+import ProductsPopular from './components/sections/ProductsPopular.vue';
 import SectionProduct from './components/sections/SectionProduct.vue';
 
 // Elements
@@ -72,7 +72,7 @@ const ModuleProducts = {
       HeroRecommendation,
       FilterProducts,
       EditVariants,
-      PopularProducts,
+      ProductsPopular,
       // Pages
       Product,
       ProductEdit,
@@ -98,7 +98,7 @@ export {
   // Blocks
   ProductImages,
   Leftovers,
-  PopularProducts,
+  ProductsPopular,
   // Elements
   Price,
   // Pages

package/src/modules/products/routes/products.routes.js

@@ -9,5 +9,6 @@ export default (function (app, db, allowedOrigins) {
   app.post('/api/products/:_id', controller.Update);
   // (D) Delete product
   app.delete('/api/products/:_id', controller.Delete);
+  
   app.post('/api/product/recommended', controller.getProductRecommendation);
 });

package/src/modules/products/store/products.js

@@ -25,8 +25,10 @@ const state = reactive({
     price: 0,
     price_cost: 0,
     localization: [],
+    recommended: [],
     variants: [],
     discounts: [],
+    included: [],
     ingredients: [],
     description: '',
   },
@@ -206,6 +208,7 @@ const actions = {
 const mutations = {
   resetProduct(product) {
     state.current = {
+      included: [],
       recommendation: false,
       category: [],
       status: 'unpublished',
@@ -220,6 +223,7 @@ const mutations = {
       price_currency: '$',
       localization: [],
       variants: [],
+      recommended: [],
       discounts: [],
       ingredients: [],
       description: '',

package/src/modules/wallet/views/localization/wallet.json

@@ -1,6 +1,6 @@
 {
   "messages": {
-    "en-default": {
+    "en": {
       "wallet": {
         "title": "Your Wallet",
         "subtitle": "Earn WDT by purchasing our weed or contributing to the community.",
@@ -14,7 +14,7 @@
         "depositWithCrypto": "deposit with crypto"
       }
     },
-    "ru-default": {
+    "ru": {
       "wallet": {
         "title": "Ваш Кошелек",
         "subtitle": "Зарабатывайте WDT, покупая товары или внося вклад в сообщество.",