@coopenomics/desktop 2.2.2

package/src/widgets/IndividualCard/ui/index.ts

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

package/src/widgets/OrganizationCard/index.ts

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

package/src/widgets/OrganizationCard/ui/OrganizationCard.vue

@@ -0,0 +1,44 @@
+<template lang="pug">
+div
+  q-input(dense v-model="data.phone" standout="bg-teal text-white" label="Телефон")
+  q-input(dense v-model="data.email" standout="bg-teal text-white" label="Email")
+  q-input(dense v-model="data.short_name" standout="bg-teal text-white" label="Краткое наименование")
+  q-input(dense v-model="data.full_name" standout="bg-teal text-white" label="Полное наименование")
+  q-input(dense v-model="data.full_address" standout="bg-teal text-white" label="Юридический адрес" type="textarea" rows="2")
+  q-input(dense v-model="data.fact_address" standout="bg-teal text-white" label="Фактический адрес" type="textarea" rows="2")
+  q-input(dense v-model="data.represented_by.last_name" standout="bg-teal text-white" label="Фамилия представителя")
+  q-input(dense v-model="data.represented_by.first_name" standout="bg-teal text-white" label="Имя представителя")
+  q-input(dense v-model="data.represented_by.middle_name" standout="bg-teal text-white" label="Отчество представителя")
+  q-input(dense v-model="data.represented_by.position" standout="bg-teal text-white" label="Должность")
+  q-input(dense v-model="data.represented_by.based_on" standout="bg-teal text-white" label="Действует на основании")
+  q-input(dense v-model="data.details.inn" standout="bg-teal text-white" label="ИНН")
+  q-input(dense v-model="data.details.ogrn" standout="bg-teal text-white" label="ОГРН")
+  q-input(dense v-model="data.details.kpp" standout="bg-teal text-white" label="КПП")
+
+</template>
+<script lang="ts" setup>
+import {Cooperative} from 'cooptypes'
+import { ref, watch } from 'vue';
+
+const props = defineProps({
+  organization: {
+    type: Object as () => Cooperative.Users.IOrganizationData,
+    required: true
+  }
+})
+
+const data = ref(props.organization)
+
+// const emit = defineEmits(['update']);
+
+const showSave = ref(false)
+
+watch(
+    data,
+    () => {
+      showSave.value = true
+    },
+    { deep: true }
+  );
+
+</script>

package/src/widgets/OrganizationCard/ui/index.ts

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

package/src/widgets/Registrator/AlreadyRegistered/AlreadyRegistered.vue

@@ -0,0 +1,19 @@
+<template lang="pug">
+q-card(flat bordered).q-pa-md.q-mt-lg
+  q-card-section
+    div.full-width.text-center
+      q-badge(color="teal").q-pa-sm
+        q-icon(name="fa-solid fa-check" size="48px")
+      div(class="text-h5").q-mt-md Вы успешно зарегистрированы и авторизованы
+
+  q-card-actions(align="center")
+    q-btn(label="На главную" color="secondary" icon="fa fa-arrow-left" @click="goBack")
+  </template>
+<script lang="ts" setup>
+import { useRouter } from 'vue-router'
+const router = useRouter()
+
+function goBack() {
+  router.push({ name: 'index' });
+}
+</script>

package/src/widgets/Registrator/AlreadyRegistered/index.ts

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

package/src/widgets/Registrator/LostKey/index.ts

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

package/src/widgets/Registrator/LostKey/ui/LostKey.vue

