@ozdao/prometheus-framework 0.2.94 → 0.2.95

package/src/modules/orders/components/pages/OrderBackoffice.vue

@@ -1,27 +1,15 @@
 <template>
 	<div v-if="order && orderOrganization" class="pd-thin"> 
-		
-		<SectionPageTitle
-      :title="`Order is ${order.status}`"
-      class="mn-b-small bg-grey bg-grey radius-big"
-    />
 
-	  <div v-if="order" class="mn-b-thin pos-relative w-100 bg-main radius-big pd-big">
+	  <div v-if="order" class="mn-b-thin pos-relative w-100 bg-main radius-big pd-medium">
 	  	<div class="mn-b-small flex-nowrap flex">
-	  		<p class="t-medium p-medium mn-r-auto">
-	        Progress
-	      </p>
-
 		  	<p class="t-medium p-medium">
-	        Order No: <span class="p-small t-transp">#{{order._id}}</span>
-	      </p>
-	  	</div>
-
+		     	Order No: <span class="p-small t-transp">#{{order._id}}</span>
+		    </p>
+			</div>
 
-  	<h2 class="mn-b-small"></h2>
-
-  	<div class="radius-extra mn-b-medium flex-nowrap flex pos-relative ">
-	    <div v-for="(status, index) in statuses" :key="index" class="mn-r-thin w-20">
+  	<div class="flex-nowrap flex gap-thin pos-relative ">
+	    <div v-for="(status, index) in statuses" :key="index" class="w-20">
 	      <div
 	      	class="bg-grey br-anim br-glow radius-extra h-1r w-100"
 	        :class="
@@ -32,21 +20,21 @@
 	      />
 	      <div 
 	      	:class="{ 't-transp': !isActiveStatus(index) }"
-				  class="mn-t-thin t-medium uppercase">{{ statusLabels[index] }}</div>
+				  class="mn-t-thin p-small t-medium uppercase">{{ statusLabels[index] }}</div>
 	    	</div>
 		  </div>
+	  </div>
 
-	  	<div class="flex-nowrap flex">
-	  		<div class="w-max flex-v-center gap-thin flex-nowrap flex pd-thin radius-small bg-white-transp-20">
-	  			<IconTime class="i-semi t-transp" fill="rgb(var(--black)" />
-          <p class="t-medium mn-r-auto">Estimated Arrival {{formatDate(order.deadline)}}</p>
-		  	</div>
-
-		  	<button v-if="getNextStatus(order.status) && route.name === 'Order Edit'" @click="openStatusPopup" class="mn-l-auto bg-black t-white button">  
-			    Mark as {{ getStatusLabel(getNextStatus(order.status)) }}  
-			  </button>
+	  <div class="bg-grey mn-b-thin pd-thin radius-extra flex-nowrap flex">
+  		<div class="w-max flex-v-center gap-thin flex-nowrap flex pd-thin radius-small bg-white-transp-20">
+  			<IconTime class="i-semi t-transp" fill="rgb(var(--black)" />
+        <p class="t-medium mn-r-auto"><span class="p-small t-transp">Estimated Arrival</span><br>{{formatDate(order.deadline)}}</p>
 	  	</div>
-	  </div>
+
+	  	<button v-if="getNextStatus(order.status) && route.name === 'Order Edit'" @click="openStatusPopup" class="mn-l-auto bg-black t-white button">  
+		    Mark as {{ getStatusLabel(getNextStatus(order.status)) }}  
+		  </button>
+  	</div>
 
 	  <Popup 
       title="Change status" 
@@ -54,7 +42,13 @@
       :isPopupOpen="isOpeStatusPopup"
       class="bg-white w-min-30r w-max-30r radius-big pd-big"
     >
