@coopenomics/desktop 2025.11.10-alpha-2 → 2025.11.11-alpha-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2025.11.10-alpha-2",
+  "version": "2025.11.11-alpha-1",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -25,9 +25,9 @@
     "start": "node -r ./alias-resolver.js dist/ssr/index.js"
   },
   "dependencies": {
-    "@coopenomics/controller": "2025.11.10-alpha-2",
-    "@coopenomics/notifications": "2025.11.10-alpha-2",
-    "@coopenomics/sdk": "2025.11.10-alpha-2",
+    "@coopenomics/controller": "2025.11.11-alpha-1",
+    "@coopenomics/notifications": "2025.11.11-alpha-1",
+    "@coopenomics/sdk": "2025.11.11-alpha-1",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@editorjs/code": "^2.9.3",
@@ -59,7 +59,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2025.11.10-alpha-2",
+    "cooptypes": "2025.11.11-alpha-1",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -123,5 +123,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "e914a117682b30c65a8fe762148bb579aa50d62d"
+  "gitHead": "5b3c9c90552b081e0a4532048329454c0e43132a"
 }

package/src/entities/ConnectionAgreement/index.ts

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

package/src/entities/ConnectionAgreement/model/index.ts

@@ -0,0 +1,2 @@
+export { useConnectionAgreementStore } from './store'
+export type { ITariff, IConnectionAgreementState } from './types'

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

@@ -0,0 +1,187 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { DigitalDocument } from 'src/shared/lib/document'
+import { useSessionStore } from 'src/entities/Session'
+import { useLoadCooperatives } from 'src/features/Union/LoadCooperatives'
+import type { ITariff, IConnectionAgreementState, ICooperativeFormData } from './types'
+
+
+const namespace = 'connection-agreement'
+
+export const useConnectionAgreementStore = defineStore(namespace, () => {
+  // State
+  const currentStep = ref<number>(1)
+  const selectedTariff = ref<ITariff | null>(null)
+  const isInitialized = ref<boolean>(false)
+  const document = ref<any>(null)
+  const signedDocument = ref<any>(null)
+  const formData = ref<ICooperativeFormData>({
+    announce: '',
+    initial: '',
+    minimum: '',
+    org_initial: '',
+    org_minimum: ''
+  })
+
+  // Methods
+  const setCurrentStep = (step: number) => {
+    currentStep.value = step
+  }
+
+  const setSelectedTariff = (tariff: ITariff | null) => {
+    selectedTariff.value = tariff
+  }
+
+  const setInitialized = (initialized: boolean) => {
+    isInitialized.value = initialized
+  }
+
+  const setDocument = (doc: any) => {
+    document.value = doc
+  }
+
+  const setSignedDocument = (doc: any) => {
+    signedDocument.value = doc
+  }
+
+  const setFormData = (data: ICooperativeFormData) => {
+    formData.value = data
+  }
+
+  // Actions
+  const generateDocument = async () => {
+    console.log('🔄 Начинаем генерацию документа')
+    const session = useSessionStore()
+    const formDataValue = formData.value
+    console.log('📋 Данные формы:', formDataValue)
+
+    try {
+      console.log('📄 Создаем новый DigitalDocument')
+      const newDoc = new DigitalDocument()
+
+    const params: any = {
+      registry_id: 50,
+      coopname: 'voskhod',
+      username: session.username
+    }
+
+      // Передаем данные из формы в документ, если они есть
+      if (formDataValue) {
+        params.announce = formDataValue.announce
+        params.initial = formDataValue.initial
+        params.minimum = formDataValue.minimum
+        params.org_initial = formDataValue.org_initial
+        params.org_minimum = formDataValue.org_minimum
+      }
+
+      console.log('🔧 Генерируем документ с параметрами:', params)
+
+      await newDoc.generate(params)
+
+      console.log('✅ Документ успешно сгенерирован')
+      document.value = newDoc
+      return newDoc
+    } catch (error) {
+      console.error('❌ Ошибка при генерации документа:', error)
+      throw error
+    }
+  }
+
+  const signDocument = async () => {
+    const session = useSessionStore()
+    if (!document.value) {
+      throw new Error('Документ не найден')
+    }
+
+    await document.value.sign(session.username)
+    signedDocument.value = document.value.signedDocument
+    return signedDocument.value
+  }
+
+  const clearSignedDocument = async () => {
+    // Очищаем подписанный документ
+    signedDocument.value = null
+
+    // Регенерируем документ заново если есть данные формы
+    if (formData.value) {
+      await generateDocument()
+    }
+  }
+
+  const reloadCooperative = async () => {
+    const { loadOneCooperative } = useLoadCooperatives()
+    const session = useSessionStore()
+
+    try {
+      const coop = await loadOneCooperative(session.username)
+      return coop
+    } catch (error) {
+      console.error('Ошибка при перезагрузке кооператива:', error)
+      throw error
+    }
+  }
+
+  const reset = () => {
+    currentStep.value = 1
+    selectedTariff.value = null
+    isInitialized.value = false
+    document.value = null
+    signedDocument.value = null
+    formData.value = {
+      announce: '',
+      initial: '',
+      minimum: '',
+      org_initial: '',
+      org_minimum: ''
+    }
+  }
+
+  const initialize = (state: Partial<IConnectionAgreementState>) => {
+    if (state.currentStep !== undefined) {
+      currentStep.value = state.currentStep
+    }
+    if (state.selectedTariff !== undefined) {
+      selectedTariff.value = state.selectedTariff
+    }
+    if (state.isInitialized !== undefined) {
+      isInitialized.value = state.isInitialized
+    }
+    if (state.document !== undefined) {
+      document.value = state.document
+    }
+    if (state.signedDocument !== undefined) {
+      signedDocument.value = state.signedDocument
+    }
+    if (state.formData !== undefined && state.formData !== null) {
+      formData.value = state.formData
+    }
+  }
+
+  return {
+    // State
+    currentStep,
+    selectedTariff,
+    isInitialized,
+    document,
+    signedDocument,
+    formData,
+
+    // Methods
+    setCurrentStep,
+    setSelectedTariff,
+    setInitialized,
+    setDocument,
+    setSignedDocument,
+    setFormData,
+    reset,
+    initialize,
+
+    // Actions
+    generateDocument,
+    signDocument,
+    clearSignedDocument,
+    reloadCooperative
+  }
+}, {
+  persist: true
+})

