@ozdao/martyrs 0.2.506 → 0.2.507

package/src/modules/orders/components/forms/FormSelectCustomer.vue

@@ -0,0 +1,172 @@
+<template>
+  <Block 
+    title="Customer"
+    class="pos-relative mn-b-thin"
+    :actions="[{
+      label: '+',
+      function: () => openCreatePopup()
+    }]"
+  >
+    <Card
+      v-if="customer?._id"
+      :photo="customer.profile?.photo"
+      :title="customer.profile?.name || customer.phone || customer.email || 'Unnamed Customer'"
+      :subtitle="customer.email || customer.phone"
+      :action="{
+        label: { is: IconCross },
+        method: clearCustomer
+      }"
+      class="bg-white h-2r pd-thin radius-medium w-100 flex flex-v-center gap-thin"
+    />
+    
+    <div v-else>
+      <BlockSearch 
+        @search="(event) => { searchUser = event }"
+        placeholder="Enter name, phone or email"
+        class="bg-white mn-b-thin"
+      />
+
+      <Feed
+        :states="{
+          empty: {
+            title: 'No Customer Found',
+            description: 'Currently, there are no such customer.'
+          }
+        }"
+        :store="customers"
+        :options="{
+          search: searchUser,
+          owner: route.params._id
+        }"
+        :showLoadMore="false"
+        v-slot="{ items }"
+        class="h-max-20r o-scroll"
+      >
+        <div
+          v-for="customerItem in items" 
+          :key="customerItem._id"
+          @click="selectCustomer(customerItem)"
+          class="bg-white pd-thin radius-medium w-100 mn-b-thin cursor-pointer"
+        >
+          <CardCustomer 
+            :customer="customerItem"
+            :formatDate="formatDate"
+          />
+        </div>
+      </Feed>
+    </div>
+  </Block>
+
+
+  <!-- Create Customer Popup -->
+  <Popup 
+    :isPopupOpen="showCreatePopup"
+    @close-popup="closeCreatePopup"
+    title="Create Customer"
+    align="center right"
+    class="bg-white h-min-100 w-max-50r pd-medium"
+  >
+    <FormCustomerDetails 
+      v-model:customer="newCustomer"
+      @save="saveNewCustomer"
+      @cancel="closeCreatePopup"
+      :create-mode="true"
+    />
+  </Popup>
+</template>
+
+<script setup>
+import { ref, computed } from "vue"
+import { useRoute } from 'vue-router'
+
+import Block from '@martyrs/src/components/Block/Block.vue'
+import Button from '@martyrs/src/components/Button/Button.vue'
+import Popup from '@martyrs/src/components/Popup/Popup.vue'
+import Feed from '@martyrs/src/components/Feed/Feed.vue'
+
+import BlockSearch from '@martyrs/src/modules/globals/views/components/blocks/BlockSearch.vue'
+import Card from '@martyrs/src/modules/globals/views/components/blocks/Card.vue'
+import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue'
+import CardCustomer from '@martyrs/src/modules/orders/components/blocks/CardCustomer.vue'
+import FormCustomerDetails from '@martyrs/src/modules/orders/components/forms/FormCustomerDetails.vue'
+
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+import customers from '@martyrs/src/modules/orders/store/customers.store';
+import customerInitState from "@martyrs/src/modules/orders/store/models/customer.js"
+import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+
+const { formatDate } = useGlobalMixins();
+
+// Props & Model
+const customer = defineModel('customer', {
+  type: Object,
+  default: null
+});
+
+// Router
+const route = useRoute()
+
+// Reactive data
+const searchUser = ref(null)
+const showCreatePopup = ref(false)
+const newCustomer = ref({ ...customerInitState })
+
+// Methods
+function selectCustomer(selectedCustomer) {
+  customer.value = selectedCustomer
+}
+
+function clearCustomer() {
+  customer.value = null
+}
+
+function openCreatePopup() {
+  newCustomer.value = { ...customerInitState }
+  if (route.params._id) {
+    newCustomer.value.owner = {
+      type: 'Organization',
+      target: route.params._id
+    };
+  }
+  newCustomer.value.creator = {
+    type: 'User',
+    target: auth.state.user._id
+  };
+  showCreatePopup.value = true
+}
+
+function closeCreatePopup() {
+  showCreatePopup.value = false
+  newCustomer.value = { ...customerInitState }
+}
+
+async function saveNewCustomer() {
+  try {
+    // Remove empty fields
+    const cleanData = { ...newCustomer.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;
+    }
+    
+    // Ensure ownership structure
+    cleanData.owner = {
+      type: 'Organization',
+      target: route.params._id
+    };
+    
+    cleanData.creator = {
+      type: 'User',
+      target: auth.state.user._id
+    };
+
+    const created = await customers.create(cleanData);
+    customer.value = created;
+    closeCreatePopup();
+  } catch (error) {
+    console.error('Error creating customer:', error);
+  }
+}
+</script>

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

