@ozdao/prometheus-framework 0.2.67 → 0.2.69

package/src/modules/backoffice/router/backoffice.js

@@ -101,11 +101,11 @@ const backofficeRoutes = [{
     },{
       path: 'add',
       name: 'AdminOrderAdd',
-      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/OrderCreateBackoffice.vue')
     },{
       path: ':order',
       name: 'AdminOrderEdit',
-      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/OrderCreateBackoffice.vue')
     }]
   },{
     path: 'payments',
@@ -117,7 +117,7 @@ const backofficeRoutes = [{
       },
       authorize: []
     },
-    component: () => import(/* webpackChunkName: 'BackofficePayments' */ '@pf/src/modules/payments/components/pages/Payments.vue'),
+    component: () => import(/* webpackChunkName: 'BackofficePayments' */ '@pf/src/modules/wallet/components/pages/Payments.vue'),
   }
   ]
 }];

package/src/modules/events/components/elements/ButtonCheck.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <Button :submit="openPublicationPopup" class="bg-main button-small radius-extra button">
-      Check ticket
+      Check Tickets
     </Button>
 
     <Popup title="Добавить участника" @close-popup="closePublicationPopup" :isPopupOpen="isPublicationPopup"
       class="w-max-30r h-max-30r t-left pd-big bg-white radius-big">
-      <h3 class="mn-b-small">Final Touches</h3>
+      <h3 class="mn-b-small">Scan QR Code</h3>
 
-      <div style="border: 2px solid black" class="h-100">
+      <div class="h-max">
         <QrcodeStream :track="paintBoundingBox" @detect="onDetect" @error="onError"></QrcodeStream>
       </div>
     </Popup>
@@ -27,7 +27,10 @@ import Button from '@pf/src/components/Button/Button.vue'
 // Methods 
 import * as tickets from '@pf/src/modules/events/store/tickets'
 
+const emits = defineEmits('qrcodecheck')
+
 const isPublicationPopup = ref(false)
