@coopenomics/desktop 2.2.2

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

@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { CancelButton } from 'src/features/Request/CancelRequest'
+import { ConfirmRecieveOnRequestButton } from 'src/features/Request/ConfirmRecieveOnRequest'
+import { computed, withDefaults } from 'vue'
+import type { IStepProps } from '../../model'
+import { useSessionStore } from 'src/entities/Session'
+const session = useSessionStore()
+const username = computed(() => session.username)
+
+const props = withDefaults(defineProps<IStepProps>(), {})
+const isActive = computed(() => props.request.status === 'recieved1')
+const currentStep = computed(()=> props.currentStep)
+</script>
+
+<template lang="pug">
+div
+  template(v-if="props.iAmAuthorizer")
+    q-step(
+      :name="7"
+      title="Подтвердите выдачу имущества"
+      icon="settings"
+      :done="currentStep > 7"
+    )
+      span Пожалуйста, подтвердите выдачу имущества по заказу в течении {time}
+      q-stepper-navigation.q-gutter-sm
+        CancelButton(v-if="iAmAuthorizer && isActive" :request-id="Number(request.id)" :coopname="request.coopname" :username="username")
+        ConfirmRecieveOnRequestButton(v-if="iAmAuthorizer && isActive" :request-id="Number(request.id)" :coopname="request.coopname" :username="username")
+
+  template(v-else)
+    q-step(
+      :name="7"
+      title="Формируются закрывающие документы"
+      icon="settings"
+      :done="currentStep > 7"
+    )
+      span Ожидаем цифровую подпись уполномоченного на акте приёма-передачи имущества
+</template>

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

@@ -0,0 +1,37 @@
+<script setup lang="ts">
+  import { CancelButton } from 'src/features/Request/CancelRequest'
+  import { RecieveOnRequestButton } from 'src/features/Request/RecieveOnRequest'
+  import { computed, withDefaults } from 'vue'
+  import type { IStepProps } from '../../model'
+  import { useSessionStore } from 'src/entities/Session'
+  const session = useSessionStore()
+  const username = computed(() => session.username)
+
+  const props = withDefaults(defineProps<IStepProps>(), {})
+  const isActive = computed(() => props.request.status === 'delivered')
+  const currentStep = computed(()=> props.currentStep)
+</script>
+
+<template lang="pug">
+div
+  template(v-if="props.iAmReciever")
+    q-step(
+      :name="6"
+      title="Получите имущество из участка"
+      icon="settings"
+      :done="currentStep > 6"
+    )
+      span Пожалуйста, получите имущество из участка {point} в течении {time}
+      q-stepper-navigation.q-gutter-sm
+        CancelButton(v-if="iAmReciever && isActive" :request-id=Number("request.id") :coopname="request.coopname" :username="username")
+        RecieveOnRequestButton(v-if="iAmReciever && isActive" :request-id=Number("request.id") :coopname="request.coopname" :username="username")
+
+  template(v-else)
+    q-step(
+      :name="6"
+      title="Заказчик получает имущество"
+      icon="settings"
+      :done="currentStep > 6"
+    )
+      span Заказчик получит имущество не позднее чем через {time}
+</template>

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