-  		<p class="bg-grey radius-small pd-small mn-b-thin">Estimated Arrival {{formatDate(order.deadline)}}</p>
+
+			<VueDatePicker v-model="order.deadline" :hide-navigation="['calendar']" :flow="['time']" class="z-index-3 bg-grey radius-small pd-small mn-b-thin mn-b-semi" />
+
+			<p class="t-medium p-medium mn-b-thin">
+		    Positions
+		  </p>
+
     	<ul class="bg-grey pd-small radius-small flex gap-thin flex-column mn-b-semi">
   			<CardOrderItem
   				v-for="(product, index) in orderProducts" :key="product._id"
@@ -89,17 +83,17 @@
 		    >
 		    	<div class="pd-small flex-nowrap flex">
 			    	<div class="mn-r-auto">
-				    	<span class="d-block t-medium p-medium">Your order is</span>
-					    <span class=" t-lh-075 h2 d-block mn-b-small">{{order.status}}</span>
-					    <p class="pd-t-nano pd-b-nano pd-r-thin pd-l-thin radius-extra bg-black t-white w-max">as on 29 aug 2021, Friday</p>
+				    	<span class="d-block t-medium p-medium">Order is</span>
+					    <span class=" t-lh-075 h2 d-block mn-b-small">created</span>
+					    <p class="pd-t-nano pd-b-nano pd-r-thin pd-l-thin radius-extra bg-black t-white w-max">{{formatDate(order.createdAt)}}</p>
 					  </div>
-					  <div class="t-right">
+					 <!--  <div class="t-right">
 					  	Cancel order<br>
 					  	Exchange item
 					  	<hr class="mn-b-thin mn-t-thin">
 					  	For Delivery Queries Contact Us
 					  	
-					  </div>
+					  </div> -->
 					</div>
 
 					<div class="pd-small cols-2 br-t br-black-transp-10 br-solid">
@@ -108,17 +102,7 @@
 			      </p>
 
 			      <p class="w-100 t-right ">
-			        {{order.user?.number}} 
-			      </p>
-			    </div>
-
-			    <div v-if="order.user?.messenger.type" class="pd-small cols-2 br-t br-black-transp-10 br-solid">
-			    	<p class="w-100 t-medium p-medium">
-			      	{{order.user?.messenger.type}}
-			      </p>
-
-			      <p class="w-100 t-right ">
-			        {{order.user?.messenger.value}} 
+			      	{{order.customer.target?.number || 'Not specified'}}
 			      </p>
 			    </div>
 
@@ -128,7 +112,7 @@
 			      </p>
 
 			      <p class="w-100 t-right">
-			        <!-- {{order.delivery?.address.slice(0,64)}}  -->
+			        {{order.delivery.address ? order.delivery.address.slice(0,64) : 'Not specified'}} 
 			      </p>
 			    </div>
 
@@ -138,7 +122,7 @@
 			      </p>
 
 			      <p class="w-100 t-right mn-b-small">
-			        {{order.delivery?.type}} 
+			        {{order.delivery.type ? order.delivery.type : 'Not specified'}} 
 			      </p>
 			    </div>
 
@@ -210,7 +194,10 @@
 <script setup="props">
 	import { computed, ref, onMounted  } from 'vue'
 	import { useRouter, useRoute } from 'vue-router'
-	
+
+	import VueDatePicker from '@vuepic/vue-datepicker';
+	import '@vuepic/vue-datepicker/dist/main.css'
+
 	import SectionPageTitle from '@pf/src/modules/globals/components/sections/SectionPageTitle.vue'
 
 	import Popup from "@pf/src/components/Popup/Popup.vue";
@@ -239,7 +226,7 @@
 	const orderOrganization = ref(null)
 
 	const statuses = ['created', 'confirmed', 'packing', 'in delivery', 'delivered'];
