@ozdao/prometheus-framework 0.2.30 → 0.2.32

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

@@ -1,14 +1,38 @@
 <template>
 <div id="popularProducts" class="pd-thin">
 	<div class="bg-grey radius-big pd-t-big pd-b-big">
-		<div class="mn-b-semi t-center title">
-			<h2 class="">{{t('title')}}</h2>
+
+		<h2 class="mn-b-semi t-center ">{{t('title')}}</h2>
+		
+		<div class="embla" ref="emblaNode">
+		 	<div class="embla__container">
+		   
+		    <div class="embla__slide pd-thin" v-for="(value, key, index) in productsState" :key="key">
+		    	<transition name="fade" mode="out-in" appear>
+						<div 
+							v-if="!value.name" 
+							class="h-100 w-100 radius-big flex-center bg-grey"
+						>
+							<Loader class="pos-relative"/>
+						</div>
+						
+						<CardProduct 
+							v-else 
+							@click="$router.push({
+			          name: 'Product Organization', 
+			          params: { 
+			            _id: value.organization, 
+			            product: value._id 
+			          } 
+			        })" 
+							:product="value"
+							class="cursor-pointer transition-ease-in hover-scale-0 h-100 w-100" 
+						/>
+					</transition>
+		    </div>
+
+    	</div>
 		</div>
-		<carousel ref="myCarousel" :items-to-show="3" :transition="330" :wrapAround="true" :autoplay="3000" :pauseAutoplayOnHover="true" :breakpoints="breakpoints">
-	    <slide class="pd-thin" v-for="(value, key, index) in products.state.all" :key="key">
-	      	<CardProduct  class="carousel__item h-100 w-100" :product="value"/>
-	    </slide>
-		</carousel>
 	</div>
 </div>
 </template>
@@ -20,17 +44,16 @@
 	import { useRouter } 	from 'vue-router'
 	import { useI18n } 		from 'vue-i18n'
 		
-	import 'vue3-carousel/dist/carousel.css'
-	import { Carousel, Slide, Pagination, Navigation } from 'vue3-carousel'
-	
+	import emblaCarouselVue from 'embla-carousel-vue'; // Assuming a Vue version exists
+	import Autoplay from 'embla-carousel-autoplay'
+
+	import Loader from '@pf/src/components/Loader/Loader.vue'
 	import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
 
 	import * as products from '@pf/src/modules/products/store/products';
 	
 	const router = useRouter()
 