@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import { CancelButton } from 'src/features/Request/CancelRequest'
+import { SupplyOnRequestButton } from 'src/features/Request/SupplyOnRequest'
+import { computed, withDefaults } from 'vue'
+import type { IStepProps } from '../../model'
+
+import { useSessionStore } from 'src/entities/Session'
+const session = useSessionStore()
+const username = computed(() => session.username)
+
+const props = withDefaults(defineProps<IStepProps>(), {})
+const currentStep = computed(()=> props.currentStep)
+const isActive = computed(() => props.request.status === 'authorized')
+</script>
+
+<template lang="pug">
+div
+  template(v-if="iAmAuthorizer")
+    q-step(
+      :name="3"
+      title="Примите имущество"
+      icon="settings"
+      :done="currentStep > 3"
+    )
+      span Пожалуйста, осмотрите имущество и примите его в кооператив, оставив подпись на акте приёма-передачи.
+
+      q-stepper-navigation.q-gutter-sm
+        CancelButton(:request-id="Number(request.id)" :coopname="request.coopname" :username="username")
+        SupplyOnRequestButton(:request-id="Number(request.id)" :coopname="request.coopname" :username="username")
+
+  template(v-else-if="iAmSupplier")
+    q-step(
+      :name="3"
+      title="Доставьте имущество до участка"
+      icon="settings"
+      :done="currentStep > 3"
+    )
+      span Пожалуйста, доставьте имущество до ближайшего участка в течении {time} и покажите {QR}
+      q-stepper-navigation.q-gutter-sm
+        CancelButton(v-if="iAmSupplier && isActive" :request-id="Number(request.id)" :coopname="request.coopname" :username="username")
+
+
+  template(v-else-if="iAmReciever")
+    q-step(
+      :name="3"
+      title="Поставщик доставляет имущество"
+      icon="settings"
+      :done="currentStep > 3"
+    )
+      span Прямо сейчас поставщик везёт ваше имущество на участок и доставит его не позднее чем через {time}
+</template>

package/src/widgets/Request/SupplyOrderRequestCard/ui/Steps/index.ts

@@ -0,0 +1,8 @@
+export { default as FirstStep } from './FirstStep.vue'
+export { default as SecondStep } from './SecondStep.vue'
+export { default as ThirdStep } from './ThirdStep.vue'
+export { default as FourthStep } from './FourthStep.vue'
+export { default as FifthStep } from './FifthStep.vue'
+export { default as SixthStep } from './SixthStep.vue'
+export { default as SeventhStep } from './SeventhStep.vue'
+export { default as EightStep } from './EightStep.vue'

package/src/widgets/Request/SupplyOrderRequestCard/ui/index.ts

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

package/src/widgets/Union/ListOfCooperatives/index.ts

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

package/src/widgets/Union/ListOfCooperatives/ui/UnionListOfCooperatives.vue

