@ozdao/prometheus-framework 0.2.80 → 0.2.82

package/src/modules/middlewares/server/accessors/ReadDepartments.js

@@ -0,0 +1,101 @@
+const AccessController = require('./AccessController');
+
+/**
+ * @extends AccessController
+ */
+class ReadDepartments extends AccessController {
+  rule = 'read';
+  entity = 'departments';
+
+  async access(req, res, next) {
+    const Department = this.db.department
+
+    try {
+      const userId = req.cookies.user._id
+      const organization = req.query.organization
+
+      // Ищем департаменты организации в которых участвует пользователь
+      const departments = await Department.find({
+        organization: { $eq: organization },
+        members: { $elemMatch: { user: userId } }
+      })
+
+      // Если не найдены департаменты организации в которой состоит пользователь
+      if (!departments.length) {
+        return res
+          .status(403)
+          .send({
+            message: 'Access Denied. Read Departments. Департаменты не найдены',
+          });
+      } 
+
+      // Если департаменты найдены
+      let hasAccess = false
+      departments.forEach((departament) => {
+        const accesses = departament.accesses
+  
+        if (getNestedProperty(accesses, rulePath)) {
+          hasAccess = true
+        }
+      })
+
+      if (hasAccess) {
+        next()
+      } else {
+        return res
+          .status(403)
+          .send({ message: 'Access Denied. Read Departments. No access' });
+      }
+    } catch (error) {
+      console.error('[canReadDepartments]', error);
+      return res.status(500).send({ message: error.message });
+    }
+  }
+
+  /**
+   * // note: пока не использовался метод
+   * @param {Object} req объект 
+   * @returns 
+   */
+  async departmentsWhereUserIsMember(req) {
+    const Department = this.db.department
+
+    try {
+      const userId = req.cookies.user._id
+      const organization = req.query.organization
+
+      // Ищем департаменты организации в которых участвует пользователь
+      const departments = await Department.find({
+        organization: { $eq: organization },
+        members: { $elemMatch: { user: userId } }
+      })
+
+      return departments;
+    } catch (error) {
+      console.error('[canReadDepartments]', error)
+      return res.status(500).send({ message: error.message })
+    }
+  }
+}
+
+module.exports = ReadDepartments;
+
+/**
+ * Получить параметр объекта по моршруту propertyPath
+ * @param {Object} obj 
+ * @param {String} propertyPath path to obj property
+ * @returns undefined or object property of exists
+ */
+function getNestedProperty(obj, propertyPath) {
+  const properties = propertyPath.split('.');
+  let value = obj;
+
+  for (const property of properties) {
+    if (!value.hasOwnProperty(property)) {
+      return undefined;
+    }
+    value = value[property];
+  }
+
+  return value;
+}

package/src/modules/middlewares/server/verifyAccesses.js

@@ -0,0 +1,33 @@
+const ReadDepartments = require('./accessors/ReadDepartments');
+
+module.exports = (db) => {
+  // Объекты посредников
+  const instances = [];
+
+  // Регистрация посредников отвечающий за проверку прав доступа
+  const middlewares = [
+    ReadDepartments,
+  ];
+
+  let nextMiddleware = null;
+
+  // Собираем цепочку посредников
+  for (let i = middlewares.length - 1; i >= 0; i--) {
+    const Middleware = middlewares[i];
+    const middleware = new Middleware();
+
+    // Передаем в посредники параметры
+    middleware.db = db;
+
+    // Добавляем звено следующего посредника
+    middleware.next = nextMiddleware;
+
+    // Добавляем middleware в начало массива.
+    instances.unshift(middleware);
+
+    nextMiddleware = middleware;
+  }
+
+  // Запускам цепочку зарегестрированных посредников
+  return (rule, entity) => instances[0].check(rule, entity);
+};

package/src/modules/middlewares/server/verifyInvites.js

