@ozdao/martyrs 0.2.602 → 0.2.603

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

@@ -17,15 +17,15 @@
       <div class="gap-micro flex-nowrap flex">
         <div class="w-100 bg-white radius-small pd-small">
           <p class="mn-b-thin">Total</p>
-          <h3>{{totalApplications}}</h3>
+          <h3>{{ stats.total }}</h3>
         </div>
         <div class="w-100 bg-white radius-small pd-small">
           <p class="mn-b-thin">In Progress</p>
-          <h3>{{inProgressApplications}}</h3>
+          <h3>{{ stats.inProgress }}</h3>
         </div>
         <div class="w-100 bg-white radius-small pd-small">
           <p class="mn-b-thin">New This Month</p>
-          <h3>{{newApplicationsThisMonth}}</h3>
+          <h3>{{ stats.newThisMonth }}</h3>
         </div>
       </div>
     </Block>
@@ -97,7 +97,7 @@
 </template>
 
 <script setup>
-  import { computed, onMounted, ref } from 'vue';
+  import { onMounted, reactive, ref } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
 
   import Block from '@martyrs/src/components/Block/Block.vue';
@@ -110,9 +110,12 @@
   import ApplicationDetails from '@martyrs/src/modules/orders/components/sections/ApplicationDetails.vue'
   import applicationInitState from '@martyrs/src/modules/orders/store/models/application.js';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+  import $axios from '@martyrs/src/modules/core/views/utils/axios-instance.js';
+  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js'
 
   const route = useRoute();
   const router = useRouter();
+  const { formatDate } = useGlobalMixins();
 
   const statusFilter = ref('all')
 
@@ -124,22 +127,22 @@
   const isCreateMode = ref(false)
   const currentApplications = ref([])
 
-  const totalApplications = computed(() => {
-    return applications.state.items?.length || 0
-  });
-
-  const inProgressApplications = computed(() => {
-    return applications.state.items?.filter(application => application.status === 'in_progress').length || 0
-  });
+  const stats = reactive({ total: 0, inProgress: 0, newThisMonth: 0 })
 
