@ozdao/prometheus-framework 0.2.35 → 0.2.36

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

@@ -27,7 +27,11 @@
 			<p class="p-big mn-b-small">Your Order</p>
 			
 			<ul class="mn-b-semi">
-				<CardOrderItem v-for="product in shopcart.state.positions" :key="product._id" editable="true" :product="product" 
+				<CardOrderItem 
+					v-for="product in shopcart.state.positions" 
+					:key="product._id" 
+					editable="true" 
+					:product="product" 
 	        :increase="product => shopcart.actions.incrementItemQuantity(product._id)"
 	        :decrease="product => shopcart.actions.decrementItemQuantity(product._id)"
 	        :remove="product => shopcart.actions.removeProduct(product._id)"
@@ -36,13 +40,13 @@
 
 			<div 
 				style="border-bottom: 1px solid #f7f7f7; border-top: 1px solid #f7f7f7;" class="pd-b-medium pd-t-medium  mn-b-medium"
-			>
+			>	
 				<p class="mn-b-thin">Subtotal: {{returnCurrency()}} {{ cartTotalPrice }} </p>
-				<p class="mn-b-thin">Delivery: {{ order.delivery.type === 'pickup' ? 'Free' : '30'}} </p>
-				<p class="h3">Total: {{returnCurrency()}} {{ cartTotalPrice }}  </p>
+				<p class="mn-b-thin">Delivery: {{returnCurrency()}} {{ Math.trunc(100 + 20 * orderOrganization[0]?.distance - 7,5 * (orderOrganization[0]?.distance  / 10))}} </p>
+				<p class="h3">Total: {{returnCurrency()}} {{ Math.trunc(100 + 20 * orderOrganization[0]?.distance - 7,5 * (orderOrganization[0]?.distance  / 10)) + cartTotalPrice.value }}  </p>
 			</div>
 
-			<p class='mn-b-thin'>By making this purchase you agree to our terms and conditions.</p>
+			<p class='mn-b-thin'>By making this purchase you agree to the General Terms and Conditions.</p>
 			<p class='mn-b-small'>I agree that placing the order places me under an obligation to make a payment in accordance with the General Terms and Conditions.</p>
 			<!-- Send order -->
 		  <button 
@@ -51,7 +55,7 @@
 		      errorName 
 		      || errorPhoneOrMessenger 
 		      || errorCity 
-		      || errorAdress 
+		      || errorAddress 
 		      || errorDelivery 
 		      || errorPayment
 		    "
@@ -76,78 +80,86 @@
 // Import components
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Block
-import CardOrderItem  from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
+import CardOrderItem from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
 // Sections
-import AskToLogin     from '@pf/src/modules/orders/components/sections/AskToLogin.vue'
-import Succes         from '@pf/src/modules/orders/components/sections/Succes.vue'
-import EmptyState     from '@pf/src/modules/orders/components/sections/EmptyState.vue'
-import FormOrderDetails         	from '@pf/src/modules/orders/components/sections/FormOrderDetails.vue'
+import AskToLogin from '@pf/src/modules/orders/components/sections/AskToLogin.vue'
+import Succes from '@pf/src/modules/orders/components/sections/Succes.vue'
+import EmptyState from '@pf/src/modules/orders/components/sections/EmptyState.vue'
+import FormOrderDetails from '@pf/src/modules/orders/components/sections/FormOrderDetails.vue'
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Import libs
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-import { computed, onMounted } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import { useRoute,useRouter } from 'vue-router'
-
+// Store
+import * as globals from '@pf/src/modules/globals/store/globals';
 import * as auth from '@pf/src/modules/auth/store/auth';
 import * as shopcart from '@pf/src/modules/orders/store/shopcart';
+import * as organizations from '@pf/src/modules/organizations/store/organizations';
 import * as orders from '@pf/src/modules/orders/store/orders';
 import * as users from '@pf/src/modules/users/store/users';
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Variables and computed
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Accessing router and store
-
 const route = useRoute()
 const router = useRouter()