@@ -7,7 +7,7 @@ const middlewareFactory = (db) => {
   const Membership = db.membership;
 
   const checkInviteExist = async (req, res, next) => {
-    for (let invite of req.body) {
+    for (let invite of req.body.invites) {
       let query;
   
       if (invite.contact.includes('@')) {
@@ -16,7 +16,7 @@ const middlewareFactory = (db) => {
         query = { invitedPhone: invite.contact };
       }
   
-      query.organization = req.params._id;
+      query['owner.target'] = req.body.owner.target;
   
       const userInvite = await Invite.findOne(query).exec();
       
@@ -30,7 +30,7 @@ const middlewareFactory = (db) => {
   };
 
   const checkUsersExist = async (req, res, next) => {
-    for (let invite of req.body) {
+    for (let invite of req.body.invites) {
       let query;
   
       if (invite.contact.includes('@')) {
@@ -43,7 +43,7 @@ const middlewareFactory = (db) => {
       console.log(req.params);
       
       if (user) {
-        const membership = await Membership.findOne({ user: new ObjectId(user._id), organization: req.params._id }).exec();
+        const membership = await Membership.findOne({ user: new ObjectId(user._id), 'owner.target': req.body.owner.target }).exec();
         
         if (membership) {
           console.log(membership);

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

@@ -21,7 +21,7 @@
 			v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0" 
 			class="order-form col"
 		>
-			<FormClientDetails
+			<FormCustomerDetails
 				:order="orders.state.current"  
 			/>
 			<FormDelivery 	
@@ -120,7 +120,7 @@ import AskToLogin from '@pf/src/modules/orders/components/sections/AskToLogin.vu
 import Succes from '@pf/src/modules/orders/components/sections/Succes.vue'
 import EmptyState from '@pf/src/modules/orders/components/sections/EmptyState.vue'
 
-import FormClientDetails from '@pf/src/modules/orders/components/sections/FormClientDetails.vue'
+import FormCustomerDetails from '@pf/src/modules/orders/components/sections/FormCustomerDetails.vue'
 import FormDelivery from '@pf/src/modules/orders/components/sections/FormDelivery.vue'
 import FormPayment from '@pf/src/modules/orders/components/sections/FormPayment.vue'
 ///////////////////////////////////////////////////////////////////////////////////////////////////

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="h-100 flex flex-column pd-thin">
     <Block class="mn-b-thin">
       <header class="flex-v-center flex-nowrap flex">
         <h2 class="mn-r-auto">Create Order</h2>
@@ -13,8 +13,18 @@
       </header>
     </Block>
 
+    <Tab 
+      v-model:selected="tabOrderCreate"
+      :tabs="[
+        {name: 'Positions', value: 'positions'},
+        {name: 'Customer', value: 'customer'},
+        {name: 'Delivery', value: 'delivery'},
+        {name: 'Payment', value: 'payment'}
+      ]"
+      class="t-medium radius-medium bg-grey mn-b-small"
+    />
+
     <Popup 
-      title="Добавить участника" 
       @close-popup="closeProductsPopup" 
       :isPopupOpen="isOpenProductsPopup"
       class="bg-white w-min-30r w-max-30r radius-big pd-medium"
@@ -22,9 +32,12 @@
 
       <h3 class="mn-b-small">Add to order</h3>
 
-      <div class="bg-grey mn-b-thin h-min-20r h-max-20r o-scroll pd-medium radius-big">
+      <div class="h-100 bg-grey mn-b-thin o-scroll pd-medium radius-big">
         <Feed
-          :search="true"
+          :search="{
+            placeholder: 'Search products...',
+            class: 'bg-white mn-b-thin'
+          }"
           :states="{
             empty: {
               title: 'No Products Found',
@@ -60,12 +73,13 @@
     </Popup>
 
     <Block
+      v-if="tabOrderCreate === 'positions'"
       title="Positions"
       :actions="[{
         label: '+',
         function: () => openProductsPopup()
       }]"
-      class="mn-b-semi"
+      class="mn-b-small"
     >
       <span 
         v-if="orders.state.current.positions.length === 0" 
@@ -87,71 +101,81 @@
     </Block>
 
     <Block
+      v-if="tabOrderCreate === 'customer'"
       title="Customer"
       class="mn-b-semi"
+      :actions="[{
+        label: '+',
+        function: () => openCustomerPopup()
+      }]"
     >
-      <div class="flex-nowrap flex">
-        <button class="w-100 bg-main pd-small flex-center flex uppercase t-medium">Select</button>
-        <button @click="openClientPopup()" class="w-100 bg-main pd-small flex-center flex uppercase t-medium">Add new</button>
-      </div>  
-
+      <CardUser
+        v-if="orders.state.current.customer._id"
+        :user="orders.state.current.customer"
+        :photo="orders.state.current.customer.profile.photo"
+        :name="orders.state.current.customer.profile.name || orders.state.current.customer.phone || orders.state.current.customer.email"
+        @click="() => { 
+         orders.mutations.resetCustomer(orders.state.current.customer)
+        }"
+        class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+      />
+      <Feed
+        v-else
+        :search="{
+          placeholder: 'Search customer...',
+          class: 'bg-white mn-b-thin'
+        }"
+        :states="{
+          empty: {
+            title: 'No Products Found',
+            description: 'Currently, there are no such products available.'
+          }
+        }"
+        :store="{
+          read: (options) => customers.read(options),
+          state: null
+        }"
+        :options="{
+          owner: route.params._id
+        }"
+        v-slot="{ 
+          items 
+        }"
+        class="bg-grey h-max-20r o-scroll"
+      >
+        <CardUser
+          v-for="(user, index) in items" 
+          :key="user._id"
+          :user="user"
+          :photo="user.profile.photo"
+          :name="user.profile.name || user.phone || user.email"
+          @click="() => { 
+            orders.state.current.customer = user
+          }"
+          class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+        />
+      </Feed>
+      
     </Block>
 