-  const newApplicationsThisMonth = computed(() => {
-    if (!applications.state.items) return 0;
-    const now = new Date();
-    const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
-    return applications.state.items.filter(application => 
-      new Date(application.createdAt) >= startOfMonth
-    ).length
-  });
+  const fetchStats = async () => {
+    try {
+      const params = {}
+      if (route.meta.context === 'organization') {
+        params.organization = route.params._id
+      }
+      const { data } = await $axios.get('/api/applications/stats', { params })
+      stats.total = data.total || 0
+      stats.inProgress = data.inProgress || 0
+      stats.newThisMonth = data.newThisMonth || 0
+    } catch (err) {
+      console.error('Error fetching application stats:', err)
+    }
+  };
 
   // Popup methods
   const openCreatePopup = () => {
@@ -166,7 +169,7 @@
   };
 
   const enableEdit = () => {
-    formApplication.value = { ...selectedApplication.value };
+    formApplication.value = JSON.parse(JSON.stringify(selectedApplication.value));
     isCreateMode.value = false;
     showViewPopup.value = false;
     showFormPopup.value = true;
@@ -174,47 +177,44 @@
 
   const saveApplication = async () => {
     try {
-      // Remove empty fields but preserve required ownership structure
-      const cleanData = { ...formApplication.value };
-      if (!cleanData.contacts?.email) delete cleanData.contacts?.email;
-      if (!cleanData.contacts?.phone) delete cleanData.contacts?.phone;
-      if (!cleanData.contacts?.name) delete cleanData.contacts?.name;
-      if (!cleanData.text) delete cleanData.text;
-      if (!cleanData.chat) delete cleanData.chat;
-      
-      // Remove _id to let MongoDB auto-generate it (Mongoose bug when _id is null)
+      const data = JSON.parse(JSON.stringify(formApplication.value));
+
       if (isCreateMode.value) {
-        delete cleanData._id;
-      }
-      
-      // Set owner based on context
-      if (route.meta.context === 'organization') {
-        // В контексте организации - owner это организация
-        cleanData.owner = {
-          type: 'Organization',
-          target: route.params._id || cleanData.owner?.target
-        };
-      } else {
-        // В контексте бекофиса - owner это Platform
-        cleanData.owner = {
-          type: 'platform',
-          target: '000000000000000000000000' // заглушка для отдела платформы
+        delete data._id;
+        if (!data.text) delete data.text;
+        if (!data.chat) delete data.chat;
+
+        // Set owner based on context
+        if (route.meta.context === 'organization') {
+          data.owner = {
+            type: 'Organization',
+            target: route.params._id || data.owner?.target
+          };
+        } else {
+          data.owner = {
+            type: 'platform',
+            target: '000000000000000000000000'
+          };
+        }
+        data.creator = {
+          type: 'User',
+          target: auth.state.user._id
         };
-      }
-      
-      // Set creator (who created the application)
-      cleanData.creator = {
-        type: 'User',
-        target: auth.state.user._id || cleanData.creator?.target
-      };
-      
-      if (isCreateMode.value) {
-        const response = await applications.create(cleanData);
+
+        const response = await applications.create(data);
         applications.addItem(response, currentApplications.value);
       } else {
-        const response = await applications.update(cleanData);
+        // Только редактируемые поля — без owner/creator/__v/timestamps
+        const updateData = { _id: data._id };
+        if (data.contacts) updateData.contacts = data.contacts;
+        if (data.type) updateData.type = data.type;
+        if (data.text) updateData.text = data.text;
+        if (data.chat) updateData.chat = data.chat;
+        if (data.status) updateData.status = data.status;
+
+        const response = await applications.update(updateData);
         applications.updateItem(response, currentApplications.value);
-        selectedApplication.value = { ...response };
+        selectedApplication.value = JSON.parse(JSON.stringify(response));
       }
       closeFormPopup();
     } catch (error) {
@@ -235,6 +235,8 @@
   };
 
   onMounted(async () => {
-   
+    if (route.meta.context !== 'user') {
+      fetchStats()
+    }
   });
 </script>

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

@@ -31,7 +31,7 @@
     </Block>
 
     <Feed
-      v-model="currentCustomers"
+      v-model:items="currentCustomers"
       :search="true"
       :states="{
         empty: {
@@ -111,9 +111,11 @@
   import CustomerDetails from '@martyrs/src/modules/orders/components/sections/CustomerDetails.vue'
   import customerInitState from '@martyrs/src/modules/orders/store/models/customer.js';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js'
 
   const route = useRoute();
   const router = useRouter();
+  const { formatDate } = useGlobalMixins();
 
   const statusFilter = ref('all')
 
@@ -177,7 +179,7 @@
   };
 
   const enableEdit = () => {
-    formCustomer.value = { ...selectedCustomer.value };
+    formCustomer.value = JSON.parse(JSON.stringify(selectedCustomer.value));
     isCreateMode.value = false;
     showViewPopup.value = false;
     showFormPopup.value = true;
@@ -185,35 +187,46 @@
 
   const saveCustomer = async () => {
     try {
-      // Remove empty fields but preserve required ownership structure
-      const cleanData = { ...formCustomer.value };
-      if (!cleanData.email) delete cleanData.email;
-      if (!cleanData.phone) delete cleanData.phone;
-      if (!cleanData.notes) delete cleanData.notes;
-      if (!cleanData.referral?.code) {
-        if (cleanData.referral) delete cleanData.referral.code;
-      }
-      
-      // Always ensure owner and creator have proper structure
-      cleanData.owner = {
-        type: 'Organization',
-        target: route.params._id || cleanData.owner?.target
-      };
-      
-      cleanData.creator = {
-        type: 'User',
-        target: auth.state.user._id || cleanData.creator?.target
-      };
-      
-      console.log('Sending customer data:', cleanData);
-      
+      const data = JSON.parse(JSON.stringify(formCustomer.value));
+
       if (isCreateMode.value) {
-        const created = await customers.create(cleanData);
+        delete data._id;
+        if (!data.email) delete data.email;
+        if (!data.phone) delete data.phone;
+        if (!data.notes) delete data.notes;
+
+        // identity обязателен для создания
+        if (!data.identity?.type) {
+          data.identity = { type: 'Visitor' };
+        }
+
+        data.owner = {
+          type: 'Organization',
+          target: route.params._id || data.owner?.target
+        };
+        data.creator = {
+          type: 'User',
+          target: auth.state.user._id
+        };
+
+        const created = await customers.create(data);
         customers.addItem(created, currentCustomers.value);
       } else {
-        const updated = await customers.update(cleanData);
+        // Только редактируемые поля — без owner/creator/identity/__v/timestamps
+        const updateData = { _id: data._id };
+        if (data.email) updateData.email = data.email;
+        if (data.phone) updateData.phone = data.phone;
+        if (data.profile) updateData.profile = data.profile;
+        if (data.source) updateData.source = data.source;
+        if (data.referral) updateData.referral = data.referral;
+        if (data.tags) updateData.tags = data.tags;
+        if (data.notes) updateData.notes = data.notes;
+        if (data.status) updateData.status = data.status;
+        if (data.address) updateData.address = data.address;
+
+        const updated = await customers.update(updateData);
         customers.updateItem(updated, currentCustomers.value);
-        selectedCustomer.value = { ...updated };
+        selectedCustomer.value = JSON.parse(JSON.stringify(updated));
       }
       closeFormPopup();
     } catch (error) {

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

@@ -110,7 +110,7 @@
       </Button>
 
 		  <p class='mn-b-thin'>
-				I agree that placing the order places me under an obligation to make a payment in accordance with <a class="fw-semi font-second t-grey" href="/pages/terms-of-use" target="_blank">Terms of Use.</a>
+				I agree that placing the order places me under an obligation to make a payment in accordance with <a class="fw-semi font-second t-dark" href="/pages/terms-of-use" target="_blank">Terms of Use.</a>
 			</p>
 			<p >
 				

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

@@ -16,10 +16,7 @@
         </div>
         <div class="flex">
           <strong class="mn-r-auto">Status:</strong>
-          <StatusBadge :value="{
-            text: application.status,
-            color: application.status === 'completed' ? '#22c55e' : application.status === 'in_progress' ? '#f59e0b' : '#6b7280'
-          }" />
+          <StatusBadge :value="application.status" />
         </div>
         <div class="flex">
           <strong class="mn-r-auto">Type:</strong>

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

@@ -16,10 +16,7 @@
         </div>
         <div class="flex">
           <strong class="mn-r-auto">Status:</strong>
-          <StatusBadge :value="{
-            text: customer.status,
-            color: customer.status === 'active' ? '#22c55e' : customer.status === 'inactive' ? '#f59e0b' : '#ef4444'
-          }" />
+          <StatusBadge :value="customer.status" />
         </div>
         <div class="flex">
           <strong class="mn-r-auto">Source:</strong>

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

@@ -282,6 +282,7 @@ const controllerFactory = db => {
     console.log(req.query);
     let stages = [
       ...queryProcessorCore.getBasicOptions(req.query),
+      ...queryProcessorCore.getFilterDate(req.query.dateStart, req.query.dateEnd),
       ...queryProcessorCore.getSearchOptions(req.query.search, {
         fields: ['positions.name'],
       }),
@@ -587,12 +588,124 @@ const controllerFactory = db => {
       });
     }
   };
+  const getStats = async (req, res) => {
+    try {
+      const now = new Date();
+      const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+      const thirtyDaysAgo = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000);
+
+      let matchStage = {};
+      if (req.query.organization) {
+        matchStage['owner.target'] = new db.mongoose.Types.ObjectId(req.query.organization);
+      }
+
+      const startDate = req.query.startDate ? new Date(req.query.startDate) : null;
+      const endDate = req.query.endDate ? new Date(req.query.endDate) : null;
+      if (startDate && endDate) {
+        matchStage.createdAt = { $gte: startDate, $lte: endDate };
+      }
+
+      const [totalStats, monthlyStats, dailyRevenue, statusBreakdown, popularProducts, recentOrders] = await Promise.all([
+        // Total orders & revenue (all time or filtered by date range)
+        Order.aggregate([
+          { $match: matchStage },
+          { $group: {
+            _id: null,
+            totalRevenue: { $sum: { $reduce: {
+              input: '$positions',
+              initialValue: 0,
+              in: { $add: ['$$value', { $multiply: [{ $ifNull: ['$$this.price', 0] }, { $ifNull: ['$$this.quantity', 1] }] }] }
+            }}},
+            orderCount: { $sum: 1 }
+          }}
+        ]),
+
+        // Monthly revenue & order count
+        Order.aggregate([
+          { $match: (startDate && endDate) ? matchStage : { ...matchStage, createdAt: { $gte: startOfMonth } } },
+          { $group: {
+            _id: null,
+            totalRevenue: { $sum: { $reduce: {
+              input: '$positions',
+              initialValue: 0,
+              in: { $add: ['$$value', { $multiply: [{ $ifNull: ['$$this.price', 0] }, { $ifNull: ['$$this.quantity', 1] }] }] }
+            }}},
+            orderCount: { $sum: 1 }
+          }}
+        ]),
+
+        // Revenue by day (all time, grouped)
+        Order.aggregate([
+          { $match: matchStage },
+          { $group: {
+            _id: { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
+            revenue: { $sum: { $reduce: {
+              input: '$positions',
+              initialValue: 0,
+              in: { $add: ['$$value', { $multiply: [{ $ifNull: ['$$this.price', 0] }, { $ifNull: ['$$this.quantity', 1] }] }] }
+            }}},
+            count: { $sum: 1 }
+          }},
+          { $sort: { _id: 1 } }
+        ]),
+
+        // By-status breakdown
+        Order.aggregate([
+          { $match: matchStage },
+          { $group: { _id: '$status', count: { $sum: 1 } } }
+        ]),
+
+        // Popular products (top 10 by quantity sold)
+        Order.aggregate([
+          { $match: matchStage },
+          { $unwind: '$positions' },
+          { $group: {
+            _id: '$positions._id',
+            name: { $first: '$positions.name' },
+            image: { $first: { $arrayElemAt: ['$positions.images', 0] } },
+            totalQuantity: { $sum: { $ifNull: ['$positions.quantity', 1] } },
+            totalRevenue: { $sum: { $multiply: [{ $ifNull: ['$positions.price', 0] }, { $ifNull: ['$positions.quantity', 1] }] } }
+          }},
+          { $sort: { totalQuantity: -1 } },
+          { $limit: 10 }
+        ]),
+
+        // Recent orders (last 5)
+        Order.aggregate([
+          { $match: matchStage },
+          { $sort: { createdAt: -1 } },
+          { $limit: 5 },
+          { $lookup: { from: 'customers', localField: 'customer.target', foreignField: '_id', as: 'customerData' } },
+          { $addFields: { 'customer.target': { $arrayElemAt: ['$customerData', 0] } } },
+          { $project: { customerData: 0 } }
+        ])
+      ]);
+
+      res.status(200).send({
+        total: totalStats[0] || { totalRevenue: 0, orderCount: 0 },
+        monthly: monthlyStats[0] || { totalRevenue: 0, orderCount: 0 },
+        dailyRevenue,
+        statusBreakdown,
+        popularProducts,
+        recentOrders
+      });
+    } catch (err) {
+      console.error(err);
+      res.status(500).send({
+        errorCode: 'GET_ORDER_STATS_FAILED',
+        message: 'Error occurred while fetching order stats.',
+        error: err.message,
+      });
+    }
+  };
+
   return {
     create,
     read,
     update,
     changePaymentStatus,
     deleteOrder,
+    getStats,
   };
 };
 export default controllerFactory;

package/src/modules/orders/middlewares/applications.verifier.js

@@ -5,25 +5,13 @@ export default (function (db) {
 
   // Верификатор для создания
   const createVerifier = new Verifier({
-    'contacts.name': {
+    contacts: {
       rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .min(1, 'Name must be at least 1 character')
-        .max(255, 'Name must not exceed 255 characters')
-    },
-    'contacts.email': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .email('Invalid email format')
-        .max(255, 'Email must not exceed 255 characters')
-    },
-    'contacts.phone': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .pattern(/^\+?[1-9]\d{1,14}$/, 'Invalid phone format')
+      validator: Validator.schema().object({
+        name: Validator.schema().string().min(1).max(255),
+        email: Validator.schema().string().email('Invalid email format').max(255),
+        phone: Validator.schema().string().pattern(/^\+?[1-9]\d{1,14}$/, 'Invalid phone format')
+      })
     },
     type: {
       rule: 'optional',
@@ -69,25 +57,13 @@ export default (function (db) {
         .required('Application ID is required')
         .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid ID format')
     },
-    'contacts.name': {
+    contacts: {
       rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .min(1, 'Name must be at least 1 character')
-        .max(255, 'Name must not exceed 255 characters')
-    },
-    'contacts.email': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .email('Invalid email format')
-        .max(255, 'Email must not exceed 255 characters')
-    },
-    'contacts.phone': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .pattern(/^\+?[1-9]\d{1,14}$/, 'Invalid phone format')
+      validator: Validator.schema().object({
+        name: Validator.schema().string().min(1).max(255),
+        email: Validator.schema().string().email('Invalid email format').max(255),
+        phone: Validator.schema().string().pattern(/^\+?[1-9]\d{1,14}$/, 'Invalid phone format')
+      })
     },
     type: {
       rule: 'optional',
@@ -186,4 +162,4 @@ export default (function (db) {
     updateVerifier,
     deleteVerifier
   };
-});
+});