@coopenomics/desktop 2.2.5 → 2.2.6

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

@@ -2,16 +2,17 @@ import { ref, type Ref } from 'vue';
 import type { Mutations } from '@coopenomics/sdk';
 import { api } from '../api';
 import { useBranchStore, type IBranch } from 'src/entities/Branch/model';
-import { COOPNAME } from 'src/shared/config';
 import { generateUsername } from 'src/shared/lib/utils/generateUsername';
+import { useSystemStore } from 'src/entities/System/model';
 
 export type ICreateBranchInput = Mutations.Branches.CreateBranch.IInput['data']
 
 export function useCreateBranch() {
   const store = useBranchStore();
+  const { info } = useSystemStore()
 
   const initialCreateBranchInput: ICreateBranchInput = {
-    coopname: COOPNAME,
+    coopname: info.coopname,
     braname: '',
     email: '',
     fact_address: '',
@@ -37,7 +38,7 @@ export function useCreateBranch() {
     data.full_name = `Кооперативный Участок "${data.short_name}"`
     const branch = await api.createBranch(data);
 
-    await store.loadBranches({ coopname: COOPNAME });
+    await store.loadBranches({ coopname: info.coopname });
 
     // Сбрасываем createBranchInput после выполнения createBranch
     resetInput(createBranchInput, initialCreateBranchInput);

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

@@ -1,12 +1,13 @@
 import type { Mutations } from '@coopenomics/sdk';
 import { api } from '../api';
 import { useBranchStore, type IBranch } from 'src/entities/Branch/model';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
 
 export type IEditBranchInput = Mutations.Branches.EditBranch.IInput['data']
 
 export function useEditBranch() {
   const store = useBranchStore()
+  const { info } = useSystemStore()
 
   async function editBranch(
     branch: IBranch
@@ -26,7 +27,7 @@ export function useEditBranch() {
 
     const result = await api.editBranch(data)
 
-    await store.loadBranches({ coopname: COOPNAME })
+    await store.loadBranches({ coopname: info.coopname })
 
     return result
   }

package/src/features/Decision/AuthorizeAndExecDecision/model/index.ts

@@ -2,10 +2,12 @@ import { TransactResult } from '@wharfkit/session';
 import { Cooperative, SovietContract } from 'cooptypes';
 import { DigitalDocument } from 'src/shared/lib/document';
 import { useSessionStore } from 'src/entities/Session';
-import { COOPNAME } from 'src/shared/config';
 import { useGlobalStore } from 'src/shared/store';
+import { useSystemStore } from 'src/entities/System/model';
 
 export function useAuthorizeAndExecDecision() {
+  const { info } = useSystemStore()
+
   async function authorizeAndExecDecision(
     username: string,
     registry_id: number,
@@ -14,11 +16,9 @@ export function useAuthorizeAndExecDecision() {
   ): Promise<TransactResult | undefined> {
     const session = useSessionStore();
 
-    console.log('registri: ', registry_id)
-
     const document = await new DigitalDocument().generate<Cooperative.Registry.DecisionOfParticipantApplication.Action>({
       registry_id: registry_id,
-      coopname: COOPNAME,
+      coopname: info.coopname,
       username,
       lang: 'ru',
       decision_id,
@@ -40,7 +40,7 @@ export function useAuthorizeAndExecDecision() {
 
     const authorizeData: SovietContract.Actions.Decisions.Authorize.IAuthorize =
       {
-        coopname: COOPNAME,
+        coopname: info.coopname,
         chairman: session.username,
         decision_id,
         document: chainDocument,
@@ -48,7 +48,7 @@ export function useAuthorizeAndExecDecision() {
 
     const execData: SovietContract.Actions.Decisions.Exec.IExec = {
       executer: session.username,
-      coopname: COOPNAME,
+      coopname: info.coopname,
       decision_id: decision_id,
     };
 

package/src/features/Decision/VoteForDecision/model/index.ts

@@ -1,10 +1,12 @@
 import { TransactResult } from '@wharfkit/session';
 import { SovietContract } from 'cooptypes';
 import { useSessionStore } from 'src/entities/Session';
-import { COOPNAME } from 'src/shared/config';
 import { useGlobalStore } from 'src/shared/store';
+import { useSystemStore } from 'src/entities/System/model';
 
 export function useVoteForDecision() {
+  const { info } = useSystemStore()
+
   async function voteForDecision(
     decision_id: number
   ): Promise<TransactResult | undefined> {
@@ -21,7 +23,7 @@ export function useVoteForDecision() {
       ],
       data: {
         member: session.username,
-        coopname: COOPNAME,
+        coopname: info.coopname,
         decision_id: decision_id,
       },
     });

package/src/features/Installer/ui/RequestKeyForm/RequestKeyForm.vue

@@ -26,7 +26,9 @@ form(@submit.prevent="submit").full-width
   import { useInstallCooperativeStore } from 'src/entities/Installer/model';
   import { FailAlert, isValidWif } from 'src/shared/api';
   import { ref } from 'vue';
-  import { COOPNAME } from 'src/shared/config';
+  import { useSystemStore } from 'src/entities/System/model';
+  const { info } = useSystemStore()
+
 
   const privateKey = ref('')
   const loading = ref(false)
@@ -36,7 +38,7 @@ form(@submit.prevent="submit").full-width
   const submit = async () => {
     loading.value = true
     try {
-      const isValid = await isValidWif(COOPNAME, privateKey.value, 'active')
+      const isValid = await isValidWif(info.coopname, privateKey.value, 'active')
 
       if (!isValid) {
         loading.value = false

package/src/features/PaymentMethod/AddPaymentMethod/model/index.ts

@@ -1,7 +1,7 @@
 import { useSessionStore } from 'src/entities/Session'
 import { useWalletStore } from 'src/entities/Wallet'
 import { sendPOST } from 'src/shared/api';
-import { COOPNAME } from 'src/shared/config'
+import { useSystemStore } from 'src/entities/System/model';
 
 export interface ISBPData {
   phone: string;
@@ -30,11 +30,12 @@ export interface IAddPaymentMethod {
 export function useAddPaymentMethod() {
   const store = useWalletStore()
   const session = useSessionStore()
+  const { info } = useSystemStore()
 
   async function addPaymentMethod(params: IAddPaymentMethod) {
 
     await store.loadUserWalet({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       username: params.username,
     })
 
@@ -42,10 +43,7 @@ export function useAddPaymentMethod() {
     await sendPOST(`/v1/methods/${params.username}/add`, params)
 
     await store.loadUserWalet({
-      coopname: COOPNAME,
-
-
-
+      coopname: info.coopname,
       username: session.username
     })
   }

package/src/features/PaymentMethod/DeletePaymentMethod/model/index.ts

@@ -1,7 +1,7 @@
 import { useSessionStore } from 'src/entities/Session'
 import { useWalletStore } from 'src/entities/Wallet'
 import { sendPOST } from 'src/shared/api';
-import { COOPNAME } from 'src/shared/config'
+import { useSystemStore } from 'src/entities/System/model';
 
 export interface IDeletePaymentMethod {
   username: string;
@@ -14,11 +14,12 @@ export function useDeletePaymentMethod() {
 
   async function deletePaymentMethod(params: IDeletePaymentMethod) {
     const {username, method_id} = params
+    const { info } = useSystemStore()
 
     await sendPOST(`/v1/methods/${username}/delete`, {method_id})
 
     await store.loadUserWalet({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       username: session.username
     })
   }

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

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

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

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

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

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

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

@@ -12,31 +12,27 @@ async function confirmRecieve(
 ): 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.ConfirmRecieve.actionName,
-        authorization: [
-          {
-            actor: params.username,
-            permission: 'active',
-          },
-        ],
-        data: {
-          username: params.username,
-          coopname: params.coopname,
-          exchange_id: params.request_id,
-          document,
-        } as MarketContract.Actions.ConfirmRecieve.IConfirmRecieve,
-      },
-    ],
+      account: ContractsList.Marketplace,
+      name: MarketContract.Actions.ConfirmRecieve.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+        document,
+      } as MarketContract.Actions.ConfirmRecieve.IConfirmRecieve,
   });
 
   const requestsStore = useRequestStore();

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

@@ -12,31 +12,27 @@ async function confirmSupplyOnRequest(
 ): 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.ConfirmSupply.actionName,
-        authorization: [
-          {
-            actor: params.username,
-            permission: 'active',
-          },
-        ],
-        data: {
-          username: params.username,
-          coopname: params.coopname,
-          exchange_id: params.request_id,
-          document,
-        } as MarketContract.Actions.ConfirmSupply.IConfirmSupply,
-      },
-    ],
+      account: ContractsList.Marketplace,
+      name: MarketContract.Actions.ConfirmSupply.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+        document,
+      } as MarketContract.Actions.ConfirmSupply.IConfirmSupply,
   });
 
   const requestsStore = useRequestStore();

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

@@ -9,41 +9,38 @@ import { MarketContract } from 'cooptypes';
 async function createChildOrder(
   params: ICreateChildOrder
 ): Promise<TransactResult | undefined> {
-  //TODO здесь передаём пустой документ
+  //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.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,
-      },
-    ],
+      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();

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

@@ -4,22 +4,14 @@ import { transact } from 'src/shared/api';
 import { ContractsList } from 'src/shared/config';
 import { useRequestStore } from 'src/entities/Request/model/stores';
 import { ILoadUserParentOffers } from 'src/entities/Request';
-import { IDocument } from 'src/shared/lib/types/document';
 import { MarketContract } from 'cooptypes';
 
 async function createParentOffer(
   params: ICreateOffer
 ): Promise<TransactResult | undefined> {
-  //TODO здесь передаём пустой документ
-  const document = {
-    hash: '',
-    public_key: '',
-    signature: '',
-    meta: '',
-  } as IDocument;
 
-  const result = await transact({
-    actions: [
+  // здесь мы не передаём документ
+  const result = await transact(
       {
         account: ContractsList.Marketplace,
         name: MarketContract.Actions.CreateOffer.actionName,
@@ -38,14 +30,12 @@ async function createParentOffer(
             pieces: params.pieces,
             unit_cost: params.unit_cost,
             product_lifecycle_secs: params.product_lifecycle_secs,
-            document,
+            // document,
             data: JSON.stringify(params.data),
             meta: '',
           },
         } as MarketContract.Actions.CreateOffer.ICreateOffer,
-      },
-    ],
-  });
+      });
 
   const requestsStore = useRequestStore();
   requestsStore.loadUserParentOffers({

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { FailAlert, SuccessAlert } from 'src/shared/api'
+import { failAlert, SuccessAlert } from 'src/shared/api'
 import { api } from '../../api'
 import type { ICreateOffer, IFormData } from 'src/features/Request/CreateParentOffer/model'
 import { computed, ref } from 'vue'
@@ -8,6 +8,7 @@ import { useCooperativeStore } from 'src/entities/Cooperative'
 import { ImageUploaderWithPreview } from '../ImageUploaderWithPreview'
 import { CURRENCY } from 'src/shared/config'
 
+
 const props = defineProps({
   username: {
     type: String,
@@ -58,10 +59,12 @@ const handlerSubmit = async () => {
         images: formData.value.images,
       },
     })
+    console.log(offerData)
     await api.createParentOffer(offerData.value)
     SuccessAlert('Объявление успешно создано')
   } catch (e: any) {
-    FailAlert(e.message)
+    console.log(e)
+    failAlert(e.message)
   }
 }
 </script>

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

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

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

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