@ozdao/prometheus-framework 0.2.101 → 0.2.103

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

@@ -61,6 +61,7 @@
 			      :product="product"
 			      :array="products.state.current.ingredients"
 			      :products="Products"
+		        :showPrice="false"
 			      @add="(item) => {
 					    globals.actions.add(products.state.current.ingredients, item);
 					    closeIngredientPopup();
@@ -77,6 +78,53 @@
 			  </div>
 		  </Block>
 
+		  <Popup 
+	      title="Add ingredient" 
+	      @close-popup="closeIngredientPopup" 
+	      :isPopupOpen="isOpenIngredientPopup"
+	      class="bg-white w-min-30r w-max-30r radius-big pd-medium"
+	    >
+	      <div class="bg-grey mn-b-thin h-min-20r h-max-20r o-scroll pd-medium radius-big">
+	        <Feed
+	          :search="{
+	          	class: 'bg-white mn-b-thin'
+	          }"
+	          :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(products.state.current.ingredients,p)
+	              closeIngredientPopup();
+	            }"
+	            class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+	          />
+	        </Feed>
+	      </div>
+	    </Popup>
+
+
 		</div> 
 
 			<Block
@@ -207,21 +255,7 @@
 			:product="products.state.current"
 		/> -->
 
-		<Popup 
-      title="Add ingredient" 
-      @close-popup="closeIngredientPopup" 
-      :isPopupOpen="isOpenIngredientPopup"
-      class="bg-white pd-big radius-big"
-    >
-	    <CardPosition 
-	      @add="(item) => globals.actions.add(
-	        products.state.current.ingredients,
-	        item 
-	      )"
-	      :products="Products"
-	      class="flex-column"
-	    />
-		</Popup>
+
 
 		
 
@@ -242,12 +276,14 @@
 	import Checkbox from "@pf/src/components/Checkbox/Checkbox.vue";
 	import Button from "@pf/src/components/Button/Button.vue";
 	import Popup from "@pf/src/components/Popup/Popup.vue";
+	import Feed from "@pf/src/components/Feed/Feed.vue";
 
 	import EditImages           from '@pf/src/components/EditImages/EditImages.vue';
 
 	import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
 
  	import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
+  import CardOrderItem  from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
 
 
 	import EditProductInfo from '@pf/src/modules/products/components/sections/EditProductInfo.vue';

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

@@ -10,7 +10,6 @@ const openai = new OpenAI({
   apiKey: process.env.OPENAI_API_KEY,
 });
 
-
 // Factory
 const controllerFactory = (db) => {
   const Product = db.product;
@@ -126,7 +125,7 @@ const controllerFactory = (db) => {
       console.log(query)
 
       // Fetching products
-      const products = await Product.find(query, null, options);
+      const products = await Product.find(query, null, options).populate('ingredients._id')
 
       if (!products.length) {
         return res.status(200).json([]);

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

@@ -35,6 +35,7 @@ module.exports = (mongoose) => {
             price: {
                 type: Number,
                 required: true,
+                default: 0,
                 min: [0, 'Price cannot be less than 0']
             },
             quantity: {
@@ -42,6 +43,11 @@ module.exports = (mongoose) => {
                 required: true,
                 min: [1, 'Quantity cannot be less than 1']
             },    
+            type: {
+                type: String,
+                required: true,
+                default: 'g'
+            },    
         }],
         quantityDiscount: [{
             quantity: {

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

@@ -23,16 +23,7 @@ module.exports = function(app, db, allowedOrigins) {
     "/api/products/:_id",
     controller.Delete
   );
-  // Get products
-  // app.get(
-  //   "/products",
-  //   controller.getProducts
-  // );
-  // app.get(
-  //   "/products/popular",
-  //   controller.getProductsPopular
-  // );
-  // // Get recommendation
+  
   app.post(
     "/api/product/recommended",
     controller.getProductRecommendation