@ozdao/martyrs 0.2.427 → 0.2.429

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

@@ -9,67 +9,96 @@
 			</div>
 
   	<div class="flex-nowrap flex gap-thin pos-relative ">
-	    <div v-for="(status, index) in statuses" :key="index" class="w-20">
+	    <div v-for="(status, index) in globals.state.options.orders.statuses" :key="index" class="w-20">
 	      <div
 	      	class="bg-white br-anim br-glow radius-extra h-1r w-100"
 	        :class="
 				    { 'br-glow-anim': isActiveStatus(index) },
 				    { 't-transp': !isActiveStatus(index) },
-				    { 'blink': order.status === statuses[index] && getNextStatus(order.status) }
+				    { 'blink': order.status === status.value && getNextStatus(order.status) }
 				  "
 	      />
 	      <div 
 	      	:class="{ 't-transp': !isActiveStatus(index) }"
-				  class="mn-t-thin p-small t-medium uppercase">{{ statusLabels[index] }}</div>
+				  class="mn-t-thin p-small t-medium uppercase">{{ status.value }}</div>
 	    	</div>
 		  </div>
 	  </div>
 
-	  <div v-if="route.meta.context !== 'user'" class="bg-light pd-thin mn-b-thin pd-thin radius-extra flex-nowrap flex">
-  		<div class="w-max flex-v-center gap-thin flex-nowrap flex pd-thin radius-small bg-light-transp-20">
-  			<IconTime class="i-semi t-transp" fill="rgb(var(--black)" />
-        <p class="t-medium mn-r-auto"><span class="p-small t-transp">Estimated Reaction</span><br>{{formatDate(order.deadline, { language: locale })}}</p>
-	  	</div>
-	  	<button v-if="getNextStatus(order.status)" @click="openStatusPopup" class="mn-l-auto bg-black t-white button">  
-		    Mark as {{ getStatusLabel(getNextStatus(order.status)) }}  
-		  </button>
-
-		<!--   <Button v-if="order.status !== 'canceled'" :submit="cancelOrder"  class="w-max t-white mn-l-thin bg-red">
-				<span>Cancel Order</span>
-			</Button>
-
-			 <Button v-if="order.status !== 'confirmed'" :submit="confirmOrder"  class="w-max t-white mn-l-thin bg-red">
-				<span>Confirm Order</span>
+  	 <Popup 
+      title="Change payment" 
+      @close-popup="closePaymentPopup" 
+      :isPopupOpen="isOpenPaymentPopup"
+      class="bg-light w-min-25r w-max-25r radius-medium pd-big"
+    >
+    	<Select 
+        v-model:select="selectedPayments.type"
+        :property="'value'"
+        label="Type"
+        :options="[
+          {name: 'Cash',  value: 'cash'}, 
+          {name: 'Card', value: 'card'}, 
+          {name: 'Bank Transfer', value: 'bank'},
+        ]"
+        placeholder="Select type of payment" 
+        size="small"
+        class="bg-white mn-b-thin pd-regular radius-small w-100"
+      />
+
+      <Select 
+        v-model:select="selectedPayments.status"
+        :property="'value'"
+        label="Status"
+        :options="[
+          {name: 'Unpaid',  value: 'unpaid'}, 
+          {name: 'Paid', value: 'paid'}, 
+          {name: 'Refunded', value: 'refunded'},
+        ]"
+        placeholder="Select status of payment" 
+        size="small"
+        class="bg-white mn-b-small pd-regular radius-small w-100"
+      />
+
+
+      <Button :submit="changePaymentStatus"  class="t-white w-100 bg-second">
+				<span>Change Status</span>
 			</Button>
- -->
-
-  	</div>
+	 	</Popup>
 
 	  <Popup 
-      title="Change status" 
+      title="Change order status" 
       @close-popup="closeStatusPopup" 
       :isPopupOpen="isOpeStatusPopup"
       class="bg-light w-min-30r w-max-30r radius-medium pd-big"
     >
 