+const error = ref('')
 
 function openPublicationPopup() {
   isPublicationPopup.value = true
@@ -38,32 +41,29 @@ function closePublicationPopup() {
 }
 
 const result = ref(null)
+
 async function onDetect(detectedCodes) {
   result.value = detectedCodes.map((code) => code.rawValue)
-  
+
   try {
     const qrcode = result.value[0] || ''
-    console.log('Получено значение qrcode:', qrcode);
 
     if (!qrcode) {
-      throw new Error('неудалось прочитать qrcode');
+      throw new Error('Troubles with qrcode reading');
     }
 
     const response = await tickets.actions.update({
       _id: qrcode,
       status: 'used',
+      check: true
     })
 
-    console.log('Обновлено значение ticket.status:', response)
-
-    alert('Билет проверен');
-
-    closePublicationPopup()
+    alert("Ticket checked. And it's all right!");
   } catch (e) {
-    alert('Билет не найден или уже использован');
-
-    console.error('Ошибка при обновлении ticket.status:', e.message)
+    alert(`Ticket is not found, already used or deactivated!`);
   }
+
+  emits('qrcodecheck')
 }
 
 function onError(err) {
@@ -103,4 +103,4 @@ function paintBoundingBox(detectedCodes, ctx) {
 
 <style scoped>
 /* Existing styles can stay unchanged */
-</style>
+</style>

package/src/modules/events/components/pages/EditEventTickets.vue

@@ -6,9 +6,10 @@
       <h2 class="mn-r-medium">Tickets</h2>
       <button 
         @click="openTicketsPopup()" 
-        class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
-          +
+        class="radius-extra uppercase button-small  flex-child flex-child-shrink-0 hover-scale-1 cursor-pointer t-white bg-second">
+          Add Tickets
       </button>
+      <ButtonCheck @qrcodecheck="fetchTickets = !fetchTickets " class="w-100 pd-medium mn-auto" />
     </header>
     
     <Popup 
@@ -34,13 +35,19 @@
           <Field
             v-model:field="item.name"
             placeholder="Name"
-            class="w-30 bg-white radius-small pd-medium"
+            class="w-50 bg-white radius-small pd-medium"
           />  
           <Field
             v-model:field="item.email"
             placeholder="Email"
             class="w-100 bg-white radius-small pd-medium"
           />
+          <Field
+            v-model:field="item.quantity"
+            placeholder="Quantity"
+            type="number"
+            class="w-10 bg-white radius-small pd-medium"
+          />
           <div v-if="index > 0" @click="() => newTickets.splice(index, 1)"  class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-red">
             <IconDelete 
               class="i-medium"
@@ -59,6 +66,7 @@
     </Popup>
 
     <Feed
+      :search="true"
       :states="{
         empty: {
           title: 'No Tickets Found',
@@ -72,18 +80,18 @@
       :options="{
         target: event._id
       }"
+      :external="fetchTickets"
       v-slot="{ 
         items 
       }"
     >
       <div
         v-for="(ticket, index) in items" 
-        class="radius-big bg-grey gap-small pd-small flex-nowrap flex pos-relative mn-b-thin"
+        class="radius-big bg-grey gap-small pd-medium flex-v-center flex-nowrap flex pos-relative mn-b-thin"
       >
+        <a :href="ticket.image" target="_blank"><img :src="ticket.qrcode" class="radius-small h-5r w-5r"></a>
 
-        <img :src="ticket.image" class="radius-small h-5r w-5r">
-
-        <div class="">
+        <div class="mn-r-auto ">
            <p class="h4">
             {{ticket.client_refactor?.name || 'No name'}}, {{ticket.role}}
            </p>
@@ -97,12 +105,22 @@
         </div>
 
         <Button 
-          :submit="onSubmit" 
+          v-if="ticket.status !== 'deactivated'"
+          :submit="() => changeStatus(ticket, 'deactivated')" 
           :callback="redirectTo" 
-          class="w-min h-min mn-l-auto bg-black t-white"
+          class="w-min h-min pd-small bg-black t-white"
         >
           Deactivate
         </Button>
+
+        <Button 
+          v-if="ticket.status === 'deactivated' || ticket.status === 'used' "
+          :submit="() => changeStatus(ticket, 'unused')" 
+          :callback="redirectTo" 
+          class="w-min h-min pd-small bg-green t-white"
+        >
+          Activate
+        </Button>
       
       </div>
     </Feed>
@@ -117,6 +135,8 @@ import Popup from "@pf/src/components/Popup/Popup.vue";
 import Field         from '@pf/src/components/Field/Field.vue'
 import Button from '@pf/src/components/Button/Button.vue';   
 
+import ButtonCheck from '@pf/src/modules/events/components/elements/ButtonCheck.vue'
+
 import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
 
 import { ref, onMounted } from 'vue';
@@ -137,7 +157,8 @@ const newTickets = ref([{
   name: '',
   email: '',
   target: event.value?._id, 
-  type: 'event'
+  type: 'event',
+  quantity: 1,
 }])
 
 const isOpenTicketsPopup = ref(false);
@@ -149,7 +170,8 @@ function openTicketsPopup(department) {
     name: '',
     email: '',
     target: event.value?._id, 
-    type: 'event'
+    type: 'event',
+    quantity: 1,
   }]
 }
 
@@ -157,6 +179,8 @@ function closeTicketsPopup() {
   isOpenTicketsPopup.value = false;
 }
 
