@ozdao/prometheus-framework 0.2.80 → 0.2.82

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

@@ -0,0 +1,67 @@
+<template>
+  <Block :title="title" class="mn-b-thin">
+    <Field 
+      v-model:field="customer.profile.name"   
+      label="Name"  
+      placeholder="Enter name"  
+      class="bg-white pd-small radius-small mn-b-thin"
+    />
+    <FieldPhone
+      v-model="customer.phone"  
+      @country="(country) => { customer.number = country }"
+      :inputOptions="{
+        placeholder: 'Enter phone number',
+        type: 'tel',
+      }"
+      :defaultCountry="'TH'"
+      :validCharactersOnly="true"
+      :dropdownOptions="{
+        showDialCodeInSelection: true,
+        showFlags: true,
+        showDialCodeInList: true
+      }" 
+      mode="national"
+      class="w-100 bg-white pd-small mn-b-thin radius-small" 
+    />
+    <div 
+      class="gap-thin flex-justify-between flex-nowrap flex"
+    >
+      <Select 
+        :select="messengerSelected"
+        :options="[
+          {name: 'Instagram', value: 'instagram'}, 
+          {name: 'Telegram', value: 'telegram'}, 
+          {name: 'WhatsApp', value: 'whatsapp'},
+        ]"
+        @update:select="(option) => messengerSelected = option"
+        placeholder="Messenger" 
+        size="small"
+        class="bg-white  pd-small radius-small"
+      />
+      <Field
+        v-model:field="customer.socials[messengerSelected]"     
+        label="@"  
+        placeholder="Enter username"
+        class="bg-white pd-small radius-small w-100"
+      />
+    </div>
+  </Block>
+</template>
+
+<script setup>
+import { ref } from "vue"
+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'
+
+let messengerSelected = ref('instagram')
+
+defineProps({
+  customer: Object,
+  title: {
+    type: String,
+    default: 'Personal Data'
+  }, 
+});
+</script>

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

@@ -1,8 +1,19 @@
 <template>
   <Block title="Delivery" class="mn-b-thin" :tooltip="'Delivery by mail takes 3-5 days.'">
 
+    <h4 class="mn-b-thin">Spot</h4>
     <div class="mn-b-small flex-nowrap flex">
 
+    </div>
+
+     <h4 class="mn-b-thin">Shipping Method</h4>
+    <div class="mn-b-small flex-nowrap flex">
+      <Radio 
+        v-model:radio="order.delivery.type"
+        label="Pickup"
+        value="pickup"
+        class="bg-white pd-medium radius-small w-100 mn-r-small"
+      />
       <Radio 
         v-model:radio="order.delivery.type"
         label="Courier"
@@ -11,14 +22,17 @@
       />
       <Radio 
         v-model:radio="order.delivery.type"
-        label="Post"
-        value="Post"
+        label="Mail"
+        value="mail"
         class="bg-white pd-medium radius-small w-100 mn-r-small"
       />
     </div>
+
+    
     
+    <h4 class="mn-b-thin">Address</h4>
     <Address
-      label="Address"    
+      label="Location"    
       :apiKey="GOOGLE_MAPS_API_KEY" 
       :address="order.delivery.address" 
       :location="order.delivery.location"  

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