-			<!-- <VueDatePicker v-model="order.deadline" :hide-navigation="['calendar']" :flow="['time']" class="z-index-3 bg-white radius-small pd-small mn-b-thin mn-b-semi" /> -->
-
-			<!-- {{order.deadline}} -->
-<!-- 
-			<p class="t-medium p-medium mn-b-thin">
-		    Positions
-		  </p>
+			<!-- Добавить выбор примерного времени -->
 
-    	<ul class="bg-white pd-small radius-small flex gap-thin flex-column mn-b-semi">
+    	<ul class="flex gap-thin flex-column mn-b-thin">
   			<CardOrderItem
-  				v-for="(product, index) in orderProducts" :key="product._id"
-  				:editable="false" 
+  				v-for="(product, index) in order.positions" :key="product._id"
+  				:editable="true" 
   				:product="product" 
+  				:increase="product => orders.mutations.incrementItemQuantity(order, product._id)"
+	        :decrease="product => orders.mutations.decrementItemQuantity(order, product._id)"
+	        :remove="product => orders.mutations.removeProduct(order, product._id)"
+	        @updateRentDates="(product, dates) => shopcart.actions.updateRentDates({ positions: order.positions, productId: product._id, dates })"
+  				class="bg-white radius-small pd-small"
   			/>
-      </ul> -->
-    	<button @click="setNextStatus"  class="w-100 bg-black-small t-white button">
-    		{{'Confirm Changing to ' + getStatusLabel(getNextStatus(order.status))}}
-    	</button>
+      </ul>
+      
+      <PriceTotal 
+        :totalPrice="cartTotalPrice"
+        :currency="returnCurrency()"
+        :showFees="globals.state.options?.orders?.showFees"
+        :feesRate="globals.state.options?.orders?.feesRate || 0"
+        :showVat="globals.state.options?.orders?.showVat"
+        :vatRate="globals.state.options?.orders?.vatRate || 0"
+      />
+
+    	<Button :submit="setNextStatus"  class="t-white w-100 bg-second">
+				<span>{{'Confirm Changing to ' + (getNextStatus(order.status)).label}}</span>
+			</Button>
 	 	</Popup>
 
 
@@ -128,22 +157,49 @@
 			    </div>
 
 			    <div class="pd-small  flex flex-nowrap flex-v-center br-t br-black-transp-10 br-solid">
-			    	<p class="mn-b-small t-medium p-medium">
+			    	<p class="t-medium p-medium">
 			      	Delivery
 			      </p>
 
-			      <p class="w-100 t-right mn-b-small">
+			      <p class="w-100 t-right ">
 			        {{order.delivery.type ? order.delivery.type : 'Not specified'}} 
 			      </p>
 			    </div>
 
+			     <div class="pd-small  flex flex-nowrap flex-v-center br-t br-black-transp-10 br-solid">
+			    	<p class="mn-r-auto t-medium p-medium">
+			      	Payment
+			      </p>
+
+
+			      <p class="w-max t-right">
+			        {{order.payment.type ? order.payment.type : 'Not specified'}} 
+			      </p>
+
+			      <p @click="openPaymentPopup" class="w-max pd-thin radius-small bg-second t-white mn-l-thin cursor-pointer hover-bg-black t-right">
+			        {{order.payment.status ? order.payment.status : 'Unpaid'}} 
+			      </p>
+			    </div>
+
+
 				</div>
-					
+
+				<div v-if="route.meta.context !== 'user'" class="o-y-scroll bg-light pd-thin mn-b-thin pd-thin radius-medium flex-nowrap flex">
+		  		<div class="flex-child-default mn-r-small w-max flex-v-center gap-thin flex-nowrap flex pd-thin radius-small bg-light-transp-20">
+		  			<IconTime class="i-semi t-transp" fill="rgb(var(--black)" />
+		        <p class="t-medium mn-r-auto"><span class="p-small t-transp">Estimated Reaction</span><br>{{formatDate(order.deadline, { language: locale })}}</p>
+			  	</div>
+			  	<button v-if="getNextStatus(order.status)" @click="openStatusPopup" class="flex-child-default  mn-l-auto bg-black t-white button">  
+				    Mark as {{ (getNextStatus(order.status)).label }}  
+				  </button>
+		  	</div>
+
 			<div class="bg-light radius-medium pd-medium  mn-r-bold  w-100">
 		    <h3 class="mn-b-small">Chat With Us</h3>
 
