@coopenomics/desktop 2.2.10 → 2025.5.2

package/src/widgets/Cooperative/Payments/ListOfPayments/ui/PaymentCard.vue

@@ -0,0 +1,73 @@
+<template lang="pug">
+div.q-pa-xs.col-xs-12.col-sm-12.col-md-12.q-mt-md
+  q-card(bordered flat)
+    q-card-section.q-py-xs
+      div.text-subtitle2 № {{ payment.id }}
+      div.text-caption Сумма: {{ payment.amount }}
+
+    q-separator
+
+    q-card-section.q-py-xs
+      div.row.items-center
+        div.col-6 Тип платежа:
+        div.col-6.text-right
+          q-badge(v-if="payment.details.data.includes('registration')") регистрационный
+          q-badge(v-else) паевой
+
+      div.row.items-center.q-mt-sm
+        div.col-6 От кого:
+        div.col-6.text-right {{ payment.username }}
+
+      div.row.items-center.q-mt-sm
+        div.col-6 Статус:
+        div.col-6.text-right
+          q-badge(v-if="payment.status ==='COMPLETED'" color="teal") обработан
+          q-badge(v-if="payment.status ==='PENDING'" color="orange") ожидание оплаты
+          q-badge(v-if="payment.status ==='FAILED'" color="red") ошибка
+          q-badge(v-if="payment.status ==='PAID'" color="orange") оплачен
+          q-badge(v-if="payment.status ==='REFUNDED'" color="grey") отменён
+          q-badge(v-if="payment.status ==='EXPIRED'" color="grey") истёк
+
+    q-card-actions(align="right")
+      q-btn(
+        v-if="payment.message"
+        size="sm"
+        flat
+        icon="expand_more"
+        @click="$emit('toggle-expand')"
+      )
+        | {{ expanded ? 'Скрыть' : 'Подробнее' }}
+
+      q-btn-dropdown(v-if="!hideActions" size="sm" label="действия" color="primary")
+        q-list(dense)
+          SetOrderPaidStatusButton(:id="payment.id" @close="$emit('close-dropdown')")
+          SetOrderRefundedStatusButton(:id="payment.id" @close="$emit('close-dropdown')")
+
+    q-slide-transition
+      div(v-show="expanded && payment.message")
+        q-separator
+        q-card-section
+          p Причина ошибки: {{payment.message}}
+</template>
+
+<script setup lang="ts">
+import { SetOrderPaidStatusButton } from 'src/features/Payment/SetStatus/ui/SetOrderPaidStatusButton';
+import { SetOrderRefundedStatusButton } from 'src/features/Payment/SetStatus/ui/SetOrderRefundedStatusButton';
+
+defineProps({
+  payment: {
+    type: Object,
+    required: true
+  },
+  expanded: {
+    type: Boolean,
+    default: false
+  },
+  hideActions: {
+    type: Boolean,
+    default: false
+  }
+})
+
+defineEmits(['toggle-expand', 'close-dropdown'])
+</script>

package/src/widgets/Cooperative/Payments/ListOfPayments/ui/index.ts

@@ -0,0 +1,2 @@
+export { default as PaymentCard } from './PaymentCard.vue'
+export { default as ListOfPaymentsWidget } from './ListOfPaymentsWidget.vue'

package/src/widgets/Cooperative/Payments/index.ts

@@ -0,0 +1 @@
+export * from './ListOfPayments'

package/src/widgets/Desktop/LeftDrawerMenu/LeftDrawerMenu.vue

@@ -1,10 +1,11 @@
 <template lang="pug">
 div
-  //- WorkspaceMenu
+  WorkspaceMenu
+  
   SecondLevelMenuList
 
 </template>
 <script setup lang="ts">
 import { SecondLevelMenuList } from '../SecondLevelMenuList';
-
+import { WorkspaceMenu } from '../WorkspaceMenu';
 </script>

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

@@ -1,115 +1,82 @@
 <template lang="pug">