-const cartTotalPrice = computed(() => shopcart.getters.cartTotalPrice)
-
+// COMPUTED
 const order = computed(() => orders.state.current)
 const user = computed(() => users.state.current)
-
+const cartTotalPrice = computed(() => shopcart.getters.cartTotalPrice)
+// Organization
+const orderOrganization = ref([])
+onMounted(async()=> {
+	orderOrganization.value = await organizations.actions.read({
+	  _id: shopcart.state.organization,
+	  location: globals.state.position?.location,
+	})
+})
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// WATCHERS
+///////////////////////////////////////////////////////////////////////////////////////////////////
+watch(() => orders.state.current.delivery.address, async (newFilterValue, oldFilterValue) => {
+	orderOrganization.value = await organizations.actions.read({
+	  _id: shopcart.state.organization,
+	  location: orders.state.current.delivery.location,
+	})
+}, { deep: true })
 /////////////////////////////
 // Store Verification
 /////////////////////////////
 const errorName = computed(() => {
-  return orders.state.current.user.name.length < 2 ? "Fill the name field" : false
-})
+  if (orders.state.current.user.name?.length < 2) { return true } else { return false }
+});
 
 const errorPhoneOrMessenger = computed(() => {
-  const phoneError = orders.state.current.user.phone.number;
-  const messengerError = (orders.state.current.user.messenger.type && orders.state.current.user.messenger.value); // Пример 
-
-  if (!phoneError && messengerError) {
-    return true;
-  } else {
-  	return false	;
-  }
+  const hasMessengerType = orders.state.current.user.messenger?.type;
+  const hasMessengerValue = orders.state.current.user.messenger?.value?.length >	 2;
+  const hasPhone = orders.state.current.user.number?.length > 0;
+  // Ошибка, если нет ни номера телефона, ни корректного типа и значения мессенджера
+  return !hasPhone && !(hasMessengerType && hasMessengerValue);
 });
 
-const errorAdress = computed(() => {
-  if (orders.state.current.delivery !== "Pickup") { 
-    return orders.state.current.delivery.address < 2 ? "Заполните поле адреса" : false
-  } else {
-    return false
-  }
-})
+const errorAddress = computed(() => {
+	let error = orders.state.current.delivery.type !== "Pickup" && orders.state.current.delivery.address < 2
+  
+  if (error) { return  true } else { return false }
+});
 
 const errorDelivery = computed(() => {
-  if (orders.state.current.delivery.type) { 
-    return false
-  } else {
-    return true
-  }
+  if (orders.state.current.delivery.type) {return false } else {return true } 
 })
 
 const errorPayment = computed(() => {
-  if (orders.state.current.payment.type) { 
-    return false
-  } else {
-    return true
-  }
+  if (orders.state.current.payment.type) { return false } else {return true } 
 })
