@ozdao/prometheus-framework 0.2.81 → 0.2.82

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

@@ -3,27 +3,15 @@ const controllerFactory = require("../controllers/orders.controller");
 // Middlewares
 const middlewareFactory = require('@pf/src/modules/middlewares/server');
 // Routes
-module.exports = function(app, db) {
+module.exports = function(app, db, origins, publicPath) {
   const controller = controllerFactory(db);
-  
-  const { authJwt } = middlewareFactory(db);
-
-  app.use(function(req, res, next) {
-    res.header(
-      "Access-Control-Allow-Headers",
-      "Access-Control-Allow-Origin: *",
-      "x-access-token, Origin, Content-Type, Accept"
-    );
-    next();
-  });
+  const middleware = middlewareFactory(db);
 
-  // Send order
   app.post(
     "/api/orders/create",
     controller.create
   );
   
-  // Get orders
   app.get(
     "/api/orders/read",
     controller.read
@@ -32,7 +20,7 @@ module.exports = function(app, db) {
   app.post(
     "/api/orders/update",
     [
-      authJwt.verifyToken
+      middleware.authJwt.verifyToken
     ],
     controller.update
   );
@@ -41,11 +29,5 @@ module.exports = function(app, db) {
     "/api/orders/delete",
     controller.deleteOrder
   );
-
-  // Change Payment status
-  // app.post(
-  //   "/api/orders/payment/:_id",
-  //   controller.changePaymentStatus
-  // );
 };
 

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

@@ -0,0 +1,5 @@
+import Store from '@pf/src/modules/globals/services/globals.store.js'
+
+const customers = new Store('/api/customers')
+
+export default customers

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

@@ -0,0 +1,29 @@
+const customerInitState = {
+  _id: null,
+  identity: {
+    type: 'Visitor',
+    target: null,
+  },
+  owner: {
+    type: 'Organization',
+    target: null,
+  },
+  creator: {
+    type: 'User',
+    target: null,
+  },
+  user: null,
+  profile: {
+    name: null
+  },
+  messenger: {
+    type: null
+  },
+  socials: {
+    instagram: null,
+    telegram: null,
+    whatsapp: null
+  }
+};
+
+export default customerInitState

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

@@ -7,43 +7,36 @@ const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true
 // Globals
 import { setError }   from '@pf/src/modules/globals/store/globals'
 
+import customerInitState from "@pf/src/modules/orders/store/models/customer"
+
 const state = reactive({
   all: [], 
   current: {
     _id: null,
-  
     positions: [],
     status: null,
     comment: '',
 
     owner: {
-      type: 'organization',
+      type: 'Organization',
       target: null,
     },
     
     creator: {
-      type: 'customer',
+      type: 'Customer',
       target: null,
     },
 
-    customer: {
-      name: null,
-      phone: null,
-      messenger: {
-        type: null,
-        value: null
-      },
-    },
-
+    customer: { ...customerInitState },
 
     payment: {
-      type: '',
-      status: '',
+      type: 'Cash',
+      status: 'Unpaid',
     },
 
     delivery: {
       type: null,
-      address: '',
+      address: null,
       status: '',
     }
   }
@@ -122,11 +115,11 @@ const actions = {
   },
 }
 
-// const getters = {
-//   getTotal(positions) {
-//     
-//   }
-// }
+const mutations = {  
+  resetCustomer(stateObject) {  
+    Object.assign(stateObject, customerInitState);
+  }  
+}
 
 const getters = {
   getTotal(positions) {
@@ -151,5 +144,6 @@ watch(state, (newState, oldState) => {
 export {
   state,
   actions,
+  mutations,
   getters
 }

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="radius-big o-hidden cols-2-1_3">
+  <div class="radius-semi o-hidden cols-2-1_3">
 
     <div class="pd-medium w-100">
 
@@ -30,7 +30,7 @@
       />
     
       <ul>
-        <li v-if="department.members.length < 1">В отделе еще нет участников</li>
+        <li v-if="department.members.length < 1">No members in department</li>
         <User 
           class="br-b br-solid br-grey" 
           v-for="(member, index) in department.members" 
@@ -51,7 +51,7 @@ import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 
 import Spoiler  from '@pf/src/components/Spoiler/Spoiler.vue';
 import DepartmentSub from '@pf/src/modules/organizations/components/blocks/DepartmentSub.vue';
-import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
 
 const props = defineProps({
   department: Object,

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

@@ -84,7 +84,7 @@
       <span class="mn-r-thin"> {{organization.products.length}} products</span>
     </div>
 
-    <div v-if="showProducts && organization.products.length > 0" class="w-100 o-scroll">
+    <div v-if="showProducts && organization.products.length > 0" class="w-100 o-scroll radius-medium">
       <div class="w-max flex-nowrap flex gap-thin">
         <CardOrderItem  
           @click.stop="$router.push({name: 'Product Organization', params: {_id: organization._id, product: product._id}})" 

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

@@ -2,7 +2,6 @@
   <div>
 
     <div class="br-grey radius-small mn-small">
-      <h3 class="mn-b-semi">Add to deparment</h3>
 
       <div class="bg-grey mn-b-thin h-min-10r h-max-10r o-scroll pd-medium radius-big">
         <Feed
@@ -36,16 +35,6 @@
         </Feed>
       </div>
 
-      <SelectMulti
-        v-if="props.member === null"
-        v-model="userInput"
-        :options="users"
-        :multiple="false"
-        :taggable="false"
-        placeholder="Type to search or add type of organization"
-        class="mn-b-semi bg-grey pd-medium radius-small" 
-      />
-
     <!--   <div v-else class="pd-small br-grey br-1px br-solid">
         {{ memberForm.user.name ? memberForm.user.name : 'Безымянный' }}, {{memberForm.user.id}}
       </div> -->
@@ -76,7 +65,7 @@ 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 User from '@pf/src/modules/organizations/components/blocks/User.vue';
+import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
 
 import * as memberships   from '@pf/src/modules/organizations/store/memberships'
 

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

@@ -62,7 +62,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import Spoiler from '@pf/src/components/Spoiler/Spoiler.vue';
 import DepartmentSub from '@pf/src/modules/organizations/components/blocks/DepartmentSub.vue';
-import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
 import * as departments from '@pf/src/modules/organizations/store/departments';
 
 const router = useRouter();

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

@@ -66,7 +66,7 @@
     </Block>
 
     <Popup 
-      title="Добавить участника" 
+      title="Add member" 
       @close-popup="closeMemberPopup" 
       :isPopupOpen="isOpenAddMemberPopup"
       class="bg-white w-max-30r radius-big pd-big"
@@ -88,12 +88,13 @@
           <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="Delivery"
-              value="pickup"
+              name="hidden"
               class="w-100 mn-r-small bg-white radius-small pd-small"
-              :radio="departments.state.department.delivery"
+              @update:radio="updated => departments.state.department.hidden = !departments.state.department.hidden"
+              :radio="departments.state.department.hidden"
             />
           </div>
         </div>
@@ -105,49 +106,72 @@
           
           <div class="cols-1 gap-thin">
             <h4>Products</h4>
-            <Checkbox 
-                label="See products"
-                name="Delivery"
-                value="pickup"
-                class="w-100 mn-r-small bg-white radius-small pd-small"
-                :radio="departments.state.department.delivery"
-              />
-              <Checkbox 
-                label="Edit products"
-                name="Delivery"
-                value="courier"
-                 class="w-100 mn-r-small bg-white radius-small pd-small"
-                :radio="departments.state.department.delivery"
-              />
-              <Checkbox 
-                label="Delete orders"
-                name="Delivery"
-                value="post"
-                 class="w-100 bg-white radius-small pd-small"
-                :radio="departments.state.department.delivery"
-              />
+            <Checkbox
+              label="Read products"
+              name="readProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.products.read"
+              @update:radio="updated => (departments.state.department.accesses.products.read = !departments.state.department.accesses.products.read)"
+            />
+            <Checkbox
+              label="Edit products"
+              name="editProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.products.edit"
+              @update:radio="updated => (departments.state.department.accesses.products.edit = !departments.state.department.accesses.products.edit)"
+            />
+            <Checkbox
+              label="Delete products"
+              name="deleteProducts"
+              class="w-100 bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.products.delete"
+              @update:radio="updated => (departments.state.department.accesses.products.delete = !departments.state.department.accesses.products.delete)"
+            />
+
             <h4>Orders</h4>
-            <Checkbox 
-                label="See orders"
-                name="Delivery"
-                value="pickup"
-                class="w-100 mn-r-small bg-white radius-small pd-small"
-                :radio="departments.state.department.delivery"
-              />
-              <Checkbox 
-                label="Confirm orders"
-                name="Delivery"
-                value="courier"
-                 class="w-100 mn-r-small bg-white radius-small pd-small"
-                :radio="departments.state.department.delivery"
-              />
-              <Checkbox 
-                label="Delete orders"
-                name="Delivery"
-                value="post"
-                 class="w-100 bg-white radius-small pd-small"
-                :radio="departments.state.department.delivery"
-              />
+            <Checkbox
+              label="Read orders"
+              name="readOrders"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.orders.read"
+              @update:radio="updated => (departments.state.department.accesses.orders.read = !departments.state.department.accesses.orders.read)"
+            />
+            <Checkbox
+              label="Confirm orders"
+              name="confirmOrders"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.orders.confirm"
+              @update:radio="updated => (departments.state.department.accesses.orders.confirm = !departments.state.department.accesses.orders.confirm)"
+            />
+            <Checkbox
+              label="Delete orders"
+              name="deleteOrders"
+              class="w-100 bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.orders.delete"
+              @update:radio="updated => (departments.state.department.accesses.orders.delete = !departments.state.department.accesses.orders.delete)"
+            />
+
+            <h4>Departments</h4>
+            <Checkbox
+              label="Read departments"
+              name="readDepartments"  class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.departments.read"
+              @update:radio="updated => (departments.state.department.accesses.departments.read = !departments.state.department.accesses.departments.read)"
+            />
+            <Checkbox
+              label="Edit departments"
+              name="editDepartments"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.departments.edit"
+              @update:radio="updated => (departments.state.department.accesses.departments.edit = !departments.state.department.accesses.departments.edit)"
+            />
+            <Checkbox
+              label="Delete departments"
+              name="deleteDepartments"
+              class="w-100 bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.departments.delete"
+              @update:radio="updated => (departments.state.department.accesses.departments.delete = !departments.state.department.accesses.departments.delete)"
+            />
           </div>
         </div>
 
@@ -215,7 +239,7 @@ import EditArray from "@pf/src/modules/organizations/components/blocks/EditArray
 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/organizations/components/blocks/User.vue';
+import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
 
 import * as departments from "@pf/src/modules/organizations/store/departments";
 import * as memberships from "@pf/src/modules/organizations/store/memberships";
@@ -229,7 +253,7 @@ async function fetchData() {
   }
   const users = ref(memberships.state.memberships);
 
-  await departments.actions.read(route.params._id);
+  // await departments.actions.read({organization: route.params._id});
   if (route.params.department) await departments.actions.readOne(route.params.department);
 }