@ozdao/prometheus-framework 0.2.68 → 0.2.70

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

@@ -1,51 +1,49 @@
 <template>
   <Block title="Personal Data" class="mn-b-thin">
     <Field 
-      v-model:field="order.client.name"     
+      v-model:field="order.customer.name"     
       label="Name*"    
       placeholder="Enter your name"  
       class="bg-white pd-medium radius-small mn-b-thin"
     />
-    
-    <FieldPhone
-      v-model="order.client.phone"  
-      @country="(country) => { order.client.number = country }"
-      :inputOptions="{
-        placeholder: 'Enter contact phone number',
-        type: 'tel',
-      }"
-      :defaultCountry="'TH'"
-      :validCharactersOnly="true"
-      :dropdownOptions="{
-        showDialCodeInSelection: true,
-        showFlags: true,
-        showDialCodeInList: true
-      }" 
-      mode="national"
-      class="bg-white pd-small radius-small mn-b-thin" 
-    />
-
-    <p class="mn-b-small">
-     Prefer to chat instead of calling? Just drop your messenger info here:
-    </p>
 
     <div class="flex-nowrap flex">
+
       <Select 
         :options="[
+          {name: 'Phone',           value: 'phone'}, 
           {name: 'Telegram',        value: 'telegram'}, 
           {name: 'WhatsApp',        value: 'whatsapp'},
           {name: 'Line',            value: 'line'}, 
         ]"
-        @update:select="(option) => order.client.messenger.type = option.value"
+        @update:select="(option) => order.customer.messenger.type = option.value"
         placeholder="Messenger" 
         size="small"
         class="bg-white pd-medium radius-small mn-r-small"
       />
 
-      <Field 
-        v-model:field="order.client.messenger.value"     
+     <!--  <Field 
+        v-model:field="order.customer.messenger.value"     
         placeholder="Enter your contact here"  
         class="bg-white pd-medium radius-small w-100"
+      /> -->
+
+      <FieldPhone
+        v-model="order.customer.phone"  
+        @country="(country) => { order.customer.number = country }"
+        :inputOptions="{
+          placeholder: 'Enter contact phone number',
+          type: 'tel',
+        }"
+        :defaultCountry="'TH'"
+        :validCharactersOnly="true"
+        :dropdownOptions="{
+          showDialCodeInSelection: true,
+          showFlags: true,
+          showDialCodeInList: true
+        }" 
+        mode="national"
+        class="bg-white pd-small radius-small mn-b-thin" 
       />
     </div>
   </Block>

package/src/modules/{applications → orders}/components/sections/SubscribeNewsletter.vue

@@ -38,7 +38,7 @@ import { ref } from 'vue'
 import FieldBig from "@pf/src/components/FieldBig/FieldBig.vue";
 
 import * as globals from '@pf/src/modules/globals/store/globals.js';
-import * as applications from '@pf/src/modules/applications/store/applications.js';
+import * as applications from '@pf/src/modules/orders/store/applications.js';
 
 import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
 

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

