@ozdao/prometheus-framework 0.2.58 → 0.2.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.58",
+  "version": "0.2.59",
   "description": "Web3 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/elements/ButtonCheck.vue

@@ -0,0 +1,106 @@
+<template>
+  <div>
+    <Button :submit="openPublicationPopup" class="bg-main button-small radius-extra button">
+      Check ticket
+    </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>
+
+      <div style="border: 2px solid black" class="h-100">
+        <QrcodeStream :track="paintBoundingBox" @detect="onDetect" @error="onError"></QrcodeStream>
+      </div>
+    </Popup>
+  </div>
+</template>
+
+<script setup>
+// Deps
+import { ref } from 'vue'
+import { QrcodeStream } from 'vue-qrcode-reader'
+
+// In components
+import Popup from '@pf/src/components/Popup/Popup.vue'
+import Button from '@pf/src/components/Button/Button.vue'
+
+// Methods 
+import * as tickets from '@pf/src/modules/events/store/tickets'
+
+const isPublicationPopup = ref(false)
+
+function openPublicationPopup() {
+  isPublicationPopup.value = true
+}
+
+function closePublicationPopup() {
+  isPublicationPopup.value = false
+}
+
+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');
+    }
+
+    const response = await tickets.actions.update({
+      _id: qrcode,
+      status: 'used',
+    })
+
+    console.log('Обновлено значение ticket.status:', response)
+
+    alert('Билет проверен');
+
+    closePublicationPopup()
+  } catch (e) {
+    alert('Билет не найден или уже использован');
+
+    console.error('Ошибка при обновлении ticket.status:', e.message)
+  }
+}
+
+function onError(err) {
+  error.value = `[${err.name}]: `
+
+  if (err.name === 'NotAllowedError') {
+    error.value += 'you need to grant camera access permission'
+  } else if (err.name === 'NotFoundError') {
+    error.value += 'no camera on this device'
+  } else if (err.name === 'NotSupportedError') {
+    error.value += 'secure context required (HTTPS, localhost)'
+  } else if (err.name === 'NotReadableError') {
+    error.value += 'is the camera already in use?'
+  } else if (err.name === 'OverconstrainedError') {
+    error.value += 'installed cameras are not suitable'
+  } else if (err.name === 'StreamApiNotSupportedError') {
+    error.value += 'Stream API is not supported in this browser'
+  } else if (err.name === 'InsecureContextError') {
+    error.value += 'Camera access is only permitted in secure context. Use HTTPS or localhost rather than HTTP.'
+  } else {
+    error.value += err.message
+  }
+}
+
+function paintBoundingBox(detectedCodes, ctx) {
+  for (const detectedCode of detectedCodes) {
+    const {
+      boundingBox: { x, y, width, height }
+    } = detectedCode
+
+    ctx.lineWidth = 2
+    ctx.strokeStyle = '#007bff'
+    ctx.strokeRect(x, y, width, height)
+  }
+}
+</script>
+
+<style scoped>
+/* Existing styles can stay unchanged */
+</style>

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

@@ -128,6 +128,10 @@
           @updateTicket="handleTicketUpdate"
         />
 
+        <!-- <img v-if="qrcode" :src="qrcode" class="w-8r h-8r" /> -->
+
+        <!-- <ButtonCheck class="w-100 pd-medium mn-auto" /> -->
+
         <section>
           <component
             v-if="event && event.content"
@@ -169,13 +173,14 @@
   import HeroEvent from '@pf/src/modules/events/components/sections/HeroEvent.vue';
   import SectionMainGuest from '@pf/src/modules/events/components/sections/SectionMainGuest.vue';
   import SectionSpecialGuests from '@pf/src/modules/events/components/sections/SectionSpecialGuests.vue'
-  import SectionLineUp from '@pf/src/modules/events/components/sections/SectionLineUp.vue';
+  import SectionLineUp from '@pf/src/modules/events/components/sections/SectionLineup.vue';
   import SectionPreviousEvents from '@pf/src/modules/events/components/sections/SectionPreviousEvents.vue';
 
 
   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';
@@ -187,9 +192,13 @@
   import { useRoute } from 'vue-router';
 
   const route = useRoute();
+  const qrcode = ref(null);
   
   const handleTicketUpdate = ({ ticket, hasTicket, targetId }) => {
     tickets.mutations.handleTicketUpdate(event.value, ticket, hasTicket, targetId);
+    console.log('HANDLE TICKET UPDATE', ticket, event.value);
+
+    qrcode.value = ticket.qrcode;
   };
 
 

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

