@ozdao/prometheus-framework 0.2.67 → 0.2.69

package/src/modules/orders/components/pages/{EditOrder.vue → OrderCreateBackoffice.vue}

@@ -87,29 +87,73 @@
     </Block>
 
     <Block
-      title="Client"
+      title="Customer"
       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"
-      />
+      <div class="flex-nowrap flex">
+        <button class="w-100 bg-main pd-small flex-center flex uppercase t-medium">Select</button>
+        <button @click="openClientPopup()" class="w-100 bg-main pd-small flex-center flex uppercase t-medium">Add new</button>
+      </div>  
+
+    </Block>
 
-      <Field 
-        v-model:field="orders.state.current.comment"     
-        label="Comment"    
-        placeholder="Enter comment"  
-        class="bg-white pd-medium radius-small mn-b-thin"
+    <FormDelivery   
+      v-if="orders.state.current.status !== true"
+      :order="orders.state.current"  
+    />
+
+    <FormPayment  
+      v-if="orders.state.current.status !== true"
+      :order="orders.state.current"  
+    />
+
+   <!--  <Feed
+      :search="true"
+      :states="{
+        empty: {
+          title: 'No Products Found',
+          description: 'Currently, there are no such products available.'
+        }
+      }"
+      :store="{
+        read: (options) => products.actions.read(options),
+        state: null
+      }"
+      :options="{
+        organization: route.params._id
+      }"
+      v-slot="{ 
+        items 
+      }"
+      class="bg-grey h-min-20r h-max-20r o-scroll"
+    >
+      <CardOrderItem
+        v-for="(product, index) in items" :key="product._id"
+        :editable="false" 
+        :product="product" 
+        @click="() => { 
+          let p = { ...product };
+          p.quantity = 1;
+          globals.actions.add(orders.state.current.positions, p) 
+          closeProductsPopup();
+        }"
+        class="bg-white pd-thin radius-medium w-100 mn-b-thin"
       />
+    </Feed> -->
+
+    <Popup 
+      title="Добавить участника" 
+      @close-popup="closeClientPopup" 
+      :isPopupOpen="isOpenClientPopup"
+      class="bg-white w-min-30r w-max-30r radius-big pd-medium"
+    >
+      <h3 class="mn-b-small">Add New Client</h3>
       
-     <!--  <FormClientDetails
+      <FormClientDetails
         :order="orders.state.current"  
-        class="bg-white"
-      /> -->
-
-    </Block>
+        class="bg-grey"
+      />
+    </Popup>
 
     <Block
       class="mn-b-semi"
@@ -140,6 +184,9 @@
   import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
 
   import FormClientDetails from '@pf/src/modules/orders/components/sections/FormClientDetails.vue'
+  import FormDelivery from '@pf/src/modules/orders/components/sections/FormDelivery.vue'
+  import FormPayment from '@pf/src/modules/orders/components/sections/FormPayment.vue'
+
   // Import your store
   import * as auth from '@pf/src/modules/auth/store/auth';
   import * as globals from '@pf/src/modules/globals/store/globals';
@@ -167,6 +214,16 @@
     isOpenProductsPopup.value = false;
   }
 
+  const isOpenClientPopup = ref(false);
+
+  function openClientPopup() {
+    isOpenClientPopup.value = true;
+  }
+
+  function closeClientPopup() {
+    isOpenClientPopup.value = false;
+  }
+
   // Data
   let order = ref(null)
 

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

@@ -1,85 +1,189 @@
 <template>
