@ozdao/martyrs 0.2.444 → 0.2.446

package/dist/notifications.server.js

@@ -3,7 +3,7 @@ const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const require$$0 = require("apn");
 const require$$0$1 = require("firebase-admin");
 const require$$0$2 = require("path");
-const mailing = require("./mailing-DqDlUHrs.js");
+const mailing = require("./mailing-D4kWlk3_.js");
 require("dotenv");
 require("nodemailer");
 require("axios");

package/dist/notifications.server.mjs

@@ -2,7 +2,7 @@ import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import require$$0 from "apn";
 import require$$0$1 from "firebase-admin";
 import require$$0$2 from "path";
-import { r as requireMailing } from "./mailing-D0Vezzzb.mjs";
+import { r as requireMailing } from "./mailing-DvCT5ijo.mjs";
 import "dotenv";
 import "nodemailer";
 import "axios";

package/dist/orders.server.js

@@ -4,7 +4,7 @@ const ownership_schema = require("./ownership.schema-Ck2H9clB.js");
 const profile_schema = require("./profile.schema-h61hhB2w.js");
 const credentials_schema = require("./credentials.schema-BmOPv6FD.js");
 const queryProcessor = require("./queryProcessor-D6GuKfTV.js");
-const mailing = require("./mailing-DqDlUHrs.js");
+const mailing = require("./mailing-D4kWlk3_.js");
 const index = require("./index-DQqZReAr.js");
 const require$$0 = require("axios");
 const globals_cache = require("./globals.cache-CwWvNGFQ.js");
@@ -241,6 +241,24 @@ function requireOrders_controller() {
   hasRequiredOrders_controller = 1;
   const queryProcessorGlobals = queryProcessor.requireQueryProcessor();
   const { sendChatMessageTelegram } = mailing.requireMailing();
+  function formatPositions(positions) {
+    return positions.map((pos) => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join("\n");
+  }
+  function formatOrderMessage(order) {
+    return `
+    🆕 New Order Received!
+    👤 Customer: ${order.customer?.name} (${order.customer?.phone?.number ? order.customer?.phone?.number : "No phone"})
+    💬 Messenger: ${order.customer?.messenger ? order.customer?.messenger?.type + " " + order.customer?.messenger?.value : "None"}
+    🏢 Organization: ${order.organization}
+    📦 Positions:
+${formatPositions(order.positions)}
+    📝 Comment: ${order.comment ? order.comment : "No comment"}
+    💳 Payment: ${order.payment?.type}
+    🚚 Delivery: ${order.delivery?.type} to ${order.delivery?.address}
+    📌 Status: ${order.status}
+    🧑 Agent: ${order.referralCode}
+  `;
+  }
   async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCreator) {
     let searchCriteria = {};
     if (customerInfo.phone) {
@@ -283,6 +301,14 @@ function requireOrders_controller() {
     }
     return customer;
   }
+  async function sendOrderMessage(orderData) {
+    try {
+      const formattedMessage = formatOrderMessage(orderData);
+      await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","), formattedMessage);
+    } catch (err) {
+      console.error(err);
+    }
+  }
   const controllerFactory = (db2) => {
     const Order = db2.order;
     const Customer = db2.customer;
@@ -356,6 +382,7 @@ function requireOrders_controller() {
           }
         }
         await session.commitTransaction();