@@ -1,3 +1,5 @@
+const QRCode = require("qrcode");
+
 const controllerFactory = (db) => {
   const Ticket = db.ticket;
 
@@ -42,6 +44,17 @@ const controllerFactory = (db) => {
 
     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" });
@@ -50,12 +63,28 @@ const controllerFactory = (db) => {
 
   const update = async (req, res) => {
     try {
-      const ticket = await Ticket.findByIdAndUpdate(req.body._id, req.body, { new: true });
+      const { _id } = req.body;
+  
+      // Поиск билета по ID
+      const ticket = await Ticket.findById(_id);
+  
+      // Если билет не найден
       if (!ticket) {
         return res.status(404).send({ errorCode: "TICKET_NOT_FOUND" });
       }
-      res.send(ticket);
+  
+      // Проверка статуса билета
+      if (ticket.status === "used") {
+        return res.status(500).send({ errorCode: "TICKET_ALREADY_USED" });
+      }
+  
+      // Обновление билета
+      const updatedTicket = await Ticket.findByIdAndUpdate(_id, req.body, { new: true });
+  
+      // Отправка обновленного билета
+      res.send(updatedTicket);
     } catch (err) {
+      // Обработка ошибки сервера
       res.status(500).send({ errorCode: "SERVER_ERROR" });
     }
   };

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

@@ -23,6 +23,14 @@ module.exports = (mongoose) => {
       type: String,
       default: 'participant'
     },
+    qrcode: {
+      type: String,
+    },
+    status: {
+      type: String,
+      enum: ["unused", "used"],
+      deafult: "unused",
+    },
   });
 
   TicketSchema.index({ user: 1, type: 1, target: 1 });

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" 
 

package/src/modules/globals/models/ownership.schema.js

@@ -14,7 +14,7 @@ module.exports = function applyOwnershipSchema(schema,db) {
     creator: {
       hidden: {
         type: Boolean,
-        required: true
+        default: false
       },
       type: {
         type: String,

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

@@ -1,8 +1,17 @@
 <template>
   <div>
-    <header class="mn-b-medium flex-v-center flex-nowrap flex">
-      <h2 class="mn-r-medium">Create Order</h2>
-    </header>
+    <Block class="mn-b-thin">
+      <header class="flex-v-center flex-nowrap flex">
+        <h2 class="mn-r-auto">Create Order</h2>
+        <Button 
+          :submit="onSubmit"
+          :callback="redirectTo"
+          class="pd-small radius-big bg-main t-black uppercase t-medium"
+        >
+          Add Order 
+        </Button>
+      </header>
+    </Block>
 
     <Popup 
       title="Добавить участника" 
@@ -51,7 +60,7 @@
     </Popup>
 
     <Block
-      title="Invetory Sheet"
+      title="Positions"
       :actions="[{
         label: '+',
         function: () => openProductsPopup()
@@ -76,28 +85,40 @@
         class="mn-b-thin pd-thin radius-medium bg-white"
       /> 
     </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">
-  	<p class="p-big">Сумма к оплате:
-  		<span v-if="order?.info?.delivery === 'Самовывоз'" class="p-big t-semi">{{ orderTotalPrice / 100 }} ₽</span>
-  		<span v-if="order?.info?.delivery === 'Курьером'" class="p-big t-semi">{{ orderTotalPrice / 100 + 350 }} ₽</span>
-  		<span v-if="order?.info?.delivery === 'Почтой'" class="p-big t-semi">{{ orderTotalPrice / 100 + 550 }} ₽</span>
-  		(Заказ {{orderTotalPrice / 100}} ₽ + доставка
-  		<span v-if="order?.info?.delivery === 'Самовывоз'" >0</span>
-  		<span v-if="order?.info?.delivery === 'Курьером'" >350</span>
-  		<span v-if="order?.info?.delivery === 'Почтой'">550</span>
-  	    ₽)  
-  	</p>
-
-  	<button class="mn-l-auto button">Запросить онлайн</button>
-  </div>
+
+    <Block
+      title="Client"
+      class="mn-b-semi"
+    >
+      <Field 
+        v-model:field="orders.state.current.client.name"     
+        label="Client"    
+        placeholder="Enter client name"  
+        class="bg-white pd-medium radius-small mn-b-thin"
+      />
+
+      <Field 
+        v-model:field="orders.state.current.comment"     
+        label="Comment"    
+        placeholder="Enter comment"  
+        class="bg-white pd-medium radius-small mn-b-thin"
+      />
+      
+     <!--  <FormClientDetails
+        :order="orders.state.current"  
+        class="bg-white"
+      /> -->
+
+    </Block>
+
+    <Block
+      class="mn-b-semi"
+    >
+      <div class="h3 flex">
+        <span class="mn-r-auto t-transp">In total</span>
+        <span>{{ cartTotalPrice }} {{returnCurrency()}} </span  >
+      </div>
+    </Block>
 </div>
 
 
@@ -106,24 +127,34 @@
 <script setup="props">
   // Import Vue functionality
   import { computed, ref, defineProps, onMounted, reactive, toRefs, watch } from 'vue'
-  import { useRoute } from 'vue-router'
+  import { useRoute,useRouter } from 'vue-router'
 
   import Feed from '@pf/src/components/Feed/Feed.vue'
+
+  import Field from '@pf/src/components/Field/Field.vue'
+  import Button from "@pf/src/components/Button/Button.vue";  
   import Popup from '@pf/src/components/Popup/Popup.vue';
 	import Block from '@pf/src/components/Block/Block.vue';
 
   import CardOrderItem  from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
-
   import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
-  
 
+  import FormClientDetails from '@pf/src/modules/orders/components/sections/FormClientDetails.vue'
   // Import your store
+  import * as auth from '@pf/src/modules/auth/store/auth';
   import * as globals from '@pf/src/modules/globals/store/globals';
   import * as orders from '@pf/src/modules/orders/store/orders';
 	import * as products from '@pf/src/modules/products/store/products';
 
   // Accessing router
   const route = useRoute()
+  const router = useRouter()
+
+  let cartTotalPrice = computed(() => {
+    return Number(orders.state.current.positions.reduce((total, product) => {
+      return total + product.price * product.quantity;
+    }, 0));
+  })
 
   // Popup
   const isOpenProductsPopup = ref(false);
@@ -139,6 +170,30 @@
   // Data
   let order = ref(null)
 
+  function onSubmit() {
+
+    orders.state.current.creator = {
+      type: 'user',
+      target: auth.state.user._id
+    }
+
+    orders.state.current.owner = {
+      type: 'organization',
+      target: route.params._id,
+    }
+
+    orders.actions.create(orders.state.current)
+  }
+
+  function redirectTo () {
+    router.push({
+      name: 'Backoffice Orders', 
+      params: { 
+        _id: route.params._id
+      } 
+    })
+  }
+
   onMounted(async () => {
     // await orders.actions.fetchOrder(route.params.id) // Implement this action in your store
 

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

@@ -149,7 +149,7 @@
 	     		v-if="orders.state.current.status_history"
 	     		:statusHistory="orders.state.current.status_history"
 	     		:statusCurrent="orders.state.current.status"
-	     		:edit="route.name === 'AdminOrderEdit'"
+	     		:edit="route.name === 'Order Edit'"
 	     	/>
 
 	     <!-- 	<button 
@@ -196,7 +196,7 @@
 		    	:username="
 		    		route.name === 'Order Status' ? order.user?.name || 'User' : 'Weeder Support'
 		    	"
-		    	:chatID="order._id"
+		    	:chatID="route.params.order"
 		    	class="radius-semi bg-white o-hidden"
 		    />
 
@@ -232,37 +232,38 @@
 
 	onMounted(async()=>{
 		order.value = await orders.actions.read({_id: route.params.order})
+		order.value = order.value[0]
 
 		productsOrganization.value = await products.actions.read({
-	    organization: order.value[0].owner.target
+	    organization: order.value?.owner.target._id
 	  });
 
 	  orderOrganization.value = await organizations.actions.read({
-	    _id: order.value[0].owner.target,
-	    // location: globals.state.position?.location,
+	    _id: order.value?.owner.target._id,
+	    location: globals.state.position?.location,
 	  });
 
 	})
 
 	let cartTotalPrice = computed(() => {
-    return Number(order.value[0]?.positions.reduce((total, product) => {
+    return Number(order.value?.positions.reduce((total, product) => {
       return total + product.price * product.quantity;
     }, 0));
   })
 
   let cartTotalAmount = computed(() => {
-    return Number(order.value[0]?.positions.reduce((total, product) => {
+    return Number(order.value?.positions.reduce((total, product) => {
       return total + product.quantity;
     }, 0));
   })
 
   let orderProducts = computed(() => {
-    return order.value[0]?.positions.map(({ _id, quantity }) => {
+    return order.value?.positions.map(({ _id, quantity }) => {
 
 	    const product = productsOrganization.value.find(product => product._id === _id)
 
 	    console.log(product)
-	    console.log(productOrganization)
+	    console.log(productsOrganization)
 
 	    return {
 	      name: product.name,

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

@@ -26,18 +26,39 @@
     class="cols-3 gap-thin"
   >
 
-    <div 
-      v-for="order in orders.state.all" 
-      class="bg-grey pd-small radius-big"
-    > 
-      Status: {{order.status}} 
+    <router-link 
+       v-for="order in orders.state.all" 
+      :to="{ 
+        name: 'Order Edit', 
+        params: { 
+          order: order._id 
 
+        }
+      }" 
+       class="bg-grey radius-big"
+    >
+      <CardHeader 
+        :class="{
+          'mn-b-small pd-medium': type !== 'short',
+          'flex-child-order-last flex-child mn-l-small': type === 'short',
+        }"
+        :entity="order"
+        :entityType="'order'"
+        :user="auth.state.user"
+        :owner="order.creator" 
+        :creator="order.creator"
+        :date="order.createdAt"
+      />
+      <div class="pd-small">
       <p 
         class="w-100 mn-b-thin p-big"
       >
         Order No.: #{{order._id}} 
       </p>
 
+      <span class="mn-b-thin pd-r-thin pd-l-thin pd-b-nano pd-t-nano bg-second radius-extra t-white t-medium d-block w-max uppercase">
+        {{order.status}}
+      </span>
       <p
         class="mn-b-small t-transp w-100"
       >
@@ -49,23 +70,9 @@
         class="mn-b-small"
       >
      
-        Order Created: {{formatDate(order.createdAt)}}
-        
-        <router-link 
-          :to="{ 
-            name: 'AdminOrderEdit', 
-            params: { 
-              order: order._id 
-
-            }
-          }" 
-          class="i-small"
-        >
-          EDIT
-        </router-link>
       </p>
-
-    </div>
+      </div>
+     </router-link>
   </section>
 </template>
 
@@ -76,8 +83,10 @@
   import Tab      from '@pf/src/components/Tab/Tab.vue'
 
   import * as orders from '@pf/src/modules/orders/store/orders';
+  import * as auth from '@pf/src/modules/auth/store/auth';
 
   import CardOrder from '@pf/src/modules/orders/components/blocks/CardOrder.vue'
+  import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
 
   const route = useRoute();
   const router = useRouter();

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

@@ -64,7 +64,7 @@ const controllerFactory = (db) => {
         req.query
       ), 
       // For creator
-      queryProcessorGlobals.getCreatorUserLookupStage(),
+      queryProcessorGlobals.getCreatorUserLookupStage(), 
       queryProcessorGlobals.getCreatorOrganizationLookupStage(),
       // For owner
       queryProcessorGlobals.getOwnerUserLookupStage(),

package/src/modules/orders/models/order.model.js

@@ -4,6 +4,15 @@ module.exports = (db) => {
     
   const OrderSchema = new db.mongoose.Schema({
    client: {
+      type: { 
+        type: String,
+        trim: true 
+      },
+      target: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        refPath: 'client.type',
+      },
+      table: { type: String, trim: true },
       name: { type: String, trim: true },
       phone: { type: Object, trim: true },
       email: { type: String, trim: true },
@@ -72,7 +81,7 @@ module.exports = (db) => {
     }
   });
 
-  // applyOwnershipSchema(OrderSchema,db);
+  applyOwnershipSchema(OrderSchema,db);
 
   const Order = db.mongoose.model("Order", OrderSchema);
 

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

@@ -50,13 +50,8 @@ const state = reactive({
 });
 
 const actions = {
-  async create(positions, owner, creator) {
+  async create(order) {
     try {
-      let order = {
-        positions: positions,
-        owner: owner,
-        creator: creator
-      }
       const response = await $axios.post('/api/orders/create', order);
 
       state.all.push(response.data);

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

@@ -19,7 +19,7 @@
 		<Field 
 			v-model:field="productQuantity" 
 			type="number"  
-			label="Quantity" 
+			label="Qty" 
 			class="bg-white pd-small radius-small" 
 		>
 		<Select 

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

@@ -111,9 +111,9 @@
   const productNew = ref(null);
 
   const totalPrice = computed(() => {
-    return leftovers.state.current.positions.reduce((sum, position) => {
+    return Number(leftovers.state.current.positions.reduce((sum, position) => {
       return sum + position.price;
-    }, 0);
+    }, 0));
   });
 
   onMounted(async () => {