@coopenomics/desktop 2.2.6 → 2.2.8

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.8](https://github.com/coopenomics/monocoop/compare/v2.2.7...v2.2.8) (2025-02-10)
+
+**Note:** Version bump only for package @coopenomics/desktop
+
+
+
+
+
+## [2.2.7](https://github.com/coopenomics/monocoop/compare/v2.2.6...v2.2.7) (2025-02-07)
+
+**Note:** Version bump only for package @coopenomics/desktop
+
+
+
+
+
 ## [2.2.6](https://github.com/coopenomics/monocoop/compare/v2.2.6-alpha.0...v2.2.6) (2025-01-27)
 
 **Note:** Version bump only for package @coopenomics/desktop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -20,8 +20,8 @@
     "prepublishOnly": "npm run build:lib"
   },
   "dependencies": {
-    "@coopenomics/controller": "2.2.6",
-    "@coopenomics/sdk": "2.2.6",
+    "@coopenomics/controller": "2.2.8",
+    "@coopenomics/sdk": "2.2.8",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -45,7 +45,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2.2.6",
+    "cooptypes": "2.2.8",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -94,5 +94,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "d0bd4428bebd6971c23c27d8d26643d72e3f07cb"
+  "gitHead": "973590281c916620f866b9e39253c6b5bf85f9d4"
 }

package/src/boot/init-stores.ts

