@coopenomics/desktop 2025.6.14 → 2025.6.24

package/src/features/Request/AcceptRequest/ui/AcceptButton.vue

@@ -31,7 +31,7 @@ const accept = async () => {
 
     SuccessAlert('Заявка принята')
   } catch (e: any) {
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 </script>

package/src/features/Request/CancelRequest/ui/CancelButton.vue

@@ -30,7 +30,7 @@ q-btn(color="red" @click="cancel") отменить поставку
       } as ICancelRequest)
       SuccessAlert('Заявка отменена')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/CompleteOnRequest/ui/CompleteOnRequestButton.vue

@@ -31,7 +31,7 @@ q-btn(color="green" @click="complete") завершить поставку
 
       SuccessAlert('Подтверждение принято')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/ConfirmRecieveOnRequest/ui/ConfirmRecieveOnRequest.vue

@@ -31,7 +31,7 @@ q-btn(color="green" @click="confirmRecieve") выдал имущество
 
       SuccessAlert('Выдача имущества подтверждена')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/ConfirmSupplyOnRequest/ui/ConfirmSupplyOnRequestButton.vue

@@ -32,7 +32,7 @@ q-btn(color="green" @click="supply") Подписать акт передачи
 
       SuccessAlert('Имущество принято в кооператив')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

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

@@ -50,7 +50,7 @@
       SuccessAlert('Заказ НЕ создан')
       router.push({ name: 'marketplace-user-supplies' }) //TODO роутинг
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

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

@@ -63,7 +63,7 @@ const handlerSubmit = async () => {
     SuccessAlert('Объявление успешно создано')
   } catch (e: any) {
     console.log(e)
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 </script>

package/src/features/Request/DeliverOnRequest/ui/DeliverOnRequestButton.vue

@@ -32,7 +32,7 @@ q-btn(color="green" @click="delivered") Подтвердить доставку
 
       SuccessAlert('Подтверждение принято')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/DisputeOnRequest/ui/DisputeOnRequestButton.vue

@@ -31,7 +31,7 @@ q-btn(color="red" @click="dispute") вернуть по гарантии
 
       SuccessAlert('Спор открыт')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/PublishRequest/ui/PublishRequestButton.vue

@@ -30,7 +30,7 @@ q-btn(@click="publish") опубликовать
       })
       SuccessAlert('Заявка опубликована')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/RecieveOnRequest/ui/RecieveOnRequestButton.vue

@@ -31,7 +31,7 @@ q-btn(color="green" @click="recieve") получил имущество
 
       SuccessAlert('Подтверждение принято')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/SupplyOnRequest/ui/SupplyOnRequestButton.vue

@@ -31,7 +31,7 @@ q-btn(color="green" @click="supply") Подписать акт приёма
       } as ISupplyOnRequest)
       SuccessAlert('Ваша подпись принята')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Request/UnpublishRequest/ui/UnpublishRequestButton.vue