@@ -9,19 +9,21 @@ function formatPositions(positions) {
 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'}
+    👤 Customer: ${order.customer?.name} (${order.customer?.phone?.number ? order.customer?.phone?.number : 'No phone'})
+    💬 Messenger: ${order.customer?.messenger ? order.customer?.messenger?.type + ' ' + order.customer?.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}
+    💳 Payment: ${order.payment?.type}
+    🚚 Delivery: ${order.delivery?.type} to ${order.delivery?.address}
     📌 Status: ${order.status}
+    🧑 Agent: ${order.referralCode}
   `;
 }
 
 const controllerFactory = (db) => {
   const Order = db.order;
+  const Customer = db.customer;
 
     // Создание заказа
   const create = async (req, res) => {
@@ -38,8 +40,46 @@ const controllerFactory = (db) => {
       comment: ''
     });
 
+    console.log(req.body)
+
     try {
-      // const formattedMessage = formatOrderMessage(req.body);
+      // Поиск или создание клиента
+      let searchCriteria = {};
+
+      if (req.body.customer.phone) {
+        searchCriteria.phone = req.body.customer.phone;
+      }
+
+      if (req.body.customer.email) {
+        searchCriteria.email = req.body.customer.email;
+      }
+
+      let customer = await Customer.findOne({ $or: [searchCriteria] });
+
+      if (!customer) {
+        customer = await Customer.create(req.body.customer);
+      }
+
+      // Присвоение идентификатора клиента заказу
+      req.body.customer = {
+        type: 'Customer',
+        target: customer._id
+      }
+
+      if (!req.body.creator?.target) {
+        req.body.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 });
+    }
+
+    try {
+      const formattedMessage = formatOrderMessage(req.body);
       console.log(formattedMessage)
       const messageSent = await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","),formattedMessage)
     } catch (err) {  
@@ -56,8 +96,6 @@ const controllerFactory = (db) => {
   };
 
   const read = async (req, res) => {
-
-    let stages = [];
     
     stages = [
       ...queryProcessorGlobals.getBasicOptions(
@@ -66,6 +104,7 @@ const controllerFactory = (db) => {
       // For creator
       queryProcessorGlobals.getCreatorUserLookupStage(), 
       queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+      queryProcessorGlobals.getCreatorCustomerLookupStage(),
       // For owner
       queryProcessorGlobals.getOwnerUserLookupStage(),
       queryProcessorGlobals.getOwnerOrganizationLookupStage(),

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

@@ -0,0 +1,31 @@
+const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.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 
+    }
+  },{
+    timestamps: { currentTime: () => Date.now() 
+  }
+
+  });
+
+  // applyOwnershipSchema(CustomerSchema,db);
+
+  const Customer = db.mongoose.model("Customer", CustomerSchema);
+
+  return Customer;
+}

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

@@ -3,31 +3,26 @@ const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.s
 module.exports = (db) => {
     
   const OrderSchema = new db.mongoose.Schema({
-   client: {
-      type: { 
+    customer: {
+      type: {
         type: String,
-        trim: true 
+        required: true
       },
       target: {
         type: db.mongoose.Schema.Types.ObjectId,
-        refPath: 'client.type',
+        refPath: 'customer.type',
+        required: true,
       },
-      table: { type: String, trim: true },
-      name: { type: String, trim: true },
-      phone: { type: Object, trim: true },
-      email: { type: String, trim: true },
-      messenger: {
-        type: { type: String, trim: true },
-        value: { type: String, trim: true }
-      }
     },
     positions: { 
       type: Array 
     },
+    referralCode: { 
+      type: String 
+    },
     status: { 
       type: String 
     },
-
     status_history: [{
       status: { 
         type: String, 

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

@@ -0,0 +1,67 @@
+// Importing Vue components from the components directory
+
+import Orders from './components/pages/Orders.vue';
+import Order from './components/pages/Order.vue';
+import EditOrder from './components/pages/EditOrder.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 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
+};

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

@@ -0,0 +1,15 @@
+// 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');
+
+// Exporting controllers, routes, and models
+module.exports = {
+  ordersController,
+  ordersRoutes,
+  UserModel,
+  CustomerModel
+};

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

@@ -19,7 +19,7 @@ const orders = [
           ru: 'Заказ'
         }
       },
-      component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/FormOrder.vue')
+      component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/OrderCreate.vue')
     },{
       path: ':order',
       name: 'Order Status',

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

@@ -22,11 +22,11 @@ const state = reactive({
     },
     
     creator: {
-      type: 'client',
+      type: 'customer',
       target: null,
     },
 
-    client: {
+    customer: {
       name: null,
       phone: null,
       messenger: {
@@ -122,6 +122,20 @@ const actions = {
   },
 }
 
+// const getters = {
+//   getTotal(positions) {
+//     
+//   }
+// }
+
+const getters = {
+  getTotal(positions) {
+    return positions.reduce((total, product) => { 
+      return total + product.price * product.quantity;
+    }, 0)
+  },
+}
+
 function set(eventData, property) { 
   state[property] = eventData
 }
@@ -137,4 +151,5 @@ watch(state, (newState, oldState) => {
 export {
   state,
   actions,
+  getters
 }

package/src/modules/users/components/pages/Profile.vue

@@ -15,11 +15,14 @@
 			_id="dash" 
 			class="pd-b-extra pd-thin w-100"
 		>
-			<ProfileCompletion 
+			<Completion 
 				v-if="route.params._id === auth.state.user._id && show" 
 		    :user="auth.state.user._id"
 		    :target="users.state.current"
 		    :cta="true" 
+		    text_cta="Fill Profile"
+		    text="Profile completed at"
+		    class="mn-b-medium"
 			/>
 
 			<section 
@@ -157,7 +160,7 @@
 			<Menu class="mn-b-regular bg-grey">
 
 			  <MenuItem @click="router.push({name: 'User Events', params: {_id: route.params._id}})" class="cursor-pointer">
-			    <IconEvents class="i-semi" :icon="true"/> 
+			    <IconEvents class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 			    <span>Events</span>
 			  </MenuItem> 
 
@@ -237,6 +240,7 @@
 import Field         from '@pf/src/components/Field/Field.vue'
 import Button        from '@pf/src/components/Button/Button.vue'
 import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
+import Completion from '@pf/src/components/Completion/Completion.vue'
 // Mobile Module
 import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
 import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
@@ -247,8 +251,6 @@ import FormReport from '@pf/src/modules/reports/components/sections/FormReport.v
 // Community Module 
 import Activity from '@pf/src/modules/community/components/blocks/Activity.vue'; 
 import Socials from '@pf/src/modules/organizations/components/blocks/Socials.vue'
-// Users Module
-import ProfileCompletion from '@pf/src/modules/users/components/sections/ProfileCompletion.vue'
 // Icons Module
 import IconEvents from '@pf/src/modules/icons/entities/IconEvents.vue'
 import IconGroups from '@pf/src/modules/icons/entities/IconGroups.vue'

package/src/modules/users/components/sections/ProfileCompletion.vue

@@ -1,19 +1,31 @@
 <template>
   <section class="w-100 mn-b-semi radius-medium pd-medium bg-main t-black">
-    <h3>
-      Profile completed at {{ completionPercentage }}%
-    </h3>
-
-    <router-link
-      v-if="cta"
-      :to="{
-        name: 'User Edit Profile',
-        params: { _id: user }
-      }"
-      class="mn-t-regular t-black bg-white w-100 button"
-    >
-      Fill Profile
-    </router-link>
+    <div class="mn-b-thin flex-v-center flex-nowrap flex">    
+      <h4>
+        {{text}}
+      </h4>
+
+      <h4 class="mn-l-thin uppercase radius-big t-semi t-medium t-white bg-black w-max pd-thin">
+        {{ percentage || completionPercentage }}%
+      </h4>
+
+      <router-link
+        v-if="cta"
+        :to="{
+          name: 'User Edit Profile',
+          params: { _id: user }
+        }"
+        class="mn-l-auto uppercase radius-big t-semi t-medium t-white bg-black w-max pd-thin"
+      >
+        {{text_cta}}
+      </router-link>
+    </div> 
+
+    <div class=" w-100 h-2r pos-relative pd-nano bg-black radius-big">
+      <div :style="`width: ${completionPercentage}%`"class="h-100 bg-main mn-b-thin radius-big">
+      </div>
+    </div>
+   
   </section>
 </template>
 
@@ -23,7 +35,10 @@ import { ref, onMounted } from 'vue'
 const { user, cta, target} = defineProps({
   user: Object,
   target: Object,
-  cta: Boolean
+  cta: Boolean,
+  percentage: Number,
+  text: String,
+  text_cta: String,
 })
 
 const completionPercentage = ref(0)

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

@@ -67,8 +67,6 @@ const controllerFactory = (db) => {
     console.log(query)
     console.log(req.body)
 
-
-
     try {
       const users = await User.aggregate(query);
       if (!users || users.length === 0) {

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

@@ -1,16 +1,17 @@
-module.exports = (mongoose) => {
+module.exports = (db) => {
 
-  const UserSchema = new mongoose.Schema({ 
+  const UserSchema = new db.mongoose.Schema({ 
     username: String,
     
     phone: String,
     email: String,
+
     apple_id: String,
     password: String,
 
     status: {
       type: String,
-      enum: ['active','banned','removed'], 
+      enum: ['active','banned','removed','inactive'], 
       default: 'active',
       required: true,
     },
@@ -54,7 +55,7 @@ module.exports = (mongoose) => {
 
     roles: [
       {
-        type: mongoose.Schema.Types.ObjectId,
+        type: db.mongoose.Schema.Types.ObjectId,
         ref: "Role"
       }
     ]
@@ -65,7 +66,7 @@ module.exports = (mongoose) => {
 
   });
 
-  const User = mongoose.model("User", UserSchema);
+  const User = db.mongoose.model("User", UserSchema);
 
   return User;
 }

package/src/modules/users/users.server.js

@@ -4,6 +4,7 @@ const usersController = require('./controllers/users.controller.js');
 const usersRoutes = require('./routes/users.routes.js');
 // Models
 const UserModel = require('./models/user.model.js');
+const ClientModel = require('./models/client.model.js');
 
 // Exporting controllers, routes, and models
 module.exports = {

package/src/styles/base/borders.scss

@@ -1,5 +1,7 @@
 body { 
-	// Border Clasess
+
+
+// Border Clasess
 	.br-1px { border-width: 1px; }
 	.br-2px { border-width: 2px; }
 	/* Border style */
@@ -9,6 +11,8 @@ body {
 	.br-t { border-top-width: 1px; }
 	.br-r { border-right-width: 1px; }
 	.br-b { border-bottom-width: 1px; }
+	.br-b-2px { border-bottom-width: 2px; }
+	.br-b-3px { border-bottom-width: 3px; }
 	.br-l { border-left-width: 1px; }
 	/* Border colors */
 	.br-black 				{ border-color: rgba(var(--black), 	1.00); }
@@ -63,7 +67,6 @@ body {
 	.br-white-transp-90 	{ border-color: rgba(var(--white), 0.90); }
 	.br-white-transp-95 	{ border-color: rgba(var(--white), 0.95); }
 	.br-white-transp-100 	{ border-color: rgba(var(--white), 1.00); }
-
 	/* Social media brand borders */
 	.br-youtube 	{ border-color: rgba(var(--youtube), 1);; }
 	.br-telegram 	{ border-color: rgba(var(--telegram), 1);; }

package/src/styles/config.scss

@@ -52,8 +52,7 @@
         }
         // Генерация отрицательных классов с модификаторами
         .#{$class-name}-#{$modifier}-#{$value-key}-negative {
-          #{$css-property}-#{$css-modifier}: -$value;
-          // #{$css-property}-#{$css-modifier}: calc(#{$value} * -1);
+          #{$css-property}-#{$css-modifier}: calc(#{$value} * -1);
         }
       }
     }
@@ -67,7 +66,7 @@
 	////////////////////////////////////////
 	// 1.COLORS VARIABLES 
 	///////////////////////////////////////
-	--main: 	0,255,136;
+	--main: 	10,250,125;;
 	@include 	generate-vars-color('main');
 	--second:	34,102,255;
 	@include 	generate-vars-color('second');
@@ -78,7 +77,7 @@
 	--fifth:	255,216,10;
 	@include 	generate-vars-color('fifth');
 	// Black and white colors
-	--black:  10,10,10;
+	--black:  0,0,0;
 	@include 	generate-vars-color('black');
 	--dark:   36,36,36; 	
 	@include 	generate-vars-color('dark');

package/src/modules/applications/applications.client.js

@@ -1 +0,0 @@
-import SubscribeNewsletter from './components/sections/SubscribeNewsletter.vue';