@ozdao/martyrs 0.2.506 → 0.2.507

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

@@ -163,63 +163,11 @@
       /> 
     </Block>
 
-    <Block
+    <FormSelectCustomer
       v-if="tabOrderCreate === 'customer'"
-      title="Customer"
+      v-model:customer="orders.state.current.customer"
       class="mn-b-semi"
-      :actions="[{
-        label: '+',
-        function: () => openCustomerPopup()
-      }]"
-    >
-      <CardUser
-        v-if="orders.state.current.customer._id"
-        :user="orders.state.current.customer"
-        :photo="orders.state.current.customer.profile.photo"
-        :name="orders.state.current.customer.profile.name || orders.state.current.customer.phone || orders.state.current.customer.email"
-        @click="() => { 
-          orders.mutations.resetCustomer(orders.state.current.customer)
-        }"
-        class="bg-white pd-thin h-4r radius-medium w-100 mn-b-thin"
-      />
-      <Feed
-        v-else
-        :search="{
-          placeholder: 'Search customer...',
-          class: 'bg-white mn-b-thin'
-        }"
-        :states="{
-          empty: {
-            title: 'No Products Found',
-            description: 'Currently, there are no such products available.'
-          }
-        }"
-        :store="{
-          read: (options) => customers.read(options),
-          state: null
-        }"
-        :options="{
-          owner: route.params._id
-        }"
-        v-slot="{ 
-          items 
-        }"
-        class="bg-light h-max-20r o-scroll"
-      >
-        <CardUser
-          v-for="(user, index) in items" 
-          :key="user._id"
-          :user="user"
-          :photo="user.profile.photo"
-          :name="user.profile.name || user.phone || user.email"
-          @click="() => { 
-            orders.state.current.customer = user
-          }"
-          class="bg-white pd-thin h-4r radius-medium w-100 mn-b-thin"
-        />
-      </Feed>
-      
-    </Block>
+    />
 
     <FormDelivery  
       v-if="tabOrderCreate === 'delivery'" 
@@ -233,16 +181,6 @@
       :organization="orderOrganization[0]" 
     />
 
-    <Popup 
-      title="Add customer" 
-      @close-popup="closeCustomerPopup" 
-      :isPopupOpen="isOpenCustomerPopup"
-      :class="'bg-white w-min-30r w-max-30r radius-big pd-medium'"
-    >
-      <FormAddCustomer 
-        @callbackCustomer="closeCustomerPopup"
-      />
-    </Popup>
 
     <Block
       class="mn-b-semi"
@@ -275,7 +213,7 @@
 
   import BlockSearch from '@martyrs/src/modules/globals/views/components/blocks/BlockSearch.vue'
 
-  import FormAddCustomer from '@martyrs/src/modules/orders/components/sections/FormAddCustomer.vue'
+  import FormSelectCustomer from '@martyrs/src/modules/orders/components/forms/FormSelectCustomer.vue'
   import FormDelivery from '@martyrs/src/modules/orders/components/sections/FormDelivery.vue'
   import FormPayment from '@martyrs/src/modules/orders/components/sections/FormPayment.vue'
 
@@ -396,15 +334,6 @@
     }
   }
 
-  const isOpenCustomerPopup = ref(false);
-
-  function openCustomerPopup() {
-    isOpenCustomerPopup.value = true;
-  }
-
-  function closeCustomerPopup() {
-    isOpenCustomerPopup.value = false;
-  }
 
   // Функции управления позициями заказа
   function incrementOrderItemQuantity(productId, variantId) {

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

@@ -0,0 +1,91 @@
+<template>
+  <div class="gap-small cols-1">
+    <Block title="Application Information">
+      <div class="gap-small">
+        <div class="flex">
+          <strong class="mn-r-auto">Name:</strong>
+          <span>{{ application.contacts?.name || 'Not specified' }}</span>
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Email:</strong>
+          <span>{{ application.contacts?.email || 'Not specified' }}</span>
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Phone:</strong>
+          <span>{{ application.contacts?.phone || 'Not specified' }}</span>
+        </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'
+          }" />
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Type:</strong>
+          <span>{{ application.type || 'Unknown' }}</span>
+        </div>
+      </div>
+    </Block>
+
+    <Block title="Additional Information">
+      <div class="gap-small">
+        <div class="flex">
+          <strong class="mn-r-auto">Created:</strong>
+          <span>{{ formatDate(application.createdAt) }}</span>
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Updated:</strong>
+          <span>{{ formatDate(application.updatedAt) }}</span>
+        </div>
+        <div v-if="application.text">
+          <strong>Message:</strong>
+          <p class="mn-t-thin">{{ application.text }}</p>
+        </div>
+        <div v-if="application.chat">
+          <strong>Chat ID:</strong>
+          <p class="mn-t-thin">{{ application.chat }}</p>
+        </div>
+      </div>
+    </Block>
+
+    <div class="gap-thin flex mn-t-small">
+      <Button 
+        @click="$emit('edit')"
+        class="w-100 pd-small radius-big bg-main t-black uppercase t-medium"
+      >
+        Edit
+      </Button>
+      <Button 
+        @click="$emit('delete')"
+        class="w-100 pd-small radius-big bg-danger t-white uppercase t-medium"
+      >
+        Delete
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import Block from '@martyrs/src/components/Block/Block.vue';
+import StatusBadge from '@martyrs/src/components/Table/StatusBadge.vue';
+import Button from '@martyrs/src/components/Button/Button.vue';
+import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+
+const { formatDate } = useGlobalMixins();
+
+defineProps({
+  application: {
+    type: Object,
+    required: true
+  }
+});
+
+defineEmits(['edit', 'delete']);
+</script>
+
+<style scoped>
+.bg-danger {
+  background-color: #ef4444;
+}
+</style>

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

