@coopenomics/desktop 2.2.10 → 2025.5.2

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,21 +21,22 @@ 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'
 import { formatAssetToReadable } from 'src/shared/lib/utils/formatAssetToReadable'
 import { useSystemStore } from 'src/entities/System/model';
+import { env } from 'src/shared/config';
+
 const { info } = useSystemStore()
 
-const { createDeposit, loadUserWalet } = useWalletStore()
+const { createDeposit, loadUserWallet } = useWalletStore()
 
 //TODO move username to Session entity
 const session = useSessionStore()
@@ -55,7 +56,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)} ${env.CURRENCY}`
     })) as IPaymentOrder
     isSubmitting.value = false
   } catch (e: any) {
@@ -65,13 +66,15 @@ const handlerSubmit = async (): Promise<void> => {
   }
 }
 
+const currency = computed(() => 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,26 @@
 <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';
+import { env } from 'src/shared/config';
 
+const currency = computed(() => env.CURRENCY)
 const showDialog = ref(false)
 const quantity = ref(1000)
 const isSubmitting = ref(false)
@@ -34,7 +35,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)} ${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,13 @@ 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()
+import { env } from 'src/shared/config';
 
+const { info } = useSystemStore()
+const currency = computed(() => env.CURRENCY)
 const coop = useCooperativeStore()
 coop.loadPublicCooperativeData(info.coopname)
 coop.loadPrivateCooperativeData()
@@ -29,10 +30,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, env.CURRENCY as string),
+        minimum: formatToAsset(localCoop.value.minimum, env.CURRENCY as string),
+        org_initial: formatToAsset(localCoop.value.org_initial, env.CURRENCY as string),
+        org_minimum: formatToAsset(localCoop.value.org_minimum, env.CURRENCY as string),
         announce: coop.publicCooperativeData?.announce,
         description: coop.publicCooperativeData?.description
       })
@@ -68,20 +69,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'

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

@@ -0,0 +1,117 @@
+import { computed } from 'vue'
+import { Notify } from 'quasar'
+import { useMeetStore } from 'src/entities/Meet/model/store'
+import { createMeetWithAgenda } from 'src/features/Meet/CreateMeet/model'
+import { signByPresiderOnAnnualGeneralMeetWithDecision } from 'src/features/Meet/CloseMeetWithDecision/model'
+import { restartMeetWithProposal } from 'src/features/Meet/RestartMeet/model'
+import { useSessionStore } from 'src/entities/Session'
+import type { IMeet } from 'src/entities/Meet'
+import { FailAlert } from 'src/shared/api'
+
+export function useMeetManagement(coopname: string) {
+  const meetStore = useMeetStore()
+  const sessionStore = useSessionStore()
+
+  const meets = computed(() => meetStore.meets)
+  const loading = computed(() => meetStore.loading)
+
+  const loadMeets = async () => {
+    try {
+      await meetStore.loadMeets({ coopname })
+    } catch (e: any) {
+      FailAlert(e)
+    }
+  }
+
+  const handleCreateMeet = async (formData: any) => {
+    try {
+      await createMeetWithAgenda({
+        coopname,
+        initiator: formData.initiator,
+        presider: formData.presider,
+        secretary: formData.secretary,
+        open_at: formData.open_at,
+        close_at: formData.close_at,
+        username: sessionStore.username,
+        agenda_points: formData.agenda_points
+      })
+
+      await loadMeets()
+
+      Notify.create({
+        message: 'Собрание успешно создано',
+        type: 'positive',
+      })
+
+      return true
+    } catch (e: any) {
+      FailAlert(e)
+      return false
+    }
+  }
+
+  const handleCloseMeet = async (meet: IMeet) => {
+    try {
+      await signByPresiderOnAnnualGeneralMeetWithDecision({
+        coopname,
+        hash: meet.hash,
+        username: sessionStore.username,
+      })
+
+      await loadMeets()
+
+      Notify.create({
+        message: 'Собрание успешно закрыто',
+        type: 'positive',
+      })
+
+      return true
+    } catch (e: any) {
+      FailAlert(e)
+      return false
+    }
+  }
+
+  const handleRestartMeet = async (data: any) => {
+    try {
+      await restartMeetWithProposal({
+        coopname,
+        hash: data.hash,
+        username: sessionStore.username,
+        new_open_at: data.new_open_at,
+        new_close_at: data.new_close_at,
+        agenda_points: data.agenda_points
+      })
+
+      await loadMeets()
+
+      Notify.create({
+        message: 'Собрание успешно перезапущено',
+        type: 'positive',
+      })
+
+      return true
+    } catch (e: any) {
+      FailAlert(e)
+      return false
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const handleVote = (meet: IMeet) => {
+    Notify.create({
+      message: 'Голосование в разработке',
+      type: 'info',
+    })
+  }
+
+  return {
+    meets,
+    loading,
+    loadMeets,
+    handleCreateMeet,
+    handleCloseMeet,
+    handleRestartMeet,
+    handleVote
+  }
+}

package/src/pages/Cooperative/ListOfMeets/ui/ListOfMeetsPage.vue

@@ -0,0 +1,90 @@
+<template lang="pug">
+div.q-pa-md
+  router-view(v-if="$route.name !== 'user-meets' && $route.name !== 'meets'")
+  template(v-else)
+    div.row.justify-center
+      div.col-12
+        div.row.q-mb-md(v-if="canCreateMeet")
+          CreateMeet(@create="handleCreate")
+
+        MeetsTable(
+          :meets="meets"
+          :loading="loading"
+          @vote="handleVote"
+          @close="handleCloseMeet"
+          @restart="showRestartMeetDialog"
+          @view="navigateToMeetDetails"
+        )
+    
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref, computed, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { MeetsTable } from 'src/widgets/Meets/MeetsTable'
+import { CreateMeet } from 'src/features/Meet/CreateMeet'
+import { useMeetManagement } from '../model'
+import type { IMeet } from 'src/entities/Meet'
+import { useCurrentUserStore } from 'src/entities/User'
+
+const route = useRoute()
+const router = useRouter()
+const coopname = computed(() => route.params.coopname as string)
+
+const {isChairman, isMember} = useCurrentUserStore()
+
+const {
+  meets,
+  loading,
+  loadMeets,
+  handleCreateMeet,
+  handleCloseMeet,
+  handleVote
+} = useMeetManagement(coopname.value)
+
+// Диалоги
+const currentMeetToRestart = ref<IMeet | null>(null)
+
+// Обработчики
+const handleCreate = async (formData: any) => {
+  const success = await handleCreateMeet(formData)
+  return success
+}
+
+const showRestartMeetDialog = (meet: IMeet) => {
+  currentMeetToRestart.value = meet
+}
+
+// Навигация на детальную страницу собрания
+const navigateToMeetDetails = (meet: IMeet) => {
+  router.push({
+    name: route.name === 'meets' ? 'meet-details' : 'user-meet-details',
+    params: {
+      coopname: coopname.value,
+      hash: meet.hash
+    }
+  })
+}
+
+// Проверка разрешений
+const canCreateMeet = computed(() => {
+  return isMember || isChairman
+})
+
+// Загрузка данных при монтировании компонента
+onMounted(() => {
+  if (route.name === 'user-meets' || route.name === 'meets') {
+    loadMeets()
+  }
+})
+
+// Следим за изменениями маршрута
+watch(
+  () => route.name,
+  (newRouteName) => {
+    if (newRouteName === 'user-meets' || newRouteName === 'meets') {
+      loadMeets()
+    }
+  }
+)
+</script>

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

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

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

@@ -1 +1 @@
-export * from './ui'
+export * from './ui'

package/src/pages/Cooperative/ListOfOrders/ui/ListOfOrdersPage.vue

@@ -1,12 +1,8 @@
 <template lang="pug">
 ListOfOrdersWidget
-  //- template(#top)
-  //- template(#default="{ expand, receiver }")
-    //- ListOfOrdersWidget(v-if="expand" :receiver="receiver")
 </template>
 
 <script lang="ts" setup>
 import { ListOfOrdersWidget } from 'src/widgets/Cooperative/Orders/ListOfOrders';
-// import { ListOfOrdersWidget } from 'src/widgets/Cooperative/Orders/ListOfOrders';
 
 </script>