@coopenomics/desktop 2.2.10 → 2025.5.2

package/src/widgets/Questions/ui/QuestionCard/QuestionCard.vue

@@ -0,0 +1,109 @@
+<template lang="pug">
+div.q-pa-xs.col-xs-12.col-sm-12.col-md-12.q-mt-md
+  q-card(bordered flat).no-padding
+    q-card-section.q-py-xs
+      div.text-subtitle2 {{ getDocumentTitle() }}
+      div.text-caption Аккаунт: {{ agenda.table.username }}
+
+    q-separator
+
+    q-card-section.q-py-xs
+      div.row.items-center
+        div.col-6 Истекает:
+        div.col-6.text-right {{ formatToFromNow(agenda.table.expired_at) }}
+
+      div.row.items-center.q-mt-sm
+        div.col-6 Голосование:
+        div.col-6.text-right
+          VotingButtons(
+            :decision="agenda.table"
+            :is-voted-for="isVotedFor"
+            :is-voted-against="isVotedAgainst"
+            :is-voted-any="isVotedAny"
+            @vote-for="$emit('vote-for')"
+            @vote-against="$emit('vote-against')"
+          )
+
+    q-card-actions(align="right")
+      q-btn(size="sm" flat icon="expand_more" @click="$emit('toggle-expand')")
+        | {{ expanded ? 'Скрыть' : 'Подробнее' }}
+      q-btn(
+        size="sm"
+        color="teal"
+        v-if="isChairman"
+        :loading="isProcessing"
+        @click="$emit('authorize')"
+      ) Утвердить
+
+    q-slide-transition
+      div(v-show="expanded")
+        q-separator
+        q-card-section
+          ComplexDocument(:documents="agenda.documents")
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { ComplexDocument } from 'src/shared/ui/ComplexDocument'
+import { formatToFromNow } from 'src/shared/lib/utils/dates/formatToFromNow'
+import { VotingButtons } from '../VotingButtons'
+import { useCurrentUserStore } from 'src/entities/User'
+import type { IAgenda } from 'src/entities/Agenda/model'
+import { Cooperative } from 'cooptypes'
+
+const props = defineProps({
+  agenda: {
+    type: Object as () => IAgenda,
+    required: true
+  },
+  expanded: {
+    type: Boolean,
+    default: false
+  },
+  isProcessing: {
+    type: Boolean,
+    default: false
+  },
+  isVotedFor: {
+    type: Function,
+    required: true
+  },
+  isVotedAgainst: {
+    type: Function,
+    required: true
+  },
+  isVotedAny: {
+    type: Function,
+    required: true
+  }
+})
+
+defineEmits(['toggle-expand', 'authorize', 'vote-for', 'vote-against'])
+
+const currentUser = useCurrentUserStore()
+const isChairman = computed(() => currentUser.isChairman)
+
+// Получение заголовка документа с поддержкой агрегатов
+function getDocumentTitle() {
+  const agenda = props.agenda
+  const statement = agenda.documents?.statement
+  const rawDocument = statement?.documentAggregate?.rawDocument
+  const meta = rawDocument?.meta as Cooperative.Document.IMetaDocument | undefined
+  // Используем только агрегаты документа
+  if (meta?.title) {
+    const title = meta.title
+    return formatDecisionTitle(title)
+  }
+
+  return 'Вопрос без заголовка'
+}
+
+// Форматирование заголовка решения
+const formatDecisionTitle = (title: string) => {
+  if (!title) return 'Без заголовка'
+  if (title.length > 50) {
+    return title.substring(0, 50) + '...'
+  }
+  return title
+}
+</script>

package/src/widgets/Questions/ui/QuestionCard/index.ts

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

package/src/widgets/Questions/ui/QuestionsTable/QuestionsTable.vue