-  <header class="mn-b-medium flex-v-center flex-nowrap flex">
-    <h2 class="mn-r-medium">Orders</h2>
-
-    <button 
-      @click="$router.push({
-        name: 'AdminOrderAdd'
-      })" 
-      class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
-        +
-    </button>
-  </header>
-
-  <Tab 
-    v-model:selected="tab"
-    :tabs="[
-      { name: 'All',        value: 'all' },
-      { name: 'New',        value: 'new' },
-      { name: 'Confirmed',  value: 'confirmed' }, 
-      { name: 'Finished',   value: 'finished' } 
-    ]"
-    class="mn-b-small o-hidden h5 radius-big bg-grey"
-  />
-
-  <section 
-    class="cols-3 gap-thin"
-  >
-
-    <router-link 
-       v-for="order in orders.state.all" 
-      :to="{ 
-        name: 'Order Edit', 
-        params: { 
-          order: order._id 
+  <div class="pd-thin"> 
+    <div 
+      class="mn-b-small bg-grey bg-grey radius-big"
+    >
+      <header class="br-b br-solid br-black-transp-10 pd-medium flex-v-center flex-nowrap flex">
+        <h1 class="mn-r-small">Orders</h1>
+
+
+
+        <router-link 
+          :to="{
+            name: 'AdminOrderAdd'
+          }" 
+          class="
+            radius-100 
+            i-big 
+            hover-scale-1 
+            transition-ease 
+            cursor-pointer 
+            t-white 
+            bg-second
+            flex-center
+            flex
+          "
+        >
+          +
+        </router-link>
+      </header>
+
+      <!-- <VueDatePicker 
+        range
+        class="mn-b-semi"
+      /> -->
+
+      <Tab 
+        v-model:selected="tab"
+        :tabs="[
+          { name: 'All',        value: 'all' },
+          { name: 'Created',   value: 'stock-in' },
+          { name: 'Confirmed',  value: 'stock-out' },
+          { name: 'Preparing',  value: 'stock-out' },
+          { name: 'Prepared',  value: 'stock-out' },
+          { name: 'In delivery',  value: 'stock-out' },
+          { name: 'Delivered',  value: 'stock-out' },
+          { name: 'Closed',  value: 'stock-out' }
+        ]"
+        class="w-100 t-nowrap o-scroll h5"
+      />
+    </div>
 
+    <Feed
+      :search="true"
+      :states="{
+        empty: {
+          title: 'No Orders Found',
+          description: 'Currently, there are no orders.'
         }
-      }" 
-       class="bg-grey radius-big"
+      }"
+      :store="{
+        read: (options) => orders.actions.read(options)
+      }"
+      :options="{
+        limit: 15,
+        owner: route.params._id,
+        ...(tab !== 'all' && { type: tab })
+      }"
+      v-slot="{ 
+        items 
+      }"
+      class="gap-thin cols-3"
     >
-      <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"
-      >
-        <!-- Номер клиента: +7{{order.phone}}<br> -->
-      </p>
+      <router-link 
+        v-for="order in items" 
+        :to="{ 
+          name: 'Order Edit', 
+          params: { 
+            order: order._id 
 
-      <p 
-        :class="{'new':order.status === 'Создан'}" 
-        class="mn-b-small"
+          }
+        }" 
+         class="bg-grey pos-relative pd-medium radius-big"
       >
+
+        <CardHeader 
+          :entity="order"
+          :entityType="'order'"
+          :user="auth.state.user"
+          :owner="order.creator" 
+          :creator="order.creator"
+          :date="order.createdAt"
+          class="mn-b-small"
+        />
+
+        <div class="mn-b-small pd-small bg-white radius-small flex-nowrap flex"> 
+          <div class="w-100">
+            <h3 class="mn-b-thin">{{order.customer.target.slice(0,8)}}</h3>
+            <p class="t-truncate">{{order.delivery.address}}</p> 
+          </div>
+
+          <div class=" w-100 t-right">
+            <h3 class="mn-b-thin">{{returnCurrency()}}{{orders.getters.getTotal(order.positions)}}</h3>
+            <p>#{{order._id.slice(0, 4) + '...' + order._id.slice(-4)}}</p> 
+          </div>
+        </div>
      
