@ozdao/prometheus-framework 0.2.92 → 0.2.94

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

@@ -6,13 +6,13 @@
       :tabs_current="tab"
       :tabs="[
         { name: 'All',        value: 'all' },
-        { name: 'Created',   value: 'stock-in' },
-        { name: 'Confirmed',  value: 'stock-out' },
-        { name: 'Preparing',  value: 'stock-out' },
-        { name: 'Prepared',  value: 'stock-out' },
-        { name: 'In delivery',  value: 'stock-out' },
-        { name: 'Delivered',  value: 'stock-out' },
-        { name: 'Closed',  value: 'stock-out' }
+        { name: 'Created',   value: 'created' },
+        { name: 'Confirmed',  value: 'confirmed' },
+        { name: 'Preparing',  value: 'preparing' },
+        { name: 'Prepared',  value: 'prepared' },
+        { name: 'In delivery',  value: 'in delivery' },
+        { name: 'Delivered',  value: 'delivered' },
+        { name: 'Closed',  value: 'closed' }
       ]"
       :actions="[
         { to: { name: 'AdminOrderAdd'}, label: 'Create Order' }
@@ -20,6 +20,29 @@
       class="mn-b-small bg-grey bg-grey radius-big"
     />
 
+
+
+    <Block
+      title="Balance"
+      class="mn-b-thin"
+    >
+      <div class="gap-micro flex-nowrap flex">
+        <div class="w-100 bg-white radius-small pd-small">
+          <p class="mn-b-thin">Total</p>
+          <h3>{{formatPrice(totalPrice)}}</h3>
+        </div>
+        <div class="w-100 bg-white radius-small pd-small">
+          <p class="mn-b-thin">Paid</p>
+          <h3>{{formatPrice(totalPriceUnpaid)}}</h3>
+        </div>
+        <div class="w-100 bg-white radius-small pd-small">
+          <p class="mn-b-thin">Unpaid</p>
+          <h3>{{formatPrice(totalPrice)}}</h3>
+        </div>
+      </div>
+
+    </Block>
+
     <Feed
       :search="true"
       :states="{
@@ -34,7 +57,7 @@
       :options="{
         limit: 15,
         owner: route.params._id,
-        ...(tab !== 'all' && { type: tab })
+        ...(tab !== 'all' && { status: tab })
       }"
       v-slot="{ 
         items 
@@ -121,8 +144,8 @@
 
 
         <div class="pd-small bg-white radius-small gap-micro flex-v-center flex-nowrap flex"> 
-          <IconEvents class="i-semi t-transp" fill="rgb(var(--black)" />
-          <p class="t-medium mn-r-auto">16:40, 21.04</p>
+          <IconTime class="i-semi t-transp" fill="rgb(var(--black)" />
+          <p class="t-medium mn-r-auto">{{formatDate(order.deadline)}}</p>
 
           <span 
             class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin bg-main"
@@ -155,6 +178,7 @@
   import '@vuepic/vue-datepicker/dist/main.css'
 
   import Tab      from '@pf/src/components/Tab/Tab.vue'
+  import Block from '@pf/src/components/Block/Block.vue';
 
   import * as orders from '@pf/src/modules/orders/store/orders';
   import * as auth from '@pf/src/modules/auth/store/auth';
@@ -166,7 +190,7 @@
 
   import Feed from '@pf/src/components/Feed/Feed.vue'
 
-  import IconEvents  from '@pf/src/modules/icons/entities/IconEvents.vue'
+  import IconTime  from '@pf/src/modules/icons/entities/IconTime.vue'
 
   const route = useRoute();
   const router = useRouter();
@@ -176,6 +200,31 @@
   // Tab logic
   const tab = ref('all')
 
