@coopenomics/desktop 2.2.9 → 2025.4.29

package/src/features/Union/AddCooperative/ui/AddCooperativeForm.vue

@@ -5,19 +5,19 @@ Form(:handler-submit="addNow" :is-submitting="isSubmitting" :showCancel="false"
 
   q-input(standout="bg-teal text-white" hint="100 RUB" label="Вступительный взнос для физлиц и ИП" v-model="data.params.initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
     template(#append)
-      span.text-overline {{CURRENCY}}
+      span.text-overline {{currency}}
 
   q-input(standout="bg-teal text-white" hint="300 RUB" label="Минимальный паевый взнос для физлиц и ИП" v-model="data.params.minimum" type="number" :min="0" :rules="[val => notEmpty(val)]")
     template(#append)
-      span.text-overline {{CURRENCY}}
+      span.text-overline {{currency}}
 
   q-input(standout="bg-teal text-white" hint="1000 RUB" label="Вступительный взнос для организаций" v-model="data.params.org_initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
     template(#append)
-      span.text-overline {{CURRENCY}}
+      span.text-overline {{currency}}
 
   q-input(standout="bg-teal text-white" hint="3000 RUB" label="Минимальный паевый взнос для организаций" v-model="data.params.org_minimum" type="number" :min="0"  :rules="[val => notEmpty(val)]")
     template(#append)
-      span.text-overline {{CURRENCY}}
+      span.text-overline {{currency}}
 
 </template>
 <script lang="ts" setup>
@@ -27,14 +27,13 @@ import { Form } from 'src/shared/ui/Form';
 import { notEmpty, isDomain } from 'src/shared/lib/utils';
 import { useSessionStore } from 'src/entities/Session';
 import { RegistratorContract } from 'cooptypes';
-import { CURRENCY } from 'src/shared/config';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
 import type { IObjectedDocument } from 'src/shared/lib/types/document';
 
 const emit = defineEmits(['finish'])
 
 const {addCooperative} = useAddCooperative()
-
+const currency = computed(() => process.env.CURRENCY)
 const isSubmitting = ref(false)
 
 const props = defineProps({

package/src/features/User/AddUser/ui/AddUserDialog/AddUserDialog.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
 div
-  q-btn(size="sm" @click="showAdd = true" color="primary")
+  q-btn(@click="showAdd = true" color="primary")
     q-icon(name="add")
     span добавить пайщика
   q-dialog(v-model="showAdd" persistent :maximized="false" )
@@ -22,14 +22,13 @@ div
                 q-input(@change="changeEmail" v-model="state.email" standout="bg-teal text-white" label="Электронная почта" :rules='[validateEmail, validateExists]').q-mb-md
 
               template(#bottom="{userDataForm}")
-
                 q-input(
                   standout="bg-teal text-white"
                   v-model="addUserState.created_at"
                   mask="datetime"
                   label="Дата и время подписания заявления"
                   placeholder="год/месяц/день часы:минуты"
-                  :rules="[val => notEmpty(val)]"
+                  :rules="[val => notEmpty(val), val => validateDateWithinRange(100)(val)]"
                   autocomplete="off"
                   hint="когда пайщик был принят в кооператив"
                 ).q-mt-md
@@ -99,6 +98,8 @@ import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore()
 
 import { notEmpty } from 'src/shared/lib/utils';
+import { validateDateWithinRange } from 'src/shared/lib/utils/dates/validateDateWithinRange';
+import { useAccountStore } from 'src/entities/Account/model';
 
 const { state, addUserState, clearUserData } = useRegistratorStore()
 const spread_minimum = ref(true) //TODO REPLACE IT!
@@ -204,6 +205,7 @@ const addUserNow = (userDataForm: any) => {
   userDataForm.validate().then(async (success: boolean) => {
     if (success) {
       try {
+        const accountStore = useAccountStore()
         loading.value = true
         await addUser()
         SuccessAlert('Пайщик добавлен в реестр, а приглашение отправлено на его email');
@@ -211,9 +213,10 @@ const addUserNow = (userDataForm: any) => {
         addUserState.created_at = ''
         clearUserData()
         loading.value = false
+        accountStore.getAccounts()
       } catch (e: any) {
         loading.value = false
-        FailAlert(`Возникла ошибка: ${e.message}`)
+        FailAlert(e)
       }
 
     } else {

package/src/features/User/LoginUser/model/index.ts

@@ -3,14 +3,13 @@ import { useGlobalStore } from 'src/shared/store'
 import { api } from '../api'
 import {client} from 'src/shared/api/client'
 import { useCurrentUserStore } from 'src/entities/User'
-import { useSystemStore } from 'src/entities/System/model'
 import { useRegistratorStore } from 'src/entities/Registrator'
 import type { ITokens } from 'src/shared/lib/types/user'
+import { useInitWalletProcess } from 'src/processes/init-wallet'
 
 export function useLoginUser() {
   const globalStore = useGlobalStore()
   const currentUser = useCurrentUserStore()
-  const system = useSystemStore()
 
   async function login(email: string, wif: string): Promise<void> {
     const auth = await api.loginUser(email, wif);
@@ -35,7 +34,8 @@ export function useLoginUser() {
     await session.init()
     client.setToken(auth.tokens.access.token)
 
-    await currentUser.loadProfile(globalStore.username, system.info.coopname)
+    const { run } = useInitWalletProcess()
+    await run() //запускаем фоновое обновление кошелька - заменить на подписку потом
 
     if (!currentUser.isRegistrationComplete){
       const {state, steps} = useRegistratorStore()

package/src/features/User/LoginUser/ui/LoginForm/LoginForm.vue

@@ -39,10 +39,6 @@ form(@submit.prevent="submit").full-width
 import { useCurrentUserStore } from 'src/entities/User';
 import { useLoginUser } from 'src/features/User/LoginUser';
 import { FailAlert } from 'src/shared/api';
-import { useSystemStore } from 'src/entities/System/model';
-const { info } = useSystemStore()
-
-import { useGlobalStore } from 'src/shared/store';
 import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 
@@ -52,7 +48,6 @@ const email = ref('')
 const privateKey = ref('')
 const loading = ref(false)
 const currentUser = useCurrentUserStore()
-const globalStore = useGlobalStore()
 
 
 const submit = async () => {
@@ -60,7 +55,6 @@ const submit = async () => {
   try {
     const { login } = useLoginUser()
     await login(email.value, privateKey.value)
-    await currentUser.loadProfile(globalStore.username, info.coopname)
 
     if (!currentUser.isRegistrationComplete) {
       router.push({ name: 'signup' })

package/src/features/User/Logout/model/index.ts

@@ -1,13 +1,15 @@
 import { useSessionStore } from 'src/entities/Session'
 import { useGlobalStore } from 'src/shared/store'
-import { api } from '../api'
+// import { api } from '../api'
 import { useCurrentUserStore } from 'src/entities/User'
+import { useRegistratorStore } from 'src/entities/Registrator'
 
 export function useLogoutUser() {
   async function logout(): Promise<void> {
     const global = useGlobalStore()
-
-    if (global.tokens?.refresh.token) await api.logoutUser(global.tokens?.refresh.token)
+    //TODO: "начать с начала" при регистрации бажит на это - да и в целом пора бы маршруты срезать эти
+    // if (global.tokens?.refresh.token) await api.logoutUser(global.tokens?.refresh.token)
+    await useRegistratorStore().clearUserData()
 
     await global.logout()
 

package/src/features/Wallet/DepositToWallet/ui/DepositButton/DepositButton.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-q-btn(@click="showDialog=true" color="primary" size="sm")
+q-btn(@click="showDialog=true" color="primary")
   q-icon(name="fa-solid fa-chevron-up").q-mr-sm
   span Совершить взнос
   q-dialog(v-model="showDialog" @hide="clear")
@@ -7,7 +7,7 @@ q-btn(@click="showDialog=true" color="primary" size="sm")
       Form(:handler-submit="handlerSubmit" :is-submitting="isSubmitting" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-pa-sm
         q-input(v-model="quantity" standout="bg-teal text-white" type="number" :min="0" :step="1000" :rules="[val => val > 0 || 'Сумма взноса должна быть положительной']")
           template(#append)
-            span.text-overline {{ CURRENCY }}
+            span.text-overline {{ currency }}
 
     ModalBase(v-else :title='"Совершите взнос"' style="min-height: 200px !important;")
       div(style="max-width:400px").q-pa-md
@@ -21,13 +21,12 @@ q-btn(@click="showDialog=true" color="primary" size="sm")
   </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { Form } from 'src/shared/ui/Form'
 import { ModalBase } from 'src/shared/ui/ModalBase'
 import { useWalletStore } from 'src/entities/Wallet'
 import type { ILoadUserWallet } from 'src/entities/Wallet/model'
 import { PayWithProvider } from 'src/shared/ui/PayWithProvider'
-import { CURRENCY } from 'src/shared/config'
 import { SuccessAlert, FailAlert } from 'src/shared/api'
 import { useSessionStore } from 'src/entities/Session'
 import type { IPaymentOrder } from 'src/shared/lib/types/payments'
@@ -35,7 +34,7 @@ import { formatAssetToReadable } from 'src/shared/lib/utils/formatAssetToReadabl
 import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore()
 
-const { createDeposit, loadUserWalet } = useWalletStore()
+const { createDeposit, loadUserWallet } = useWalletStore()
 
 //TODO move username to Session entity
 const session = useSessionStore()
@@ -55,7 +54,7 @@ const handlerSubmit = async (): Promise<void> => {
   isSubmitting.value = true
   try {
     paymentOrder.value = (await createDeposit({
-      quantity: `${parseFloat(quantity.value.toString()).toFixed(4)} ${CURRENCY}`
+      quantity: `${parseFloat(quantity.value.toString()).toFixed(4)} ${process.env.CURRENCY}`
     })) as IPaymentOrder
     isSubmitting.value = false
   } catch (e: any) {
@@ -65,13 +64,15 @@ const handlerSubmit = async (): Promise<void> => {
   }
 }
 
+const currency = computed(() => process.env.CURRENCY)
+
 const paymentFail = (): void => {
   clear()
   FailAlert('Произошла ошибка при приёме платежа')
 }
 
 const paymentSuccess = (): void => {
-  loadUserWalet({ coopname: info.coopname, username: session.username as string } as ILoadUserWallet)
+  loadUserWallet({ coopname: info.coopname, username: session.username as string } as ILoadUserWallet)
   clear()
   SuccessAlert('Платеж успешно принят')
 }

package/src/features/Wallet/WithdrawFromWallet/ui/withdrawButton.vue

@@ -1,25 +1,24 @@
 <template lang="pug">
-q-btn(@click="showDialog = true" size="sm" color="primary")
+q-btn(@click="showDialog = true" color="primary")
   q-icon(name="fa-solid fa-chevron-down").q-mr-sm
   span получить возврат
 
   q-dialog(v-model="showDialog" @hide="clear")
     ModalBase( :title='"Введите сумму"' )
-      Form(:handler-submit="handlerSubmit" :is-submitting="isSubmitting" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-pa-sm
+      Form(:disabled="true" :handler-submit="handlerSubmit" :is-submitting="isSubmitting" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-pa-sm
         q-input(v-model="quantity" standout="bg-teal text-white" type="number" :min="0" :step="1000" :rules="[val => val > 0 || 'Сумма взноса должна быть положительной']")
           template(#append)
-            span.text-overline {{ CURRENCY }}
+            span.text-overline {{ currency }}
           //- template(#hint)
             //- span комиссия провайдера {{feePercent}}%, к получению {{toRecieve}}
 
 </template>
 <script setup lang="ts">
 
-import { ref } from 'vue';
-import { CURRENCY } from 'src/shared/config';
+import { ref, computed } from 'vue';
 import { ModalBase } from 'src/shared/ui/ModalBase';
 import { Form } from 'src/shared/ui/Form';
-
+const currency = computed(() => process.env.CURRENCY)
 const showDialog = ref(false)
 const quantity = ref(1000)
 const isSubmitting = ref(false)
@@ -34,7 +33,7 @@ const handlerSubmit = async (): Promise<void> => {
   isSubmitting.value = true
   try {
     // paymentOrder.value = (await createDeposit({
-    //   quantity: `${parseFloat(quantity.value.toString()).toFixed(4)} ${CURRENCY}`,
+    //   quantity: `${parseFloat(quantity.value.toString()).toFixed(4)} ${process.env.CURRENCY}`,
     //   provider: 'yookassa',
     // })) as IPaymentOrder
     isSubmitting.value = false

package/src/pages/Blank/index.ts

@@ -0,0 +1 @@
+export { default as BlankPage } from './BlankPage.vue'

package/src/pages/Contacts/ContactsPage.vue

@@ -0,0 +1,64 @@
+<template lang="pug">
+div.q-pa-md
+  div.row
+    div.col-md-12.col-xs-12
+      q-card(flat class="card-container q-pa-md" v-if="contacts && contacts.details")
+        div.row.items-center.q-mb-md
+          div.col-12
+            div.text-h4.q-mb-xs Контактная информация
+            div.text-subtitle1 {{ contacts.full_name }}
+
+        div.row.q-mb-md
+          div.col-12
+            div.info-card
+              div.card-title Регистрационные данные
+              div.row.q-col-gutter-md
+                div.col-12.col-md-6
+                  div.q-my-sm
+                    div.card-label ИНН
+                    div.card-value {{ contacts.details.inn }}
+                div.col-12.col-md-6
+                  div.q-my-sm
+                    div.card-label ОГРН
+                    div.card-value {{ contacts.details.ogrn }}
+
+        div.row.q-mb-md
+          div.col-12
+            div.info-card
+              div.card-title Контактные данные
+              div.row.q-col-gutter-md
+                div.col-12
+                  div.q-my-sm
+                    div.card-label Юридический адрес
+                    div.card-value {{ contacts.full_address }}
+
+                div.col-12.col-md-6
+                  div.q-my-sm
+                    div.card-label Телефон
+                    div.card-value {{ contacts.phone }}
+
+                div.col-12.col-md-6
+                  div.q-my-sm
+                    div.card-label Электронная почта
+                    div.card-value {{ contacts.email }}
+
+        div.row.q-mb-md(v-if="contacts.chairman")
+          div.col-12
+            div.info-card
+              div.card-title Совет
+              div.q-my-sm
+                div.card-label Председатель
+                div.card-value {{ chairman }}
+</template>
+
+<script lang="ts" setup>
+import { useCooperativeStore } from 'src/entities/Cooperative';
+import { computed } from 'vue';
+import 'src/shared/ui/CardStyles/index.scss';
+
+const cooperative = useCooperativeStore()
+cooperative.loadContacts()
+
+const contacts = computed(() => cooperative.contacts)
+const chairman = computed(() => `${contacts.value?.chairman?.last_name} ${contacts.value?.chairman?.first_name} ${contacts.value?.chairman?.middle_name}`)
+</script>

package/src/{widgets/Cooperative/Contacts → pages/Cooperative/ChangeContacts}/ui/index.ts

@@ -1,2 +1 @@
-export {default as CooperativeContacts} from './Contacts.vue'
 export {default as ChangeCooperativeContacts} from './ChangeContacts.vue'

package/src/{widgets/Cooperative/Contributions/ui/ChangeContributions.vue → pages/Cooperative/ChangeRegisterPayments/ui/ChangeRegisterPayments.vue}

@@ -4,12 +4,11 @@ import { useCooperativeStore } from 'src/entities/Cooperative';
 import { useSessionStore } from 'src/entities/Session';
 import { useUpdateCoop } from 'src/features/Cooperative/UpdateCoop';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
-import { CURRENCY } from 'src/shared/config';
 import { formatToAsset } from 'src/shared/lib/utils/formatToAsset';
-import { ref, watch } from 'vue';
+import { ref, watch, computed } from 'vue';
 import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore()
-
+const currency = computed(() => process.env.CURRENCY)
 const coop = useCooperativeStore()
 coop.loadPublicCooperativeData(info.coopname)
 coop.loadPrivateCooperativeData()
@@ -29,10 +28,10 @@ const save = async () => {
       await updateCoop({
         coopname: info.coopname,
         username: session.username,
-        initial: formatToAsset(localCoop.value.initial, CURRENCY),
-        minimum: formatToAsset(localCoop.value.minimum, CURRENCY),
-        org_initial: formatToAsset(localCoop.value.org_initial, CURRENCY),
-        org_minimum: formatToAsset(localCoop.value.org_minimum, CURRENCY),
+        initial: formatToAsset(localCoop.value.initial, process.env.CURRENCY as string),
+        minimum: formatToAsset(localCoop.value.minimum, process.env.CURRENCY as string),
+        org_initial: formatToAsset(localCoop.value.org_initial, process.env.CURRENCY as string),
+        org_minimum: formatToAsset(localCoop.value.org_minimum, process.env.CURRENCY as string),
         announce: coop.publicCooperativeData?.announce,
         description: coop.publicCooperativeData?.description
       })
@@ -68,20 +67,20 @@ div.q-pa-md
 
       q-input(standout="bg-teal text-white" v-model="localCoop.initial" label="Вступительный взнос")
         template(#append)
-          span.text-overline {{ CURRENCY }}
+          span.text-overline {{ currency }}
 
       q-input(standout="bg-teal text-white" v-model="localCoop.minimum" label="Минимальный паевый взнос")
         template(#append)
-          span.text-overline {{ CURRENCY }}
+          span.text-overline {{ currency }}
 
     q-card(flat).q-pa-md.q-gutter-sm
       p.text-overline ЮРИДИЧЕСКИЕ ЛИЦА
       q-input(standout="bg-teal text-white" v-model="localCoop.org_initial" label="Вступительный взнос")
         template(#append)
-          span.text-overline {{ CURRENCY }}
+          span.text-overline {{ currency }}
       q-input(standout="bg-teal text-white" v-model="localCoop.org_minimum" label="Минимальный паевый взнос")
         template(#append)
-          span.text-overline {{ CURRENCY }}
+          span.text-overline {{ currency }}
 
   q-btn(@click="save" size="sm" color="primary")
     q-icon(name="save").q-mr-sm

package/src/pages/Cooperative/ChangeRegisterPayments/ui/index.ts

@@ -0,0 +1 @@
+export {default as ChangeRegisterPaymentsPage} from './ChangeRegisterPayments.vue'

package/src/pages/Cooperative/ListOfAgenda/index.ts

@@ -0,0 +1 @@
+export { default as ListOfAgendaQuestions } from './ui/ListOfAgendaQuestions.vue'

package/src/pages/Cooperative/ListOfAgenda/ui/ListOfAgendaQuestions.vue

@@ -0,0 +1,118 @@
+<template lang="pug">
+q-card(flat)
+  QuestionsTable(
+    :decisions="decisions"
+    :loading="loading"
+    :isChairman="currentUser.isChairman"
+    :format-decision-title="formatDecisionTitle"
+    :is-voted-for="isVotedFor"
+    :is-voted-against="isVotedAgainst"
+    :is-voted-any="isVotedAny"
+    :processing-decisions="processingDecisions"
+    @authorize="onAuthorizeDecision"
+    @vote-for="onVoteFor"
+    @vote-against="onVoteAgainst"
+  )
+    template(#top)
+      CreateProjectFreeDecisionButton
+</template>
+
+<script setup lang="ts">
+import { onBeforeUnmount, computed, ref } from 'vue'
+import { useRoute } from 'vue-router'
+import { useCurrentUserStore } from 'src/entities/User'
+import { CreateProjectFreeDecisionButton } from 'src/features/Decision/CreateProject'
+import { useDecisionProcessor } from 'src/processes/process-decisions'
+import { FailAlert, SuccessAlert } from 'src/shared/api'
+import { QuestionsTable } from 'src/widgets/Questions'
+
+const route = useRoute()
+const currentUser = useCurrentUserStore()
+const processingDecisions = ref<Record<number, boolean>>({})
+
+// Получаем процесс обработки решений
+const decisionProcessor = useDecisionProcessor()
+const {
+  loading,
+  loadDecisions,
+  authorizeAndExecuteDecision,
+  voteForDecision,
+  voteAgainstDecision,
+  isVotedFor,
+  isVotedAgainst,
+  isVotedAny,
+  formatDecisionTitle
+} = decisionProcessor
+
+// Данные
+const decisions = computed(() => decisionProcessor.decisions.value)
+
+// Обработчики событий
+const onAuthorizeDecision = async (row) => {
+  const decision_id = Number(row.table.id)
+  processingDecisions.value[decision_id] = true
+
+  try {
+    await authorizeAndExecuteDecision(row)
+    SuccessAlert('Решение принято и исполнено')
+    await loadDecisions(route.params.coopname as string)
+  } catch (e) {
+    FailAlert(e)
+  } finally {
+    // Гарантированно сбрасываем состояние загрузки
+    processingDecisions.value[decision_id] = false
+
+    // Добавляем таймаут для гарантии обновления UI
+    setTimeout(() => {
+      processingDecisions.value = { ...processingDecisions.value }
+    }, 100)
+  }
+}
+
+const onVoteFor = async (decision_id) => {
+  processingDecisions.value[decision_id] = true
+
+  try {
+    await voteForDecision(decision_id)
+    SuccessAlert('Голос принят')
+    await loadDecisions(route.params.coopname as string)
+  } catch (e) {
+    FailAlert(e)
+  } finally {
+    // Гарантированно сбрасываем состояние загрузки
+    processingDecisions.value[decision_id] = false
+
+    // Добавляем таймаут для гарантии обновления UI
+    setTimeout(() => {
+      processingDecisions.value = { ...processingDecisions.value }
+    }, 100)
+  }
+}
+
+const onVoteAgainst = async (decision_id) => {
+  processingDecisions.value[decision_id] = true
+
+  try {
+    await voteAgainstDecision(decision_id)
+    SuccessAlert('Голос принят')
+    await loadDecisions(route.params.coopname as string)
+  } catch (e) {
+    FailAlert(e)
+  } finally {
+    // Гарантированно сбрасываем состояние загрузки
+    processingDecisions.value[decision_id] = false
+
+    // Добавляем таймаут для гарантии обновления UI
+    setTimeout(() => {
+      processingDecisions.value = { ...processingDecisions.value }
+    }, 100)
+  }
+}
+
+// Инициализация
+loadDecisions(route.params.coopname as string)
+
+// Периодическое обновление данных
+const interval = setInterval(() => loadDecisions(route.params.coopname as string, true), 10000)
+onBeforeUnmount(() => clearInterval(interval))
+</script>

package/src/pages/Cooperative/ListOfAgenda/ui/index.ts

@@ -0,0 +1 @@
+export {default as ListOfQuestionsPage} from './ListOfQuestions.vue'

package/src/pages/Cooperative/ListOfDocuments/ListOfDocumentsPage.vue

@@ -0,0 +1,24 @@
+<template lang="pug">
+q-page.padding
+  ListOfDocumentsWidget(
+    :username="coopname"
+    :filter="{}"
+    :showFilter="true"
+    :initialDocumentType="typeForToggle"
+  )
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+import { useSystemStore } from 'src/entities/System/model'
+import { ListOfDocumentsWidget } from 'src/widgets/Cooperative/Documents/ListOfDocuments/ui'
+import type { DocumentType } from 'src/entities/Document/model/types'
+
+// Получаем системную информацию
+const { info } = useSystemStore()
+const coopname = computed(() => info.coopname)
+
+// Переменная для отслеживания типа в интерфейсе
+const typeForToggle = ref<DocumentType>('newsubmitted')
+
+</script>

package/src/pages/Cooperative/ListOfMeets/model/index.ts

@@ -0,0 +1 @@
+export * from './model'