-		    <ChatWindow
+		    <ChatPage
 		    	:username="['Order', 'UserOrder'].includes(route.name) ? (order.user?.name || 'User') : 'Support'"
+		    	:user="auth.state.user._id"
 		    	:chatID="route.params.order"
 		    	class="radius-semi bs-black bg-light o-hidden"
 		    />
@@ -184,12 +240,12 @@
 	      <PriceTotal 
           :totalPrice="cartTotalPrice"
           :currency="returnCurrency()"
-          :showFees="globals.state.options?.showFees"
-          :feesRate="globals.state.options?.feesRate || 0"
-          :showVat="globals.state.options?.showVat"
-          :vatRate="globals.state.options?.vatRate || 0"
+          :showFees="globals.state.options?.orders?.showFees"
+          :feesRate="globals.state.options?.orders?.feesRate || 0"
+          :showVat="globals.state.options?.orders?.showVat"
+          :vatRate="globals.state.options?.orders?.vatRate || 0"
         />
-         </div>
+     	</div>
 
 	   
 	  </div>
@@ -203,6 +259,7 @@
 	import { useRouter, useRoute } from 'vue-router'
 
 	import Button from '@martyrs/src/components/Button/Button.vue'
+	import Select from '@martyrs/src/components/Select/Select.vue'
 	import Popup from "@martyrs/src/components/Popup/Popup.vue";
 
 	import IconTime  from '@martyrs/src/modules/icons/entities/IconTime.vue'
@@ -211,11 +268,11 @@
 	import CardOrderItem  from '@martyrs/src/modules/orders/components/blocks/CardOrderItem.vue'
 	import CardOrganization from '@martyrs/src/modules/organizations/components/blocks/CardOrganization.vue'
 
-	import ChatWindow from '@martyrs/src/modules/chats/components/pages/ChatPage.vue';
+	import ChatPage from '@martyrs/src/modules/chats/components/pages/ChatPage.vue';
 
 	import StatusHistory from '@martyrs/src/modules/orders/components/blocks/StatusHistory.vue'
 	import PriceTotal from '@martyrs/src/modules/orders/components/elements/PriceTotal.vue';
-
+	import FormPayment from '@martyrs/src/modules/orders/components/sections/FormPayment.vue'
 
 	import * as globals 	from '@martyrs/src/modules/globals/views/store/globals'
 	import * as auth from '@martyrs/src/modules/auth/views/store/auth'
@@ -234,13 +291,9 @@
 	const productsOrganization = ref(null)
 	const orderOrganization = ref(null)
 
-	const statuses = ['created', 'confirmed', 'preparing', 'inuse', 'finished'];
+	const statuses = globals.state.options.orders.statuses
 	const statusLabels = ['Created', 'Confirmed', 'Preparing', 'In use', 'Finished'];
 
-	const isActiveStatus = (index) => {
-	  return statuses.slice(index).includes(order.value.status);
-	};
-
   if (route.meta.context === 'user' && 
       auth.state.user && 
       route.params._id !== auth.state.user?._id && 
@@ -248,13 +301,6 @@
       !auth.state.access?.roles?.includes('ROLE_ADMIN')) {
     router.push('/401');
   }
-	// description: 'Your order has been successfully created. Our manager will contact you within five minutes to confirm your order.'
-	// description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
-	// description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
-	// description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
-	// description: 'Your order is currently in transit. Our delivery team is working hard to get your items to you as soon as possible.'
-	// description: 'Congratulations! Your order has been successfully delivered. If you have any concerns or feedback, feel free to contact us.'
-
 
 	const isOpeStatusPopup = ref(false);
 	const selectedMember = ref(null);