+  const totalPrice = computed(() => {
+    return calculateTotalSum(orders.state.all)
+  });
+
+   const totalPriceUnpaid = computed(() => {
+    return calculateSum(orders.state.all,'unpaid')
+  });
+
+  
+  function calculateTotalSum(orders) {
+    return orders.reduce((totalSum, item) => {
+      return totalSum + item.positions.reduce((sum, position) => sum + position.price, 0);
+    }, 0);
+  }
+
+  function calculateSum(orders, status) {
+    return orders.reduce((totalSum, item) => {
+      if (item.payment.status === status) {
+        return totalSum + item.positions.reduce((sum, position) => sum + position.price, 0);
+      }
+      return totalSum;
+    }, 0);
+  }
+
+
   onMounted(async () => {
    
   });

package/src/modules/orders/components/sections/FormDelivery.vue

@@ -6,7 +6,7 @@
 
     </div>
 
-     <h4 class="mn-b-thin">Shipping Method</h4>
+     <h4 class="mn-b-thin">Select zone</h4>
     <div class="mn-b-small flex-nowrap flex">
       <Radio 
         v-model:radio="order.delivery.type"
@@ -22,7 +22,7 @@
       />
       <Radio 
         v-model:radio="order.delivery.type"
-        label="Mail"
+        label="Post"
         value="mail"
         class="bg-white pd-medium radius-small w-100 mn-r-small"
       />

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

@@ -1,4 +1,5 @@
 const { sendChatMessageTelegram } = require('@pf/src/modules/globals/utils/mailing');
