@ozdao/prometheus-framework 0.2.64 → 0.2.66

package/src/modules/products/components/blocks/CardPosition.vue

@@ -1,55 +1,61 @@
 <template>
-	<div class="gap-thin flex-nowrap flex">
-		<SelectMulti
-			v-model="productSelected"
-			:options="products"
-			label="name"
-			:multiple="false"
-			:taggable="false"
-			placeholder="Select a product"
-			class="bg-white pd-small radius-small" 
-		/>
-		<Field 
-			v-model:field="productPrice"
-			type="number"   
-			label="Price" 
-			:symbol="returnCurrency()"
-			class="bg-white pd-small radius-small" 
-		/>
-		<Field 
-			v-model:field="productQuantity" 
-			type="number"  
-			label="Qty" 
-			class="bg-white pd-small radius-small" 
-		>
-		<Select 
-			v-model:select="productQuantityType" 
-			:options="[
-				'pcs',
-				'g',
-				'ml'
-			]"
-			class="bg-grey pd-thin radius-thin"
-		/>
-
-		</Field>
-
-		<button 
-			v-if="!product"
-			:disabled="!isProductValid" 
-			@click="addProduct" 
-			class="bg-main aspect-1x1 radius-small pd-small"
-		>
-			<IconAdd class="i-semi"/>
-		</button>
-
-		<button 
-			v-if="product"
-			@click="deleteProduct" 
-			class="bg-red aspect-1x1 radius-small pd-small"
-		>
-			<IconDelete class="i-semi"/>
-		</button>
+	<div class="gap-thin">
+		<div class="gap-thin mn-b-thin flex-nowrap flex">
+			<SelectMulti
+				v-model="productSelected"
+				:options="products"
+				label="name"
+				:multiple="false"
+				:taggable="false"
+				placeholder="Select a product"
+				class="bg-white br-solid br-1px br-black-transp-5 pd-small radius-small" 
+			/>
+			<button 
+				v-if="!product"
+				:disabled="!isProductValid" 
+				@click="addProduct" 
+				class="bg-main aspect-1x1 radius-small pd-small"
+			>
+				<IconAdd class="i-semi"/>
+			</button>
+
+			<button 
+				v-if="product"
+				@click="deleteProduct" 
+				class="bg-red aspect-1x1 radius-small pd-small"
+			>
+				<IconDelete class="i-semi"/>
+			</button>
+		</div>
+		<div class="gap-thin flex-nowrap flex">
+			<Field 
+				v-model:field="productPrice"
+				type="number"   
+				label="Price" 
+				:symbol="returnCurrency()"
+				class="bg-white w-100 br-solid br-1px br-black-transp-5  pd-small radius-small" 
+			/>
+			<Field 
+				v-model:field="productQuantity" 
+				type="number"  
+				label="Qty" 
+				class="bg-white w-100 br-solid br-1px br-black-transp-5 pd-small radius-small" 
+			>
+			<Select 
+				v-model:select="productQuantityType" 
+				:options="[
+					'pcs',
+					'g',
+					'ml'
+				]"
+				class="bg-grey pd-r-thin pd-l-thin pd-t-nano pd-b-nano radius-thin"
+			/>
+
+			</Field>
+		</div>
+
+		
+		
 	</div>
 </template>
 

package/src/modules/products/components/pages/EditLeftover.vue

@@ -13,22 +13,60 @@
         class="bg-main t-black w-max pd-small t-semi p-big uppercase radius-small"
       />
     </header>
-
-    <Block
-      title="Add Position"
-      class="mn-b-semi"
+    
+    <Popup 
+      title="Add position" 
+      @close-popup="closeProductsPopup" 
+      :isPopupOpen="isOpenProductsPopup"
+      class="bg-white w-min-30r w-max-30r radius-big pd-medium"
     >
