@ozdao/prometheus-framework 0.2.62 → 0.2.64

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

@@ -41,8 +41,7 @@
       :tabs="[
         { name: 'All',        value: 'all' },
         { name: 'Stock-In',   value: 'stock-in' },
-        { name: 'Stock-Out',  value: 'stock-out' }, 
-        { name: 'Write-Off',  value: 'write-off' }, 
+        { name: 'Stock-Out',  value: 'stock-out' }
       ]"
       class="mn-b-small o-hidden h5 radius-big bg-grey"
     />
@@ -59,7 +58,8 @@
       }"
       :options="{
         limit: 15,
-        organization: route.params._id
+        organization: route.params._id,
+        ...(tab !== 'all' && { type: tab })
         // user: user
       }"
       v-slot="{ 

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

@@ -1,12 +1,12 @@
 <template>
 	<div class="flex flex-column w-100 o-hidden gap-thin pd-thin">
 		<!-- <Breadcrumbs class="bg-grey radius-big pd-small"/> -->
-		{{product.quantity}}
+		<!-- {{product.quantity}}
 		<div v-if="product.ingredients">
 			{{product?.ingredients[0]?._id}}
 			{{product?.ingredients[0]?.quantity}}
 			{{product?.ingredients[1]?.quantity}}
-		</div>
+		</div> -->
 		<SectionProduct v-if="product" :product="product" :user="auth.state.user" class="pos-relative"/>
 
 		<PopularProducts />

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

@@ -1,4 +1,5 @@
 <template>
+  <div class="pd-thin">
   <header 
     v-if="route.name !== 'Organization'"
     class="mn-b-medium flex-v-center flex-nowrap flex"
@@ -6,16 +7,16 @@
     <h2 class="mn-r-medium">Products</h2>
     <button 
       @click="$router.push({
-        name: 'AddProduct'
+        name: 'ProductAdd'
       })" 
       class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
         +
     </button>
   </header>
-<!-- 
+
   <Tab 
     v-if="route.name !== 'Organization'"
-    v-model:selected="tab"
+    v-model:selected="tabProducts"
     :tabs="[
       { name: 'All',          value: 'all' },
       { name: 'Published',    value: 'published' },
@@ -24,7 +25,7 @@
     ]"
     class="mn-b-small o-hidden h5 radius-big bg-grey"
   />
- -->
+
   <div class="cols-2-1_3 bg-grey pd-thin radius-big gap-thin">
 
     <FilterProducts
@@ -37,7 +38,6 @@
         placeholder="Enter product name"
         class="bg-white mn-b-thin"
       />
-      {{tab}}
       <Feed
         :states="{
           empty: {
@@ -56,7 +56,7 @@
           prices: route.query.prices,
           delivery: route.query.delivery,
           search: route.query.search,
-          status: tab === 'all' ? '' : tab ? tab : ''
+          ...(tabProducts !== 'all' && { status: tabProducts })
           // user: user
         }"
         v-slot="{ 
@@ -80,6 +80,7 @@
       </Feed>
     </div>
   </div>
+</div>
 </template>
 
 
@@ -104,13 +105,13 @@
   const router = useRouter()
 
   // Tab logic
-  // const tab = ref(route.query.tab ? route.query.tab : 'all')
+  const tabProducts = ref(route.query.tabProducts ? route.query.tabProducts : 'all')
 
-  // route.query.tab = tab.value
+  route.query.tabProducts = tabProducts.value
 
-  // watch(tab, (newValue) => {
-  //   router.replace({ query: { ...route.query, tab: newValue } });
-  // });
+  watch(tabProducts, (newValue) => {
+    router.replace({ query: { ...route.query, tabProducts: newValue } });
+  });
   
   function updateSearch(search) {
     let query = { ...route.query}

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

@@ -12,6 +12,10 @@ const controllerFactory = (db) => {
         query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
       }
 
+      if (req.query.type) {
+        query.type = req.query.type;
+      }
+
       console.log(query);
 
       const leftoveres = await Leftover.find(query, null, options)
@@ -31,17 +35,22 @@ const controllerFactory = (db) => {
 
   const create = async (req, res) => {
     try {
+
+      console.log(req.body)
       const leftover = await Leftover.create({
         organization: req.body.organization,
         type: req.body.type,
         order: req.body.order,
-        positions: req.body.positions
+        positions: req.body.positions,
+        creator: req.body.creator,
+        owner: req.body.owner
       });
       if (!leftover) {
         return res.status(404).send({ message: "ERROR_CREATING_LEFTOVER" });
       }
       res.status(200).send(leftover);
     } catch (err) {
+      console.log(err)
       res.status(500).send({ message: "ERROR_CREATE_LEFTOVER" });
     }
   };

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

@@ -41,9 +41,9 @@ const actions = {
     }
   },
 
-  async create({ organization, type, order, positions }) {
+  async create({ organization, type, order, positions, creator, owner }) {
     try {
-      const response = await $axios.post('/leftovers', { organization, type, order, positions });
+      const response = await $axios.post('/leftovers', { organization, type, order, positions, creator, owner });
       state.all.push(response.data);
       return response.data;
     } catch (error) {