@@ -0,0 +1,63 @@
+<template lang="pug">
+div
+  q-card(flat).q-pa-md
+    p.text-subtitle1.text-center ПЕРЕВЫПУСК КЛЮЧА
+
+
+    form(@submit.prevent="submit").q-mt-md.full-width
+      q-input(label="Введите электронную почту"
+        v-model="email"
+        standout="bg-teal text-white"
+        autocorrect="off"
+        autocapitalize="off"
+        autocomplete="off"
+        spellcheck="false"
+        hint=""
+        :rules='[validateEmail]',
+      )
+
+      q-btn(
+        color="primary"
+        type="submit"
+        :loading="loading"
+      ).full-width продолжить
+
+
+</template>
+<script lang="ts" setup>
+import { useCreateUser } from 'src/features/User/CreateUser';
+import { useLostKey } from 'src/features/User/LostKey/model';
+
+import { FailAlert } from 'src/shared/api';
+import { computed, ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+const email = ref('')
+const loading = ref(false)
+
+const { lostKeyRequest } = useLostKey()
+const { emailIsValid } = useCreateUser()
+const isValidEmail = computed(() => emailIsValid(email.value))
+
+const validateEmail = () => {
+  return isValidEmail.value || 'Введите корректный email'
+}
+
+
+
+const router = useRouter()
+
+const submit = async () => {
+  try {
+    loading.value = true
+    await lostKeyRequest(email.value)
+    router.push({ name: 'resetkey' })
+    loading.value = false
+  } catch (e: any) {
+    loading.value = false
+    FailAlert(e.message)
+  }
+}
+
+
+</script>

package/src/widgets/Registrator/LostKey/ui/index.ts

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

package/src/widgets/Registrator/ResetKey/index.ts

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

package/src/widgets/Registrator/ResetKey/ui/ResetKey.vue

@@ -0,0 +1,89 @@
+<template lang="pug">
+div
+  q-card(flat).q-pa-md
+    div(v-if="token")
+      p.text-subtitle1.text-center СОХРАНИТЕ КЛЮЧ
+      span.q-mt-md Новый приватный ключ доступа сгенерирован для вас. Пожалуйста, подтвердите надёжное сохранение. Мы рекомендуем сохранить его в бесплатном менеджере паролей, таком как
+        a(href="https://bitwarden.com/download" target="_bank").q-ml-xs Bitwarden
+        | .
+
+      q-input.q-mt-lg(
+        v-if='account && account.private_key',
+        v-model='account.private_key',
+        label='Приватный ключ',
+        :readonly='true'
+      )
+
+
+      q-checkbox(v-model="i_save", label="Я сохранил ключ")
+      div.row.q-mt-md
+        q-btn.col-md-6.col-xs-12(flat, @click='copyMnemonic')
+          i.fa.fa-copy
+          span.q-ml-md скопировать
+
+
+        q-btn(:disabled="!i_save" @click="finish" color="primary" :loading="loading").col-md-6.col-xs-12 продолжить
+
+    div(v-else)
+      p.text-subtitle1.text-center ПРОВЕРЬТЕ ПОЧТУ
+      span.q-mt-md На вашу электронную почту отправлено письмо со ссылкой для перевыпуска ключа. Пожалуйста, перейдите по ссылке для продолжения. Время действия ссылки - 10 минут. Эту страницу можно закрыть.
+
+</template>
+<script lang="ts" setup>
+import { copyToClipboard } from 'quasar';
+import { useCreateUser } from 'src/features/User/CreateUser';
+import { useResetKey } from 'src/features/User/ResetKey/model';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { type IGeneratedAccount } from 'src/shared/lib/types/user';
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+const route = useRoute()
+const router = useRouter()
+
+const { generateAccount } = useCreateUser()
+const account = ref<IGeneratedAccount | undefined>()
+
+const i_save = ref(false)
+const token = ref(route.query.token)
+const loading = ref(false)
+
+const { resetKey } = useResetKey()
+
+account.value = generateAccount()
+
+
+const copyMnemonic = () => {
+  const toCopy = `${account.value?.private_key}`
+
+  copyToClipboard(toCopy)
+    .then(() => {
+      SuccessAlert('Ключ был скопирован в буфер обмена')
+    })
+    .catch((e) => {
+      console.log(e)
+    })
+}
+
+const finish = async () => {
+  try {
+
+    if (!account.value) {
+      FailAlert('Возникла ошибка при генерации приватного ключа')
+      return
+    }
+    loading.value = true
+    await resetKey(token.value as string, account.value.public_key)
+
+    SuccessAlert('Ключ доступа успешно установлен')
+    loading.value = false
+
+    router.push({ name: 'signin' })
+
+  } catch (e: any) {
+    loading.value = false
+    FailAlert(e.message)
+  }
+}
+
+</script>

package/src/widgets/Registrator/ResetKey/ui/index.ts

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

package/src/widgets/Registrator/SignIn/SignIn.vue

@@ -0,0 +1,12 @@
+<template lang='pug'>
+div
+  q-card.signup(flat)
+    div.q-pa-md
+      p.text-h6.text-center.q-mb-md ВХОД ДЛЯ ПАЙЩИКОВ
+        LoginForm
+
+
+</template>
+<script lang="ts" setup>
+import { LoginForm } from 'src/features/User/LoginUser/ui/LoginForm';
+</script>

package/src/widgets/Registrator/SignIn/index.ts

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

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

@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue'
+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()
+
+let units = ref(1)
+const selectedAddress = ref<IAddressesData>()
+
+defineProps({
+  offer: {
+    type: Object as () => IRequestData,
+    required: true,
+  },
+})
+
+const addresses = computed(() =>
+cooperativeStore.addresses.map((el: any) => {
+    return { ...el, address: el.data.street + ', ' + el.data.house_number }
+  })
+)
+
+onMounted(async () => {
+  await cooperativeStore.loadAddresses({ coopname: COOPNAME })
+  selectedAddress.value = addresses.value[0]
+})
+
+</script>
+
+<template lang="pug">
+div.q-pl-md.q-pr-md
+  q-select(
+    v-model="selectedAddress"
+    :options="addresses"
+    map-options
+    emit-value
+    option-label="address"
+    option-value="id"
+    label="Выберите адрес для получения заказа"
+  )
+  div(style="font-size: 12px !important; ").text-grey.q-mt-md
+    p {{ selectedAddress?.data?.directions }}
+    p телефон: {{ selectedAddress?.data?.phone_number }}
+    p часы работы: {{ selectedAddress?.data?.business_hours }}
+
+  Map(v-if="selectedAddress" :lat="Number(selectedAddress.data.latitude)" :long="Number(selectedAddress.data.longitude)")
+
+  q-input(v-model="units" label="Введите количество единиц")
+
+  CreateChildOrderButton(:coopname="COOPNAME" :username="username" :offer="offer" :units="units")
+</template>

package/src/widgets/Request/CreateChildOrderCard/index.ts

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

package/src/widgets/Request/RequestCard/RequestCard.vue

@@ -0,0 +1,37 @@
+<template lang="pug">
+q-card(flat ).no-select
+  img(:src="src").img
+  div.q-pa-md
+    div.text-h6.q-mb-md {{ request.data.title }}
+    div
+      span Осталось:
+        q-badge(size="lg").q-ml-xs {{ request.remain_units }} единиц
+    div
+      span Цена: 
+        q-badge(size="lg").q-ml-xs {{ request.unit_cost }}
+  
+    
+</template>
+
+<script setup lang="ts">
+  import { computed } from 'vue'
+  import { constructImageSrc } from 'src/shared/api'
+
+  const props = defineProps({
+    request: {
+      type: Object,
+      required: true,
+    },
+  })
+
+  const src = computed(() => {
+    const preview = props.request?.data?.preview
+    return constructImageSrc(preview)
+  })
+</script>
+
+<style>
+  .img {
+    max-height: 250px;
+  }
+</style>

package/src/widgets/Request/RequestCard/index.ts

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

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

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

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

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

package/src/widgets/Request/SupplyOrderRequestCard/model/types.ts

@@ -0,0 +1,10 @@
+import { IRequestData } from 'src/entities/Request'
+
+export interface IStepProps {
+  iAmSupplier: boolean
+  iAmAuthorizer: boolean
+  iAmReciever: boolean
+  currentStep: number
+  username: string
+  request: IRequestData
+}

package/src/widgets/Request/SupplyOrderRequestCard/ui/Base/Base.vue

@@ -0,0 +1,93 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import type { IRequestData } from 'src/entities/Request/model'
+import {
+  FirstStep,
+  SecondStep,
+  ThirdStep,
+  FourthStep,
+  FifthStep,
+  SixthStep,
+  SeventhStep,
+  EightStep,
+} from '../Steps'
+import { STORAGE_URL } from 'src/shared/config'
+
+//TODO изменить на обязательный импорт с типом
+const props = defineProps<{
+  request: IRequestData
+}>()
+
+const request = computed(() => props.request)
+
+const step = computed(() => {
+  const statuses = {
+    published: 1,
+    accepted: 2,
+    authorized: 3,
+    supplied1: 4,
+    supplied2: 5,
+    delivered: 6,
+    recieved1: 7,
+    recieved2: 8,
+    completed: 9,
+    canceled: 10,
+    declined: 0,
+  }
+
+  type StatusType = keyof typeof statuses
+  return statuses[props.request.status as StatusType]
+})
+
+import { useSessionStore } from 'src/entities/Session'
+const session = useSessionStore()
+const username = computed(() => session.username)
+const iAmSupplier = computed(() => props.request.product_contributor == username.value)
+const iAmReciever = computed(() => props.request.money_contributor == username.value)
+const iAmAuthorizer = computed(() => username.value === 'chairman') // TODO получить имя аккаунта председателя => проверить уполномоченного на наличие в листе уполномоченных
+
+// TODO move it to shared storage api
+const src = computed(() => {
+  const preview = props.request?.data?.preview
+  if (!preview) return
+
+  if (preview && preview.startsWith('https://')) {
+    return preview // Превью уже содержит HTTPS, оставляем его как есть
+  } else {
+    return STORAGE_URL + preview // Иначе, добавляем config.storageUrl
+  }
+})
+</script>
+
+<template lang="pug">
+q-card(flat ).no-select
+  div.q-pa-md
+    div.row
+      div.col-md-2.col-xs-12
+        div.text-h6.q-mb-md {{request.data?.title}}
+        div
+          span Заказ:
+            q-badge(size="lg").q-ml-xs {{request.remain_units || request.blocked_units || request.delivered_units}} единиц
+        div
+          span Цена:
+            q-badge(size="lg").q-ml-xs {{request.unit_cost}}
+        img(v-if="src" :src="src").full-width.q-mt-lg
+      div.col-md-10.col-xs-12
+        q-stepper(
+          v-model="step"
+          flat
+          vertical
+          color="primary"
+          animated
+          done-color="green"
+        )
+          FirstStep(:request='request' :i-am-supplier="iAmSupplier" :i-am-authorizer="iAmAuthorizer" :i-am-reciever="iAmReciever" :username="username" :current-step="step")
+          SecondStep(:request='request' :i-am-supplier="iAmSupplier" :i-am-authorizer="iAmAuthorizer" :i-am-reciever="iAmReciever" :username="username" :current-step="step")
+          ThirdStep(:request='request' :i-am-supplier="iAmSupplier" :i-am-authorizer="iAmAuthorizer" :i-am-reciever="iAmReciever" :username="username"  :current-step="step")
+          FourthStep(:request='request' :i-am-supplier="iAmSupplier" :i-am-authorizer="iAmAuthorizer" :i-am-reciever="iAmReciever" :username="username"  :current-step="step")
+          FifthStep(:request='request' :i-am-supplier="iAmSupplier" :i-am-authorizer="iAmAuthorizer" :i-am-reciever="iAmReciever" :username="username"  :current-step="step")
+          SixthStep(:request='request' :i-am-supplier="iAmSupplier" :i-am-authorizer="iAmAuthorizer" :i-am-reciever="iAmReciever" :username="username"  :current-step="step")
+          SeventhStep(:request='request' :i-am-supplier="iAmSupplier" :i-am-authorizer="iAmAuthorizer" :i-am-reciever="iAmReciever" :username="username"  :current-step="step")
+          EightStep(:request='request' :i-am-supplier="iAmSupplier" :i-am-authorizer="iAmAuthorizer" :i-am-reciever="iAmReciever" :username="username"  :current-step="step")
+
+</template>

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

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

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

@@ -0,0 +1,28 @@
+<template lang="pug">
+div
+  q-step(
+    :name="8"
+    title="Завершите заявку"
+    icon="settings"
+    :done="currentStep > 8"
+  )
+    span Пожалуйста, завершите заявку и разблокируйте деньги поставщика через {time}
+    q-stepper-navigation.q-gutter-sm
+      CompleteOnRequestButton(:request-id=Number("request.id") :coopname="request.coopname" :username="username")
+      DisputeOnRequestButton(v-if="iAmReciever && isActive" :request-id=Number("request.id") :coopname="request.coopname" :username="username")
+
+</template>
+
+<script setup lang="ts">
+  import { CompleteOnRequestButton } from 'src/features/Request/CompleteOnRequest'
+  import { DisputeOnRequestButton } from 'src/features/Request/DisputeOnRequest'
+  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 === 'recieved2') //TODO && и гарантийный срок вышел!
+  const currentStep = computed(()=> props.currentStep)
+</script>

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