-      <CardPosition 
-        @add="(item) => globals.actions.add(
-          leftovers.state.current.positions,
-          item 
-        )"
-        :products="Products"
-      />
-    </Block>
+
+      <h3 class="mn-b-small">Add to order</h3>
+
+      <div class="bg-grey mn-b-thin h-min-20r h-max-20r o-scroll pd-medium radius-big">
+        <Feed
+          :search="true"
+          :states="{
+            empty: {
+              title: 'No Products Found',
+              description: 'Currently, there are no such products available.'
+            }
+          }"
+          :store="{
+            read: (options) => products.actions.read(options),
+            state: null
+          }"
+          :options="{
+            organization: route.params._id
+          }"
+          v-slot="{ 
+            items 
+          }"
+          class=""
+        >
+          <CardOrderItem
+            v-for="(product, index) in items" :key="product._id"
+            :editable="false" 
+            :product="product" 
+            @click="() => { 
+              let p = { ...product };
+              p.quantity = 1;
+              p.type = 'pcs'
+              globals.actions.add(leftovers.state.current.positions, p) 
+              closeProductsPopup();
+            }"
+            class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+          />
+        </Feed>
+      </div>
+    </Popup>
 
     <Block
       title="Invetory Sheet"
+      :actions="[{
+        label: '+',
+        function: () => openProductsPopup()
+      }]"
       placeholder="No positions added yet"
       class="mn-b-semi"
     >
@@ -38,10 +76,6 @@
         :product="product"
         :array="leftovers.state.current.positions"
         :products="Products"
-        @add="(item) => globals.actions.add(
-          leftovers.state.current.positions,
-          item 
-        )"
         @update="(item) => globals.actions.update(
           leftovers.state.current.positions,
           item,
@@ -52,8 +86,22 @@
           item,
           index
         )"
+        class="mn-b-small radius-medium bg-white pd-small"
       />
     </Block>
+
+    <Block
+      title="Comment"
+      class="mn-b-semi"
+    >
+      <Field
+        v-model:field="leftovers.state.current.comment"
+        label="Comment"
+        type="textarea"
+        class="w-100 bg-white radius-small pd-medium"
+      />  
+
+    </Block>
    
     <Block class="">
       <section class="gap-thin flex-v-center flex-nojustify flex">
@@ -93,10 +141,13 @@
   import Block from '@pf/src/components/Block/Block.vue';
 
   import Field from '@pf/src/components/Field/Field.vue';
+  import Feed from '@pf/src/components/Feed/Feed.vue'
   import Select from '@pf/src/components/Select/Select.vue';
+  import Popup from '@pf/src/components/Popup/Popup.vue';
   import SelectMulti from '@pf/src/components/SelectMulti/SelectMulti.vue';
 
   import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
+  import CardOrderItem  from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
 
   import { computed, onMounted, ref, reactive } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
@@ -118,6 +169,16 @@
     }, 0));
   });
 