@@ -30,7 +30,7 @@ q-btn(@click="unpublish") снять с публикации
       })
       SuccessAlert('Заявка снята с публикации')
     } catch (e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 </script>

package/src/features/Union/AddCooperative/ui/AddCooperativeForm.vue

@@ -83,7 +83,7 @@ const addNow = async () => {
 
     clear()
   } catch(e: any){
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 

package/src/features/User/LoginUser/ui/LoginForm/LoginForm.vue

@@ -104,7 +104,7 @@ const submit = async () => {
   } catch (e: any) {
     console.error(e)
     loading.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 
 }

package/src/features/Wallet/DepositToWallet/ui/DepositButton/DepositButton.vue

@@ -62,7 +62,7 @@ const handlerSubmit = async (): Promise<void> => {
   } catch (e: any) {
     console.log('e.message', e.message)
     isSubmitting.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 

package/src/features/Wallet/WithdrawFromWallet/ui/withdrawButton.vue

@@ -42,7 +42,7 @@ const handlerSubmit = async (): Promise<void> => {
   } catch (e: any) {
     // console.log('e.message', e.message)
     isSubmitting.value = false
-    // FailAlert(e.message)
+    // FailAlert(e)
   }
 }
 

package/src/pages/Cooperative/ListOfMeets/ui/ListOfMeetsPage.vue

@@ -5,7 +5,7 @@ div
     div.row.justify-center
       div.col-12
         div.row.q-pa-md(v-if="canCreateMeet")
-          CreateMeet
+          CreateMeet(:is-chairman="isChairman")
         MeetCardsList(
           :meets="meets"
           :loading="loading"

package/src/pages/Cooperative/MemberBranchList/ui/MemberBranchListPage.vue

@@ -56,6 +56,8 @@ div
               EditableIndividualCard(:participantData="props.row.trustee" :readonly="true").q-mt-sm
               div.text-wrap
                 p.text-grey для замены председателя участка - измените его имя аккаунта в карточке участка на аккаунт одного из пайщиков.
+              div.q-mt-md.flex.justify-center
+                DeleteBranchButton(:branch="props.row")
 </template>
 
 <script lang="ts" setup>
@@ -63,6 +65,7 @@ import { computed, ref } from 'vue';
 import { useBranchStore } from 'src/entities/Branch/model';
 import { useEditableTableRows } from 'src/shared/lib/composables/useEditableTableRows';
 import { CreateBranchButton } from 'src/features/Branch/CreateBranch';
+import { DeleteBranchButton } from 'src/features/Branch/DeleteBranch';
 import { getNameFromUserData } from 'src/shared/lib/utils/getNameFromUserData';
 import { BranchCard } from 'src/widgets/BranchCard';
 import { EditableIndividualCard } from 'src/shared/ui/EditableIndividualCard';

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

@@ -77,7 +77,7 @@ const setAccount = async () => {
   } catch (e: any) {
     store.goTo('SetUserData')
     console.error(e)
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 </script>

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

@@ -70,7 +70,7 @@ const loadStatement = async (): Promise<void> => {
     isLoading.value = false
   } catch (e: any) {
     isLoading.value = false
-    FailAlert(e.message)
+    FailAlert(e)
   }
 }
 const back = () => {

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

@@ -91,8 +91,6 @@ watch(
   () => {
     if (store.step >= steps.GenerateAccount && store.step < steps.WaitingRegistration) {
       useInitWalletProcess().run()
-      // currentUser.loadProfile(username.value, info.coopname)
-      // wallet.loadUserWallet({coopname: info.coopname, username: username.value})
     }
   }
 )

package/src/pages/Union/ListOfCooperatives/ui/UnionPageListOfCooperatives.vue

@@ -99,7 +99,7 @@
       loadCooperatives()
       SuccessAlert('Кооператив активирован')
     } catch(e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 
@@ -111,7 +111,7 @@
       loadCooperatives()
       SuccessAlert('Кооператив заблокирован')
     } catch(e: any) {
-      FailAlert(e.message)
+      FailAlert(e)
     }
   }
 

package/src/processes/navigation-guard-setup/index.ts

@@ -1,36 +1,36 @@
-import { Router } from 'vue-router'
-import { useSessionStore } from 'src/entities/Session'
-import { useCurrentUserStore } from 'src/entities/User'
-import { useDesktopStore } from 'src/entities/Desktop/model'
-import { useSystemStore } from 'src/entities/System/model'
-import { LocalStorage } from 'quasar'
+import { Router } from 'vue-router';
+import { useSessionStore } from 'src/entities/Session';
+import { useCurrentUserStore } from 'src/entities/User';
+import { useDesktopStore } from 'src/entities/Desktop/model';
+import { useSystemStore } from 'src/entities/System/model';
+import { LocalStorage } from 'quasar';
 
 function hasAccess(to, userAccount) {
-  if (!to.meta?.roles || to.meta?.roles.length === 0) return true
-  return userAccount && to.meta?.roles.includes(userAccount.role)
+  if (!to.meta?.roles || to.meta?.roles.length === 0) return true;
+  return userAccount && to.meta?.roles.includes(userAccount.role);
 }
 
 // Функция для получения URL для редиректа
 function getRedirectUrl(router: Router, to: any): string {
   if (process.env.CLIENT) {
-    return router.resolve(to).href
+    return router.resolve(to).href;
   }
-  return ''
+  return '';
 }
 
 export function setupNavigationGuard(router: Router) {
-  const desktops = useDesktopStore()
-  const session = useSessionStore()
-  const currentUser = useCurrentUserStore()
-  const { info } = useSystemStore()
+  const desktops = useDesktopStore();
+  const session = useSessionStore();
+  const currentUser = useCurrentUserStore();
+  const { info } = useSystemStore();
 
   router.beforeEach(async (to, from, next) => {
-    await desktops.healthCheck()
+    await desktops.healthCheck();
 
     // если требуется установка
     if (desktops.health?.status === 'install' && to.name !== 'install') {
-      next({ name: 'install', params: { coopname: info.coopname } })
-      return
+      next({ name: 'install', params: { coopname: info.coopname } });
+      return;
     }
 
     // редирект с index
@@ -39,18 +39,18 @@ export function setupNavigationGuard(router: Router) {
       if (session.isAuth && currentUser.isRegistrationComplete) {
         // Если рабочий стол не выбран - выбираем по правам пользователя
         if (!desktops.activeWorkspaceName) {
-          desktops.selectDefaultWorkspace()
+          desktops.selectDefaultWorkspace();
         }
 
         // Переходим на маршрут по умолчанию для выбранного рабочего стола
-        desktops.goToDefaultPage(router)
-        // next(false)
-        return
+        desktops.goToDefaultPage(router);
+
+        return;
       } else {
         // Если пользователь не авторизован, используем nonAuthorizedHome
-        const homePage = desktops.currentDesktop?.nonAuthorizedHome
-        next({ name: homePage, params: { coopname: info.coopname } })
-        return
+        const homePage = desktops.currentDesktop?.nonAuthorizedHome;
+        next({ name: homePage, params: { coopname: info.coopname } });
+        return;
       }
     }
 
@@ -59,19 +59,19 @@ export function setupNavigationGuard(router: Router) {
       // Сохраняем целевой URL для редиректа после входа
       if (process.env.CLIENT) {
         // Получаем URL для редиректа
-        const redirectUrl = getRedirectUrl(router, to)
-        LocalStorage.set('redirectAfterLogin', redirectUrl)
+        const redirectUrl = getRedirectUrl(router, to);
+        LocalStorage.set('redirectAfterLogin', redirectUrl);
       }
       // Перенаправляем на страницу входа
-      next({ name: 'login-redirect', params: { coopname: info.coopname } })
-      return
+      next({ name: 'login-redirect', params: { coopname: info.coopname } });
+      return;
     }
 
     // проверка по ролям
     if (hasAccess(to, currentUser.userAccount)) {
-      next()
+      next();
     } else {
-      next({ name: 'permissionDenied' })
+      next({ name: 'permissionDenied' });
     }
-  })
+  });
 }