@@ -0,0 +1,34 @@
+<template lang="pug">
+div
+  template(v-if="props.iAmAuthorizer")
+    q-step(
+      :name="5"
+      title="Ожидаем доставку до ПВЗ"
+      icon="settings"
+      :done="currentStep > 5"
+    )
+      span Пожалуйста, организуйте доставку до ПВЗ, если это требуется, и подтвердите готовность выдать имущество заказчику.
+      q-stepper-navigation.q-gutter-sm
+        DeliverOnRequestButton(v-if="iAmAuthorizer && isActive" :request-id=Number("request.id") :coopname="request.coopname" :username="username")
+
+  template(v-else)
+    q-step(
+      :name="4"
+      title="Ожидаем прибытие имущества на ПВЗ"
+      icon="settings"
+      :done="currentStep > 5"
+    )
+      span Ожидаем, когда уполномоченный кооператива доставит имущество до ПВЗ.
+  </template>
+<script setup lang="ts">
+  import { DeliverOnRequestButton } from 'src/features/Request/DeliverOnRequest'
+  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 === 'supplied2')
+  const currentStep = computed(()=> props.currentStep)
+</script>

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

@@ -0,0 +1,39 @@
+<script setup lang="ts">
+  import { AcceptButton } from 'src/features/Request/AcceptRequest'
+  import { DeclineButton } from 'src/features/Request/DeclineRequest'
+  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 === 'published')
+  const currentStep = computed(()=> props.currentStep)
+</script>
+
+<template lang="pug">
+div
+  template(v-if="props.iAmSupplier")
+    q-step(
+      :name="1"
+      title="Поступил новый заказ!"
+      icon="settings"
+      :done="currentStep > 1"
+    )
+      span Пожалуйста, подтвердите свою готовность совершить поставку.
+
+      q-stepper-navigation.q-gutter-sm
+        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")
+
+  template(v-else)
+    q-step(
+      :name="1"
+      title="Получаем подтверждение от поставщика"
+      icon="settings"
+      :done="currentStep > 1"
+    )
+      span Ожидаем подтверждение поставщика о его готовности совершить поставку в срок.
+</template>

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

