@coopenomics/desktop 2.2.5 → 2.2.6

package/src/features/Request/DisputeOnRequest/api/index.ts

@@ -12,15 +12,13 @@ async function dispute(
 ): Promise<TransactResult | undefined> {
   //TODO здесь нужно получить подписанный документ (заявление на взнос имуществом) и подставить
   const document = {
-    hash: '',
-    public_key: '',
-    signature: '',
+    hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
+    public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',
+    signature: 'SIG_K1_KWeGQ48n78ybpkuVDf1M7nuGnT8pkPXFbYYMUXtFTFv2dEReMEmwW89r19dKmAVSFZwHTdxdqkB3ZQJeAS9CcQwb92E398',
     meta: '',
   } as IDocument;
 
   const result = await transact({
-    actions: [
-      {
         account: ContractsList.Marketplace,
         name: MarketContract.Actions.OpenDispute.actionName,
         authorization: [
@@ -35,8 +33,6 @@ async function dispute(
           exchange_id: params.request_id,
           document,
         } as MarketContract.Actions.OpenDispute.IOpenDispute,
-      },
-    ],
   });
 
   const requestsStore = useRequestStore();

package/src/features/Request/ModerateRequest/api/index.ts

@@ -9,24 +9,20 @@ async function moderateRequest(
   params: IModerateRequest
 ): Promise<TransactResult | undefined> {
   const result = await transact({
-    actions: [
-      {
-        account: ContractsList.Marketplace,
-        name: MarketContract.Actions.ModerateRequest.actionName,
-        authorization: [
-          {
-            actor: params.username,
-            permission: 'active',
-          },
-        ],
-        data: {
-          username: params.username,
-          coopname: params.coopname,
-          exchange_id: params.request_id,
-          cancellation_fee: params.cancellation_fee,
-        } as MarketContract.Actions.ModerateRequest.IModerateRequest,
-      },
-    ],
+      account: ContractsList.Marketplace,
+      name: MarketContract.Actions.ModerateRequest.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+        cancellation_fee: params.cancellation_fee,
+      } as MarketContract.Actions.ModerateRequest.IModerateRequest,
   });
 
   const requestsStore = useRequestStore();

package/src/features/Request/ModerateRequest/ui/ModerateRequestButton.vue

@@ -1,9 +1,9 @@
 <template lang="pug">
-q-btn(color="red" @click="moderate") подтвердить модерацию  
+q-btn(color="red" @click="moderate") подтвердить модерацию
 </template>
 
 <script setup lang="ts">
-  import { SuccessAlert } from 'src/shared/api'
+  import { failAlert, SuccessAlert } from 'src/shared/api'
   import { ref } from 'vue'
   import { api } from '../api'
 
@@ -34,7 +34,8 @@ q-btn(color="red" @click="moderate") подтвердить модерацию
       })
       SuccessAlert('Модерация заявки подтверждена')
     } catch (e: any) {
-      SuccessAlert(e.message)
+      failAlert(e)
     }
   }
+
 </script>

package/src/features/Request/ProhibitRequest/api/index.ts

@@ -9,24 +9,20 @@ async function prohibitRequest(
   params: IProhibitRequest
 ): Promise<TransactResult | undefined> {
   const result = await transact({
-    actions: [
-      {
-        account: ContractsList.Marketplace,
-        name: MarketContract.Actions.ProhibitRequest.actionName,
-        authorization: [
-          {
-            actor: params.username,
-            permission: 'active',
-          },
-        ],
-        data: {
-          username: params.username,
-          coopname: params.coopname,
-          exchange_id: params.request_id,
-          meta: '',
-        } as MarketContract.Actions.ProhibitRequest.IProhibitRequest,
-      },
-    ],
+      account: ContractsList.Marketplace,
+      name: MarketContract.Actions.ProhibitRequest.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+        meta: '',
+      } as MarketContract.Actions.ProhibitRequest.IProhibitRequest,
   });
 
   const requestsStore = useRequestStore();