@@ -0,0 +1,240 @@
+<template>
+  <div class="mobile:pd-thin pd-medium"> 
+    <SectionPageTitle
+      v-if="!MOBILE_APP"
+      title="Applications"
+      :actions="[
+        { method: () => openCreatePopup(), label: 'Create Application' }
+      ]"
+      class="mn-b-small"
+    />
+
+    <Block
+      v-if="route.meta.context !== 'user'"
+      title="Statistics"
+      class="mn-b-small"
+    >
+      <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>
+        </div>
+        <div class="w-100 bg-white radius-small pd-small">
+          <p class="mn-b-thin">In Progress</p>
+          <h3>{{inProgressApplications}}</h3>
+        </div>
+        <div class="w-100 bg-white radius-small pd-small">
+          <p class="mn-b-thin">New This Month</p>
+          <h3>{{newApplicationsThisMonth}}</h3>
+        </div>
+      </div>
+    </Block>
+    <Feed
+      v-model:items="currentApplications"
+      :search="true"
+      :states="{
+        empty: {
+          title: 'No Applications Found',
+          description: 'Currently, there are no applications.'
+        }
+      }"
+      :store="applications"
+      :options="{
+        limit: 15,
+        ...(route.meta.context === 'organization' && { owner: route.params._id }),
+        ...(statusFilter !== 'all' && { status: statusFilter })
+      }"
+      v-slot="{ 
+        items 
+      }"
+      class="gap-thin cols-3 mobile:cols-1"
+    >
+      <div 
+        v-for="application in items" 
+        :key="application._id"
+        @click="openViewPopup(application)"
+        class="cursor-pointer"
+      >
+        <CardApplication 
+          :application="application"
+          :formatDate="formatDate"
+        />
+      </div>
+    </Feed>
+
+    <!-- View Application Popup -->
+    <Popup 
+      :isPopupOpen="showViewPopup"
+      @close-popup="closeViewPopup"
+      title="Application Details"
+      align="center right"
+      class="bg-white h-min-100 w-max-50r pd-medium"
+    >
+      <ApplicationDetails
+        v-if="selectedApplication"
+        :application="selectedApplication"
+        @edit="enableEdit"
+        @delete="deleteApplication"
+      />
+    </Popup>
+
+    <!-- Create/Edit Application Popup -->
+    <Popup 
+      :isPopupOpen="showFormPopup"
+      @close-popup="closeFormPopup"
+      :title="isCreateMode ? 'Create Application' : 'Edit Application'"
+      align="center right"
+      class="bg-white h-min-100 w-max-50r pd-medium"
+    >
+      <FormApplicationDetails 
+        v-model:application="formApplication"
+        @save="saveApplication"
+        @cancel="closeFormPopup"
+        :create-mode="isCreateMode"
+      />
+    </Popup>
+  </div>
+</template>
+
+<script setup>
+  import { computed, onMounted, ref } from 'vue';
+  import { useRoute, useRouter } from 'vue-router';
+
+  import Block from '@martyrs/src/components/Block/Block.vue';
+  import Popup from '@martyrs/src/components/Popup/Popup.vue';
+  import applications from '@martyrs/src/modules/orders/store/applications.js';
+  import SectionPageTitle from '@martyrs/src/modules/globals/views/components/sections/SectionPageTitle.vue'
+  import Feed from '@martyrs/src/components/Feed/Feed.vue'
+  import CardApplication from '@martyrs/src/modules/orders/components/blocks/CardApplication.vue'
+  import FormApplicationDetails from '@martyrs/src/modules/orders/components/forms/FormApplicationDetails.vue'
+  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';
+
+  const route = useRoute();
+  const router = useRouter();
+
+  const statusFilter = ref('all')
+
+  // Popup states
+  const showViewPopup = ref(false)
+  const showFormPopup = ref(false)
+  const selectedApplication = ref(null)
+  const formApplication = ref({ ...applicationInitState })
+  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 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
+  });
+
+  // Popup methods
+  const openCreatePopup = () => {
+    formApplication.value = { ...applicationInitState };
+    // Ownership будет установлен в saveApplication
+    isCreateMode.value = true;
+    showFormPopup.value = true;
+  };
+
+  const openViewPopup = (application) => {
+    selectedApplication.value = application;
+    showViewPopup.value = true;
+  };
+
+  const closeViewPopup = () => {
+    showViewPopup.value = false;
+    selectedApplication.value = null;
+  };
+
+  const closeFormPopup = () => {
+    showFormPopup.value = false;
+    formApplication.value = { ...applicationInitState };
+    isCreateMode.value = false;
+  };
+
+  const enableEdit = () => {
+    formApplication.value = { ...selectedApplication.value };
+    isCreateMode.value = false;
+    showViewPopup.value = false;
+    showFormPopup.value = true;
+  };
+
+  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)
+      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' // заглушка для отдела платформы
+        };
+      }
+      
+      // 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);
+        applications.addItem(response, currentApplications.value);
+      } else {
+        const response = await applications.update(cleanData);
+        applications.updateItem(response, currentApplications.value);
+        selectedApplication.value = { ...response };
+      }
+      closeFormPopup();
+    } catch (error) {
+      console.error('Error saving application:', error);
+    }
+  };
+
+  const deleteApplication = async () => {
+    if (confirm('Are you sure you want to delete this application?')) {
+      try {
+        await applications.delete({ _id: selectedApplication.value._id });
+        applications.removeItem(selectedApplication.value, currentApplications.value);
+        closeViewPopup();
+      } catch (error) {
+        console.error('Error deleting application:', error);
+      }
+    }
+  };
+
+  onMounted(async () => {
+   
+  });
+</script>

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

