@ozdao/prometheus-framework 0.2.30 → 0.2.31

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

@@ -4,9 +4,9 @@
     <!-- 01. Popup Header  -->
     <!-- ---------------------------------------------------------------- -->
     <div class="flex-nowrap flex">
-      <div class="w-100">
-        <h4 class="mn-r-thin p-big">{{t('title')}}</h4>
-        <p class="t-transp p-small">{{t('subtitle')}} {{ t('items', { count: StoreCartAmount }) }}</p>
+      <div class="mn-b-small w-100">
+        <h4 class="mn-b-thin p-big">{{t('title')}}</h4>
+        <p class="t-transp p-small">{{t('subtitle')}} {{ t('positions', { count: StoreCartAmount }) }}</p>
       </div>
       <button @click="shopcart.actions.toggleShopcart" class="button-icon"><img src="@/assets/icons/cross.svg"></button>
     </div>
@@ -15,9 +15,9 @@
     <!-- ---------------------------------------------------------------- -->
     <div class="mn-b-big shopcart-content">
       <!-- Empty State -->
-      <p v-if="!(shopcart.state.items.length > 0)" class="mn-t-medium"><i>{{t('emptystate')}}</i></p>
-      <!-- Shopcart Items -->
-      <CardOrderItem v-for="product in shopcart.state.items" :key="product._id" editable="true" :product="product" 
+      <p v-if="!(shopcart.state.positions.length > 0)" class="mn-t-medium"><i>{{t('emptystate')}}</i></p>
+      <!-- Shopcart positions -->
+      <CardOrderItem v-for="product in shopcart.state.positions" :key="product._id" editable="true" :product="product" 
         :increase="product => shopcart.actions.incrementItemQuantity(product._id)"
         :decrease="product => shopcart.actions.decrementItemQuantity(product._id)"
         :remove="product => shopcart.actions.removeProduct(product._id)"
@@ -27,11 +27,11 @@
     <!-- 03. Footer  -->
     <!-- ---------------------------------------------------------------- -->
     <div  class="shopcart-footer pd-b-medium pd-t-medium pd-big transition-cubic bg-black t-white">
-      <div v-if="shopcart.state.items.length > 0" class="mn-b-small total-price">
+      <div v-if="shopcart.state.positions.length > 0" class="mn-b-small total-price">
         <p class="t-transp t-white mn-b-micro">{{ t('intotal') }}</p>
         <p class="t-demi t-white p-big">{{cartTotalPrice}} {{returnCurrency()}}</p>
       </div>
-      <button v-if="shopcart.state.items.length > 0" @click="openOrder()" class="bg-main t-black w-100 button">{{ t('fastorder') }}</button>
+      <button v-if="shopcart.state.positions.length > 0" @click="openOrder()" class="bg-main t-black w-100 button">{{ t('fastorder') }}</button>
     </div>  
   </section>
   <!-- ---------------------------------------------------------------- -->
@@ -66,6 +66,14 @@
   // Accessing state
   const cartTotalPrice = shopcart.getters.cartTotalPrice
   const StoreCartAmount = shopcart.getters.cartTotalAmount
+  // 
+  // router.beforeEach((to, from, next) => {
+  //   if (shopcart.state.currentState === true) {
+  //     shopcart.actions.toggleShopcart();
+  //   }
+  //   next(); // Убедитесь, что вызываете next() для продолжения перехода по роуту
+  // });
+
   /////////////////////////////
   // LOCALIZATION
   /////////////////////////////
