@coopenomics/desktop 2025.6.14 → 2025.6.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2025.6.14",
+  "version": "2025.6.19",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -24,8 +24,8 @@
     "start": "node -r ./alias-resolver.js dist/ssr/index.js"
   },
   "dependencies": {
-    "@coopenomics/controller": "2025.6.14",
-    "@coopenomics/sdk": "2025.6.14",
+    "@coopenomics/controller": "2025.6.19",
+    "@coopenomics/sdk": "2025.6.19",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -50,7 +50,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2025.6.14",
+    "cooptypes": "2025.6.19",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -103,5 +103,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "1c376c003ab7d30e5fa11e13152795ac4823885a"
+  "gitHead": "1bd8f003f744f0a1f0ecde84dc8841763e31f858"
 }

package/src/entities/Session/model/store.ts

@@ -77,7 +77,7 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
         }
       } catch (e: any) {
         console.error(e);
-        FailAlert(e.message);
+        FailAlert(e);
         close()
         globalStore.logout()
       }

package/src/features/Installer/ui/RequestKeyForm/RequestKeyForm.vue

@@ -52,7 +52,7 @@ form(@submit.prevent="submit").full-width
 
     } catch (e: any) {
       loading.value = false
-      FailAlert(e.message)
+      FailAlert(e)
     }
 
   }

package/src/features/Installer/ui/SetSovietForm/SetSovietForm.vue

@@ -59,7 +59,7 @@ const next = async () => {
 
     SuccessAlert('Установка произведена успешно')
   } catch(e: any){
-    FailAlert(e.message)
+    FailAlert(e)
     loading.value = false
   }
 

package/src/features/Meet/CreateMeet/model/index.ts

@@ -18,6 +18,7 @@ export interface ICreateMeetWithAgendaInput {
   open_at: string
   close_at: string
   username: string
+  type: 'regular' | 'extra'
   agenda_points: {
     title: string
     context: string
@@ -81,11 +82,12 @@ export async function createMeetWithAgenda(data: ICreateMeetWithAgendaInput): Pr
     coopname: data.coopname,
     username: data.username,
     meet: {
-      type: 'regular', // По умолчанию очередное собрание
+      type: data.type,
       open_at_datetime: openAtFormatted,
       close_at_datetime: closeAtFormatted
     },
-    questions: questions
+    questions: questions,
+    is_repeated: false
   })
 
 

package/src/features/Meet/CreateMeet/ui/CreateMeet.vue

@@ -5,9 +5,11 @@ div
     label="Создать общее собрание"
     @click="showCreateMeetDialog = true"
   )
+
   CreateMeetForm(
     v-model="showCreateMeetDialog"
     :loading="isCreating"
+    :is-chairman="isChairman"
     @create="handleCreate"
   )
 </template>
@@ -22,6 +24,11 @@ import { useRoute } from 'vue-router'
 import { Notify } from 'quasar'
 import { FailAlert } from 'src/shared/api'
 
+// Определяем пропсы
+defineProps<{
+  isChairman: boolean
+}>()
+
 const route = useRoute()
 const sessionStore = useSessionStore()
 const meetStore = useMeetStore()
@@ -40,6 +47,7 @@ const handleCreate = async (formData: any) => {
       open_at: formData.open_at,
       close_at: formData.close_at,
       username: sessionStore.username,
+      type: formData.type,
       agenda_points: formData.agenda_points
     })
 

package/src/features/Meet/CreateMeet/ui/CreateMeetForm.vue

@@ -2,12 +2,23 @@
 q-dialog(:model-value="modelValue" @update:model-value="$emit('update:modelValue', $event)" persistent)
   q-card(style="min-width: 500px")
     q-card-section.row.items-center
-      div.text-h6 Создать общее собрание
+      div.text-h6 Создать общее собрание {{ isChairman ? '(Председатель)' : '(Член совета)' }}
       q-space
       q-btn(icon="close" flat round dense v-close-popup @click="$emit('update:modelValue', false)")
 
     q-card-section
       q-form(@submit="handleSubmit")