-	const statusLabels = ['Order Confirming', 'Order Confirmed', 'Packing', 'In Delivery', 'Delivered'];
+	const statusLabels = ['Created', 'Confirmed', 'Packing', 'In Delivery', 'Delivered'];
 
 	const isActiveStatus = (index) => {
 	  return statuses.slice(index).includes(order.value.status);

package/src/modules/orders/components/pages/OrderCreateBackoffice.vue

@@ -196,6 +196,7 @@
   import { computed, ref, defineProps, onMounted, reactive, toRefs, watch } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
 
+
   import Field from '@pf/src/components/Field/Field.vue'
   import Button from "@pf/src/components/Button/Button.vue";  
   import Tab from '@pf/src/components/Tab/Tab.vue'
@@ -225,6 +226,8 @@
   const route = useRoute()
   const router = useRouter()
 
+   orders.mutations.resetOrder(orders.state.current)
+
   let cartTotalPrice = computed(() => {
     return Number(orders.state.current.positions.reduce((total, product) => {
       return total + product.price * product.quantity;
@@ -261,12 +264,12 @@
   function onSubmit() {
 
     orders.state.current.creator = {
-      type: 'user',
+      type: 'User',
       target: auth.state.user._id
     }
 
     orders.state.current.owner = {
-      type: 'organization',
+      type: 'Organization',
       target: route.params._id,
     }
 
@@ -287,7 +290,8 @@
     })
   }
 
-  onMounted(async () => {
+  onMounted(() => {
+
     // await orders.actions.fetchOrder(route.params.id) // Implement this action in your store
 
     // order.value = orders.state.current

package/src/modules/orders/components/pages/Orders.vue

@@ -87,7 +87,7 @@
 
         <div class="mn-b-small pd-small bg-white radius-small flex-nowrap flex"> 
           <div class="w-100">
-            <h3 class="mn-b-thin">{{order.customer.target.profile.name || order.customer.target.phone || order.customer.target.email || 'No name'}}</h3>
+            <h3 class="mn-b-thin">{{order.customer.target.profile?.name || order.customer.target.phone || order.customer.target.email || 'No name'}}</h3>
             <p class="t-truncate">{{order.delivery.address || 'Not specified'}}</p> 
           </div>
 

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

@@ -1,6 +1,8 @@
+const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
+
 const { sendChatMessageTelegram } = require('@pf/src/modules/globals/utils/mailing');
 
-const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
+
 
 function formatPositions(positions) {
   return positions.map(pos => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join('\n');
@@ -22,7 +24,6 @@ function formatOrderMessage(order) {
   `;
 }
 
-
 async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCreator) {
   let searchCriteria = {};
 
@@ -36,6 +37,8 @@ async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCre
 
   let customer = null;
 
+  console.log(searchCriteria)
+
   // Проверяем, есть ли критерии для поиска
   if (Object.keys(searchCriteria).length > 0) {
     customer = await Customer.findOne({ $or: [searchCriteria] });
@@ -47,12 +50,12 @@ async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCre
       ...customerInfo,
       owner: orderOwner,
       creator: {
-        type: customerInfo.creator.type || orderCreator.type,
-        target: customerInfo.creator.target || orderCreator.target, 
+        type: customerInfo.creator?.type || orderCreator.type,
+        target: customerInfo.creator?.target || orderCreator.target, 
       },
       identity: {
-        type: customerInfo.identity.type || orderCreator.type,
-        target: customerInfo.identity.target || orderCreator.target, 
+        type: customerInfo.identity?.type || orderCreator.type,
+        target: customerInfo.identity?.target || orderCreator.target, 
       },
     };
     customer = await Customer.create(newCustomerData);
@@ -70,20 +73,6 @@ async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCre
    }
  }
 
-function initializeOrder(orderData, userId) {
-  orderData.status = 'created';
-
-  orderData.status_history = orderData.status_history || [];
-  
-  orderData.status_history.push({
-    status: orderData.status,
-    changedBy: userId,
-    timestamp: new Date(),
-    comment: ''
-  });
-}
-
-
 const controllerFactory = (db) => {
   const Order = db.order;
   const Customer = db.customer;
@@ -93,7 +82,16 @@ const controllerFactory = (db) => {
     const orderData = req.body;
     const userId = req.userId;
 
-    initializeOrder(orderData, userId);
+    orderData.status = 'created';
+
+    orderData.status_history = orderData.status_history || [];
+    
+    orderData.status_history.push({
+      status: orderData.status,
+      user: new db.mongoose.Types.ObjectId(req.userId), 
+      timestamp: new Date(),
+      comment: ''
+    });
 
     try {
       if (!orderData.customer.target) {
@@ -173,19 +171,21 @@ const controllerFactory = (db) => {
 
   // Обновление заказа
   const update = async (req, res) => {
-    console.log(req.body)
     const order = await Order.findOne({ _id: req.body._id });
     
     if (!order) {
       return res.status(404).send({ errorCode: "ORDER_NOT_FOUND", message: "Order not found." });
     }
 
+     console.log('order status is', req.userId)
+
+
     if (req.body.status && req.body.status !== order.status) {
       order.status = req.body.status; // Обновление текущего статуса заказа
       // Добавление записи в историю изменений статусов
       order.status_history.push({
         status: req.body.status,
-        changedBy: req.userId, 
+        user: new db.mongoose.Types.ObjectId(req.userId), 
         timestamp: new Date(),
         comment: ''
       });
@@ -203,7 +203,7 @@ const controllerFactory = (db) => {
     try {
       const order = await Order.findOneAndUpdate(
         { _id: req.params._id }, 
-        { status: 'Оплачен', payment: { type: 'Наличные', status: 'Оплачено' }},
+        { status: 'closed', payment: { type: 'Cash', status: 'paid' }},
         { new: true }
       ).exec();
       if (!order) {

package/src/modules/orders/models/order.model.js

@@ -32,7 +32,7 @@ module.exports = (db) => {
         type: String, 
         trim: true 
       },
-      changedBy: {
+      user: {
         type: db.mongoose.Schema.Types.ObjectId,
         ref: 'User',
       },

package/src/modules/orders/routes/orders.routes.js

@@ -9,6 +9,9 @@ module.exports = function(app, db, origins, publicPath) {
 
   app.post(
     "/api/orders/create",
+    [
+      middleware.authJwt.verifyToken
+    ],
     controller.create
   );
   
@@ -27,6 +30,9 @@ module.exports = function(app, db, origins, publicPath) {
   
   app.post(
     "/api/orders/delete",
+    [
+      middleware.authJwt.verifyToken
+    ],
     controller.deleteOrder
   );
 };

package/src/modules/orders/store/models/order.js

@@ -0,0 +1,33 @@
+import customerInitState from "@pf/src/modules/orders/store/models/customer"
+
+const orderInitState = {
+  _id: undefined,
+  positions: [],
+  status: null,
+  comment: '',
+
+  owner: {
+    type: 'Organization',
+    target: null,
+  },
+  
+  creator: {
+    type: 'Customer',
+    target: null,
+  },
+
+  customer: { ...customerInitState },
+
+  payment: {
+    type: 'Cash',
+    status: 'Unpaid',
+  },
+
+  delivery: {
+    type: null,
+    address: null,
+    status: '',
+  }
+};
+
+export default orderInitState

package/src/modules/orders/store/orders.js

@@ -6,39 +6,14 @@ import axios from 'axios';
 const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
 // Globals
 import { setError }   from '@pf/src/modules/globals/store/globals'
+// Init State
+import orderInitState from "@pf/src/modules/orders/store/models/order"
 
-import customerInitState from "@pf/src/modules/orders/store/models/customer"
 
 const state = reactive({
   all: [], 
   current: {
-    _id: undefined,
-    positions: [],
-    status: null,
-    comment: '',
-
-    owner: {
-      type: 'Organization',
-      target: null,
-    },
-    
-    creator: {
-      type: 'Customer',
-      target: null,
-    },
-
-    customer: { ...customerInitState },
-
-    payment: {
-      type: 'Cash',
-      status: 'Unpaid',
-    },
-
-    delivery: {
-      type: null,
-      address: null,
-      status: '',
-    }
+    ...orderInitState
   }
 });
 
@@ -114,6 +89,10 @@ const actions = {
 const mutations = {  
   resetCustomer(stateObject) {  
     Object.assign(stateObject, customerInitState);
+  },  
+  resetOrder(stateObject) {
+    state.current = { ...orderInitState }
+    // Object.assign(stateObject, orderInitState);
   }  
 }
 

package/src/modules/organizations/components/blocks/CardDepartment.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="radius-semi o-hidden cols-2-1_3">
+  <div class="">
 
     <div class="pd-medium w-100">
 
@@ -32,7 +32,7 @@
       <ul>
         <li v-if="department.members.length < 1">No members in department</li>
         <User 
-          class="br-b br-solid br-grey" 
+          class="pd-small br-solid br-1px br-black-transp-5 radius-small mn-b-thin" 
           v-for="(member, index) in department.members" 
           :key="index" 
           :user="member.user" 

package/src/modules/organizations/components/pages/DepartmentEdit.vue

@@ -62,7 +62,10 @@
         :name="member.user.profile.name || member.user.phone || member.user.email || member.user._id"
         :position="member.position" 
         :action="{
-          label: 'x',
+          label: {
+            is: IconDelete,
+            props: { class: 'i-medium', fill: 'rgb(var(--white)' }
+          },
           method: () => removeMember(member)
         }"
       />
@@ -120,8 +123,6 @@
           
           <p class="p-medium mn-b-small">Please settings for your department:</p>
           <div class="cols-1 gap-thin">
-            <h4>Products</h4>
-
             <Checkbox 
               label="Hidden department"
               name="hidden"
@@ -267,9 +268,10 @@ import Popup from "@pf/src/components/Popup/Popup.vue";
 import Block from '@pf/src/components/Block/Block.vue';
 import Feed from '@pf/src/components/Feed/Feed.vue'
 
+import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue'
+
 import EditArray from "@pf/src/modules/organizations/components/blocks/EditArray.vue";
 import DepartmentSub from "@pf/src/modules/organizations/components/blocks/DepartmentSub.vue";
-import DepartmentSubDepartmentModify from "@pf/src/modules/organizations/components/blocks/DepartmentMemberModify.vue";
 
 import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
 
@@ -332,7 +334,7 @@ async function onSubmit() {
 }
 
 function redirectTo() {
-  router.replace({ name: "Department", params: { _id: route.params._id, department: departments.state.department._id } });
+  router.push({ name: "Organization Members", params: { _id: route.params._id } });
 }
 
 async function onDelete() {

package/src/modules/organizations/components/pages/Members.vue

@@ -5,7 +5,7 @@
       @update:tabs_current="(update) => tab = update"
       :tabs_current="tab"
       :tabs="[
-        { name: `Members (${organization.state.current.numberOfMembers})`, value: 'members' },
+        { name: `Members (${organization.state.current.numberOfMembers || 0})`, value: 'members' },
         { name: 'Departments', value: 'departments' },
         { name: 'Invites', value: 'invites' }
       ]"
@@ -28,46 +28,49 @@
       />
     </Popup>  
 
-    <Block
+    <Feed
       v-if="tab === 'departments'"
-      class="mn-b-semi"
+      :states="{
+        empty: {
+          title: 'No Departments Found',
+          description: 'Currently, there are no departments available.',
+          action: 'Add department',
+          callback:  () => $router.push(`/organizations/${route.params._id}/departments/create`)
+        }
+      }"
+      :store="{
+        read: (options) => departments.actions.read(options),
+        state: null
+      }"
+      :options="{
+        organization: route.params._id,
+        user: auth.state.user._id,
+      }"
+      v-slot="{ 
+        items 
+      }"
     >
-      <Feed
-        :states="{
-          empty: {
-            title: 'No Departments Found',
-            description: 'Currently, there are no departments available.',
-            action: 'Add department',
-            callback:  () => $router.push(`/organizations/${route.params._id}/departments/create`)
-          }
-        }"
-        :store="{
-          read: (options) => departments.actions.read(options),
-          state: null
-        }"
-        :options="{
-          organization: route.params._id,
-          user: auth.state.user._id,
-          hidden: false,
-        }"
-        v-slot="{ 
-          items 
+      <CardDepartment
+        v-for="(department, index) in items"
+        :key="index"
+        :department="department"
+        :organization="route.params._id"
+        class="radius-semi bg-grey pos-relative mn-b-thin"
+      />
+
+     </Feed>
+      <router-link
+         v-if="tab === 'departments' && departments.state.departments.length > 0"
+        :to="{
+          path: `/organizations/${route.params._id}/departments/create`
         }"
+        class="d-block flex-center flex uppercase t-semi bg-main w-100 pd-small radius-extra"
       >
-        <CardDepartment
-          v-for="(department, index) in items"
-          :key="index"
-          :department="department"
-          :organization="route.params._id"
-          class="radius-big bg-white pos-relative mn-b-thin"
-        />
-       </Feed>
-    </Block>  
-
-    <section class="mn-b-big radius-medium bg-white">
+        Add department
+      </router-link>
       <!-- Members -->
       <div 
-        v-if="tab === 'members'"
+         v-if="tab === 'members'"
         class="cols-1 gap-thin"
       >
         <Feed
@@ -102,7 +105,10 @@
             :role="member.label || member.role"
             @click="$router.push(`/profile/${member.user._id}`)" 
             :action=" member.role !== 'owner' ? {
-              label: 'x',
+              label: {
+                is: IconDelete,
+                props: { class: 'i-medium', fill: 'rgb(var(--white)' }
+              },
               method: () => removeMember(index, member)
             } : null"
             class="w-100 bg-grey radius-big flex-nowrap flex pd-medium"
@@ -139,14 +145,17 @@
             :name="invite.email || invite.phone"
             :role="invite.status"
             :action="{
-              label: 'x',
+              label: {
+                is: IconDelete,
+                props: { class: 'i-medium', fill: 'rgb(var(--white)' }
+              },
               method: () => removeInvite(index, invite)
             }"
             class="w-100 bg-grey radius-big flex-nowrap flex pd-medium"
           />
         </Feed>
       </div>
-    </section>
+  
   </div>
 </template>
 
@@ -171,6 +180,8 @@ import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
 import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue';
 import CardDepartment from '@pf/src/modules/organizations/components/blocks/CardDepartment.vue';
 
+import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue'
+
 import * as auth      from '@pf/src/modules/auth/store/auth'
 import * as invites from '@pf/src/modules/organizations/store/invites';
 import * as memberships from '@pf/src/modules/organizations/store/memberships';
@@ -212,6 +223,7 @@ const FirstLevelDepartments = computed(() => {
 });
 
 async function handleSendInvite(list) {
+  console.log('invite.list')
   await invites.actions.create({
     owner: {
       type: 'Organization',

package/src/modules/organizations/components/pages/Organization.vue

@@ -185,7 +185,7 @@
 			user: auth.state.user._id
 		})
 
- 		await memberships.actions.read(route.params._id)
+ 		await memberships.actions.read({target: route.params._id})
 	})
 
 	const tabOrganization = ref(tab)

package/src/modules/organizations/controllers/invites.controller.js

@@ -36,6 +36,7 @@ const сontrollerFactory = (db) => {
   const create = async (req, res) => {
     const creator = req.body.creator
     const owner = req.body.owner
+
     const list = req.body.invites
 
     try {
@@ -60,6 +61,7 @@ const сontrollerFactory = (db) => {
 
           await membership.save();
         } else {
+          
           const newInvite = new Invite({
             code: uuid(),
             creator: creator,