@coopenomics/desktop 2.2.6-alpha.0 → 2.2.7

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

@@ -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,
@@ -35,17 +27,15 @@ 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,
+            // document,
             data: JSON.stringify(params.data),
             meta: '',
           },
         } as MarketContract.Actions.CreateOffer.ICreateOffer,
-      },
-    ],
-  });
+      });
 
   const requestsStore = useRequestStore();
   requestsStore.loadUserParentOffers({

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

@@ -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,
@@ -33,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,
@@ -48,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: {
@@ -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>
@@ -70,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/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();

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.ReceiveOnRequest.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+        document,
+      } as MarketContract.Actions.ReceiveOnRequest.IReceiveOnRequest,
   });
 
   const requestsStore = useRequestStore();

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

@@ -10,11 +10,11 @@ import { TransactResult } from '@wharfkit/session';
 async function supplyOnRequest(
   params: ISupplyOnRequest
 ): 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;
 

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,10 +10,8 @@ async function updateRequestData(
   params: IUpdateRequestData
 ): Promise<TransactResult | undefined> {
   const result = await transact({
-    actions: [
-      {
         account: ContractsList.Marketplace,
-        name: MarketContract.Actions.UpdateRequests.actionName,
+        name: MarketContract.Actions.UpdateRequest.actionName,
         authorization: [
           {
             actor: params.username,
@@ -28,9 +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/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 {