@ozdao/prometheus-framework 0.2.31 → 0.2.33

package/src/modules/orders/components/blocks/CardOrder.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="pd-big mn-regular order-client-card col"> 
 	  <p class="mn-regular flex-center flex-nowrap flex w-100">
-			<img v-if="order.status === 'Created'" 			class="mn-r-small" src="@/assets/icons/status/created.svg"/>
-			<img v-if="order.status === 'Confirmed'"	class="mn-r-small" src="@/assets/icons/status/confirmed.svg"/>
-			<img v-if="order.status === 'Awaiting shipment'" 			class="mn-r-small" src="@/assets/icons/status/paid.svg"/>
-			<img v-if="order.status === 'In delivery'" 		class="mn-r-small" src="@/assets/icons/status/finished.svg"/>
-			<img v-if="order.status === 'Finished'" 		class="mn-r-small" src="@/assets/icons/status/finished.svg"/>
+				<!-- <img v-if="order.status === 'Created'" 			class="mn-r-small" src="@/assets/icons/status/created.svg"/>
+				<img v-if="order.status === 'Confirmed'"	class="mn-r-small" src="@/assets/icons/status/confirmed.svg"/>
+				<img v-if="order.status === 'Awaiting shipment'" 			class="mn-r-small" src="@/assets/icons/status/paid.svg"/>
+				<img v-if="order.status === 'In delivery'" 		class="mn-r-small" src="@/assets/icons/status/finished.svg"/>
+				<img v-if="order.status === 'Finished'" 		class="mn-r-small" src="@/assets/icons/status/finished.svg"/> -->
 	    <span class="w-100 t-medium p-big">{{order.status}}</span>
 	  </p>
 	  

package/src/modules/orders/components/blocks/StatusHistory.vue

@@ -0,0 +1,84 @@
+<template>
+  <div class="bg-grey radius-medium w-100">
+    <h3 class="pd-medium">Tracking History</h3>
+    <div v-for="status in statuses" :key="status.value" class="w-100 br-t br-solid br-black-transp-10 pd-medium flex-v-center flex-nowrap flex">
+      <div v-if="isStatusInHistory(status.value)" class="flex-center flex i-big radius-extra br-solid br-2px br-black-transp-10 mn-r-small">✔</div>
+      <p class="h4 w-8r">{{status.name}}</p>
+      <button :disabled="!isNextPossibleStatus(status.value)" @click="setStatus(status)" class="mn-l-auto bg-main button radius-big">Set status</button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+
+const props = defineProps({
+  statusHistory: {
+    type: Array
+  },
+  statusCurrent: {
+    type: String
+  }
+})
+
+// Инициализация состояния компонента
+const statuses = ref([{
+  value: 'created',
+  name: 'Received',
+  nextstatus: 'Confirming order...',
+  description: 'Your order has been successfully created. Our manager will contact you within five minutes to confirm your order.'
+},{
+  value: 'confirming',
+  name: 'Confirming',
+  nextstatus: 'Confirming order...',
+  description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
+},{
+  value: 'confirmed',
+  name: 'Confirmed',
+  nextstatus: 'Order is confirmed. Packing order...',
+  description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
+},{
+  value: 'packing',
+  name: 'Packing',
+  nextstatus: 'Packing order...',
+  description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
+},{
+  value: 'packed',
+  name: 'Packed',
+  nextstatus: 'Delivering order...',
+  description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
+},{
+  value: 'in delivery',
+  name: 'Delivering',
+  description: 'Your order is currently in transit. Our delivery team is working hard to get your items to you as soon as possible.'
+},{
+  value: 'delivered',
+  name: 'Delivered',
+  description: 'Congratulations! Your order has been successfully delivered. If you have any concerns or feedback, feel free to contact us.'
+}]);
+
+const statusCurrent = ref(props.statusCurrent);
+const statusHistory = ref(props.statusHistory);
+
+// Проверка, был ли статус уже установлен
+const isStatusInHistory = (statusValue) => {
+  return statusHistory.value.some(status => status.status === statusValue);
+};
+
+// Проверка, является ли статус следующим возможным действием
+const isNextPossibleStatus = (statusValue) => {
+  const currentIndex = statuses.value.findIndex(status => status.value === statusCurrent.value);
+  console.log(status.status === statusCurrent.value)
+  console.log(statusCurrent.value)
+   console.log(status)
+  const nextIndex = currentIndex + 1;
+  return statuses.value[nextIndex] && statuses.value[nextIndex].value === statusValue;
+};
+
+// Функция установки нового статуса
+const setStatus = async (newStatus) => {
+  console.log(status)
+  // orders.state.current.status = status.value
+  // await orders.actions.update(orders.state.current)
+}
+</script>

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

@@ -9,7 +9,7 @@
 	  	<p class="mn-b-medium w-m-40r p-medium">Your order has been successfully created. Our manager will contact you within five minutes to confirm your order.</p>
 	  
 	  	
