@coopenomics/desktop 2.2.10 → 2025.4.29

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

@@ -0,0 +1,117 @@
+import { defineStore } from 'pinia'
+import { ref, type Ref } from 'vue'
+import { api } from '../api'
+import type { DocumentType, IGetDocuments, IPagination, IDocumentPackageAggregate } from './types'
+import { FailAlert } from 'src/shared/api'
+
+const namespace = 'documentStore'
+
+interface IDocumentStore {
+  documents: Ref<IDocumentPackageAggregate[]>
+  loading: Ref<boolean>
+  documentType: Ref<DocumentType>
+  pagination: Ref<IPagination>
+  changePage: (page: number, username: string, filter: Record<string, any>, hidden?: boolean) => Promise<IDocumentPackageAggregate[]>
+  changeDocumentType: (type: DocumentType, username: string, filter: Record<string, any>) => Promise<void>
+  resetDocuments: () => void
+}
+/**
+ * Хранилище для работы с документами
+ */
+export const useDocumentStore = defineStore(namespace, (): IDocumentStore => {
+  const documents = ref<IDocumentPackageAggregate[]>([])
+  const loading = ref(false)
+  const documentType = ref<DocumentType>('newsubmitted')
+
+  // Информация о пагинации
+  const pagination = ref<IPagination>({
+    totalCount: 0,
+    totalPages: 0,
+    currentPage: 1
+  })
+
+  /**
+   * Сброс состояния документов
+   */
+  const resetDocuments = () => {
+    documents.value = []
+    pagination.value = {
+      totalCount: 0,
+      totalPages: 0,
+      currentPage: 1
+    }
+  }
+
+  /**
+   * Изменяет страницу для пагинации и загружает данные
+   * @param page номер страницы
+   * @param username имя пользователя или кооператива
+   * @param filter параметры фильтрации
+   * @param hidden флаг скрытой загрузки (без индикатора)
+   * @returns массив документов
+   */
+  const changePage = async (
+    page: number,
+    username: string,
+    filter: Record<string, any>,
+    hidden = false
+  ): Promise<IDocumentPackageAggregate[]> => {
+    try {
+      loading.value = hidden ? false : true
+
+      pagination.value.currentPage = page
+
+      const data: IGetDocuments = {
+        username,
+        filter,
+        type: documentType.value,
+        page: page,
+        limit: 10
+      }
+
+      const result = await api.loadDocuments(data)
+
+      // Если это первая страница, заменяем документы
+      // Иначе добавляем новые документы к существующим
+      if (page === 1) {
+        documents.value = result.items
+      } else {
+        documents.value = [...documents.value, ...result.items]
+      }
+
+      // Обновляем информацию о пагинации
+      pagination.value = {
+        totalCount: result.totalCount,
+        totalPages: result.totalPages,
+        currentPage: result.currentPage
+      }
+
+      loading.value = false
+      return documents.value
+    } catch (error: any) {
+      loading.value = false
+      console.error('Error loading documents:', error)
+      FailAlert(error)
+      return []
+    }
+  }
+
+  /**
+   * Изменяет тип документов для отображения
+   */
+  const changeDocumentType = async (type: DocumentType, username: string, filter: Record<string, any>) => {
+    documentType.value = type
+    // Сбрасываем текущую страницу при смене типа и загружаем документы
+    await changePage(1, username, filter)
+  }
+
+  return {
+    documents,
+    loading,
+    documentType,
+    pagination,
+    changePage,
+    changeDocumentType,
+    resetDocuments
+  }
+})

package/src/entities/Document/model/types.ts

@@ -0,0 +1,18 @@
+import type { Queries, Zeus } from '@coopenomics/sdk';
+
+export type IDocumentPackageAggregate = Zeus.ModelTypes['DocumentPackageAggregate'];
+export type IDocumentAggregate = Zeus.ModelTypes['DocumentAggregate'];
+export type ZGetDocumentsResult = Queries.Documents.GetDocuments.IOutput[typeof Queries.Documents.GetDocuments.name];
+export type IGetDocuments = Queries.Documents.GetDocuments.IInput['data']
+
+// Информация о пагинации
+export interface IPagination {
+  totalCount: number;
+  totalPages: number;
+  currentPage: number;
+}
+
+// Типы документов в системе
+export type DocumentType = 'newsubmitted' | 'newresolved';
+
+

package/src/entities/Meet/api/index.ts