+        // Выбор типа собрания
+        q-select(
+          v-model="formData.type"
+          :options="meetTypeOptions"
+          label="Тип собрания"
+          emit-value
+          map-options
+          :rules="[val => !!val || 'Обязательное поле']"
+          dense
+        )
+
         q-input(
           v-model="formData.presider"
           label="Имя аккаунта председателя собрания"
@@ -88,18 +99,25 @@ q-dialog(:model-value="modelValue" @update:model-value="$emit('update:modelValue
 </template>
 
 <script setup lang="ts">
-import { reactive } from 'vue'
+import { reactive, computed, onMounted } from 'vue'
 import { useAgendaPoints } from 'src/shared/hooks/useAgendaPoints'
 import { getCurrentLocalDateForForm, convertLocalDateToUTC, getTimezoneLabel, getFutureDateForForm } from 'src/shared/lib/utils/dates/timezone'
 import { env } from 'src/shared/config/Environment'
 import { useSessionStore } from 'src/entities/Session';
 import { useSystemStore } from 'src/entities/System/model';
 
-defineProps<{
+// Определяем пропсы один раз
+const props = defineProps<{
   modelValue: boolean,
-  loading?: boolean
+  loading?: boolean,
+  isChairman: boolean
 }>()
 
+// Отладочная информация при монтировании
+onMounted(() => {
+  console.log('CreateMeetForm mounted, isChairman:', props.isChairman)
+})
+
 const emit = defineEmits<{
   (e: 'update:modelValue', value: boolean): void
   (e: 'create', data: any): void
@@ -110,6 +128,30 @@ const timezoneLabel = getTimezoneLabel()
 const session = useSessionStore()
 const system = useSystemStore()
 
+// Делаем isChairman доступным в шаблоне напрямую для отладки
+const isChairman = computed(() => {
+  console.log('Вычисляемое свойство isChairman:', props.isChairman)
+  return props.isChairman
+})
+
+// Опции для выбора типа собрания в зависимости от роли
+const meetTypeOptions = computed(() => {
+  // Выведем отладочную информацию, чтобы увидеть значение флага
+  console.log('isChairman в форме для опций:', props.isChairman)
+
+  // Председатель может выбирать любой тип
+  if (props.isChairman) {
+    return [
+      { label: 'Очередное собрание', value: 'regular' },
+      { label: 'Внеочередное собрание', value: 'extra' }
+    ]
+  }
+  // Члены совета могут создавать только внеочередное
+  return [
+    { label: 'Внеочередное собрание', value: 'extra' }
+  ]
+})
+
 // Форма для создания собрания
 const formData = reactive(
   env.NODE_ENV === 'development'
@@ -121,6 +163,7 @@ const formData = reactive(
         open_at: getCurrentLocalDateForForm(0.17), // ~10 секунд от текущего времени
         close_at: getCurrentLocalDateForForm(2), // 2 минуты от текущего времени
         username: session.username,
+        type: props.isChairman ? 'regular' : 'extra', // Тип по умолчанию в зависимости от роли
         agenda_points: [
           {
             title: 'Тестовый вопрос',
@@ -137,6 +180,7 @@ const formData = reactive(
         open_at: getFutureDateForForm(15, 6, 0), // через 15 дней, 6:00
         close_at: getFutureDateForForm(18, 12, 0), // через 18 дней, 12:00
         username: session.username,
+        type: props.isChairman ? 'regular' : 'extra', // Тип по умолчанию в зависимости от роли
         agenda_points: [
           // пустой массив, либо можно добавить пустой объект для вёрстки
         ],

package/src/features/Meet/GenerateSovietDecision/model/index.ts

@@ -36,7 +36,7 @@ export function useGenerateSovietDecisionOnAnnualMeet() {
     if (!data.meet_hash) {
       throw new Error('Необходимо указать хеш собрания (meet_hash)')
     }
-
+    console.log('data', data)
     const { [Mutations.Meet.GenerateSovietDecisionOnAnnualMeetDocument.name]: result } = await client.Mutation(
       Mutations.Meet.GenerateSovietDecisionOnAnnualMeetDocument.mutation,
       {

package/src/features/Meet/RestartMeet/model/index.ts

@@ -27,6 +27,7 @@ export interface IRestartMeetWithProposalInput {
     context: string
     decision: string
   }[]
+  type: string
 }
 
 /**
@@ -81,11 +82,12 @@ export async function restartMeetWithProposal(data: IRestartMeetWithProposalInpu
     coopname: data.coopname,
     username: data.username,
     meet: {
-      type: 'regular', // По умолчанию очередное собрание
+      type: data.type,
       open_at_datetime: openAtFormatted,
       close_at_datetime: closeAtFormatted
     },
-    questions: questions
+    questions: questions,
+    is_repeated: true
   })
 
   // Подписываем документ
@@ -145,13 +147,24 @@ export const useRestartMeet = (
     if (!meetStore.currentMeet) return false
     processingRef.value = true
     try {
+      // Выводим полную структуру для отладки
+      console.log('Полные данные о собрании:', meetStore.currentMeet)
+
+      // Получаем тип собрания из текущего объекта meet
+      // По умолчанию используем 'regular' если тип не найден
+      const originalMeetType = (meetStore.currentMeet.processing?.meet.proposal?.document.meta as any).meet.type
+
+      // Выводим для отладки
+      console.log('Тип собрания для перезапуска:', originalMeetType)
+
       const result = await restartMeetWithProposal({
         coopname: info.coopname,
         hash: meetStore.currentMeet.hash,
         username: sessionStore.username,
         new_open_at: data.new_open_at,
         new_close_at: data.new_close_at,
-        agenda_points: data.agenda_points
+        agenda_points: data.agenda_points,
+        type: originalMeetType // Передаем оригинальный тип собрания
       })
 
       await meetStore.loadMeet({ coopname: info.coopname, hash: result.processing?.hash as string})

package/src/features/PaymentMethod/AddPaymentMethod/ui/AddPaymentButton.vue

@@ -159,7 +159,7 @@ const handlerSubmit = async (): Promise<void> => {
   } catch (e: any) {
     showDialog.value = false
     isSubmitting.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 

package/src/features/PaymentMethod/DeletePaymentMethod/ui/DeletePaymentMethodButton.vue

@@ -61,7 +61,7 @@ const handlerSubmit = async (): Promise<void> => {
   } catch (e: any) {
     showDialog.value = false
     isSubmitting.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 

package/src/features/Request/AcceptRequest/ui/AcceptButton.vue

@@ -31,7 +31,7 @@ const accept = async () => {
 
     SuccessAlert('Заявка принята')
   } catch (e: any) {
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 </script>

package/src/features/Request/CancelRequest/ui/CancelButton.vue

@@ -30,7 +30,7 @@ q-btn(color="red" @click="cancel") отменить поставку
       } as ICancelRequest)
       SuccessAlert('Заявка отменена')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/CompleteOnRequest/ui/CompleteOnRequestButton.vue

@@ -31,7 +31,7 @@ q-btn(color="green" @click="complete") завершить поставку
 
       SuccessAlert('Подтверждение принято')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/ConfirmRecieveOnRequest/ui/ConfirmRecieveOnRequest.vue

@@ -31,7 +31,7 @@ q-btn(color="green" @click="confirmRecieve") выдал имущество
 
       SuccessAlert('Выдача имущества подтверждена')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/ConfirmSupplyOnRequest/ui/ConfirmSupplyOnRequestButton.vue

@@ -32,7 +32,7 @@ q-btn(color="green" @click="supply") Подписать акт передачи
 
       SuccessAlert('Имущество принято в кооператив')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/CreateChildOrder/ui/CreateChildOrderButton/CreateChildOrderButton.vue

@@ -50,7 +50,7 @@
       SuccessAlert('Заказ НЕ создан')
       router.push({ name: 'marketplace-user-supplies' }) //TODO роутинг
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/CreateParentOffer/ui/CreateParentOfferForm/CreateParentOfferForm.vue

@@ -63,7 +63,7 @@ const handlerSubmit = async () => {
     SuccessAlert('Объявление успешно создано')
   } catch (e: any) {
     console.log(e)
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 </script>

package/src/features/Request/DeliverOnRequest/ui/DeliverOnRequestButton.vue

@@ -32,7 +32,7 @@ q-btn(color="green" @click="delivered") Подтвердить доставку
 
       SuccessAlert('Подтверждение принято')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/DisputeOnRequest/ui/DisputeOnRequestButton.vue

@@ -31,7 +31,7 @@ q-btn(color="red" @click="dispute") вернуть по гарантии
 
       SuccessAlert('Спор открыт')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/PublishRequest/ui/PublishRequestButton.vue

@@ -30,7 +30,7 @@ q-btn(@click="publish") опубликовать
       })
       SuccessAlert('Заявка опубликована')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/RecieveOnRequest/ui/RecieveOnRequestButton.vue

@@ -31,7 +31,7 @@ q-btn(color="green" @click="recieve") получил имущество
 
       SuccessAlert('Подтверждение принято')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/SupplyOnRequest/ui/SupplyOnRequestButton.vue

@@ -31,7 +31,7 @@ q-btn(color="green" @click="supply") Подписать акт приёма
       } as ISupplyOnRequest)
       SuccessAlert('Ваша подпись принята')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/UnpublishRequest/ui/UnpublishRequestButton.vue

@@ -30,7 +30,7 @@ q-btn(@click="unpublish") снять с публикации
       })
       SuccessAlert('Заявка снята с публикации')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

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

@@ -83,7 +83,7 @@ const addNow = async () => {
 
     clear()
   } catch(e: any){
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 

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

@@ -104,7 +104,7 @@ const submit = async () => {
   } catch (e: any) {
     console.error(e)
     loading.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 
 }

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

@@ -62,7 +62,7 @@ const handlerSubmit = async (): Promise<void> => {
   } catch (e: any) {
     console.log('e.message', e.message)
     isSubmitting.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 

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

@@ -42,7 +42,7 @@ const handlerSubmit = async (): Promise<void> => {
   } catch (e: any) {
     // console.log('e.message', e.message)
     isSubmitting.value = false
-    // FailAlert(e.message)
+    // FailAlert(e)
   }
 }
 

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

@@ -5,7 +5,7 @@ div
     div.row.justify-center
       div.col-12
         div.row.q-pa-md(v-if="canCreateMeet")
-          CreateMeet
+          CreateMeet(:is-chairman="isChairman")
         MeetCardsList(
           :meets="meets"
           :loading="loading"

package/src/pages/Registrator/SignUp/GenerateAccount.vue

@@ -77,7 +77,7 @@ const setAccount = async () => {
   } catch (e: any) {
     store.goTo('SetUserData')
     console.error(e)
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 </script>

package/src/pages/Registrator/SignUp/ReadStatement.vue

@@ -70,7 +70,7 @@ const loadStatement = async (): Promise<void> => {
     isLoading.value = false
   } catch (e: any) {
     isLoading.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 const back = () => {

package/src/pages/Registrator/SignUp/SignUp.vue

@@ -91,8 +91,6 @@ watch(
   () => {
     if (store.step >= steps.GenerateAccount && store.step < steps.WaitingRegistration) {
       useInitWalletProcess().run()
-      // currentUser.loadProfile(username.value, info.coopname)
-      // wallet.loadUserWallet({coopname: info.coopname, username: username.value})
     }
   }
 )

package/src/pages/Union/ListOfCooperatives/ui/UnionPageListOfCooperatives.vue

@@ -99,7 +99,7 @@
       loadCooperatives()
       SuccessAlert('Кооператив активирован')
     } catch(e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 
@@ -111,7 +111,7 @@
       loadCooperatives()
       SuccessAlert('Кооператив заблокирован')
     } catch(e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 

package/src/processes/process-decisions/index.ts

@@ -135,10 +135,15 @@ export function useDecisionProcessor() {
     }
     else if (registry_id === Cooperative.Registry.AnnualGeneralMeetingSovietDecision.registry_id) {
       const { generateSovietDecisionOnAnnualMeet } = useGenerateSovietDecisionOnAnnualMeet()
+      const unparsedDocumentMeta = row.table.statement.meta == '' ? '{}' : row.table.statement.meta
+      const parsedDocumentMeta = JSON.parse(unparsedDocumentMeta) as Cooperative.Registry.AnnualGeneralMeetingAgenda.Action
+      const is_repeated = parsedDocumentMeta.is_repeated || false
+
       document = await generateSovietDecisionOnAnnualMeet({
         username: username,
         decision_id: decision_id,
-        meet_hash: row.table.hash as string
+        meet_hash: row.table.hash as string,
+        is_repeated
       })
     }
     else {

package/src/processes/select-branch/index.ts

@@ -1,4 +1,4 @@
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { useSelectBranch } from 'src/features/Branch/SelectBranch'
 import { useSystemStore } from 'src/entities/System/model'
 import { useSessionStore } from 'src/entities/Session'
@@ -24,9 +24,16 @@ export function useSelectBranchProcess() {
 
   const branches = computed(() => branchStore.publicBranches)
 
-  if (session.isAuth) {
-    branchStore.loadPublicBranches({ coopname: system.info.coopname })
-  }
+  // Вотчер на авторизацию
+  watch(
+    () => session.isAuth,
+    (isAuth, wasAuth) => {
+      if (isAuth && !wasAuth) {
+        branchStore.loadPublicBranches({ coopname: system.info.coopname })
+      }
+    },
+    { immediate: true }
+  )
 
   const next = async () => {
     isLoading.value = true

package/src/shared/api/errors.ts

@@ -15,13 +15,14 @@ export function createBlockchainGetError(name: string) {
 
 export function handleException(e: unknown): void {
   if (e instanceof Error) {
-    FailAlert(e.message);
+    FailAlert(e);
   } else {
     FailAlert('Произошла неизвестная ошибка');
   }
 }
 
 export function extractGraphQLErrorMessages(error: unknown): string {
+  if (typeof error === 'string') return error;
   if (!error || typeof error !== 'object') return 'Unknown error';
 
   // Проверяем, если ошибка уже является массивом

package/src/widgets/Cooperative/Funds/ui/AccumulationFunds.vue

@@ -16,7 +16,7 @@ const loadFunds = async () => {
   try {
     await coop.loadFunds(info.coopname)
   } catch(e: any){
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 
@@ -48,7 +48,7 @@ const delFund = async(fund: FundContract.Tables.AccumulatedFunds.IAccumulatedFun
     SuccessAlert('Фонд успешно удалён')
 
   } catch (e: any){
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 
@@ -74,7 +74,7 @@ const saveFund = async (fund: FundContract.Tables.AccumulatedFunds.IAccumulatedF
 
       SuccessAlert('Фонд успешно обновлён')
     } catch(e: any){
-      FailAlert(e.message)
+      FailAlert(e)
       await coop.loadFunds(info.coopname)
     }
 

package/src/widgets/Cooperative/Funds/ui/AddAccumulationFund.vue

@@ -47,7 +47,7 @@ const addFund = async() => {
     SuccessAlert('Фонд успешно создан')
   } catch(e: any){
     localShowAdd.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 
 }

package/src/widgets/Cooperative/Funds/ui/AddExpenseFund.vue

@@ -45,7 +45,7 @@ const addFund = async() => {
     SuccessAlert('Фонд успешно создан')
   } catch(e: any){
     localShowAdd.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 
 }

package/src/widgets/Cooperative/Funds/ui/ExpenseFunds.vue

@@ -16,7 +16,7 @@ const loadFunds = async () => {
   try {
     await coop.loadFunds(info.coopname)
   } catch(e: any){
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 
@@ -42,7 +42,7 @@ const delFund = async(fund: FundContract.Tables.AccumulatedFunds.IAccumulatedFun
     SuccessAlert('Фонд успешно удалён')
 
   } catch (e: any){
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 
@@ -67,7 +67,7 @@ const saveFund = async (fund: FundContract.Tables.AccumulatedFunds.IAccumulatedF
 
       SuccessAlert('Фонд успешно обновлён')
     } catch(e: any){
-      FailAlert(e.message)
+      FailAlert(e)
       await coop.loadFunds(info.coopname)
     }
 

package/src/widgets/Registrator/LostKey/ui/LostKey.vue

@@ -55,7 +55,7 @@ const submit = async () => {
     loading.value = false
   } catch (e: any) {
     loading.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 

package/src/widgets/Registrator/ResetKey/ui/ResetKey.vue

@@ -82,7 +82,7 @@ const finish = async () => {
 
   } catch (e: any) {
     loading.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }