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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2025.11.10-alpha-3",
+  "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-3",
-    "@coopenomics/notifications": "2025.11.10-alpha-3",
-    "@coopenomics/sdk": "2025.11.10-alpha-3",
+    "@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-3",
+    "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": "637950d37f74f959a640d61891ef35d0ace9b858"
+  "gitHead": "5b3c9c90552b081e0a4532048329454c0e43132a"
 }

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

@@ -1,6 +1,9 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
-import type { ITariff, IConnectionAgreementState } from './types'
+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'
@@ -12,6 +15,13 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
   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) => {
@@ -34,12 +44,96 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
     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>) => {
@@ -58,6 +152,9 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
     if (state.signedDocument !== undefined) {
       signedDocument.value = state.signedDocument
     }
+    if (state.formData !== undefined && state.formData !== null) {
+      formData.value = state.formData
+    }
   }
 
   return {
@@ -67,6 +164,7 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
     isInitialized,
     document,
     signedDocument,
+    formData,
 
     // Methods
     setCurrentStep,
@@ -74,8 +172,15 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
     setInitialized,
     setDocument,
     setSignedDocument,
+    setFormData,
     reset,
-    initialize
+    initialize,
+
+    // Actions
+    generateDocument,
+    signDocument,
+    clearSignedDocument,
+    reloadCooperative
   }
 }, {
   persist: true

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

@@ -7,10 +7,19 @@ export interface ITariff {
   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)]")
-
-  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="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}}
+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="Минимальный паевый взнос для физлиц и ИП" 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="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, 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';
@@ -106,13 +111,17 @@ const clear = () => {
 
 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,26 +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="currentStep >= 5"
-        :document="document"
-        :signed-document="signedDocument"
         :coop="coop"
-        :html="html"
         :domain-valid="domainValid"
         :installation-progress="installationProgress"
         :instance-status="instanceStatus"
         :subscriptions-loading="subscriptionsLoading"
         :subscriptions-error="subscriptionsError"
-        :selected-tariff="connectionAgreement.selectedTariff"
-        @step-change="handleStepChange"
-        @clear-signed-document="handleClearSignedDocument"
-        @tariff-selected="handleTariffSelected"
-        @tariff-deselected="handleTariffDeselected"
-        @continue="handleContinue"
-        @sign="sign"
-        @finish="finish"
-        @reload="reload"
       )
 
     div(v-else).row
@@ -42,22 +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 { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement';
-import { computed, ref, onMounted, onUnmounted } from 'vue';
 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 connectionAgreement = useConnectionAgreementStore()
-const {loadOneCooperative} = useLoadCooperatives()
+const { loadOneCooperative } = useLoadCooperatives()
 const {
   domainValid,
   installationProgress,
@@ -69,112 +52,15 @@ const {
 
 const coop = ref()
 
-// Восстанавливаем документы из persistent store или создаем новые
-const document = computed({
-  get: () => {
-    if (connectionAgreement.document) {
-      // Если есть сохраненный документ, пересоздаем экземпляр DigitalDocument
-      const doc = new DigitalDocument()
-      if (connectionAgreement.document.data) {
-        doc.data = connectionAgreement.document.data
-      }
-      if (connectionAgreement.document.signedDocument) {
-        doc.signedDocument = connectionAgreement.document.signedDocument
-      }
-      return doc
-    }
-    return new DigitalDocument()
-  },
-  set: (value) => connectionAgreement.setDocument(value)
-})
-
-const signedDocument = computed({
-  get: () => connectionAgreement.signedDocument || document.value?.signedDocument,
-  set: (value) => connectionAgreement.setSignedDocument(value)
-})
-
-const html = computed(() => document.value?.data?.html)
-
-// Используем persistent store для управления шагом
-const currentStep = computed({
-  get: () => connectionAgreement.currentStep,
-  set: (value) => connectionAgreement.setCurrentStep(value)
-})
-
-const handleStepChange = async (step: number) => {
-  currentStep.value = step
-
-  // Если переходим к шагу 2 (соглашение), всегда генерируем документ заново
-  if (step === 2) {
-    const newDoc = new DigitalDocument()
-    await newDoc.generate({
-      registry_id: Cooperative.Registry.CoopenomicsAgreement.registry_id,
-      coopname: 'voskhod',
-      username: session.username,
-    })
-    document.value = newDoc
-    connectionAgreement.setDocument(newDoc)
-  }
-}
-
-const handleClearSignedDocument = async () => {
-  // Очищаем подписанный документ и регенерируем документ при возврате на шаг 2
-  signedDocument.value = null
-  connectionAgreement.setSignedDocument(null)
-
-  // Регенерируем документ заново и убеждаемся что он сохраняется
-  const newDoc = new DigitalDocument()
-  await newDoc.generate({
-    registry_id: Cooperative.Registry.CoopenomicsAgreement.registry_id,
-    coopname: 'voskhod',
-    username: session.username,
-  })
-  document.value = newDoc
-  connectionAgreement.setDocument(newDoc)
-}
-
-const handleTariffSelected = (tariff: any) => {
-  // Сохраняем выбранный тариф в persistent store
-  connectionAgreement.setSelectedTariff(tariff)
-  console.log('Selected tariff:', tariff)
-}
-
-const handleTariffDeselected = () => {
-  // Очищаем выбранный тариф в persistent store
-  connectionAgreement.setSelectedTariff(null)
-  console.log('Tariff deselected')
-}
-
 // Остановка автообновления при размонтировании компонента
 let stopRefresh: (() => void) | null = null
 
-const handleContinue = () => {
-  // Документ будет сгенерирован при переходе к шагу 2
-}
-
 const openProviderWebsite = () => {
   window.open('https://цифровой-кооператив.рф', '_blank')
 }
 
-
-const finish = () => {
-  // Эта функция имеет смысл только если провайдер доступен
-  if (!system.info.is_providered) return
-
-  reload()
-
-  // Запускаем автообновление подписок каждую минуту
-  if (!stopRefresh) {
-    stopRefresh = startAutoRefresh(60000) // 1 минута
-  }
-
-  // Сбрасываем persistent состояние после завершения
-  connectionAgreement.reset()
-}
-
-//todo loadCooperative by username and check status
-const reload = async() => {
-  // Загружаем кооператив только если провайдер доступен
+// Загружаем кооператив
+const loadCooperative = async () => {
   if (system.info.is_providered) {
     coop.value = await loadOneCooperative(session.username)
   }
@@ -189,34 +75,42 @@ const init = async () => {
     connectionAgreement.setInitialized(true)
   }
 
-  coop.value = await loadOneCooperative(session.username)
-
-  if (!coop.value) {
-    // Если кооператива нет и мы на шаге 1, документ будет сгенерирован в handleContinue
-    // Если пользователь еще не прошел ни одного шага, начинаем с первого
-    if (currentStep.value === 1) {
-      // Уже на первом шаге
-    }
-  } else {
-    // Если кооператив существует, переходим на соответствующий шаг
-    // Определяем шаг в зависимости от статуса кооператива и домена
-    if (coop.value.status === 'active' && domainValid.value === true) {
-      currentStep.value = 5 // Установка и настройка
-    } else if (coop.value.status === 'pending') {
-      currentStep.value = 5 // Ожидание одобрения (последний шаг)
-    } else if (domainValid.value === true) {
-      currentStep.value = 5 // Домен валиден, переходим к установке
-    } else {
-      currentStep.value = 4 // Проверка домена
+  // Загружаем кооператив
+  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 sign = async() => {
-  await document.value.sign(session.username)
-  signedDocument.value = document.value.signedDocument
+const finish = () => {
+  // Эта функция имеет смысл только если провайдер доступен
+  if (!system.info.is_providered) return
+
+  // Запускаем автообновление подписок каждую минуту
+  if (!stopRefresh) {
+    stopRefresh = startAutoRefresh(60000) // 1 минута
+  }
+
+  // Сбрасываем persistent состояние после завершения
+  connectionAgreement.reset()
 }
 
+// Watch за изменением шага для автоматического завершения
+watch(() => connectionAgreement.currentStep, (newStep) => {
+  if (newStep >= 5) {
+    finish()
+  }
+})
+
 // Lifecycle хуки
 onMounted(() => {
   // Если провайдер доступен - делаем полную инициализацию

package/src/widgets/ConnectionAgreementStepper/Steps/AgreementStep.vue

@@ -3,33 +3,45 @@ import { computed, withDefaults } from 'vue'
 import type { IStepProps } from '../model/types'
 import { DocumentHtmlReader } from 'src/shared/ui/DocumentHtmlReader'
 import { Loader } from 'src/shared/ui/Loader'
+import { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement'
 
 const props = withDefaults(defineProps<IStepProps & {
   html?: string
-  onSign?: () => void
-  onBack?: () => void
 }>(), {})
 
-const emits = defineEmits<{
-  back: []
-  sign: []
-}>()
+const connectionAgreement = useConnectionAgreementStore()
 
 const isActive = computed(() => props.isActive)
 const isDone = computed(() => props.isDone)
 
-const handleSign = () => {
-  emits('sign')
+const handleSign = async () => {
+  try {
+    await connectionAgreement.signDocument()
+    // Переходим к следующему шагу после подписания
+    if (connectionAgreement.currentStep < 5) {
+      connectionAgreement.setCurrentStep(connectionAgreement.currentStep + 1)
+    }
+  } catch (error) {
+    console.error('Ошибка подписания документа:', error)
+  }
 }
 
 const handleBack = () => {
-  emits('back')
+  // Специальная логика для возврата - очищаем подписанный документ
+  console.log(`⬅️ AgreementStep: Возврат с шага ${connectionAgreement.currentStep}`)
+
+  // Очищаем подписанный документ без генерации нового
+  connectionAgreement.setSignedDocument(null)
+
+  if (connectionAgreement.currentStep > 1) {
+    connectionAgreement.setCurrentStep(connectionAgreement.currentStep - 1)
+  }
 }
 </script>
 
 <template lang="pug">
 q-step(
-  :name="2"
+  :name="3"
   title="Соглашение о подключении"
   icon="description"
   :done="isDone"

package/src/widgets/ConnectionAgreementStepper/Steps/DomainValidationStep.vue

@@ -85,38 +85,51 @@
 <script setup lang="ts">
 import { computed, withDefaults } from 'vue'
 import type { IStepProps } from '../model/types'
+import { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement'
+import { useProviderSubscriptions } from 'src/features/Provider'
 
 const props = withDefaults(defineProps<IStepProps & {
   coop?: any
   domainValid?: boolean | null
   subscriptionsLoading?: boolean
   subscriptionsError?: string | null
-  onReload?: () => void
-  onBack?: () => void
-  onContinue?: () => void
 }>(), {
   domainValid: null,
   subscriptionsLoading: false,
   subscriptionsError: null
 })
 
-const emits = defineEmits<{
-  back: []
-  continue: []
-  reload: []
-}>()
+const connectionAgreement = useConnectionAgreementStore()
+const { loadSubscriptions } = useProviderSubscriptions()
 
 const isDone = computed(() => props.isDone)
 
 const handleBack = () => {
-  emits('back')
+  console.log(`⬅️ DomainValidationStep: Текущий шаг ${connectionAgreement.currentStep}`)
+
+  // Специальная логика для возврата с шагов 4 и 5 - переходим к форме (шаг 2)
+  if (connectionAgreement.currentStep === 4 || connectionAgreement.currentStep === 5) {
+    console.log('🎯 Переходим к шагу 2 (форма)')
+    connectionAgreement.setCurrentStep(2)
+    return
+  }
+
+  if (connectionAgreement.currentStep > 1) {
+    connectionAgreement.setCurrentStep(connectionAgreement.currentStep - 1)
+  }
 }
 
 const handleContinue = () => {
-  emits('continue')
+  if (connectionAgreement.currentStep < 5) {
+    connectionAgreement.setCurrentStep(connectionAgreement.currentStep + 1)
+  }
 }
 
-const handleReload = () => {
-  emits('reload')
+const handleReload = async () => {
+  try {
+    await loadSubscriptions()
+  } catch (error) {
+    console.error('Ошибка обновления подписки:', error)
+  }
 }
 </script>

package/src/widgets/ConnectionAgreementStepper/Steps/FormStep.vue

@@ -1,51 +1,49 @@
 <script setup lang="ts">
-import { computed, withDefaults } from 'vue'
+import { withDefaults } from 'vue'
 import type { IStepProps } from '../model/types'
-import { AddCooperativeForm } from 'src/features/Union/AddCooperative'
+import { CooperativeDataForm } from 'src/features/Union/CooperativeDataForm'
+import { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement'
 
-const props = withDefaults(defineProps<IStepProps & {
+withDefaults(defineProps<IStepProps & {
   document?: any
   signedDocument?: any
-  cooperative?: any
-  onFinish?: () => void
-  onBack?: () => void
 }>(), {})
 
-// Используем подписанный документ, если он есть, иначе обычный документ
-const documentToUse = computed(() => props.signedDocument || props.document)
+const connectionAgreement = useConnectionAgreementStore()
 
-const emits = defineEmits<{
-  back: []
-  finish: []
-}>()
+const handleContinue = (formData?: any) => {
+  console.log('📝 FormStep: Продолжаем с данными формы:', formData)
 
-const handleFinish = () => {
-  emits('finish')
+  // Сохраняем данные формы в стор (уже сохранены напрямую)
+  // Переходим к следующему шагу (документ сгенерируется в watch)
+  if (connectionAgreement.currentStep < 5) {
+    connectionAgreement.setCurrentStep(connectionAgreement.currentStep + 1)
+  }
 }
 
 const handleBack = () => {
-  emits('back')
+  if (connectionAgreement.currentStep > 1) {
+    connectionAgreement.setCurrentStep(connectionAgreement.currentStep - 1)
+  }
 }
 </script>
 
 <template lang="pug">
 q-step(
-  :name="3"
-  title="Настройка кооператива"
+  :name="2"
+  title="Сбор данных"
   icon="settings"
   :done="isDone"
 )
   .q-pa-md
     p.q-pb-md Введите домен для запуска сайта Цифрового Кооператива. Также, укажите суммы вступительных и минимальных паевых взносов для физических лиц, юридических лиц и индивидуальных предпринимателей:
 
-    AddCooperativeForm(
-      v-if="documentToUse"
-      :document="documentToUse"
-      :cooperative="cooperative"
-      @finish="handleFinish"
+    CooperativeDataForm(
+      :key="Date.now()"
+      @continue="handleContinue"
     )
 
-  q-stepper-navigation.q-gutter-sm(v-if="documentToUse")
+  q-stepper-navigation.q-gutter-sm
     q-btn(
       color="grey-6"
       flat

package/src/widgets/ConnectionAgreementStepper/Steps/IntroStep.vue

@@ -1,38 +1,36 @@
 <script setup lang="ts">
-import { computed, withDefaults, ref } from 'vue'
+import { computed, withDefaults } from 'vue'
 import type { IStepProps } from '../model/types'
 import { TariffSelector, type ITariff } from '../Tariffs'
+import { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement'
 
 const props = withDefaults(defineProps<IStepProps & {
-  onContinue?: () => void
   selectedTariff?: ITariff | null
 }>(), {})
 
-const emits = defineEmits<{
-  tariffSelected: [tariff: ITariff]
-  tariffDeselected: []
-}>()
+const connectionAgreement = useConnectionAgreementStore()
 
 const isActive = computed(() => props.isActive)
 const isDone = computed(() => props.isDone)
 
-const selectedTariff = ref<ITariff | null>(props.selectedTariff || null)
+const selectedTariff = computed({
+  get: () => props.selectedTariff || connectionAgreement.selectedTariff,
+  set: (value) => connectionAgreement.setSelectedTariff(value)
+})
 
 const canContinue = computed(() => selectedTariff.value !== null)
 
 const handleTariffSelected = (tariff: ITariff) => {
   selectedTariff.value = tariff
-  emits('tariffSelected', tariff)
 }
 
 const handleTariffDeselected = () => {
   selectedTariff.value = null
-  emits('tariffDeselected')
 }
 
 const handleContinue = () => {
-  if (canContinue.value && props.onContinue) {
-    props.onContinue()
+  if (canContinue.value && connectionAgreement.currentStep < 5) {
+    connectionAgreement.setCurrentStep(connectionAgreement.currentStep + 1)
   }
 }
 </script>

package/src/widgets/ConnectionAgreementStepper/Steps/WaitingStep.vue

@@ -77,6 +77,8 @@
 <script setup lang="ts">
 import { computed, withDefaults } from 'vue'
 import type { IStepProps } from '../model/types'
+import { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement'
+import { useProviderSubscriptions } from 'src/features/Provider'
 
 const props = withDefaults(defineProps<IStepProps & {
   coop?: any
@@ -85,8 +87,6 @@ const props = withDefaults(defineProps<IStepProps & {
   instanceStatus?: string | null
   subscriptionsLoading?: boolean
   subscriptionsError?: string | null
-  onReload?: () => void
-  onBack?: () => void
 }>(), {
   domainValid: null,
   installationProgress: null,
@@ -95,19 +95,32 @@ const props = withDefaults(defineProps<IStepProps & {
   subscriptionsError: null
 })
 
-const emits = defineEmits<{
-  back: []
-  reload: []
-}>()
+const connectionAgreement = useConnectionAgreementStore()
+const { loadSubscriptions } = useProviderSubscriptions()
 
 const isDone = computed(() => props.isDone)
 
 const handleBack = () => {
-  emits('back')
+  console.log(`⬅️ WaitingStep: Текущий шаг ${connectionAgreement.currentStep}`)
+
+  // Специальная логика для возврата - переходим к форме (шаг 2)
+  if (connectionAgreement.currentStep === 4 || connectionAgreement.currentStep === 5) {
+    console.log('🎯 Переходим к шагу 2 (форма)')
+    connectionAgreement.setCurrentStep(2)
+    return
+  }
+
+  if (connectionAgreement.currentStep > 1) {
+    connectionAgreement.setCurrentStep(connectionAgreement.currentStep - 1)
+  }
 }
 
-const handleReload = () => {
-  emits('reload')
+const handleReload = async () => {
+  try {
+    await loadSubscriptions()
+  } catch (error) {
+    console.error('Ошибка обновления подписки:', error)
+  }
 }
 </script>
 

package/src/widgets/ConnectionAgreementStepper/ui/ConnectionAgreementStepper.vue

@@ -1,86 +1,3 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import { IntroStep, AgreementStep, FormStep, DomainValidationStep, WaitingStep } from '../Steps/index'
-
-const props = defineProps<{
-  initialStep?: number
-  isFinish: boolean
-  document?: any
-  signedDocument: any
-  coop: any
-  html?: string
-  domainValid?: boolean | null
-  installationProgress?: number | null
-  instanceStatus?: string | null
-  subscriptionsLoading?: boolean
-  subscriptionsError?: string | null
-  selectedTariff?: any
-}>()
-
-const emits = defineEmits<{
-  stepChange: [step: number]
-  tariffSelected: [tariff: any]
-  tariffDeselected: []
-  continue: []
-  sign: []
-  finish: []
-  reload: []
-  clearSignedDocument: []
-}>()
-
-const currentStep = ref(props.initialStep || 1)
-
-// Управление шагами
-const goToNext = () => {
-  if (currentStep.value < 5) {
-    currentStep.value++
-    emits('stepChange', currentStep.value)
-  }
-}
-
-const goToPrev = () => {
-  if (currentStep.value > 1) {
-    currentStep.value--
-    emits('stepChange', currentStep.value)
-  }
-}
-
-const handleContinue = () => {
-  goToNext()
-  emits('continue')
-}
-
-const handleBack = () => {
-  goToPrev()
-  // Если возвращаемся на шаг 2 (соглашение), очищаем подписанный документ
-  if (currentStep.value === 2) {
-    emits('clearSignedDocument')
-  }
-}
-
-const handleSign = () => {
-  goToNext()
-  emits('sign')
-}
-
-const handleFinish = () => {
-  goToNext()
-  emits('finish')
-}
-
-const handleReload = () => {
-  emits('reload')
-}
-
-const handleTariffSelected = (tariff: any) => {
-  emits('tariffSelected', tariff)
-}
-
-const handleTariffDeselected = () => {
-  emits('tariffDeselected')
-}
-</script>
-
 <template lang="pug">
 div
   q-stepper(
@@ -96,29 +13,21 @@ div
       :is-active="currentStep === 1"
       :is-done="currentStep > 1"
       :selected-tariff="selectedTariff"
-      @continue="handleContinue"
-      @tariff-selected="handleTariffSelected"
-      @tariff-deselected="handleTariffDeselected"
     )
 
-    AgreementStep(
+    FormStep(
       :current-step="currentStep"
       :is-active="currentStep === 2"
       :is-done="currentStep > 2"
-      :html="html"
-      @back="handleBack"
-      @sign="handleSign"
+      :document="document"
+      :signed-document="signedDocument"
     )
 
-    FormStep(
+    AgreementStep(
       :current-step="currentStep"
       :is-active="currentStep === 3"
       :is-done="currentStep > 3"
-      :document="document"
-      :signed-document="signedDocument"
-      :cooperative="coop"
-      @back="goToPrev"
-      @finish="handleFinish"
+      :html="html"
     )
 
     DomainValidationStep(
@@ -129,9 +38,6 @@ div
       :domain-valid="domainValid"
       :subscriptions-loading="subscriptionsLoading"
       :subscriptions-error="subscriptionsError"
-      @back="goToPrev"
-      @continue="goToNext"
-      @reload="handleReload"
     )
 
     WaitingStep(
@@ -144,7 +50,43 @@ div
       :instance-status="instanceStatus"
       :subscriptions-loading="subscriptionsLoading"
       :subscriptions-error="subscriptionsError"
-      @back="goToPrev"
-      @reload="handleReload"
     )
 </template>
+
+
+<script setup lang="ts">
+import { computed, watch } from 'vue'
+import { IntroStep, AgreementStep, FormStep, DomainValidationStep, WaitingStep } from '../Steps/index'
+import { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement'
+
+defineProps<{
+  coop?: any
+  domainValid?: boolean | null
+  installationProgress?: number | null
+  instanceStatus?: string | null
+  subscriptionsLoading?: boolean
+  subscriptionsError?: string | null
+}>()
+
+const connectionAgreement = useConnectionAgreementStore()
+
+// Данные из стора
+const currentStep = computed(() => connectionAgreement.currentStep)
+const selectedTariff = computed(() => connectionAgreement.selectedTariff)
+const document = computed(() => connectionAgreement.document)
+const signedDocument = computed(() => connectionAgreement.signedDocument)
+const html = computed(() => document.value?.data?.html)
+
+// Watch для реактивной генерации документа при переходе к шагу 3
+watch(() => currentStep.value, async (newStep, oldStep) => {
+  // Если переходим к шагу 3 (соглашение), всегда генерируем документ заново
+  if (newStep === 3 && oldStep !== 3) {
+    console.log('📝 Шаг 3: Генерируем соглашение')
+    try {
+      await connectionAgreement.generateDocument()
+    } catch (error) {
+      console.error('Ошибка генерации документа:', error)
+    }
+  }
+})
+</script>