@coopenomics/desktop 2.2.2

package/src/pages/Marketplace/UserParentOffers/ui/UserParentOffersPage.vue

@@ -0,0 +1,44 @@
+<script lang="ts" setup>
+import { useRequestStore } from 'src/entities/Request/model/stores'
+import { computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { RequestCard } from 'src/widgets/Request/RequestCard'
+import { OfferPage } from 'src/pages/Marketplace/OfferPage'
+
+import type { IRequestData } from 'src/entities/Request'
+const requestsStore = useRequestStore()
+const route = useRoute()
+const router = useRouter()
+
+const coopname = computed(() => route.params.coopname)
+import { useSessionStore } from 'src/entities/Session'
+const session = useSessionStore()
+const username = computed(() => session.username)
+
+
+requestsStore.loadUserParentOffers({
+  coopname: coopname.value as string,
+  username: username.value as string,
+})
+
+const currentUserRequestId = computed(() => route.params.id)
+const userParentOffers = computed(() => requestsStore.userParentOffers)
+
+const currentUserParentOffer = computed(() =>
+  userParentOffers.value.find((obj) => Number(obj.id) === Number(currentUserRequestId.value))
+)
+const showUserOffer = (offer: IRequestData) => {
+  router.push({ name: 'marketplace-user-offer-id', params: { id: offer.id } })
+}
+</script>
+
+<template lang="pug">
+div
+  div(v-if="!currentUserParentOffer").row
+    div(v-for="offer in userParentOffers" :key="offer.id").q-pa-md.col-md-3.col-xs-12
+      RequestCard(:request="offer" style="border: 1px solid grey;" @click="showUserOffer(offer)").card
+
+  div(v-if="currentUserParentOffer")
+    OfferPage( :object="currentUserParentOffer").col-md-3.col-xs-12
+
+</template>

package/src/pages/Marketplace/UserParentOffers/ui/index.ts

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

package/src/pages/Marketplace/UserSuppliesList/index.ts

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

package/src/pages/Marketplace/UserSuppliesList/ui/UserSuppliesListPage.vue

@@ -0,0 +1,29 @@
+<script lang="ts" setup>
+import { useRequestStore } from 'src/entities/Request/model/stores'
+import { SupplyOrderRequest } from 'src/widgets/Request/SupplyOrderRequestCard'
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
+
+const requestsStore = useRequestStore()
+const route = useRoute()
+
+const coopname = computed(() => route.params.coopname)
+
+import { useSessionStore } from 'src/entities/Session'
+const session = useSessionStore()
+const username = computed(() => session.username)
+
+
+requestsStore.loadUserChildOrders({
+  coopname: coopname.value as string,
+  username: username.value as string,
+})
+
+const orders = computed(() => requestsStore.userChildOrders)
+</script>
+
+<template lang="pug">
+div.row
+  div(v-for="order in orders" :key="order.id").q-pa-md.col-md-12.col-xs-12
+    SupplyOrderRequest(:request="order")
+</template>

package/src/pages/Marketplace/UserSuppliesList/ui/index.ts

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

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

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

package/src/pages/Registrator/LostKey/ui/LostKeyPage.vue

@@ -0,0 +1,13 @@
+<template lang="pug">
+.row.justify-center.q-pa-sm
+  .col-md-4.col-sm-6.col-xs-12
+    LostKey.q-mt-lg
+    q-btn(flat size="sm" @click="router.go(-1)") назад
+
+</template>
+<script lang="ts" setup>
+import { LostKey } from 'src/widgets/Registrator/LostKey/ui';
+import { useRouter } from 'vue-router';
+const router = useRouter()
+
+</script>

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

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

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

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

package/src/pages/Registrator/ResetKey/ui/ResetKeyPage.vue

@@ -0,0 +1,9 @@
+<template lang="pug">
+.row.justify-center.q-pa-sm
+  .col-md-4.col-sm-6.col-xs-12
+    ResetKey.q-mt-lg
+
+</template>
+<script lang="ts" setup>
+import { ResetKey } from 'src/widgets/Registrator/ResetKey';
+</script>

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

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

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

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

package/src/pages/Registrator/SignIn/ui/SignInPage.vue

@@ -0,0 +1,26 @@
+<template lang="pug">
+.row.justify-center.q-pa-sm
+  .col-md-4.col-sm-6.col-xs-12
+    div(v-if="!registeredAndloggedIn")
+      SignIn.q-mt-lg
+      div.text-right
+        q-btn(flat size="sm" dense @click="router.push({name: 'lostkey'})") потеряли ключ?
+        q-btn(flat size="sm" dense @click="router.push({name: 'signup'})") нет аккаунта?
+    AlreadyRegistered(v-else).q-mt-lg
+</template>
+<script lang="ts" setup>
+import { useSessionStore } from 'src/entities/Session';
+import { useCurrentUserStore } from 'src/entities/User';
+import { SignIn } from 'src/widgets/Registrator/SignIn'
+import { computed } from 'vue'
+import { AlreadyRegistered } from 'src/widgets/Registrator/AlreadyRegistered'
+import { useRouter } from 'vue-router';
+import { useRegistratorStore } from 'src/entities/Registrator';
+const store = useRegistratorStore().state
+
+const router = useRouter()
+
+const registeredAndloggedIn = computed(() => {
+  return useCurrentUserStore().isRegistrationComplete && useSessionStore().isAuth && store.step == 1
+})
+</script>

package/src/pages/Registrator/SignIn/ui/index.ts

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

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

@@ -0,0 +1,74 @@
+<template lang='pug'>
+div
+  q-step(:name="store.steps.EmailInput", title='Введите электронную почту', :done="store.isStepDone('EmailInput')")
+    p Добро пожаловать в {{ COOP_SHORT_NAME }}! Для начала регистрации, пожалуйста, введите вашу электронную почту:
+
+    q-input.q-mt-lg(
+      v-model.trim='email',
+      standout="bg-teal text-white",
+      type='email',
+      label='Введите email',
+      :readonly='inLoading',
+      color='primary',
+      :rules='[validateEmail, validateExists]',
+      @keypress.enter='setEmail'
+    )
+
+    q-btn.q-mt-lg.q-mb-lg(
+      color='primary',
+      label='Продолжить',
+      :disable='!isValidEmail',
+      :loading='inLoading',
+      @click='setEmail'
+    )
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, watch } from 'vue'
+import { useCreateUser } from 'src/features/User/CreateUser'
+import { debounce } from 'quasar'
+import { COOP_SHORT_NAME } from 'src/shared/config'
+import { useRegistratorStore } from 'src/entities/Registrator'
+const store = useRegistratorStore()
+
+const api = useCreateUser()
+
+watch(() => store.state.email, () => email.value = store.state.email)
+
+const email = ref(store.state.email)
+
+const inLoading = ref(false)
+const isEmailExist = ref(false)
+
+const isValidEmail = computed(() => api.emailIsValid(email.value))
+
+const validateEmail = () => {
+  return isValidEmail.value || 'Введите корректный email'
+}
+
+const validateExists = () => {
+  return !isEmailExist.value || 'Пользователь с таким email уже существует. Войдите.'
+}
+
+const checkEmailExists = debounce(async () => {
+  inLoading.value = true
+  isEmailExist.value = await api.emailIsExist(email.value)
+  inLoading.value = false
+}, 500) // 500ms delay
+
+watch(email, checkEmailExists)
+
+const setEmail = () => {
+  if (isValidEmail.value && !isEmailExist.value) {
+    store.state.email = email.value
+    if (store.state.userData.individual_data)
+      store.state.userData.individual_data.email = email.value
+    if (store.state.userData.organization_data)
+      store.state.userData.organization_data.email = email.value
+    if (store.state.userData.entrepreneur_data)
+      store.state.userData.entrepreneur_data.email = email.value
+
+    store.next();
+  }
+}
+</script>

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