-
-
+/////////////////////////////
+// Methods
+/////////////////////////////
 async function handleCreate() {
+
+	orders.state.current.status = 'created';
+	
   let order = await orders.actions.create(shopcart.state.positions, shopcart.state.organization);
 
   if (order) {

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

@@ -1,9 +1,9 @@
 <template>
-	<div class="pd-big"> 
+	<div v-if="order && orderOrganization" class="pd-big"> 
 	  
 	
 
-	  <div class="mn-b-thin pos-relative w-100 bg-main radius-big pd-big">
+	  <div v-if="order" class="mn-b-thin pos-relative w-100 bg-main radius-big pd-big">
 
 	  	<h2 class="mn-b-small">Order is {{order.status}}</h2>
 	  	<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>
@@ -53,8 +53,15 @@
 	  	</div>
 
 	  	<!-- <div class="w-max pd-thin radius-small bg-white-transp-20"> -->
-		  	<p>Estimated Arrival {{DateToFormattedString2(order.createdAt)}}</p>
-	  		<h3>10-15 min</h3>
+		  	<p>Estimated Arrival {{formatDate(calculateDeliveryTime(orderOrganization[0]?.distance, order.createdAt))}}</p>
+		  	<!-- Estimated in minutes -->
+	  		<h3>{{
+	  			orderOrganization[0]?.distance ? 
+          Math.ceil((5 + 5 + 3 * orderOrganization[0]?.distance) / 5) * 5 
+          + '-' 
+          + Math.ceil((15 + 5 + 3 * orderOrganization[0]?.distance) / 5) * 5 
+          + ' MIN' : 'Unavailable' 
+	  		}}</h3>
 	  	<!-- </div> -->
 	  
 	  
@@ -65,11 +72,12 @@
 
 
 	  
-	  <div class="gap-thin cols-2">
+	  <div v-if="order" class="gap-thin cols-2">
 
 	    <div class="w-100">
 
 		    <CardOrganization 
+		    	v-if="orderOrganization"
 		      :organization="orderOrganization[0]"
 		      :showRating="true"
 		      :showFollowers="false"
@@ -80,19 +88,19 @@
 		    <div 
 		    	class="mn-b-thin bg-grey w-100 o-hidden radius-medium "
 		    >
-		    	<div class="pd-small cols-2">
-			    	<div>
+		    	<div class="pd-small flex-nowrap flex">
+			    	<div class="mn-r-auto">
 				    	<span class="d-block t-medium p-medium">Your order is</span>
 					    <span class=" t-lh-075 h2 d-block mn-b-small">{{order.status}}</span>
 					    <p class="pd-t-nano pd-b-nano pd-r-thin pd-l-thin radius-extra bg-black t-white w-max">as on 29 aug 2021, Friday</p>
 					  </div>
-					  <div class="t-right">
+					  <!-- <div class="t-right">
 					  	Cancel order<br>
 					  	Exchange item
 					  	<hr class="mn-b-thin mn-t-thin">
 					  	For Delivery Queries Contact Us
 					  	
-					  </div>
+					  </div> -->
 					</div>
 
 					<div class="pd-small cols-2 br-t br-black-transp-10 br-solid">
@@ -101,7 +109,17 @@
 			      </p>
 
 			      <p class="w-100 t-right ">
-			        {{order.user?.phone.number}} 
+			        {{order.user?.number}} 
+			      </p>
+			    </div>
+
+			    <div v-if="order.user?.messenger.type" class="pd-small cols-2 br-t br-black-transp-10 br-solid">
+			    	<p class="w-100 t-medium p-medium">
+			      	{{order.user?.messenger.type}}
+			      </p>
+
+			      <p class="w-100 t-right ">
+			        {{order.user?.messenger.value}} 
 			      </p>
 			    </div>
 
@@ -127,14 +145,11 @@
 
 				</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"
+	     		:edit="route.name === 'AdminOrderEdit'"
 	     	/>
 
 	     <!-- 	<button 
@@ -167,11 +182,11 @@
 		      </div>
 		      <div class="pd-small br-solid br-b br-black-transp-10  flex">
 		        <p class="mn-r-auto  t-transp">Delivery</p>
-		        <p>Free</p>
+		        <p>{{returnCurrency()}} {{ Math.trunc(100 + 20 * orderOrganization[0]?.distance - 7,5 * (orderOrganization[0]?.distance  / 10))}} </p>
 		      </div>
 		      <div class="pd-small  flex-bottom flex">
 		        <p class="mn-r-auto t-transp">In total to pay</p>
-		        <p class="p-big t-semi">{{ cartTotalPrice }} {{returnCurrency()}} </p>
+		        <p class="p-big t-semi">{{returnCurrency()}} {{ Math.trunc(100 + 20 * orderOrganization[0]?.distance - 7,5 * (orderOrganization[0]?.distance  / 10)) + cartTotalPrice }}</p>
 		      </div>
 		    </div>
 
@@ -203,6 +218,7 @@
 
 	import StatusHistory from '@pf/src/modules/orders/components/blocks/StatusHistory.vue'
 
+	import * as globals 	from '@pf/src/modules/globals/store/globals'
 	import * as orders 	from '@pf/src/modules/orders/store/orders'
 	import * as products 	from '@pf/src/modules/products/store/products'
 	import * as organizations 	from '@pf/src/modules/organizations/store/organizations'
@@ -210,21 +226,24 @@
 	const router = useRouter()
 	const route = useRoute()
 
-	await orders.actions.fetchOrder(route.params.order)
+	const order = ref(null)
+	const productsOrganization = ref(null)
+	const orderOrganization = ref(null)
 
-	let order = ref(orders.state.current)
+	onMounted(async()=>{
+		order.value = await orders.actions.fetchOrder(route.params.order)
 
+		productsOrganization.value = await products.actions.read({
+	    organization: order.value.organization
+	  });
 
-	const productsOrganization = ref([])
-	const orderOrganization = ref([])
+	  orderOrganization.value = await organizations.actions.read({
+	    _id: order.value.organization,
+	    location: globals.state.position?.location,
+	  });
 
-	productsOrganization.value = await products.actions.read({
-    organization: order.value.organization
-  });
+	})
 
-  orderOrganization.value = await organizations.actions.read({
-    _id: order.value.organization
-  });
 
 	let cartTotalPrice = computed(() => {
     return Number(order.value.positions.reduce((total, product) => {
@@ -266,22 +285,24 @@
 	function requestPayment(order) {
 		 // store.dispatch("payments/newPayment", order);
 	}
-	
-	function DateToFormattedString(d) {         
-    var fixedDate = new Date(d);                                                     
-    var mm = (fixedDate.getMonth()+1).toString(); // getMonth() is zero-based         
-    var dd  = (fixedDate.getDate() + 6).toString();            
-                         
-    return (dd[1]?dd:"0"+dd[0]) + '/' + (mm[1]?mm:"0"+mm[0]);
-  }
-
-  function DateToFormattedString2(d) {         
-    var fixedDate = new Date(d);                                                     
-    var mm = (fixedDate.getMonth() + 1).toString(); // getMonth() is zero-based         
-    var dd  = (fixedDate.getDate() + 1).toString();            
-                         
-    return (dd[1]?dd:"0"+dd[0]) + '/' + (mm[1]?mm:"0"+mm[0]);
-  }
+
+	function calculateDeliveryTime(distance, date) {
+	  if (!distance) {
+	    return null;
+	  }
+
+	  const basePreparationTime = 10 * 60 * 1000; // Convert to milliseconds
+	  const travelTime = Math.ceil((15 + 5 + 3 * distance) / 5) * 5 * 60 * 1000;
+
+	  // Преобразование даты начала в миллисекунды и добавление времени подготовки и доставки
+	  const startTime = new Date(date).getTime();
+	  const estimatedDeliveryTime = new Date(startTime + basePreparationTime + travelTime);
+
+	  console.log(date)
+	  console.log(estimatedDeliveryTime)
+
+	  return estimatedDeliveryTime;
+	}
 
 
 </script>

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

@@ -20,14 +20,19 @@
     <!-- Phone -->
     <FieldPhone
       v-model:modelValue="order.user.phone"  
+      @country="(country) => { order.user.number = country }"
+      :inputOptions="{
+        placeholder: 'Enter contact phone number',
+        type: 'tel',
+      }"
+      :defaultCountry="'TH'"
+      :validCharactersOnly="true"
       :dropdownOptions="{
         showDialCodeInSelection: true,
         showFlags: true,
         showDialCodeInList: true
-      }"
-      :validation="phoneValidation" 
+      }" 
       mode="national"
-      :inputOptions="{placeholder: 'Enter contact phone number'}"
       class="bg-white pd-small radius-small mn-b-thin" 
     />
 
@@ -42,7 +47,7 @@
           {name: 'WhatsApp',        value: 'whatsapp'},
           {name: 'Line',            value: 'line'}, 
         ]"
-        :select="order.user.messenger.type"
+        @update:select="(option) => order.user.messenger.type = option.value"
         placeholder="Messenger" 
         size="small"
         class="
@@ -101,17 +106,41 @@
     </div>
     <!-- Adress-->
     <Address
-      apiKey="AIzaSyDDR6WgYB7XMt7yTDDzQNEdF_gTdUiq8dI" 
-      v-model:address="order.delivery.address"     
       label="Address"    
-      placeholder="Enter delivery address"  
+
+      apiKey="AIzaSyDDR6WgYB7XMt7yTDDzQNEdF_gTdUiq8dI" 
+      
+      :address="order.delivery.address" 
+      :location="order.delivery.location"  
+      
+      placeholder="Enter your address"  
+
       class="
-        bg-white
-        pd-medium
-        radius-small
-        w-100
-        mn-b-thin
+        bg-white radius-tl-medium radius-tr-medium  t-black br-grey br-solid br-2px pd-medium
       "
+
+      @update:location="newLocation => {
+        order.delivery.location = newLocation;
+      }"
+      @update:address="newAddress => {
+        order.delivery.address = newAddress;
+      }"
+    />
+
+    <LocationMarker 
+      apiKey="AIzaSyDDR6WgYB7XMt7yTDDzQNEdF_gTdUiq8dI" 
+
+      :address="order.delivery.address" 
+      :location="order.delivery.location"
+
+      class="mn-b-thin radius-bl-medium radius-br-medium h-15r o-hidden"
+
+      @update:location="newLocation => {
+        order.delivery.location = newLocation;
+      }"
+      @update:address="newAddress => {
+        order.delivery.address = newAddress;
+      }"
     />
    <Field 
       v-model:field="order.comment"     