@@ -74,15 +82,15 @@
       en: {
         title: 'Your order',
         subtitle: 'You have',
-        items: 'no products in shop cart | 1 product in shop cart | {count} products in shop card',
-        emptystate: "You don't have any items in your shop cart yet. Maybe something needs to be added?",
+        positions: 'no products in shop cart | 1 product in shop cart | {count} products in shop card',
+        emptystate: "You don't have any positions in your shop cart yet. Maybe something needs to be added?",
         intotal: 'In total',
-        fastorder: 'Finish in chat'
+        fastorder: 'Checkout'
       },
       ru: {
         title: 'Ваш заказ',
         subtitle: 'У вас',
-        items: 'нет товаров в корзине | 1 товар в корзине | {count} товаров в корзине',
+        positions: 'нет товаров в корзине | 1 товар в корзине | {count} товаров в корзине',
         emptystate: "У вас еще нет товаров в корзине. Может стоит что-нибудь добавить?",
         intotal: 'Итого',
         fastorder: 'Подтвердить заказ'
@@ -97,7 +105,8 @@
   function openOrder() {
     // store.dispatch("shopcart/toggleShopCart");
     // store.dispatch("shopcart/setSearch");
-    router.push({name: 'Order'})
+    router.push({name: 'Form Order'})
+    shopcart.actions.toggleShopcart();
   }
 </script>
 

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

@@ -1,6 +1,6 @@
 <template>
 <div class="">
-  You dont have any items in order. 
+  You dont have any positions in order. 
 </div>
 
 </template>

package/src/modules/orders/components/sections/{Form.vue → FormOrderDetails.vue}

@@ -1,14 +1,15 @@
 <template>
 <div class="order-form col">
   <!-- Client info -->
-  <div class="mn-b-big">
-    
-    <p class="mn-b-medium t-medium p-big">Personal Data</p>
+  <Block
+    title="Personal Data"
+    class="mn-b-thin"
+  >
     <!-- Name and surname -->
     <Field 
       v-model:field="order.user.name"     
       label="Name*"    
-      placeholder="Elisabeth"  
+      placeholder="Enter your name"  
       class="
         bg-white
         pd-medium
@@ -17,20 +18,21 @@
       "
     />
     <!-- Phone -->
-    <Field 
-      v-model:field="order.user.phone"     
-      label="Phone*"    
-      placeholder="660929931503"  
-      class="
-        bg-white
-        pd-medium
-        radius-small
-        mn-b-thin
-      "
+    <FieldPhone
+      v-model:modelValue="order.user.phone"  
+      :dropdownOptions="{
+        showDialCodeInSelection: true,
+        showFlags: true,
+        showDialCodeInList: true
+      }"
+      :validation="phoneValidation" 
+      mode="national"
+      :inputOptions="{placeholder: 'Enter contact phone number'}"
+      class="bg-white pd-small radius-small mn-b-thin" 
     />
 
     <p class="mn-b-small">
-      Leave your contact in messenger:
+     Prefer to chat instead of calling? Just drop your messenger info here:
     </p>
 
     <div class="flex-nowrap flex">
@@ -62,17 +64,14 @@
         "
       />
     </div>
-  </div>
+  </Block>
 
   <!-- Delivery -->
-  <div class="mn-b-big">
-    <p class="mn-b-medium t-medium p-big flex-v-center flex-nowrap flex">
-      <span class="mn-r-thin">Delivery</span>
-
-      <Tooltip text="Delivery by courier takes 1-3 hours. Delivery by mail takes 3-5 days.">
-        <img src="@/assets/icons/info.svg" class="i-base">
-      </Tooltip>
-    </p>
+  <Block
+    title="Delivery"
+    class="mn-b-thin"
+    :tooltip="'Delivery by mail takes 3-5 days.'"
+  >
     <!-- Type of delivery -->
     <div class="mn-b-small flex-nowrap flex">
       <Radio 
@@ -99,21 +98,9 @@
           mn-r-small
         "
       />
-      <Radio 
-        v-model:radio="order.delivery.type"
-        label="Pickup"
-        value="pickup"
-        class="
-          bg-white
-          pd-medium
-          radius-small
-          w-100
-        "
-      />
     </div>
     <!-- Adress-->
     <Address
-      v-if="order.delivery.type !== 'pickup'"
       apiKey="AIzaSyDDR6WgYB7XMt7yTDDzQNEdF_gTdUiq8dI" 
       v-model:address="order.delivery.address"     
       label="Address"    
