@coopenomics/desktop 2.2.2

package/src/features/Installer/ui/RequestKeyForm/RequestKeyForm.vue

@@ -0,0 +1,57 @@
+<template lang="pug">
+form(@submit.prevent="submit").full-width
+  q-input(
+    v-model="privateKey"
+    label="Введите ключ доступа"
+    color="primary"
+    hint=""
+    standout="bg-teal text-white"
+    class="full-width"
+    type="password"
+    autocorrect="off"
+    autocapitalize="off"
+    autocomplete="off"
+    spellcheck="false")
+
+  q-btn(
+    type="submit"
+    label="Войти"
+    class="full-width"
+    color="primary"
+    :loading="loading"
+    :disable="!privateKey")
+
+</template>
+  <script lang="ts" setup>
+  import { useInstallCooperativeStore } from 'src/entities/Installer/model';
+  import { FailAlert, isValidWif } from 'src/shared/api';
+  import { ref } from 'vue';
+  import { COOPNAME } from 'src/shared/config';
+
+  const privateKey = ref('')
+  const loading = ref(false)
+
+  const installStore = useInstallCooperativeStore()
+
+  const submit = async () => {
+    loading.value = true
+    try {
+      const isValid = await isValidWif(COOPNAME, privateKey.value, 'active')
+
+      if (!isValid) {
+        loading.value = false
+        FailAlert('Неверный ключ доступа')
+        return
+      }
+
+      installStore.wif = privateKey.value
+
+      loading.value = false
+
+    } catch (e: any) {
+      loading.value = false
+      FailAlert(e.message)
+    }
+
+  }
+  </script>

package/src/features/Installer/ui/RequestKeyForm/index.ts

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

package/src/features/Installer/ui/SetSovietForm/SetSovietForm.vue

