@ozdao/prometheus-framework 0.2.53 → 0.2.54

package/src/modules/events/components/sections/HeroEvent.vue

@@ -22,10 +22,11 @@
 				style="object-fit: cover;" 
 				ref="videoElement"  
 				class="pos-absolute pos-t-0 pos-l-0 w-100 h-100" 
-				preload autoplay muted loop playsinlineclass playsinline :src="content.video" 
+				preload autoplay muted loop playsinlineclass playsinline
 				itemprop="video" 
 				type="video/webm"
 			>
+				 <source :src="content.video" :type="getVideoType(content.video)" />
 			</video>
 	  </div>
 
@@ -38,7 +39,7 @@
 	  	pd-big mn-r-auto mn-l-auto t-white flex-h-center flex-column o-hidden flex-v-start t-left flex w-100 h-100 gap-zero">
     	<!-- <img src="/logo/jungle-stereo-cosmonaut.png"  class="h-8r mn-b-small z-index-1"/> -->
     	<div class="mn-b-big z-index-1 flex-nowrap flex gap-small">
-	    	<img v-for="logo in content.logos" class="radius-thin i-big" :src="logo">
+	    	<img v-for="logo in content.logos" class="radius-thin object-fit-contain i-big" :src="logo">
 	    </div>
 
     	<h3 class="pd-thin z-index-1  w-max br-solid br-2px br-white radius-extra 	mn-b-thin">
@@ -128,6 +129,15 @@
 		};	
   }
 