package/src/features/Request/PublishRequest/api/index.ts

@@ -10,23 +10,19 @@ async function publishRequest(
   params: IPublishRequest
 ): Promise<TransactResult | undefined> {
   const result = await transact({
-    actions: [
-      {
-        account: ContractsList.Marketplace,
-        name: MarketContract.Actions.PublishRequest.actionName,
-        authorization: [
-          {
-            actor: params.username,
-            permission: 'active',
-          },
-        ],
-        data: {
-          username: params.username,
-          coopname: params.coopname,
-          exchange_id: params.request_id,
-        } as MarketContract.Actions.PublishRequest.IPublishRequest,
-      },
-    ],
+      account: ContractsList.Marketplace,
+      name: MarketContract.Actions.PublishRequest.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+      } as MarketContract.Actions.PublishRequest.IPublishRequest,
   });
 
   const requestsStore = useRequestStore();

package/src/features/Request/RecieveOnRequest/api/index.ts

@@ -12,31 +12,27 @@ async function recieve(
 ): Promise<TransactResult | undefined> {
   //TODO здесь нужно получить подписанный документ (заявление на взнос имуществом) и подставить
   const document = {
-    hash: '',
-    public_key: '',
-    signature: '',
+    hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
+    public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',
+    signature: 'SIG_K1_KWeGQ48n78ybpkuVDf1M7nuGnT8pkPXFbYYMUXtFTFv2dEReMEmwW89r19dKmAVSFZwHTdxdqkB3ZQJeAS9CcQwb92E398',
     meta: '',
   } as IDocument;
 
   const result = await transact({
-    actions: [
-      {
-        account: ContractsList.Marketplace,
-        name: MarketContract.Actions.RecieveOnRequest.actionName,
-        authorization: [
-          {
-            actor: params.username,
-            permission: 'active',
-          },
-        ],
-        data: {
-          username: params.username,
-          coopname: params.coopname,
-          exchange_id: params.request_id,
-          document,
-        } as MarketContract.Actions.RecieveOnRequest.IRecieveOnRequest,
-      },
-    ],
+      account: ContractsList.Marketplace,
+      name: MarketContract.Actions.RecieveOnRequest.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+        document,
+      } as MarketContract.Actions.RecieveOnRequest.IRecieveOnRequest,
   });
 
   const requestsStore = useRequestStore();

package/src/features/Request/SupplyOnRequest/api/index.ts