-      </p>
-      </div>
-     </router-link>
-  </section>
+        <div class="cols-1 mn-b-small gap-thin pd-small bg-white radius-small">
+          <!-- Always display the first two positions -->
+          <div
+            v-for="(position, index) in order.positions.slice(0, 2)"
+            :key="index"
+            class="w-100 flex"
+          >
+            <p class="mn-r-auto">{{ position.name }}</p>
+            <p class="t-right">
+              {{ position.quantity }} {{ position.type }}
+              x
+              {{ position.price }}
+              <span class="t-transp">{{ returnCurrency() }}</span>
+            </p>
+          </div>
+
+          <transition name="fade">
+            <!-- Display the rest of the positions if there are more than two and spoiler is true -->
+            <div v-if="spoiler && order.positions.length > 2">
+              <div
+                v-for="(position, index) in order.positions.slice(2)"
+                :key="index + 2"
+                class="w-100 flex"
+              >
+                <p class="mn-r-auto">{{ position.name }}</p>
+                <p class="t-right">
+                  {{ position.quantity }} {{ position.type }}
+                  x
+                  {{ position.price }}
+                  <span class="t-transp">{{ returnCurrency() }}</span>
+                </p>
+              </div>
+            </div>
+          </transition>
+
+          <!-- Toggle button for additional positions, visible only if there are more than two positions -->
+          <button
+            v-if="order.positions.length > 2"
+            @click.prevent="spoiler = !spoiler"
+            class="radius-big bg-grey-transp-50 pd-nano w-100 flex-center flex"
+          >
+            {{ !spoiler ? `+${order.positions.length - 2} more` : `Hide` }} 
+          </button>
+        </div>
+
+
+        <div class="pd-small bg-white radius-small gap-micro flex-v-center flex-nowrap flex"> 
+          <IconEvents class="i-semi t-transp" fill="rgb(var(--black)" />
+          <p class="t-medium mn-r-auto">16:40, 21.04</p>
+
+          <span 
+            class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin bg-main"
+          >
+            {{order.status}}
+          </span>
+
+          <span 
+            class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin t-white bg-red"
+          >
+            Unpaid
+          </span>
+        </div>
+      
+
+        <div v-if="order.comment" class="pos-relative radius-small bg-fifth-transp-10 mn-t-thin pd-small">
+          <p class="mn-b-thin t-transp uppercase p-small t-medium">Comment</p>
+          <p>{{order.comment}}</p>
+        </div>
+      </router-link>
+    </Feed>
+  </div>
 </template>
 
 <script setup>
   import { computed, onMounted, reactive, ref } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
 
+  import VueDatePicker from '@vuepic/vue-datepicker';
+  import '@vuepic/vue-datepicker/dist/main.css'
+
   import Tab      from '@pf/src/components/Tab/Tab.vue'
 
   import * as orders from '@pf/src/modules/orders/store/orders';
@@ -88,12 +192,19 @@
   import CardOrder from '@pf/src/modules/orders/components/blocks/CardOrder.vue'
   import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
 
+  import Feed from '@pf/src/components/Feed/Feed.vue'
+
+  import IconEvents  from '@pf/src/modules/icons/entities/IconEvents.vue'
+
   const route = useRoute();
   const router = useRouter();
+
+  const spoiler = ref(false)
+
   // Tab logic
   const tab = ref(route.query.tab ? route.query.tab : 'posts')
 
   onMounted(async () => {
-    await orders.actions.read();
+   
   });
 </script>

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

@@ -18,7 +18,7 @@
 		<transition  @before-enter="scrollTop" name="scale">	
 			<div v-if="order.state.current._id === ''" >	
 				
-				<section  v-for="order in user.orders" class="pd-big mn-b-regular order-client-card col"> 
+				<section  v-for="order in user.orders" class="pd-big mn-b-regular order-customer-card col"> 
 		      <p class="mn-b-regular flex-center flex-nowrap flex w-100">
 						<img v-if="order.status === 'Создан'" 			class="mn-r-small" src="@/assets/icons/status/created.svg"/>
 						<img v-if="order.status === 'Подтвержден'"	class="mn-r-small" src="@/assets/icons/status/confirmed.svg"/>
@@ -112,7 +112,7 @@ function orderProducts (positions) {
 </script>
 
 <style lang="scss" scoped>
-.order-client-card {
+.order-customer-card {
 	background: #FBFCFD;	
 }
 .order-images-wrapper {

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,