@@ -0,0 +1,71 @@
+<template lang="pug">
+div(v-if="installStore")
+  div(v-for="(member,index) in installStore.soviet" v-bind:key="member.id")
+    q-card(style="margin-bottom: 50px;" flat)
+
+      q-badge(v-if="member.role=='chairman'" style="position: absolute; top: -15px;" label="Председатель совета" color="black")
+      q-badge(v-if="member.role=='member'" style="position: absolute; top: -15px;" label="Член совета" color="black")
+
+      q-btn(style="position: absolute; top: -20px; right: 0px;" flat v-if="member.role != 'chairman'" @click="del(member.id)" icon="close" dense size="sm" round)
+
+      IndividualDataForm(v-model:userData="installStore.soviet[index]").q-mt-lg
+        template(#top)
+          q-input(standout="bg-teal text-white" v-model="installStore.soviet[index].individual_data.email" label="Электронная почта")
+
+  div.flex.justify-around
+    q-btn(@click="add" color="primary" icon="add") добавить члена
+    q-btn(@click="next" color="primary" icon="done" :loading="loading") завершить
+
+
+</template>
+<script lang="ts" setup>
+
+import { useInstallCooperativeStore } from 'src/entities/Installer/model';
+const installStore = useInstallCooperativeStore()
+import { IndividualDataForm } from 'src/shared/ui/UserDataForm/IndividualDataForm';
+import type { IIndividualData } from 'src/shared/lib/types/user/IUserData';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { useDesktopStore } from 'src/entities/Desktop/model';
+import { useInstallCooperative } from '../../model';
+import { ref } from 'vue';
+
+installStore.is_finish = false
+
+const add = () => {
+  let role: 'chairman' | 'member' = 'chairman'
+
+  if (installStore.soviet.length > 0)
+    role = 'member'
+
+  installStore.soviet.push({id: Date.now(), type: 'individual', role, individual_data: {} as IIndividualData})
+}
+
+const del = (id: number) => {
+  installStore.soviet = installStore.soviet.filter(el => el.id !==  id)
+}
+const loading = ref(false)
+
+const next = async () => {
+  try {
+    const { install } = useInstallCooperative()
+    loading.value = true
+    await install()
+    await useDesktopStore().healthCheck()
+
+    loading.value = false
+    installStore.is_finish = true
+    installStore.wif=''
+    installStore.soviet = []
+
+    SuccessAlert('Установка произведена успешно')
+  } catch(e: any){
+    FailAlert(e.message)
+    loading.value = false
+  }
+
+}
+
+if (installStore.soviet.length == 0)
+  add()
+
+</script>

package/src/features/Installer/ui/SetSovietForm/index.ts

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

package/src/features/Installer/ui/index.ts

@@ -0,0 +1,2 @@
+export * from './RequestKeyForm'
+export * from './SetSovietForm'

package/src/features/Order/SetStatus/api/index.ts

@@ -0,0 +1,7 @@
+import { sendPOST } from 'src/shared/api'
+
+const setStatus = async (id: string, status: 'paid' | 'completed' | 'repending' | 'refunded') => {
+  await sendPOST('/v1/orders/set-order-status', {id, status})
+}
+
+export const api = {setStatus}

package/src/features/Order/SetStatus/index.ts

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

package/src/features/Order/SetStatus/model/index.ts

@@ -0,0 +1,23 @@
+import { useOrderStore } from 'src/entities/Order'
+import { api } from '../api'
+
+export const useSetStatus = () => {
+  const orderStore = useOrderStore()
+
+  const setPaidStatus = async (id: string) => {
+    await api.setStatus(id, 'paid')
+    setTimeout(() => orderStore.updateCoopOrders({username: orderStore.username, id}), 2000)
+  }
+
+  const setRefundedStatus = async (id: string) => {
+    await api.setStatus(id, 'refunded')
+    setTimeout(() => orderStore.updateCoopOrders({username: orderStore.username, id}), 2000)
+  }
+
+  const setCompletedStatus = async (id: string) => {
+    await api.setStatus(id, 'completed')
+    setTimeout(() => orderStore.updateCoopOrders({username: orderStore.username, id}), 2000)
+  }
+
+  return {setPaidStatus, setRefundedStatus, setCompletedStatus}
+}

package/src/features/Order/SetStatus/ui/SetOrderCompletedStatusButton/SetOrderCompletedStatusButton.vue

@@ -0,0 +1,48 @@
+<template lang="pug">
+q-item(clickable flat size="sm" @click="showDialog=true").full-width
+  div.q-pa-sm
+    q-icon(name="fa-solid fa-square-check").q-mr-xs
+    span обработан
+
+  q-dialog(v-model="showDialog" @hide="close")
+    ModalBase(title='отметить обработанным')
+      Form(:handler-submit="setCompleted" :is-submitting="isSubmitting" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="close").q-pa-sm
+        div(style="max-width: 300px;")
+          p Вы уверены, что хотите отметить платеж обработанным? Отметка НЕ приводит к изменению лицевых счетов и не выполняет никаких действий по обработке платежа, а только заменяет статус платежа.
+
+</template>
+<script lang="ts" setup>
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { useSetStatus } from '../../model';
+import { ref } from 'vue';
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+const {setCompletedStatus} = useSetStatus()
+const isSubmitting = ref(false)
+const showDialog = ref(false)
+
+const emit = defineEmits(['close'])
+
+const props = defineProps({
+  id: {
+    type: String,
+    required: true
+  },
+})
+
+const close = () => {
+  showDialog.value = false
+  emit('close')
+}
+
+const setCompleted = async() => {
+  try {
+    await setCompletedStatus(props.id)
+    SuccessAlert('Статус ордера обновлён')
+    close()
+  } catch(e: any) {
+    FailAlert(`Возникла ошибка: ${e.message}`)
+    close()
+  }
+}
+</script>

package/src/features/Order/SetStatus/ui/SetOrderCompletedStatusButton/index.ts

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

package/src/features/Order/SetStatus/ui/SetOrderPaidStatusButton/SetOrderPaidStatusButton.vue

@@ -0,0 +1,49 @@
+<template lang="pug">
+q-item(clickable flat size="sm" @click="showDialog=true").full-width
+  div.q-pa-sm
+    q-icon(name="fa-regular fa-square-check").q-mr-xs
+    span отметить оплаченным
+
+  q-dialog(v-model="showDialog" @hide="close")
+    ModalBase(title='отметить оплаченным')
+      Form(:handler-submit="setPaid" :is-submitting="isSubmitting" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="close").q-pa-sm
+        div(style="max-width: 300px;")
+          p Вы уверены, что хотите отметить счёт оплаченным? Система обработает платеж сразу после получения отметки: совет кооператива получит пакет документов для голосования о приёме нового пайщика, или, паевый взнос будет зачислен в кошелёк.
+
+
+</template>
+<script lang="ts" setup>
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { useSetStatus } from '../../model';
+import { ref } from 'vue';
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+const {setPaidStatus} = useSetStatus()
+const isSubmitting = ref(false)
+const showDialog = ref(false)
+
+const emit = defineEmits(['close'])
+
+const props = defineProps({
+  id: {
+    type: String,
+    required: true
+  },
+})
+
+const close = () => {
+  showDialog.value = false
+  emit('close')
+}
+
+const setPaid = async() => {
+  try {
+    await setPaidStatus(props.id)
+    SuccessAlert('Статус ордера обновлён')
+    close()
+  } catch(e: any) {
+    FailAlert(`Возникла ошибка: ${e.message}`)
+    close()
+  }
+}
+</script>

package/src/features/Order/SetStatus/ui/SetOrderPaidStatusButton/index.ts

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

package/src/features/Order/SetStatus/ui/SetOrderRefundedStatusButton/SetOrderRefundedStatusButton.vue

@@ -0,0 +1,49 @@
+<template lang="pug">
+q-item(clickable flat size="sm" @click="showDialog=true").full-width
+  div.q-pa-sm
+    q-icon(name="cancel").q-mr-xs
+    span отметить отмененным
+
+  q-dialog(v-model="showDialog" @hide="close")
+    ModalBase(title='отметить отменённым')
+      Form(:handler-submit="setRefund" :is-submitting="isSubmitting" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="close").q-pa-sm
+        div(style="max-width: 300px;")
+          p Вы уверены, что хотите отметить платеж отмененным? Система обработает возврат платежа по лицевому счёту пайщика сразу после получения отметки.
+          p При отмене уже зачисленного паевого взноса, баланс аккаунта будет уменьшен. В случае отмены вступительного взноса - действие аккаунта будет приостановлено.
+
+</template>
+<script lang="ts" setup>
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { useSetStatus } from '../../model';
+import { ref } from 'vue';
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+const {setRefundedStatus} = useSetStatus()
+const isSubmitting = ref(false)
+const showDialog = ref(false)
+
+const emit = defineEmits(['close'])
+
+const props = defineProps({
+  id: {
+    type: String,
+    required: true
+  },
+})
+
+const close = () => {
+  showDialog.value = false
+  emit('close')
+}
+
+const setRefund = async() => {
+  try {
+    await setRefundedStatus(props.id)
+    SuccessAlert('Статус ордера обновлён')
+    close()
+  } catch(e: any) {
+    FailAlert(`Возникла ошибка: ${e.message}`)
+    close()
+  }
+}
+</script>

package/src/features/Order/SetStatus/ui/SetOrderRefundedStatusButton/index.ts

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

package/src/features/PaymentMethod/AddPaymentMethod/index.ts

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

package/src/features/PaymentMethod/AddPaymentMethod/model/index.ts

@@ -0,0 +1,56 @@
+import { useSessionStore } from 'src/entities/Session'
+import { useWalletStore } from 'src/entities/Wallet'
+import { sendPOST } from 'src/shared/api';
+import { COOPNAME } from 'src/shared/config'
+
+export interface ISBPData {
+  phone: string;
+}
+
+export interface IBankTransferData {
+  account_number: string;
+  bank_name: string;
+  card_number?: string;
+  currency: string;
+  details: {
+    bik: string;
+    corr: string;
+    kpp: string;
+  };
+}
+
+export interface IAddPaymentMethod {
+  username: string;
+  method_id: string;
+  method_type: 'sbp' | 'bank_transfer';
+  data: ISBPData | IBankTransferData;
+}
+
+
+export function useAddPaymentMethod() {
+  const store = useWalletStore()
+  const session = useSessionStore()
+
+  async function addPaymentMethod(params: IAddPaymentMethod) {
+
+    await store.loadUserWalet({
+      coopname: COOPNAME,
+      username: params.username,
+    })
+
+
+    await sendPOST(`/v1/methods/${params.username}/add`, params)
+
+    await store.loadUserWalet({
+      coopname: COOPNAME,
+
+
+
+      username: session.username
+    })
+  }
+
+  return {
+    addPaymentMethod
+  }
+}

package/src/features/PaymentMethod/AddPaymentMethod/ui/AddPaymentButton.vue

@@ -0,0 +1,166 @@
+<template lang="pug">
+div
+  q-btn(@click="showDialog=true" color="primary" size="sm" icon="add") добавить реквизиты
+
+  //- q-badge(flat rounded color="grey").q-ml-sm
+  //-   q-icon(name="far fa-question")
+  //-   q-tooltip Используйте, чтобы добавить метод возврата паевого взноса. Каким именно методом вам вернуть паевый взнос вы сможете выбрать при создании заявления на возврат.
+
+  q-dialog(v-model="showDialog" @hide="clear")
+    ModalBase(:title='"Добавить метод платежа"' )
+      Form(:handler-submit="handlerSubmit" :is-submitting="isSubmitting" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-pa-sm
+        q-select(v-model="methodType" standout="bg-teal text-white" :options="methods" map-options emit-value option-label="title" option-value="value" label="Выберите способ получения платежа" :rules="[val => notEmpty(val)]")
+
+        div(v-if="methodType=='sbp'")
+          q-input(v-model="sbp.phone" standout="bg-teal text-white" mask="+7 (###) ###-##-##" fill-mask label="Номер телефона" hint="Имя и фамилия получателя должны совпадать с теми, которые указаны в Удостоверении." :rules="[val => notEmpty(val)]" autocomplete="off").q-mb-lg
+
+        div(v-if="methodType=='bank_transfer'")
+          q-select(
+            v-model="bank_transfer.currency"
+            label="Валюта счёта"
+            standout="bg-teal text-white"
+            :options="[{ label: 'RUB', value: 'RUB' }]"
+            emit-value
+            :rules="[val => notEmpty(val)]"
+            map-options
+          )
+          q-input(
+            v-model="bank_transfer.bank_name"
+            standout="bg-teal text-white"
+            label="Наименование банка"
+            :rules="[val => notEmpty(val)]"
+            autocomplete="off"
+          )
+
+          q-input(
+            v-model="bank_transfer.details.corr"
+            standout="bg-teal text-white"
+            mask="####################"
+            label="Корреспондентский счет"
+            :rules="[val => notEmpty(val), val => val.length === 20 || 'ожидаем 20 цифр']"
+            autocomplete="off"
+          )
+
+          q-input(
+            v-model="bank_transfer.details.bik"
+            standout="bg-teal text-white"
+            mask="#########"
+            label="БИК"
+            :rules="[val => notEmpty(val), val => val.length === 9 || 'ожидаем 9 цифр']"
+            autocomplete="off"
+          )
+
+          q-input(
+            v-model="bank_transfer.details.kpp"
+            standout="bg-teal text-white"
+            mask="#########"
+            label="КПП"
+            :rules="[val => notEmpty(val), val => val.length === 9 || 'ожидаем 9 цифр']"
+            autocomplete="off"
+          )
+
+          q-input(
+            v-model="bank_transfer.account_number"
+            standout="bg-teal text-white"
+            mask="####################"
+            label="Номер счета"
+            :rules="[val => notEmpty(val), val => val.length === 20 || 'ожидаем 20 цифр']"
+            autocomplete="off"
+            hint="Имя и фамилия получателя должны совпадать с теми, которые указаны в Удостоверении."
+
+          ).q-mb-lg
+
+
+
+</template>
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import { useAddPaymentMethod } from '../model';
+import { FailAlert } from 'src/shared/api';
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+
+const props = defineProps({
+  username: {
+    type: String,
+    required: true,
+  },
+})
+
+const username = computed(() => props.username)
+const methodType = ref()
+
+const methods = ref([{
+  title: 'Система Быстрых Платежей (СБП)',
+  value: 'sbp'
+}, {
+  title: 'Банковский перевод',
+  value: 'bank_transfer'
+}])
+
+const notEmpty = (val: any) => {
+  return !!val || 'Это поле обязательно для заполнения'
+}
+
+const showDialog = ref(false)
+const isSubmitting = ref(false)
+const sbp = ref({ phone: '' })
+
+const bank_transfer = ref({
+  account_number: '',
+  bank_name: '',
+  currency: 'RUB',
+  details: {
+    bik: '',
+    corr: '',
+    kpp: '',
+  }
+})
+
+const clear = (): void => {
+  showDialog.value = false
+  sbp.value = { phone: '' }
+  bank_transfer.value = {
+    account_number: '',
+    bank_name: '',
+    currency: 'RUB',
+    details: {
+      bik: '',
+      corr: '',
+      kpp: '',
+    }
+  }
+}
+
+const { addPaymentMethod } = useAddPaymentMethod()
+
+const handlerSubmit = async (): Promise<void> => {
+
+  isSubmitting.value = true
+  try {
+    let data = null as any
+
+    if (methodType.value === 'sbp')
+      data = sbp.value
+    else if (methodType.value === 'bank_transfer')
+      data = bank_transfer.value
+
+
+    await addPaymentMethod({
+      username: username.value,
+      method_id: crypto.randomUUID(), //autogenerate
+      method_type: methodType.value,
+      data
+    })
+
+    showDialog.value = false
+    isSubmitting.value = false
+    clear()
+  } catch (e: any) {
+    showDialog.value = false
+    isSubmitting.value = false
+    FailAlert(e.message)
+  }
+}
+
+</script>

package/src/features/PaymentMethod/AddPaymentMethod/ui/index.ts

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

package/src/features/PaymentMethod/DeletePaymentMethod/index.ts

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

package/src/features/PaymentMethod/DeletePaymentMethod/model/index.ts

@@ -0,0 +1,29 @@
+import { useSessionStore } from 'src/entities/Session'
+import { useWalletStore } from 'src/entities/Wallet'
+import { sendPOST } from 'src/shared/api';
+import { COOPNAME } from 'src/shared/config'
+
+export interface IDeletePaymentMethod {
+  username: string;
+  method_id: string;
+}
+
+export function useDeletePaymentMethod() {
+  const store = useWalletStore()
+  const session = useSessionStore()
+
+  async function deletePaymentMethod(params: IDeletePaymentMethod) {
+    const {username, method_id} = params
+
+    await sendPOST(`/v1/methods/${username}/delete`, {method_id})
+
+    await store.loadUserWalet({
+      coopname: COOPNAME,
+      username: session.username
+    })
+  }
+
+  return {
+    deletePaymentMethod
+  }
+}

package/src/features/PaymentMethod/DeletePaymentMethod/ui/DeletePaymentMethodButton.vue

@@ -0,0 +1,67 @@
+<template lang="pug">
+div
+  q-btn(@click="showDialog=true" :size="size" flat dense) удалить
+    q-icon(name="close")
+  q-dialog(v-model="showDialog" @hide="clear")
+    ModalBase(:title='"Удалить метод платежа"' )
+      Form(:handler-submit="handlerSubmit" :is-submitting="isSubmitting" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-pa-sm
+        p Вы уверены, что хотите удалить метод платежа?
+
+
+  </template>
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import { useDeletePaymentMethod } from '../model';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+
+const props = defineProps({
+  username: {
+    type: String,
+    required: true,
+  },
+  method_id: {
+    type: String,
+    required: true,
+  },
+  size: {
+    type: String,
+    required: false,
+    default: 'md'
+  }
+})
+
+const username = computed(() => props.username)
+
+const showDialog = ref(false)
+const isSubmitting = ref(false)
+
+const clear = (): void => {
+  showDialog.value = false
+}
+
+const { deletePaymentMethod } = useDeletePaymentMethod()
+
+const handlerSubmit = async (): Promise<void> => {
+
+  isSubmitting.value = true
+  try {
+    await deletePaymentMethod({
+      username: username.value,
+      method_id: props.method_id
+    })
+
+    showDialog.value = false
+    isSubmitting.value = false
+    SuccessAlert('Метод платежа успешно удалён')
+
+  } catch (e: any) {
+    showDialog.value = false
+    isSubmitting.value = false
+    FailAlert(e.message)
+  }
+}
+
+
+</script>

package/src/features/PaymentMethod/DeletePaymentMethod/ui/index.ts

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