@@ -0,0 +1,239 @@
+<template>
+  <div class="mobile:pd-thin pd-medium"> 
+    <SectionPageTitle
+      v-if="!MOBILE_APP"
+      title="Customers"
+      :actions="[
+        { method: () => openCreatePopup(), label: 'Create Customer' }
+      ]"
+      class="mn-b-small"
+    />
+
+    <Block
+      v-if="route.meta.context !== 'user'"
+      title="Statistics"
+      class="mn-b-small"
+    >
+      <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>{{totalCustomers}}</h3>
+        </div>
+        <div class="w-100 bg-white radius-small pd-small">
+          <p class="mn-b-thin">Active</p>
+          <h3>{{activeCustomers}}</h3>
+        </div>
+        <div class="w-100 bg-white radius-small pd-small">
+          <p class="mn-b-thin">New This Month</p>
+          <h3>{{newCustomersThisMonth}}</h3>
+        </div>
+      </div>
+    </Block>
+
+    <Feed
+      v-model="currentCustomers"
+      :search="true"
+      :states="{
+        empty: {
+          title: 'No Customers Found',
+          description: 'Currently, there are no customers.'
+        }
+      }"
+      :store="customers"
+      :options="{
+        limit: 15,
+        ...(route.meta.context === 'organization' && { owner: route.params._id }),
+        ...(statusFilter !== 'all' && { status: statusFilter })
+      }"
+      v-slot="{ 
+        items 
+      }"
+      class="gap-thin cols-3 mobile:cols-1"
+    >
+      <div 
+        v-for="customer in items" 
+        :key="customer._id"
+        @click="openViewPopup(customer)"
+        class="cursor-pointer"
+      >
+        <CardCustomer 
+          :customer="customer"
+          :formatDate="formatDate"
+        />
+      </div>
+    </Feed>
+
+    <!-- View Customer Popup -->
+    <Popup 
+      :isPopupOpen="showViewPopup"
+      @close-popup="closeViewPopup"
+      title="Customer Details"
+      align="center right"
+      class="bg-white h-min-100 w-max-50r pd-medium"
+    >
+      <CustomerDetails
+        v-if="selectedCustomer"
+        :customer="selectedCustomer"
+        @edit="enableEdit"
+        @delete="deleteCustomer"
+      />
+    </Popup>
+
+    <!-- Create/Edit Customer Popup -->
+    <Popup 
+      :isPopupOpen="showFormPopup"
+      @close-popup="closeFormPopup"
+      :title="isCreateMode ? 'Create Customer' : 'Edit Customer'"
+      align="center right"
+      class="bg-white h-min-100 w-max-50r pd-medium"
+    >
+      <FormCustomerDetails 
+        v-model:customer="formCustomer"
+        @save="saveCustomer"
+        @cancel="closeFormPopup"
+        :create-mode="isCreateMode"
+      />
+    </Popup>
+  </div>
+</template>
+
+<script setup>
+  import { computed, onMounted, ref } from 'vue';
+  import { useRoute, useRouter } from 'vue-router';
+
+  import Block from '@martyrs/src/components/Block/Block.vue';
+  import Popup from '@martyrs/src/components/Popup/Popup.vue';
+  import customers from '@martyrs/src/modules/orders/store/customers.store.js';
+  import SectionPageTitle from '@martyrs/src/modules/globals/views/components/sections/SectionPageTitle.vue'
+  import Feed from '@martyrs/src/components/Feed/Feed.vue'
+  import CardCustomer from '@martyrs/src/modules/orders/components/blocks/CardCustomer.vue'
+  import FormCustomerDetails from '@martyrs/src/modules/orders/components/forms/FormCustomerDetails.vue'
+  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';
+
+  const route = useRoute();
+  const router = useRouter();
+
+  const statusFilter = ref('all')
+
+  // Popup states
+  const showViewPopup = ref(false)
+  const showFormPopup = ref(false)
+  const selectedCustomer = ref(null)
+  const formCustomer = ref({ ...customerInitState })
+  const isCreateMode = ref(false)
+  const currentCustomers = ref([])
+
+  const totalCustomers = computed(() => {
+    return customers.state.items?.length || 0
+  });
+
+  const activeCustomers = computed(() => {
+    return customers.state.items?.filter(customer => customer.status === 'active').length || 0
+  });
+
+  const newCustomersThisMonth = computed(() => {
+    if (!customers.state.items) return 0;
+    const now = new Date();
+    const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+    return customers.state.items.filter(customer => 
+      new Date(customer.createdAt) >= startOfMonth
+    ).length
+  });
+
+  // Popup methods
+  const openCreatePopup = () => {
+    formCustomer.value = { ...customerInitState };
+    // Set owner and creator
+    if (route.params._id) {
+      formCustomer.value.owner = {
+        type: 'Organization',
+        target: route.params._id
+      };
+    }
+    formCustomer.value.creator = {
+      type: 'User',
+      target: auth.state.user._id
+    };
+    isCreateMode.value = true;
+    showFormPopup.value = true;
+  };
+
+  const openViewPopup = (customer) => {
+    selectedCustomer.value = customer;
+    showViewPopup.value = true;
+  };
+
+  const closeViewPopup = () => {
+    showViewPopup.value = false;
+    selectedCustomer.value = null;
+  };
+
+  const closeFormPopup = () => {
+    showFormPopup.value = false;
+    formCustomer.value = { ...customerInitState };
+    isCreateMode.value = false;
+  };
+
+  const enableEdit = () => {
+    formCustomer.value = { ...selectedCustomer.value };
+    isCreateMode.value = false;
+    showViewPopup.value = false;
+    showFormPopup.value = true;
+  };
+
+  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);
+      
+      if (isCreateMode.value) {
+        const created = await customers.create(cleanData);
+        customers.addItem(created, currentCustomers.value);
+      } else {
+        const updated = await customers.update(cleanData);
+        customers.updateItem(updated, currentCustomers.value);
+        selectedCustomer.value = { ...updated };
+      }
+      closeFormPopup();
+    } catch (error) {
+      console.error('Error saving customer:', error);
+    }
+  };
+
+  const deleteCustomer = async () => {
+    if (confirm('Are you sure you want to delete this customer?')) {
+      try {
+        await customers.delete({ _id: selectedCustomer.value._id });
+        customers.removeItem(selectedCustomer.value, currentCustomers.value);
+        closeViewPopup();
+      } catch (error) {
+        console.error('Error deleting customer:', error);
+      }
+    }
+  };
+
+  onMounted(async () => {
+   
+  });
+</script>

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

@@ -30,7 +30,7 @@
 			class="rows-1 gap-thin"
 		>
 			<FormCustomerDetails
-				:customer="orders.state.current.customer"
+				v-model:customer="orders.state.current.customer"
 			/>
 			<FormPayment 	
 				v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
@@ -138,7 +138,7 @@ import EmptyState from '@martyrs/src/modules/orders/components/sections/EmptySta
 
 import PriceTotal from '@martyrs/src/modules/orders/components/elements/PriceTotal.vue';
 
-import FormCustomerDetails from '@martyrs/src/modules/orders/components/sections/FormCustomerDetails.vue'
+import FormCustomerDetails from '@martyrs/src/modules/orders/components/forms/FormCustomerDetails.vue'
 import FormDelivery from '@martyrs/src/modules/orders/components/sections/FormDelivery.vue'
 import FormPayment from '@martyrs/src/modules/orders/components/sections/FormPayment.vue'
 ///////////////////////////////////////////////////////////////////////////////////////////////////