+  function getVideoType(videoUrl) {
+    if (videoUrl.endsWith('.mp4')) {
+      return 'video/mp4';
+    } else if (videoUrl.endsWith('.webm')) {
+      return 'video/webm';
+    }
+    return '';
+  }
+
 	async function playVid() {      
     if (videoElement.value.paused && !isPlaying) {
       return videoElement.value.play();

package/src/modules/events/components/sections/SectionPreviousEvents.vue

@@ -3,7 +3,7 @@
 	<div class="cols-2 gap-big pos-relative ">
 		 <div class="cols-1 gap-small ">
 		  <a v-if="options?.link" @click="clickBuyTicket()" href="#"  class="bg-main flex-child-grow-1  flex-child-shrink-0 flex-child-basis-auto o-hidden  radius-big pd-big flex-center flex-column flex w-100 gap-zero">
-		  	<img v-if="content?.ticket" class="w-100" :src="content?.ticket">
+		  	<img v-if="content?.ticket" class="w-80" :src="content?.ticket">
 
 	    	<a class="t-white bg-black pd-l-small pd-b-thin pd-t-thin pd-r-small h4 radius-extra uppercase t-nye204">
 	    		<!-- SOLD OUT -->

package/src/modules/landing/components/sections/MobileApp.vue

@@ -76,15 +76,11 @@ import LabelGooglePlay from '@pf/src/modules/icons/labels/LabelGooglePlay.vue'
 const props = defineProps({
   mockupImage: {
     type: String,
-    default: "/landing/mockup.png"
-  },
-   mockupMobile: {
-    type: String,
-    default: "/landing/mockup-mobile.png"
+    default: "/landing/mockup.jpg"
   },
   bgImage: {
     type: String,
-    default: "" // Введите ваше стандартное значение здесь, если необходимо
+    default: ""
   },
   textData: {
     type: Object,

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

@@ -10,6 +10,7 @@
         />
       </div>
       <p class="h4 w-8r">{{status.name}}</p>
+       <!-- <button v-if="status.value === 'delivered'"  @click="printReceipt()" class="mn-l-auto bg-main button radius-big">Print</button> -->
       <button v-if="edit" :disabled="!isNextPossibleStatus(status.value)" @click="setStatus(status)" class="mn-l-auto bg-main button radius-big">Set status</button>
     </div>
   </div>
@@ -20,6 +21,8 @@ import { ref, computed } from 'vue';
 
 import IconCheckmark from '@pf/src/modules/icons/navigation/IconCheckmark.vue'
 
+// import Socket from '@vendus/sockets-for-cordova';
+
 const props = defineProps({
   statusHistory: {
     type: Array
@@ -33,40 +36,42 @@ const props = defineProps({
 })
 
 // Инициализация состояния компонента
-const statuses = ref([{
+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.'
-}]);
+  },{
+    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);
@@ -91,5 +96,60 @@ const setStatus = async (newStatus) => {
   // console.log(status)
   // orders.state.current.status = status.value
   // await orders.actions.update(orders.state.current)
-}
+} 
+
+const printerIP = ref('192.168.1.197');
+const printerPort = ref(9100);
+const textToPrint = ref('This is some text to print\n\n');
+
+// const printReceipt = async () => {
+//   try {
+//     const initPrinter = new Uint8Array([0x1b, 0x40]); // Команда инициализации принтера
+//     const lineFeed = new Uint8Array([0x0a]); // Перевод строки
+//     const cutPaper = new Uint8Array([0x1d, 0x56, 0x01]); // Резка бумаги
+
+//     const encoder = new TextEncoder();
+//     const textData = encoder.encode(textToPrint.value);
+
+//     const dataToSend = new Uint8Array([
+//       ...initPrinter,
+//       ...textData,
+//       ...lineFeed,
+//       ...cutPaper
+//     ]);
+
+//     const socket = new Socket();
+
+//     socket.onError = function (errorMessage) {
+//       console.error('Ошибка при подключении к принтеру:', errorMessage);
+//     };
+
+//     socket.onClose = function (hasError) {
+//       console.log('Соединение с принтером закрыто');
+//     };
+
+//     await new Promise((resolve, reject) => {
+//       socket.open(
+//         printerIP.value,
+//         printerPort.value,
+//         function () {
+//           console.log('Подключено к принтеру');
+//           resolve();
+//         },
+//         function (errorMessage) {
+//           console.error('Не удалось подключиться к принтеру:', errorMessage);
+//           reject(errorMessage);
+//         }
+//       );
+//     });
+
+//     socket.write(dataToSend);
+
+//     socket.shutdownWrite();
+
+//     console.log('Чек успешно напечатан');
+//   } catch (error) {
+//     console.error('Ошибка при печати чека:', error);
+//   }
+// };
 </script>

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

@@ -2,24 +2,7 @@
   <header class="mn-b-medium flex-v-center flex-nowrap flex">
     <h2 class="mn-r-medium">Edit Order</h2>
   </header>
-
-	<section class="gap-thin flex-nowrap flex mn-b-semi">
-	    
-	  <div class="w-100 br-solid br-1px br-black-transp-10 radius-big pd-medium">
-	    <p class=" mn-b-small p-big">
-	      Статус заказа:<br>{{order.status}}
-	    </p>
-	    <button class="button">Подтвердить заказ</button>
-	  </div>
-
-	  <div class="w-100 br-solid br-1px br-black-transp-10 radius-big pd-medium">
-	    <p class="mn-b-semi p-big">Статус оплаты:<br>{{order.payment?.status}}</p>
-	    <button class="button">Изменить статус оплаты</button>
-	  </div>
-
-	   
-	</section>
-
+  
 	<Block
     title="Add Position"
     class="mn-b-semi"
@@ -51,12 +34,12 @@
       @update="updateProduct"
     />
   </Block>
-
+<!-- 
   <FormOrderDetails 	
 		:order="orders.state.current"  
 		@create="handleCreate"
 		class="bg-grey pd-medium radius-big mn-b-semi"
-	/>
+	/> -->
 
 
 <div class="mn-thinw-100 flex-v-center flex block">
@@ -88,7 +71,7 @@
   import ListPositions from '@pf/src/modules/products/components/blocks/ListPositions.vue'
   import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
   
-  import FormOrderDetails from '@pf/src/modules/orders/components/sections/FormOrderDetails.vue'
+  // import FormOrderDetails from '@pf/src/modules/orders/components/sections/FormOrderDetails.vue'
 
   // Import your store
   import * as orders from '@pf/src/modules/orders/store/orders';

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

@@ -10,15 +10,29 @@
 		<!-- Empty State   -->
 		<EmptyState  
 			v-if="shopcart.state.positions < 1" 
-		/>
+		/>	
+
 		<Succes 
 			v-if="order.status === true && shopcart.state.positions.length > 0" 
 			:order="order" 
 		/>
-		<FormOrderDetails 	
-			v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
-			:order="orders.state.current"  
-		/>
+		<!-- Order Form -->
+		<div
+			v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0" 
+			class="order-form col"
+		>
+			<FormClientDetails
+				:order="orders.state.current"  
+			/>
+			<FormDelivery 	
+				v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
+				:order="orders.state.current"  
+			/>
+			<FormPayment 	
+				v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
+				:order="orders.state.current"  
+			/>
+		</div>
 
 		<!-- Order positions -->
 		<div 
@@ -41,13 +55,33 @@
 			<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: {{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>
+				<p class="mn-b-thin">
+					Subtotal: 
+					{{ 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 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>
+			<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 
 		  	v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
@@ -85,7 +119,10 @@ import CardOrderItem from '@pf/src/modules/orders/components/blocks/CardOrderIte
 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 FormClientDetails from '@pf/src/modules/orders/components/sections/FormClientDetails.vue'
+import FormDelivery from '@pf/src/modules/orders/components/sections/FormDelivery.vue'
+import FormPayment from '@pf/src/modules/orders/components/sections/FormPayment.vue'
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Import libs
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -110,6 +147,7 @@ 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,
@@ -129,13 +167,13 @@ watch(() => orders.state.current.delivery.address, async (newFilterValue, oldFil
 // Store Verification
 /////////////////////////////
 const errorName = computed(() => {
-  if (orders.state.current.user.name?.length < 2) { return true } else { return false }
+  if (orders.state.current.client.name?.length < 2) { return true } else { return false }
 });
 
 const errorPhoneOrMessenger = computed(() => {
-  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;
+  const hasMessengerType = orders.state.current.client.messenger?.type;
+  const hasMessengerValue = orders.state.current.client.messenger?.value?.length >	 2;
+  const hasPhone = orders.state.current.client.number?.length > 0;
   // Ошибка, если нет ни номера телефона, ни корректного типа и значения мессенджера
   return !hasPhone && !(hasMessengerType && hasMessengerValue);
 });

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

@@ -77,7 +77,7 @@
 	    <div class="w-100">
 
 		    <CardOrganization 
-		    	v-if="orderOrganization"
+		    	v-if="orderOrganization[0]"
 		      :organization="orderOrganization[0]"
 		      :showRating="true"
 		      :showFollowers="false"
@@ -239,7 +239,7 @@
 
 	  orderOrganization.value = await organizations.actions.read({
 	    _id: order.value.organization,
-	    location: globals.state.position?.location,
+	    // location: globals.state.position?.location,
 	  });
 
 	})

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

@@ -0,0 +1,63 @@
+<template>
+  <Block title="Personal Data" class="mn-b-thin">
+    <Field 
+      v-model="order.client.name"     
+      label="Name*"    
+      placeholder="Enter your name"  
+      class="bg-white pd-medium radius-small mn-b-thin"
+    />
+    
+    <FieldPhone
+      v-model="order.client.phone"  
+      @country="(country) => { order.client.number = country }"
+      :inputOptions="{
+        placeholder: 'Enter contact phone number',
+        type: 'tel',
+      }"
+      :defaultCountry="'TH'"
+      :validCharactersOnly="true"
+      :dropdownOptions="{
+        showDialCodeInSelection: true,
+        showFlags: true,
+        showDialCodeInList: true
+      }" 
+      mode="national"
+      class="bg-white pd-small radius-small mn-b-thin" 
+    />
+
+    <p class="mn-b-small">
+     Prefer to chat instead of calling? Just drop your messenger info here:
+    </p>
+
+    <div class="flex-nowrap flex">
+      <Select 
+        :options="[
+          {name: 'Telegram',        value: 'telegram'}, 
+          {name: 'WhatsApp',        value: 'whatsapp'},
+          {name: 'Line',            value: 'line'}, 
+        ]"
+        @update:select="(option) => order.client.messenger.type = option.value"
+        placeholder="Messenger" 
+        size="small"
+        class="bg-white pd-medium radius-small mn-r-small"
+      />
+
+      <Field 
+        v-model="order.client.messenger.value"     
+        placeholder="Enter your contact here"  
+        class="bg-white pd-medium radius-small w-100"
+      />
+    </div>
+  </Block>
+</template>
+
+<script setup>
+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/FieldPhone2.vue'
+import Select from '@pf/src/components/Select/Select.vue'
+
+defineProps({
+  order: Object,
+});
+</script>

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

@@ -0,0 +1,72 @@
+<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"
+        label="Courier"
+        value="courier"
+        class="bg-white pd-medium radius-small w-100 mn-r-small"
+      />
+      <Radio 
+        v-model="order.delivery.type"
+        label="Post"
+        value="Post"
+        class="bg-white pd-medium radius-small w-100 mn-r-small"
+      />
+    </div>
+    
+    <Address
+      label="Address"    
+      :apiKey="GOOGLE_MAPS_API_KEY" 
+      :address="order.delivery.address" 
+      :location="order.delivery.location"  
+      placeholder="Enter your address"  
+      class="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="GOOGLE_MAPS_API_KEY" 
+      :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="order.comment"     
+      placeholder="Comments regarding the address (apartment unit, floor level, building section)"
+      type="textarea"  
+      class="bg-white pd-medium radius-small"
+    />
+  </Block>
+</template>
+
+<script setup>
+import { onMounted } from 'vue'
+import * as globals from '@pf/src/modules/globals/store/globals';
+import Block from '@pf/src/components/Block/Block.vue'
+import Address from '@pf/src/components/Address/Address.vue'
+import LocationMarker from "@pf/src/components/LocationMarker/LocationMarker.vue";
+import Radio from '@pf/src/components/Radio/Radio.vue'
+import Field from '@pf/src/components/Field/Field.vue'
+
+const props = defineProps({
+  order: Object,
+});
+
+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>

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

@@ -0,0 +1,27 @@
+<template>
+  <Block title="Payment">
+    <div class="mn-b-small flex-nowrap flex">
+      <Select 
+        v-model="order.payment.type"
+        :property="'value'"
+        :options="[
+          {name: 'Cash On Delivery',  value: 'cash'}, 
+          {name: 'Bank Transfer',     value: 'bank'},
+          {name: 'Crypto',            value: 'crypto'}, 
+        ]"
+        placeholder="Select type of payment" 
+        size="small"
+        class="bg-white pd-medium radius-small w-100"
+      />
+    </div>
+  </Block>
+</template>
+
+<script setup>
+import Block from '@pf/src/components/Block/Block.vue'
+import Select from '@pf/src/components/Select/Select.vue'
+
+defineProps({
+  order: Object,
+});
+</script>