@coopenomics/desktop 2.2.6-alpha.0 → 2.2.7

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

@@ -2,7 +2,7 @@
 div(v-if="store")
   q-step(
     :name="store.steps.SelectBranch"
-    title="Выберите ближайший кооперативный участок"
+    title="Выберите кооперативный участок"
     :done="store.isStepDone('SelectBranch')"
   )
     BranchSelector(
@@ -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)
     }

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

@@ -38,7 +38,9 @@ import WaitingRegistration from './WaitingRegistration.vue'
 import Welcome from './Welcome.vue'
 import SelectBranch from './SelectBranch.vue'
 
-import { COOPNAME } from 'src/shared/config'
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { useCurrentUserStore } from 'src/entities/User'
 
 import { useRegistratorStore } from 'src/entities/Registrator'
@@ -48,7 +50,6 @@ import { useAgreementStore } from 'src/entities/Agreement'
 import { useWalletStore } from 'src/entities/Wallet'
 
 import { useRouter } from 'vue-router';
-import { useSystemStore } from 'src/entities/System/model'
 
 const currentUser = useCurrentUserStore()
 const router = useRouter()
@@ -60,7 +61,7 @@ const agreementer = useAgreementStore()
 const wallet = useWalletStore()
 
 onMounted(() => {
-  agreementer.loadCooperativeAgreements(COOPNAME)
+  agreementer.loadCooperativeAgreements(info.coopname)
   if (!currentUser.isRegistrationComplete) {
 
     if (currentUser.userAccount?.status === 'registered' || currentUser.userAccount?.status === 'active' || currentUser.userAccount?.status === 'blocked') {
@@ -97,8 +98,8 @@ watch(
   () => [store.step, store.email, store.account, store.userData],
   () => {
     if (store.step >= steps.GenerateAccount && store.step < steps.WaitingRegistration) {
-      currentUser.loadProfile(username.value, COOPNAME)
-      wallet.loadUserWalet({coopname: COOPNAME, username: username.value})
+      currentUser.loadProfile(username.value, info.coopname)
+      wallet.loadUserWalet({coopname: info.coopname, username: username.value})
     }
   }
 )
@@ -112,8 +113,7 @@ watch(() => registeredAndloggedIn, (newValue) => {
     router.push({name: 'index'})
 })
 
-const system = useSystemStore()
-const isBranched = computed(() => system.info?.cooperator_account.is_branched)
+const isBranched = computed(() => info.cooperator_account.is_branched)
 
 </script>
 <style></style>

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

@@ -17,7 +17,9 @@ div
 <script lang="ts" setup>
 import { ref, computed, watch, onBeforeUnmount, onMounted } from 'vue'
 import { useCurrentUserStore } from 'src/entities/User';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { Loader } from 'src/shared/ui/Loader';
 import { useRegistratorStore } from 'src/entities/Registrator'
 const store = useRegistratorStore()
@@ -52,7 +54,7 @@ onBeforeUnmount(() => {
 const update = async () => {
   if (store.state.account.username && !participantAccount.value) {
     try {
-      await currentUser.loadProfile(store.state.account.username, COOPNAME)
+      await currentUser.loadProfile(store.state.account.username, info.coopname)
     } catch(e: any){
       console.log('error: ', e.message)
     }

package/src/pages/Union/Connection/ConnectionPage.vue

@@ -53,7 +53,7 @@ const document = ref(new DigitalDocument())
 const {loadOneCooperative} = useLoadCooperatives()
 
 const coop = ref()
-const instruction = computed(() => `Создайте A-запись домена ${coop.value?.announce} на IP-адрес: 95.174.93.156`)
+const instruction = computed(() => `Создайте A-запись домена ${coop.value?.announce} на IP-адрес: 51.250.114.13`)
 
 const html = computed(() => document.value?.data?.html)
 const signedDocument = computed(() => document.value?.signedDocument)

package/src/pages/_layouts/default.vue

@@ -25,13 +25,14 @@
   import { LeftDrawerMenu } from 'src/widgets/Desktop/LeftDrawerMenu'
   import { ContactsFooter } from 'src/shared/ui/Footer'
   import { useRoute } from 'vue-router'
-  import { COOPNAME } from 'src/shared/config'
+  import { useSystemStore } from 'src/entities/System/model';
+  const { info } = useSystemStore()
 
   const session = useSessionStore()
   const cooperativeStore = useCooperativeStore()
   cooperativeStore.loadContacts()
   const route = useRoute()
-  const showDrawer = computed(() => route.params.coopname === COOPNAME)
+  const showDrawer = computed(() => route.params.coopname === info.coopname)
 
   const $q = useQuasar()
   const { width } = useWindowSize()

package/src/shared/store/index.ts

@@ -3,7 +3,6 @@ import { Action, PrivateKey } from '@wharfkit/antelope';
 import { defineStore } from 'pinia';
 import { ref, Ref } from 'vue';
 import { decrypt, encrypt, hashSHA256 } from '../api/crypto';
-import { COOPNAME } from '../config';
 import { IMessageSignature } from '../lib/types/crypto';
 import { useSessionStore } from 'src/entities/Session';
 import { TransactResult } from '@wharfkit/session';
@@ -11,6 +10,7 @@ import { readBlockchain } from '../api';
 import { ITokens } from '../lib/types/user';
 import { getFromIndexedDB, setToIndexedDB } from '../api/indexDB';
 import { client } from '../api/client';
+import { useSystemStore } from 'src/entities/System/model';
 
 interface IGlobalStore {
   hasCreditials: Ref<boolean>;
@@ -37,23 +37,25 @@ export const useGlobalStore = defineStore('global', (): IGlobalStore => {
 
   const password = ''; // это временное намеренное решение. Позже заменим на пользовательский пин-код.
 
+  const { info } = useSystemStore()
+
   // Инициализация
   const init = async () => {
 
     try {
       // Получите зашифрованный ключ и токены из хранилища
       const encryptedKey = await getFromIndexedDB(
-        COOPNAME,
+        info.coopname,
         'store',
         'encryptedKey'
       );
       const encryptedTokens = await getFromIndexedDB(
-        COOPNAME,
+        info.coopname,
         'store',
         'encryptedTokens'
       );
       const encryptedUsername = await getFromIndexedDB(
-        COOPNAME,
+        info.coopname,
         'store',
         'encryptedUsername'
       );
@@ -73,22 +75,18 @@ export const useGlobalStore = defineStore('global', (): IGlobalStore => {
       tokens.value = JSON.parse(decryptedTokens);
       username.value = decryptedUsername;
 
-      // if (NODE_ENV === 'development')
-      //   console.log('tokens: ', tokens)
-
       // Установите hasCreditials в true
       hasCreditials.value = true;
-      console.log('on init', tokens.value?.access.token)
+
       if (tokens.value?.access.token){
-        console.log('on set tokens')
         client.setToken(tokens.value.access.token)
       }
 
 
     } catch (error: any) {
-      await setToIndexedDB(COOPNAME, 'store', 'encryptedKey', '');
-      await setToIndexedDB(COOPNAME, 'store', 'encryptedUsername', '');
-      await setToIndexedDB(COOPNAME, 'store', 'encryptedTokens', '');
+      await setToIndexedDB(info.coopname, 'store', 'encryptedKey', '');
+      await setToIndexedDB(info.coopname, 'store', 'encryptedUsername', '');
+      await setToIndexedDB(info.coopname, 'store', 'encryptedTokens', '');
       throw new Error('Ошибка авторизации. Войдите повторно.');
     }
   };
@@ -97,9 +95,9 @@ export const useGlobalStore = defineStore('global', (): IGlobalStore => {
     const encryptedKey = await encrypt(key, password);
     const encryptedUsername = await encrypt(newUsername, password);
 
-    await setToIndexedDB(COOPNAME, 'store', 'encryptedKey', encryptedKey);
+    await setToIndexedDB(info.coopname, 'store', 'encryptedKey', encryptedKey);
     await setToIndexedDB(
-      COOPNAME,
+      info.coopname,
       'store',
       'encryptedUsername',
       encryptedUsername
@@ -111,7 +109,7 @@ export const useGlobalStore = defineStore('global', (): IGlobalStore => {
 
   const setTokens = async (newTokens: ITokens) => {
     const encryptedTokens = await encrypt(JSON.stringify(newTokens), password);
-    await setToIndexedDB(COOPNAME, 'store', 'encryptedTokens', encryptedTokens);
+    await setToIndexedDB(info.coopname, 'store', 'encryptedTokens', encryptedTokens);
     tokens.value = newTokens;
   };
 
@@ -120,9 +118,9 @@ export const useGlobalStore = defineStore('global', (): IGlobalStore => {
     wif.value = undefined;
     hasCreditials.value = false;
     tokens.value = undefined;
-    await setToIndexedDB(COOPNAME, 'store', 'encryptedKey', '');
-    await setToIndexedDB(COOPNAME, 'store', 'encryptedUsername', '');
-    await setToIndexedDB(COOPNAME, 'store', 'encryptedTokens', '');
+    await setToIndexedDB(info.coopname, 'store', 'encryptedKey', '');
+    await setToIndexedDB(info.coopname, 'store', 'encryptedUsername', '');
+    await setToIndexedDB(info.coopname, 'store', 'encryptedTokens', '');
   };
 
   const signDigest = (digest: string): IMessageSignature => {

package/src/shared/ui/BaseDocument/BaseDocument.vue

@@ -160,9 +160,7 @@ async function download() {
 </script>
 <style>
 .description table {
-  width: 100%;
-  /* или другая фиксированная ширина */
-  table-layout: fixed;
+
 }
 
 .description td {

package/src/shared/ui/Providers/Bank/Bank.vue

@@ -3,6 +3,7 @@ import type { IPaymentOrder } from 'src/shared/lib/types/payments';
 import { onMounted, onBeforeUnmount, ref, computed } from 'vue';
 import QRCode from 'qrcode';
 import { useCooperativeStore } from 'src/entities/Cooperative';
+import { copyToClipboard, Notify } from 'quasar';
 
 // Определяем интерфейс для orderData
 interface IOrderData {
@@ -14,6 +15,7 @@ interface IOrderData {
   correspacc?: string;
   personalacc?: string;
   purpose?: string;
+  payeeinn?: string;
 }
 
 const props = defineProps<{
@@ -68,6 +70,28 @@ const generateQRCode = () => {
   }
 };
 
+const copyAll = () => {
+  const data = `
+ИНН Получателя: ${orderData.value.payeeinn}
+Получатель: ${orderData.value.name}
+БИК: ${orderData.value.bic}
+Банк получателя: ${orderData.value.bankname}
+КПП: ${orderData.value.kpp}
+Корреспондентский счёт: ${orderData.value.correspacc}
+Номер счёта: ${orderData.value.personalacc}
+Сумма платежа: ${amount.value}
+Назначение платежа: ${orderData.value.purpose}
+  `.trim();
+
+  copy(data);
+};
+
+const copy = (data: any) => {
+  copyToClipboard(data)
+    .then(() => Notify.create({ message: 'Реквизиты скопированы в буфер обмена', type: 'positive' }))
+    .catch(console.log)
+}
+
 const downloadQR = () => {
   if (qrElement.value) {
     const link = document.createElement('a');
@@ -82,19 +106,47 @@ const downloadQR = () => {
 
 <template lang="pug">
 div
+  q-input(label="ИНН получателя" v-model="orderData.payeeinn" readonly)
+    template(v-slot:append)
+      q-btn(icon="fas fa-copy" @click="copy(orderData.payeeinn)" size="xs" flat)
+
   q-input(label="Получатель" v-model="orderData.name" readonly)
-  q-input(label="Банк получателя" v-model="orderData.bankname" readonly)
+    template(v-slot:append)
+      q-btn(icon="fas fa-copy" @click="copy(orderData.name)" size="xs" flat)
+
   q-input(label="БИК" v-model="orderData.bic" readonly)
+    template(v-slot:append)
+      q-btn(icon="fas fa-copy" @click="copy(orderData.bic)" size="xs" flat)
+
+  q-input(label="Банк получателя" v-model="orderData.bankname" readonly)
+    template(v-slot:append)
+      q-btn(icon="fas fa-copy" @click="copy(orderData.bankname)" size="xs" flat)
+
   q-input(label="КПП" v-model="orderData.kpp" readonly)
+    template(v-slot:append)
+      q-btn(icon="fas fa-copy" @click="copy(orderData.kpp)" size="xs" flat)
+
   q-input(label="Корреспондентский счёт" v-model="orderData.correspacc" readonly)
+    template(v-slot:append)
+      q-btn(icon="fas fa-copy" @click="copy(orderData.correspacc)" size="xs" flat)
+
   q-input(label="Номер счёта" v-model="orderData.personalacc" readonly)
+    template(v-slot:append)
+      q-btn(icon="fas fa-copy" @click="copy(orderData.personalacc)" size="xs" flat)
+
   q-input(label="Cумма платежа" v-model="amount" readonly)
+    template(v-slot:append)
+      q-btn(icon="fas fa-copy" @click="copy(amount)" size="xs" flat)
+
   q-input(label="Назначение платежа" v-model="orderData.purpose" readonly)
+    template(v-slot:append)
+      q-btn(icon="fas fa-copy" @click="copy(orderData.purpose)" size="xs" flat)
 
   div.full-width.text-center
     canvas#qr
   div.full-width.text-center
-    q-btn(@click="downloadQR" flat icon="download") скачать QR
+    q-btn(@click="copyAll" flat icon="fas fa-copy" size="sm") скопировать реквизиты
+    q-btn(@click="downloadQR" flat icon="download" size="sm") скачать QR
 </template>
 
 <style>

package/src/shared/ui/UserDataForm/OrganizationDataForm/OrganizationDataForm.vue

@@ -4,7 +4,7 @@ div(v-if="userData.organization_data").q-gutter-sm.q-mt-md
     v-model="userData.organization_data.type"
     label="Выберите тип организации"
     standout="bg-teal text-white"
-    :options="[{ label: 'Потребительский Кооператив', value: 'coop' }, { label: 'ООО', value: 'ooo' }]"
+    :options="[{ label: 'Потребительский Кооператив', value: 'coop' }, { label: 'Производственный Кооператив', value: 'prodcoop' }, { label: 'ООО', value: 'ooo' }]"
     emit-value
     map-options).q-mb-md
   q-input(v-model="userData.organization_data.short_name" standout="bg-teal text-white" hint="ПК Ромашка" label="Краткое наименование организации" :rules="[val => notEmpty(val)]" autocomplete="off")

package/src/widgets/Agreementer/RequireAgreements/ui/RequireAgreements.vue

@@ -7,7 +7,9 @@ div
 <script lang="ts" setup>
 import { SignAgreementDialog } from 'src/features/Agreementer/SignAgreementDialog';
 import { useAgreementStore } from 'src/entities/Agreement';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { computed, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { AgreementReader } from 'src/features/Agreementer/GenerateAgreement';
@@ -56,8 +58,8 @@ const required_agreements = computed(() => {
 });
 
 const init = async () => {
-  agreementer.loadCooperativeAgreements(COOPNAME)
-  agreementer.loadAgreementTemplates(COOPNAME)
+  agreementer.loadCooperativeAgreements(info.coopname)
+  agreementer.loadAgreementTemplates(info.coopname)
 }
 const session = useSessionStore()
 

package/src/widgets/Cooperative/Agenda/ListOfQuestions/ui/ListOfQuestions.vue

@@ -85,7 +85,9 @@ import { Cooperative, SovietContract } from 'cooptypes'
 import { useVoteForDecision } from 'src/features/Decision/VoteForDecision';
 import { useAuthorizeAndExecDecision } from 'src/features/Decision/AuthorizeAndExecDecision';
 import { useVoteAgainstDecision } from 'src/features/Decision/VoteAgainstDecision';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { useCooperativeStore } from 'src/entities/Cooperative/model/stores';
 import { useCurrentUserStore } from 'src/entities/User';
 import { CreateProjectFreeDecisionButton } from 'src/features/Decision/CreateProject';
@@ -160,12 +162,18 @@ const isProcess = (decisionId: number) => {
 }
 
 const updateAuthorized = async (row: Cooperative.Document.IComplexAgenda) => {
+
   const decision_id = Number(row.table.id)
+  console.log('decision_id', decision_id)
   try {
     const username = row.table.username
     const type = row.table.type
     const meta = {} as any
-    let parsedDocumentMeta = JSON.parse(row.table.statement.meta)
+    console.log('here', row.table.statement.meta)
+
+    //TODO убрать проверку позже (нужно было для теста)
+    const unparsedDocumentMeta = row.table.statement.meta == '' ? '{}' : row.table.statement.meta
+    let parsedDocumentMeta = JSON.parse(unparsedDocumentMeta)
 
     const registryMap = {
       'freedecision': Cooperative.Registry.FreeDecision.registry_id,
@@ -241,7 +249,7 @@ const voteFor = async (decision_id: number) => {
 const voteAgainst = async (decision_id: number) => {
   try {
     await useVoteAgainstDecision().voteAgainstDecision({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       member: session.username,
       decision_id,
     })