-	  	<p class="p-medium mn-b-thin t-semi">{{ statuses.find(status => status.value === order.status).nextstatus}}</p>
+	  	<!-- <p class="p-medium mn-b-thin t-semi">{{ statuses.find(status => status.value === order.status).nextstatus}}</p> -->
 
 	  	<div class="radius-extra  mn-b-medium flex-nowrap flex h-1r pos-relativew-40r">
 	  		<div 
@@ -126,19 +126,16 @@
 			    </div>
 
 				</div>
-
 				
-	     	<div class="bg-grey radius-medium  w-100">
-					<h3 class="pd-medium">Tracking History</h3>
-					<div v-for="status in statuses" 	
-						class="w-100 br-t br-solid br-black-transp-10 pd-medium flex-nowrap flex"
-					>	
-						<img class="mn-r-small" src="@/assets/icons/status/created.svg"/>
-						<p  class="h4 w-8r">{{status.name}}<br><span class="p-small">16:30, 29th Aug 2021</span></p>
-						<button  @click="setStatus(status)" class="bg-main button radius-big">Set status</button>
-					</div>
-			  </div>
+				<div class="pd-big bg-red">
+					{{orders.state.current.status_history}}
+				</div>
 
+	     	<StatusHistory 
+	     		v-if="orders.state.current.status_history"
+	     		:statusHistory="orders.state.current.status_history"
+	     		:statusCurrent="orders.state.current.status"
+	     	/>
 
 	     <!-- 	<button 
 	     	@click="requestPayment(order)"
@@ -204,6 +201,7 @@
 
 	import ChatWindow from '@pf/src/modules/chats/components/pages/ChatPage.vue';
 
+	import StatusHistory from '@pf/src/modules/orders/components/blocks/StatusHistory.vue'
 
 	import * as orders 	from '@pf/src/modules/orders/store/orders'
 	import * as products 	from '@pf/src/modules/products/store/products'
@@ -216,40 +214,6 @@
 
 	let order = ref(orders.state.current)
 
-	let statuses = [{
-		value: 'created',
-		name: 'Received',
-		nextstatus: 'Confirming order...',
-		description: 'Your order has been successfully created. Our manager will contact you within five minutes to confirm your order.'
-	},{
-		value: 'confirming',
-		name: 'Confirming',
-		nextstatus: 'Confirming order...',
-		description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
-	},{
-		value: 'confirmed',
-		name: 'Confirmed',
-		nextstatus: 'Order is confirmed. Packing order...',
-		description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
-	},{
-		value: 'packing',
-		name: 'Packing',
-		nextstatus: 'Packing order...',
-		description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
-	},{
-		value: 'packing',
-		name: 'Packed',
-		nextstatus: 'Delivering order...',
-		description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
-	},{
-		value: 'in delivery',
-		name: 'Delivering',
-		description: 'Your order is currently in transit. Our delivery team is working hard to get your items to you as soon as possible.'
-	},{
-		value: 'delivered',
-		name: 'Delivered',
-		description: 'Congratulations! Your order has been successfully delivered. If you have any concerns or feedback, feel free to contact us.'
-	}]
 
 	const productsOrganization = ref([])
 	const orderOrganization = ref([])
@@ -297,14 +261,7 @@
 
 	// const payment = computed(() => store.state.payments.current)
 