+        sendOrderMessage(orderData).catch(console.error);
         res.status(201).send(createdOrder);
       } catch (err) {
         await session.abortTransaction();

package/dist/orders.server.mjs

@@ -3,7 +3,7 @@ import { r as requireOwnership_schema } from "./ownership.schema-C0w02Vw1.mjs";
 import { r as requireProfile_schema } from "./profile.schema-kP_zKXNt.mjs";
 import { r as requireCredentials_schema } from "./credentials.schema-oOC8B5KL.mjs";
 import { r as requireQueryProcessor } from "./queryProcessor-CWnMIe2U.mjs";
-import { r as requireMailing } from "./mailing-D0Vezzzb.mjs";
+import { r as requireMailing } from "./mailing-DvCT5ijo.mjs";
 import { r as requireMiddlewares } from "./index-DICZTQ-1.mjs";
 import require$$0 from "axios";
 import { r as requireGlobals_cache } from "./globals.cache-BT6q3vOf.mjs";
@@ -240,6 +240,24 @@ function requireOrders_controller() {
   hasRequiredOrders_controller = 1;
   const queryProcessorGlobals = requireQueryProcessor();
   const { sendChatMessageTelegram } = requireMailing();
+  function formatPositions(positions) {
+    return positions.map((pos) => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join("\n");
+  }
+  function formatOrderMessage(order) {
+    return `
+    🆕 New Order Received!
+    👤 Customer: ${order.customer?.name} (${order.customer?.phone?.number ? order.customer?.phone?.number : "No phone"})
+    💬 Messenger: ${order.customer?.messenger ? order.customer?.messenger?.type + " " + order.customer?.messenger?.value : "None"}
+    🏢 Organization: ${order.organization}
+    📦 Positions:
+${formatPositions(order.positions)}
+    📝 Comment: ${order.comment ? order.comment : "No comment"}
+    💳 Payment: ${order.payment?.type}
+    🚚 Delivery: ${order.delivery?.type} to ${order.delivery?.address}
+    📌 Status: ${order.status}
+    🧑 Agent: ${order.referralCode}
+  `;
+  }
   async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCreator) {
     let searchCriteria = {};
     if (customerInfo.phone) {
@@ -282,6 +300,14 @@ function requireOrders_controller() {
     }
     return customer;
   }
+  async function sendOrderMessage(orderData) {
+    try {
+      const formattedMessage = formatOrderMessage(orderData);
+      await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","), formattedMessage);
+    } catch (err) {
+      console.error(err);
+    }
+  }
   const controllerFactory = (db2) => {
     const Order = db2.order;
     const Customer = db2.customer;
@@ -355,6 +381,7 @@ function requireOrders_controller() {
           }
         }
         await session.commitTransaction();
+        sendOrderMessage(orderData).catch(console.error);
         res.status(201).send(createdOrder);
       } catch (err) {
         await session.abortTransaction();

package/dist/organizations.server.js

@@ -7,7 +7,7 @@ const require$$0 = require("mongoose");
 const require$$1 = require("@googlemaps/google-maps-services-js");
 const addMembersQuantity = require("./addMembersQuantity-DxWjHK1K.js");
 const require$$0$2 = require("uuidv4");
-const mailing = require("./mailing-DqDlUHrs.js");
+const mailing = require("./mailing-D4kWlk3_.js");
 const index = require("./index-DQqZReAr.js");
 const globals_abac = require("./globals.abac-DT0VjfaZ.js");
 const engagement_schema = require("./engagement.schema-DAiXsvh1.js");

package/dist/organizations.server.mjs

@@ -6,7 +6,7 @@ import require$$0 from "mongoose";
 import require$$1 from "@googlemaps/google-maps-services-js";
 import { r as requireAddUserStatusFields, a as requireAddMembersQuantity } from "./addMembersQuantity-DBfuUEx_.mjs";
 import require$$0$2 from "uuidv4";
-import { r as requireMailing } from "./mailing-D0Vezzzb.mjs";
+import { r as requireMailing } from "./mailing-DvCT5ijo.mjs";
 import { r as requireMiddlewares } from "./index-DICZTQ-1.mjs";
 import { r as requireGlobals_abac } from "./globals.abac-CvmZM8XG.mjs";
 import { r as requireEngagement_schema } from "./engagement.schema-DnDD7Bn3.mjs";

package/dist/style.css

@@ -2578,10 +2578,10 @@ to {
 }
 .vue-select-header {
   height: 3rem;
-}.blink[data-v-c30b339c] {
-  animation: blink-animation-c30b339c 1s ease infinite;
+}.blink[data-v-529cceb6] {
+  animation: blink-animation-529cceb6 1s ease infinite;
 }
-@keyframes blink-animation-c30b339c {
+@keyframes blink-animation-529cceb6 {
 0%, 100% {
     opacity: 1;
 }

package/dist/{tickets.controller-Bbxe7kaF.mjs → tickets.controller-BIhfgjNb.mjs}

@@ -2,7 +2,7 @@ import require$$0$1 from "path";
 import require$$1 from "puppeteer";
 import require$$2 from "qrcode";
 import require$$0 from "mustache";
-import { r as requireMailing } from "./mailing-D0Vezzzb.mjs";
+import { r as requireMailing } from "./mailing-DvCT5ijo.mjs";
 var templateTicket;
 var hasRequiredTemplateTicket;
 function requireTemplateTicket() {

package/dist/{tickets.controller-CcxkRHlX.js → tickets.controller-zEHIAe_B.js}

@@ -3,7 +3,7 @@ const require$$0$1 = require("path");
 const require$$1 = require("puppeteer");
 const require$$2 = require("qrcode");
 const require$$0 = require("mustache");
-const mailing = require("./mailing-DqDlUHrs.js");
+const mailing = require("./mailing-D4kWlk3_.js");
 var templateTicket;
 var hasRequiredTemplateTicket;
 function requireTemplateTicket() {

package/dist/wallet.server.js

@@ -5,7 +5,7 @@ require("axios");
 require("bcryptjs");
 require("crypto");
 const require$$2 = require("qrcode");
-const tickets_controller = require("./tickets.controller-CcxkRHlX.js");
+const tickets_controller = require("./tickets.controller-zEHIAe_B.js");
 const require$$0 = require("stripe");
 const require$$0$1 = require("mongoose");
 const require$$1 = require("bignumber.js");

package/dist/wallet.server.mjs

@@ -4,7 +4,7 @@ import "axios";
 import "bcryptjs";
 import "crypto";
 import require$$2 from "qrcode";
-import { r as requireTickets_controller } from "./tickets.controller-Bbxe7kaF.mjs";
+import { r as requireTickets_controller } from "./tickets.controller-BIhfgjNb.mjs";
 import require$$0 from "stripe";
 import require$$0$1 from "mongoose";
 import require$$1 from "bignumber.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.444",
+  "version": "0.2.446",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

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

@@ -1,10 +1,7 @@
 <template>
   <section class="feed">
     <TransitionGroup tag="ul" name="scaleTransition" class="o-hidden bg-light radius-big">
-      <SkeletonEvent
-        v-if="isLoading"
-        v-for="i in limit" :key="i"
-      />
+      <Loader v-if="isLoading"/>
     </TransitionGroup>
 
     <transition 

package/src/modules/globals/controllers/utils/mailing.js

@@ -63,30 +63,29 @@ async function sendChatMessageTelegram(chatIds, text) {
   const telegramToken = process.env.TELEGRAM_BOT_TOKEN; // Токен Telegram Bot хранится в переменных окружения
   const telegramUrl = `https://api.telegram.org/bot${telegramToken}/sendMessage`;
 
-  // Создание кнопок
-  // const inlineKeyboard = JSON.stringify({
-  //   inline_keyboard: [
-  //     [
-  //       { text: 'Confirm', callback_data: `confirm_${application._id}` },
-  //       { text: 'Lost', callback_data: `lost_${application._id}` },
-  //       { text: 'Delete', callback_data: `delete_${application._id}` }
-  //     ]
-  //   ]
-  // });
+  // Используем Promise.all для параллельной отправки сообщений
+  const sendPromises = chatIds.map(chatId => {
+    return axios.post(telegramUrl, {
+      chat_id: chatId,
+      text: text,
+      // reply_markup: inlineKeyboard
+    }).catch(error => {
+      // Логируем ошибку для конкретного чата, но не прерываем процесс
+      console.log(`Failed to send message to chat ${chatId}:`, error.message);
+      // Возвращаем false или null, чтобы Promise.all мог продолжить
+      return false;
+    });
+  });
 
   try {
-    // Отправка сообщения каждому чату из массива
-    for (const chatId of chatIds) {
-      await axios.post(telegramUrl, {
-        chat_id: chatId,
-        text: text,
-        // reply_markup: inlineKeyboard
-      });
-    }
-    console.log('Telegram message sent');
+    // Ждем завершения всех промисов, но ошибки не прерывают выполнение
+    const results = await Promise.all(sendPromises);
+    console.log('Telegram messages processing completed');
+    // Возвращаем true, даже если некоторые сообщения не были отправлены
     return true;
   } catch (error) {
-    console.log(error);
+    // Логируем общую ошибку, но не прерываем выполнение
+    console.log('Error in sending Telegram messages:', error.message);
     return false;
   }
 }

package/src/modules/globals/views/components/blocks/BlockFilter.vue

@@ -4,7 +4,7 @@ import { ref } from 'vue';
 import Checkbox from "@martyrs/src/components/Checkbox/Checkbox.vue";
 import Spoiler from "@martyrs/src/components/Spoiler/Spoiler.vue"
 
- import IconChevronBottom from '@martyrs/src/modules/icons/navigation/IconChevronBottom.vue'
+import IconChevronBottom from '@martyrs/src/modules/icons/navigation/IconChevronBottom.vue'
 
 const props = defineProps({
   title: {

package/src/modules/globals/views/components/partials/Header.vue

@@ -144,6 +144,7 @@
 			v-if="router.hasRoute('Search') && route.meta.header_search"
 			aria-label="search"
 			class="pd-zero bg-transp"
+			:class="route.meta.header_search_class"
 			:submit="() => router.push({name: 'Search'})"
 			:showSucces="false"
 			:showLoader="false"

package/src/modules/marketplace/views/components/layouts/Marketplace.vue

@@ -116,7 +116,7 @@
     let categoriesFilter = await categories.actions.read(options);
 
     categoriesFilter = categoriesFilter.map(category => ({
-      value: category.url,
+      value: category._id,
       label: category.name
     }));
 

package/src/modules/orders/components/elements/PriceTotal.vue

@@ -13,10 +13,16 @@
     </p>
     
     <!-- VAT calculation (conditional) -->
-    <p v-if="showVat" class="flex flex-nowrap br-black-transp-10 br-solid br-b pd-b-small pd-t-small">
+    <p v-if="showVat" class="flex flex-nowrap pd-t-small">
       <span class="w-100 t-transp">{{ t('vat', { rate: vatRate * 100 }) }}</span>
       <span class="w-100 t-right">{{currency}}{{vatAmount}}</span>
     </p>
+
+    <!-- Delivery fee (conditional) -->
+    <p v-if="showDeliveryFee" class="flex flex-nowrap br-black-transp-10 br-solid br-b pd-b-small pd-t-small">
+      <span class="w-100 t-transp">{{ t('delivery') }}</span>
+      <span class="w-100 t-right">{{currency}}{{deliveryAmount}}</span>
+    </p>
     
     <!-- Grand total -->
     <p class="p-big flex flex-nowrap pd-b-small pd-t-small">
@@ -55,6 +61,14 @@ const props = defineProps({
   vatRate: {
     type: Number,
     default: 0
+  },
+  showDeliveryFee: {
+    type: Boolean,
+    default: false
+  },
+  deliveryRate: {
+    type: Number,
+    default: 0
   }
 });
 
@@ -64,12 +78,14 @@ const text = {
       subtotal: 'Subtotal',
       feesRate: 'Platform Fee',
       vat: 'VAT ({rate}%)',
+      delivery: 'Delivery',
       intotal: 'In Total'
     },
     ru: {
       subtotal: 'Подытог',
       feesRate: 'Плата за платформу',
       vat: 'НДС ({rate}%)',
+      delivery: 'Доставка',
       intotal: 'Итого'
     }
   }
@@ -89,7 +105,17 @@ const feesRate = computed(() => {
   return formatPrice(props.totalPrice * props.feesRate);
 });
 
+const deliveryAmount = computed(() => {
+  if (!props.showDeliveryFee) return 0;
+  return formatPrice(props.deliveryRate);
+});
+
 const grandTotal = computed(() => {
-  return formatPrice(parseFloat(props.totalPrice) + parseFloat(feesRate.value) + parseFloat(vatAmount.value));
+  return formatPrice(
+    parseFloat(props.totalPrice) +
+    parseFloat(feesRate.value) +
+    parseFloat(vatAmount.value) +
+    parseFloat(deliveryAmount.value)
+  );
 });
 </script>

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

@@ -176,7 +176,7 @@
 			        {{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">
+			      <p @click="route.meta.context !== 'user' && route.meta.context !== 'root' ? openPaymentPopup : console.log('hello')" 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>
@@ -184,7 +184,7 @@
 
 				</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 v-if="route.meta.context !== 'user' && route.meta.context !== 'root'" 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>
@@ -239,11 +239,14 @@
 	      
 	      <PriceTotal 
           :totalPrice="cartTotalPrice"
+          :deliveryRate="deliveryCost"
           :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"
+				  :showDeliveryFee="globals.state.options?.orders.showDeliveryFee"
+
         />
      	</div>
 
@@ -345,6 +348,15 @@
 
 	})
 
+
+const deliveryCost = computed(() => {
+  const type = orders.state.current.delivery.type
+  const distance = orderOrganization.value[0]?.distance || 0
+  const config = globals.state.options?.orders?.delivery_formula || {}
+
+  return orders.getters.getDeliveryPrice(type, distance, config)
+})
+
 	let cartTotalPrice = computed(() => {
      return Number(order.value?.positions.reduce((total, product) => {
       // Проверяем тип листинга

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

@@ -58,16 +58,18 @@
 	      />
 			</ul>
 
-			<div 
+				<div 
 				class="mn-b-thin"
 			>	
 				<PriceTotal 
           :totalPrice="cartTotalPrice"
+          :deliveryRate="deliveryCost"
           :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"
+          :showDeliveryFee="globals.state.options?.orders.showDeliveryFee"
         />
 			</div>
 			<!-- Send order -->
@@ -143,22 +145,14 @@ const order = computed(() => orders.state.current)
 const user = computed(() => users.state.current)
 
 const cartTotalPrice = shopcart.getters.cartTotalPrice
-
-
 const deliveryCost = computed(() => {
-  if (orders.state.current.delivery.type === 'pickup') return 0;
-  if (orders.state.current.delivery.type === 'mail') return 350;
-  if (orders.state.current.delivery.type === 'courier') {
-    const distance = orderOrganization.value[0]?.distance || 0;
-    return Math.trunc(100 + 20 * distance - 7.5 * (distance / 10));
-  }
-  return 0;
-});
+  const type = orders.state.current.delivery.type
+  const distance = orderOrganization.value[0]?.distance || 0
+  const config = globals.state.options?.orders?.delivery_formula || {}
+
+  return orders.getters.getDeliveryPrice(type, distance, config)
+})
 
-// Computed property for total cost
-const totalCost = computed(() => {
-  return deliveryCost.value + cartTotalPrice.value.value;
-});
 // Organization
 const orderOrganization = ref({})
 

package/src/modules/orders/components/partials/ShopCart.vue

@@ -36,10 +36,10 @@
        <PriceTotal 
           :totalPrice="cartTotalPrice"
           :currency="returnCurrency()"
-          :showFees="globals.state.options?.showFees"
-          :feesRate="globals.state.options?.feesRate"
-          :showVat="globals.state.options?.showVat"
-          :vatRate="globals.state.options?.vatRate"
+          :showFees="globals.state.options?.orders.showFees"
+          :feesRate="globals.state.options?.orders.feesRate"
+          :showVat="globals.state.options?.orders.showVat"
+          :vatRate="globals.state.options?.orders.vatRate"
         />
       </div>
       <button v-if="shopcart.state.positions.length > 0" @click="openOrder()" class="bg-main t-black w-100 button">{{ t('fastorder') }}</button>
@@ -79,7 +79,6 @@
 
   import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue';
 
-
   import * as globals from '@martyrs/src/modules/globals/views/store/globals';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth';
   import * as shopcart from '@martyrs/src/modules/orders/store/shopcart';
@@ -133,6 +132,14 @@
     !globals.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id ?  router.push({name: 'Sign In', query: { returnUrl: '/orders/form'}}) :   router.push({name: 'CreateOrder'}) 
     shopcart.actions.toggleShopcart();
   }
+
+  onMounted(async()=> {
+    orderOrganization.value = await organizations.actions.read({
+      _id: shopcart.state.organization,
+      location: globals.state.position?.location,
+      lookup: ['spots']
+    })
+  })
 </script>
 
 <style lang="scss">

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

@@ -192,8 +192,8 @@ const controllerFactory = (db) => {
       await session.commitTransaction();
 
       // Send notification
-      // sendOrderMessage(orderData);
-      
+      sendOrderMessage(orderData).catch(console.error);
+
       // Return the created order
       res.status(201).send(createdOrder);
     } catch (err) {

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

@@ -182,6 +182,20 @@ const getters = {
         return total + product.price * (product.quantity || 1);
       }
     }, 0));
+  },
+  getDeliveryPrice(type, distance = 0, config = {}) {
+    if (type === 'pickup') return config.pickupCost || 0;
+    if (type === 'mail') return config.mailCost || 300;
+
+    if (type === 'courier') {
+      const base = config.courierBase || 100;
+      const perKm = config.courierPerKm || 20;
+      const discount = config.courierDiscountFactor || 7.5;
+
+      return Math.trunc(base + perKm * distance - discount * (distance / 10));
+    }
+
+    return 0;
   }
 }
 

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

@@ -60,10 +60,10 @@
 		          <PopupDateSelector
 		            :product="product"
 		            :isOpen="isPopupOpen"
-		            :showFees="globals.state.options?.showFees"
-                :feesRate="globals.state.options?.feesRate || 0.15"
-                :showVat="globals.state.options?.showVat"
-                :vatRate="globals.state.options?.vatRate || 0"
+		            :showFees="globals.state.options?.orders.showFees"
+                :feesRate="globals.state.options?.orders.feesRate || 0.15"
+                :showVat="globals.state.options?.orders.showVat"
+                :vatRate="globals.state.options?.orders.vatRate || 0"
 		            :onConfirm="selectedDates => addToCart(product, selectedDates)"
 		            @close="closePopup"
 		          />
@@ -102,6 +102,7 @@
 import { computed, ref, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
+
 import * as auth from '@martyrs/src/modules/auth/views/store/auth'
 import * as globals from '@martyrs/src/modules/globals/views/store/globals'
 import * as products from '@martyrs/src/modules/products/store/products'
@@ -151,7 +152,7 @@ const pageProduct = ref(null)
 // products.mutations.resetProduct()
 onMounted(async () => {
 
-   emits('page-loading');
+  emits('page-loading');
   await products.actions.read({ _id: route.params.product })
   emits('page-loaded');