@@ -0,0 +1,82 @@
+<template lang='pug'>
+div
+  q-step(:name='store.steps.GenerateAccount', title='Получите приватный ключ и надежно сохраните его для цифровой подписи', :done='store.isStepDone("GenerateAccount")')
+    div
+      p.full-width Приватный ключ используется для входа в систему и подписи документов. Мы рекомендуем сохранить его в бесплатном менеджере паролей, таком как
+        a(href="https://bitwarden.com/download" target="_bank").q-ml-xs Bitwarden
+        | .
+
+
+    q-input.q-mt-lg(
+      v-if='account.private_key',
+      v-model='account.private_key',
+      label='Приватный ключ',
+      :readonly='true'
+    )
+
+    q-checkbox(v-model="i_save", label="Я сохранил имя и ключ в надёжном месте")
+
+    .q-mt-lg
+      q-btn.col-md-6.col-xs-12(flat, @click="store.prev()")
+        i.fa.fa-arrow-left
+        span.q-ml-md назад
+
+      q-btn.col-md-6.col-xs-12(flat, @click='copyMnemonic')
+        i.fa.fa-copy
+        span.q-ml-md скопировать
+
+      q-btn.q-mt-lg.q-mb-lg(color='primary', :disabled="!i_save" @click='setAccount')
+        | Продолжить
+        q-tooltip подтвердите сохранение ключа для продолжения
+</template>
+<script lang="ts" setup>
+import { ref, computed } from 'vue'
+import { useCreateUser } from 'src/features/User/CreateUser'
+import { Notify, copyToClipboard } from 'quasar'
+import { useRegistratorStore } from 'src/entities/Registrator'
+const store = useRegistratorStore()
+
+import { FailAlert } from 'src/shared/api'
+
+const api = useCreateUser()
+const i_save = ref(false)
+const account = ref(store.state.account)
+
+if (!account.value.private_key || !account.value.public_key || !account.value.username)
+  account.value = api.generateAccount()
+
+const email = computed(() => store.state.email)
+const userData = computed(() => store.state.userData)
+
+const copyMnemonic = () => {
+  const toCopy = `${account.value.private_key}`
+
+  copyToClipboard(toCopy)
+    .then(() => {
+      Notify.create({
+        message: 'Информация скопирована в буфер обмена',
+        type: 'positive',
+      })
+    })
+    .catch((e) => {
+      console.log(e)
+    })
+}
+
+const setAccount = async () => {
+  try {
+
+    await api.createUser(email.value, userData.value, account.value)
+    store.state.account = account.value
+    if (store.isBranched)
+      store.goTo('SelectBranch')
+    else
+      store.goTo('ReadStatement')
+
+  } catch (e: any) {
+    store.goTo('SetUserData')
+    console.error(e)
+    FailAlert(e.message)
+  }
+}
+</script>

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