-	async function setStatus(status) {
-		console.log(status)
-		orders.state.current.status = status.value
-
-
-
-		await orders.actions.update(orders.state.current)
-	}
+	
 
 	function requestPayment(order) {
 		 // store.dispatch("payments/newPayment", order);

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

@@ -62,10 +62,6 @@
           class="i-small"
         >
           EDIT
-          <img 
-            class="i-small" 
-            src="@/assets/icons/edit.svg"
-          >
         </router-link>
       </p>
 

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

@@ -74,17 +74,25 @@ const controllerFactory = (db) => {
 
   // Обновление заказа
   const update = async (req, res) => {
-    console.log(req.body)
-    console.log(req.params._id)
+    const order = await Order.findById(req.body._id);
+    
+    if (!order) {
+      return res.status(404).send({ errorCode: "ORDER_NOT_FOUND", message: "Order not found." });
+    }
+
+    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, 
+        timestamp: new Date(),
+        comment: ''
+      });
+    }
 
     try {
-      const order = await Order.findOneAndUpdate(
-        { _id: req.params._id }, 
-        req.body,
-      ).exec();
-      if (!order) {
-        return res.status(404).send({ errorCode: "ORDER_UPDATE_FAILED", message: "Failed to update the order." });
-      }
+      await order.save(); // Сохранение обновленного заказа
       res.status(200).send(order);
     } catch (err) {
       res.status(500).send({ errorCode: "UPDATE_ORDER_FAILED", message: "Error occurred while updating the order.", error: err });

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

@@ -24,6 +24,25 @@ module.exports = (db) => {
     status: { 
       type: String 
     },
+    status_history: [{
+      status: { 
+        type: String, 
+        trim: true 
+      },
+      changedBy: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+      },
+      timestamp: { 
+        type: Date, 
+        default: Date.now 
+      },
+      comment: {
+        type: String,
+        trim: true
+      }
+      // Здесь вы можете добавить любые другие поля, которые считаете нужными
+    }],
     comment: { 
       type: String, 
       trim: true 

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

@@ -5,7 +5,7 @@ const middlewareFactory = require('@pf/src/modules/middlewares/server');
 // Routes
 module.exports = function(app, db) {
   const controller = controllerFactory(db);
-  const { verifySignUp, verifyUser } = middlewareFactory(db);
+  const { authJwt } = middlewareFactory(db);
 
   app.use(function(req, res, next) {
     res.header(
@@ -33,6 +33,9 @@ module.exports = function(app, db) {
   );
   app.post(
     "/api/orders/update",
+    [
+      authJwt.verifyToken
+    ],
     controller.update
   );
     // Update order

package/src/modules/products/components/sections/FilterProducts.vue

@@ -16,8 +16,8 @@
             :label="category.name"
             :value="category.url"
             class="w-100 mn-t-small mn-b-small bg-white radius-small pd-small"
-            :radio="store.marketplace.state.filter.categories"
-            @update:radio="event => store.marketplace.state.filter.categories = event"
+            :radio="marketplace.state.filter.categories"
+            @update:radio="event => marketplace.state.filter.categories = event"
           />
         </template>
       </Spoiler>
@@ -40,8 +40,8 @@
             :label="price.label"
             :value="price.value"
             class="w-100 mn-t-small bg-white radius-small pd-small"
-            :radio="store.marketplace.state.filter.prices"
-          @update:radio="event => store.marketplace.state.filter.prices = event"
+            :radio="marketplace.state.filter.prices"
+          @update:radio="event => marketplace.state.filter.prices = event"
           />
         </template>
       </Spoiler>
@@ -64,8 +64,8 @@
             :label="deliveryOption.label"
             :value="deliveryOption.value"
             class="w-100 mn-t-small bg-white radius-small pd-small"
-            :radio="store.marketplace.state.filter.delivery"
-            @update:radio="event => store.marketplace.state.filter.delivery = event"
+            :radio="marketplace.state.filter.delivery"
+            @update:radio="event => marketplace.state.filter.delivery = event"
           />
         </template>
       </Spoiler>
@@ -84,14 +84,13 @@ import Spoiler from "@pf/src/components/Spoiler/Spoiler.vue"
 import Checkbox from "@pf/src/components/Checkbox/Checkbox.vue"
 
 import { useI18n } from 'vue-i18n'
-import { useStore } from '@/store'
 import { useRoute, useRouter,onBeforeRouteLeave } from 'vue-router'
 
-const store = useStore()
 const route = useRoute()
 const router = useRouter()
 
 import * as categories from '@pf/src/modules/products/store/categories';
+import * as marketplace from '@pf/src/modules/marketplace/store/marketplace';
 
 await categories.actions.fetchCategories()
 
@@ -124,7 +123,7 @@ const props = defineProps({
   }
 })
 
-watch(() => store.marketplace.state.filter, (newFilterValue, oldFilterValue) => {
+watch(() => marketplace.state.filter, (newFilterValue, oldFilterValue) => {
   // Переводим фильтр в формат query
   const query = { ...route.query };
 
@@ -156,7 +155,7 @@ onMounted(async () => {
       delivery: query.delivery ? query.delivery.split(',') : [],
       // Продолжайте этот паттерн для остальных полей фильтра
     };
-    store.marketplace.state.filter = newFilterValue;
+    marketplace.state.filter = newFilterValue;
   }
 })
 

package/src/modules/wallet/components/pages/Wallet.vue

@@ -84,7 +84,7 @@
           <p class="mn-b-small p-small">{{income.content[0].content}}</p>
 
           <div class="bg-black t-white radius-extra pd-thin flex-center flex-nowrap flex">
-            <img src="/logo/wdt-plus.svg" class="mn-r-thin i-semi">
+            <!-- <img src="/logo/wdt-plus.svg" class="mn-r-thin i-semi"> -->
             <p class="t-semi">{{income.amount}} WDT</p>
           </div>
         </div>
@@ -103,7 +103,7 @@
         v-for="income in state.rewards"
       > 
         <div class="flex-nowrap flex pd-medium">
-          <img src="/logo/wdt-plus.svg" class="mn-r-thin i-semi">
+          <!-- <img src="/logo/wdt-plus.svg" class="mn-r-thin i-semi"> -->
           <p class="t-semi mn-r-auto">{{income.amount}} WDT</p>
           
           <span class="pd-t-nano pd-b-nano pd-l-thin pd-r-thin bg-main flex flex-center radius-extra t-semi p-small">{{income.type === 'blogpost' ? 'Community Reward' : income.type}}</span>
@@ -126,7 +126,6 @@
   import { state, actions } from '../../store/wallet';
   import Web3 from "web3";
 
-
   import CardBlogpost from '@pf/src/modules/community/components/blocks/CardBlogpost.vue';
 
   // User has disconnected metamask from extension