@@ -269,6 +315,24 @@
 	  selectedMember.value = null;
 	}
 
+	const isOpenPaymentPopup = ref(false);
+
+	const selectedPayments = ref({
+		type: null,
+		status: null
+	});
+
+	function openPaymentPopup() {
+	  selectedPayments.value.type = order.value.payment.type
+	  selectedPayments.value.status = order.value.payment.status
+
+	  isOpenPaymentPopup.value = true;
+	}
+
+	function closePaymentPopup() {
+	  isOpenPaymentPopup.value = false;
+	}
+
 	onMounted(async()=>{
 		order.value = await orders.actions.read({_id: route.params.order})
 		order.value = order.value[0]
@@ -276,6 +340,7 @@
 	  orderOrganization.value = await organizations.actions.read({
 	    _id: order.value?.owner.target._id,
 	    location: globals.state.position?.location,
+	    lookup: ['spots']
 	  });
 
 	})
@@ -309,25 +374,37 @@
 	  await orders.actions.update(orders.state.current)
 	} 
 
+
 	function getNextStatus(currentStatus) {
-    const currentIndex = statuses.indexOf(currentStatus);
+	  const currentIndex = globals.state.options.orders.statuses.findIndex(status => status.value === currentStatus);
 
-    if (currentIndex !== -1 && currentIndex + 1 < statuses.length) {
-      return statuses[currentIndex + 1];
-    }
-    return null; // Если следующий статус не существует
-  }
+	  if (currentIndex !== -1 && currentIndex + 1 < statuses.length) {
+	    return globals.state.options.orders.statuses[currentIndex + 1];
+	  }
+	  return null; // If next status doesn't exist
+	}
 