package/src/entities/ConnectionAgreement/model/types.ts

@@ -0,0 +1,25 @@
+export interface ITariff {
+  id: string
+  name: string
+  description: string
+  price: string
+  features: string[]
+  additionalCosts?: string[]
+}
+
+export interface ICooperativeFormData {
+  announce: string
+  initial: string
+  minimum: string
+  org_initial: string
+  org_minimum: string
+}
+
+export interface IConnectionAgreementState {
+  currentStep: number
+  selectedTariff: ITariff | null
+  isInitialized: boolean
+  document?: any
+  signedDocument?: any
+  formData?: ICooperativeFormData
+}

package/src/features/Provider/model/index.ts

@@ -10,6 +10,7 @@ export interface HostingSubscriptionData {
   subscription_type_id: 1;
   progress: number;
   is_valid: boolean;
+  is_delegated: boolean;
 }
 
 /**
@@ -39,7 +40,7 @@ export function useProviderSubscriptions() {
   // Статус валидности домена для хостинг подписки (из specific_data)
   const domainValid = computed(() => {
     const specificData = hostingSubscription.value?.specific_data as SubscriptionSpecificData;
-    return specificData?.is_valid ?? null;
+    return (specificData?.is_valid && specificData?.is_delegated) ?? null;
   });
 
   // Прогресс установки для хостинг подписки (из specific_data)

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

@@ -1,29 +1,34 @@
 <template lang="pug">
-Form(:handler-submit="addNow" :is-submitting="isSubmitting" :showCancel="false" :button-cancel-txt="'Отменить'" :button-submit-txt="'Отправить'" @cancel="clear").q-gutter-md
-  //- q-input(standout="bg-teal text-white" label="Имя аккаунта" v-model="data.coopname" :rules="[val => notEmpty(val)]")
-  q-input(standout="bg-teal text-white" hint="domovoy.com или coop.domovoy.com" label="Домен или поддомен для запуска" v-model="data.params.announce" :rules="[val => notEmpty(val), val => isDomain(val)]")
+div
+  template(v-if="isSubmitting")
+    Loader(:text="'Создаем кооператив...'")
+  template(v-else)
+    Form(:handler-submit="addNow" :showCancel="false" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-gutter-md
+      //- q-input(standout="bg-teal text-white" label="Имя аккаунта" v-model="data.coopname" :rules="[val => notEmpty(val)]")
+      q-input(standout="bg-teal text-white" hint="domovoy.com или coop.domovoy.com" label="Домен или поддомен для запуска" v-model="data.params.announce" :rules="[val => notEmpty(val), val => isDomain(val)]")
 
-  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}}
+      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}}
 
-  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}}
+      q-input(standout="bg-teal text-white" hint="Минимальный паевый взнос для физлиц и ИП" v-model="data.params.minimum" type="number" :min="0" :rules="[val => notEmpty(val)]")
+        template(#append)
+          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}}
+      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}}
 
-  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}}
+      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}}
 
 </template>
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useAddCooperative } from '../model';
 import { Form } from 'src/shared/ui/Form';
+import { Loader } from 'src/shared/ui';
 import { notEmpty, isDomain } from 'src/shared/lib/utils';
 import { useSessionStore } from 'src/entities/Session';
 import { RegistratorContract } from 'cooptypes';
@@ -41,6 +46,10 @@ const props = defineProps({
   document: {
     type: Object as () => IDocument,
     required: true,
+  },
+  cooperative: {
+    type: Object as () => any,
+    default: null,
   }
 })
 
@@ -48,17 +57,31 @@ const document = computed(() => props.document)
 
 const session = useSessionStore()
 
+// Функция для извлечения числового значения из IAsset
+const extractNumericValue = (asset: any): string => {
+  if (!asset) return ''
+  if (typeof asset === 'number') return asset.toString()
+  if (typeof asset === 'string') {
+    // Извлекаем число из строки типа "1000.0000 RUB" и убираем лишние нули
+    const match = asset.match(/^(\d+(?:\.\d+)?)/)
+    if (match) {
+      return parseFloat(match[1]).toString()
+    }
+  }
+  return ''
+}
+
 const data = ref<RegistratorContract.Actions.RegisterCooperative.IRegisterCooperative>({
   coopname: session.username,
   params: {
     is_cooperative: true,
     coop_type: 'conscoop',
-    announce: '',
+    announce: props.cooperative?.announce || '',
     description: '',
-    initial: '',
-    minimum: '',
-    org_initial: '',
-    org_minimum: ''
+    initial: extractNumericValue(props.cooperative?.initial),
+    minimum: extractNumericValue(props.cooperative?.minimum),
+    org_initial: extractNumericValue(props.cooperative?.org_initial),
+    org_minimum: extractNumericValue(props.cooperative?.org_minimum)
   },
   username: session.username,
   document: {
@@ -71,19 +94,34 @@ const data = ref<RegistratorContract.Actions.RegisterCooperative.IRegisterCooper
   }
 })
 
+// Следим за изменениями cooperative и обновляем данные
+watch(() => props.cooperative, (newCooperative) => {
+  if (newCooperative) {
+    data.value.params.announce = newCooperative.announce || ''
+    data.value.params.initial = extractNumericValue(newCooperative.initial)
+    data.value.params.minimum = extractNumericValue(newCooperative.minimum)
+    data.value.params.org_initial = extractNumericValue(newCooperative.org_initial)
+    data.value.params.org_minimum = extractNumericValue(newCooperative.org_minimum)
+  }
+}, { immediate: true })
+
 const clear = () => {
   emit('finish')
 }
 
 const addNow = async () => {
   try {
+    isSubmitting.value = true
     data.value.document = {...document.value, meta: JSON.stringify(document.value.meta)}
     await addCooperative(data.value)
-    SuccessAlert('Документ подписан и отправлен')
+    SuccessAlert('Заявка на создание кооператива отправлена!')
 
+    // После успешной отправки переходим к следующему шагу
     clear()
   } catch(e: any){
     FailAlert(e)
+  } finally {
+    isSubmitting.value = false
   }
 }
 

package/src/features/Union/CooperativeDataForm/index.ts

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

package/src/features/Union/CooperativeDataForm/ui/CooperativeDataForm.vue

@@ -0,0 +1,44 @@
+<template lang="pug">
+div
+  Form(:handler-submit="saveData" :showCancel="false" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-gutter-md
+    q-input(standout="bg-teal text-white" hint="domovoy.com или coop.domovoy.com" label="Домен или поддомен для запуска" v-model="connectionAgreement.formData.announce" :rules="[val => notEmpty(val), val => isDomain(val)]")
+
+    q-input(standout="bg-teal text-white" hint="100 RUB" label="Вступительный взнос для физлиц и ИП" v-model="connectionAgreement.formData.initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
+      template(#append)
+        span.text-overline RUB
+
+    q-input(standout="bg-teal text-white" label="Минимальный паевый взнос для физлиц и ИП" hint="300 RUB" v-model="connectionAgreement.formData.minimum" type="number" :min="0" :rules="[val => notEmpty(val)]")
+      template(#append)
+        span.text-overline RUB
+
+    q-input(standout="bg-teal text-white" hint="1000 RUB" label="Вступительный взнос для организаций" v-model="connectionAgreement.formData.org_initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
+      template(#append)
+        span.text-overline RUB
+
+    q-input(standout="bg-teal text-white" hint="3000 RUB" label="Минимальный паевый взнос для организаций" v-model="connectionAgreement.formData.org_minimum" type="number" :min="0"  :rules="[val => notEmpty(val)]")
+      template(#append)
+        span.text-overline RUB
+</template>
+<script lang="ts" setup>
+import { Form } from 'src/shared/ui/Form';
+import { notEmpty, isDomain } from 'src/shared/lib/utils';
+import { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement';
+
+
+const emit = defineEmits(['continue'])
+
+const connectionAgreement = useConnectionAgreementStore()
+
+// Данные напрямую из стора (уже инициализированы с дефолтными значениями)
+
+const clear = () => {
+  emit('continue')
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const saveData = async (e?: Event) => {
+  console.log('📤 CooperativeDataForm: Данные формы:', connectionAgreement.formData)
+  // Данные уже сохранены в сторе напрямую
+  emit('continue', connectionAgreement.formData)
+}
+</script>

package/src/features/Union/CooperativeDataForm/ui/index.ts

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

package/src/pages/Union/ConnectionAgreement/ConnectionAgreementPage.vue

@@ -3,23 +3,12 @@ div.row.q-pa-md
   div.col-md-12.col-xs-12
     div(v-if="system.info.is_providered")
       ConnectionAgreementStepper(
-        :initial-step="currentStep"
-        :is-finish="is_finish"
-        :signed-document="signedDocument"
         :coop="coop"
-        :html="html"
         :domain-valid="domainValid"
         :installation-progress="installationProgress"
         :instance-status="instanceStatus"
         :subscriptions-loading="subscriptionsLoading"
         :subscriptions-error="subscriptionsError"
-        @step-change="handleStepChange"
-        @tariff-selected="handleTariffSelected"
-        @tariff-deselected="handleTariffDeselected"
-        @continue="handleContinue"
-        @sign="sign"
-        @finish="finish"
-        @reload="reload"
       )
 
     div(v-else).row
@@ -39,21 +28,19 @@ div.row.q-pa-md
 
 </template>
 <script setup lang="ts">
-import { DigitalDocument } from 'src/shared/lib/document';
+import { ref, onMounted, onUnmounted, watch } from 'vue';
 import { useSessionStore } from 'src/entities/Session';
 import { useSystemStore } from 'src/entities/System/model';
-import { computed, ref, onMounted, onUnmounted } from 'vue';
+import { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement';
 import { useLoadCooperatives } from 'src/features/Union/LoadCooperatives';
 import { useProviderSubscriptions } from 'src/features/Provider';
-import { Cooperative } from 'cooptypes';
 import { ConnectionAgreementStepper } from 'src/widgets/ConnectionAgreementStepper';
 import { ColorCard } from 'src/shared/ui';
 
-
 const session = useSessionStore()
 const system = useSystemStore()
-const document = ref(new DigitalDocument())
-const {loadOneCooperative} = useLoadCooperatives()
+const connectionAgreement = useConnectionAgreementStore()
+const { loadOneCooperative } = useLoadCooperatives()
 const {
   domainValid,
   installationProgress,
@@ -65,88 +52,64 @@ const {
 
 const coop = ref()
 
-const html = computed(() => document.value?.data?.html)
-const signedDocument = computed(() => document.value?.signedDocument)
-const is_finish = ref(false)
-
-// Управление шагом степпера
-const currentStep = ref(1)
-
-const handleStepChange = (step: number) => {
-  currentStep.value = step
-}
+// Остановка автообновления при размонтировании компонента
+let stopRefresh: (() => void) | null = null
 
-const handleTariffSelected = (tariff: any) => {
-  // Здесь можно сохранить выбранный тариф
-  console.log('Selected tariff:', tariff)
+const openProviderWebsite = () => {
+  window.open('https://цифровой-кооператив.рф', '_blank')
 }
 
-const handleTariffDeselected = () => {
-  // Здесь можно обработать снятие выбора тарифа
-  console.log('Tariff deselected')
+// Загружаем кооператив
+const loadCooperative = async () => {
+  if (system.info.is_providered) {
+    coop.value = await loadOneCooperative(session.username)
+  }
 }
 
-// Остановка автообновления при размонтировании компонента
-let stopRefresh: (() => void) | null = null
+const init = async () => {
+  // Инициализация имеет смысл только если провайдер доступен
+  if (!system.info.is_providered) return
 
-const handleContinue = async () => {
-  // Если документ еще не сгенерирован, генерируем его
-  if (!document.value.data?.html && !coop.value) {
-    await document.value.generate({
-      registry_id: Cooperative.Registry.CoopenomicsAgreement.registry_id,
-      coopname: 'voskhod',
-      username: session.username,
-    })
+  // Инициализируем persistent store если он еще не инициализирован
+  if (!connectionAgreement.isInitialized) {
+    connectionAgreement.setInitialized(true)
   }
-}
 
-const openProviderWebsite = () => {
-  window.open('https://цифровой-кооператив.рф', '_blank')
+  // Загружаем кооператив
+  await loadCooperative()
+
+  // Если кооператив существует, инициализируем данные формы из него
+  if (coop.value) {
+    const formData = {
+      announce: coop.value.announce || '',
+      initial: parseFloat(coop.value.initial || '0').toString(),
+      minimum: parseFloat(coop.value.minimum || '0').toString(),
+      org_initial: parseFloat(coop.value.org_initial || '0').toString(),
+      org_minimum: parseFloat(coop.value.org_minimum || '0').toString()
+    }
+    connectionAgreement.setFormData(formData)
+  }
 }
 
-
 const finish = () => {
   // Эта функция имеет смысл только если провайдер доступен
   if (!system.info.is_providered) return
 
-  is_finish.value = true
-  reload()
-
   // Запускаем автообновление подписок каждую минуту
   if (!stopRefresh) {
     stopRefresh = startAutoRefresh(60000) // 1 минута
   }
-}
 
-//todo loadCooperative by username and check status
-const reload = async() => {
-  // Загружаем кооператив только если провайдер доступен
-  if (system.info.is_providered) {
-    coop.value = await loadOneCooperative(session.username)
-  }
+  // Сбрасываем persistent состояние после завершения
+  connectionAgreement.reset()
 }
 
-const init = async () => {
-  // Инициализация имеет смысл только если провайдер доступен
-  if (!system.info.is_providered) return
-
-  coop.value = await loadOneCooperative(session.username)
-
-  if (!coop.value) {
-    await document.value.generate({
-      registry_id: Cooperative.Registry.CoopenomicsAgreement.registry_id,
-      coopname: 'voskhod',
-      username: session.username,
-    })
-  } else {
-    is_finish.value = true
-    currentStep.value = 4 // Переходим на последний шаг если кооператив уже создан
+// Watch за изменением шага для автоматического завершения
+watch(() => connectionAgreement.currentStep, (newStep) => {
+  if (newStep >= 5) {
+    finish()
   }
-}
-
-const sign = async() => {
-  await document.value.sign(session.username)
-}
+})
 
 // Lifecycle хуки
 onMounted(() => {
@@ -165,9 +128,6 @@ onUnmounted(() => {
   }
 })
 
-init()
-
-
 /**
  * Здесь необходимо получить соглашение для подключения и проверить заполнено ли оно.
  *