@ozdao/prometheus-framework 0.2.60 → 0.2.61

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

@@ -1,8 +1,110 @@
 const QRCode = require("qrcode");
+const Jimp = require('jimp');
+const path = require('path');
 
-const controllerFactory = (db) => {
+const { sendEmail } = require('@pf/src/modules/globals/utils/mailing');
+
+const controllerFactory = (db, publicPath) => {
   const Ticket = db.ticket;
 
+  // Функция для создания билета, генерации 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' });
+
+    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 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)
+      } 
+    }
+
+    // Обновление билета с сгенерированным 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" });
+      }
+    }
+  };
+
   const read = async (req, res) => {
     let query = {};
     let options = {};
@@ -34,33 +136,6 @@ const controllerFactory = (db) => {
     }
   };
 
-  const create = async (req, res) => {
-    const newTicket = new Ticket({
-      user: req.body.user,
-      type: req.body.type,
-      target: req.body.target,
-      role: req.body.role
-    });
-
-    try {
-      const data = await newTicket.save();
-
-      // Working with qrcode
-      const qrData = data._id.toString();
-      const qrCode = await QRCode.toDataURL(qrData);
-
-      data.status = "unused";
-      data.qrcode = qrCode;
-
-      // Updated ticked with generated qrcode
-      await data.save();
-
-      res.send(data);
-    } catch (err) {
-      res.status(500).send({ errorCode: "SERVER_ERROR" });
-    }
-  };
-
   const update = async (req, res) => {
     try {
       const { _id } = req.body;

package/src/modules/events/models/ticket.model.js

@@ -1,17 +1,28 @@
 module.exports = (mongoose) => {
   const TicketSchema = new mongoose.Schema({
+    client: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Client',
+    },
+    client_refactor: {
+      email: {
+        type: String,
+      },
+      name: {
+        type: String,
+      },
+    },
     user: {
       type: mongoose.Schema.Types.ObjectId,
       ref: 'User',
-      required: true,
     },
     type: {
       type: String,
       enum: ['event','parking'], 
-      default: 'organization',
+      default: 'event',
       required: true,
     },
-    target: {  // заменяем 'organization' на 'target', так как это может быть или User, или Organization
+    target: {  
       type: mongoose.Schema.Types.ObjectId,
       ref: function (value) {
         if (this.type === 'event') return 'Event';
@@ -26,11 +37,18 @@ module.exports = (mongoose) => {
     qrcode: {
       type: String,
     },
+    image: {
+      type: String,
+    },
     status: {
       type: String,
-      enum: ["unused", "used"],
+      enum: ["unused", "used","deactivated"],
       deafult: "unused",
     },
+  }, {
+    timestamps: { 
+      currentTime: () => Date.now() 
+    }
   });
 
   TicketSchema.index({ user: 1, type: 1, target: 1 });

package/src/modules/events/router/events.js

@@ -50,6 +50,11 @@ const eventsRoutes = [
     name: 'Edit Event',
     meta: { authorize: [] },
     component: () => import(/* webpackChunkName: 'EditEvent' */ '../components/pages/EditEvent.vue')
+  },{
+    path: 'events/:url/edit/tickets',
+    name: 'Edit Event Tickets',
+    meta: { authorize: [] },
+    component: () => import(/* webpackChunkName: 'EditEvent' */ '../components/pages/EditEventTickets.vue')
   }
 ];
 

package/src/modules/events/routes/tickets.routes.js

@@ -1,8 +1,8 @@
 // Factories
 const controllerFactory = require("../controllers/tickets.controller");
 // Routes
-module.exports = function(app, db, origins) {
-  const controller = controllerFactory(db);
+module.exports = function(app, db, origins, publicPath) {
+  const controller = controllerFactory(db, publicPath);
 
   app.use(function(req, res, next) {
     

package/src/modules/events/store/tickets.js

@@ -22,6 +22,7 @@ const state = reactive({
 // Methods
 const actions = {
   async read({ user, type, target, role }) {
+    
     try {
       const response = await $axios.get(`/api/tickets`, { params: { user, type, target, role } });
       state.error = null;

package/src/modules/globals/components/blocks/CardHeader.vue

@@ -11,7 +11,7 @@
 				class="w-100 flex-nowrap flex-v-center flex"
 			>
 				<img 
-					v-if="owner.target.profile.photo?.length > 0 && type !== 'short'" 
+					v-if="owner.target?.profile?.photo?.length > 0 && type !== 'short'" 
 					:src="(FILE_SERVER_URL || '') + owner.target.profile.photo" 
 					class="radius-medium object-fit-cover mn-r-thin i-thin" 
 
@@ -24,7 +24,7 @@
 				/>
 
 				<PlaceholderUserpic
-					v-if="!owner.target.profile.photo && type !== 'short'"
+					v-if="!owner.target?.profile?.photo && type !== 'short'"
 					class="radius-medium mn-r-thin i-thin"
 
 					@click.stop="$router.push({
@@ -48,19 +48,19 @@
 							}
 						})" 
 					>
-						{{owner.target.profile.name}}
+						{{owner.target?.profile?.name}}
 					</span>
 
 					<span
-						v-if="!creator.hidden && owner.target.profile.name !== creator.target.profile?.name"
+						v-if="!creator.hidden && owner.target?.profile?.name !== creator.target?.profile?.name"
 						@click.stop="$router.push({
 							name: 'User Profile', 
 							params: {
-								_id: creator.target._id
+								_id: creator.target?._id
 							}
 						})" 
 					>
-						· by {{creator.target.profile?.name}}
+						· by {{creator.target?.profile?.name}}
 					</span>
 					<span v-if="date">
 						· {{getTimeElapsed(date)}}

package/src/modules/organizations/components/pages/Members.vue

@@ -81,7 +81,7 @@ import User from '@pf/src/modules/organizations/components/blocks/User.vue';
 
 
 import * as auth      from '@pf/src/modules/auth/store/auth'
-import * as invites from '@pf/src/modules/auth/store/invites';
+import * as invites from '@pf/src/modules/organizations/store/invites';
 import * as memberships from '@pf/src/modules/organizations/store/memberships';
 import * as organization  from '@pf/src/modules/organizations/store/organizations'
 import * as departments from '@pf/src/modules/organizations/store/departments';

package/src/modules/organizations/components/pages/Organization.vue

@@ -26,13 +26,13 @@
 	        }
 	      }"
 	      :store="{
-	        read: (options) => departments.actions.read(route.params._id),
+	        read: (options) => departments.actions.read(options),
 	        state: null
 	      }"
 	      :options="{
-	          user: auth.state.user._id,
-	          sort: 'numberOfMemberships',
-	          limit: 10
+      		organization: route.params._id,
+          user: auth.state.user._id,
+          hidden: false,
 	      }"
 	      v-slot="{ 
 	        items 

package/src/modules/organizations/components/sections/MembersAdd.vue

@@ -58,7 +58,7 @@
   import Button   from '@pf/src/components/Button/Button.vue'
   // Import validation
   import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
-  import * as invites from '@pf/src/modules/auth/store/invites';
+  import * as invites from '@pf/src/modules/organizations/store/invites';
   // Props
   const props = defineProps({
     organization: Object,

package/src/modules/organizations/controllers/departments.controller.js

@@ -17,7 +17,20 @@ const controllerFactory = (db) => {
   };
 
   const read = (req, res) => {
-    Department.find({ organization: req.params._id })
+   let query = {};
+   let options = {};
+
+   console.log(req.query)
+    
+    if (req.query.organization) {
+      query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
+    }
+
+    if (req.query.hidden) {
+      query.hidden = req.query.hidden;
+    }
+
+    Department.find(query, null, options)
       .populate('members.user')
       .populate('subdepartments')
       .then(departments => {

package/src/modules/organizations/models/department.model.js

@@ -21,7 +21,11 @@ module.exports = (mongoose) => {
         start: String,
         end: String
       }
-    }],
+    }],   
+    hidden: {
+      type: Boolean,
+      default: false,
+    },
     // Marketplace options
     delivery: [String],
     payment: [String],

package/src/modules/organizations/organizations.client.js

@@ -30,6 +30,7 @@ import ButtonToggleMembership from './components/elements/ButtonToggleMembership
 import * as departmentsStore from './store/departments.js';
 import * as membershipsStore from './store/memberships.js';
 import * as organizationStore from './store/organizations.js';
+import * as invitesStore from './store/invites.js';
 
 // Import Vue Router routes
 import organizationsRouter from './router/organizations.js';
@@ -61,6 +62,7 @@ ButtonToggleMembership,
 departmentsStore,
 membershipsStore,
 organizationStore,
+invitesStore,
 organizationsRouter
 };
 

package/src/modules/organizations/organizations.server.js

@@ -2,26 +2,30 @@
 const DepartmentsController = require('./controllers/departments.controller.js');
 const OrganizationsController = require('./controllers/organizations.controller.js');
 const MembershipsController = require('./controllers/memberships.controller.js');
-
+const InvitesController = require('./controllers/invites.controller.js');
 // Importing routes
 const departmentsRoutes = require('./routes/departments.routes.js');
 const organizationsRoutes = require('./routes/organizations.routes.js');
 const membershipsRoutes = require('./routes/memberships.routes.js');
-
+const invitesRoutes = require('./routes/invites.routes.js')
 // Importing models
 const DepartmentModel = require('./models/department.model.js');
 const OrganizationModel = require('./models/organization.model.js');
 const MembershipModel = require('./models/membership.model.js');
+const InviteModel = require('./models/invite.model.js');
 
 // Exporting
 module.exports = {
   DepartmentsController,
   OrganizationsController,
   MembershipsController,
+  InvitesController,
   departmentsRoutes,
   organizationsRoutes,
   membershipsRoutes,
+  invitesRoutes,
   DepartmentModel,
   OrganizationModel,
   MembershipModel,
+  InviteModel
 };

package/src/modules/organizations/routes/departments.routes.js

@@ -14,7 +14,7 @@ module.exports = function(app, db) {
   });
 
   // Get organization departments by _id
-  app.get("/api/departments/:_id", controller.read);
+  app.get("/api/departments/read", controller.read);
 
   // Get department by _id
   app.get("/api/departments/get/:_id", controller.readOne);

package/src/modules/organizations/store/departments.js

@@ -48,9 +48,10 @@ const actions = {
     }
   },
 
-  async read(organizationId) {
+  async read(options) {
     try {
-      const response = await $axios.get(`/api/departments/${organizationId}`);
+      const response = await $axios.get(`/api/departments/read`, { params: options });
+
       console.log('Response:', response);
       state.departments = response.data;
       state.error = null;

package/src/modules/products/components/blocks/CardLeftover.vue

@@ -1,8 +1,17 @@
 <template>
-  <div class="flex-column pos-relative flex-wrap block">
+  <div class="flex-column pos-relative flex-wrap">
+    <CardHeader 
+      :entity="leftover"
+      :entityType="'leftover'"
+      :user="user"
+      :owner="leftover.creator" 
+      :creator="leftover.creator"
+      :date="leftover.createdAt"
+    />
+
     <div class="w-100 mn-b-thin flex">
       <p class="p-big">
-        {{leftover.type}} #{{leftover._id}} {{leftover.organization}}
+        {{leftover.type}}
       </p> 
       <IconEdit
         @click="$router.push({
@@ -16,14 +25,16 @@
       />
     </div>
 
-    <div class="w-100 spoiler">
-      <div @click="spoiler = !spoiler"  class="mn-b-small flex">
+  
+
+    <div class="w-100 bg-white radius-small pd-small spoiler">
+      <div @click="spoiler = !spoiler"  class="flex">
         <span>Всего товаров {{leftover.positions.length}}</span>
         <!-- <img :class="{ 'spoiler-active': spoiler }" class="button-icon" src="@/assets/icons/arrow-down-spoiler.svg"> -->
       </div>
       <transition name="fade">
         <div v-if="spoiler">
-          <div  v-for="position in leftover.positions" class="w-100 mn-b-thin flex"> 
+          <div  v-for="position in leftover.positions" class="mn-t-small w-100 mn-b-thin flex"> 
             <div class=" w-50 flex">
               <span>
                 <!-- <span class="t-transp">Название:</span>  -->
@@ -43,7 +54,7 @@
       </transition>
     </div>
     
-   <!-- <p class="t-transp">Created At {{leftover.createdAt}} by </p> -->
+
   </div>
 </template>
 
@@ -52,11 +63,12 @@
 	import { ref } from 'vue'
 	import { useRouter } from 'vue-router'
 
+  import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
+
   // Icons
   import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
   import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
 
-
 	const router = useRouter()
 
 	const props = defineProps({

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

@@ -112,7 +112,7 @@
 
   const totalPrice = computed(() => {
     return Number(leftovers.state.current.positions.reduce((sum, position) => {
-      return sum + position.price;
+      return Number(sum) + Number(position.price);
     }, 0));
   });
 

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

@@ -69,7 +69,7 @@
       <CardLeftover 
         v-for="leftover in items" 
         :leftover="leftover"
-        class="bg-grey pd-small radius-big"
+        class="bg-grey pd-small mn-b-thin radius-small"
       />
     </Feed>
   </div>
@@ -95,9 +95,20 @@
   const totalPrice = computed(() => {
     return leftovers.state.all.reduce((totalSum, item) => {
       const itemTotal = item.positions.reduce((sum, position) => {
-        return sum + (position.price * (position.quantity || 1));
+        return sum + position.price;
       }, 0);
-      return totalSum + itemTotal;
+
+      // Adjust the sum based on the type of transaction
+      if (item.type === 'stock-in') {
+        // If it's a stock-in, subtract the itemTotal from the totalSum
+        return totalSum - itemTotal;
+      } else if (item.type === 'stock-out') {
+        // If it's a stock-out, add the itemTotal to the totalSum
+        return totalSum + itemTotal;
+      } else {
+        // If the item type is not specified or is different, do not adjust the totalSum
+        return totalSum;
+      }
     }, 0);
   });
 

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

@@ -12,7 +12,7 @@
         +
     </button>
   </header>
-
+<!-- 
   <Tab 
     v-if="route.name !== 'Organization'"
     v-model:selected="tab"
@@ -24,7 +24,7 @@
     ]"
     class="mn-b-small o-hidden h5 radius-big bg-grey"
   />
-
+ -->
   <div class="cols-2-1_3 bg-grey pd-thin radius-big gap-thin">
 
     <FilterProducts
@@ -37,7 +37,7 @@
         placeholder="Enter product name"
         class="bg-white mn-b-thin"
       />
-
+      {{tab}}
       <Feed
         :states="{
           empty: {
@@ -104,13 +104,13 @@
   const router = useRouter()
 
   // Tab logic
-  const tab = ref(route.query.tab ? route.query.tab : 'all')
+  // const tab = ref(route.query.tab ? route.query.tab : 'all')
 
-  route.query.tab = tab.value
+  // route.query.tab = tab.value
 
-  watch(tab, (newValue) => {
-    router.replace({ query: { ...route.query, tab: newValue } });
-  });
+  // watch(tab, (newValue) => {
+  //   router.replace({ query: { ...route.query, tab: newValue } });
+  // });
   
   function updateSearch(search) {
     let query = { ...route.query}

package/src/modules/products/models/leftover.model.js

@@ -1,7 +1,9 @@
-module.exports = (mongoose) => {
-  const LeftoverSchema = new mongoose.Schema({
+const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js');
+
+module.exports = (db) => {
+  const LeftoverSchema = new db.mongoose.Schema({
     organization: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'Organization',
     },    
     type: {
@@ -18,7 +20,7 @@ module.exports = (mongoose) => {
     },
     positions: [{
       _id: {
-        type: mongoose.Schema.Types.ObjectId,
+        type: db.mongoose.Schema.Types.ObjectId,
         ref: 'Product',
       },    
       name: {
@@ -40,9 +42,11 @@ module.exports = (mongoose) => {
     }
   });
 
+  applyOwnershipSchema(LeftoverSchema,db);
+
   LeftoverSchema.index({ user: 1, type: 1, target: 1 });
 
-  const Leftover = mongoose.model('Leftover', LeftoverSchema);
+  const Leftover = db.mongoose.model('Leftover', LeftoverSchema);
 
   return Leftover;
 }

package/src/modules/users/models/client.model.js

@@ -0,0 +1,60 @@
+module.exports = (mongoose) => {
+
+  const ClientSchema = new mongoose.Schema({ 
+    phone: String,
+    email: String,
+
+    status: {
+      type: String,
+      enum: ['new','lost','converted'], 
+      default: 'new',
+      required: true,
+    },
+    
+    profile: {
+      photo: {
+          type: String,
+          default: ''
+      },
+      name: {
+          type: String,
+          default: ''
+      },
+      description: {
+          type: String,
+          default: ''
+      },
+      birthday: {
+          type: Date,
+      }
+    },
+
+    socials: {
+      telegram: {
+        type: String,
+        default: ''
+      },
+      twitter: {
+        type: String,
+        default: ''
+      },
+      facebook: {
+        type: String,
+        default: ''
+      },
+      instagram: {
+        type: String,
+        default: ''
+      }
+    },
+    },{
+      // Creation Date
+      timestamps: { currentTime: () => Date.now() 
+    }
+
+  });
+
+  const Client = mongoose.model("Client", ClientSchema);
+
+  return Client;
+}