-    <FormDelivery   
-      v-if="orders.state.current.status !== true"
+    <FormDelivery  
+      v-if="tabOrderCreate === 'delivery'" 
       :order="orders.state.current"  
     />
 
     <FormPayment  
-      v-if="orders.state.current.status !== true"
+      v-if="tabOrderCreate === 'payment'"
       :order="orders.state.current"  
     />
 
-   <!--  <Feed
-      :search="true"
-      :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="bg-grey h-min-20r h-max-20r o-scroll"
-    >
-      <CardOrderItem
-        v-for="(product, index) in items" :key="product._id"
-        :editable="false" 
-        :product="product" 
-        @click="() => { 
-          let p = { ...product };
-          p.quantity = 1;
-          globals.actions.add(orders.state.current.positions, p) 
-          closeProductsPopup();
-        }"
-        class="bg-white pd-thin radius-medium w-100 mn-b-thin"
-      />
-    </Feed> -->
-
     <Popup 
-      title="Добавить участника" 
-      @close-popup="closeClientPopup" 
-      :isPopupOpen="isOpenClientPopup"
-      class="bg-white w-min-30r w-max-30r radius-big pd-medium"
+      title="Add customer" 
+      @close-popup="closeCustomerPopup" 
+      :isPopupOpen="isOpenCustomerPopup"
+      :class="'bg-white w-min-30r w-max-30r radius-big pd-medium'"
     >
-      <h3 class="mn-b-small">Add New Client</h3>
-      
-      <FormClientDetails
-        :order="orders.state.current"  
-        class="bg-grey"
+      <FormAddCustomer 
+        @callbackCustomer="closeCustomerPopup"
       />
     </Popup>
 
@@ -169,29 +193,34 @@
 </template>
 
 <script setup="props">
-  // Import Vue functionality
   import { computed, ref, defineProps, onMounted, reactive, toRefs, watch } from 'vue'
-  import { useRoute,useRouter } from 'vue-router'
-
-  import Feed from '@pf/src/components/Feed/Feed.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'
   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 CardOrderItem  from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
   import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
+  import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
 
-  import FormClientDetails from '@pf/src/modules/orders/components/sections/FormClientDetails.vue'
+  import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+
+  import FormAddCustomer from '@pf/src/modules/orders/components/sections/FormAddCustomer.vue'
   import FormDelivery from '@pf/src/modules/orders/components/sections/FormDelivery.vue'
   import FormPayment from '@pf/src/modules/orders/components/sections/FormPayment.vue'
 
   // Import your store
-  import * as auth from '@pf/src/modules/auth/store/auth';
   import * as globals from '@pf/src/modules/globals/store/globals';
+  import * as auth from '@pf/src/modules/auth/store/auth';
   import * as orders from '@pf/src/modules/orders/store/orders';
-	import * as products from '@pf/src/modules/products/store/products';
+  import * as products from '@pf/src/modules/products/store/products';
+
+  import customers from '@pf/src/modules/orders/store/customers.store';
+	
 
   // Accessing router
   const route = useRoute()
@@ -203,6 +232,9 @@
     }, 0));
   })
 
+  // Tab
+  const tabOrderCreate = ref('positions')
+
   // Popup
   const isOpenProductsPopup = ref(false);
 
@@ -214,14 +246,14 @@
     isOpenProductsPopup.value = false;
   }
 
-  const isOpenClientPopup = ref(false);
+  const isOpenCustomerPopup = ref(false);
 
-  function openClientPopup() {
-    isOpenClientPopup.value = true;
+  function openCustomerPopup() {
+    isOpenCustomerPopup.value = true;
   }
 
-  function closeClientPopup() {
-    isOpenClientPopup.value = false;
+  function closeCustomerPopup() {
+    isOpenCustomerPopup.value = false;
   }
 
   // Data
@@ -239,6 +271,11 @@
       target: route.params._id,
     }
 
+    orders.state.current.customer = {
+      type: 'Customer',
+      target: orders.state.current.customer._id || null,
+    }
+
     orders.actions.create(orders.state.current)
   }
 

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

@@ -64,8 +64,8 @@
 
         <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.slice(0,8)}}</h3>