@@ -0,0 +1,37 @@
+<script setup lang="ts">
+  import { CancelButton } from 'src/features/Request/CancelRequest'
+  import { ConfirmSupplyOnRequestButton } from 'src/features/Request/ConfirmSupplyOnRequest'
+  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 === 'supplied1')
+  const currentStep = computed(()=> props.currentStep)
+</script>
+
+<template lang="pug">
+div
+  template(v-if="iAmSupplier")
+    q-step(
+      :name="4"
+      title="Оставьте подпись на акте приёма-передачи"
+      icon="settings"
+      :done="currentStep > 4"
+    )
+      span Пожалуйста, подтвердите передачу имущества оставив подпись на акте приёма-передачи.
+      q-stepper-navigation.q-gutter-sm
+        CancelButton(v-if="iAmSupplier && isActive" :request-id=Number("request.id") :coopname="request.coopname" :username="username")
+        ConfirmSupplyOnRequestButton(:request-id=Number("request.id") :coopname="request.coopname" :username="username")
+
+  template(v-else)
+    q-step(
+      :name="4"
+      title="Ожидаем подтверждение поставщика"
+      icon="settings"
+      :done="currentStep > 4"
+    )
+      span Ожидаем, когда поставщик оставит свою цифровую подпись на акте приёма-передачи имущества.
+</template>

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

@@ -0,0 +1,18 @@
+<script setup lang="ts">
+  import { computed, withDefaults } from 'vue'
+  import type { IStepProps } from '../../model'
+  const props = withDefaults(defineProps<IStepProps>(), {})
+  const currentStep = computed(()=> props.currentStep)
+</script>
+
+<template lang="pug">
+div
+  q-step(
+    :name="2"
+    title="Ожидаем решение совета"
+    icon="settings"
+    :done="currentStep > 2"
+  )
+    span Совет кооператива принимает решение по удовлетворению вашей потребности.
+
+</template>