@@ -156,22 +185,21 @@
 </template>
 
 <script setup="props">
-import { computed, onMounted } from 'vue'
+import { computed, onMounted, watch } from 'vue'
 
+import * as globals from '@pf/src/modules/globals/store/globals';
 import * as orders from '@pf/src/modules/orders/store/orders';
 /////////////////////////////
 // COMPONENT DEPENDENCIES
 /////////////////////////////
 import Block           from '@pf/src/components/Block/Block.vue'
 import Field           from '@pf/src/components/Field/Field.vue'
-import FieldPhone    from '@pf/src/components/FieldPhone/FieldPhone.vue'
+import FieldPhone    from '@pf/src/components/FieldPhone/FieldPhone2.vue'
 import Select           from '@pf/src/components/Select/Select.vue'
 import Address           from '@pf/src/components/Address/Address.vue'
-import Radio           from '@pf/src/components/Radio/Radio.vue'
-/////////////////////////////
-// HELPERS
-/////////////////////////////
 
+import LocationMarker from "@pf/src/components/LocationMarker/LocationMarker.vue";
+import Radio           from '@pf/src/components/Radio/Radio.vue'
 /////////////////////////////
 // CREATED
 /////////////////////////////
@@ -181,6 +209,10 @@ const props = defineProps({
 /////////////////////////////
 // MOUNTED
 /////////////////////////////
+onMounted(() => {
+  if (globals.state.position) props.order.delivery.address = globals.state.position.address
+  if (globals.state.position) props.order.delivery.location = globals.state.position.location
+})
 </script>
 
 <style lang="scss">

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

@@ -53,7 +53,16 @@ const controllerFactory = (db) => {
   const create = async (req, res) => {
     delete req.body._id;
 
-    req.body.status = 'created'
+    req.body.status = 'created';
+    req.body.status_history = req.body.status_history || [];
+
+    // Добавление записи в историю изменений статусов
+    req.body.status_history.push({
+      status: req.body.status,
+      changedBy: req.userId, 
+      timestamp: new Date(),
+      comment: ''
+    });
 
     try {
       const formattedMessage = formatOrderMessage(req.body);

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

@@ -9,6 +9,7 @@ module.exports = (db) => {
       _id: { type: Boolean },
       name: { type: String, trim: true },
       phone: { type: Object, trim: true },
+      number: { type: String, trim: true },
       messenger: {
         type: { type: String, trim: true },
         value: { type: String, trim: true }

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

@@ -13,13 +13,13 @@ const state = reactive({
     _id: '',
     organization: '',
     positions: [],
-    status: false,
+    status: null,
     comment: '',
 
     user: {
-      _id: false,
+      _id: null,
       name: '',
-      phone: '',
+      phone: null,
       messenger: {
         type: '',
         value: ''
@@ -45,12 +45,11 @@ const actions = {
       state.current.positions = order
       state.current.organization = organization
 
-      console.log(state.current)
-
       const response = await $axios.post('/api/orders/create', state.current);
 
       state.all.push(response.data);
-      return Promise.resolve(response.data);
+
+      return response.data;
     } catch (error) {
       setError(error);
     }
@@ -59,20 +58,26 @@ const actions = {
    async fetchOrder(orderID) {
     try {
       const response = await $axios.get(`/api/orders/${orderID}`);
-      console.log(response)
+
       state.current = response.data;
+      console.log(response.data)
+      return response.data; 
     } catch (error) {
       setError(error);
+      throw err;
     }
   },
 
-  async read(orderID) {
+   async read(orderID) {
     try {
       const response = await $axios.get(`/api/orders/read`);
-      console.log(response)
+
       state.all = response.data;
-    } catch (error) {
-      setError(error);
+
+      return response.data; 
+    } catch (err) {
+      setError(err)
+      throw err;
     }
   },
 
@@ -85,18 +90,17 @@ const actions = {
       if (index !== -1) {
         state.all[index] = response.data;
       }
+
+      return response.data; 
     } catch (error) {
       setError(error);
     }
   },
 
-  async confirm(orderID) {
+  async delete(orderID) {
     try {
-      const response = await $axios.post(`/api/orders/confirm/${orderID}`);
-      const index = state.all.findIndex(o => o._id === orderID);
-      if (index !== -1) {
-        state.all[index] = response.data;
-      }
+      await $axios.delete(`/api/orders/${orderID}`);
+      state.all = state.all.filter(o => o._id !== orderID);
     } catch (error) {
       setError(error);
     }
@@ -113,18 +117,8 @@ const actions = {
       setError(error);
     }
   },
-
-  async delete(orderID) {
-    try {
-      await $axios.delete(`/api/orders/${orderID}`);
-      state.all = state.all.filter(o => o._id !== orderID);
-    } catch (error) {
-      setError(error);
-    }
-  },
 }
 
-
 const history = []
 
 history.push(state) 

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

@@ -27,13 +27,19 @@ const actions = {
 
   setShopcart() {
     try {
-      if (localStorage.getItem('shopcart')) state.positions = JSON.parse(localStorage.getItem('shopcart'))
+      const storedShopcart = localStorage.getItem('shopcart');
+      if (storedShopcart) {
+        const shopcartData = JSON.parse(storedShopcart);
+        state.positions = shopcartData.positions; // Восстанавливаем продукты
+        state.organization = shopcartData.organization; // Восстанавливаем _id организации
+      }
     } catch (error) {
       console.error(error);
       throw error;
     }
   },
 
+
   addProductToCart(product, organization) {
     const cartItem = state.positions.find(
       (item) => item._id === product._id
@@ -48,12 +54,18 @@ const actions = {
         name: product.name,
         price: product.price,
         quantity: 1,
+        org_id: organization, // Добавляем _id организации к каждому продукту
       });
     }
 
-    localStorage.setItem('shopcart', JSON.stringify(state.positions));
+    // Обновляем объект корзины в localStorage, включая _id организации
+    localStorage.setItem('shopcart', JSON.stringify({
+      positions: state.positions,
+      organization: organization // Сохраняем _id организации в корне объекта корзины
+    }));
   },
 
+
   removeProduct(_id) {
     const cartItem = state.positions.find(
       (item) => item._id === _id