@@ -0,0 +1,58 @@
+import { client } from 'src/shared/api/client';
+import { Queries, Mutations } from '@coopenomics/sdk';
+import type { IGetMeetsInput, IGetMeetInput, ICloseMeetInput, IRestartMeetInput } from '../types';
+
+async function loadMeets(data: IGetMeetsInput) {
+  const { [Queries.Meet.GetMeets.name]: output } = await client.Query(
+    Queries.Meet.GetMeets.query,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+  return output;
+}
+
+async function loadMeet(data: IGetMeetInput) {
+  const { [Queries.Meet.GetMeet.name]: output } = await client.Query(
+    Queries.Meet.GetMeet.query,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+  return output;
+}
+
+async function closeMeet(data: ICloseMeetInput) {
+  const { [Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.name]: output } = await client.Mutation(
+    Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.mutation,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+  return output;
+}
+
+async function restartMeet(data: IRestartMeetInput) {
+  const { [Mutations.Meet.RestartAnnualGeneralMeet.name]: output } = await client.Mutation(
+    Mutations.Meet.RestartAnnualGeneralMeet.mutation,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+  return output;
+}
+
+export const api = {
+  loadMeets,
+  loadMeet,
+  closeMeet,
+  restartMeet
+}

package/src/entities/Meet/index.ts

@@ -0,0 +1,2 @@
+export * from './model'
+export * from './types'

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

@@ -0,0 +1,72 @@
+import { defineStore } from 'pinia'
+import { ref, Ref } from 'vue'
+import { api } from '../api'
+import type { IMeet, IGetMeetsInput, IGetMeetInput, ICloseMeetInput, IRestartMeetInput } from '../types';
+
+const namespace = 'meetStore';
+
+interface IMeetStore {
+  meets: Ref<IMeet[]>
+  currentMeet: Ref<IMeet | null>
+  loading: Ref<boolean>
+  loadMeets: (data: IGetMeetsInput) => Promise<IMeet[]>;
+  loadMeet: (data: IGetMeetInput) => Promise<IMeet>;
+  closeMeet: (data: ICloseMeetInput) => Promise<IMeet>;
+  restartMeet: (data: IRestartMeetInput) => Promise<IMeet>;
+}
+
+export const useMeetStore = defineStore(namespace, (): IMeetStore => {
+  const meets = ref<IMeet[]>([])
+  const currentMeet = ref<IMeet | null>(null)
+  const loading = ref<boolean>(false)
+
+  const loadMeets = async (data: IGetMeetsInput) => {
+    loading.value = true
+    try {
+      const result = await api.loadMeets(data);
+      meets.value = result;
+      return result;
+    } finally {
+      loading.value = false
+    }
+  };
+
+  const loadMeet = async (data: IGetMeetInput) => {
+    loading.value = true
+    try {
+      const result = await api.loadMeet(data);
+      currentMeet.value = result;
+      return result;
+    } finally {
+      loading.value = false
+    }
+  };
+
+  const closeMeet = async (data: ICloseMeetInput) => {
+    loading.value = true
+    try {
+      return await api.closeMeet(data);
+    } finally {
+      loading.value = false
+    }
+  };
+
+  const restartMeet = async (data: IRestartMeetInput) => {
+    loading.value = true
+    try {
+      return await api.restartMeet(data);
+    } finally {
+      loading.value = false
+    }
+  };
+
+  return {
+    meets,
+    currentMeet,
+    loading,
+    loadMeets,
+    loadMeet,
+    closeMeet,
+    restartMeet
+  }
+})

package/src/entities/Meet/types/index.ts

@@ -0,0 +1,7 @@
+import type { Queries, Mutations } from '@coopenomics/sdk';
+
+export type IMeet = Queries.Meet.GetMeet.IOutput[typeof Queries.Meet.GetMeet.name]
+export type IGetMeetsInput = Queries.Meet.GetMeets.IInput['data']
+export type IGetMeetInput = Queries.Meet.GetMeet.IInput['data']
+export type ICloseMeetInput = Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.IInput['data']
+export type IRestartMeetInput = Mutations.Meet.RestartAnnualGeneralMeet.IInput['data']

package/src/entities/Payment/api/index.ts

@@ -0,0 +1,20 @@
+import { client } from 'src/shared/api/client';
+import { Queries } from '@coopenomics/sdk';
+import type { IGetPaymentsInputData, IGetPaymentsInputOptions, IPaymentPaginationResult } from '../model/types';
+
+/**
+ * Загружает список платежей с использованием GraphQL API
+ */
+async function loadPayments(data?: IGetPaymentsInputData, options?: IGetPaymentsInputOptions): Promise<IPaymentPaginationResult> {
+  const variables: Queries.Payments.GetPayments.IInput = {data, options}
+
+  const { [Queries.Payments.GetPayments.name]: output } = await client.Query(
+    Queries.Payments.GetPayments.query,
+    {
+      variables
+    }
+  );
+  return output;
+}
+
+export const api = { loadPayments };

package/src/entities/Payment/model/index.ts

@@ -0,0 +1,2 @@
+export * from './store'
+export * from './types'

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

@@ -0,0 +1,62 @@
+import { defineStore } from 'pinia';
+import { Ref, ref } from 'vue';
+import { api } from '../api';
+import type { IGetPaymentsInputData, IGetPaymentsInputOptions, IPayment, IPaymentPaginationResult } from './types';
+
+interface IPaymentStore {
+  payments: Ref<IPaymentPaginationResult | undefined>;
+  loadPayments: (data?: IGetPaymentsInputData, options?: IGetPaymentsInputOptions) => Promise<void>;
+  updatePayments: (data?: IGetPaymentsInputData, options?: IGetPaymentsInputOptions) => Promise<void>;
+  clear: () => void;
+}
+
+const namespace = 'payments';
+
+export const usePaymentStore = defineStore(namespace, (): IPaymentStore => {
+  const payments: Ref<IPaymentPaginationResult | undefined> = ref();
+
+  const clear = () => {
+    payments.value = undefined;
+  };
+
+  // Функция для слияния массивов платежей по id
+  const mergePayments = (existingPayments: IPayment[], newPayments: IPayment[]) => {
+    const mergedPaymentsMap = new Map(existingPayments.map(payment => [payment.id, payment]));
+
+    newPayments.forEach(payment => {
+      mergedPaymentsMap.set(payment.id, payment); // Обновляем или добавляем новый платеж
+    });
+
+    return Array.from(mergedPaymentsMap.values()); // Возвращаем массив объединённых платежей
+  };
+
+  const updatePayments = async(data?: IGetPaymentsInputData, options?: IGetPaymentsInputOptions): Promise<void> => {
+    const newPaymentsResponse = await api.loadPayments(data, options);
+
+    if (payments.value) {
+      payments.value.items = mergePayments(payments.value.items, newPaymentsResponse.items);
+    } else {
+      payments.value = newPaymentsResponse;
+    }
+  };
+
+  // Функция для загрузки платежей
+  const loadPayments = async (data?: IGetPaymentsInputData, options?: IGetPaymentsInputOptions): Promise<void> => {
+    const newPaymentsResponse = await api.loadPayments(data, options);
+
+    if (payments.value) {
+      // Обновляем все свойства объекта payments
+      payments.value = {
+        ...payments.value,
+        items: mergePayments(payments.value.items, newPaymentsResponse.items),
+        currentPage: newPaymentsResponse.currentPage,
+        totalPages: newPaymentsResponse.totalPages,
+        totalCount: newPaymentsResponse.totalCount
+      };
+    } else {
+      payments.value = newPaymentsResponse;
+    }
+  };
+
+  return { payments, loadPayments, updatePayments, clear };
+});

package/src/entities/Payment/model/types.ts

@@ -0,0 +1,7 @@
+import type { Queries } from '@coopenomics/sdk';
+
+export type IPaymentPaginationResult = Queries.Payments.GetPayments.IOutput[typeof Queries.Payments.GetPayments.name]
+export type IPayment = IPaymentPaginationResult['items'][number]
+
+export type IGetPaymentsInputData = Queries.Payments.GetPayments.IInput['data']
+export type IGetPaymentsInputOptions = Queries.Payments.GetPayments.IInput['options']

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

@@ -4,7 +4,6 @@ import { computed, ComputedRef, Ref, ref } from 'vue';
 import { Session } from '@wharfkit/session';
 import { WalletPluginPrivateKey } from '@wharfkit/wallet-plugin-privatekey';
 import { FailAlert, readBlockchain } from 'src/shared/api';
-import { CHAIN_ID, CHAIN_URL } from 'src/shared/config';
 import { PrivateKey, Serializer } from '@wharfkit/antelope';
 import { GetInfoResult } from 'eosjs/dist/eosjs-rpc-interfaces';
 
@@ -49,6 +48,7 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
   const close = async (): Promise<void> => {
     isAuth.value = false;
     session.value = undefined;
+    globalStore.logout()
   };
 
   const init = async () => {
@@ -67,8 +67,8 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
             actor: globalStore.username,
             permission: 'active',
             chain: {
-              id: CHAIN_ID,
-              url: CHAIN_URL,
+              id: process.env.CHAIN_ID as string,
+              url: process.env.CHAIN_URL as string,
             },
             walletPlugin: new WalletPluginPrivateKey(
               globalStore.wif as PrivateKey

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/User/model/stores.ts

@@ -21,6 +21,7 @@ interface IUserStore {
   userAccount: Ref<IUserAccountData | null>;
   isRegistrationComplete: ComputedRef<boolean>;
   isChairman: ComputedRef<boolean>;
+  isMember: ComputedRef<boolean>;
 }
 
 const namespaceCurrentUser = 'currentUser';
@@ -43,7 +44,8 @@ export const useCurrentUserStore = defineStore(
           (userEntity.userAccount.value || false) &&
           userEntity.participantAccount.value != null
       ),
-      isChairman: computed(() => userEntity.userAccount.value?.role === 'chairman')
+      isChairman: computed(() => userEntity.userAccount.value?.role === 'chairman'),
+      isMember: computed(() => userEntity.userAccount.value?.role === 'member'),
     };
   }
 );

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

@@ -1,14 +1,11 @@
 import { fetchTable, sendGET } from '../../../shared/api';
 
 import {
-  ContractsList,
-  TablesList,
   LimitsList,
   SecondaryIndexesNumbers,
 } from 'src/shared/config';
 
 import {
-  IWalletData,
   IDepositData,
   IWithdrawData,
   IProgramWalletData,
@@ -20,7 +17,6 @@ import {
 } from '../model';
 
 import {
-  ILoadSingleUserWallet,
   ILoadSingleUserDeposit,
   ILoadSingleUserProgramWallet,
   ILoadSingleUserWithdraw,
@@ -28,31 +24,16 @@ import {
   ILoadUserProgramWallets,
   ILoadUserWithdraws,
 } from '../model';
-import { SovietContract } from 'cooptypes';
-
-async function loadSingleUserWalletData(
-  params: ILoadSingleUserWallet
-): Promise<IWalletData> {
-  return (
-    await fetchTable(
-      ContractsList.Soviet,
-      params.coopname,
-      TablesList.Wallets,
-      params.username,
-      params.username,
-      LimitsList.One
-    )
-  )[0] as IWalletData;
-}
+import { GatewayContract, SovietContract } from 'cooptypes';
 
 async function loadSingleUserDepositData(
   params: ILoadSingleUserDeposit
 ): Promise<IDepositData> {
   return (
     await fetchTable(
-      ContractsList.Gateway,
+      GatewayContract.contractName.production,
       params.coopname,
-      TablesList.Deposits,
+      GatewayContract.Tables.Incomes.tableName,
       params.username,
       params.username,
       LimitsList.One
@@ -65,9 +46,9 @@ async function loadSingleUserProgramWalletData(
 ): Promise<IProgramWalletData> {
   return (
     await fetchTable(
-      ContractsList.Soviet,
+      SovietContract.contractName.production,
       params.coopname,
-      TablesList.ProgramWallets,
+      SovietContract.Tables.ProgramWallets.tableName,
       params.wallet_id,
       params.wallet_id,
       LimitsList.One
@@ -80,9 +61,9 @@ async function loadSingleUserWithdrawData(
 ): Promise<IWithdrawData> {
   return (
     await fetchTable(
-      ContractsList.Gateway,
+      GatewayContract.contractName.production,
       params.coopname,
-      TablesList.Withdraws,
+      GatewayContract.Tables.Outcomes.tableName,
       params.withdraw_id,
       params.withdraw_id,
       LimitsList.One
@@ -94,9 +75,9 @@ async function loadUserDepositsData(
   params: ILoadUserDeposits
 ): Promise<IDepositData[]> {
   return (await fetchTable(
-    ContractsList.Gateway,
+    GatewayContract.contractName.production,
     params.coopname,
-    TablesList.Deposits,
+    GatewayContract.Tables.Incomes.tableName,
     params.username,
     params.username,
     LimitsList.None,
@@ -108,9 +89,9 @@ async function loadUserWithdrawsData(
   params: ILoadUserWithdraws
 ): Promise<IWithdrawData[]> {
   return (await fetchTable(
-    ContractsList.Gateway,
+    GatewayContract.contractName.production,
     params.coopname,
-    TablesList.Withdraws,
+    GatewayContract.Tables.Outcomes.tableName,
     params.username,
     params.username,
     LimitsList.None,
@@ -157,10 +138,12 @@ async function loadUserProgramWalletsData(
 }
 
 async function loadMethods(params: IGetPaymentMethods): Promise<IPaymentMethodData[]> {
-  const {username} = params
+  const { username } = params;
   const methods = (await sendGET(`/v1/methods/${username}`)) as IGetResponsePaymentMethodData;
 
-  return methods.results;
+  //тут стоит костыль, т.к. method_id это string, а фабрика документов не возвращает платежные методы с ID в виде number, по которым можно отсортировать.
+  //и дат там тоже нет. Как появятся даты/номера - так и сортировку эту поправим.
+  return methods.results.sort((a, b) => b.method_id.localeCompare(a.method_id));
 }
 
 async function loadUserAgreements(coopname: string, username: string): Promise<SovietContract.Tables.Agreements.IAgreement[]> {
@@ -180,7 +163,6 @@ async function loadUserAgreements(coopname: string, username: string): Promise<S
 
 
 export const api = {
-  loadSingleUserWalletData,
   loadSingleUserDepositData,
   loadSingleUserProgramWalletData,
   loadSingleUserWithdrawData,

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

@@ -18,14 +18,13 @@ const namespace = 'wallet';
 
 interface IWalletStore {
   /*  доменный интерфейс кошелька пользователя */
-  // wallet: Ref<IWalletData>;
   program_wallets: Ref<ExtendedProgramWalletData[]>;
   deposits: Ref<IDepositData[]>;
   withdraws: Ref<IWithdrawData[]>;
   methods: Ref<IPaymentMethodData[]>;
   agreements: Ref<SovietContract.Tables.Agreements.IAgreement[]>;
 
-  loadUserWalet: (params: ILoadUserWallet) => Promise<void>;
+  loadUserWallet: (params: ILoadUserWallet) => Promise<void>;
 
   //TODO move to features
   createDeposit: (params: ICreateDeposit) => Promise<IPaymentOrder>;
@@ -33,14 +32,6 @@ 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 deposits = ref<IDepositData[]>([]);
   const withdraws = ref<IWithdrawData[]>([]);
@@ -49,20 +40,10 @@ export const useWalletStore = defineStore(namespace, (): IWalletStore => {
   const agreements = ref<SovietContract.Tables.Agreements.IAgreement[]>([]);
 
 
-  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 loadUserWallet = async (params: ILoadUserWallet) => {
 
     try {
       const data = await Promise.all([
-        // api.loadSingleUserWalletData(params),
         api.loadUserDepositsData(params),
         api.loadUserWithdrawsData(params),
         api.loadUserProgramWalletsData(params),
@@ -70,7 +51,6 @@ export const useWalletStore = defineStore(namespace, (): IWalletStore => {
         api.loadUserAgreements(params.coopname, params.username)
       ]);
 
-      // wallet.value = data[0] ?? createEmptyWallet();
       deposits.value = data[0] ?? [];
       withdraws.value = data[1] ?? [];
       program_wallets.value = data[2] ?? [];
@@ -99,7 +79,7 @@ export const useWalletStore = defineStore(namespace, (): IWalletStore => {
     withdraws,
     methods,
     agreements,
-    loadUserWalet,
+    loadUserWallet,
     createDeposit,
     createWithdraw,
   };

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

@@ -11,9 +11,8 @@ export type ExtendedProgramWalletData = IProgramWalletData & {
   program_details: ICoopProgramData; // | или другие типы будущих программ
 };
 
-export type IDepositData = GatewayContract.Tables.Deposits.IDeposits;
-export type IWithdrawData = GatewayContract.Tables.Withdraws.IWithdraws;
-export type IWalletData = SovietContract.Tables.Wallets.IWallets;
+export type IDepositData = GatewayContract.Tables.Incomes.IIncome;
+export type IWithdrawData = GatewayContract.Tables.Outcomes.IOutcome;
 
 export interface ILoadSingleUserWallet {
   coopname: string;

package/src/features/Agreementer/SignAgreementDialog/ui/SignAgreementDialog.vue

@@ -56,7 +56,7 @@ const sign = async () => {
   try {
     isSubmitting.value = true
     await signAgreement(session.username, props.agreement.type, agreementOnSign.value)
-    await useWalletStore().loadUserWalet({coopname: info.coopname, username: session.username})
+    await useWalletStore().loadUserWallet({coopname: info.coopname, username: session.username})
     isSubmitting.value = false
     show.value = false
     SuccessAlert('Документ принят')

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

@@ -1 +1,3 @@
 export * from './ui'
+export * from './model'
+export * from './api'