@@ -127,7 +114,7 @@
       "
     />
    <Field 
-      v-model:field="order.user.phone"     
+      v-model:field="order.comment"     
       placeholder="Comments regarding the address (apartment unit, floor level, building section)"
       type="textarea"  
       class="
@@ -136,19 +123,21 @@
         radius-small
       "
     />
-  </div>
+  </Block>
   <!-- Type of payment -->
-  <div  class="mn-b-big">
-    <p class="mn-b-medium t-medium p-big">Payment</p>
-
+  <Block
+    title="Payment"
+  >
     <div class="mn-b-small flex-nowrap flex">
       <Select 
+        v-model:select="order.payment.type"
+        :property="'value'"
         :options="[
-          {name: 'Cash On Delivery',  value: 'telegram'}, 
-          {name: 'Bank Transfer',     value: 'whatsapp'},
-          {name: 'Crypto',            value: 'line'}, 
+          {name: 'Cash On Delivery',  value: 'cash'}, 
+          {name: 'Bank Transfer',     value: 'bank'},
+          {name: 'Crypto',            value: 'crypto'}, 
         ]"
-        :select="order.user.messenger.type"
+       
         placeholder="Select type of payment" 
         size="small"
         class="
@@ -159,23 +148,9 @@
         "
       />
     </div>
-  </div>
+  </Block>
 
-  <!-- Send order -->
-  <button 
-    :disabled="
-      errorName 
-      || errorPhone 
-      || errorCity 
-      || errorAdress 
-      || errorDelivery 
-      || errorPayment
-    "
-    @click="onSubmit()" 
-    class="button"
-  >
-    Place an Order
-  </button>
+  
 </div>
 
 </template>
@@ -187,11 +162,12 @@ import * as orders from '@pf/src/modules/orders/store/orders';
 /////////////////////////////
 // COMPONENT DEPENDENCIES
 /////////////////////////////
+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/FieldPhone.vue'
 import Select           from '@pf/src/components/Select/Select.vue'
 import Address           from '@pf/src/components/Address/Address.vue'
 import Radio           from '@pf/src/components/Radio/Radio.vue'
-import Tooltip           from '@pf/src/components/Tooltip/Tooltip.vue'
 /////////////////////////////
 // HELPERS
 /////////////////////////////
@@ -202,50 +178,6 @@ import Tooltip           from '@pf/src/components/Tooltip/Tooltip.vue'
 const props = defineProps({
   order: Object,
 });
-
-const emits = defineEmits([
-  'create'
-])
-/////////////////////////////
-// Store Verification
-/////////////////////////////
-// const errorName = computed(() => {
-//   return props.order.user.name.length < 2 ? "Заполните поле имени" : false
-// })
-
-// const errorPhone = computed(() => {
-//   return props.order.user.phone.length < 6 ? "Заполните поле телефона" : false
-// })
-
-// const errorAdress = computed(() => {
-//   if (props.delivery !== "Pickup") { 
-//     return props.order.delivery.address < 2 ? "Заполните поле адреса" : false
-//   } else {
-//     return false
-//   }
-// })
-
-// const errorDelivery = computed(() => {
-//   if (props.order.delivery.type) { 
-//     return false
-//   } else {
-//     return true
-//   }
-// })
-
-// const errorPayment = computed(() => {
-//   if (props.order.payment.type) { 
-//     return false
-//   } else {
-//     return true
-//   }
-// })
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Methods
-///////////////////////////////////////////////////////////////////////////////////////////////////
-function onSubmit() {
-  emits('create')
-}
 /////////////////////////////
 // MOUNTED
 /////////////////////////////

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

@@ -1,3 +1,6 @@
+const { sendChatMessageTelegram } = require('@pf/src/modules/globals/utils/mailing');
+ 
+
 const controllerFactory = (db) => {
   const Order = db.order;
 
@@ -27,15 +30,41 @@ const controllerFactory = (db) => {
     }
   };
 