-	await products.actions.read({limit: 10})
-
  	const text = {
     messages: {
       en: {
@@ -46,36 +69,57 @@
 
 	const { t } = useI18n(text)
 
-	const myCarousel = ref(null)
+	const productsState = ref(10)
+	const selectedIndex = ref(0);
+	const scrollSnaps = ref([]);
+
+	const autoplayOptions = {
+	  delay: 2000,
+	  jump: false,
+	  stopOnInteraction: false,
+	  stopOnMouseEnter: false,
+	  stopOnFocusIn: true,
+	  stopOnLastSnap: false,
+	  rootNode: (emblaRoot) => emblaRoot.parentElement
+	}
 
-	const breakpoints = {
-    320: 	{ itemsToShow: 1	},
-    640: 	{ itemsToShow: 3 		},
-    1024: { itemsToShow: 3 		},
-  }
+	const [emblaNode, emblaApi] = emblaCarouselVue({ loop: true }, [Autoplay(autoplayOptions)])
 
-	function slideTo(val) {
-    myCarousel.value.slideTo(val)
-  }
-  function updateSlideWidth() {
-	  if (!root.value) return;
-	  
-	  const rect = root.value.getBoundingClientRect();
-	  
-	  slideWidth.value = rect.width / config.itemsToShow;
-	}
+	const scrollTo = (index) => emblaApi.value && emblaApi.value.scrollTo(index);
+	const onInit = (embla) =>  scrollSnaps.value = emblaApi.value.scrollSnapList();
+	const onSelect = (embla) => selectedIndex.value = emblaApi.value.selectedScrollSnap();
 
-	onMounted(async () => {
-		
+	onMounted(async() => {
+		productsState.value = await products.actions.read({
+			limit: 10, 
+			organization: '657e7134efb8110c51b8b713'
+		})
+
+	  onInit(emblaApi);
+	  onSelect(emblaApi);
 
-		setTimeout(() => {
-    	myCarousel.value.updateSlideWidth();
-  	}, 500);
-	})
+	  emblaApi.value.on('reInit', onInit);
+	  emblaApi.value.on('reInit', onSelect);
+	  emblaApi.value.on('select', onSelect);
+	});
 </script>
 
 <style lang="scss">
+	.embla {
+    overflow: hidden;
+  }
+  .embla__container {
+    display: flex;
+  }
+  .embla__slide {
+    flex: 0 0 25%;
+    min-width: 0;
+  }
 
-</style>
-
-
+  @media screen and (max-width: 1025px) {
+    .embla__slide {
+	    flex: 0 0 50%;
+	    min-width: 0;
+	  }
+  }
+</style>

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

@@ -1,7 +1,8 @@
 <template>
-	<div class="cols-2-1_2 gap-big product-data-wrapper">
-		<div class="flex-nowrap flex-column flex">
-			<div class="h-100 bg-white radius-medium o-hidden">
+	<div class="cols-2-1_2 w-100 gap-big">
+		
+		<div class="flex-nowrap flex-column flex pos-relative">
+			<div class="h-100 h-max-50vh bg-grey radius-big o-hidden">
 				<!-- PRODUCT IMAGE -->
 				<Images360
 					v-if="product && product.image3d"
@@ -9,30 +10,19 @@
 					:imagePath="`/assets/images/products/${product.image3d}`"
 					:imageCount="36"
 				/>
+
 				<img
 					v-if="images[0] && !product.image3d"
-					class="h-100 w-100"
-					style="object-fit: cover;"
+					class="h-100 bg-grey w-100"
+					style="object-fit: contain;"
 					:src="(FILE_SERVER_URL || '') + images[0]"
 				/>
-				<svg 
-					width="524" 
-					height="345" 
-					viewBox="0 0 524 345" 
-					fill="none" 
-					xmlns="http://www.w3.org/2000/svg"
+
+				<PlaceholderImage
 					v-if="!images[0] && !product.image3d"
 					class="h-100 w-100"
 					style="object-fit: cover;"
-				>
-					<rect width="524" height="345" fill="white"/>
-					<rect width="524" height="345" fill="white" />
-					<circle cx="262" cy="172" r="56" fill="#00ff88" fill-opacity="0.1"/>
-					<path  
-						fill="#00ff88" 
-						d="M229.348 186.819C230.243 191.884 233.393 194.231 238.458 193.273V193.644C238.458 198.832 241.206 201.581 246.364 201.581H291.545C296.733 201.581 299.481 198.74 299.481 193.644V162.576C299.481 157.481 296.733 154.64 291.545 154.64H285.677L284.071 145.653C283.175 140.619 279.995 138.303 274.899 139.198L230.398 147.043C225.302 147.969 223.048 151.15 223.943 156.246L229.348 186.819ZM230.83 186.479L225.456 156.06C224.715 151.86 226.537 149.266 230.737 148.525L275.084 140.712C279.13 140.001 281.848 141.762 282.62 145.993L284.102 154.64H246.364C241.206 154.64 238.458 157.419 238.458 162.576V191.729L238.365 191.76C234.165 192.532 231.571 190.679 230.83 186.479ZM239.971 162.669C239.971 158.376 242.164 156.153 246.456 156.153H291.483C295.59 156.153 297.968 158.376 297.968 162.669V190.093L284.565 177.894C283.145 176.597 281.662 175.856 279.809 175.856C277.987 175.856 276.628 176.566 275.146 177.863L262.052 189.073L257.142 184.565C255.875 183.36 254.764 182.743 253.158 182.743C251.675 182.743 250.656 183.36 249.39 184.503L239.971 193.212V162.669ZM257.636 178.419C261.373 178.419 264.43 175.3 264.43 171.471C264.43 167.734 261.373 164.584 257.636 164.584C253.806 164.584 250.718 167.734 250.718 171.471C250.718 175.3 253.806 178.419 257.636 178.419Z"
-					/>
-				</svg>
+				/>
 
 			</div>
 
@@ -43,7 +33,7 @@
 			/>
 		</div>
 
-		<div class="h-100 flex-justify flex col">
+		<div class="pos-relative w-100 h-100 flex-column flex-justify flex col">
 
 			<IconEdit
 				@click="$router.push({
@@ -69,9 +59,12 @@
 			<h3 v-if="recommendation" class="mn-b-semi">
 				{{ recommendation }}
 			</h3>
-			<p v-if="product.description && !product.localization && !recommendation" class="w-100 mn-b-medium t-transp">
+
+
+			<p v-if="product.description && !product.localization < 1 && !recommendation" class="w-100 mn-b-medium t-transp">
 				{{ product.description }}
 			</p>
+
 			<p v-if="product.localization && product.localization.length > 1 && !recommendation" class="w-100  mn-b-medium t-transp">
 				{{ t('description') }}
 			</p>
@@ -82,7 +75,7 @@
 				<div 
 					v-if="product.information.length > 0" 
 					v-for="information in product.information" 
-					class="w-100 pd-small radius-small bg-white product-information"
+					class="w-100 pd-small radius-small bg-grey-transp-30 product-information"
 				>
 					<p class="t-demi">{{ information.name }}</p>
 					<p>{{ information.value }}</p>
@@ -111,6 +104,7 @@ import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 	
 import THC from '@pf/src/modules/products/components/elements/THC.vue'
 import Price from '@pf/src/modules/products/components/elements/Price.vue'
+import PlaceholderImage from '@pf/src/modules/icons/placeholders/PlaceholderImage.vue'
 // import SelectElement 	from '@/components/elements/SelectElement.vue'
 
 import { computed } from 'vue'
@@ -166,6 +160,10 @@ function validateToCard(product) {
 }
 
 function addToCart(product) {
+	if (shopcart.state.organization !== product.organization) {
+		shopcart.state.positions = []
+		shopcart.state.organization = product.organization
+	}
   shopcart.actions.addProductToCart(product)
 }
 </script>

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

@@ -1,12 +1,21 @@
+const ObjectId = require('mongoose').Types.ObjectId;
+
 const controllerFactory = (db) => {
   const Leftover = db.leftover;
 
   const getAll = async (req, res) => {
     try {
-      const leftoveres = await Leftover.find({}).sort({ 'createdAt': 'desc' }).exec();
+      let query = {};
+      let options = {};
+
+      if (req.query.organization) query.organization = new ObjectId(req.query.organization)
+
+      const leftoveres = await Leftover.find(query, null, options).sort({ 'createdAt': 'desc' }).exec();
+      
       if (!leftoveres) {
         return res.status(404).send({ message: "LEFTOVERES_NOT_FOUND" });
       }
+
       res.status(200).send(leftoveres);
     } catch (err) {
       res.status(500).send({ message: "ERROR_GET_ALL_LEFTOVERES" });
@@ -16,6 +25,7 @@ const controllerFactory = (db) => {
   const create = async (req, res) => {
     try {
       const leftover = await Leftover.create({
+        organization: req.body.organization,
         type: req.body.type,
         order: req.body.order,
         positions: req.body.positions

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

@@ -1,6 +1,6 @@
 const {v1: uuidv1, v4: uuidv4, } = require('uuid');
+const ObjectId = require('mongoose').Types.ObjectId;
 
-const fetch = require('node-fetch')
 const path = require('path');
 
 const OpenAI = require("openai");
@@ -26,44 +26,85 @@ const controllerFactory = (db) => {
       res.status(500).send({ message: err.message });
     }
   };
+  const ReadCount = async (req, res) => {
+    
+  }
   // Read products
   const Read = async (req, res) => {
     try {
-    
       let query = {};
       let options = {};
 
       if (req.query.organization) {
-        query.organization = req.query.organization;
+        query.organization = new ObjectId(req.query.organization);
       }
 
-      // Handle fetching a specific product by _id
       if (req.query._id) {
         query._id = req.query._id;
       }
 
-      if (req.status) {
+      if (req.query.status) {
         query.status = req.query.status;
       }
 
-      // Handle pagination
-      options.skip = parseInt(req.query.skip);
-      options.limit = parseInt(req.query.limit);
-      
+      const categories = req.query.categories?.split(',') || [];
+
+      if (categories.length) {
+        query.category = { $in: categories };
+      }
+
+      const deliveryOptions = req.query.delivery?.split(',') || [];
+
+      if (deliveryOptions.length) {
+        query.delivery = { $in: deliveryOptions };
+      }
+
+      // Handle price ranges
+      const prices = req.query.prices?.split(',') || [];
+
+      console.log(prices)
+      console.log(req.query.prices)
+
+      if (prices.length) {
+        query.price = { 
+          $or: prices.map(priceRange => {
+            if (priceRange.startsWith('<')) return { $lt: parseInt(priceRange.slice(1))  }
+            if (priceRange.startsWith('>')) return { $gt: parseInt(priceRange.slice(1))  }
+            
+            const [min, max] = priceRange.split('-').map(Number)
+            
+            return { $gte: min, $lte: max }
+          })
+        }
+      }
+
+      // Handle pagination and sorting
+      options.skip = parseInt(req.query.skip) || 0;
+      options.limit = parseInt(req.query.limit) || 10;
       options.sort = { createdAt: -1 };
 
+      // Count functionality
+      if (req.query.count) {
+        try {
+          const count = await Product.countDocuments(query);
+          return res.status(200).json({ count });
+        } catch (err) {
+          return res.status(500).json({ message: err.message });
+        }
+      }
+
       console.log(query)
+
+      // Fetching products
       const products = await Product.find(query, null, options);
 
-      // If not found
-      if (!products) {
-        return res.status(404).send({ message: "Products not found." });
+      if (!products.length) {
+        return res.status(200).json([]);
       }
-      console.log(products)
-      res.status(200).send(products);
+
+      res.status(200).json(products);
     } catch (err) {
-      // If error
-      return res.status(500).send({ message: err });
+      return res.status(500).json({ message: err.message });
     }
   };
 
@@ -85,6 +126,7 @@ const controllerFactory = (db) => {
           information: req.body.information,
           localization: req.body.localization,
           quantity: req.body.quantity,
+          quantityDiscount: req.body.quantityDiscount
         },
         { new: true }
       );
@@ -204,7 +246,6 @@ const controllerFactory = (db) => {
     try {
       const products = await Product.find({
         status: 'published',
-        popularity: { $gt: 10 },
       }).limit(40);
 
       if (!products) {
@@ -286,97 +327,59 @@ const controllerFactory = (db) => {
     });
   };
   // Get product
-  const getProduct = (req, res) => {
-    Product.aggregate([{ 
-        $match: { "_id" : req.params._id } 
-    },{
-      $lookup: {
-        from: "modifications",
-        let: { "productId": "$_id" },
-        pipeline: [{ 
-          $match: { 
-            "$expr": { 
-              "$eq": ["$product._id", "$$productId"] 
-            }
-          }
-        },{
-          $lookup: {
-            from: "leftovers",
-            let: { "productId": "$_id" },
-            pipeline: [{
+  const getProduct = async (req, res) => {
+    try {
+      const product = await  Product.aggregate([{ 
+        $match: { "_id" : new ObjectId(req.params._id) } 
+      },{
+        $lookup: {
+          from: "leftovers",
+          let: { "productId": "$_id" },
+          pipeline: [
+            {
               $unwind: "$positions"
-            },{ 
+            },
+            { 
               "$match": { "$expr": { "$eq": ["$positions._id", "$$productId"] }}
-            },{ 
+            },
+            { 
               "$project": {
                 _id: "$positions._id",
                 quantity: "$positions.quantity",
                 name: "$positions.name",
               // "quantity": "$$quantity"
               }
-            }],
-            as: "variantsMods"
-          },
-        },{ 
-          $set: { 
-            quantity:{
-              $sum:["$quantity",{$sum:"$variantsMods.quantity"}]
-            } 
-          }
-        },{ 
-          $unset: "variants" 
-        }],
-        as: "modifications"
-      },
-    },{
-      $lookup: {
-        from: "leftovers",
-        let: { "productId": "$_id" },
-        pipeline: [
-          {
-            $unwind: "$positions"
-          },
-          { 
-            "$match": { "$expr": { "$eq": ["$positions._id", "$$productId"] }}
-          },
-          { 
-            "$project": {
-              _id: "$positions._id",
-              quantity: "$positions.quantity",
-              name: "$positions.name",
-            // "quantity": "$$quantity"
             }
-          }
-        ],
-        as: "variants"
-      }
-    },{ 
-      $set: { 
-        quantity:{
-          $sum:["$quantity",{$sum:"$variants.quantity"}]
+          ],
+          as: "variants"
+        }
+      },{ 
+        $set: { 
+          quantity:{
+            $sum:["$quantity",{$sum:"$variants.quantity"}]
+          } 
         } 
-      } 
-    },
-    { $unset: "variants" }
-  ])
-  .exec((err, product) => {
-    // If error
-    if (err) {return res.status(500).send({ message: err }); }
-    // If not found
-    if (!product) {return res.status(404).send({ message: "Product not found." }); }
-    // If success
-    Product.findOneAndUpdate(
-      { _id: req.params._id },
-      { $inc: { popularity: 1 } },
-      { new: true },
-      (err, updatedProduct) => {
-        if (err) { console.error('Error updating popularity:', err); }
-        else { console.log('Popularity updated:', updatedProduct); }
+      },
+      { $unset: "variants" }
+    ])
+
+      if (!product || product.length < 1) {
+        return res.status(404).send({ message: "Product not found." });
       }
-    );
-    res.status(200).send(product[0]);
-    console.log(product)
-    }); 
+
+      const updatedProduct = await Product.findOneAndUpdate(
+        { _id: req.params._id },
+        { $inc: { popularity: 1 } },
+        { new: true }
+      );
+
+      console.log('Popularity updated:', updatedProduct);
+
+     res.status(200).send(product);
+    } catch (err) {
+      console.error('Error:', err);
+      res.status(500).send({ message: err });
+    }
   };
   
   return {

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

@@ -1,8 +1,9 @@
 module.exports = (mongoose) => {
   const LeftoverSchema = new mongoose.Schema({
     organization: {
-      type: Object
-    },
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Organization',
+    },    
     type: {
       type: String,
       enum: ['stock-in','stock-out','write-off'], 
@@ -17,8 +18,9 @@ module.exports = (mongoose) => {
     },
     positions: [{
       _id: {
-        type: String
-      }, 
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Product',
+      },    
       name: {
         type: String
       },

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

@@ -15,7 +15,6 @@ module.exports = (mongoose) => {
         description:    {type: String},
         sale:           {type: Number},
         price:          {type: Number},
-        coverImage:     {type: String},
         images:         {type: Array},
         popularity:     {type: Number}, 
         localization:   {type: Array},
@@ -25,6 +24,19 @@ module.exports = (mongoose) => {
         }],
         // MoySklad
         quantity:     {type: Number},
+        quantityDiscount: [{
+            quantity: {
+                type: Number,
+                required: true,
+                min: [1, 'Quantity cannot be less than 1']
+            },
+            discount: {
+                type: Number,
+                required: true,
+                min: [0, 'Quantity-based discount cannot be less than 0'],
+                max: [100, 'Quantity-based discount cannot be more than 100']
+            },
+        }]
     }, {
         timestamps: { 
             currentTime: () => Date.now() 

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

@@ -46,9 +46,9 @@ module.exports = function(app, db, allowedOrigins) {
     controller.getProductRecommendation
   );
   // // Get product
-  // app.get(
-  //   "/products/:_id",
-  //   controller.getProduct
-  // );
+  app.get(
+    "/products/:_id",
+    controller.getProduct
+  );
 };
 

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

@@ -11,6 +11,7 @@ const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true
 const state = reactive({
   all: [],
   current: {
+    organization: "",
     type: "",
     order: "",
     positions: [],
@@ -20,7 +21,7 @@ const state = reactive({
 const actions = {
   async read(options) {
     try {
-      const response = await $axios.get('/leftovers');
+      const response = await $axios.get('/leftovers', { params: options });
       state.all = response.data;
       return response.data;
     } catch (error) {
@@ -40,9 +41,9 @@ const actions = {
     }
   },
 
-  async create({ type, order, positions }) {
+  async create({ organization, type, order, positions }) {
     try {
-      const response = await $axios.post('/leftovers', { type, order, positions });
+      const response = await $axios.post('/leftovers', { organization, type, order, positions });
       state.all.push(response.data);
       return response.data;
     } catch (error) {
@@ -72,27 +73,6 @@ const actions = {
       throw error;
     }
   },
-
-  // In your Vuex store
-  addProductToLeftover({ product, price, quantity, type }) {
-    const existingProduct = state.current.positions.find(item => item._id === product._id);
-
-    if (!existingProduct) {
-      state.current.positions.push({ ...product, price, quantity, type });
-    } else {
-      existingProduct.quantity += quantity;
-      existingProduct.price = price;
-      existingProduct.type = type
-    }
-  },
-
-  deleteItemFromLeftover(product) {
-    const index = state.current.positions.findIndex(c => c._id === product._id);
-    if (index !== -1) {
-      state.current.positions.splice(index, 1);
-    }
-  },
-
 };
 
 const history = [];