@@ -0,0 +1,70 @@
+<template lang='pug'>
+div(v-if="store?.state?.payment?.details?.amount_without_fee")
+  q-step(:name='store.steps.PayInitial', title='Оплатите вступительный взнос', :done='store.isStepDone("PayInitial")')
+    div(v-if="store.state.payment.details")
+      p Пожалуйста, совершите оплату регистрационного взноса {{ formatAssetToReadable(store.state.payment.details.amount_without_fee) }}. Комиссия провайдера {{ store.state.payment.details.fact_fee_percent }}%, всего к оплате: {{ store.state.payment.details.amount_plus_fee }}.
+      div.q-mt-md
+        span.text-bold Внимание!
+        span.q-ml-xs Оплату необходимо произвести с банковского счета, который принадлежит именно Вам. При поступлении средств с другого счета, оплата будет аннулирована, а вступление в кооператив приостановлено.
+      PayWithProvider(:payment-order="store.state.payment" @payment-fail="paymentFail" @payment-success="paymentSuccess")
+
+</template>
+
+<script lang="ts" setup>
+import { computed, watch, onMounted } from 'vue'
+import { useCreateUser } from 'src/features/User/CreateUser'
+import { FailAlert } from 'src/shared/api';
+import { COOPNAME } from 'src/shared/config';
+import { useCooperativeStore } from 'src/entities/Cooperative';
+import { useRegistratorStore } from 'src/entities/Registrator'
+import { PayWithProvider } from 'src/shared/ui/PayWithProvider';
+import { formatAssetToReadable } from 'src/shared/lib/utils/formatAssetToReadable';
+const store = useRegistratorStore()
+
+const api = useCreateUser()
+
+const step = computed(() => store.state.step)
+const coop = useCooperativeStore()
+
+const currentStep = store.steps.PayInitial
+
+onMounted(async () => {
+  await coop.loadPublicCooperativeData(COOPNAME)
+
+  if (step.value === currentStep)
+    createInitialPayment()
+})
+
+watch(step, (newValue) => {
+  if (newValue === currentStep)
+    createInitialPayment()
+})
+
+watch(() => store.state.is_paid, (newValue) => {
+  if (newValue === true){
+    store.state.agreements.self_paid = true
+    store.next()
+  }
+})
+
+const createInitialPayment = async () => {
+  try {
+    if (!store.state.is_paid) {
+      await api.createInitialPayment()
+    }
+  } catch (e: any) {
+    FailAlert('Возникла ошибка на этапе оплаты. Попробуйте позже или обратитесь в поддержку.')
+    console.error(e)
+  }
+}
+
+const paymentFail = (): void => {
+  FailAlert('Возникла ошибка на этапе оплаты. Попробуйте позже или обратитесь в поддержку.')
+}
+
+const paymentSuccess = (): void => {
+  store.state.is_paid = true
+}
+
+
+</script>

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