+  function formatPositions(positions) {
+    return positions.map(pos => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join('\n');
+  }
+
+  // Функция для форматирования сообщения об ордере
+  function formatOrderMessage(order) {
+    return `
+      🆕 New Order Received!
+      👤 Client: ${order.user.name} (${order.user.phone.number ? order.user.phone.number : 'No phone'})
+      💬 Messenger: ${order.user.messenger ? order.user.messenger.type + ' ' + order.user.messenger.value : 'None'}
+      🏢 Organization: ${order.organization}
+      📦 Positions:\n${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}
+    `;
+  }
+
   // Создание заказа
   const create = async (req, res) => {
     delete req.body._id;
 
-    console.log(req.body)
+    req.body.status = 'created'
+
+    try {
+      const formattedMessage = formatOrderMessage(req.body);
+      console.log(formattedMessage)
+      const messageSent = await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","),formattedMessage)
+    } catch (err) {  
+      console.log(err)
+    }
 
     try {
       const order = await Order.create(req.body);
-      console.log(order)
       res.status(201).send(order);
     } catch (err) {
       console.log(err)
@@ -44,12 +73,14 @@ const controllerFactory = (db) => {
   };
 
   // Обновление заказа
-  const updateOrder = async (req, res) => {
+  const update = async (req, res) => {
+    console.log(req.body)
+    console.log(req.params._id)
+
     try {
       const order = await Order.findOneAndUpdate(
         { _id: req.params._id }, 
-        { items: req.body },
-        { new: true }
+        req.body,
       ).exec();
       if (!order) {
         return res.status(404).send({ errorCode: "ORDER_UPDATE_FAILED", message: "Failed to update the order." });
@@ -60,27 +91,6 @@ const controllerFactory = (db) => {
     }
   };
 
-  // Подтверждение заказа
-  const confirmOrder = async (req, res) => {
-    try {
-      var prop = req.body.prop;
-      var updatedOrder = {};
-      updatedOrder[prop] = req.body.status;
-
-      const order = await Order.findOneAndUpdate(
-        { _id: req.params._id }, 
-        updatedOrder,
-        { new: true }
-      ).exec();
-      if (!order) {
-        return res.status(404).send({ errorCode: "ORDER_CONFIRM_FAILED", message: "Failed to confirm the order." });
-      }
-      res.status(200).send(order);
-    } catch (err) {
-      res.status(500).send({ errorCode: "CONFIRM_ORDER_FAILED", message: "Error occurred while confirming the order.", error: err });
-    }
-  };
-
   // Изменение статуса оплаты
   const changePaymentStatus = async (req, res) => {
     try {
@@ -115,8 +125,7 @@ const controllerFactory = (db) => {
     create,
     read,
     getOrder,
-    updateOrder,
-    confirmOrder,
+    update,
     changePaymentStatus,
     deleteOrder
   };

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

@@ -1,26 +1,56 @@
 module.exports = (db) => {
   
   const OrderSchema = new db.mongoose.Schema({
-    items: { type: Array },
-    status: { type: Boolean },
-    comment: { type: String, trim: true },
+    owner: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'User', 
+    },
     user: {
       _id: { type: Boolean },
       name: { type: String, trim: true },
-      phone: { type: String, trim: true },
+      phone: { type: Object, trim: true },
       messenger: {
         type: { type: String, trim: true },
         value: { type: String, trim: true }
       }
     },
+    organization: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'Organization',
+    },
+    positions: { 
+      type: Array 
+    },
+    status: { 
+      type: String 
+    },
+    comment: { 
+      type: String, 
+      trim: true 
+    },
     payment: {
-      type: { type: String, trim: true },
-      status: { type: String, trim: true }
+      type: { 
+        type: String, 
+        trim: true 
+      },
+      status: { 
+        type: String, 
+        trim: true 
+      }
     },
     delivery: {
-      type: { type: String, trim: true },
-      address: { type: String, trim: true },
-      status: { type: String, trim: true }
+      type: { 
+        type: String,
+         trim: true 
+       },
+      address: { 
+        type: String, 
+        trim: true 
+      },
+      status: { 
+        type: String,
+        trim: true 
+      }
     }
   }, {
     timestamps: { 

package/src/modules/orders/router/orders.router.js

@@ -11,8 +11,29 @@ const orders = [
       }
     },
     children: [{
-      path: '',
-      name: 'Order',
+      path: 'form',
+      name: 'Form Order',
+      meta: {
+        title: {
+          en: 'Order',
+          ru: 'Заказ'
+        }
+      },
+      component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/FormOrder.vue')
+    },{
+      path: ':order',
+      name: 'Order Status',
+      meta: {
+        title: {
+          en: 'Order',
+          ru: 'Заказ'
+        }
+      },
+      component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/Order.vue')
+    },
+    {
+      path: ':order/edit',
+      name: 'AdminOrderEdit',
       meta: {
         title: {
           en: 'Order',

package/src/modules/orders/routes/orders.routes.js

@@ -20,6 +20,11 @@ module.exports = function(app, db) {
   app.post(
     "/api/orders/create",
     controller.create
+  );
+    // Get order
+  app.get(
+    "/api/orders/:_id",
+    controller.getOrder
   );
     // Get orders
   app.get(
@@ -28,28 +33,15 @@ module.exports = function(app, db) {
   );
   app.post(
     "/api/orders/update",
-    controller.updateOrder
+    controller.update
   );
-    // Get orders
+    // Update order
   app.post(
-    "/api/orders/delete",
-    controller.deleteOrder
-  );
-  // Get order
-  app.get(
     "/api/orders/:_id",
-    controller.getOrder
+    controller.update
   );
-  // Update order
+  // Get orders
   app.post(
-    "/api/orders/:_id",
-    controller.updateOrder
-  );
-   app.post(
-    "/api/orders/confirm/:_id",
-    controller.confirmOrder
-  );
-   app.post(
     "/api/orders/payment/:_id",
     controller.changePaymentStatus
   );
@@ -58,6 +50,11 @@ module.exports = function(app, db) {
     "/api/orders/:_id",
     controller.deleteOrder
   );
+  app.post(
+    "/api/orders/delete",
+    controller.deleteOrder
+  );
+
 
 };
 

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

@@ -11,7 +11,8 @@ const state = reactive({
   all: [], 
   current: {
     _id: '',
-    items: [],
+    organization: '',
+    positions: [],
     status: false,
     comment: '',
 
@@ -31,7 +32,7 @@ const state = reactive({
     },
 
     delivery: {
-      type: '',
+      type: null,
       address: '',
       status: '',
     }
@@ -39,15 +40,27 @@ const state = reactive({
 });
 
 const actions = {
-  async create(order) {
+  async create(order, organization) {
     try {
-      state.current.items = order
+      state.current.positions = order
+      state.current.organization = organization
 
       console.log(state.current)
+
       const response = await $axios.post('/api/orders/create', state.current);
 
-      console.log(response)
       state.all.push(response.data);
+      return Promise.resolve(response.data);
+    } catch (error) {
+      setError(error);
+    }
+  },
+
+   async fetchOrder(orderID) {
+    try {
+      const response = await $axios.get(`/api/orders/${orderID}`);
+      console.log(response)
+      state.current = response.data;
     } catch (error) {
       setError(error);
     }
@@ -63,10 +76,12 @@ const actions = {
     }
   },
 
-  async update(orderID, order) {
+  async update(order) {
     try {
-      const response = await $axios.post(`/api/orders/${orderID}`, order);
-      const index = state.all.findIndex(o => o._id === orderID);
+      const response = await $axios.post(`/api/orders/${order._id}`, order);
+
+      const index = state.all.findIndex(o => o._id === order._id);
+      
       if (index !== -1) {
         state.all[index] = response.data;
       }
@@ -120,5 +135,5 @@ watch(state, (newState, oldState) => {
 
 export {
   state,
-  actions
+  actions,
 }