+  const isOpenProductsPopup = ref(false);
+
+  function openProductsPopup() {
+    isOpenProductsPopup.value = true;
+  }
+
+  function closeProductsPopup() {
+    isOpenProductsPopup.value = false;
+  }
+
   onMounted(async () => {
     if (route.params.leftover) {
       try {

package/src/modules/products/components/pages/Leftovers.vue

@@ -12,7 +12,7 @@
     </header>
     
     <section class="mn-b-semi pd-medium bg-grey radius-big">
-      <p class="mn-b-thin">Spended:</p>
+      <p class="mn-b-thin">Balance:</p>
       <h3>{{formatPrice(totalPrice)}}</h3>
     </section>
 
@@ -47,6 +47,7 @@
     />
 
     <Feed
+      :search="true"
       :states="{
         empty: {
           title: 'No Leftovers Found',
@@ -58,9 +59,8 @@
       }"
       :options="{
         limit: 15,
-        organization: route.params._id,
+        owner: route.params._id,
         ...(tab !== 'all' && { type: tab })
-        // user: user
       }"
       v-slot="{ 
         items 

package/src/modules/products/components/pages/Products.vue

@@ -62,7 +62,7 @@
         v-slot="{ 
           items 
         }"
-        class="cols-3 gap-thin"
+        class="cols-4 gap-thin"
       >
         <CardProduct
           v-for="product in items"

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

@@ -1,29 +1,66 @@
+const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
+
 const controllerFactory = (db) => {
   const Leftover = db.leftover;
 
-  const getAll = async (req, res) => {
+  const read = async (req, res) => {
     try {
-      let query = {};
-      let options = {};
 
-      // Проверка наличия req.query.organization
-      if (req.query.organization) {
-        // Создание ObjectId из строки
-        query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
-      }
+      let matchConditions = [];
+
+      const search = req.query.search;
+
+      if (search) {
+        const parts = search.split('.');
 
-      if (req.query.type) {
-        query.type = req.query.type;
+        let regexPattern = '';
+
+        if (parts.length === 2) {
+          // Создаем паттерн, который допускает замену одного символа в каждой части
+          regexPattern = parts.map(part => part.substr(0, part.length - 1) + '.{1}').join('\\.');
+        } else {
+          // Если нет точки, применяем аналогичный подход к всей строке
+          regexPattern = search.substr(0, search.length - 1) + '.{1}';
+        }
+
+        matchConditions.push({
+          $or: [
+            { "comment": { $regex: regexPattern, $options: 'i' } },
+            { "positions.name": { $regex: regexPattern, $options: 'i' } }
+          ]
+        });
       }
 
-      console.log(query);
+      const matchStage = matchConditions.length > 0 ? { $match: { $and: matchConditions } } : null;
+
+      let stages = [
+        ...queryProcessorGlobals.getBasicOptions(
+          req.query
+        ), 
+        // For creator
+        queryProcessorGlobals.getCreatorUserLookupStage(), 
+        queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+        // For owner
+        queryProcessorGlobals.getOwnerUserLookupStage(),
+        queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+        queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+
+        ...(matchStage != null ? [matchStage] : []),
+        // Pagination
+        ...queryProcessorGlobals.getSortingOptions(
+          req.query.sortParam,
+          req.query.sortOrder,
+        ),
+        ...queryProcessorGlobals.getPaginationOptions(
+          req.query.skip,
+          req.query.limit
+        )
+      ];
 
-      const leftoveres = await Leftover.find(query, null, options)
-        .sort({ createdAt: "desc" })
-        .exec();
+      const leftoveres = await Leftover.aggregate(stages).exec();
 
-      if (!leftoveres) {
-        return res.status(404).send({ message: "LEFTOVERES_NOT_FOUND" });
+      if (!leftoveres.length) {
+          return res.status(404).send({ message: "LEFTOVERES_NOT_FOUND" });
       }
 
       res.status(200).send(leftoveres);
@@ -93,7 +130,7 @@ const controllerFactory = (db) => {
   };
 
   return {
-    getAll,
+    read,
     create,
     get,
     update,

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

@@ -13,11 +13,16 @@ module.exports = (db) => {
       required: true,
     },
     order: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'Order',
+    },  
+    comment: {
       type: String
     }, 
     store: {
       type: Object
     },
+
     positions: [{
       _id: {
         type: db.mongoose.Schema.Types.ObjectId,

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

@@ -10,7 +10,7 @@ module.exports = function(app, db) {
 
   app.get(
     "/leftovers",
-    controller.getAll
+    controller.read
   );
 
 

package/src/styles/config.scss

@@ -91,8 +91,8 @@
 	// Tones
 	--red: 					360, 70, 90;
 	--red-nice: 		354, 80, 100;
-	--green: 				120, 58, 70;
-	--green-nice: 	126, 70, 80;
+	--green: 				88,	 207,	57;
+	--green-nice: 	35,	226,	0;
 	--orange: 			8, 72, 94;
 	--orange-nice:	13, 70, 100;
 	--yellow: 			38, 100, 100;