-  function getStatusLabel(status) {
-    const index = statuses.indexOf(status);
+	const isActiveStatus = (index) => {
+	  return globals.state.options.orders.statuses.slice(index).some(status => status.value === order.value.status);
+	};
+
+  async function changePaymentStatus() {
+    if (selectedPayments.value.status && selectedPayments.value.type) {
+      orders.state.current.payment = selectedPayments.value;
+
+      await orders.actions.update(orders.state.current)
+    } else {
+      console.error('Payment status is void. Must handle somehow.');
+    }
 
-    return status ? statusLabels[index] : "";
+		closePaymentPopup()
   }
+
   async function setNextStatus() {
     const nextStatus = getNextStatus(orders.state.current.status);
 
     if (nextStatus) {
-      orders.state.current.status = nextStatus;
+      orders.state.current.status = nextStatus.value;
 
       await orders.actions.update(orders.state.current)
     } else {
@@ -352,11 +429,6 @@
     orders.state.current.status = 'confirmed';
 
     await orders.actions.update(orders.state.current)
-}
-
-
-	function requestPayment(order) {
-		 // store.dispatch("payments/newPayment", order);
 	}
 
 	function calculateDeliveryTime(distance, date) {
@@ -371,9 +443,6 @@
 	  const startTime = new Date(date).getTime();
 	  const estimatedDeliveryTime = new Date(startTime + basePreparationTime + travelTime);
 
-	  console.log(date)
-	  console.log(estimatedDeliveryTime)
-
 	  return estimatedDeliveryTime;
 	}
 

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

@@ -27,10 +27,12 @@
 			<FormPayment 	
 				v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
 				:order="orders.state.current"  
+				:organization="orderOrganization[0]" 
 			/>
 			<FormDelivery 	
 				v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
-				:order="orders.state.current"  
+				:order="orders.state.current" 
+				:organization="orderOrganization[0]" 
 			/>
 			
 		</div>
@@ -180,17 +182,10 @@ onMounted(async()=> {
 	orderOrganization.value = await organizations.actions.read({
 	  _id: shopcart.state.organization,
 	  location: globals.state.position?.location,
+	  lookup: ['spots']
 	})
 })
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// 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
 /////////////////////////////

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

@@ -1,60 +1,38 @@
 <template>
   <Block title="Delivery">
     <h5 class="font-second mn-b-thin">Select delivery type</h5>
-    <div class="mn-b-small flex-nowrap flex">
+    
+    <div class="mn-b-small flex-nowrap flex" v-if="availableDeliveryTypes.length">
       <Radio 
+        v-for="type in availableDeliveryTypes"
+        :key="type"
         v-model:radio="order.delivery.type"
-        label="Pickup"
-        value="pickup"
-        class="bg-white pd-medium radius-small w-100 mn-r-small"
-      />
-      <Radio 
-        v-model:radio="order.delivery.type"
-        label="Courier"
-        value="courier"
+        :label="capitalize(type)"
+        :value="type"
         class="bg-white pd-medium radius-small w-100 mn-r-small"
       />
     </div>
+    <div v-else>No delivery options available.</div>
 
     <!-- Раздел для Pickup -->
     <template v-if="order.delivery.type === 'pickup'">
       <h5 class="font-second mn-b-thin">Select pickup spot</h5>
-      <Feed
-        :states="{
-          empty: {
-            title: 'No Spots Found',
-            description: 'Currently, there are no spots available.'
-          }
-        }"
-        :store="{
-          read: (options) => spotsModule.actions.read(props.order.organization || route.params._id),
-          state: spotsModule.state
-        }"
-        :options="{
-            limit: 10
-        }"
-        v-slot="{ 
-          items 
-        }"
-        class=""
-      >
-        <CardSpot
-          v-for="(spot, index) in items"
-          :key="index"
-          :spot="spot"
-          :organization="order.organization"
-          :editAcess="false"
-          :showDeliveryOptions="false"
-          :showPaymentOptions="false"
-          :selected="order.delivery.spot === spot._id"
-          @click="() => order.delivery.spot = order.delivery.spot === spot._id ? null : spot._id"
-          class="mn-b-thin radius-medium o-hidden bg-white"
-        />
-      </Feed>
+      <CardSpot
+        v-for="(spot, index) in organization?.spots.filter(item => item.delivery?.includes('pickup'))"
+        :key="index"
+        :spot="spot"
+        :organization="order.organization"
+        :editAcess="false"
+        :showDeliveryOptions="false"
+        :showPaymentOptions="false"
+        :selected="order.delivery.spot === spot._id"
+        @click="() => order.delivery.spot = order.delivery.spot === spot._id ? null : spot._id"
+        class="mn-b-thin radius-medium o-hidden bg-white"
+      />
     </template>
 
     <!-- Раздел для Courier -->
-    <template v-else-if="order.delivery.type === 'courier'">
+    <template v-else-if="order.delivery.type === 'courier' || order.delivery.type === 'post'">
       <h5 class="font-second mn-b-thin">Address</h5>
       <Address
         label="Location"    
@@ -91,7 +69,7 @@
 </template>
 
 <script setup>
-import { watch, onMounted } from 'vue';
+import { watch, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 
 import Feed from '@martyrs/src/components/Feed/Feed.vue';
@@ -106,6 +84,7 @@ import Field from '@martyrs/src/components/Field/Field.vue';
 
 const props = defineProps({
   order: Object,
+  organization: Object,
 });
 
 const route = useRoute();
@@ -124,4 +103,17 @@ onMounted(() => {
     props.order.delivery.location = globals.state.position.location;
   }
 });
+
+const availableDeliveryTypes = computed(() => {
+  const types = new Set()
+  props.organization?.spots?.forEach(spot => {
+    spot.delivery?.forEach(type => types.add(type))
+  })
+  return Array.from(types)
+})
+
+function capitalize(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1)
+}
+
 </script>

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

@@ -3,12 +3,7 @@
     <div class="mn-b-small flex-nowrap flex">
       <Select 
         v-model:select="order.payment.type"