package/src/processes/process-decisions/index.ts

@@ -135,10 +135,15 @@ export function useDecisionProcessor() {
     }
     else if (registry_id === Cooperative.Registry.AnnualGeneralMeetingSovietDecision.registry_id) {
       const { generateSovietDecisionOnAnnualMeet } = useGenerateSovietDecisionOnAnnualMeet()
+      const unparsedDocumentMeta = row.table.statement.meta == '' ? '{}' : row.table.statement.meta
+      const parsedDocumentMeta = JSON.parse(unparsedDocumentMeta) as Cooperative.Registry.AnnualGeneralMeetingAgenda.Action
+      const is_repeated = parsedDocumentMeta.is_repeated || false
+
       document = await generateSovietDecisionOnAnnualMeet({
         username: username,
         decision_id: decision_id,
-        meet_hash: row.table.hash as string
+        meet_hash: row.table.hash as string,
+        is_repeated
       })
     }
     else {

package/src/processes/select-branch/index.ts

@@ -1,4 +1,4 @@
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { useSelectBranch } from 'src/features/Branch/SelectBranch'
 import { useSystemStore } from 'src/entities/System/model'
 import { useSessionStore } from 'src/entities/Session'
@@ -24,9 +24,16 @@ export function useSelectBranchProcess() {
 
   const branches = computed(() => branchStore.publicBranches)
 
-  if (session.isAuth) {
-    branchStore.loadPublicBranches({ coopname: system.info.coopname })
-  }
+  // Вотчер на авторизацию
+  watch(
+    () => session.isAuth,
+    (isAuth, wasAuth) => {
+      if (isAuth && !wasAuth) {
+        branchStore.loadPublicBranches({ coopname: system.info.coopname })
+      }
+    },
+    { immediate: true }
+  )
 
   const next = async () => {
     isLoading.value = true

package/src/shared/api/errors.ts

@@ -15,13 +15,14 @@ export function createBlockchainGetError(name: string) {
 
 export function handleException(e: unknown): void {
   if (e instanceof Error) {
-    FailAlert(e.message);
+    FailAlert(e);
   } else {
     FailAlert('Произошла неизвестная ошибка');
   }
 }
 
 export function extractGraphQLErrorMessages(error: unknown): string {
+  if (typeof error === 'string') return error;
   if (!error || typeof error !== 'object') return 'Unknown error';
 
   // Проверяем, если ошибка уже является массивом