@coopenomics/desktop 2.2.6-alpha.0 → 2.2.7

package/src/widgets/Cooperative/Contacts/ui/ChangeContacts.vue

@@ -16,7 +16,9 @@ import { Cooperative } from 'cooptypes';
 import { useCooperativeStore } from 'src/entities/Cooperative';
 import { useUpdateMeta } from 'src/features/User/UpdateMeta';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { ref, watch } from 'vue';
 
 const coop = useCooperativeStore()
@@ -31,7 +33,7 @@ watch(() => coop.contacts, (newValue: Cooperative.Model.IContacts | undefined) =
   }
 })
 
-coop.loadPublicCooperativeData(COOPNAME)
+coop.loadPublicCooperativeData(info.coopname)
 coop.loadContacts()
 
 const update = async () => {
@@ -40,7 +42,7 @@ const update = async () => {
 
   try {
     await updateMeta(
-      COOPNAME,
+      info.coopname,
       {
         phone: phone.value,
         email: email.value

package/src/widgets/Cooperative/Contributions/ui/ChangeContributions.vue

@@ -4,12 +4,14 @@ import { useCooperativeStore } from 'src/entities/Cooperative';
 import { useSessionStore } from 'src/entities/Session';
 import { useUpdateCoop } from 'src/features/Cooperative/UpdateCoop';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
-import { COOPNAME, CURRENCY } from 'src/shared/config';
+import { CURRENCY } from 'src/shared/config';
 import { formatToAsset } from 'src/shared/lib/utils/formatToAsset';
 import { ref, watch } from 'vue';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
 
 const coop = useCooperativeStore()
-coop.loadPublicCooperativeData(COOPNAME)
+coop.loadPublicCooperativeData(info.coopname)
 coop.loadPrivateCooperativeData()
 
 const localCoop = ref({
@@ -25,7 +27,7 @@ const save = async () => {
   if (coop.publicCooperativeData)
     try {
       await updateCoop({
-        coopname: COOPNAME,
+        coopname: info.coopname,
         username: session.username,
         initial: formatToAsset(localCoop.value.initial, CURRENCY),
         minimum: formatToAsset(localCoop.value.minimum, CURRENCY),
@@ -34,7 +36,7 @@ const save = async () => {
         announce: coop.publicCooperativeData?.announce,
         description: coop.publicCooperativeData?.description
       })
-      await coop.loadPublicCooperativeData(COOPNAME)
+      await coop.loadPublicCooperativeData(info.coopname)
 
       SuccessAlert('Размеры взносов успешно обновлены')
     } catch (e: any) {

package/src/widgets/Cooperative/Funds/ui/AccumulationFunds.vue

@@ -2,18 +2,19 @@
 import { computed, ref } from 'vue';
 import { FundContract } from 'cooptypes';
 import { useEditFund } from 'src/features/Fund/EditFund';
-import { COOPNAME } from 'src/shared/config';
 import { useSessionStore } from 'src/entities/Session';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
 import { useCooperativeStore } from 'src/entities/Cooperative';
 import AddAccumulationFund from './AddAccumulationFund.vue'
 import { useDeleteFund } from 'src/features/Fund/DeleteFund';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
 
 const coop = useCooperativeStore()
 
 const loadFunds = async () => {
   try {
-    await coop.loadFunds(COOPNAME)
+    await coop.loadFunds(info.coopname)
   } catch(e: any){
     FailAlert(e.message)
   }
@@ -37,13 +38,13 @@ const delFund = async(fund: FundContract.Tables.AccumulatedFunds.IAccumulatedFun
   const { deleteFund } = useDeleteFund()
   try {
     await deleteFund({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       username: session.username,
       type: 'accumulation',
       fund_id: fund.id
     })
 
-    await coop.loadFunds(COOPNAME)
+    await coop.loadFunds(info.coopname)
     SuccessAlert('Фонд успешно удалён')
 
   } catch (e: any){
@@ -59,7 +60,7 @@ const saveFund = async (fund: FundContract.Tables.AccumulatedFunds.IAccumulatedF
     try {
 
       await editFund({
-        coopname: COOPNAME,
+        coopname: info.coopname,
         username: session.username,
         type: 'accumulation',
         fund_id: fund.id,
@@ -69,12 +70,12 @@ const saveFund = async (fund: FundContract.Tables.AccumulatedFunds.IAccumulatedF
         percent: percent
       })
 
-      await coop.loadFunds(COOPNAME)
+      await coop.loadFunds(info.coopname)
 
       SuccessAlert('Фонд успешно обновлён')
     } catch(e: any){
       FailAlert(e.message)
-      await coop.loadFunds(COOPNAME)
+      await coop.loadFunds(info.coopname)
     }
 
 };

package/src/widgets/Cooperative/Funds/ui/AddAccumulationFund.vue

@@ -3,7 +3,9 @@ import { useCooperativeStore } from 'src/entities/Cooperative';
 import { useSessionStore } from 'src/entities/Session';
 import { useCreateFund } from 'src/features/Fund/CreateFund';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { ref, watch } from 'vue';
 
 const props = defineProps({
@@ -27,7 +29,7 @@ const percent = ref()
 const addFund = async() => {
   try{
     await createFund({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       username: session.username,
       type: 'accumulation',
       contract: '',
@@ -36,7 +38,7 @@ const addFund = async() => {
       percent: Number(percent.value) * 10000
     })
 
-    await coop.loadFunds(COOPNAME)
+    await coop.loadFunds(info.coopname)
     localShowAdd.value = false
     name.value = ''
     description.value = ''

package/src/widgets/Cooperative/Funds/ui/AddExpenseFund.vue

@@ -3,7 +3,9 @@ import { useCooperativeStore } from 'src/entities/Cooperative';
 import { useSessionStore } from 'src/entities/Session';
 import { useCreateFund } from 'src/features/Fund/CreateFund';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { ref, watch } from 'vue';
 
 const props = defineProps({
@@ -26,7 +28,7 @@ const description = ref('')
 const addFund = async() => {
   try{
     await createFund({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       username: session.username,
       type: 'expend',
       contract: '',
@@ -35,7 +37,7 @@ const addFund = async() => {
       percent: 0
     })
 
-    await coop.loadFunds(COOPNAME)
+    await coop.loadFunds(info.coopname)
     localShowAdd.value = false
     name.value = ''
     description.value = ''

package/src/widgets/Cooperative/Funds/ui/ExpenseFunds.vue

@@ -2,18 +2,19 @@
 import { computed, ref } from 'vue';
 import { FundContract } from 'cooptypes';
 import { useEditFund } from 'src/features/Fund/EditFund';
-import { COOPNAME } from 'src/shared/config';
 import { useSessionStore } from 'src/entities/Session';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
 import { useCooperativeStore } from 'src/entities/Cooperative';
 import AddExpenseFund from './AddExpenseFund.vue'
 import { useDeleteFund } from 'src/features/Fund/DeleteFund';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
 
 const coop = useCooperativeStore()
 
 const loadFunds = async () => {
   try {
-    await coop.loadFunds(COOPNAME)
+    await coop.loadFunds(info.coopname)
   } catch(e: any){
     FailAlert(e.message)
   }
@@ -31,13 +32,13 @@ const delFund = async(fund: FundContract.Tables.AccumulatedFunds.IAccumulatedFun
   const { deleteFund } = useDeleteFund()
   try {
     await deleteFund({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       username: session.username,
       type: 'expend',
       fund_id: fund.id
     })
 
-    await coop.loadFunds(COOPNAME)
+    await coop.loadFunds(info.coopname)
     SuccessAlert('Фонд успешно удалён')
 
   } catch (e: any){
@@ -52,7 +53,7 @@ const saveFund = async (fund: FundContract.Tables.AccumulatedFunds.IAccumulatedF
     try {
 
       await editFund({
-        coopname: COOPNAME,
+        coopname: info.coopname,
         username: session.username,
         type: 'expend',
         fund_id: fund.id,
@@ -62,12 +63,12 @@ const saveFund = async (fund: FundContract.Tables.AccumulatedFunds.IAccumulatedF
         percent: 0
       })
 
-      await coop.loadFunds(COOPNAME)
+      await coop.loadFunds(info.coopname)
 
       SuccessAlert('Фонд успешно обновлён')
     } catch(e: any){
       FailAlert(e.message)
-      await coop.loadFunds(COOPNAME)
+      await coop.loadFunds(info.coopname)
     }
 
 };

package/src/widgets/Cooperative/Members/ui/Members.vue

@@ -76,7 +76,9 @@ import { Notify } from 'quasar';
 import { readBlockchain } from 'src/shared/api'
 import { useSessionStore } from 'src/entities/Session';
 import { useUpdateBoard } from 'src/features/Cooperative/UpdateBoard';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { useCooperativeStore } from 'src/entities/Cooperative';
 import { sleep } from 'src/shared/api/sleep';
 
@@ -173,7 +175,7 @@ const updateBoard = async (new_members: any) => {
     const coop = useUpdateBoard()
 
     await coop.updateBoard({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       username: useSessionStore().username,
       board_id: 0,
       members: new_members,

package/src/widgets/Desktop/SecondLevelMenu/SecondLevelMenu.vue

@@ -19,7 +19,7 @@ q-tabs(
     :name="route.meta.title"
     :label="route.meta.title"
     :to="{ name: route.name }"
-    :params="{coopname: COOPNAME}"
+    :params="{coopname: info.coopname}"
   )
 
 
@@ -30,7 +30,9 @@ import { ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { useDesktopStore } from 'src/entities/Desktop/model';
 import { type IRoute } from 'src/entities/Desktop/model/types';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 const desktop = useDesktopStore()
 const routes = ref<IRoute[]>([])
 const route = useRoute()

package/src/widgets/Desktop/SecondLevelMenuList/SecondLevelMenuList.vue

@@ -1,37 +1,41 @@
 <template lang="pug">
-q-list(
-  v-if="routes"
-  class="second-menu"
-)
-
-  q-item(
-    v-for="route in routes"
-    :key="route.name"
-    clickable
-    v-ripple
-    :active="isActive(route)"
-    active-class="bg-gradient-dark text-white"
-    @click="navigate(route)"
+  q-list(
+    v-if="filteredRoutes"
+    class="second-menu"
   )
 
-    q-item-section
-      q-item-label.no-select {{ route.meta.title }}
+    q-item(
+      v-for="route in filteredRoutes"
+      :key="route.name"
+      clickable
+      v-ripple
+      :active="isActive(route)"
+      active-class="bg-gradient-dark text-white"
+      @click="navigate(route)"
+    )
+
+      q-item-section
+        q-item-label.no-select
+          span {{ route.meta.title }}
+
+      // показываем иконку замка с цветом если требуется роль не user
+      q-icon(v-if="route.meta.roles && !route.meta.roles.includes('user') && route.meta.roles.length > 0" name="fa-solid fa-lock-open" :color="context.userRole == 'member' ? 'orange' : 'teal' ")
 
   </template>
 
   <script lang="ts" setup>
   import { useCurrentUserStore } from 'src/entities/User';
-  import { ref, watch } from 'vue';
+  import { computed } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
   import { useDesktopStore } from 'src/entities/Desktop/model';
   import { type IRoute } from 'src/entities/Desktop/model/types';
-  import { COOPNAME } from 'src/shared/config';
+  import { useSystemStore } from 'src/entities/System/model';
 
-  const desktop = useDesktopStore()
-  const routes = ref<IRoute[]>([])
-  const route = useRoute()
-  const router = useRouter()
-  const user = useCurrentUserStore()
+  const desktop = useDesktopStore();
+  const route = useRoute();
+  const router = useRouter();
+  const user = useCurrentUserStore();
+  const { info } = useSystemStore();
 
   const evaluateCondition = (condition: string, context: Record<string, any>): boolean => {
     try {
@@ -43,7 +47,7 @@ q-list(
     }
   };
 
-  const init = () => {
+  const context = computed(() => {
     const isCoop = user.userAccount?.type === 'organization' &&
       user.userAccount?.private_data &&
       'type' in user.userAccount.private_data &&
@@ -51,38 +55,34 @@ q-list(
 
     const userRole = user.userAccount?.role || 'user';
 
-    const context = {
+    return {
       isCoop,
       userRole,
       userAccount: user.userAccount,
-      coopname: COOPNAME,
-      // любые другие свойства, которые нужно использовать в условиях
+      coopname: info.coopname,
     };
+  });
 
-    routes.value = (desktop.getSecondLevel(route) as unknown as IRoute[]).filter(
-    (route) => {
-      const rolesMatch = route.meta?.roles?.includes(userRole) || route.meta?.roles?.length === 0;
+  const filteredRoutes = computed(() => {
+    const secondLevelRoutes = desktop.getSecondLevel(route) as unknown as IRoute[];
+    return secondLevelRoutes.filter((route) => {
+      const rolesMatch = route.meta?.roles?.includes(context.value.userRole) || route.meta?.roles?.length === 0;
       const conditionMatch = route.meta?.conditions
-        ? evaluateCondition(route.meta.conditions, context)
+        ? evaluateCondition(route.meta.conditions, context.value)
         : true; // Если условия нет, пропускаем проверку
       return rolesMatch && conditionMatch;
-    }
-  );
-  }
+    });
+  });
 
   // Функция проверки активного маршрута
   const isActive = (routeToCheck: IRoute) => {
-    return route.name === routeToCheck.name
-  }
+    return route.name === routeToCheck.name;
+  };
 
   // Функция навигации при клике на элемент
   const navigate = (routeToNavigate: IRoute) => {
-    router.push({ name: routeToNavigate.name, params: { coopname: COOPNAME } });
-  }
-
-  init()
-
-  watch(route, () => init())
+    router.push({ name: routeToNavigate.name, params: { coopname: info.coopname } });
+  };
   </script>
 
   <style>
@@ -91,26 +91,25 @@ q-list(
   }
 
   .custom-ripple {
-  position: relative;
-  overflow: hidden;
-}
-
-.custom-ripple::before {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.1);
-  transform: scaleX(0);
-  transform-origin: left;
-  transition: transform 0.4s ease-out;
-  z-index: 0;
-}
-
-.custom-ripple:active::before {
-  transform: scaleX(1);
-}
+    position: relative;
+    overflow: hidden;
+  }
 
+  .custom-ripple::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.1);
+    transform: scaleX(0);
+    transform-origin: left;
+    transition: transform 0.4s ease-out;
+    z-index: 0;
+  }
+
+  .custom-ripple:active::before {
+    transform: scaleX(1);
+  }
   </style>

package/src/widgets/Desktop/WorkspaceMenu/WorkspaceMenu.vue

@@ -20,7 +20,9 @@ div
   import { computed } from 'vue'
   import { useRouter, useRoute } from 'vue-router'
   import { useQuasar } from 'quasar'
-  import { COOPNAME } from 'src/shared/config'
+  import { useSystemStore } from 'src/entities/System/model';
+  const { info } = useSystemStore()
+
   import { useCurrentUserStore } from 'src/entities/User'
   import { type IRoute } from 'src/entities/Desktop/model/types'
   import { useDesktopStore } from 'src/entities/Desktop/model'
@@ -46,8 +48,8 @@ div
 
   const open = (route: IRoute) => {
     if (route.children)
-      router.push({ name: route.children[0].name, params: { coopname: COOPNAME } })
-    else router.push({ name: route.name, params: { coopname: COOPNAME } })
+      router.push({ name: route.children[0].name, params: { coopname: info.coopname } })
+    else router.push({ name: route.name, params: { coopname: info.coopname } })
 
   }
 

package/src/widgets/Request/CreateChildOrderCard/CreateChildOrderCard.vue

@@ -4,11 +4,13 @@ import { Map } from 'src/shared/ui/Map'
 import { CreateChildOrderButton } from 'src/features/Request/CreateChildOrder'
 import type { IRequestData } from 'src/entities/Request'
 import { useCooperativeStore, type IAddressesData } from 'src/entities/Cooperative'
-import { COOPNAME } from 'src/shared/config'
+
 import { useSessionStore } from 'src/entities/Session'
 const session = useSessionStore()
 const username = computed(() => session.username)
 const cooperativeStore = useCooperativeStore()
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
 
 let units = ref(1)
 const selectedAddress = ref<IAddressesData>()
@@ -27,7 +29,7 @@ cooperativeStore.addresses.map((el: any) => {
 )
 
 onMounted(async () => {
-  await cooperativeStore.loadAddresses({ coopname: COOPNAME })
+  await cooperativeStore.loadAddresses({ coopname: info.coopname })
   selectedAddress.value = addresses.value[0]
 })
 
@@ -53,5 +55,5 @@ div.q-pl-md.q-pr-md
 
   q-input(v-model="units" label="Введите количество единиц")
 
-  CreateChildOrderButton(:coopname="COOPNAME" :username="username" :offer="offer" :units="units")
+  CreateChildOrderButton(:coopname="info.coopname" :username="username" :offer="offer" :units="units")
 </template>

package/src/widgets/Request/SupplyOrderRequestCard/ui/Steps/FirstStep.vue

@@ -24,10 +24,10 @@ div
       span Пожалуйста, подтвердите свою готовность совершить поставку.
 
       q-stepper-navigation.q-gutter-sm
-        DeclineButton(v-if="iAmSupplier && isActive" :request-id=Number("request.id") :coopname="request.coopname" :username="username")
+        DeclineButton(v-if="iAmSupplier && isActive" :request-id="Number(request.id)" :coopname="request.coopname" :username="username")
         //- q-btn(v-if="iAmSupplier && isActive" @click="decline") Отклонить
-        AcceptButton(v-if="iAmSupplier && isActive" :request-id=Number("request.id") :coopname="request.coopname" :username="username")
-
+        AcceptButton(v-if="iAmSupplier && isActive" :request-id="Number(request.id)" :coopname="request.coopname" :username="username")
+        p {{request}}
   template(v-else)
     q-step(
       :name="1"

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

@@ -8,7 +8,9 @@ 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
@@ -34,6 +36,8 @@ 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/widgets/User/PaymentMethods/ui/PaymentMethods.vue

@@ -85,7 +85,9 @@ div(flat bordered).q-pa-md
 
 <script lang="ts" setup>
 import { useWalletStore } from 'src/entities/Wallet';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { computed } from 'vue';
 import { AddPaymentMethodButton } from 'src/features/PaymentMethod/AddPaymentMethod';
 import type { IBankTransferData, ISBPData } from 'src/features/PaymentMethod/AddPaymentMethod/model';
@@ -102,7 +104,7 @@ const wallet = useWalletStore()
 
 const username = computed(() => props.username)
 
-wallet.loadUserWalet({ coopname: COOPNAME, username: username.value })
+wallet.loadUserWalet({ coopname: info.coopname, username: username.value })
 
 function isSBPData(data: ISBPData | IBankTransferData): data is ISBPData {
   return (data as ISBPData).phone !== undefined;

package/src/shared/api/wif.ts

@@ -1,9 +0,0 @@
-import { LocalStorage } from 'quasar'
-import { COOPNAME } from '../config'
-
-export function getWIF(): string {
-  const wif = LocalStorage.getItem(`${COOPNAME}:WIF`) as string
-  if (!wif) throw new Error('Ошибка авторизации: приватный ключ не найден')
-
-  return wif
-}