-        :property="'value'"
-        :options="[
-          {name: 'Cash',  value: 'cash'}, 
-          {name: 'Card', value: 'card'}, 
-          {name: 'Bank Transfer', value: 'bank'},
-        ]"
+        :options="availablePaymentTypes"
         placeholder="Select type of payment" 
         size="small"
         class="bg-white pd-medium radius-small w-100"
@@ -18,10 +13,25 @@
 </template>
 
 <script setup>
+
+import { computed } from 'vue';
+
 import Block from '@martyrs/src/components/Block/Block.vue'
 import Select from '@martyrs/src/components/Select/Select.vue'
 
-defineProps({
+const props = defineProps({
   order: Object,
+  organization: Object,
 });
+
+const availablePaymentTypes = computed(() => {
+  const types = new Set()
+  props.organization?.spots?.forEach(spot => {
+    spot.payment?.forEach(type => types.add(type))
+  })
+  return Array.from(types)
+})
+
+
+
 </script>

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

@@ -324,7 +324,17 @@ const controllerFactory = (db) => {
       // }
       
       // Save the order first
+      if (req.body.payment?.type && req.body.payment.type !== order.payment?.type) {
+        order.payment.type = req.body.payment.type;
+      }
+
+      // Update payment.status if changed
+      if (req.body.payment?.status && req.body.payment.status !== order.payment?.status) {
+        order.payment.status = req.body.payment.status;
+      }
+
       await order.save();
+
       
       // Send notification if status changed
       if (statusChanged) {

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

@@ -94,6 +94,71 @@ const mutations = {
     }
   },
 
+
+  addProductToCart(state, product, organization, date) {
+    const cartItem = state.positions.find(
+      (item) => item._id === product._id
+    );
+
+    if (cartItem) {
+      cartItem.quantity++;
+    } else {
+      state.positions.push({
+        _id: product._id,
+        images: product.images,
+        name: product.name,
+        listing: product.listing,
+        price: product.price,
+        price_currency: product.price_currency,
+        quantity: 1,
+        date: date, 
+        org_id: organization, // Добавляем _id организации к каждому продукту
+      });
+    }
+  },
+
+
+  removeProduct(state, _id) {
+    const cartItem = state.positions.find(
+      (item) => item._id === _id
+    );
+    const cartItemIndex = state.positions.indexOf(cartItem);
+
+    if (cartItemIndex > -1) {
+      state.positions.splice(cartItemIndex, 1);
+      
+      // Сохраняем весь объект корзины, а не только позиции
+      localStorage.setItem('shopcart', JSON.stringify({
+        positions: state.positions,
+        organization: state.organization
+      }));
+    }
+  },
+
+
+  decrementItemQuantity(state, _id) {
+    const cartItem = state.positions.find(
+      (item) => item._id === _id
+    );
+    const cartItemIndex = state.positions.indexOf(cartItem);
+    
+    if (cartItemIndex > -1) {
+      cartItem.quantity--;
+    }
+  },
+
+
+  incrementItemQuantity(state, _id) {
+    const cartItem = state.positions.find(
+      (item) => item._id === _id
+    );
+
+    if (cartItem) {
+      cartItem.quantity++;
+    }
+  },
+
+
   resetCustomer(stateObject) {  
     Object.assign(stateObject, customerInitState);
   },  

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

@@ -2,7 +2,7 @@
   <div class="embla" ref="emblaNode">
     <div class="embla__container">
       <div 
-        class="embla__slide h-100 pos-relativepd-nano" 
+        class="embla__slide h-100 pos-relative pd-nano" 
         v-for="(value, key) in productsState" 
         :key="value?._id || key"
       >
@@ -37,8 +37,11 @@ import { useRouter } from 'vue-router'
     
 import emblaCarouselVue from 'embla-carousel-vue'
 import Autoplay from 'embla-carousel-autoplay'
+
 import Loader from '@martyrs/src/components/Loader/Loader.vue'
+
 import CardProduct from '@martyrs/src/modules/products/components/blocks/CardProduct.vue'
+
 import * as products from '@martyrs/src/modules/products/store/products'
 
 const router = useRouter()