@@ -15,9 +15,11 @@ const middlewareFactory = (db) => {
   const read = async (req, res) => {
     try {
       const applications = await Application.find({});
+      
       if (!applications) {
         return res.status(404).send({ message: "Applications not found." });
       }
+      
       res.status(200).send(applications);
     } catch (err) {
       res.status(500).send({ message: err });

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

@@ -21,76 +21,87 @@ function formatOrderMessage(order) {
   `;
 }
 
-const controllerFactory = (db) => {
-  const Order = db.order;
-  const Customer = db.customer;
+function initializeOrder(orderData, userId) {
+  orderData.status = 'created';
+  orderData.status_history = orderData.status_history || [];
+  orderData.status_history.push({
+    status: orderData.status,
+    changedBy: userId,
+    timestamp: new Date(),
+    comment: ''
+  });
+}
 
-    // Создание заказа
-  const create = async (req, res) => {
-    delete req.body._id;
+async function findOrCreateCustomer(Customer, customerInfo, orderOwner, visitor) {
+  let searchCriteria = {};
 
-    req.body.status = 'created';
-    req.body.status_history = req.body.status_history || [];
+  if (customerInfo.phone) {
+    searchCriteria.phone = customerInfo.phone;
+  }
 
-    // Добавление записи в историю изменений статусов
-    req.body.status_history.push({
-      status: req.body.status,
-      changedBy: req.userId, 
-      timestamp: new Date(),
-      comment: ''
-    });
+  if (customerInfo.email) {
+    searchCriteria.email = customerInfo.email;
+  }
 
-    console.log(req.body)
+  let customer = null;
 
-    try {
-      // Поиск или создание клиента
-      let searchCriteria = {};
+  // Проверяем, есть ли критерии для поиска
+  if (Object.keys(searchCriteria).length > 0) {
+    customer = await Customer.findOne({ $or: [searchCriteria] });
+  }
 
-      if (req.body.customer.phone) {
-        searchCriteria.phone = req.body.customer.phone;
-      }
+  if (!customer) {
+    // Создаем нового клиента с указанием владельца и создателя
+    const newCustomerData = {
+      ...customerInfo,
+      owner: orderOwner,
+      creator: customerInfo.creator || { type: 'Visitor', target: visitor || orderOwner.target },
+      identity: customerInfo.indentity ||  { type: 'Visitor', target: visitor || orderOwner.target }
+    };
+    customer = await Customer.create(newCustomerData);
+  }
 
-      if (req.body.customer.email) {
-        searchCriteria.email = req.body.customer.email;
-      }
+  return customer;
+}
 
-      let customer = await Customer.findOne({ $or: [searchCriteria] });
+ async function sendOrderMessage(orderData) {
+   try {  
+     const formattedMessage = formatOrderMessage(orderData);  
+     await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","), formattedMessage);  
+   } catch (err) {  
+     console.error(err);  
+   }
+ }
 
-      if (!customer) {
-        customer = await Customer.create(req.body.customer);
-      }
+const controllerFactory = (db) => {
+  const Order = db.order;
+  const Customer = db.customer;
 
-      // Присвоение идентификатора клиента заказу
-      req.body.customer = {
-        type: 'Customer',
-        target: customer._id
-      }
+  // Создание заказа
+  const create = async (req, res) => {
+    const orderData = req.body;
+    const userId = req.userId;
+    
+    initializeOrder(orderData, userId);
+
+    try {
+      if (!orderData.customer.target) {
+        let customer = await findOrCreateCustomer(Customer, orderData.customer, orderData.owner, orderData.visitor);
 
-      if (!req.body.creator?.target) {
-        req.body.creator = {
-          type: 'Customer',
-          target: customer._id
+        orderData.customer = { type: 'Customer', target: customer._id };
+
+        if (!orderData.creator?.target) {
+          orderData.creator = { type: 'Customer', target: customer._id };
         }
       }
 
-    } catch (err) {
-      console.log(err);
-      return res.status(500).send({ errorCode: "CLIENT_PROCESSING_FAILED", message: "Error occurred while processing the customer.", error: err });
-    }
+      await sendOrderMessage(orderData);
 
-    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)
-    }
+      const order = await Order.create(orderData);
 
-    try {
-      const order = await Order.create(req.body);
       res.status(201).send(order);
     } catch (err) {
-      console.log(err)
+      console.error(err);
       res.status(500).send({ errorCode: "CREATE_ORDER_FAILED", message: "Error occurred while creating the order.", error: err });
     }
   };
@@ -101,6 +112,20 @@ const controllerFactory = (db) => {
       ...queryProcessorGlobals.getBasicOptions(
         req.query
       ), 
+      // For customer
+      {
+        $lookup: {
+          from: "customers",
+          localField: "customer.target",
+          foreignField: "_id",
+          as: "customerTarget"
+        }
+      }, 
+      {
+        $addFields: {
+          "customer.target": { $arrayElemAt: ["$customerTarget", 0] }
+        }
+      },
       // For creator
       queryProcessorGlobals.getCreatorUserLookupStage(), 
       queryProcessorGlobals.getCreatorOrganizationLookupStage(),

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

@@ -1,29 +1,65 @@
 const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js');
+const applyProfileSchema = require('@pf/src/modules/globals/models/profile.schema.js');
+const applyCredentialsSchema = require('@pf/src/modules/globals/models/credentials.schema.js');
 
 module.exports = (db) => {
 
-  const CustomerSchema = new db.mongoose.Schema({ 
-    // target: {
-    //   type: {
-    //     type: String,
-    //     required: true
-    //   },
-    //   target: {
-    //     type: db.mongoose.Schema.Types.ObjectId,
-    //     refPath: 'target.type',
-    //     required: true,
-    //   },
-    // },
-    referralCode: { 
-      type: String 
+  const CustomerSchema = new db.mongoose.Schema({
+    identity: {
+      type: {
+        type: String,
+        enum: ['Visitor','User','Organization'],
+        required: true
+      },
+      target: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        refPath: 'target.type',
+      },
+    },
+    referral:  {
+      code: {
+        type: String
+      },
     }
-  },{
-    timestamps: { currentTime: () => Date.now() 
-  }
+  }, {
+    timestamps: {
+      currentTime: () => Date.now()
+    }
+  });
+
+  applyCredentialsSchema(CustomerSchema, db);
+  applyProfileSchema(CustomerSchema, db);
+  applyOwnershipSchema(CustomerSchema, db);
 
+  CustomerSchema.index({
+    owner: 1,
+    email: 1
+  }, {
+    unique: true,
+    partialFilterExpression: {
+      email: { $exists: true, $ne: "" }  
+    }
   });
 
-  // applyOwnershipSchema(CustomerSchema,db);
+  CustomerSchema.index({
+    owner: 1,
+    phone: 1
+  }, {
+    unique: true,
+    partialFilterExpression: {
+      phone: { $exists: true, $ne: "" } 
+    }
+  });
+
+  CustomerSchema.index({
+    owner: 1,
+    identity: 1
+  }, {
+    unique: true,
+    partialFilterExpression: {
+      identity: { $exists: true, $ne: "" }  
+    }
+  });
 
   const Customer = db.mongoose.model("Customer", CustomerSchema);
 

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

@@ -11,7 +11,7 @@ module.exports = (db) => {
       target: {
         type: db.mongoose.Schema.Types.ObjectId,
         refPath: 'customer.type',
-        required: true,
+        required: true
       },
     },
     positions: { 

package/src/modules/orders/orders.client.js

@@ -1,67 +1,67 @@
-// Importing Vue components from the components directory
-
+// Store
+import * as storeOrders from './store/orders.js';
+import * as storeShopcart from './store/shopcart.js';
+// Router
+import routerOrders from './router/orders.router.js';
+// Views
 import Orders from './components/pages/Orders.vue';
 import Order from './components/pages/Order.vue';
-import EditOrder from './components/pages/EditOrder.vue';
-
+import OrderCreate from './components/pages/OrderCreate.vue';
+import OrderCreateBackoffice from './components/pages/OrderCreateBackoffice.vue';
 // import Favorites from './components/pages/Favorites.vue';
-
 // Importing blocks components
 import CardOrderItem from './components/blocks/CardOrderItem.vue';
 import CardOrder from './components/blocks/CardOrder.vue';
-
 import StatusHistory from './components/blocks/StatusHistory.vue';
-
-import FormOrder from './components/pages/FormOrder.vue';
-
 // Importing sections components
-import FormClientDetails from './components/sections/FormClientDetails.vue';
+import FormCustomerDetails from './components/sections/FormCustomerDetails.vue';
 import FormPayment from './components/sections/FormPayment.vue';
 import FormDelivery from './components/sections/FormDelivery.vue';
-
 import EmptyState from './components/sections/EmptyState.vue';
 import AskToLogin from './components/sections/AskToLogin.vue';
 import Succes from './components/sections/Succes.vue';
-
 // Importing partials components
 import ShopCart from './components/partials/ShopCart.vue';
 
-// Importing Vuex store modules from the store directory
-import * as ordersStore from './store/orders.js';
-import * as shopcartStore from './store/shopcart.js';
-
-// Importing Vue Router routes from the router directory
-import ordersRoutes from './router/orders.router.js';
-
-// Exporting components, store modules, and routes
-export {
-  // Pages
-  FormOrder,
-  Order,
-  Orders,
-  EditOrder,
-  // Favorites,
-
-  // Blocks
-  CardOrderItem,
-  CardOrder,
-  StatusHistory,
-
-  // Sections
-  FormClientDetails,
-  AskToLogin,
-  FormDelivery,
-  EmptyState,
-  Succes,
-  FormPayment,
-
-  // Partials
-  ShopCart,
-
-  // Store
-  ordersStore,
-  shopcartStore,
-
-  // Router
-  ordersRoutes
-};
+// Пример функции инициализации для модуля заказов
+function initializeOrders(app, store, router) {
+  router.addRoute('Home', routerOrders);
+  store.addStore('orders', storeOrders);
+  store.addStore('shopcart', storeShopcart);
+}
+
+const ModuleOrder = {
+  initialize: initializeOrders,
+  views: {
+    store: {
+      storeOrders,
+      storeShopcart
+    },
+    router: {
+      routerOrders
+    },
+    components: {
+      // Pages
+      Orders,
+      Order,
+      OrderCreate,
+      OrderCreateBackoffice,
+      // Favorites,
+      // Blocks
+      CardOrderItem,
+      CardOrder,
+      StatusHistory,
+      // Sections
+      FormCustomerDetails,
+      AskToLogin,
+      FormDelivery,
+      EmptyState,
+      Succes,
+      FormPayment,
+      // Partials
+      ShopCart,
+    }
+  }
+}
+
+export default ModuleOrder

package/src/modules/orders/orders.server.js

@@ -1,15 +1,35 @@
-// Importing controllers from the controllers directory
-const ordersController = require('./controllers/orders.controller.js');
-// Importing routes from the routes directory
-const ordersRoutes = require('./routes/orders.routes.js');
-// Models
-const OrderModel = require('./models/order.model.js');
-const CustomerModel = require('./models/customer.model.js');
+const ModelOrder = require('./models/order.model.js');
+const ModelCustomer = require('./models/customer.model.js');
 
+const RoutesOrder = require('./routes/orders.routes.js');
+
+const FactoryOrder = require('./controllers/orders.controller.js');
+
+const CRUD = require('@pf/src/modules/globals/services/globals.crud');
+
+function initializeOrders(app, db, origins, publicPath) {
+  // Setup models in the database object
+  db.order = ModelOrder(db);
+  db.customer = ModelCustomer(db);
+
+  // Setup routes if the app object is provided
+  if (app) {
+    RoutesOrder(app,db,origins,publicPath)
+  }
+
+  new CRUD('/api/customers', app, db, db.customer)
+}
 // Exporting controllers, routes, and models
 module.exports = {
-  ordersController,
-  ordersRoutes,
-  UserModel,
-  CustomerModel
-};
+  initialize: initializeOrders,
+  models: {
+    ModelOrder,
+    ModelCustomer,
+  },
+  routes: {
+    RoutesOrder,
+  },
+  controllers: {
+    FactoryOrder
+  }
+};

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

@@ -1,51 +1,46 @@
 import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue'
 
-const orders = [
-  {
-    path: 'orders',
-    component: layoutEmpty,
+const orders = {
+  path: 'orders',
+  component: layoutEmpty,
+  meta: {
+    title: {
+      en: 'Marketplace',
+      ru: 'Маркетплейс'
+    }
+  },
+  children: [{
+    path: 'form',
+    name: 'Form Order',
     meta: {
       title: {
-        en: 'Marketplace',
-        ru: 'Маркетплейс'
+        en: 'Order',
+        ru: 'Заказ'
       }
     },
-    children: [{
-      path: 'form',
-      name: 'Form Order',
-      meta: {
-        title: {
-          en: 'Order',
-          ru: 'Заказ'
-        }
-      },
-      component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/OrderCreate.vue')
-    },{
-      path: ':order',
-      name: 'Order Status',
-      meta: {
-        title: {
-          en: 'Order',
-          ru: 'Заказ'
-        }
-      },
-      component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/Order.vue')
+    component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/OrderCreate.vue')
+  },{
+    path: ':order',
+    name: 'Order Status',
+    meta: {
+      title: {
+        en: 'Order',
+        ru: 'Заказ'
+      }
     },
-    {
-      path: ':order/edit',
-      name: 'Order Edit',
-      meta: {
-        title: {
-          en: 'Order',
-          ru: 'Заказ'
-        }
-      },
-      component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/Order.vue')
+    component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/Order.vue')
+  },
+  {
+    path: ':order/edit',
+    name: 'Order Edit',
+    meta: {
+      title: {
+        en: 'Order',
+        ru: 'Заказ'
+      }
     },
-    ]
-  }
-];
-
-
+    component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/Order.vue')
+  }]
+};
 
 export default orders;