@ozdao/prometheus-framework 0.2.60 → 0.2.62

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

@@ -1,8 +1,17 @@
 <template>
-  <div class="flex-column pos-relative flex-wrap block">
+  <div class="flex-column pos-relative flex-wrap">
+    <CardHeader 
+      :entity="leftover"
+      :entityType="'leftover'"
+      :user="user"
+      :owner="leftover.creator" 
+      :creator="leftover.creator"
+      :date="leftover.createdAt"
+    />
+
     <div class="w-100 mn-b-thin flex">
       <p class="p-big">
-        {{leftover.type}} #{{leftover._id}} {{leftover.organization}}
+        {{leftover.type}}
       </p> 
       <IconEdit
         @click="$router.push({
@@ -16,14 +25,16 @@
       />
     </div>
 
-    <div class="w-100 spoiler">
-      <div @click="spoiler = !spoiler"  class="mn-b-small flex">
+  
+
+    <div class="w-100 bg-white radius-small pd-small spoiler">
+      <div @click="spoiler = !spoiler"  class="flex">
         <span>Всего товаров {{leftover.positions.length}}</span>
         <!-- <img :class="{ 'spoiler-active': spoiler }" class="button-icon" src="@/assets/icons/arrow-down-spoiler.svg"> -->
       </div>
       <transition name="fade">
         <div v-if="spoiler">
-          <div  v-for="position in leftover.positions" class="w-100 mn-b-thin flex"> 
+          <div  v-for="position in leftover.positions" class="mn-t-small w-100 mn-b-thin flex"> 
             <div class=" w-50 flex">
               <span>
                 <!-- <span class="t-transp">Название:</span>  -->
@@ -43,7 +54,7 @@
       </transition>
     </div>
     
-   <!-- <p class="t-transp">Created At {{leftover.createdAt}} by </p> -->
+
   </div>
 </template>
 
@@ -52,11 +63,12 @@
 	import { ref } from 'vue'
 	import { useRouter } from 'vue-router'
 
+  import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
+
   // Icons
   import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
   import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
 
-
 	const router = useRouter()
 
 	const props = defineProps({

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

@@ -112,7 +112,7 @@
 
   const totalPrice = computed(() => {
     return Number(leftovers.state.current.positions.reduce((sum, position) => {
-      return sum + position.price;
+      return Number(sum) + Number(position.price);
     }, 0));
   });
 

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

@@ -69,7 +69,7 @@
       <CardLeftover 
         v-for="leftover in items" 
         :leftover="leftover"
-        class="bg-grey pd-small radius-big"
+        class="bg-grey pd-small mn-b-thin radius-small"
       />
     </Feed>
   </div>
@@ -95,9 +95,20 @@
   const totalPrice = computed(() => {
     return leftovers.state.all.reduce((totalSum, item) => {
       const itemTotal = item.positions.reduce((sum, position) => {
-        return sum + (position.price * (position.quantity || 1));
+        return sum + position.price;
       }, 0);
-      return totalSum + itemTotal;
+
+      // Adjust the sum based on the type of transaction
+      if (item.type === 'stock-in') {
+        // If it's a stock-in, subtract the itemTotal from the totalSum
+        return totalSum - itemTotal;
+      } else if (item.type === 'stock-out') {
+        // If it's a stock-out, add the itemTotal to the totalSum
+        return totalSum + itemTotal;
+      } else {
+        // If the item type is not specified or is different, do not adjust the totalSum
+        return totalSum;
+      }
     }, 0);
   });
 

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

@@ -12,7 +12,7 @@
         +
     </button>
   </header>
-
+<!-- 
   <Tab 
     v-if="route.name !== 'Organization'"
     v-model:selected="tab"
@@ -24,7 +24,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 +37,7 @@
         placeholder="Enter product name"
         class="bg-white mn-b-thin"
       />
-
+      {{tab}}
       <Feed
         :states="{
           empty: {
@@ -104,13 +104,13 @@
   const router = useRouter()
 
   // Tab logic
-  const tab = ref(route.query.tab ? route.query.tab : 'all')
+  // const tab = ref(route.query.tab ? route.query.tab : 'all')
 
-  route.query.tab = tab.value
+  // route.query.tab = tab.value
 
-  watch(tab, (newValue) => {
-    router.replace({ query: { ...route.query, tab: newValue } });
-  });
+  // watch(tab, (newValue) => {
+  //   router.replace({ query: { ...route.query, tab: newValue } });
+  // });
   
   function updateSearch(search) {
     let query = { ...route.query}

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

@@ -1,7 +1,9 @@
-module.exports = (mongoose) => {
-  const LeftoverSchema = new mongoose.Schema({
+const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js');
+
+module.exports = (db) => {
+  const LeftoverSchema = new db.mongoose.Schema({
     organization: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'Organization',
     },    
     type: {
@@ -18,7 +20,7 @@ module.exports = (mongoose) => {
     },
     positions: [{
       _id: {
-        type: mongoose.Schema.Types.ObjectId,
+        type: db.mongoose.Schema.Types.ObjectId,
         ref: 'Product',
       },    
       name: {
@@ -40,9 +42,11 @@ module.exports = (mongoose) => {
     }
   });
 
+  applyOwnershipSchema(LeftoverSchema,db);
+
   LeftoverSchema.index({ user: 1, type: 1, target: 1 });
 
-  const Leftover = mongoose.model('Leftover', LeftoverSchema);
+  const Leftover = db.mongoose.model('Leftover', LeftoverSchema);
 
   return Leftover;
 }

package/src/modules/users/models/client.model.js

@@ -0,0 +1,60 @@
+module.exports = (mongoose) => {
+
+  const ClientSchema = new mongoose.Schema({ 
+    phone: String,
+    email: String,
+
+    status: {
+      type: String,
+      enum: ['new','lost','converted'], 
+      default: 'new',
+      required: true,
+    },
+    
+    profile: {
+      photo: {
+          type: String,
+          default: ''
+      },
+      name: {
+          type: String,
+          default: ''
+      },
+      description: {
+          type: String,
+          default: ''
+      },
+      birthday: {
+          type: Date,
+      }
+    },
+
+    socials: {
+      telegram: {
+        type: String,
+        default: ''
+      },
+      twitter: {
+        type: String,
+        default: ''
+      },
+      facebook: {
+        type: String,
+        default: ''
+      },
+      instagram: {
+        type: String,
+        default: ''
+      }
+    },
+    },{
+      // Creation Date
+      timestamps: { currentTime: () => Date.now() 
+    }
+
+  });
+
+  const Client = mongoose.model("Client", ClientSchema);
+
+  return Client;
+}