+
 const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
 
 function formatPositions(positions) {
@@ -21,18 +22,8 @@ function formatOrderMessage(order) {
   `;
 }
 
-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: ''
-  });
-}
 
-async function findOrCreateCustomer(Customer, customerInfo, orderOwner, visitor) {
+async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCreator) {
   let searchCriteria = {};
 
   if (customerInfo.phone) {
@@ -55,8 +46,14 @@ async function findOrCreateCustomer(Customer, customerInfo, orderOwner, visitor)
     const newCustomerData = {
       ...customerInfo,
       owner: orderOwner,
-      creator: customerInfo.creator || { type: 'Visitor', target: visitor || orderOwner.target },
-      identity: customerInfo.indentity ||  { type: 'Visitor', target: visitor || orderOwner.target }
+      creator: {
+        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, 
+      },
     };
     customer = await Customer.create(newCustomerData);
   }
@@ -73,6 +70,20 @@ async function findOrCreateCustomer(Customer, customerInfo, orderOwner, visitor)
    }
  }
 
+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;
@@ -81,16 +92,16 @@ const controllerFactory = (db) => {
   const create = async (req, res) => {
     const orderData = req.body;
     const userId = req.userId;
-    
+
     initializeOrder(orderData, userId);
 
     try {
       if (!orderData.customer.target) {
-        let customer = await findOrCreateCustomer(Customer, orderData.customer, orderData.owner, orderData.visitor);
+        let customer = await findOrCreateCustomer(Customer, orderData.customer, orderData.owner, orderData.creator);
 
         orderData.customer = { type: 'Customer', target: customer._id };
 
-        if (!orderData.creator?.target) {
+        if (!orderData.creator.target) {
           orderData.creator = { type: 'Customer', target: customer._id };
         }
       }
@@ -108,7 +119,7 @@ const controllerFactory = (db) => {
 
   const read = async (req, res) => {
     
-    stages = [
+    let stages = [
       ...queryProcessorGlobals.getBasicOptions(
         req.query
       ), 
@@ -162,7 +173,8 @@ const controllerFactory = (db) => {
 
   // Обновление заказа
   const update = async (req, res) => {
-    const order = await Order.findById(new db.mongoose.Schema.Types.ObjectId(req.body._id));
+    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." });
@@ -178,7 +190,6 @@ const controllerFactory = (db) => {
         comment: ''
       });
     }
-
     try {
       await order.save(); // Сохранение обновленного заказа
       res.status(200).send(order);

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

@@ -23,6 +23,10 @@ module.exports = (db) => {
     status: { 
       type: String 
     },
+    deadline: {
+      type: Date,
+      default: () => new Date(Date.now() + 30 * 60000) // Добавляет 30 минут к текущему времени
+    },
     status_history: [{
       status: { 
         type: String, 
@@ -49,11 +53,13 @@ module.exports = (db) => {
     payment: {
       type: { 
         type: String, 
-        trim: true 
+        trim: true, 
+        default: 'cash'
       },
       status: { 
         type: String, 
-        trim: true 
+        trim: true, 
+        default: 'unpaid'
       }
     },
     delivery: {

package/src/modules/orders/router/orders.backoffice.router.js

@@ -27,7 +27,7 @@ const orders = [
     },{
       path: ':order',
       name: 'AdminOrderEdit',
-      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/OrderCreateBackoffice.vue')
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/OrderBackoffice.vue')
     }]
   }
 ];

package/src/modules/orders/router/orders.router.js

@@ -28,7 +28,7 @@ const orders = {
         ru: 'Заказ'
       }
     },
-    component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/Order.vue')
+    component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/OrderBackoffice.vue')
   },
   {
     path: ':order/edit',
@@ -39,7 +39,7 @@ const orders = {
         ru: 'Заказ'
       }
     },
-    component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/Order.vue')
+    component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/OrderBackoffice.vue')
   }]
 };
 

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

@@ -12,7 +12,7 @@ import customerInitState from "@pf/src/modules/orders/store/models/customer"
 const state = reactive({
   all: [], 
   current: {
-    _id: null,
+    _id: undefined,
     positions: [],
     status: null,
     comment: '',
@@ -58,11 +58,7 @@ const actions = {
    async read( options = {}) {
     try {
      
-      if (options._id) {
-        options.params = { _id: options._id };
-      }
-
-      const response = await $axios.get('/api/orders/read', { params: options.params });
+      const response = await $axios.get('/api/orders/read', { params: options });
 
       if (options._id) {
         set(response.data[0], 'current')
@@ -79,7 +75,7 @@ const actions = {
 
   async update(order) {
     try {
-      const response = await $axios.post(`/api/orders/${order._id}`, order);
+      const response = await $axios.post(`/api/orders/update`, order);
 
       const index = state.all.findIndex(o => o._id === order._id);
       

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

@@ -124,7 +124,7 @@ const actions = {
   },
 
 
-  resetShopcart({ state }) {
+  resetShopcart() {
     state.positions = [];
     
     localStorage.removeItem('shopcart');

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

@@ -36,6 +36,8 @@
           v-for="(member, index) in department.members" 
           :key="index" 
           :user="member.user" 
+          :photo="member.user.profile.photo"
+          :name="member.user.profile.name || member.user.phone || member.user.email || member.user._id"
           :position="member.position" 
           @click="$router.push(`/app/profile/${member.user._id}`)" 
         />

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

@@ -39,7 +39,9 @@
             class="br-b br-solid br-grey" 
             v-for="(member, index) in departments.state.department.members" 
             :key="index" 
-            :user="member" 
+            :user="member.user" 
+            :photo="member.user.profile.photo"
+            :name="member.user.profile.name || member.user.phone || member.user.email || member.user._id"
             :position="member.position" 
             @click="$router.push(`/app/profile/${member.user._id}`)" 
           />
@@ -65,6 +67,8 @@ import DepartmentSub from '@pf/src/modules/organizations/components/blocks/Depar
 import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
 import * as departments from '@pf/src/modules/organizations/store/departments';
 
+import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
+
 const router = useRouter();
 const route = useRoute();
 

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

@@ -5,8 +5,9 @@
       <h1 v-if="route.params.department" class="mn-r-auto">Edit Department</h1>
       <h1 v-else class="mn-r-auto">Create Department</h1>
 
-      <section class="flex-nowrap flex pd-thin">
-        <Button :submit="onSubmit" :callback="redirectTo" class="bg-main">Save Department</Button>
+      <section class="flex-nowrap flex gap-thin pd-thin">
+        <Button v-if="route.params.department"   :submit="onDelete" :callback="redirectToDash" class="bg-red">Delete</Button>
+        <Button :submit="onSubmit" :callback="redirectTo" class="bg-main">Save</Button>
       </section>
 
     </header>
@@ -52,16 +53,18 @@
       }]"
       class="cols-1 gap-thin mn-b-thin"
     > 
-      <!-- {{departments.state.department.members[0]}} -->
-      <User 
-        class="bg-grey o-hidden radius-small mn-b-thin" 
+      <CardUser 
+        class="bg-white pd-thin radius-medium w-100" 
         v-for="(member, index) in departments.state.department.members" 
         :key="index" 
         :user="member.user" 
         :photo="member.user.profile.photo"
         :name="member.user.profile.name || member.user.phone || member.user.email || member.user._id"
         :position="member.position" 
-        @click="openMemberPopup(index)"
+        :action="{
+          label: 'x',
+          method: () => removeMember(member)
+        }"
       />
     </Block>
 
@@ -71,12 +74,42 @@
       :isPopupOpen="isOpenAddMemberPopup"
       class="bg-white w-max-30r radius-big pd-big"
     >
-      <DepartmentMemberModify 
-        :members="departments.state.department.members" 
-        :member="selectedMember" 
-        :users="memberships.state.memberships"
-        @callback="closeMemberPopup"
-      />
+      <Feed
+        :search="{
+          placeholder: 'Search customer...',
+          class: 'bg-grey mn-b-thin'
+        }"
+        :states="{
+          empty: {
+            title: 'No Products Found',
+            description: 'Currently, there are no such products available.'
+          }
+        }"
+        :store="{
+          read: (options) => memberships.actions.read(options),
+          state: null
+        }"
+        :options="{
+          target: route.params._id
+        }"
+        v-slot="{ 
+          items 
+        }"
+        class="bg-grey pd-medium w-min-20r w-max-40r radius-big h-max-20r o-scroll"
+      >
+        <CardUser
+          v-for="(user, index) in items" 
+          :key="user._id"
+          :user="user.user"
+          :photo="user.user.profile?.photo"
+          :name="user.user.profile?.name || user.user.phone || user.user.email"
+          @click="() => { 
+            globals.actions.add(departments.state.department.members, { _id: user.user._id, user: user.user, position: 'Member'})
+            closeMemberPopup();
+          }"
+          class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+        />
+      </Feed>
     </Popup>
       
 
@@ -178,13 +211,11 @@
 
       </div>
 
-    <section  v-if="route.params.department"  class="flex-nowrap flex pd-thin">
-      <Button :submit="onDelete" :callback="redirectToDash" class="bg-grey">Delete Department</Button>
-    </section>
+  
     
 
 
-    <div id="dash" class="pd-medium bg-white">
+<!--     <div id="dash" class="pd-medium bg-white">
 
       <Popup title="Добавить подотдел" @close-popup="closeDepartmentPopup" :isPopupOpen="isOpenDepartmentPopup">
         <DepartmentSubDepartmentModify 
@@ -214,7 +245,7 @@
         </ul> 
 
       
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -234,13 +265,15 @@ import LocationMarker from "@pf/src/components/LocationMarker/LocationMarker.vue
 import Button from "@pf/src/components/Button/Button.vue";
 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 EditArray from "@pf/src/modules/organizations/components/blocks/EditArray.vue";
 import DepartmentSub from "@pf/src/modules/organizations/components/blocks/DepartmentSub.vue";
-import DepartmentMemberModify from "@pf/src/modules/organizations/components/blocks/DepartmentMemberModify.vue";
 import DepartmentSubDepartmentModify from "@pf/src/modules/organizations/components/blocks/DepartmentMemberModify.vue";
-import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
 
+import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
+
+import * as globals from "@pf/src/modules/globals/store/globals";
 import * as departments from "@pf/src/modules/organizations/store/departments";
 import * as memberships from "@pf/src/modules/organizations/store/memberships";
 
@@ -248,11 +281,7 @@ const router = useRouter();
 const route = useRoute();
 
 async function fetchData() {
-  if (route.params.department) {
-    await memberships.actions.read({target: route.params._id});
-  }
   const users = ref(memberships.state.memberships);
-
   // await departments.actions.read({organization: route.params._id});
   if (route.params.department) await departments.actions.readOne(route.params.department);
 }
@@ -307,10 +336,19 @@ function redirectTo() {
 }
 
 async function onDelete() {
-  await departments.actions.delete(
-    route.params._id,
-    departments.state.department
-  );
+  if (confirm("Are you sure you want to delete this department?")) {
+    await departments.actions.delete(
+      route.params._id,
+      departments.state.department
+    );
+  }
+  
+}
+
+function removeMember(member) {
+   if (confirm("Are you sure you want to remove this member?")) {
+    globals.actions.delete(departments.state.department.members, { _id: member.user._id}) 
+  }
 }
 
 function redirectDash() {

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

@@ -82,7 +82,8 @@
             read: (options) => memberships.actions.read(options)
           }"
           :options="{
-            target: route.params._id
+            target: route.params._id,
+            role: ['member','owner']
           }"
           v-slot="{ 
             items 

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

@@ -129,7 +129,7 @@
 			    <button
 	          v-if="auth.state.user._id === organization.state.current.owner"
 	          @click="$router.push(`/spots/${organization.state.current._id}/spots/create`)"
-	          class="mn-b-thin button w-100"
+	          class="mn-b-thin bg-main button w-100"
 	        >
 	          Add spot
 	        </button>

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

@@ -5,13 +5,15 @@ const controllerFactory = (db) => {
 
   const read = async (req, res) => {
     try {
+      
       const memberships = await Membership.aggregate([
         {
           $match: {
             ...(req.query.user && { user: new ObjectId(req.query.user) }),
             ...(req.query.type && { type: req.query.type }),
             ...(req.query.target && { target: new ObjectId(req.query.target) }),
-            ...(req.query.role && { role: req.query.role }),
+            // ...(req.query.role && { role: req.query.role }),
+             ...(req.query.role && { role: { $in: req.query.role } }),
           },
         },
         {

package/src/modules/organizations/store/memberships.js

@@ -28,7 +28,7 @@ const actions = {
     if (options._id) params._id = options._id;
     if (options.user) params.user = options.user;
     if (options.target) params.target = options.target;
-    if (options.roles) params.roles = options.roles;
+    if (options.role) params.role = options.role;
 
     try {
       const response = await $axios.get(`/api/memberships`, { params: params });

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

@@ -13,9 +13,8 @@
 			: 'bg-white'
 		"
 	>
-
 		<router-link
-			v-if="user" 
+			v-if="user && user.roles && (user.roles.includes('ROLE_MODERATOR') || user.roles.includes('ROLE_ADMIN'))"
       :to="{
         name: 'ProductEdit', 
         params: {
@@ -34,7 +33,7 @@
         class="i-regular"
         classes="fill-white"
       />
-      </router-link>
+    </router-link>
 
 		<!-- Product Image Sqaure -->
 

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

@@ -270,10 +270,18 @@
 	}
 
   onMounted(async() => { 
+	  products.mutations.resetProduct();
 
-  // Data prefetching
-	 	await categories.actions.fetchCategories()
+  	if (route.params.product) {
+		  await products.actions.read({ _id: route.params.product });
+	  } 
+
+	  if (!products.state.current.ingredients) {
+	  	products.state.current.ingredients = []
+	  }
 
+  	// Data prefetching
+	 	await categories.actions.fetchCategories()
 
     try {
       const productsResponse = await products.actions.read({
@@ -284,17 +292,6 @@
     } catch (error) {
       console.error('error');
     }
-
-	  if (route.params.product) {
-		  await products.actions.read({ _id: route.params.product });
-	  } else {
-	  	// await commit('products/clearProductState')
-	  }
-
-	  if (!products.state.current.ingredients) {
-	  	products.state.current.ingredients = []
-	  }
-
   })
 
 	function onImagesUpdate(newImages) {

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

@@ -68,6 +68,7 @@
           v-for="product in items"
           :key="product._id"
           :product="product"
+          :user="auth.state.access"
           class="h-max"
           @click.capture="$router.push({
             name: 'Product Organization', 
@@ -99,6 +100,7 @@
   import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
 
   // Accessing router and store
+  import * as auth from '@pf/src/modules/auth/store/auth';
   import * as products from '@pf/src/modules/products/store/products';
 
   const route = useRoute()