@@ -0,0 +1,136 @@
+<template lang="pug">
+div
+  q-table(
+    v-if="coops"
+    ref="tableRef" v-model:expanded="expanded"
+    flat
+    :rows="coops"
+    :columns="columns"
+    :table-colspan="9"
+    row-key="username"
+    :pagination="pagination"
+    virtual-scroll
+    :virtual-scroll-item-size="48"
+    :rows-per-page-options="[10]"
+    :loading="onLoading"
+    :no-data-label="'Нет кооперативов'"
+  ).full-height
+    template(#top)
+
+
+    template(#header="props")
+
+      q-tr(:props="props")
+        q-th(auto-width)
+
+        q-th(
+          v-for="col in props.cols"
+          :key="col.name"
+          :props="props"
+        ) {{ col.label }}
+
+    template(#body="props")
+      q-tr(:key="`m_${props.row.username}`" :props="props")
+        q-td(auto-width)
+          q-btn(size="sm" color="primary" round dense :icon="props.expand ? 'remove' : 'add'" @click="props.expand = !props.expand")
+        q-td {{ props.row.username }}
+        q-td {{ props.row.announce }}
+
+        q-td
+          q-badge(v-if="props.row.status === 'active'" color="teal") активен
+          q-badge(v-if="props.row.status === 'pending'" color="orange") на рассмотрении
+          q-badge(v-if="props.row.status === 'blocked'" color="red") заблокирован
+
+        q-td {{ moment(props.row.created_at).format('DD.MM.YY HH:mm:ss') }}
+
+        q-td
+          q-btn-dropdown( label="действия" flat size="sm")
+            q-list
+              q-item(v-if="props.row.status !== 'active'" clickable v-close-popup @click="activate(props.row.username)")
+                q-item-section
+                  q-item-label Активировать
+              q-item(v-if="props.row.status !== 'blocked'" clickable v-close-popup @click="block(props.row.username)")
+                q-item-section
+                  q-item-label Заблокировать
+              //- q-item(clickable v-close-popup @click="deleteCoop(props.row.username)")
+              //-   q-item-section
+              //-     q-item-label Удалить
+
+      q-tr(v-show="props.expand" :key="`e_${props.row.username}`" :props="props" class="q-virtual-scroll--with-prev")
+        q-td(colspan="100%")
+          slot(:expand="props.expand" :receiver="props.row.username")
+          ListOfDocumentsWidget(:expand="true" :documentType="'newsubmitted'" :filter="{receiver: props.row.username, data: getDataFilter(props.row.document.hash)}")
+
+</template>
+<script setup lang="ts">
+import { useLoadCooperatives } from 'src/features/Union/LoadCooperatives';
+const {loadCooperatives} = useLoadCooperatives()
+import { useUnionStore } from 'src/entities/Union/model';
+import { computed, ref } from 'vue';
+import moment from 'moment-with-locales-es6'
+import { useActivateCooperative } from 'src/features/Union/ActivateCooperative';
+import { FailAlert, SuccessAlert } from 'src/shared/api/alerts';
+import { useBlockCooperative } from 'src/features/Union/BlockCooperative';
+const union = useUnionStore()
+
+import { ListOfDocumentsWidget } from 'src/widgets/Cooperative/Documents/ListOfDocuments';
+const getDataFilter = (hash: string) => {
+  return {
+    document: {
+      hash: hash.toUpperCase()
+    }
+  }
+}
+
+const coops = computed(() => union.coops)
+
+loadCooperatives()
+
+const activate = async (coopname: string) => {
+  const {activateCooperative} = useActivateCooperative()
+
+  try {
+    await activateCooperative(coopname)
+    loadCooperatives()
+    SuccessAlert('Кооператив активирован')
+  } catch(e: any) {
+    FailAlert(e.message)
+  }
+}
+
+const block = async (coopname: string) => {
+  const {blockCooperative} = useBlockCooperative()
+
+  try {
+    await blockCooperative(coopname)
+    loadCooperatives()
+    SuccessAlert('Кооператив заблокирован')
+  } catch(e: any) {
+    FailAlert(e.message)
+  }
+}
+
+
+const onLoading = ref(false)
+
+const columns = [
+  { name: 'username', align: 'left', label: 'Аккаунт', field: 'username', sortable: true },
+  { name: 'announce', align: 'left', label: 'Сайт', field: 'announce', sortable: false },
+
+  { name: 'status', align: 'left', label: 'Статус', field: 'status', sortable: true },
+  {
+    name: 'created_at',
+    align: 'left',
+    label: 'Дата заявки',
+    field: 'created_at',
+    sortable: true,
+  },
+  { name: 'actions', align: 'center', label: '', field: 'actions', sortable: false },
+] as any
+
+const expanded = ref([])
+const tableRef = ref(null)
+const pagination = ref({ rowsPerPage: 0 })
+
+
+</script>

package/src/widgets/Union/ListOfCooperatives/ui/index.ts

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

package/src/widgets/User/CoopCard/index.ts

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

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

@@ -0,0 +1,111 @@
+<template lang="pug">
+div.q-pa-md
+  div.row
+    div.col-md-12.col-xs-12
+      q-card(flat round class="cooperative-card" style="border-radius: 20px;")
+        div.q-pa-sm.row.items-center.q-pa-md
+          div.col-12.col-md-3.flex.justify-center
+            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.row
+          DepositButton.col-6.border-left-radius-buttons
+          WithdrawButton.col-6.border-right-radius-buttons
+
+      WalletBalance.q-mt-lg
+
+
+    //- div.col-md-6.col-xs-12.q-mt-lg
+
+
+</template>
+
+<script lang="ts" setup>
+import { WalletBalance } from 'src/entities/Wallet/ui'
+import { DepositButton } from 'src/features/Wallet/DepositToWallet'
+import { WithdrawButton } from 'src/features/Wallet/WithdrawFromWallet'
+import { AutoAvatar } from 'src/shared/ui/AutoAvatar';
+
+import { useCurrentUserStore } from 'src/entities/User'
+import type { IEntrepreneurData, IIndividualData, IOrganizationData } from 'src/shared/lib/types/user/IUserData';
+import { computed } from 'vue';
+const currentUser = useCurrentUserStore()
+
+const userType = computed(() => currentUser.userAccount?.type)
+
+const role = computed(() => {
+  if (currentUser.userAccount?.role === 'user')
+    return 'Пайщик'
+  else if (currentUser.userAccount?.role === 'member')
+    return 'Член совета'
+  else if (currentUser.userAccount?.role === 'chairman')
+    return 'Председатель совета'
+  else return ''
+});
+
+const individualProfile = computed(() => {
+  if (userType.value === 'individual') {
+    return currentUser.userAccount?.private_data as IIndividualData
+  }
+  return null
+})
+
+const entrepreneurProfile = computed(() => {
+  if (userType.value === 'entrepreneur') {
+    return currentUser.userAccount?.private_data as IEntrepreneurData
+  }
+  return null
+})
+
+const organizationProfile = computed(() => {
+  if (userType.value === 'organization') {
+    return currentUser.userAccount?.private_data as IOrganizationData
+  }
+  return null
+})
+
+// const userProfile = computed(() => {
+//   if (userType.value === 'individual' || userType.value === 'entrepreneur') {
+//     return individualProfile?.value || entrepreneurProfile?.value
+//   }
+//   return organizationProfile?.value
+// })
+
+const displayName = computed(() => {
+  if (userType.value === 'individual') {
+    return `${individualProfile.value?.last_name} ${individualProfile.value?.first_name} ${individualProfile.value?.middle_name}`
+  } else if (userType.value === 'entrepreneur') {
+    return `${entrepreneurProfile.value?.last_name} ${entrepreneurProfile.value?.first_name} ${entrepreneurProfile.value?.middle_name}`
+  } else {
+    return organizationProfile.value?.short_name
+  }
+})
+
+// const inn_ogrn = computed(() => {
+//   if (organizationProfile.value)
+//     return `${organizationProfile.value.details.inn} / ${organizationProfile.value.details.ogrn}`
+//   else return ''
+// })
+
+</script>
+<style lang="scss" scoped>
+.cooperative-card {
+  max-width: 400px;
+  width: 100%;
+}
+
+.border-left-radius-buttons {
+  border-top-left-radius: 0px !important;
+  border-top-right-radius: 0px !important;
+  border-bottom-right-radius: 0px !important;
+  border-bottom-left-radius: 20px !important;
+}
+
+.border-right-radius-buttons {
+  border-top-right-radius: 0px !important;
+  border-top-left-radius: 0px !important;
+  border-bottom-right-radius: 20px !important;
+  border-bottom-left-radius: 0px !important;
+}
+</style>

package/src/widgets/User/CoopCard/ui/index.ts

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

package/src/widgets/User/LogoutCard/index.ts

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

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

@@ -0,0 +1,31 @@
+<template lang="pug">
+div
+q-card(flat).q-pa-md
+  p.text-h6 Выйти из приложения
+  div.q-pa-sm
+    span Для повторного входа потребуется ввести ключ доступа, выданный при регистрации.
+  q-btn(size="sm" color="primary" @click="logout").q-mt-md
+    q-icon( color="white" name="logout")
+    span.q-ml-sm Выйти
+
+</template>
+<script lang="ts" setup>
+import { useRouter } from 'vue-router';
+import { useLogoutUser } from 'src/features/User/Logout/model'
+import { FailAlert } from 'src/shared/api';
+
+const router = useRouter()
+
+const logout = async () => {
+  const { logout } = useLogoutUser()
+
+  try {
+    await logout()
+    router.push({ name: 'signin' })
+
+  } catch (e: any) {
+    FailAlert('Ошибка при выходе: ' + e.message)
+  }
+}
+
+</script>

package/src/widgets/User/LogoutCard/ui/index.ts

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

package/src/widgets/User/PaymentMethods/index.ts

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

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

@@ -0,0 +1,116 @@
+<template lang="pug">
+div(flat bordered).q-pa-md
+  p Указанные реквизиты используются кооперативом для возврата паевых взносов пайщику.
+
+  AddPaymentMethodButton(:username="username")
+
+  q-list.full-width.q-mt-lg
+    q-item(v-for="(method, index) in wallet.methods" :key="method.method_id").full-width
+      q-card(flat).full-width
+        div(v-if="method.method_type ==='sbp' && isSBPData(method.data)")
+          div(style="max-width: 300px").flex.justify-between
+
+            span
+              span {{ index + 1}}.
+              span(v-if="method.method_type ==='sbp'").q-pl-xs СБП
+            DeletePaymentButton(:size="'xs'" :username="username" :method_id="method.method_id")
+
+
+            q-input(v-model="method.data.phone" label="Номер телефона" standout="bg-teal text-white" readonly).full-width
+
+        div(style="max-width: 300px" v-if="method.method_type ==='bank_transfer' && isBankTransferData(method.data)")
+          div.flex.justify-between
+            span
+              span {{ index + 1 }}.
+              span(v-if="method.method_type ==='bank_transfer'").q-pl-xs Банковский перевод
+            DeletePaymentButton(:size="'xs'" :username="username" :method_id="method.method_id")
+
+          div
+            q-select(
+              v-model="method.data.currency"
+              readonly
+              label="Валюта счёта"
+              standout="bg-teal text-white"
+              :options="[{ label: 'RUB', value: 'RUB' }]"
+              emit-value
+              map-options
+            )
+
+            q-input(
+              v-model="method.data.bank_name"
+              readonly
+              standout="bg-teal text-white"
+              label="Наименование банка"
+              autocomplete="off"
+            )
+
+            q-input(
+              v-model="method.data.details.corr"
+              standout="bg-teal text-white"
+              readonly
+              mask="####################"
+              label="Корреспондентский счет"
+              autocomplete="off"
+            )
+
+            q-input(
+              v-model="method.data.details.bik"
+              readonly
+              standout="bg-teal text-white"
+              mask="#########"
+              label="БИК"
+              autocomplete="off"
+            )
+
+            q-input(
+              v-model="method.data.details.kpp"
+              readonly
+              standout="bg-teal text-white"
+              mask="#########"
+              label="КПП"
+              autocomplete="off"
+            )
+
+            q-input(
+              v-model="method.data.account_number"
+              standout="bg-teal text-white"
+              readonly
+              mask="####################"
+              label="Номер счета"
+              autocomplete="off"
+            )
+
+
+</template>
+
+<script lang="ts" setup>
+import { useWalletStore } from 'src/entities/Wallet';
+import { COOPNAME } from 'src/shared/config';
+import { computed } from 'vue';
+import { AddPaymentMethodButton } from 'src/features/PaymentMethod/AddPaymentMethod';
+import type { IBankTransferData, ISBPData } from 'src/features/PaymentMethod/AddPaymentMethod/model';
+import { DeletePaymentButton } from 'src/features/PaymentMethod/DeletePaymentMethod/ui';
+
+const props = defineProps({
+  username: {
+    type: String,
+    required: true,
+  },
+})
+
+const wallet = useWalletStore()
+
+const username = computed(() => props.username)
+
+wallet.loadUserWalet({ coopname: COOPNAME, username: username.value })
+
+function isSBPData(data: ISBPData | IBankTransferData): data is ISBPData {
+  return (data as ISBPData).phone !== undefined;
+}
+
+function isBankTransferData(data: ISBPData | IBankTransferData): data is IBankTransferData {
+  return (data as IBankTransferData).account_number !== undefined;
+}
+
+
+</script>

package/src/widgets/User/PaymentMethods/ui/index.ts

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

package/src/widgets/User/PersonalCard/index.ts

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

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

@@ -0,0 +1,109 @@
+<template lang="pug">
+div(v-if="currentUser?.username" flat bordered).q-pa-md
+  div.row
+    div.col-md-4.col-xs-12
+      div(style="flex-grow: 1; display: flex; justify-content: center;")
+        //- UserQR
+
+        AutoAvatar(style="width: 125px;" :username="currentUser.username").q-pa-sm.q-pt-lg
+
+    div.col-md-8.col-xs-12
+      div
+        div
+          q-item
+            q-item-section
+              q-item-label(caption) Пайщик
+              q-item-label {{ displayName }}
+
+
+          q-item
+            q-item-section
+              q-item-label(caption) Зарегистрирован как
+              q-item-label(v-if="userType === 'individual'") физическое лицо
+              q-item-label(v-if="userType === 'entrepreneur'") индивидуальный предприниматель
+              q-item-label(v-if="userType === 'organization'") юридическое лицо
+
+          q-item
+            q-item-section
+              q-item-label(caption) Имя аккаунта
+              q-item-label {{ currentUser.username }}
+
+          q-item(v-if="userType === 'individual' && individualProfile")
+            q-item-section
+              q-item-label(caption) Дата рождения
+              q-item-label {{ individualProfile.birthdate }}
+
+          q-item(v-if="userType === 'organization' && organizationProfile")
+            q-item-section
+              q-item-label(caption) ИНН / ОГРН
+              q-item-label {{ inn_ogrn }}
+
+          q-item(v-if="userProfile")
+            q-item-section
+              q-item-label(caption) Телефон
+              q-item-label {{ userProfile.phone }}
+
+          q-item(v-if="userProfile")
+            q-item-section
+              q-item-label(caption) Почта
+              q-item-label {{ userProfile.email }}
+
+  </template>
+
+<script lang="ts" setup>
+import { AutoAvatar } from 'src/shared/ui/AutoAvatar';
+import { useCurrentUserStore } from 'src/entities/User'
+import type { IEntrepreneurData, IIndividualData, IOrganizationData } from 'src/shared/lib/types/user/IUserData';
+import { computed } from 'vue';
+const currentUser = useCurrentUserStore()
+
+const userType = computed(() => currentUser.userAccount?.type)
+
+const individualProfile = computed(() => {
+  if (userType.value === 'individual') {
+    return currentUser.userAccount?.private_data as IIndividualData
+  }
+  return null
+})
+
+const entrepreneurProfile = computed(() => {
+  if (userType.value === 'entrepreneur') {
+    return currentUser.userAccount?.private_data as IEntrepreneurData
+  }
+  return null
+})
+
+const organizationProfile = computed(() => {
+  if (userType.value === 'organization') {
+    return currentUser.userAccount?.private_data as IOrganizationData
+  }
+  return null
+})
+
+const userProfile = computed(() => {
+  if (userType.value === 'individual' || userType.value === 'entrepreneur') {
+    return individualProfile?.value || entrepreneurProfile?.value
+  }
+  return organizationProfile?.value
+})
+
+const displayName = computed(() => {
+  if (userType.value === 'individual') {
+    return `${individualProfile.value?.last_name} ${individualProfile.value?.first_name} ${individualProfile.value?.middle_name}`
+  } else if (userType.value === 'entrepreneur') {
+    return `${entrepreneurProfile.value?.last_name} ${entrepreneurProfile.value?.first_name} ${entrepreneurProfile.value?.middle_name}`
+  } else {
+    return organizationProfile.value?.short_name
+  }
+})
+
+const inn_ogrn = computed(() => {
+  if (organizationProfile.value)
+    return `${organizationProfile.value.details.inn} / ${organizationProfile.value.details.ogrn}`
+  else return ''
+})
+
+</script>
+<style>
+
+</style>