@@ -0,0 +1,103 @@
+<template lang='pug'>
+div
+  q-step(
+    :name='store.steps.ReadStatement',
+    title='Ознакомьтесь с заполненным заявлением на вступление в кооператив',
+    :done='store.isStepDone("ReadStatement")'
+  )
+
+    //- p Прочитайте заявление и примите положения
+    div(v-if='isLoading').full-width.text-center.q-mt-lg.q-mb-lg
+      Loader(:text='`Заполняем заявление...`')
+    // eslint-disable-next-line vue/no-v-html
+    div(v-if='!isLoading' v-html='html').store.statement
+
+    div(v-if='!isLoading').q-gutter-sm
+      q-checkbox(v-model='store.state.agreements.digital_signature' full-width)
+        | Я прочитал и принимаю
+        ReadAgreementDialog(v-if="signatureAgreement" :agreement="signatureAgreement" v-model:agree="store.state.agreements.digital_signature" text="положение о порядке и правилах использования простой электронной подписи")
+          AgreementReader(:agreement="signatureAgreement").q-mb-lg
+
+      q-checkbox(v-model='store.state.agreements.wallet' full-width)
+        | Я прочитал и принимаю
+        ReadAgreementDialog(v-if="walletAgreement" :agreement="walletAgreement" v-model:agree="store.state.agreements.wallet" text="положение о целевой потребительской программе 'Цифровой Кошелёк'")
+          AgreementReader(:agreement="walletAgreement").q-mb-lg
+
+      q-checkbox(v-model='store.state.agreements.user' full-width)
+        | Я прочитал и принимаю
+        ReadAgreementDialog(v-if="userAgreement" :agreement="userAgreement" v-model:agree="store.state.agreements.user" text="пользовательское соглашение")
+          AgreementReader(:agreement="userAgreement").q-mb-lg
+
+      q-checkbox(v-model='store.state.agreements.ustav' full-width)
+        | Я прочитал и принимаю
+
+        a(@click.stop='(event) => event.stopPropagation()' href='/documents/ustav.pdf' target='_blank').q-ml-xs Устав кооператива
+
+    div(v-if="!isLoading").q-mt-lg
+      q-btn.col-md-6.col-xs-12(flat, @click='store.prev()')
+        i.fa.fa-arrow-left
+        span.q-ml-md назад
+
+      q-btn.q-mt-lg.q-mb-lg(color='primary', label='Продолжить', :disabled='!agreeWithAll' @click='store.next()')
+</template>
+<script lang="ts" setup>
+import { ref, computed, watch, onMounted } from 'vue'
+import { useCreateUser } from 'src/features/User/CreateUser'
+import { FailAlert } from 'src/shared/api';
+import { Loader } from 'src/shared/ui/Loader';
+import { ReadAgreementDialog } from 'src/features/Agreementer/ReadAgreementDialog';
+import { useAgreementStore } from 'src/entities/Agreement'
+import { AgreementReader } from 'src/features/Agreementer/GenerateAgreement';
+const agreementer = useAgreementStore()
+
+import { useRegistratorStore } from 'src/entities/Registrator'
+const store = useRegistratorStore()
+
+const { generateStatementWithoutSignature } = useCreateUser()
+
+const agreeWithAll = computed(() => {
+  return store.state.agreements.digital_signature && store.state.agreements.wallet && store.state.agreements.user && store.state.agreements.ustav
+})
+
+const html = ref()
+const isLoading = ref(false)
+
+const loadStatement = async (): Promise<void> => {
+  try {
+    isLoading.value = true
+    const document = await generateStatementWithoutSignature()
+    html.value = document.html
+    isLoading.value = false
+  } catch (e: any) {
+    isLoading.value = false
+    FailAlert(e.message)
+  }
+}
+
+onMounted(() => {
+  if (store.state.step === store.steps.ReadStatement) {
+    loadStatement()
+  }
+})
+
+watch(() => store.state.step, (value: number) => {
+  if (value === store.steps.ReadStatement) {
+    loadStatement()
+  }
+})
+
+const signatureAgreement = computed(() => {
+  return agreementer.cooperativeAgreements.find(el => el.type == 'signature')
+})
+
+const walletAgreement = computed(() => {
+  return agreementer.cooperativeAgreements.find(el => el.type == 'wallet')
+})
+
+
+const userAgreement = computed(() => {
+  return agreementer.cooperativeAgreements.find(el => el.type == 'user')
+})
+
+
+</script>

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