@@ -0,0 +1,177 @@
+<template lang="pug">
+div.scroll-area(style="height: 90vh; overflow-y: auto;")
+  q-table(
+    ref="tableRef"
+    flat
+    :grid="isMobile"
+    :rows="decisions"
+    :columns="columns"
+    :table-colspan="9"
+    row-key="table.id"
+    :pagination="pagination"
+    virtual-scroll
+    :virtual-scroll-item-size="48"
+    :rows-per-page-options="[10]"
+    :loading="loading"
+    :no-data-label="'У совета нет вопросов на повестке для голосования. Вопросы на повестку добавляются автоматически при участии пайщиков в цифровых целевых потребительских программах кооператива. Также, вопрос на повестку можно добавить вручную, нажав на кнопку `ПРЕДЛОЖИТЬ ПОВЕСТКУ`.'"
+    :virtual-scroll-target="'.scroll-area'"
+  ).full-width
+
+    template(#top v-if="$slots.top")
+      slot(name="top")
+
+    template(#item="props")
+      QuestionCard(
+        :agenda="props.row"
+        :expanded="expanded.get(props.row.table.id)"
+        :is-processing="isProcessing(props.row.table.id)"
+        :is-voted-for="isVotedFor"
+        :is-voted-against="isVotedAgainst"
+        :is-voted-any="isVotedAny"
+        @toggle-expand="toggleExpand(props.row.table.id)"
+        @authorize="onAuthorizeDecision(props.row)"
+        @vote-for="onVoteFor(props.row.table.id)"
+        @vote-against="onVoteAgainst(props.row.table.id)"
+      )
+
+    template(#header="props")
+      q-tr(:props="props")
+        q-th(auto-width)
+        q-th(
+          v-for="col in props.cols"
+          :key="col.name"
+          :props="props"
+        ) {{ col.label }}
+
+    template(#body="props")
+      q-tr(:key="`m_${props.row.table.id}`" :props="props")
+        q-td(auto-width)
+          q-btn(size="sm" color="primary" dense :icon="expanded.get(props.row.table.id) ? 'remove' : 'add'" round @click="toggleExpand(props.row.table.id)")
+
+        q-td {{ props.row.table.id }}
+        q-td {{ props.row.table.username }}
+        q-td(style="max-width: 200px; word-wrap: break-word; white-space: normal;") {{ getDecisionTitle(props.row) }}
+
+        q-td {{formatToFromNow(props.row.table.expired_at)}}
+        q-td
+          VotingButtons(
+            :decision="props.row.table"
+            :is-voted-for="isVotedFor"
+            :is-voted-against="isVotedAgainst"
+            :is-voted-any="isVotedAny"
+            @vote-for="onVoteFor(props.row.table.id)"
+            @vote-against="onVoteAgainst(props.row.table.id)"
+          )
+        q-td
+          q-btn(
+            size="sm"
+            color="teal"
+            v-if="isChairman"
+            :loading="isProcessing(props.row.table.id)"
+            @click="onAuthorizeDecision(props.row)"
+          ) утвердить
+
+      q-tr(v-if="expanded.get(props.row.table.id)" :key="`e_${props.row.table.id}`" :props="props" class="q-virtual-scroll--with-prev")
+        q-td(colspan="100%")
+          ComplexDocument(:documents="props.row.documents")
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { ComplexDocument } from 'src/shared/ui/ComplexDocument'
+import { Cooperative } from 'cooptypes'
+import { formatToFromNow } from 'src/shared/lib/utils/dates/formatToFromNow'
+import { QuestionCard } from '../QuestionCard'
+import { VotingButtons } from '../VotingButtons'
+import { useWindowSize } from 'src/shared/hooks'
+
+const props = defineProps({
+  decisions: {
+    type: Array,
+    required: true
+  },
+  loading: {
+    type: Boolean,
+    required: true
+  },
+  isChairman: {
+    type: Boolean,
+    default: false
+  },
+  formatDecisionTitle: {
+    type: Function,
+    required: true
+  },
+  isVotedFor: {
+    type: Function,
+    required: true
+  },
+  isVotedAgainst: {
+    type: Function,
+    required: true
+  },
+  isVotedAny: {
+    type: Function,
+    required: true
+  },
+  processingDecisions: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const emit = defineEmits(['authorize', 'vote-for', 'vote-against'])
+
+const { isMobile } = useWindowSize()
+
+// Получение заголовка для решения с поддержкой агрегатов документов
+function getDecisionTitle(row: any) {
+  // Используем только агрегаты документа
+  if (row.documents?.statement?.documentAggregate?.rawDocument?.meta?.title) {
+    const title = row.documents.statement.documentAggregate.rawDocument.meta.title
+    const user = row.documents.statement.action.user
+    return props.formatDecisionTitle(title, user)
+  }
+
+  // Запасной вариант
+  return 'Вопрос на голосование'
+}
+
+// Настройка таблицы
+const columns = [
+  { name: 'id', align: 'left', label: '№', field: row => row.table.id, sortable: true },
+  { name: 'username', align: 'left', label: 'Аккаунт', field: row => row.table.username, sortable: true },
+  { name: 'caption', align: 'left', label: 'Пункт', field: row => getDecisionTitle(row), sortable: true },
+  { name: 'expired_at', align: 'left', label: 'Истекает', field: row => row.table.expired_at, format: val => formatToFromNow(val), sortable: false },
+  { name: 'approved', align: 'left', label: 'Голосование', field: row => row.table.approved, sortable: true },
+  { name: 'authorized', align: 'left', label: '', field: row => row.table.authorized, sortable: true },
+] as any
+
+// Состояние UI
+const expanded = reactive(new Map()) // Map для отслеживания состояния развертывания каждой записи
+const tableRef = ref(null)
+const pagination = ref({ rowsPerPage: 10 })
+
+// UI методы
+const toggleExpand = (id: any) => {
+  expanded.set(id, !expanded.get(id))
+}
+
+const isProcessing = (decisionId: number) => {
+  // Используем только processingDecisions из props
+  return Boolean(props.processingDecisions[decisionId])
+}
+
+// Обработчики событий
+const onAuthorizeDecision = (row: Cooperative.Document.IComplexAgenda) => {
+  emit('authorize', row)
+}
+
+const onVoteFor = (decision_id: number) => {
+  emit('vote-for', decision_id)
+}
+
+const onVoteAgainst = (decision_id: number) => {
+  emit('vote-against', decision_id)
+}
+</script>

package/src/widgets/Questions/ui/QuestionsTable/index.ts

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

package/src/widgets/Questions/ui/VotingButtons/VotingButtons.vue

@@ -0,0 +1,75 @@
+<template lang="pug">
+div.buttons-container
+  div.votes-group
+    q-btn(v-if="isVotedFor(decision) || !isVotedAny(decision)" :disabled="isVotedAny(decision)" dense flat @click="$emit('vote-against')").text-red
+      q-icon(name="fa-regular fa-thumbs-down")
+      span.vote-count {{decision.votes_against.length}}
+
+    q-btn(v-if="isVotedAgainst(decision)" disabled dense flat).text-red
+      q-icon(name="fas fa-thumbs-down")
+      span.vote-count {{decision.votes_against.length}}
+
+  q-checkbox(v-model="approved" disable).q-mx-xs
+
+  div.votes-group
+    q-btn(v-if="isVotedAgainst(decision) || !isVotedAny(decision)" :disabled="isVotedAny(decision)" dense flat @click="$emit('vote-for')").text-green
+      span.vote-count {{decision.votes_for.length}}
+      q-icon(name="fa-regular fa-thumbs-up" style="transform: scaleX(-1)")
+
+    q-btn(v-if="isVotedFor(decision)" disabled dense flat).text-green
+      span.vote-count {{decision.votes_for.length}}
+      q-icon(name="fas fa-thumbs-up" style="transform: scaleX(-1)")
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+const props = defineProps({
+  decision: {
+    type: Object,
+    required: true
+  },
+  isVotedFor: {
+    type: Function,
+    required: true
+  },
+  isVotedAgainst: {
+    type: Function,
+    required: true
+  },
+  isVotedAny: {
+    type: Function,
+    required: true
+  }
+})
+
+defineEmits(['vote-for', 'vote-against'])
+
+const approved = computed(() => props.decision.approved)
+</script>
+
+<style scoped>
+.buttons-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 150px;
+}
+
+.votes-group {
+  width: 60px;
+  display: flex;
+  justify-content: center;
+}
+
+.vote-count {
+  min-width: 25px;
+  display: inline-block;
+  text-align: center;
+}
+
+.q-btn {
+  min-width: 60px;
+  height: 32px;
+}
+</style>

package/src/widgets/Questions/ui/VotingButtons/index.ts

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

package/src/widgets/Questions/ui/index.ts

@@ -0,0 +1,3 @@
+export * from './QuestionCard'
+export * from './QuestionsTable'
+export * from './VotingButtons'

package/src/widgets/RequireAgreements/index.ts

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

package/src/widgets/User/PaymentMethods/ui/PaymentMethods.vue

@@ -1,88 +1,81 @@
 <template lang="pug">
-div(flat bordered).q-pa-md
-  p Указанные реквизиты используются кооперативом для возврата паевых взносов пайщику.
-
-  AddPaymentMethodButton(:username="username")
-
-  q-list.full-width.q-mt-lg
-    q-item(v-for="(method, index) in wallet.methods" :key="method.method_id").full-width
-      q-card(flat).full-width
-        div(v-if="method.method_type ==='sbp' && isSBPData(method.data)")
-          div(style="max-width: 300px").flex.justify-between
-
-            span
-              span {{ index + 1}}.
-              span(v-if="method.method_type ==='sbp'").q-pl-xs СБП
-            DeletePaymentButton(:size="'xs'" :username="username" :method_id="method.method_id")
-
-
-            q-input(v-model="method.data.phone" label="Номер телефона" standout="bg-teal text-white" readonly).full-width
-
-        div(style="max-width: 300px" v-if="method.method_type ==='bank_transfer' && isBankTransferData(method.data)")
-          div.flex.justify-between
-            span
-              span {{ index + 1 }}.
-              span(v-if="method.method_type ==='bank_transfer'").q-pl-xs Банковский перевод
-            DeletePaymentButton(:size="'xs'" :username="username" :method_id="method.method_id")
-
-          div
-            q-select(
-              v-model="method.data.currency"
-              readonly
-              label="Валюта счёта"
-              standout="bg-teal text-white"
-              :options="[{ label: 'RUB', value: 'RUB' }]"
-              emit-value
-              map-options
-            )
-
-            q-input(
-              v-model="method.data.bank_name"
-              readonly
-              standout="bg-teal text-white"
-              label="Наименование банка"
-              autocomplete="off"
-            )
-
-            q-input(
-              v-model="method.data.details.corr"
-              standout="bg-teal text-white"
-              readonly
-              mask="####################"
-              label="Корреспондентский счет"
-              autocomplete="off"
-            )
-
-            q-input(
-              v-model="method.data.details.bik"
-              readonly
-              standout="bg-teal text-white"
-              mask="#########"
-              label="БИК"
-              autocomplete="off"
-            )
-
-            q-input(
-              v-model="method.data.details.kpp"
-              readonly
-              standout="bg-teal text-white"
-              mask="#########"
-              label="КПП"
-              autocomplete="off"
-            )
-
-            q-input(
-              v-model="method.data.account_number"
-              standout="bg-teal text-white"
-              readonly
-              mask="####################"
-              label="Номер счета"
-              autocomplete="off"
-            )
-
-
+div.q-pa-md
+  q-card(flat class="card-container q-pa-md")
+    div.row.items-center
+      div.col-12
+        div.text-h4.q-mb-sm Способы получения платежей
+        p.q-mb-md Указанные реквизиты используются при платежах от кооператива в пользу пайщика
+
+    div.row.q-mb-md
+      div.col-12
+        AddPaymentMethodButton(:username="username").full-width.card-action-btn
+
+    div.row
+      div.col-12
+        div(v-if="wallet.methods && wallet.methods.length > 0")
+          div.info-card.hover(
+            v-for="(method, index) in wallet.methods"
+            :key="method.method_id"
+            class="q-mb-md"
+          )
+            div.row.items-start
+              div.col-auto.q-mr-sm
+                q-badge(color="primary" outline) {{ index + 1 }}
+              div.col
+                div.card-title {{ method.method_type === 'sbp' ? 'Система Быстрых Платежей' : 'Банковский перевод' }}
+
+                div.q-mb-md(v-if="method.method_type === 'sbp' && isSBPData(method.data)")
+                  div.q-my-sm
+                    span.card-label Телефон:
+                    span.card-value {{ method.data.phone }}
+
+                div.q-mb-md(v-if="method.method_type === 'bank_transfer' && isBankTransferData(method.data)")
+                  div.row.q-col-gutter-md
+                    div.col-12.col-md-4
+                      div.q-my-sm
+                        div.card-label Валюта
+                        div.card-value {{ method.data.currency }}
+
+                    div.col-12.col-md-4
+                      div.q-my-sm
+                        div.card-label Банк
+                        div.card-value {{ method.data.bank_name }}
+
+                    div.col-12.col-md-4
+                      div.q-my-sm
+                        div.card-label Счет
+                        div.card-value {{ method.data.account_number }}
+
+                  div.row.q-col-gutter-md
+                    div.col-12.col-md-4
+                      div.q-my-sm
+                        div.card-label Корр. счет
+                        div.card-value {{ method.data.details.corr }}
+
+                    div.col-12.col-md-4
+                      div.q-my-sm
+                        div.card-label БИК
+                        div.card-value {{ method.data.details.bik }}
+
+                    div.col-12.col-md-4
+                      div.q-my-sm
+                        div.card-label КПП
+                        div.card-value {{ method.data.details.kpp }}
+
+                div.row.justify-end
+                  DeletePaymentButton(
+                    :size="'sm'"
+                    :username="username"
+                    :method_id="method.method_id"
+                    flat
+                    class="card-action-btn"
+                  )
+
+        div.q-pa-md.text-center(v-else)
+          p.text-grey У вас еще не добавлены способы получения платежей
 </template>
 
+
 <script lang="ts" setup>
 import { useWalletStore } from 'src/entities/Wallet';
 import { useSystemStore } from 'src/entities/System/model';
@@ -92,6 +85,7 @@ import { computed } from 'vue';
 import { AddPaymentMethodButton } from 'src/features/PaymentMethod/AddPaymentMethod';
 import type { IBankTransferData, ISBPData } from 'src/features/PaymentMethod/AddPaymentMethod/model';
 import { DeletePaymentButton } from 'src/features/PaymentMethod/DeletePaymentMethod/ui';
+import 'src/shared/ui/CardStyles/index.scss';
 
 const props = defineProps({
   username: {
@@ -104,7 +98,7 @@ const wallet = useWalletStore()
 
 const username = computed(() => props.username)
 
-wallet.loadUserWalet({ coopname: info.coopname, username: username.value })
+wallet.loadUserWallet({ coopname: info.coopname, username: username.value })
 
 function isSBPData(data: ISBPData | IBankTransferData): data is ISBPData {
   return (data as ISBPData).phone !== undefined;
@@ -113,6 +107,8 @@ function isSBPData(data: ISBPData | IBankTransferData): data is ISBPData {
 function isBankTransferData(data: ISBPData | IBankTransferData): data is IBankTransferData {
   return (data as IBankTransferData).account_number !== undefined;
 }
-
-
 </script>
+
+<style lang="scss" scoped>
+// Можно добавить дополнительные стили, если потребуется
+</style>

package/src-ssr/middlewares/injectEnv.ts

@@ -0,0 +1,49 @@
+import { ssrMiddleware } from 'quasar/wrappers';
+import { EnvVars } from '../../src/shared/config/Environment';
+
+/**
+ * SSR middleware для инъекции переменных окружения в браузер
+ * Создает window.__ENV__ со всеми переменными, которые должны быть доступны на клиенте
+ */
+export default ssrMiddleware(({ app }) => {
+  // Регистрируем middleware для всех запросов
+  app.use((req, res, next) => {
+    // Получаем переменные из process.env, которые нужны клиенту
+    const envForClient: EnvVars = {
+      NODE_ENV: process.env.NODE_ENV,
+      BACKEND_URL: process.env.BACKEND_URL,
+      CHAIN_URL: process.env.CHAIN_URL,
+      CHAIN_ID: process.env.CHAIN_ID,
+      CURRENCY: process.env.CURRENCY,
+      COOP_SHORT_NAME: process.env.COOP_SHORT_NAME,
+      SITE_DESCRIPTION: process.env.SITE_DESCRIPTION,
+      SITE_IMAGE: process.env.SITE_IMAGE,
+      STORAGE_URL: process.env.STORAGE_URL,
+      UPLOAD_URL: process.env.UPLOAD_URL,
+      VUE_ROUTER_MODE: process.env.VUE_ROUTER_MODE,
+      VUE_ROUTER_BASE: process.env.VUE_ROUTER_BASE
+    };
+
+    // Создаем скрипт, который добавит переменные в window.__ENV__
+    const script = `
+    <script>
+      window.__ENV__ = ${JSON.stringify(envForClient)};
+      console.log('SSR: Переменные окружения загружены');
+    </script>
+    `;
+
+    // Оригинальный метод отправки HTML
+    const originalSend = res.send;
+
+    // Переопределяем метод, чтобы вставить наш скрипт перед закрывающим тегом </head>
+    res.send = function (html) {
+      if (typeof html === 'string') {
+        html = html.replace('</head>', `${script}</head>`);
+      }
+      return originalSend.call(this, html);
+    };
+
+    // Продолжаем обработку запроса
+    next();
+  });
+});

package/tsconfig.json

@@ -12,7 +12,7 @@
   "vueCompilerOptions": {
     "plugins": ["@vue/language-plugin-pug"]
   },
-  // "include": ["./**/*.vue", "./**/*.ts"],
+  "include": ["./**/*.vue", "./**/*.ts"],
   "exclude": [
     "./Env-example.ts",
     "./dist",

package/extensions/powerup/boot.ts

@@ -1,17 +0,0 @@
-import { boot } from 'quasar/wrappers'
-import { App } from 'vue'
-import { Router } from 'vue-router'
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export default boot(({ app, router }: { app: App<Element>; router: Router }) => {
-  // Пример инициализации компонента
-  // app.component('MyExtensionComponent', () => import('./MyExtensionComponent.vue'))
-
-  // Пример добавления маршрута, если нужно
-  // router.addRoute({
-  //   path: '/my-extension',
-  //   component: () => import('./MyExtensionPage.vue')
-  // })
-
-  console.log('Расширение powerup загружено успешно')
-})