@@ -0,0 +1,107 @@
+<template>
+  <div class="gap-small cols-1">
+    <Block title="Customer Information">
+      <div class="gap-small">
+        <div class="flex">
+          <strong class="mn-r-auto">Name:</strong>
+          <span>{{ customer.profile?.name || 'Not specified' }}</span>
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Email:</strong>
+          <span>{{ customer.email || 'Not specified' }}</span>
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Phone:</strong>
+          <span>{{ customer.phone || 'Not specified' }}</span>
+        </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'
+          }" />
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Source:</strong>
+          <span>{{ customer.source || 'Unknown' }}</span>
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Type:</strong>
+          <span>{{ customer.identity?.type || 'Visitor' }}</span>
+        </div>
+      </div>
+    </Block>
+
+    <Block title="Additional Information">
+      <div class="gap-small">
+        <div v-if="customer.referral?.code" class="flex">
+          <strong class="mn-r-auto">Referral Code:</strong>
+          <span>{{ customer.referral.code }}</span>
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Created:</strong>
+          <span>{{ formatDate(customer.createdAt) }}</span>
+        </div>
+        <div class="flex">
+          <strong class="mn-r-auto">Last Activity:</strong>
+          <span>{{ formatDate(customer.lastActivity || customer.updatedAt) }}</span>
+        </div>
+        <div v-if="customer.tags && customer.tags.length > 0">
+          <strong>Tags:</strong>
+          <div class="flex flex-wrap gap-nano mn-t-thin">
+            <span 
+              v-for="tag in customer.tags" 
+              :key="tag"
+              class="bg-light pd-nano radius-small t-small"
+            >
+              {{ tag }}
+            </span>
+          </div>
+        </div>
+        <div v-if="customer.notes">
+          <strong>Notes:</strong>
+          <p class="mn-t-thin">{{ customer.notes }}</p>
+        </div>
+      </div>
+    </Block>
+
+    <div class="gap-thin flex mn-t-small">
+      <Button 
+        @click="$emit('edit')"
+        class="w-100 pd-small radius-big bg-main t-black uppercase t-medium"
+      >
+        Edit
+      </Button>
+      <Button 
+        @click="$emit('delete')"
+        class="w-100 pd-small radius-big bg-danger t-white uppercase t-medium"
+      >
+        Delete
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import Block from '@martyrs/src/components/Block/Block.vue';
+import StatusBadge from '@martyrs/src/components/Table/StatusBadge.vue';
+import Button from '@martyrs/src/components/Button/Button.vue';
+import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+
+const { formatDate } = useGlobalMixins();
+
+defineProps({
+  customer: {
+    type: Object,
+    required: true
+  }
+});
+
+defineEmits(['edit', 'delete']);
+</script>
+
+<style scoped>
+.bg-danger {
+  background-color: #ef4444;
+}
+</style>

package/src/modules/orders/locales/en.js