-  q-list(
-    v-if="filteredRoutes"
-    class="second-menu"
-  )
-
-    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' ")
-
+  div
+    q-list(v-if="filteredRoutes" class="second-menu")
+      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 }}
+        //- 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 { 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 { useSystemStore } from 'src/entities/System/model';
-
-  const desktop = useDesktopStore();
-  const route = useRoute();
-  const router = useRouter();
-  const user = useCurrentUserStore();
-  const { info } = useSystemStore();
-
+  import { useCurrentUserStore } from 'src/entities/User'
+  import { computed } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { useDesktopStore } from 'src/entities/Desktop/model'
+  import { useSystemStore } from 'src/entities/System/model'
+  import type { IRoute } from 'src/entities/Desktop/model/types'
+
+  const desktop = useDesktopStore()
+  const router = useRouter()
+  const user = useCurrentUserStore()
+  const { info } = useSystemStore()
+
+  // Функция для проверки условия
   const evaluateCondition = (condition: string, context: Record<string, any>): boolean => {
     try {
-      const func = new Function(...Object.keys(context), `return ${condition};`);
-      return func(...Object.values(context));
+      const func = new Function(...Object.keys(context), `return ${condition};`)
+      return func(...Object.values(context))
     } catch (error) {
-      console.error('Error evaluating condition:', error);
-      return false;
+      console.error('Error evaluating condition:', error)
+      return false
     }
-  };
+  }
 
+  // Контекст для evaluateCondition и проверки ролей
   const context = computed(() => {
-    const isCoop = user.userAccount?.type === 'organization' &&
-      user.userAccount?.private_data &&
-      'type' in user.userAccount.private_data &&
-      user.userAccount.private_data.type === 'coop';
-
-    const userRole = user.userAccount?.role || 'user';
-
-    return {
-      isCoop,
-      userRole,
-      userAccount: user.userAccount,
-      coopname: info.coopname,
-    };
-  });
-
-  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.value)
-        : true; // Если условия нет, пропускаем проверку
+    const isCoop = user.userAccount?.type === 'organization'
+      && user.userAccount?.private_data
+      && 'type' in user.userAccount.private_data
+      && user.userAccount.private_data.type === 'coop'
+    const userRole = user.userAccount?.role || 'user'
+    return { isCoop, userRole, userAccount: user.userAccount, coopname: info.coopname }
+  })
+
+  // Используем активный второй уровень из store
+  const filteredRoutes = computed<IRoute[]>(() => {
+    return (desktop.activeSecondLevelRoutes as unknown as IRoute[]).filter(r => {
+      const rolesMatch = r.meta?.roles?.includes(context.value.userRole) || (r.meta?.roles && r.meta.roles.length === 0);
+      const conditionMatch = r.meta?.conditions ? evaluateCondition(r.meta.conditions, context.value) : true;
       return rolesMatch && conditionMatch;
     });
   });
 
-  // Функция проверки активного маршрута
+
+  // Проверка активного маршрута
   const isActive = (routeToCheck: IRoute) => {
-    return route.name === routeToCheck.name;
-  };
+    return router.currentRoute.value.name === routeToCheck.name
+  }
 
-  // Функция навигации при клике на элемент
+  // Навигация при клике
   const navigate = (routeToNavigate: IRoute) => {
-    router.push({ name: routeToNavigate.name, params: { coopname: info.coopname } });
-  };
+    router.push({ name: routeToNavigate.name, params: { coopname: info.coopname } })
+  }
   </script>
 
   <style>
   .second-menu .q-item-label {
     font-size: 12px !important;
   }
-
-  .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);
-  }
   </style>

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

@@ -1,96 +1,151 @@
 <template lang="pug">
 div