@@ -0,0 +1,50 @@
+<template lang="pug">
+div(v-if="store")
+  q-step(
+    :name="store.steps.SelectBranch"
+    title="Выберите ближайший кооперативный участок"
+    :done="store.isStepDone('SelectBranch')"
+  )
+    BranchSelector(
+      v-model:selectedBranch="store.state.selectedBranch"
+      :branches="branches"
+    )
+    div.q-mt-lg
+      q-btn.col-md-6.col-xs-12(flat, @click='store.prev()')
+        i.fa.fa-arrow-left
+        span.q-ml-md назад
+
+      q-btn.q-mt-lg.q-mb-lg(color='primary', label='Продолжить', :disabled='!store.state.selectedBranch' @click='store.next()')
+
+</template>
+
+<script lang="ts" setup>
+import { useBranchStore } from 'src/entities/Branch/model'
+import { useRegistratorStore } from 'src/entities/Registrator'
+import { failAlert } from 'src/shared/api';
+import { COOPNAME } from 'src/shared/config'
+import { computed, onMounted, watch } from 'vue'
+import { BranchSelector } from 'src/shared/ui/BranchSelector';
+
+const store = useRegistratorStore()
+const branchStore = useBranchStore()
+
+const load = async () => {
+  if (store.isStep('SelectBranch'))
+    try{
+      await branchStore.loadPublicBranches({ coopname: COOPNAME })
+    } catch(e: any){
+      failAlert(e)
+    }
+}
+
+onMounted(() => load())
+
+watch(() => store.state.step, async () => {
+  load()
+})
+
+// Массив используется без изменений
+const branches = computed(() => branchStore.publicBranches)
+
+</script>

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

@@ -0,0 +1,64 @@
+<template lang="pug">
+div
+  q-step(
+    :name="store.steps.SetUserData"
+    title="Заполните форму заявления на вступление"
+    :done="store.isStepDone('SetUserData')"
+  )
+    UserDataForm(v-model:userData="store.state.userData")
+      template(#bottom="{userDataForm}")
+        q-checkbox(v-model='store.state.agreements.condidential' full-width standout="bg-teal text-white").q-mt-lg
+          | Я даю своё согласие на обработку своих персональных данных в соответствии с
+          ReadAgreementDialog(v-if="privacyAgreement" :agreement="privacyAgreement" v-model:agree="store.state.agreements.condidential" text="политикой конфиденциальности")
+            AgreementReader(:agreement="privacyAgreement").q-mb-lg
+
+        q-btn(flat, @click="store.prev()")
+          i.fa.fa-arrow-left
+          span.q-ml-md назад
+
+        q-btn(
+          :disabled="!store.state.agreements.condidential"
+          color="primary"
+          label="Продолжить"
+          @click="setData(userDataForm)"
+        ).q-mt-lg.q-mb-lg
+
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue'
+import { UserDataForm } from 'src/shared/ui/UserDataForm/UserDataForm';
+import { useRegistratorStore } from 'src/entities/Registrator'
+import { useAgreementStore } from 'src/entities/Agreement';
+import { ReadAgreementDialog } from 'src/features/Agreementer/ReadAgreementDialog';
+import { AgreementReader } from 'src/features/Agreementer/GenerateAgreement';
+
+const store = useRegistratorStore()
+
+const agreementer = useAgreementStore()
+
+const privacyAgreement = computed(() => {
+  return agreementer.cooperativeAgreements.find(el => el.type == 'privacy')
+})
+
+const setData = (userDataForm: any) => {
+  userDataForm.validate().then(async (success: boolean) => {
+    if (success) {
+      store.next()
+    } else {
+      const firstInvalid = document.querySelector('.q-field--error .q-field__native');
+      if (firstInvalid) {
+        firstInvalid.scrollIntoView({ behavior: 'smooth', block: 'center' });
+      }
+      return
+    }
+  })
+}
+
+
+</script>
+<style>
+.dataInput .q-btn-selected {
+  color: teal;
+}
+</style>