@@ -0,0 +1,35 @@
+// @martyrs/src/modules/orders/locales/en.js
+export default {
+  orders: {
+    newsletter: {
+      placeholder: 'Enter your email',
+      action: 'Subscribe',
+      success: {
+        title: 'Successfully Subscribed!',
+        subtitle: 'Thank you for subscribing. Follow us on social media:'
+      },
+      socials: [
+        {
+          name: 'telegram',
+          icon: 'telegram',
+          url: 'https://t.me/ozdao'
+        },
+        {
+          name: 'twitter',
+          icon: 'twitter',
+          url: 'https://twitter.com/ozdao'
+        },
+        {
+          name: 'instagram',
+          icon: 'instagram',
+          url: 'https://instagram.com/ozdao'
+        },
+        {
+          name: 'youtube',
+          icon: 'youtube',
+          url: 'https://youtube.com/@ozdao'
+        }
+      ]
+    }
+  }
+};

package/src/modules/orders/locales/index.js

@@ -0,0 +1,7 @@
+import en from './en.js';
+import ru from './ru.js';
+
+export default {
+  en,
+  ru
+};

package/src/modules/orders/locales/ru.js

@@ -0,0 +1,35 @@
+// @martyrs/src/modules/orders/locales/ru.js
+export default {
+  orders: {
+    newsletter: {
+      placeholder: 'Введите ваш email',
+      action: 'Подписаться',
+      success: {
+        title: 'Успешно подписались!',
+        subtitle: 'Спасибо за подписку. Подписывайтесь на наши социальные сети:'
+      },
+      socials: [
+        {
+          name: 'telegram',
+          icon: 'telegram',
+          url: 'https://t.me/ozdao'
+        },
+        {
+          name: 'twitter',
+          icon: 'twitter',
+          url: 'https://twitter.com/ozdao'
+        },
+        {
+          name: 'instagram',
+          icon: 'instagram',
+          url: 'https://instagram.com/ozdao'
+        },
+        {
+          name: 'youtube',
+          icon: 'youtube',
+          url: 'https://youtube.com/@ozdao'
+        }
+      ]
+    }
+  }
+};

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

@@ -0,0 +1,189 @@
+import Validator from '@martyrs/src/modules/globals/controllers/classes/globals.validator.js';
+import Verifier from '@martyrs/src/modules/globals/controllers/classes/globals.verifier.js';
+
+export default (function (db) {
+
+  // Верификатор для создания
+  const createVerifier = new Verifier({
+    'contacts.name': {
+      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')
+    },
+    type: {
+      rule: 'optional',
+      default: 'newsletter',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['newsletter', 'support', 'inquiry', 'feedback', 'other'])
+    },
+    text: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(2000, 'Text must not exceed 2000 characters')
+    },
+    chat: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(255, 'Chat ID must not exceed 255 characters')
+    },
+    status: {
+      rule: 'optional',
+      default: 'created',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['created', 'in_progress', 'completed', 'cancelled'])
+    },
+    owner: {
+      rule: 'optional',
+      validator: Validator.schema().object({
+        type: Validator.schema().string().oneOf(['user', 'organization', 'User', 'Organization']),
+        target: Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
+      })
+    }
+  });
+
+  // Верификатор для обновления
+  const updateVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Application ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid ID format')
+    },
+    'contacts.name': {
+      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')
+    },
+    type: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['newsletter', 'support', 'inquiry', 'feedback', 'other'])
+    },
+    text: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(2000, 'Text must not exceed 2000 characters')
+    },
+    chat: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(255, 'Chat ID must not exceed 255 characters')
+    },
+    status: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['created', 'in_progress', 'completed', 'cancelled'])
+    }
+  });
+
+  // Верификатор для чтения
+  const readVerifier = new Verifier({
+    _id: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/)
+    },
+    owner: {
+      rule: 'optional',
+      validator: Validator.schema().string()
+    },
+    status: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['created', 'in_progress', 'completed', 'cancelled'])
+    },
+    type: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['newsletter', 'support', 'inquiry', 'feedback', 'other'])
+    },
+    skip: {
+      rule: 'optional',
+      default: 0,
+      validator: Validator.schema()
+        .integer()
+        .min(0)
+    },
+    limit: {
+      rule: 'optional',
+      default: 20,
+      validator: Validator.schema()
+        .integer()
+        .min(1)
+        .max(100)
+    },
+    sortParam: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['contacts.name', 'contacts.email', 'type', 'status', 'createdAt', 'updatedAt'])
+    },
+    sortOrder: {
+      rule: 'optional',
+      default: 'desc',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['asc', 'desc'])
+    }
+  });
+
+  // Верификатор для удаления
+  const deleteVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Application ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/)
+    }
+  });
+
+  return {
+    createVerifier,
+    readVerifier,
+    updateVerifier,
+    deleteVerifier
+  };
+});