@ozdao/prometheus-framework 0.2.57 → 0.2.59

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

@@ -149,7 +149,7 @@
 	     		v-if="orders.state.current.status_history"
 	     		:statusHistory="orders.state.current.status_history"
 	     		:statusCurrent="orders.state.current.status"
-	     		:edit="route.name === 'AdminOrderEdit'"
+	     		:edit="route.name === 'Order Edit'"
 	     	/>
 
 	     <!-- 	<button 
@@ -196,7 +196,7 @@
 		    	:username="
 		    		route.name === 'Order Status' ? order.user?.name || 'User' : 'Weeder Support'
 		    	"
-		    	:chatID="order._id"
+		    	:chatID="route.params.order"
 		    	class="radius-semi bg-white o-hidden"
 		    />
 
@@ -231,36 +231,40 @@
 	const orderOrganization = ref(null)
 
 	onMounted(async()=>{
-		order.value = await orders.actions.fetchOrder(route.params.order)
+		order.value = await orders.actions.read({_id: route.params.order})
+		order.value = order.value[0]
 
 		productsOrganization.value = await products.actions.read({
-	    organization: order.value.organization
+	    organization: order.value?.owner.target._id
 	  });
 
 	  orderOrganization.value = await organizations.actions.read({
-	    _id: order.value.organization,
-	    // location: globals.state.position?.location,
+	    _id: order.value?.owner.target._id,
+	    location: globals.state.position?.location,
 	  });
 
 	})
 
 	let cartTotalPrice = computed(() => {
-    return Number(order.value.positions.reduce((total, product) => {
+    return Number(order.value?.positions.reduce((total, product) => {
       return total + product.price * product.quantity;
     }, 0));
   })
 
   let cartTotalAmount = computed(() => {
-    return Number(order.value.positions.reduce((total, product) => {
+    return Number(order.value?.positions.reduce((total, product) => {
       return total + product.quantity;
     }, 0));
   })
 
   let orderProducts = computed(() => {
-    return order.value.positions.map(({ _id, quantity }) => {
+    return order.value?.positions.map(({ _id, quantity }) => {
 
 	    const product = productsOrganization.value.find(product => product._id === _id)
 
+	    console.log(product)
+	    console.log(productsOrganization)
+
 	    return {
 	      name: product.name,
 	      images: product.images,
@@ -271,16 +275,6 @@
 	  })
   })
 
-	onMounted(async () => {
-		
-  })
-
-	// await store.dispatch('payments/getStatus', props.order._id)
-
-	// const payment = computed(() => store.state.payments.current)
-
-	
-
 	function requestPayment(order) {
 		 // store.dispatch("payments/newPayment", order);
 	}

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

@@ -4,7 +4,7 @@
 
     <button 
       @click="$router.push({
-        name: 'AdminOrder'
+        name: 'AdminOrderAdd'
       })" 
       class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
         +
@@ -26,18 +26,39 @@
     class="cols-3 gap-thin"
   >
 
-    <div 
-      v-for="order in orders.state.all" 
-      class="bg-grey pd-small radius-big"
-    > 
-      Status: {{order.status}} 
+    <router-link 
+       v-for="order in orders.state.all" 
+      :to="{ 
+        name: 'Order Edit', 
+        params: { 
+          order: order._id 
 
+        }
+      }" 
+       class="bg-grey radius-big"
+    >
+      <CardHeader 
+        :class="{
+          'mn-b-small pd-medium': type !== 'short',
+          'flex-child-order-last flex-child mn-l-small': type === 'short',
+        }"
+        :entity="order"
+        :entityType="'order'"
+        :user="auth.state.user"
+        :owner="order.creator" 
+        :creator="order.creator"
+        :date="order.createdAt"
+      />
+      <div class="pd-small">
       <p 
         class="w-100 mn-b-thin p-big"
       >
         Order No.: #{{order._id}} 
       </p>
 
+      <span class="mn-b-thin pd-r-thin pd-l-thin pd-b-nano pd-t-nano bg-second radius-extra t-white t-medium d-block w-max uppercase">
+        {{order.status}}
+      </span>
       <p
         class="mn-b-small t-transp w-100"
       >
@@ -49,23 +70,9 @@
         class="mn-b-small"
       >
      
-        Order Created: {{formatDate(order.createdAt)}}
-        
-        <router-link 
-          :to="{ 
-            name: 'AdminOrderEdit', 
-            params: { 
-              order: order._id 
-
-            }
-          }" 
-          class="i-small"
-        >
-          EDIT
-        </router-link>
       </p>
-
-    </div>
+      </div>
+     </router-link>
   </section>
 </template>
 
@@ -76,8 +83,10 @@
   import Tab      from '@pf/src/components/Tab/Tab.vue'
 
   import * as orders from '@pf/src/modules/orders/store/orders';
+  import * as auth from '@pf/src/modules/auth/store/auth';
 
   import CardOrder from '@pf/src/modules/orders/components/blocks/CardOrder.vue'
+  import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
 
   const route = useRoute();
   const router = useRouter();

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

@@ -1,7 +1,7 @@
 <template>
   <Block title="Personal Data" class="mn-b-thin">
     <Field 
-      v-model="order.client.name"     
+      v-model:field="order.client.name"     
       label="Name*"    
       placeholder="Enter your name"  
       class="bg-white pd-medium radius-small mn-b-thin"
@@ -43,7 +43,7 @@
       />
 
       <Field 
-        v-model="order.client.messenger.value"     
+        v-model:field="order.client.messenger.value"     
         placeholder="Enter your contact here"  
         class="bg-white pd-medium radius-small w-100"
       />

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

@@ -1,14 +1,16 @@
 <template>
   <Block title="Delivery" class="mn-b-thin" :tooltip="'Delivery by mail takes 3-5 days.'">
+
     <div class="mn-b-small flex-nowrap flex">
+
       <Radio 
-        v-model="order.delivery.type"
+        v-model:radio="order.delivery.type"
         label="Courier"
         value="courier"
         class="bg-white pd-medium radius-small w-100 mn-r-small"
       />
       <Radio 
-        v-model="order.delivery.type"
+        v-model:radio="order.delivery.type"
         label="Post"
         value="Post"
         class="bg-white pd-medium radius-small w-100 mn-r-small"
@@ -44,7 +46,7 @@
     />
 
     <Field 
-      v-model="order.comment"     
+      v-model:field="order.comment"     
       placeholder="Comments regarding the address (apartment unit, floor level, building section)"
       type="textarea"  
       class="bg-white pd-medium radius-small"

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

@@ -2,7 +2,7 @@
   <Block title="Payment">
     <div class="mn-b-small flex-nowrap flex">
       <Select 
-        v-model="order.payment.type"
+        v-model:select="order.payment.type"
         :property="'value'"
         :options="[
           {name: 'Cash On Delivery',  value: 'cash'}, 

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

@@ -39,7 +39,7 @@ const controllerFactory = (db) => {
     });
 
     try {
-      const formattedMessage = formatOrderMessage(req.body);
+      // const formattedMessage = formatOrderMessage(req.body);
       console.log(formattedMessage)
       const messageSent = await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","),formattedMessage)
     } catch (err) {  
@@ -64,7 +64,7 @@ const controllerFactory = (db) => {
         req.query
       ), 
       // For creator
-      queryProcessorGlobals.getCreatorUserLookupStage(),
+      queryProcessorGlobals.getCreatorUserLookupStage(), 
       queryProcessorGlobals.getCreatorOrganizationLookupStage(),
       // For owner
       queryProcessorGlobals.getOwnerUserLookupStage(),

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

@@ -4,6 +4,15 @@ module.exports = (db) => {
     
   const OrderSchema = new db.mongoose.Schema({
    client: {
+      type: { 
+        type: String,
+        trim: true 
+      },
+      target: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        refPath: 'client.type',
+      },
+      table: { type: String, trim: true },
       name: { type: String, trim: true },
       phone: { type: Object, trim: true },
       email: { type: String, trim: true },

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

@@ -33,7 +33,7 @@ const orders = [
     },
     {
       path: ':order/edit',
-      name: 'AdminOrderEdit',
+      name: 'Order Edit',
       meta: {
         title: {
           en: 'Order',

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

@@ -22,11 +22,13 @@ module.exports = function(app, db) {
     "/api/orders/create",
     controller.create
   );
-    // Get orders
+  
+  // Get orders
   app.get(
     "/api/orders/read",
     controller.read
   );
+
   app.post(
     "/api/orders/update",
     [
@@ -34,6 +36,7 @@ module.exports = function(app, db) {
     ],
     controller.update
   );
+  
   app.post(
     "/api/orders/delete",
     controller.deleteOrder
@@ -44,6 +47,5 @@ module.exports = function(app, db) {
   //   "/api/orders/payment/:_id",
   //   controller.changePaymentStatus
   // );
-
 };
 

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

@@ -50,13 +50,8 @@ const state = reactive({
 });
 
 const actions = {
-  async create(positions, owner, creator) {
+  async create(order) {
     try {
-      let order = {
-        positions: positions,
-        owner: owner,
-        creator: creator
-      }
       const response = await $axios.post('/api/orders/create', order);
 
       state.all.push(response.data);
@@ -67,24 +62,20 @@ const actions = {
     }
   },
 
-   async fetchOrder(orderID) {
+   async read( options = {}) {
     try {
-      const response = await $axios.get(`/api/orders/${orderID}`);
-
-      state.current = response.data;
-      console.log(response.data)
-      return response.data; 
-    } catch (error) {
-      setError(error);
-      throw err;
-    }
-  },
+     
+      if (options._id) {
+        options.params = { _id: options._id };
+      }
 
-   async read(orderID) {
-    try {
-      const response = await $axios.get(`/api/orders/read`);
+      const response = await $axios.get('/api/orders/read', { params: options.params });
 
-      state.all = response.data;
+      if (options._id) {
+        set(response.data[0], 'current')
+      } else {
+        set(response.data, 'all')
+      }
 
       return response.data; 
     } catch (err) {
@@ -131,6 +122,10 @@ const actions = {
   },
 }
 
+function set(eventData, property) { 
+  state[property] = eventData
+}
+
 const history = []
 
 history.push(state) 

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

@@ -22,8 +22,6 @@
 
 
 <script setup="props">
-  import VueSelect from "vue-select";
-
     // GLOBAL
   // import InputText    from '/components/elements/InputText.vue'
   // import InputSelect  from '/components/elements/InputSelect.vue'
@@ -128,7 +126,7 @@
 </script>
 
 <style lang="scss" >
-  @import "vue-select/dist/vue-select.css";
+  
 .VueSelect {
   background: #f7f7f7;
   border-radius: 0.5rem;

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

@@ -295,5 +295,4 @@ function redirectDash() {
 </script>
 
 <style scoped>
-  @import "vue-select/dist/vue-select.css";
 </style>

package/src/modules/organizations/router/departments.router.js

@@ -1,7 +1,7 @@
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
 const departmentRoutes = [{
-  path: ':_id/departments/create',
+  path: 'departments/create',
   name: 'Department Creation',
   meta: {
     title: 'Создание отдела',
@@ -9,7 +9,7 @@ const departmentRoutes = [{
   beforeEnter: [validationAuth.requiresAuth],
   component: () => import('@pf/src/modules/organizations/components/pages/DepartmentEdit.vue'),
 }, {
-  path: ':_id/departments/:department',
+  path: 'departments/:department',
   name: 'Department',
   meta: {
     title: 'Отдел',
@@ -17,7 +17,7 @@ const departmentRoutes = [{
   beforeEnter: [validationAuth.requiresAuth],
   component: () => import('@pf/src/modules/organizations/components/pages/Department.vue'),
 }, {
-  path: ':_id/departments/:department/edit',
+  path: 'departments/:department/edit',
   name: 'Department Edit',
   meta: {
     title: 'Редактирование отдела',

package/src/modules/organizations/router/members.router.js

@@ -1,7 +1,7 @@
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
-export const membersRoutes = [{
-  path: ':_id/members',
+const membersRoutes = [{
+  path: 'members',
   name: 'Organization Members',
   meta: {
     title: {
@@ -11,7 +11,10 @@ export const membersRoutes = [{
   },
   component: () => import('@pf/src/modules/organizations/components/pages/Members.vue')
 },{
-  path: ':_id/members/invite',
+  path: 'members/invite',
   name: 'Invite Member',
   component: () => import('@pf/src/modules/organizations/components/sections/MembersAdd.vue')
 }];
+
+
+export default membersRoutes;

package/src/modules/organizations/router/organizations.js

@@ -1,13 +1,16 @@
 import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
 
-import organizationRoutes from './organizations.router.js';
-
-import { membersRoutes } from './members.router.js';
+import membersRoutes from './members.router.js';
 import departmentRoutes from './departments.router.js'
-import productRoutes from './products.router.js';
+
+import productRoutes from '@pf/src/modules/products/router/products.router.js'
+import categoriesRoutes from '@pf/src/modules/products/router/categories.router.js'
+import leftoversRoutes from '@pf/src/modules/products/router/leftovers.router.js'
 
 import backofficeRoutes from '@pf/src/modules/backoffice/router/backoffice.js'
 
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
+
 const organizations = [{
   path: 'organizations',
   component: layoutEmpty,
@@ -17,14 +20,58 @@ const organizations = [{
       ru: 'Организации'
     }
   },
-  children: [
-    ...organizationRoutes,
-    ...membersRoutes,
-    ...departmentRoutes,
-    ...productRoutes,
-    // ...backofficeRoutes
-    
-  ]
+  children: [{
+    path: 'create',
+    name: 'Create Organization',
+    meta: {
+      title: {
+        en: 'Create Organization',
+        ru: 'Создать Организацию'
+      }
+    },
+    beforeEnter: [validationAuth.requiresAuth],
+    component: () => import('@pf/src/modules/organizations/components/pages/OrganizationEdit.vue')
+  },{
+    path: ':_id',
+    name: 'OrganizationRoot',
+    meta: {
+      title: {
+        en: 'Organization',
+        ru: 'Организация'
+      }
+    },
+    component: layoutEmpty,
+    children: [
+      {
+        path: '',
+        name: 'Organization',
+        meta: {
+          title: {
+            en: 'Organization',
+            ru: 'Организация'
+          }
+        },
+        component: () => import('@pf/src/modules/organizations/components/pages/Organization.vue'),
+      },
+      ...membersRoutes,
+      ...departmentRoutes,
+      ...productRoutes,
+      ...categoriesRoutes,
+      ...leftoversRoutes,
+      ...backofficeRoutes 
+    ],
+  },{
+    path: ':_id/edit',
+    name: 'Organization Edit',
+    meta: {
+      title: {
+        en: 'Edit Organization',
+        ru: 'Редактировать Организацию'
+      }
+    },
+    beforeEnter: [validationAuth.requiresAuth],
+    component: () => import('@pf/src/modules/organizations/components/pages/OrganizationEdit.vue'),
+  }]
 }];
 
 export default organizations;

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

@@ -19,7 +19,7 @@
 		<Field 
 			v-model:field="productQuantity" 
 			type="number"  
-			label="Quantity" 
+			label="Qty" 
 			class="bg-white pd-small radius-small" 
 		>
 		<Select 

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

@@ -111,9 +111,9 @@
   const productNew = ref(null);
 
   const totalPrice = computed(() => {
-    return leftovers.state.current.positions.reduce((sum, position) => {
+    return Number(leftovers.state.current.positions.reduce((sum, position) => {
       return sum + position.price;
-    }, 0);
+    }, 0));
   });
 
   onMounted(async () => {

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

@@ -1,4 +1,30 @@
 <template>
+  <header 
+    v-if="route.name !== 'Organization'"
+    class="mn-b-medium flex-v-center flex-nowrap flex"
+  >
+    <h2 class="mn-r-medium">Products</h2>
+    <button 
+      @click="$router.push({
+        name: 'AddProduct'
+      })" 
+      class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
+        +
+    </button>
+  </header>
+
+  <Tab 
+    v-if="route.name !== 'Organization'"
+    v-model:selected="tab"
+    :tabs="[
+      { name: 'All',          value: 'all' },
+      { name: 'Published',    value: 'published' },
+      { name: 'Unpublished',  value: 'unpublished' }, 
+      { name: 'Archivied',    value: 'archivied' } 
+    ]"
+    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
@@ -29,7 +55,8 @@
           categories: route.query.categories,
           prices: route.query.prices,
           delivery: route.query.delivery,
-          search: route.query.search
+          search: route.query.search,
+          status: tab === 'all' ? '' : tab ? tab : ''
           // user: user
         }"
         v-slot="{ 
@@ -58,21 +85,33 @@
 
 <script setup="props">
   // Import libs
-  import { computed, onMounted } from 'vue'
-
+  import { computed, watch, onMounted, ref } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
 
   // Import components
+  import Tab from '@pf/src/components/Tab/Tab.vue'
+  import Feed from '@pf/src/components/Feed/Feed.vue'
+
   import FilterProducts from '@pf/src/modules/products/components/sections/FilterProducts.vue'
   import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
-  
 
-  import Feed from '@pf/src/components/Feed/Feed.vue'
   import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
 
   // Accessing router and store
   import * as products from '@pf/src/modules/products/store/products';
 
+  const route = useRoute()
+  const router = useRouter()
+
+  // Tab logic
+  const tab = ref(route.query.tab ? route.query.tab : 'all')
+
+  route.query.tab = tab.value
+
+  watch(tab, (newValue) => {
+    router.replace({ query: { ...route.query, tab: newValue } });
+  });
+  
   function updateSearch(search) {
     let query = { ...route.query}
     
@@ -80,9 +119,6 @@
     
     router.push({ query });
   }
-
-  const route = useRoute()
-  const router = useRouter()
 </script>
 
 <style lang="scss">

package/src/modules/products/products.client.js

@@ -26,12 +26,6 @@ import THC from './components/elements/THC.vue';
 
 import Product from './components/pages/Product.vue';
 
-// import OrganizationDetails from './components/pages/OrganizationDetails.vue';
-// import OrganizationDocuments from './components/pages/OrganizationDocuments.vue';
-// import OrganizationPeople from './components/pages/OrganizationPeople.vue';
-// import OrganizationCreate from './components/pages/OrganizationCreate.vue';
-
-import ProductsBackoffice from './components/pages/ProductsBackoffice.vue';
 import ProductEdit from './components/pages/ProductEdit.vue';
 import EditLeftover from './components/pages/EditLeftover.vue';
 import ProductRecommendation from './components/pages/ProductRecommmendation.vue'; // Исправленная опечатка
@@ -72,13 +66,6 @@ export {
   THC,
 
   Product,
-
-  // OrganizationDetails,
-  // OrganizationDocuments,
-  // OrganizationPeople,
-  // OrganizationCreate,
-
-  ProductsBackoffice,
   ProductEdit,
   EditLeftover,
   ProductRecommendation,