-            <p class="t-truncate">{{order.delivery.address}}</p> 
+            <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>
 
           <div class=" w-100 t-right">

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

@@ -0,0 +1,152 @@
+<template>
+  <Block class="pos-relative mn-b-thin">
+    <BlockSearch 
+      v-click-outside="() => {searchUserShow = false}" 
+      v-if="!dataCustomer.user"
+      @search="(event) => { searchUser = event; searchUserShow = true }"
+      placeholder="Enter name, phone or email"
+      class="bg-white"
+    />
+    <CardUser
+      v-else
+      :user="dataCustomer.user"
+      :photo="dataCustomer.user.profile.photo"
+      :name="dataCustomer.user.profile.name || dataCustomer.user.phone || dataCustomer.user.email"
+      @click="() => { 
+        dataCustomer.user = null
+      }"
+      class="bg-white pd-thin radius-medium w-100"
+    />
+
+    <div 
+      v-if="searchUser && searchUserShow && !dataCustomer.user " 
+      class="mn-t-thin pos-absolute w-100 pos-t-100 pos-l-0 z-index-3 bg-grey pd-small radius-small
+    ">
+      <Feed
+        :states="{
+          empty: {
+            title: 'No User Found',
+            description: 'Currently, there are no such user.'
+          }
+        }"
+        :store="{
+          read: (options) => users.actions.read(options),
+          state: null
+        }"
+        :options="{
+          search: searchUser
+        }"
+        :showLoadMore="false"
+        v-slot="{ 
+          items 
+        }"
+        class="h-max-20r o-scroll"
+      >
+        <CardUser
+          v-for="(user, index) in items" :key="user._id"
+          :user="user"
+          :photo="user.profile.photo"
+          :name="user.profile.name || user.phone || user.email"
+          @click="() => { 
+            dataCustomer.user = user
+            dataCustomer.profile = user.profile
+            dataCustomer.phone = user.phone
+            dataCustomer.email = user.email
+            dataCustomer.socials = user.socials
+          }"
+          class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+        />
+      </Feed>
+    </div>
+  </Block>
+
+  <FormCustomerDetails
+    :customer="dataCustomer"  
+    class="mn-b-thin bg-grey"
+  />
+
+  <Button 
+    :submit="addCustomer"
+    :callback="callbackCustomer"
+    @error="setError"
+    class="w-100 pd-small radius-big bg-main t-black uppercase t-medium"
+  >
+    Add Customer 
+  </Button>
+</template>
+
+<script setup>
+import { ref } from "vue"
+import { useRoute, useRouter } from 'vue-router'
+
+import Block from '@pf/src/components/Block/Block.vue'
+import Field from '@pf/src/components/Field/Field.vue'
+import Select from '@pf/src/components/Select/Select.vue'
+import Feed from '@pf/src/components/Feed/Feed.vue'
+import Button from '@pf/src/components/Button/Button.vue'
+
+import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+
+import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
+
+import FormCustomerDetails from '@pf/src/modules/orders/components/sections/FormCustomerDetails.vue'
+
+import * as users from '@pf/src/modules/users/store/users';
+import * as auth from '@pf/src/modules/auth/store/auth';
+
+import { setError } from '@pf/src/modules/globals/store/globals'
+
+import customers from '@pf/src/modules/orders/store/customers.store';
+import customerInitState from "@pf/src/modules/orders/store/models/customer"
+
+import clickOutside from '@pf/src/components/FieldPhone/click-outside';
+
+// Directives
+let vClickOutside = clickOutside
+// Props
+const props = defineProps({
+  order: Object,
+});
+// Emits
+const emits = defineEmits(['callbackCustomer']);
+// Router
+const route = useRoute()
+
+let dataCustomer = ref(customerInitState)
+
+let searchUser = ref(null)
+let searchUserShow = ref(false)
+
+async function addCustomer() {
+  let customerData = {
+    identity: {
+      type: dataCustomer.value.user ? 'User' : 'Visitor',
+      target: dataCustomer.value.user ? dataCustomer.value.user._id : null
+    },
+    owner: {
+      type: 'Organization',
+      target: route.params._id
+    },
+    creator: {
+      type: 'User',
+      target: auth.state.user._id
+    },
+    phone: dataCustomer.value.phone,
+    email: dataCustomer.value.email,
+    profile: dataCustomer.value.profile,
+    socials: dataCustomer.value.socials
+  }
+
+  try { 
+    let customer = await customers.create(customerData)
+    
+    dataCustomer.value = customer
+  } catch(err) {
+    console.log(err)
+  }
+}
+
+function callbackCustomer() {
+  emits('callbackCustomer', dataCustomer.value)
+}
+</script>