+const fetchTickets = ref(false)
+
 
 onMounted(async () =>{
   const data = await events.read({ user: auth.state.user._id, url: route.params.url });
@@ -167,15 +191,17 @@ onMounted(async () =>{
 async function onSubmit() {
   try {
     const response = await tickets.actions.create(newTickets.value);
+    fetchTickets.value = !fetchTickets.value
   } catch (error) {
     console.log(error);
   }
 }
 
-async function onDeactivate() {
+async function changeStatus(ticket, status) {
   if (confirm('Are you sure you want to deactivate this event?')) {
     try {
-      const response = await events.update(event.value._id);
+      const response = await tickets.actions.update({ ...ticket, status: status});
+      fetchTickets.value = !fetchTickets.value
     } catch (error) {
       console.error(error);
     }

package/src/modules/events/components/pages/Event.vue

@@ -130,7 +130,7 @@
 
         <!-- <img v-if="qrcode" :src="qrcode" class="w-8r h-8r" /> -->
 
-        <!-- <ButtonCheck class="w-100 pd-medium mn-auto" /> -->
+        
 
         <section>
           <component
@@ -180,7 +180,6 @@
   import CardEvent from '@pf/src/modules/events/components/blocks/CardEvent.vue';
   import SkeletonEvent from '@pf/src/modules/icons/skeletons/SkeletonEvent.vue'
   import ButtonJoin from '@pf/src/modules/events/components/elements/ButtonJoin.vue';
-  // import ButtonCheck from '@pf/src/modules/events/components/elements/ButtonCheck.vue'
   import Comments from '@pf/src/modules/community/components/sections/Comments.vue';
 
   import Image  from '@pf/src/modules/constructor/components/elements/Image.vue';

package/src/modules/events/controllers/tickets.controller.js

@@ -1,109 +1,131 @@
-const QRCode = require("qrcode");
-const Jimp = require('jimp');
+const fs = require("fs");
 const path = require('path');
+const puppeteer = require("puppeteer");
+
+const QRCode = require("qrcode");
+const Mustache = require("mustache");
 
 const { sendEmail } = require('@pf/src/modules/globals/utils/mailing');
 
+const { renderTemplate: renderTicketTemplate } = require('./utils/templateTicket');
+const { renderTemplate: renderEmailTemplate } = require('./utils/templateEmail');
+
+function formatDate(dateString) {
+  const date = new Date(dateString);
+  const options = { day: 'numeric', month: 'long' };
+  return date.toLocaleDateString('en-US', options);
+}
+
+// Функция для форматирования времени в формат "16:30"
+function formatTime(dateString) {
+  const date = new Date(dateString);
+  const options = { hour: '2-digit', minute: '2-digit', hour12: false };
+  return date.toLocaleTimeString('en-US', options);
+}
+
 const controllerFactory = (db, publicPath) => {
   const Ticket = db.ticket;
+  const Event = db.event;
 
   // Функция для создания билета, генерации QR-кода и сохранения билета
   async function saveAndSendTicket(ticketData) {
-    console.log(ticketData);
-    const ticket = new Ticket(ticketData);
-
-    const data = await ticket.save();
-
-    // Работа с QR-кодом
-    const qrData = data._id.toString();
-    const qrCode = await QRCode.toDataURL(qrData, { errorCorrectionLevel: 'H', type: 'image/png' });
+	  console.log(ticketData);
+	  const quantity = ticketData.quantity || 1; // Установим значение по умолчанию, если quantity не указано
+	  const ticketIds = [];
+	  const pdfFiles = [];
 
-    data.status = "unused";
-    data.qrcode = qrCode;
-
-    data.client_refactor.name = ticketData.name
-    data.client_refactor.email = ticketData.email
-
-    // Путь к шаблону билета и куда сохранить измененный
-    const templatePath = path.join(publicPath, 'tickets', 'template.png');
-    const outputPath = path.join(publicPath, 'tickets', `ticket-${data._id}.png`);
-    data.image = `/tickets/ticket-${data._id}.png`;
-
-    // Загрузка шаблона билета
-    const ticketTemplate = await Jimp.read(templatePath);
-
-    // Генерация QR-кода в виде изображения
-    const qrImage = await Jimp.read(Buffer.from(qrCode.split(",")[1], 'base64'));
-
-    const resizedQrWidth = qrImage.bitmap.width * 1.5;
-    const resizedQrHeight = qrImage.bitmap.height * 1.5;
-    qrImage.resize(resizedQrWidth, resizedQrHeight);
-
-    // Вычисление позиции для QR-кода после изменения размера
-    const { width: templateWidth, height: templateHeight } = ticketTemplate.bitmap;
+   	const event = await Event.findById(ticketData.target).exec();
     
-    const xPosition = (templateWidth - resizedQrWidth) / 2;
-    const yPosition = (templateHeight / 2 - resizedQrHeight / 2) + 275; // Немного ниже центра
-
-    // Добавление QR-кода на шаблон билета
-    await ticketTemplate.composite(qrImage, xPosition, yPosition);
-
-    // Сохранение измененного билета
-    await ticketTemplate.writeAsync(outputPath);
-
-    if (ticketData.email) {
-      const emailBody = `
-        <h1>Your Ticket from ${process.env.APP_NAME}</h1>
-        <p>Dear ${ticketData.name || 'Anonymous'},<br>
-        Your ticket is now ready.<br>
-        Please find your ticket attached below:</p>
-        <img src="${process.env.API_URL + data.image}" alt="Ticket Image" style="width:100%;max-width:600px;height:auto;">
-        Keep this ticket safe, and show the QR code at the entrance.<br>
-        Looking forward to seeing you!<br>
-        Best regards,<br>
-        <p>The ${process.env.APP_NAME} Team</p>
-      `;
-
-      try {
-        const emailSent = await sendEmail(ticketData.email, `Your Ticket from ${process.env.APP_NAME}`, emailBody);
-      } catch(err){
-        console.log(err)
-      } 
+    if (!event) {
+      console.error("Event not found!");
+      return;
     }
 
-    // Обновление билета с сгенерированным QR-кодом
-    await data.save();
-
-    return data; // Возвращаем данные для дальнейшего использования
-  }
-
-  const create = async (req, res) => {
-    // Проверяем, является ли тело запроса массивом
-    if (Array.isArray(req.body)) {
-      // Если тело запроса - массив, обрабатываем каждый элемент массива
-      const ticketsData = req.body;
-
-      try {
-        const ticketsPromises = ticketsData.map(ticketData =>
-          saveAndSendTicket(ticketData)
-        );
-        const tickets = await Promise.all(ticketsPromises);
-        res.json(tickets); // Отправляем массив сохраненных билетов
-      } catch (err) {
-          console.log(err)
-        res.status(500).send({ errorCode: "SERVER_ERROR" });
-      }
-    } else {
-      // Если тело запроса не массив, обрабатываем как один объект
-      try {
-        const data = await saveAndSendTicket(req.body);
-        res.json(data); // Отправляем данные одного билета
-      } catch (err) {
-        console.log(err)
-        res.status(500).send({ errorCode: "SERVER_ERROR" });
-      }
-    }
-  };
+	  for (let i = 0; i < quantity; i++) {
+	    const ticket = new Ticket(ticketData);
+	    const data = await ticket.save();
+	    ticketIds.push(data._id.toString()); // Сохраняем ID каждого билета для QR кода
+	   
+	    const qrData = data._id.toString();
+	    const qrCode = await QRCode.toDataURL(qrData, {
+	      errorCorrectionLevel: 'H',
+	      type: 'image/png'
+	    });
+	    data.status = "unused";
+	    data.qrcode = qrCode;
+	    data.client_refactor.name = ticketData.name
+	    data.client_refactor.email = ticketData.email
+	    const renderedHtml = renderTicketTemplate({
+	      clientName: ticketData.name || 'No name',
+	      qrCode: qrCode,
+	      eventLocation: event.location || process.env.APP_NAME,
+	      eventName: event.name,
+	      eventDate: formatDate(event.date.start),
+	      eventTime: formatTime(event.date.start)
+	    });
+	    const dirPath = path.join(publicPath, 'tickets');
+	    const fileName = `ticket-${data._id.toString()}.pdf`;
+	    const filePath = path.join(dirPath, fileName);
+	    pdfFiles.push(filePath); // Сохраняем пути ко всем файлам PDF
+	    const browser = await puppeteer.launch();
+	    const page = await browser.newPage();
+	    await page.setContent(renderedHtml);
+	    const pdfBuffer = await page.pdf({
+	      path: filePath,
+	      format: "A4"
+	    });
+	    await browser.close();
+	    data.image = `/tickets/${fileName}`;
+	    await data.save(); // Обновление билета в базе данных
+	  }
+	  // Отправка одного емейла с прикрепленными PDF файлами всех билетов
+	  if (ticketData.email) {
+	    const renderedHtmlEmail = renderEmailTemplate({
+	      clientName: ticketData.name || 'No name',
+	      eventLocation: event.location || process.env.APP_NAME,
+	      eventName: event.name,
+	      eventDate: formatDate(event.date.start),
+	      eventTime: formatTime(event.date.start),
+	      randomness: Date.now()
+	    });
+	    try {
+	      const emailSent = await sendEmail(ticketData.email, `Your Tickets for ${event.name}`, renderedHtmlEmail, pdfFiles);
+	    } catch (err) {
+	      console.error("Email sending failed:", err);
+	    }
+	  }
+	  return {
+	    tickets: ticketIds
+	  }; // Возвращаем ID всех созданных билетов
+	};
+
+	const create = async (req, res) => {
+	  if (Array.isArray(req.body)) {
+	    const ticketsData = req.body;
+	    try {
+	      const ticketsPromises = ticketsData.map(ticketData =>
+	        saveAndSendTicket(ticketData)
+	      );
+	      const tickets = await Promise.all(ticketsPromises);
+	      res.json(tickets);
+	    } catch (err) {
+	      console.log(err)
+	      res.status(500).send({
+	        errorCode: "SERVER_ERROR"
+	      });
+	    }
+	  } else {
+	    try {
+	      const data = await saveAndSendTicket(req.body);
+	      res.json(data);
+	    } catch (err) {
+	      console.log(err)
+	      res.status(500).send({
+	        errorCode: "SERVER_ERROR"
+	      });
+	    }
+	  }
+	};
 
   const read = async (req, res) => {
     let query = {};
@@ -125,6 +147,34 @@ const controllerFactory = (db, publicPath) => {
       query.role = req.query.role;
     }
 
+    options.limit = req.query.limit || 10;
+    options.skip = req.query.skip || 0;
+		
+		const sortParam = req.query.sortParam || 'createdAt';
+		const sortOrder = req.query.sortOrder === 'asc' ? 1 : -1;
+
+		options.sort = {
+		  [sortParam]: sortOrder,
+		  "_id": 1
+		};
+
+		const search = req.query.search;
+
+    if (search) {
+		  const parts = search.split('.');
+		  let regexPattern = '';
+
+		  if (parts.length === 2) {
+		    // Создаем паттерн, который допускает замену одного символа в каждой части
+		    regexPattern = parts.map(part => part.replace(/[.*+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*')).join('\\.');
+		  } else {
+		    // Если нет точки, применяем аналогичный подход к всей строке
+		    regexPattern = search.replace(/[.*+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+		  }
+
+		  query['client_refactor.name'] = { $regex: new RegExp(regexPattern, 'i') };
+		}
+
     try {
       const tickets = await Ticket.find(query, null, options).populate('user');
       if (!tickets) {
@@ -139,7 +189,7 @@ const controllerFactory = (db, publicPath) => {
   const update = async (req, res) => {
     try {
       const { _id } = req.body;
-  
+  		
       // Поиск билета по ID
       const ticket = await Ticket.findById(_id);
   
@@ -147,15 +197,18 @@ const controllerFactory = (db, publicPath) => {
       if (!ticket) {
         return res.status(404).send({ errorCode: "TICKET_NOT_FOUND" });
       }
-  
+
       // Проверка статуса билета
-      if (ticket.status === "used") {
+      if (ticket.status === "used" && req.body.check) {
         return res.status(500).send({ errorCode: "TICKET_ALREADY_USED" });
       }
+
+      if (ticket.status === "deactivated" && req.body.check) {
+        return res.status(500).send({ errorCode: "TICKET_DEACTIVATED" });
+      }
   
       // Обновление билета
-      const updatedTicket = await Ticket.findByIdAndUpdate(_id, req.body, { new: true });
-  
+      const updatedTicket = await Ticket.findOneAndUpdate({_id: _id}, req.body, { new: true });
       // Отправка обновленного билета
       res.send(updatedTicket);
     } catch (err) {

package/src/modules/events/controllers/utils/templateEmail.js

@@ -0,0 +1,14 @@
+const Mustache = require("mustache");
+
+// Шаблон HTML и CSS в одной строке
+const template = `
+<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Ticket Confirmation</title></head><body style="font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;margin:0;padding:0;color:#333;background-color:#f9f9f9"><span style="opacity:0">{{ randomness }}</span><div class="container" style="border-radius:48px;width:100%;max-width:650px;background:#fff;margin:20px auto;overflow:hidden"><div class="header" style="background:#e31c25;color:#fff;text-align:left"><img alt="NO MORE SNOW" style="max-width:150px;height:auto;padding:20px" src="https://thecommunephuket.com/logo/nms_logotype-white.jpg"><h1 style="box-sizing:border-box;border-top:2px solid rgba(0,0,0,.1);padding:40px;text-align:center;margin:0;text-transform:uppercase;width:100%">Confirmation of Your Ticket Purchase</h1></div><div class="content" style="padding:20px;text-align:center"><h2 style="color:#000">Thank You, {{clientName}}!</h2><p style="color:#000;opacity:.5">Your purchase has been confirmed. Please find your ticket attached to this email.</p><div class="details" style="background-color:#f5f5f5;padding:10px;margin-top:20px;margin-bottom:20px;border-radius:24px"><h3 style="color:#000;margin:0">Event Details</h3><p style="display:flex;color:#000"><strong style="display:block;width:100%;opacity:.5;text-align:right;margin-right:.5rem">Event:</strong><span style="text-align:left;width:100%">{{eventName}}</span></p><p style="display:flex;color:#000"><strong style="display:block;width:100%;opacity:.5;text-align:right;margin-right:.5rem">Date:</strong><span style="text-align:left;width:100%">{{eventDate}}</span></p><p style="display:flex;color:#000"><strong style="display:block;width:100%;opacity:.5;text-align:right;margin-right:.5rem">Time:</strong><span style="text-align:left;width:100%">{{eventTime}}</span></p></div><div class="social-links" style="text-align:center"><h3 style="color:#000">Stay Connected</h3><p style="color:#000;opacity:.5">Follow us on Instagram for the latest updates and exclusive content!</p><table border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto; border-collapse:separate;mso-table-lspace:0;mso-table-rspace:0;width:auto"><tr><td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#e31c25;border-radius:48px;text-align:center" valign="top" bgcolor="#e31c25" align="center"><a href="https://www.instagram.com/no.more.snow/?hl=en" target="_blank" style="display:inline-block;color:#fff;background-color:#e31c25;border:solid 1px #e31c25;border-radius:48px;box-sizing:border-box;cursor:pointer;text-decoration:none;font-size:14px;font-weight:700;margin:0;padding:12px 25px;text-transform:capitalize;border-color:#e31c25">Instagram</a></td></tr></table></div><div class="footer" style="text-align:center;padding:10px 20px;border-radius:24px"><p style="color:#000">Need help? Contact us:<a href="https://t.me/thecommunebar" style="color:#e31c25">@thecommunebar</a></p></div><p class="details copyright" style="color:#000;background-color:#f5f5f5;padding:20px;margin-top:20px;margin-bottom:20px;border-radius:24px;margin:0;box-sizing:border-box;text-align:center">&copy; 2024 NO MORE SNOW Ltd. All Rights Reserved.</p></div></div><span style="opacity:0">{{ randomness }}</span></body></html>
+`;
+
+// Функция для рендеринга шаблона с данными
+function renderTemplate(data) {
+    return Mustache.render(template, data);
+}
+
+module.exports = { renderTemplate };
+