-  q-btn(
-    stack
-    v-for="route in menuRoutes" :key="route.path"
-    v-ripple
-    flat
-    class="cursor-pointer btn-menu"
-    :class="headerClass(route)"
-    @click="open(route)"
-    align="center"
+  q-carousel(
+    v-model="slideIndex"
+    animated
+    infinite
+    :arrows="menuWorkspaces.length > 1"
+    swipeable
+    control-type="flat"
+    control-color="grey"
+    height="100px"
+    class="workspace-menu"
   )
-
-    q-icon(:name="route.meta.icon").btn-icon.q-pt-sm
-    span.btn-font {{ route.meta.title }}
-
+    q-carousel-slide(
+      v-for="(item, index) in menuWorkspaces"
+      :name="index"
+      :key="item.workspaceName"
+      class="flex flex-center"
+    )
+      q-btn(
+        stack
+        flat
+        v-ripple
+        class="cursor-pointer btn-menu"
+        @click="handleClick(item, index)"
+        align="center"
+      ).full-width
+        q-icon(:name="item.icon").btn-icon.q-pt-sm
+        span.btn-font {{ item.title }}
+
+  q-dialog(v-model="showDialog")
+    q-card(style="min-width: 300px; max-width: 90vw")
+      q-bar.bg-primary.text-white
+        span Выберите рабочий стол
+        q-space
+        q-btn(flat dense icon="close" v-close-popup)
+          q-tooltip Закрыть
+
+      div.row
+        div(
+          v-for="(item, index) in menuWorkspaces"
+          :key="item.workspaceName"
+          :class="{ 'col-6': !(index === menuWorkspaces.length - 1 && menuWorkspaces.length % 2 !== 0), 'col-12': index === menuWorkspaces.length - 1 && menuWorkspaces.length % 2 !== 0 }"
+        )
+          q-btn(
+            stack
+            flat
+            class="full-width q-pa-sm btn-menu"
+            :class="headerClass(item)"
+            @click="selectFromDialog(index)"
+          )
+            q-icon(:name="item.icon").btn-icon
+            div.btn-font.text-center {{ item.title }}
 </template>
 
   <script setup lang="ts">
-  import { computed } from 'vue'
-  import { useRouter, useRoute } from 'vue-router'
-  import { useQuasar } from 'quasar'
-  import { useSystemStore } from 'src/entities/System/model';
-  const { info } = useSystemStore()
-
+  import { ref, computed, onMounted, watch } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { useSystemStore } from 'src/entities/System/model'
   import { useCurrentUserStore } from 'src/entities/User'
-  import { type IRoute } from 'src/entities/Desktop/model/types'
   import { useDesktopStore } from 'src/entities/Desktop/model'
-
-  const $q = useQuasar()
-
-  const isDark = computed(() => $q.dark.isActive)
+  import { useSessionStore } from 'src/entities/Session'
 
   const router = useRouter()
-  const route = useRoute()
+  const system = useSystemStore()
   const user = useCurrentUserStore()
+  const session = useSessionStore()
+  const desktop = useDesktopStore()
+  const { info } = system
 
-  const isRouteActive = (currentRoute: IRoute) => {
-    return route.matched.find(r => r.path === currentRoute.path) || route.name == currentRoute.name
-  }
+  const slideIndex = ref(0)
+  const showDialog = ref(false)
+
+  // workspaceMenus – список рабочих столов из store
+  const workspaceMenus = computed(() => desktop.workspaceMenus)
 
-  const headerClass = (route: IRoute) => {
-    const isActive = isRouteActive(route)
-    return isActive ? (isDark.value ? 'text-white bg-teal' : 'text-white bg-teal') : ''
+  // Фильтрация по ролям (если требуется)
+  const menuWorkspaces = computed(() => {
+    const userRole = user.userAccount?.role || 'user'
+    return workspaceMenus.value.filter(item =>
+      item.meta.roles?.includes(userRole) || !item.meta.roles || item.meta.roles.length === 0
+    )
+  })
+
+  const headerClass = (item: any) => {
+    return desktop?.activeWorkspaceName === item.workspaceName ? 'text-white bg-teal' : ''
   }
 
-  const desktop = useDesktopStore()
 
-  const open = (route: IRoute) => {
-    if (route.children)
+  // Функция навигации: переходим в рамках маршрутов рабочего стола
+  const open = (route: any) => {
+    if (route && route.children && route.children.length)
       router.push({ name: route.children[0].name, params: { coopname: info.coopname } })
-    else router.push({ name: route.name, params: { coopname: info.coopname } })
-
+    else if (route)
+      router.push({ name: route.name, params: { coopname: info.coopname } })
   }
 
-  const menuRoutes = computed(() => {
-    const userRole = user.userAccount?.role || 'user';
+  const handleClick = (item: any, index: number) => {
+    if (slideIndex.value === index) {
+      showDialog.value = true
+    } else {
+      slideIndex.value = index
+      // Обновляем активный рабочий стол
+      desktop.selectWorkspace(item.workspaceName)
+      if (item.mainRoute) open(item.mainRoute)
+    }
+  }
 
-    return desktop.firstLevel.filter(
-      (route) => route.meta.roles.includes(userRole) || route.meta.roles.length === 0
-    );
+  const selectFromDialog = (index: number) => {
+    showDialog.value = false
+    slideIndex.value = index
+    const item = menuWorkspaces.value[index]
+    desktop.selectWorkspace(item.workspaceName)
+    if (item.mainRoute) open(item.mainRoute)
+  }
 
+  onMounted(() => {
+    if (menuWorkspaces.value.length > 0 && session.isAuth && user.isRegistrationComplete) {
+      slideIndex.value = 0
+      const firstItem = menuWorkspaces.value[0]
+      desktop.selectWorkspace(firstItem.workspaceName)
+      if (firstItem.mainRoute) open(firstItem.mainRoute)
+    }
   })
 
+  // При изменении slideIndex обновляем активный рабочий стол
+  watch(slideIndex, (newIndex) => {
+    const item = menuWorkspaces.value[newIndex]
+    if (item) {
+      desktop.selectWorkspace(item.workspaceName)
+      if (item.mainRoute) open(item.mainRoute)
+    }
+  })
   </script>
 
-  <style lang="scss" scoped>
+  <style lang="scss">
   .btn-menu {
     height: 100px;
     width: 100px;
+    border-radius: 0 !important;
   }
-
   .btn-icon {
     font-size: 20px !important;
   }
-
   .btn-font {
     font-size: 8px !important;
   }
-
-  .logout-btn {
-    position: fixed;
-    bottom: 54px;
-    width: 100%;
-  }
-
-  .menu-container {
-    display: flex;
-    // flex-direction: column;
-    height: 100%;
-  }
-
-  .control-buttons {
-    margin-top: auto;
+  .workspace-menu .q-carousel__slide {
+    padding: 0px !important;
   }
   </style>

package/src/widgets/{ExtStore/ExtensionCard → ExtensionCard}/ExtensionCard.vue

@@ -1,22 +1,26 @@
 <template lang="pug">
 div.q-pa-md
   q-card(flat bordered @click="open").hover-card.q-pa-md
-    q-img(v-if="extension.image" :src="extension.image")
+    p.text-h6.no-margin {{extension.title}}
+
     div
       q-chip(outline  v-for="tag in extension.tags" v-bind:key="tag" dense size="sm") {{tag}}
 
-    p.q-mt-md.text-h6 {{extension.title}}
+    q-img(v-if="extension.image" :src="extension.image")
+
 
-    p {{extension.description}}
+    p.q-mt-md {{extension.description}}
     div.flex.justify-between.items-center
       div
-        q-chip(square dense size="sm" color="green" outline v-if="extension.installed").q-ml-sm установлено
+        q-chip(square dense size="md" color="green" outline v-if="extension.is_installed && extension.is_available").q-ml-sm установлено
 
       div
-        q-btn(dense size="sm" v-if="extension.available" flat @click="open")
+        q-btn(dense size="sm" v-if="extension.is_available" flat @click="open")
           span подробнее
           q-icon(name="fa fa-arrow-right").q-ml-sm
-        q-chip(size="sm" dense color="orange" v-if="!extension.available" outline) в разработке
+
+        q-chip(size="md" dense color="orange" v-if="!extension.is_available" outline) в разработке
+
 </template>
 <script lang="ts" setup>
 import type { IExtension } from 'src/entities/Extension/model/types';
@@ -29,10 +33,11 @@ const props = defineProps({
   }
 })
 
+
 const router = useRouter()
 
 const open = () => {
-  if (props.extension.available)
+  if (props.extension.is_available)
     router.push({name: 'one-extension', params: {name: props.extension.name}})
 }
 </script>

package/src/widgets/Header/BackButton/BackButton.vue

@@ -0,0 +1,25 @@
+<!-- BackButton.vue -->
+<template lang="pug">
+q-btn(
+  v-if="backNavigationButton"
+  stretch
+  icon="fas fa-chevron-left"
+  flat
+  @click="backNavigationButton.onClick"
+).back-button
+  span.q-pl-sm {{ backNavigationButton.text }}
+</template>
+
+<script setup lang="ts">
+import { useDesktopStore } from 'src/entities/Desktop/model'
+import { computed } from 'vue'
+
+const desktopStore = useDesktopStore()
+const backNavigationButton = computed(() => desktopStore.backNavigationButton)
+</script>
+
+<style scoped lang="scss">
+.back-button {
+  min-width: auto;
+}
+</style>

package/src/widgets/Header/BackButton/index.ts

@@ -0,0 +1 @@
+export { default as BackButton } from './BackButton.vue'

package/src/widgets/Header/CommonHeader/CooperativeSettingsHeader.vue

@@ -0,0 +1,34 @@
+<!-- CooperativeSettingsHeader.vue -->
+<template lang="pug">
+q-header(bordered).bg-gradient-dark
+  q-toolbar
+    q-btn(flat icon="fas fa-chevron-left" stretch @click="open('index')")
+    q-tabs(
+      dense
+      switch-indicator
+      inline-label
+      align="justify"
+      active-class="bg-teal"
+      active-bg-color="teal"
+      active-color="white"
+      indicator-color="secondary"
+      class="header-tab-container"
+    )
+      q-route-tab(name="Совет" label="Совет" :to="{name: 'members'}" )
+      q-route-tab(name="Кооперативные участки" label="Кооперативные участки" :to="{name: 'branches'}" )
+      q-route-tab(name="Фонды накопления" label="Фонды накопления" :to="{name: 'accumulation-funds'}" )
+      q-route-tab(name="Фонды списания" label="Фонды списания" :to="{name: 'expense-funds'}" )
+      q-route-tab(name="Взносы" label="Взносы" :to="{name: 'initial-contributions'}" )
+      q-route-tab(name="Контакты" label="Контакты" :to="{name: 'change-contacts'}" )
+</template>
+
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import './HeaderStyles.scss'
+
+const router = useRouter()
+
+const open = (name: string) => {
+  router.push({name})
+}
+</script>

package/src/widgets/Header/CommonHeader/ExtstoreHeader.vue

@@ -0,0 +1,41 @@
+<!-- ExtstoreHeader.vue -->
+<template lang="pug">
+q-header(bordered).bg-gradient-dark
+  q-toolbar
+    q-btn(flat icon="fas fa-chevron-left" stretch @click="backFromAppstore")
+    q-tabs(
+      dense
+      switch-indicator
+      inline-label
+      align="justify"
+      active-class="bg-teal"
+      active-bg-color="teal"
+      active-color="white"
+      indicator-color="secondary"
+      class="header-tab-container"
+    )
+      q-route-tab(name="Все приложения" label="Все приложения" :to="{name: 'extstore-showcase'}" )
+      q-route-tab(name="Установленные" label="Установленные" :to="{name: 'appstore-installed'}" )
+</template>
+
+<script setup lang="ts">
+import { useRouter, useRoute } from 'vue-router'
+import './HeaderStyles.scss'
+
+const router = useRouter()
+const route = useRoute()
+
+const is = (what: string) => route.name === what
+
+const open = (name: string) => {
+  router.push({name})
+}
+
+const backFromAppstore = () => {
+  if (is('extension-install') || is('extension-settings'))
+    open('one-extension')
+  else if (is('one-extension'))
+    open('extstore-showcase')
+  else open('index')
+}
+</script>