@@ -8,14 +8,16 @@ import { useAccountStore } from 'src/entities/Account/model';
 import { useSessionStore } from 'src/entities/Session';
 
 export default boot(async ({ router }) => {
+  const system = useSystemStore();
+  //Инициализация системного стора
+  await system.loadSystemInfo();
+
+  // инициализация всего остального
   const desktops = useDesktopStore();
   const cardStore = useCardStore();
-  const system = useSystemStore();
   const account = useAccountStore();
   const session = useSessionStore();
 
-  //Инициализация системного стора
-  await system.loadSystemInfo();
 
   // Инициализация стора desktops
   await desktops.healthCheck();

package/src/desktops/Chairman/model/index.ts

@@ -1,6 +1,4 @@
-import { UserIdentityPage } from 'src/pages/User/IdentityPage';
 import { UserPaymentMethodsPage } from 'src/pages/User/PaymentMethodsPage';
-import { UserWalletPage } from 'src/pages/User/WalletPage';
 import { markRaw } from 'vue';
 
 export const manifest = {
@@ -18,27 +16,6 @@ export const manifest = {
       path: '/:coopname/user',
       name: 'home',
       children: [{
-        meta: {
-          title: 'Удостоверение',
-          icon: '',
-          roles: [],
-        },
-        path: 'identity',
-        name: 'user-identity',
-        component: markRaw(UserIdentityPage),
-        children: [],
-        },{
-          meta: {
-            title: 'Кошелёк',
-            icon: '',
-            roles: [],
-          },
-          path: 'wallet',
-          name: 'user-wallet',
-          component: markRaw(UserWalletPage),
-          children: [],
-        },
-        {
           meta: {
             title: 'Реквизиты',
             icon: '',

package/src/desktops/Member/model/index.ts

@@ -1,6 +1,4 @@
-import { UserIdentityPage } from 'src/pages/User/IdentityPage';
 import { UserPaymentMethodsPage } from 'src/pages/User/PaymentMethodsPage';
-import { UserWalletPage } from 'src/pages/User/WalletPage';
 import { markRaw } from 'vue';
 
 export const manifest = {
@@ -18,27 +16,6 @@ export const manifest = {
       path: '/:coopname/user',
       name: 'home',
       children: [{
-        meta: {
-          title: 'Удостоверение',
-          icon: '',
-          roles: [],
-        },
-        path: 'identity',
-        name: 'user-identity',
-        component: markRaw(UserIdentityPage),
-        children: [],
-        },{
-          meta: {
-            title: 'Кошелёк',
-            icon: '',
-            roles: [],
-          },
-          path: 'wallet',
-          name: 'user-wallet',
-          component: markRaw(UserWalletPage),
-          children: [],
-        },
-        {
           meta: {
             title: 'Реквизиты',
             icon: '',

package/src/desktops/Setup/model/index.ts

@@ -1,6 +1,4 @@
-import { UserIdentityPage } from 'src/pages/User/IdentityPage';
 import { UserPaymentMethodsPage } from 'src/pages/User/PaymentMethodsPage';
-import { UserWalletPage } from 'src/pages/User/WalletPage';
 import { markRaw } from 'vue';
 
 export const manifest = {
@@ -18,27 +16,6 @@ export const manifest = {
       path: '/:coopname/user',
       name: 'home',
       children: [{
-        meta: {
-          title: 'Удостоверение',
-          icon: '',
-          roles: [],
-        },
-        path: 'identity',
-        name: 'user-identity',
-        component: markRaw(UserIdentityPage),
-        children: [],
-        },{
-          meta: {
-            title: 'Кошелёк',
-            icon: '',
-            roles: [],
-          },
-          path: 'wallet',
-          name: 'user-wallet',
-          component: markRaw(UserWalletPage),
-          children: [],
-        },
-        {
           meta: {
             title: 'Реквизиты',
             icon: '',

package/src/desktops/User/model/index.ts

@@ -8,13 +8,13 @@ import { agreementsBase } from 'src/shared/lib/consts/workspaces';
 import { ConnectionPage } from 'src/pages/Union/Connection';
 import { ListOfDocumentsPage } from 'src/pages/Documentor/ListOfDocuments';
 import { CoopCardPage } from 'src/pages/User/CardPage';
-import { MainMarketplacePage } from 'src/pages/Marketplace/MainPage';
-import { ModerationPage } from 'src/pages/Marketplace/Moderation';
-import { CreateParentOfferPage } from 'src/pages/Marketplace/CreateParentOffer';
-import { ShowcasePage } from 'src/pages/Marketplace/Showcase';
-import { UserParentOffersPage } from 'src/pages/Marketplace/UserParentOffers';
-import { UserSuppliesListPage } from 'src/pages/Marketplace/UserSuppliesList';
-import { SuppliesListPage } from 'src/pages/Marketplace/SuppliesList';
+// import { MainMarketplacePage } from 'src/pages/Marketplace/MainPage';
+// import { ModerationPage } from 'src/pages/Marketplace/Moderation';
+// import { CreateParentOfferPage } from 'src/pages/Marketplace/CreateParentOffer';
+// import { ShowcasePage } from 'src/pages/Marketplace/Showcase';
+// import { UserParentOffersPage } from 'src/pages/Marketplace/UserParentOffers';
+// import { UserSuppliesListPage } from 'src/pages/Marketplace/UserSuppliesList';
+// import { SuppliesListPage } from 'src/pages/Marketplace/SuppliesList';
 
 export const manifest = {
   'name': 'UserDesktop',
@@ -171,11 +171,6 @@ export const manifest = {
           },
         },
         // {
-          // meta: {
-            // title: 'Маркетплейс',
-            // icon: 'fa-solid fa-cog',
-            // roles: [],
-          // },
         //   path: '/:coopname/marketplace',
         //   name: 'marketplace',
         //   component: markRaw(MainMarketplacePage),

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

@@ -12,7 +12,7 @@ interface ISystemStore {
 
 export const useSystemStore = defineStore(namespace, (): ISystemStore => {
   const info = ref<ISystemInfo>({} as ISystemInfo)
-
+  console.log('system: ', info)
   const loadSystemInfo = async () => {
     info.value = await api.loadSystemInfo();
   };

package/src/entities/Wallet/model/stores.ts

@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia';
 import { api } from '../api';
 import {
-  IWalletData,
   IDepositData,
   IWithdrawData,
   ExtendedProgramWalletData,
@@ -13,14 +12,13 @@ import { ILoadUserWallet } from './types';
 import { ICreateDeposit } from 'src/shared/lib/types/payments';
 import { Ref, ref } from 'vue';
 import { sendPOST } from 'src/shared/api';
-import { CURRENCY } from 'src/shared/config';
 import type { SovietContract } from 'cooptypes';
 
 const namespace = 'wallet';
 
 interface IWalletStore {
   /*  доменный интерфейс кошелька пользователя */
-  wallet: Ref<IWalletData>;
+  // wallet: Ref<IWalletData>;
   program_wallets: Ref<ExtendedProgramWalletData[]>;
   deposits: Ref<IDepositData[]>;
   withdraws: Ref<IWithdrawData[]>;
@@ -35,14 +33,14 @@ interface IWalletStore {
 }
 
 export const useWalletStore = defineStore(namespace, (): IWalletStore => {
-  const wallet = ref<IWalletData>({
-    username: '',
-    coopname: '',
-    available: `0.0000 ${CURRENCY}`,
-    blocked: `0.0000 ${CURRENCY}`,
-    minimum: `0.0000 ${CURRENCY}`,
-    initial: `0.0000 ${CURRENCY}`,
-  });
+  // const wallet = ref<IWalletData>({
+  //   username: '',
+  //   coopname: '',
+  //   available: `0.0000 ${CURRENCY}`,
+  //   blocked: `0.0000 ${CURRENCY}`,
+  //   minimum: `0.0000 ${CURRENCY}`,
+  //   initial: `0.0000 ${CURRENCY}`,
+  // });
 
   const deposits = ref<IDepositData[]>([]);
   const withdraws = ref<IWithdrawData[]>([]);
@@ -53,18 +51,18 @@ export const useWalletStore = defineStore(namespace, (): IWalletStore => {
 
   const loadUserWalet = async (params: ILoadUserWallet) => {
 
-    const createEmptyWallet = (): IWalletData => ({
-      username: '',
-      coopname: '',
-      available: `0.0000 ${CURRENCY}`,
-      blocked: `0.0000 ${CURRENCY}`,
-      minimum: `0.0000 ${CURRENCY}`,
-      initial: `0.0000 ${CURRENCY}`,
-    });
+    // const createEmptyWallet = (): IWalletData => ({
+    //   username: '',
+    //   coopname: '',
+    //   available: `0.0000 ${CURRENCY}`,
+    //   blocked: `0.0000 ${CURRENCY}`,
+    //   minimum: `0.0000 ${CURRENCY}`,
+    //   initial: `0.0000 ${CURRENCY}`,
+    // });
 
     try {
       const data = await Promise.all([
-        api.loadSingleUserWalletData(params),
+        // api.loadSingleUserWalletData(params),
         api.loadUserDepositsData(params),
         api.loadUserWithdrawsData(params),
         api.loadUserProgramWalletsData(params),
@@ -72,12 +70,12 @@ export const useWalletStore = defineStore(namespace, (): IWalletStore => {
         api.loadUserAgreements(params.coopname, params.username)
       ]);
 
-      wallet.value = data[0] ?? createEmptyWallet();
-      deposits.value = data[1] ?? [];
-      withdraws.value = data[2] ?? [];
-      program_wallets.value = data[3] ?? [];
-      methods.value = data[4] ?? [];
-      agreements.value = data[5] ?? [];
+      // wallet.value = data[0] ?? createEmptyWallet();
+      deposits.value = data[0] ?? [];
+      withdraws.value = data[1] ?? [];
+      program_wallets.value = data[2] ?? [];
+      methods.value = data[3] ?? [];
+      agreements.value = data[4] ?? [];
 
     } catch (e: any) {
       console.log(e);
@@ -95,7 +93,7 @@ export const useWalletStore = defineStore(namespace, (): IWalletStore => {
   };
 
   return {
-    wallet,
+    // wallet,
     program_wallets,
     deposits,
     withdraws,

package/src/entities/Wallet/ui/index.ts

@@ -1,2 +1 @@
-export * from './WalletBalance'
 export * from './WalletProgramsList'

package/src/features/Branch/SelectBranch/model/index.ts

@@ -2,7 +2,7 @@ import type { Mutations } from '@coopenomics/sdk';
 import { ref } from 'vue';
 import { api } from '../api';
 
-export type ISelectBranchInput = Mutations.Branches.SelectBranch.IInput
+export type ISelectBranchInput = Mutations.Branches.SelectBranch.IInput['data']
 
 const isVisible = ref(false);
 

package/src/features/Branch/SelectBranch/ui/SelectBranchOverlay.vue

@@ -85,19 +85,17 @@ div
       const {selectBranch} = useSelectBranch()
 
       await selectBranch({
-        data: {
-          braname: selectedBranch.value,
-          coopname: system.info.coopname,
-          document,
-          username: session.username,
-        }
+        braname: selectedBranch.value,
+        coopname: system.info.coopname,
+        document,
+        username: session.username,
       })
       isVisible.value = false
       SuccessAlert('Кооперативный участок выбран')
     } catch(e: any){
       isSubmitting.value = false
       console.error(e)
-      failAlert(`Ошибка подписи документа: ${e.message}`)
+      failAlert(e)
     }
 
   }

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

@@ -20,7 +20,7 @@ async function confirmRecieve(
 
   const result = await transact({
       account: ContractsList.Marketplace,
-      name: MarketContract.Actions.ConfirmRecieve.actionName,
+      name: MarketContract.Actions.ConfirmReceive.actionName,
       authorization: [
         {
           actor: params.username,
@@ -32,7 +32,7 @@ async function confirmRecieve(
         coopname: params.coopname,
         exchange_id: params.request_id,
         document,
-      } as MarketContract.Actions.ConfirmRecieve.IConfirmRecieve,
+      } as MarketContract.Actions.ConfirmReceive.IConfirmReceive,
   });
 
   const requestsStore = useRequestStore();

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

@@ -1,57 +1,82 @@
-import { TransactResult } from '@wharfkit/session';
-import { ICreateChildOrder } from '../model';
-import { transact } from 'src/shared/api';
-import { ContractsList } from 'src/shared/config';
-import { useRequestStore } from 'src/entities/Request/model/stores';
-import { IDocument } from 'src/shared/lib/types/document';
-import { MarketContract } from 'cooptypes';
+import { Mutations } from '@coopenomics/sdk';
+import { client } from 'src/shared/api/client';
 
 async function createChildOrder(
-  params: ICreateChildOrder
-): Promise<TransactResult | undefined> {
-  //TODO здесь передаём документ заявления на возврат имуществом (?)
-  const document = {
-    hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
-    public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',
-    signature: 'SIG_K1_KWeGQ48n78ybpkuVDf1M7nuGnT8pkPXFbYYMUXtFTFv2dEReMEmwW89r19dKmAVSFZwHTdxdqkB3ZQJeAS9CcQwb92E398',
-    meta: '',
-  } as IDocument;
-
-  const result = await transact({
-      account: ContractsList.Marketplace,
-      name: MarketContract.Actions.CreateOrder.actionName,
-      authorization: [
-        {
-          actor: params.username,
-          permission: 'active',
-        },
-      ],
-      data: {
-        params: {
-          username: params.username,
-          coopname: params.coopname,
-          parent_id: params.parent_id,
-          program_id: params.program_id,
-          pieces: params.pieces,
-          unit_cost: params.unit_cost,
-          product_lifecycle_secs: 0,
-          document,
-          data: '',
-          meta: '',
-        },
-      } as MarketContract.Actions.CreateOrder.ICreateOrder,
-
-  });
-
-  const requestsStore = useRequestStore();
-  requestsStore.loadUserChildOrders({
-    coopname: params.coopname,
-    username: params.username,
-  });
+  data: Mutations.Cooplace.CreateChildOrder.IInput['data']
+): Promise<Mutations.Cooplace.CreateChildOrder.IOutput[typeof Mutations.Cooplace.CreateChildOrder.name]> {
+
+  const {[Mutations.Cooplace.CreateChildOrder.name]: result} = await client.Mutation(Mutations.Cooplace.CreateChildOrder.mutation, {
+    variables: {
+      data
+    }
+  })
+
 
   return result;
 }
 
+async function generateReturnByAssetStatement(
+  data: Mutations.Cooplace.GenerateReturnByAssetStatement.IInput['data']
+): Promise<Mutations.Cooplace.GenerateReturnByAssetStatement.IOutput[typeof Mutations.Cooplace.GenerateReturnByAssetStatement.name]> {
+  const {[Mutations.Cooplace.GenerateReturnByAssetStatement.name]: result} = await client.Mutation(Mutations.Cooplace.GenerateReturnByAssetStatement.mutation, {
+    variables: {
+      data
+    }
+  })
+
+  return result;
+}
+
+// async function createChildOrder(
+//   params: ICreateChildOrder
+// ): Promise<TransactResult | undefined> {
+//   //TODO здесь передаём документ заявления на возврат имуществом (?)
+//   const document = {
+//     hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
+//     public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',
+//     signature: 'SIG_K1_KWeGQ48n78ybpkuVDf1M7nuGnT8pkPXFbYYMUXtFTFv2dEReMEmwW89r19dKmAVSFZwHTdxdqkB3ZQJeAS9CcQwb92E398',
+//     meta: '',
+//   } as IDocument;
+
+
+
+
+//   const result = await transact({
+//       account: ContractsList.Marketplace,
+//       name: MarketContract.Actions.CreateOrder.actionName,
+//       authorization: [
+//         {
+//           actor: params.username,
+//           permission: 'active',
+//         },
+//       ],
+//       data: {
+//         params: {
+//           username: params.username,
+//           coopname: params.coopname,
+//           parent_id: params.parent_id,
+//           program_id: params.program_id,
+//           units: params.units,
+//           unit_cost: params.unit_cost,
+//           product_lifecycle_secs: 0,
+//           document,
+//           data: '',
+//           meta: '',
+//         },
+//       } as MarketContract.Actions.CreateOrder.ICreateOrder,
+
+//   });
+
+//   const requestsStore = useRequestStore();
+//   requestsStore.loadUserChildOrders({
+//     coopname: params.coopname,
+//     username: params.username,
+//   });
+
+//   return result;
+// }
+
 export const api = {
   createChildOrder,
+  generateReturnByAssetStatement
 };

package/src/features/Request/CreateChildOrder/model/index.ts

@@ -1 +1,47 @@
+import { Mutations } from '@coopenomics/sdk';
+import { useRequestStore } from 'src/entities/Request/model/stores';
+import { api } from '../api';
+import { client } from 'src/shared/api/client';
+
 export * from './types'
+
+export function useCreateChildOrder() {
+  async function createChildOrder(
+    //TODO перевести id на хэши
+    data: Mutations.Cooplace.GenerateReturnByAssetStatement.IInput['data'] & {parent_id: number}
+  ): Promise<Mutations.Cooplace.CreateChildOrder.IOutput[typeof Mutations.Cooplace.CreateChildOrder.name]> {
+
+    const returnByAssetStatement = await api.generateReturnByAssetStatement({
+      coopname: data.coopname,
+      username: data.username,
+      request: data.request,
+    })
+
+    const document = await client.Document.signDocument(returnByAssetStatement)
+
+      //TODO здесь же нужно передать распоряжение на использование средств цифрового кошелька
+
+    const result = await api.createChildOrder({
+      coopname: data.coopname,
+      data: '',
+      meta: '',
+      parent_id: data.parent_id,
+      product_lifecycle_secs: 0,
+      program_id: data.request.program_id,
+      unit_cost: data.request.unit_cost,
+      units: data.request.units,
+      username: data.username,
+      document
+    })
+
+    const requestsStore = useRequestStore();
+    requestsStore.loadUserChildOrders({
+      coopname: data.coopname,
+      username: data.username,
+    });
+
+
+    return result;
+  }
+  return { createChildOrder };
+}

package/src/features/Request/CreateChildOrder/model/types.ts

@@ -5,7 +5,7 @@ export interface ICreateChildOrder {
   coopname: string;
   parent_id: string | number;
   program_id: string | number;
-  pieces: string | number;
+  units: string | number;
   unit_cost: string;
 }
 

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

@@ -4,19 +4,43 @@
   import type { ICreateChildOrderProps } from '../../model'
   import { withDefaults } from 'vue'
   import { useRouter } from 'vue-router'
+  import { client } from 'src/shared/api/client'
 
   const router = useRouter()
   const props = withDefaults(defineProps<ICreateChildOrderProps>(), {})
 
   const createOrder = async () => {
     try {
+
+      const document = await api.generateReturnByAssetStatement({
+        coopname: props.coopname,
+        request: {
+          currency: 'RUB',
+          hash: 'hash',
+          program_id: 1,
+          title: 'test',
+          total_cost: '10.0000 RUB',
+          type: '',
+          unit_cost: props.offer.unit_cost,
+          unit_of_measurement: '',
+          units: props.units
+        },
+        username: props.username
+      })
+
+      const signedDocument = await client.Document.signDocument(document)
+
       await api.createChildOrder({
         coopname: props.coopname,
         username: props.username,
-        parent_id: props.offer.id,
-        program_id: props.offer.program_id,
-        pieces: props.units,
+        parent_id: Number(props.offer.id),
+        program_id: Number(props.offer.program_id),
+        units: props.units,
         unit_cost: props.offer.unit_cost,
+        data: '',
+        document: signedDocument,
+        meta: '',
+        product_lifecycle_secs: 100
       })
       SuccessAlert('Заказ создан')
       router.push({ name: 'marketplace-user-supplies' }) //TODO роутинг
@@ -26,5 +50,5 @@
   }
 </script>
 <template lang="pug">
-q-btn(size="lg" @click="createOrder") оплатить 
+q-btn(size="lg" @click="createOrder") оплатить
 </template>

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

@@ -27,7 +27,7 @@ async function createParentOffer(
             coopname: params.coopname,
             parent_id: 0,
             program_id: params.program_id,
-            pieces: params.pieces,
+            units: params.units,
             unit_cost: params.unit_cost,
             product_lifecycle_secs: params.product_lifecycle_secs,
             // document,

package/src/features/Request/CreateParentOffer/model/types.ts

@@ -4,7 +4,7 @@ export interface ICreateOffer {
   username: string;
   coopname: string;
   program_id: string | number;
-  pieces: string | number;
+  units: string | number;
   unit_cost: string;
   product_lifecycle_secs: string | number;
   data: IRequestObjectData;
@@ -13,7 +13,7 @@ export interface ICreateOffer {
 export interface IFormData {
   title: string;
   description: string;
-  pieces: number;
+  units: number;
   unit_cost_number: number;
   product_lifecycle_days: number;
   program_id: number;

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

@@ -34,7 +34,7 @@ const updateImages = (previewImage: string, images: string[]) => {
 const formData = ref<IFormData>({
   title: '',
   description: '',
-  pieces: 1,
+  units: 1,
   unit_cost_number: 0,
   product_lifecycle_days: 3,
   program_id: 0,
@@ -49,7 +49,7 @@ const handlerSubmit = async () => {
       username: props.username,
       coopname: props.coopname,
       program_id: formData.value.program_id,
-      pieces: formData.value.pieces,
+      units: formData.value.units,
       unit_cost: parseFloat(unit_cost.toString()).toFixed(4) + ' ' + CURRENCY,
       product_lifecycle_secs: 86400 * formData.value.product_lifecycle_days,
       data: {
@@ -73,7 +73,7 @@ q-card(bordered flat)
   Form(:handler-submit="handlerSubmit" :is-submitting="isSubmitting" :show-cancel="false" :button-cancel-txt="'Отменить'" :button-submit-txt="'Создать объявление'").q-mt-lg
     q-input(v-model="formData.title" square standout="bg-teal text-white" label="Заголовок").q-ma-md
     q-input(v-model="formData.description" square standout="bg-teal text-white" label="Описание" type="textarea").q-ma-md
-    q-input(v-model="formData.pieces" square standout="bg-teal text-white" label="Количество единиц" type="number").q-ma-md
+    q-input(v-model="formData.units" square standout="bg-teal text-white" label="Количество единиц" type="number").q-ma-md
     q-input(v-model="formData.unit_cost_number" square standout="bg-teal text-white" type="number" controls-position="right" :precision="4" :step="1.0000" :min="0" label="Введите сумму:").q-ma-md
     q-input(v-model="formData.product_lifecycle_days" square standout="bg-teal text-white" label="Гарантийный срок в днях" ).q-pa-md
     q-select(v-model="formData.program_id" square standout="bg-teal text-white" :options="programs" map-options emit-value option-label="title" option-value="id" label="Целевая программа").q-ma-md

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

@@ -20,7 +20,7 @@ async function recieve(
 
   const result = await transact({
       account: ContractsList.Marketplace,
-      name: MarketContract.Actions.RecieveOnRequest.actionName,
+      name: MarketContract.Actions.ReceiveOnRequest.actionName,
       authorization: [
         {
           actor: params.username,
@@ -32,7 +32,7 @@ async function recieve(
         coopname: params.coopname,
         exchange_id: params.request_id,
         document,
-      } as MarketContract.Actions.RecieveOnRequest.IRecieveOnRequest,
+      } as MarketContract.Actions.ReceiveOnRequest.IReceiveOnRequest,
   });
 
   const requestsStore = useRequestStore();

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

@@ -10,7 +10,7 @@ import { TransactResult } from '@wharfkit/session';
 async function supplyOnRequest(
   params: ISupplyOnRequest
 ): Promise<TransactResult | undefined> {
-  //TODO получить подписанное заявление на имущественный взнос из кошелька
+  //TODO получить подписанный акт приёма-передачи имущества
   const document = {
     hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
     public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',

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

@@ -11,7 +11,7 @@ async function updateRequestData(
 ): Promise<TransactResult | undefined> {
   const result = await transact({
         account: ContractsList.Marketplace,
-        name: MarketContract.Actions.UpdateRequests.actionName,
+        name: MarketContract.Actions.UpdateRequest.actionName,
         authorization: [
           {
             actor: params.username,
@@ -26,7 +26,7 @@ async function updateRequestData(
           unit_cost: params.unitCost,
           data: JSON.stringify(params.data),
           meta: '',
-        } as MarketContract.Actions.UpdateRequests.IUpdateRequest,
+        } as MarketContract.Actions.UpdateRequest.IUpdateRequest,
   });
 
   const requestsStore = useRequestStore();

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(

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/User/CoopCard/ui/CoopCard.vue

@@ -8,12 +8,45 @@ div.q-pa-md
             AutoAvatar(style="width: 60px; border-radius: 50%;" :username="currentUser.username")
           div.col-12.col-md-9.q-mt-sm.q-mt-md-0
             q-badge(color="primary" style="font-size: 12px; margin-bottom: 4px;") {{role}}
-            div.text-h6 {{displayName}}
+            div.text-h6
+              span(v-if="isIP").q-mr-sm ИП
+              | {{displayName}}
         div.row
           DepositButton.col-6.border-left-radius-buttons
           WithdrawButton.col-6.border-right-radius-buttons
 
-      WalletBalance.q-mt-lg
+          div.col-md-4.col-xs-12
+
+
+      q-list(flat).q-gutter-sm
+        q-item
+          q-item-section
+            q-item-label(caption) Имя аккаунта
+            q-item-label(style="font-size: 20px;").text-bold {{ currentUser.username }}
+
+        //- q-item
+        //-   q-item-section
+        //-     q-item-label(caption) Паевый счёт
+        //-     q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.available }}
+
+        q-item
+          q-item-section
+            q-item-label(caption) Минимальный паевый счёт
+            q-item-label(style="font-size: 20px;").text-bold {{ currentUser.participantAccount?.minimum_amount }}
+
+        //- q-item
+        //-   q-item-section
+        //-     q-item-label(caption) Заблокировано в целевых программах
+        //-     q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.blocked }}
+
+
+        q-item(v-for="program_wallet of walletStore.program_wallets" :key="program_wallet.id")
+          q-item-section
+            q-item-label(caption) {{ program_wallet.program_details.title }}
+
+            q-item-label(style="font-size: 20px;").text-bold {{program_wallet.available}}
+
+
 
 
     //- div.col-md-6.col-xs-12.q-mt-lg
@@ -22,10 +55,12 @@ div.q-pa-md
 </template>
 
 <script lang="ts" setup>
-import { WalletBalance } from 'src/entities/Wallet/ui'
+
 import { DepositButton } from 'src/features/Wallet/DepositToWallet'
 import { WithdrawButton } from 'src/features/Wallet/WithdrawFromWallet'
 import { AutoAvatar } from 'src/shared/ui/AutoAvatar';
+import { useWalletStore } from 'src/entities/Wallet';
+const walletStore = useWalletStore()
 
 import { useCurrentUserStore } from 'src/entities/User'
 import type { IEntrepreneurData, IIndividualData, IOrganizationData } from 'src/shared/lib/types/user/IUserData';
@@ -34,6 +69,9 @@ const currentUser = useCurrentUserStore()
 
 const userType = computed(() => currentUser.userAccount?.type)
 
+const isIP = computed(() => currentUser.userAccount?.type === 'entrepreneur')
+
+
 const role = computed(() => {
   if (currentUser.userAccount?.role === 'user')
     return 'Пайщик'

package/src/entities/Wallet/ui/WalletBalance/WalletBalance.vue

@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import { useWalletStore } from '../../model'
-const walletStore = useWalletStore()
-</script>
-
-<template lang="pug">
-q-list(flat).q-gutter-sm
-  q-item
-    q-item-section
-      q-item-label(caption) Имя аккаунта
-      q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.username }}
-
-  q-item
-    q-item-section
-      q-item-label(caption) Паевый счёт
-      q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.available }}
-
-  q-item
-    q-item-section
-      q-item-label(caption) Минимальный паевый счёт
-      q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.minimum }}
-
-  q-item
-    q-item-section
-      q-item-label(caption) Заблокировано в целевых программах
-      q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.blocked }}
-
-
-  q-item(v-for="program_wallet of walletStore.program_wallets" :key="program_wallet.id")
-    q-item-section
-      q-item-label(caption) {{ program_wallet.program_details.title }}
-
-      q-item-label(style="font-size: 20px;").text-bold {{program_wallet.available}}
-
-</template>

package/src/entities/Wallet/ui/WalletBalance/index.ts

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

package/src/pages/User/IdentityPage/index.ts

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

package/src/pages/User/IdentityPage/ui/IdentityPage.vue

@@ -1,15 +0,0 @@
-<template lang="pug">
-PersonalCard(:username="username")
-
-</template>
-<script lang="ts" setup>
-import { PersonalCard } from 'src/widgets/User/PersonalCard/ui'
-
-import { computed } from 'vue';
-import { useCurrentUserStore } from 'src/entities/User';
-
-const currentUser = useCurrentUserStore()
-
-const username = computed(() => currentUser.username)
-
-</script>

package/src/pages/User/IdentityPage/ui/index.ts

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

package/src/pages/User/WalletPage/index.ts

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

package/src/pages/User/WalletPage/ui/WalletPage.vue

@@ -1,14 +0,0 @@
-<template lang="pug">
-WalletCard(:username="username")
-</template>
-<script lang="ts" setup>
-import { WalletCard } from 'src/widgets/User/WalletCard'
-
-import { computed } from 'vue';
-import { useCurrentUserStore } from 'src/entities/User';
-
-const currentUser = useCurrentUserStore()
-
-const username = computed(() => currentUser.username)
-
-</script>

package/src/pages/User/WalletPage/ui/index.ts

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

package/src/widgets/User/PersonalCard/index.ts

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

package/src/widgets/User/PersonalCard/ui/PersonalCard.vue

@@ -1,109 +0,0 @@
-<template lang="pug">
-div(v-if="currentUser?.username" flat bordered).q-pa-md
-  div.row
-    div.col-md-4.col-xs-12
-      div(style="flex-grow: 1; display: flex; justify-content: center;")
-        //- UserQR
-
-        AutoAvatar(style="width: 125px;" :username="currentUser.username").q-pa-sm.q-pt-lg
-
-    div.col-md-8.col-xs-12
-      div
-        div
-          q-item
-            q-item-section
-              q-item-label(caption) Пайщик
-              q-item-label {{ displayName }}
-
-
-          q-item
-            q-item-section
-              q-item-label(caption) Зарегистрирован как
-              q-item-label(v-if="userType === 'individual'") физическое лицо
-              q-item-label(v-if="userType === 'entrepreneur'") индивидуальный предприниматель
-              q-item-label(v-if="userType === 'organization'") юридическое лицо
-
-          q-item
-            q-item-section
-              q-item-label(caption) Имя аккаунта
-              q-item-label {{ currentUser.username }}
-
-          q-item(v-if="userType === 'individual' && individualProfile")
-            q-item-section
-              q-item-label(caption) Дата рождения
-              q-item-label {{ individualProfile.birthdate }}
-
-          q-item(v-if="userType === 'organization' && organizationProfile")
-            q-item-section
-              q-item-label(caption) ИНН / ОГРН
-              q-item-label {{ inn_ogrn }}
-
-          q-item(v-if="userProfile")
-            q-item-section
-              q-item-label(caption) Телефон
-              q-item-label {{ userProfile.phone }}
-
-          q-item(v-if="userProfile")
-            q-item-section
-              q-item-label(caption) Почта
-              q-item-label {{ userProfile.email }}
-
-  </template>
-
-<script lang="ts" setup>
-import { AutoAvatar } from 'src/shared/ui/AutoAvatar';
-import { useCurrentUserStore } from 'src/entities/User'
-import type { IEntrepreneurData, IIndividualData, IOrganizationData } from 'src/shared/lib/types/user/IUserData';
-import { computed } from 'vue';
-const currentUser = useCurrentUserStore()
-
-const userType = computed(() => currentUser.userAccount?.type)
-
-const individualProfile = computed(() => {
-  if (userType.value === 'individual') {
-    return currentUser.userAccount?.private_data as IIndividualData
-  }
-  return null
-})
-
-const entrepreneurProfile = computed(() => {
-  if (userType.value === 'entrepreneur') {
-    return currentUser.userAccount?.private_data as IEntrepreneurData
-  }
-  return null
-})
-
-const organizationProfile = computed(() => {
-  if (userType.value === 'organization') {
-    return currentUser.userAccount?.private_data as IOrganizationData
-  }
-  return null
-})
-
-const userProfile = computed(() => {
-  if (userType.value === 'individual' || userType.value === 'entrepreneur') {
-    return individualProfile?.value || entrepreneurProfile?.value
-  }
-  return organizationProfile?.value
-})
-
-const displayName = computed(() => {
-  if (userType.value === 'individual') {
-    return `${individualProfile.value?.last_name} ${individualProfile.value?.first_name} ${individualProfile.value?.middle_name}`
-  } else if (userType.value === 'entrepreneur') {
-    return `${entrepreneurProfile.value?.last_name} ${entrepreneurProfile.value?.first_name} ${entrepreneurProfile.value?.middle_name}`
-  } else {
-    return organizationProfile.value?.short_name
-  }
-})
-
-const inn_ogrn = computed(() => {
-  if (organizationProfile.value)
-    return `${organizationProfile.value.details.inn} / ${organizationProfile.value.details.ogrn}`
-  else return ''
-})
-
-</script>
-<style>
-
-</style>

package/src/widgets/User/PersonalCard/ui/UserQR.vue

@@ -1,5 +0,0 @@
-<template lang="pug">
-div qr
-</template>
-<script lang="ts" setup>
-</script>

package/src/widgets/User/PersonalCard/ui/index.ts

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

package/src/widgets/User/WalletCard/index.ts

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

package/src/widgets/User/WalletCard/ui/WalletCard.vue

@@ -1,26 +0,0 @@
-<template lang="pug">
-div.q-pa-md
-  div.flex
-    DepositButton.q-ma-sm
-    WithdrawButton.q-ma-sm
-
-  div.row.justify-between.q-mt-lg
-    div.col-md-4.col-xs-12
-      WalletBalance
-    div.col-md-4.col-xs-12.q-mt-lg
-
-</template>
-
-<script lang="ts" setup>
-import { WalletBalance } from 'src/entities/Wallet/ui'
-import { DepositButton } from 'src/features/Wallet/DepositToWallet'
-import { WithdrawButton } from 'src/features/Wallet/WithdrawFromWallet'
-
-defineProps({
-  username: {
-    type: String,
-    required: true,
-  },
-})
-
-</script>

package/src/widgets/User/WalletCard/ui/index.ts

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