@@ -12,9 +12,9 @@ async function supplyOnRequest(
 ): Promise<TransactResult | undefined> {
   //TODO получить подписанное заявление на имущественный взнос из кошелька
   const document = {
-    hash: '',
-    public_key: '',
-    signature: '',
+    hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
+    public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',
+    signature: 'SIG_K1_KWeGQ48n78ybpkuVDf1M7nuGnT8pkPXFbYYMUXtFTFv2dEReMEmwW89r19dKmAVSFZwHTdxdqkB3ZQJeAS9CcQwb92E398',
     meta: '',
   } as IDocument;
 

package/src/features/Request/UnpublishRequest/api/index.ts

@@ -10,23 +10,20 @@ async function unpublishRequest(
   params: IUnpublishRequest
 ): Promise<TransactResult | undefined> {
   const result = await transact({
-    actions: [
-      {
-        account: ContractsList.Marketplace,
-        name: MarketContract.Actions.UnpublishRequest.actionName,
-        authorization: [
-          {
-            actor: params.username,
-            permission: 'active',
-          },
-        ],
-        data: {
-          username: params.username,
-          coopname: params.coopname,
-          exchange_id: params.request_id,
-        } as MarketContract.Actions.UnpublishRequest.IUnpublishRequest,
-      },
-    ],
+      account: ContractsList.Marketplace,
+      name: MarketContract.Actions.UnpublishRequest.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+      } as MarketContract.Actions.UnpublishRequest.IUnpublishRequest,
+
   });
 
   const requestsStore = useRequestStore();

package/src/features/Request/UpdateRequest/api/index.ts

@@ -10,8 +10,6 @@ async function updateRequestData(
   params: IUpdateRequestData
 ): Promise<TransactResult | undefined> {
   const result = await transact({
-    actions: [
-      {
         account: ContractsList.Marketplace,
         name: MarketContract.Actions.UpdateRequests.actionName,
         authorization: [
@@ -29,8 +27,6 @@ async function updateRequestData(
           data: JSON.stringify(params.data),
           meta: '',
         } as MarketContract.Actions.UpdateRequests.IUpdateRequest,
-      },
-    ],
   });
 
   const requestsStore = useRequestStore();

package/src/features/User/AddUser/ui/AddUserDialog/AddUserDialog.vue

@@ -95,7 +95,9 @@ import { useCooperativeStore } from 'src/entities/Cooperative';
 import { useRegistratorStore } from 'src/entities/Registrator';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
 import { useCreateUser } from 'src/features/User/CreateUser';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { notEmpty } from 'src/shared/lib/utils';
 
 const { state, addUserState, clearUserData } = useRegistratorStore()
@@ -122,7 +124,7 @@ const coop = useCooperativeStore()
 
 onMounted(async () => {
 
-  await coop.loadPublicCooperativeData(COOPNAME)
+  await coop.loadPublicCooperativeData(info.coopname)
 
   if (coop.publicCooperativeData) {
 

package/src/features/User/CreateUser/model/index.ts

@@ -6,7 +6,8 @@ import { IGeneratedAccount, ISendStatement } from 'src/shared/lib/types/user';
 
 import { useSessionStore } from 'src/entities/Session';
 import { useGlobalStore } from 'src/shared/store';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+
 import { IObjectedDocument } from 'src/shared/lib/types/document';
 import {
   ICreatedPayment,
@@ -33,6 +34,7 @@ export interface ICreateUser {
 
 export function useCreateUser() {
   const store = useRegistratorStore().state
+  const { info } = useSystemStore()
 
   async function createInitialPayment(): Promise<ICreatedPayment> {
     const result = await api.createInitialPaymentOrder();
@@ -60,7 +62,7 @@ export function useCreateUser() {
       data: {
         signature: store.signature,
         skip_save: false,
-        coopname: COOPNAME,
+        coopname: info.coopname,
         username: store.account.username,
         braname: store.selectedBranch,
         links: [store.walletAgreement.hash, store.privacyAgreement.hash, store.signatureAgreement.hash, store.userAgreement.hash]
@@ -80,7 +82,7 @@ export function useCreateUser() {
   async function signPrivacyAgreement(): Promise<IObjectedDocument> {
     const variables: Mutations.Agreements.GeneratePrivacyAgreement.IInput = {
       data: {
-        coopname: COOPNAME,
+        coopname: info.coopname,
         username: store.account.username,
       }
     }
@@ -98,7 +100,7 @@ export function useCreateUser() {
   async function signSignatureAgreement(): Promise<IObjectedDocument> {
     const variables: Mutations.Agreements.GenerateSignatureAgreement.IInput = {
       data: {
-        coopname: COOPNAME,
+        coopname: info.coopname,
         username: store.account.username,
       }
     }
@@ -118,7 +120,7 @@ export function useCreateUser() {
   async function signUserAgreement(): Promise<IObjectedDocument> {
     const variables: Mutations.Agreements.GenerateUserAgreement.IInput = {
       data: {
-        coopname: COOPNAME,
+        coopname: info.coopname,
         username: store.account.username,
       }
     }
@@ -140,7 +142,7 @@ export function useCreateUser() {
   async function signWalletAgreement(): Promise<IObjectedDocument> {
     const variables: Mutations.Agreements.GenerateWalletAgreement.IInput = {
       data: {
-        coopname: COOPNAME,
+        coopname: info.coopname,
         username: store.account.username,
       }
     }
@@ -161,7 +163,7 @@ export function useCreateUser() {
       data: {
         signature: '',
         skip_save: true,
-        coopname: COOPNAME,
+        coopname: info.coopname,
         username: store.account.username,
         braname: store.selectedBranch,
       }
@@ -210,7 +212,7 @@ export function useCreateUser() {
     await sessionStore.init();
 
     const currentUser = useCurrentUserStore();
-    await currentUser.loadProfile(user.username, COOPNAME);
+    await currentUser.loadProfile(user.username, info.coopname);
   }
 
   function emailIsValid(email: string): boolean {

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

@@ -39,7 +39,9 @@ form(@submit.prevent="submit").full-width
 import { useCurrentUserStore } from 'src/entities/User';
 import { useLoginUser } from 'src/features/User/LoginUser';
 import { FailAlert } from 'src/shared/api';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { useGlobalStore } from 'src/shared/store';
 import { ref } from 'vue';
 import { useRouter } from 'vue-router';
@@ -58,7 +60,7 @@ const submit = async () => {
   try {
     const { login } = useLoginUser()
     await login(email.value, privateKey.value)
-    await currentUser.loadProfile(globalStore.username, COOPNAME)
+    await currentUser.loadProfile(globalStore.username, info.coopname)
 
     if (!currentUser.isRegistrationComplete) {
       router.push({ name: 'signup' })

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

@@ -27,11 +27,13 @@ import { ModalBase } from 'src/shared/ui/ModalBase'
 import { useWalletStore } from 'src/entities/Wallet'
 import type { ILoadUserWallet } from 'src/entities/Wallet/model'
 import { PayWithProvider } from 'src/shared/ui/PayWithProvider'
-import { COOPNAME, CURRENCY } from 'src/shared/config'
+import { CURRENCY } from 'src/shared/config'
 import { SuccessAlert, FailAlert } from 'src/shared/api'
 import { useSessionStore } from 'src/entities/Session'
 import type { IPaymentOrder } from 'src/shared/lib/types/payments'
 import { formatAssetToReadable } from 'src/shared/lib/utils/formatAssetToReadable'
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
 
 const { createDeposit, loadUserWalet } = useWalletStore()
 
@@ -69,7 +71,7 @@ const paymentFail = (): void => {
 }
 
 const paymentSuccess = (): void => {
-  loadUserWalet({ coopname: COOPNAME, username: session.username as string } as ILoadUserWallet)
+  loadUserWalet({ coopname: info.coopname, username: session.username as string } as ILoadUserWallet)
   clear()
   SuccessAlert('Платеж успешно принят')
 }

package/src/pages/Cooperative/ListOfBranches/ui/ListOfBranchesPage.vue

@@ -69,12 +69,14 @@ import { getNameFromUserData } from 'src/shared/lib/utils/getNameFromUserData';
 import { BranchCard } from 'src/widgets/BranchCard';
 import { IndividualCard } from 'src/widgets/IndividualCard';
 import { BankDetailsCard } from 'src/widgets/BankDetailsCard';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 
 const branchStore = useBranchStore();
 
 branchStore.loadBranches({
-  coopname: COOPNAME
+  coopname: info.coopname
 })
 
 const onLoading = ref(false);

package/src/pages/Documentor/ListOfDocuments/ListOfDocumentsPage.vue

@@ -3,8 +3,10 @@ ListOfDocumentsWidget(:showFilter="true" :filter="{receiver: coopname}")
 </template>
 <script setup lang="ts">
 import { ListOfDocumentsWidget } from 'src/widgets/Cooperative/Documents/ListOfDocuments';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { computed } from 'vue';
 
-const coopname = computed(() => COOPNAME)
+const coopname = computed(() => info.coopname)
 </script>

package/src/pages/Marketplace/CreateParentOffer/ui/CreateParentOfferPage.vue

@@ -2,12 +2,12 @@
 import { computed } from 'vue'
 import { CreateParentOfferForm } from 'src/features/Request/CreateParentOffer'
 import { useSessionStore } from 'src/entities/Session'
+import { useSystemStore } from 'src/entities/System/model'
 const session = useSessionStore()
 const username = computed(() => session.username)
-import { COOPNAME } from 'src/shared/config';
-
+const { info } = useSystemStore()
 </script>
 <template lang="pug">
 div.row.justify-center
-  CreateParentOfferForm(:username="username" :coopname="COOPNAME").col-md-4.col-xs-12.q-mt-md.q-mb-lg
+  CreateParentOfferForm(:username="username" :coopname="info.coopname").col-md-4.col-xs-12.q-mt-md.q-mb-lg
 </template>

package/src/pages/Marketplace/MainPage/ui/MainPage.vue

@@ -1,25 +1,25 @@
 <template lang="pug">
 div
-  q-tabs(v-if="loggedIn" dense switch-indicator inline-label outside-arrows mobile-arrows align="justify" active-class="bg-teal-2" )
-    q-route-tab(name="Витрина" label="Витрина" :to="{name: 'marketplace-showcase'}" )
-    q-route-tab(name="Мои объявления" label="Мои объявления" :to="{name: 'marketplace-user-offers'}" )
-    q-route-tab(name="Мои заказы" label="Мои заказы" :to="{name: 'marketplace-user-supplies'}" )
-    q-route-tab(name="Создать объявление" label="Создать объявление" :to="{name: 'marketplace-create-offer'}" )
-    q-route-tab(name="Все объявления" label="Все объявления" :to="{name: 'marketplace-moderation'}" )
-    q-route-tab(name="Все заказы" label="Все заказы" :to="{name: 'marketplace-supplies'}" )
+  //- q-tabs(v-if="loggedIn" dense switch-indicator inline-label outside-arrows mobile-arrows align="justify" active-class="bg-teal-2" )
+  //-   q-route-tab(name="Витрина" label="Витрина" :to="{name: 'marketplace-showcase'}" )
+  //-   q-route-tab(name="Мои объявления" label="Мои объявления" :to="{name: 'marketplace-user-offers'}" )
+  //-   q-route-tab(name="Мои заказы" label="Мои заказы" :to="{name: 'marketplace-user-supplies'}" )
+  //-   q-route-tab(name="Создать объявление" label="Создать объявление" :to="{name: 'marketplace-create-offer'}" )
+  //-   q-route-tab(name="Все объявления" label="Все объявления" :to="{name: 'marketplace-moderation'}" )
+  //-   q-route-tab(name="Все заказы" label="Все заказы" :to="{name: 'marketplace-supplies'}" )
 
   router-view
 
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
-import { useSessionStore } from 'src/entities/Session'
-const session = useSessionStore()
+// import { computed } from 'vue'
+// import { useSessionStore } from 'src/entities/Session'
+// const session = useSessionStore()
 
-const loggedIn = computed(() => {
-  return session.isAuth
-})
+// const loggedIn = computed(() => {
+//   return session.isAuth
+// })
 </script>
 
 <style>

package/src/pages/Marketplace/Moderation/ui/ModerationPage.vue

@@ -30,7 +30,7 @@ div
 
 </template>
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, onMounted } from 'vue'
 import { ImageCarousel } from 'src/shared/ui/ImageCarousel'
 
 import { useRouter } from 'vue-router'
@@ -40,13 +40,15 @@ import { UnpublishRequestButton } from 'src/features/Request/UnpublishRequest'
 import { ModerateRequestButton } from 'src/features/Request/ModerateRequest'
 import { ProhibitRequestButton } from 'src/features/Request/ProhibitRequest'
 import { useSessionStore } from 'src/entities/Session'
-import { COOPNAME } from 'src/shared/config'
+
+import { useSystemStore } from 'src/entities/System/model'
 const session = useSessionStore()
 const username = computed(() => session.username)
+const { info } = useSystemStore()
 
 const router = useRouter()
 
-const coopname = computed(() => COOPNAME)
+const coopname = computed(() => info.coopname)
 const requstsStore = useRequestStore()
 
 const objects = computed(() => requstsStore.allParentOffers)
@@ -56,4 +58,6 @@ const currentObjectId = computed(() => router.currentRoute.value.params.id)
 const currentObject = computed(() =>
   objects.value.find((obj) => obj.id == Number(currentObjectId.value))
 )
+
+onMounted(() => requstsStore.loadAllParentOffers({coopname: coopname.value}))
 </script>

package/src/pages/Marketplace/OfferPage/ui/OfferPage.vue

@@ -70,7 +70,9 @@ import { UnpublishRequestButton } from 'src/features/Request/UnpublishRequest'
 import { UpdateRequestButton } from 'src/features/Request/UpdateRequest'
 import { useRequestStore } from 'src/entities/Request/model/stores'
 import { useSessionStore } from 'src/entities/Session'
-import { COOPNAME } from 'src/shared/config'
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import type { IRequestData } from 'src/entities/Request'
 const session = useSessionStore()
 const username = computed(() => session.username)
@@ -95,7 +97,7 @@ watch(
   { deep: true }
 )
 const iAmOwner = computed(() => localRequest.value.username == username.value)
-const coopname = computed(() => COOPNAME)
+const coopname = computed(() => info.coopname)
 
 let [temp_price, temp_symbol] = localRequest.value.unit_cost.split(' ')
 temp_price = parseFloat(temp_price).toFixed(0)

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

@@ -14,7 +14,9 @@ div(v-if="store?.state?.payment?.details?.amount_without_fee")
 import { computed, watch, onMounted } from 'vue'
 import { useCreateUser } from 'src/features/User/CreateUser'
 import { FailAlert } from 'src/shared/api';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { useCooperativeStore } from 'src/entities/Cooperative';
 import { useRegistratorStore } from 'src/entities/Registrator'
 import { PayWithProvider } from 'src/shared/ui/PayWithProvider';
@@ -29,7 +31,7 @@ const coop = useCooperativeStore()
 const currentStep = store.steps.PayInitial
 
 onMounted(async () => {
-  await coop.loadPublicCooperativeData(COOPNAME)
+  await coop.loadPublicCooperativeData(info.coopname)
 
   if (step.value === currentStep)
     createInitialPayment()

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

@@ -34,7 +34,7 @@ div
         a(@click.stop='(event) => event.stopPropagation()' href='/documents/ustav.pdf' target='_blank').q-ml-xs Устав кооператива
 
     div(v-if="!isLoading").q-mt-lg
-      q-btn.col-md-6.col-xs-12(flat, @click='store.prev()')
+      q-btn.col-md-6.col-xs-12(flat @click='back')
         i.fa.fa-arrow-left
         span.q-ml-md назад
 
@@ -73,7 +73,13 @@ const loadStatement = async (): Promise<void> => {
     failAlert(e.message)
   }
 }
+const back = () => {
+  if (store.isBranched)
+      store.goTo('SelectBranch')
+    else
+      store.goTo('GenerateAccount')
 
+}
 onMounted(() => {
   if (store.state.step === store.steps.ReadStatement) {
     loadStatement()

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

@@ -22,7 +22,9 @@ div(v-if="store")
 import { useBranchStore } from 'src/entities/Branch/model'
 import { useRegistratorStore } from 'src/entities/Registrator'
 import { failAlert } from 'src/shared/api';
-import { COOPNAME } from 'src/shared/config'
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { computed, onMounted, watch } from 'vue'
 import { BranchSelector } from 'src/shared/ui/BranchSelector';
 
@@ -32,7 +34,7 @@ const branchStore = useBranchStore()
 const load = async () => {
   if (store.isStep('SelectBranch'))
     try{
-      await branchStore.loadPublicBranches({ coopname: COOPNAME })
+      await branchStore.loadPublicBranches({ coopname: info.coopname })
     } catch(e: any){
       failAlert(e)
     }