adata-ui 2.1.41-beta.2 → 2.1.41-beta.21

package/components/features/payment/process/PaymentProcess.vue

@@ -1,158 +1,162 @@
-<script setup lang="ts">
-import PaymentKaspiQrSidePanel from '#adata-ui/components/features/payment/process/PaymentKaspiQrSidePanel.vue'
-import PaymentKaspiRedirectSidePanel from '#adata-ui/components/features/payment/process/PaymentKaspiRedirectSidePanel.vue'
-import PaymentMethodSidePanel from '#adata-ui/components/features/payment/process/PaymentMethodSidePanel.vue'
-import PaymentTopUpSidePanel from '#adata-ui/components/features/payment/process/PaymentTopUpSidePanel.vue'
-import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
-
-const { $toast } = useNuxtApp()
-const { locale } = useI18n()
-const { commonAuth } = useAppConfig()
-const accessToken = useCookie('accessToken')
-
-const {
-  rateId,
-  topUpSidePanel,
-  methodSidePanel,
-  kaspiQRSidePanel,
-  kaspiRedirectSidePanel,
-  payByCard,
-} = usePayment()
-
-const userApiURL = commonAuth.userApiURL
-
-const paymentSum = ref(0)
-const requestUrl = ref('')
-const requestId = ref<number | null>(null)
-
-function actionPayment(num: number) {
-  paymentSum.value = num
-  topUpSidePanel.value = false
-  methodSidePanel.value = true
-}
-
-function toggleKaspiSidePanel(state: boolean) {
-  if (window.innerWidth >= 1024) {
-    kaspiQRSidePanel.value = state
-  }
-  else {
-    kaspiRedirectSidePanel.value = state
-  }
-}
-
-function onBack(type: 'method' | 'kaspi') {
-  if (type === 'method') {
-    topUpSidePanel.value = true
-    methodSidePanel.value = false
-  }
-  else if (type === 'kaspi') {
-    toggleKaspiSidePanel(false)
-    methodSidePanel.value = true
-  }
-}
-
-const userInfo = useState('user-info', () => ({}))
-
-function pushReplenishmentEventToDataLayer() {
-  window.dataLayer = window.dataLayer || []
-
-  window.dataLayer?.push({
-    event: 'replenishment',
-    user_id: `${userInfo.value.id}`,
-    user_email: `${userInfo.value.email}`,
-    rep_amount: `${paymentSum.value}`,
-  })
-}
-
-async function directionsBanks(bank: 'kaspi' | 'other', sum: number) {
-  methodSidePanel.value = false
-  if (bank === 'kaspi') {
-    try {
-      const { data } = await $fetch(`${removeTrailingSlash(userApiURL)}/user/kaspi-balance/request`, {
-        method: 'POST',
-        credentials: 'include',
-        headers: {
-          Authorization: `Bearer ${accessToken.value}`,
-          lang: locale.value,
-        },
-        params: {
-          amount: sum,
-          initial: 1,
-          rate_id: rateId.value ?? undefined,
-        },
-      })
-      requestId.value = data.request_id
-      requestUrl.value = `https://kaspi.kz/pay/adata?service_id=5964&9507=${data.request_id}`
-      toggleKaspiSidePanel(true)
-    }
-    catch (error) {
-      console.error(error)
-      $toast.error(error.data.message)
-    }
-  }
-  else if (bank === 'other') {
-    try {
-      await payByCard(sum)
-      pushReplenishmentEventToDataLayer()
-    }
-    catch (error) {
-      console.error(error)
-    }
-  }
-}
-
-async function updateUserRate() {
-  try {
-    // await $fetch(`${removeTrailingSlash(userApiURL)}/user/rate`, {
-    //   method: 'PUT',
-    //   credentials: 'include',
-    //   headers: {
-    //     Authorization: `Bearer ${accessToken.value}`,
-    //     lang: locale.value,
-    //   },
-    //   body: {
-    //     rate_code: 'basic_plus',
-    //   },
-    // })
-    pushReplenishmentEventToDataLayer()
-    window.location.reload()
-  }
-  catch (error) {
-    $toast.error(error.data.message)
-    toggleKaspiSidePanel(false)
-  }
-}
-</script>
-
-<template>
-  <payment-top-up-side-panel
-    v-model="topUpSidePanel"
-    @next="actionPayment"
-  />
-
-  <payment-method-side-panel
-    v-model="methodSidePanel"
-    :sum="paymentSum"
-    @back="onBack"
-    @next-bank="directionsBanks"
-  />
-
-  <payment-kaspi-qr-side-panel
-    v-model="kaspiQRSidePanel"
-    :request-url="requestUrl"
-    :request-id="requestId as number"
-    @back="onBack"
-    @update-user-rate="updateUserRate"
-  />
-
-  <payment-kaspi-redirect-side-panel
-    v-model="kaspiRedirectSidePanel"
-    :request-id="requestId as number"
-    @back="onBack"
-    @update-user-rate="updateUserRate"
-  />
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import PaymentKaspiQrSidePanel from '#adata-ui/components/features/payment/process/PaymentKaspiQrSidePanel.vue'
+import PaymentKaspiRedirectSidePanel from '#adata-ui/components/features/payment/process/PaymentKaspiRedirectSidePanel.vue'
+import PaymentMethodSidePanel from '#adata-ui/components/features/payment/process/PaymentMethodSidePanel.vue'
+import PaymentTopUpSidePanel from '#adata-ui/components/features/payment/process/PaymentTopUpSidePanel.vue'
+import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+
+const { $toast } = useNuxtApp()
+const { locale } = useI18n()
+const { commonAuth } = useAppConfig()
+const accessToken = useCookie('accessToken')
+
+const {
+  rateId,
+  topUpSidePanel,
+  topUpPresetAmount,
+  methodSidePanel,
+  kaspiQRSidePanel,
+  kaspiRedirectSidePanel,
+  payByCard,
+} = usePayment()
+
+const userApiURL = commonAuth.userApiURL
+
+const paymentSum = ref(0)
+const requestUrl = ref('')
+const requestId = ref<number | null>(null)
+
+function actionPayment(num: number) {
+  paymentSum.value = num
+  topUpSidePanel.value = false
+  methodSidePanel.value = true
+}
+
+function toggleKaspiSidePanel(state: boolean) {
+  if (window.innerWidth >= 1024) {
+    kaspiQRSidePanel.value = state
+  }
+  else {
+    kaspiRedirectSidePanel.value = state
+  }
+}
+
+function onBack(type: 'method' | 'kaspi') {
+  if (type === 'method') {
+    // Панель пополнения обнуляет поле при закрытии, поэтому введённую сумму
+    // возвращаем ей тем же способом, что и быстрые суммы снаружи.
+    topUpPresetAmount.value = paymentSum.value
+    topUpSidePanel.value = true
+    methodSidePanel.value = false
+  }
+  else if (type === 'kaspi') {
+    toggleKaspiSidePanel(false)
+    methodSidePanel.value = true
+  }
+}
+
+const userInfo = useState('user-info', () => ({}))
+
+function pushReplenishmentEventToDataLayer() {
+  window.dataLayer = window.dataLayer || []
+
+  window.dataLayer?.push({
+    event: 'replenishment',
+    user_id: `${userInfo.value.id}`,
+    user_email: `${userInfo.value.email}`,
+    rep_amount: `${paymentSum.value}`,
+  })
+}
+
+async function directionsBanks(bank: 'kaspi' | 'other', sum: number) {
+  methodSidePanel.value = false
+  if (bank === 'kaspi') {
+    try {
+      const { data } = await $fetch(`${removeTrailingSlash(userApiURL)}/user/kaspi-balance/request`, {
+        method: 'POST',
+        credentials: 'include',
+        headers: {
+          Authorization: `Bearer ${accessToken.value}`,
+          lang: locale.value,
+        },
+        params: {
+          amount: sum,
+          initial: 1,
+          rate_id: rateId.value ?? undefined,
+        },
+      })
+      requestId.value = data.request_id
+      requestUrl.value = `https://kaspi.kz/pay/adata?service_id=5964&9507=${data.request_id}`
+      toggleKaspiSidePanel(true)
+    }
+    catch (error) {
+      console.error(error)
+      $toast.error(error.data.message)
+    }
+  }
+  else if (bank === 'other') {
+    try {
+      await payByCard(sum)
+      pushReplenishmentEventToDataLayer()
+    }
+    catch (error) {
+      console.error(error)
+    }
+  }
+}
+
+async function updateUserRate() {
+  try {
+    // await $fetch(`${removeTrailingSlash(userApiURL)}/user/rate`, {
+    //   method: 'PUT',
+    //   credentials: 'include',
+    //   headers: {
+    //     Authorization: `Bearer ${accessToken.value}`,
+    //     lang: locale.value,
+    //   },
+    //   body: {
+    //     rate_code: 'basic_plus',
+    //   },
+    // })
+    pushReplenishmentEventToDataLayer()
+    window.location.reload()
+  }
+  catch (error) {
+    $toast.error(error.data.message)
+    toggleKaspiSidePanel(false)
+  }
+}
+</script>
+
+<template>
+  <payment-top-up-side-panel
+    v-model="topUpSidePanel"
+    @next="actionPayment"
+  />
+
+  <payment-method-side-panel
+    v-model="methodSidePanel"
+    :sum="paymentSum"
+    @back="onBack"
+    @next-bank="directionsBanks"
+  />
+
+  <payment-kaspi-qr-side-panel
+    v-model="kaspiQRSidePanel"
+    :request-url="requestUrl"
+    :request-id="requestId as number"
+    @back="onBack"
+    @update-user-rate="updateUserRate"
+  />
+
+  <payment-kaspi-redirect-side-panel
+    v-model="kaspiRedirectSidePanel"
+    :request-id="requestId as number"
+    @back="onBack"
+    @update-user-rate="updateUserRate"
+  />
+</template>
+
+<style scoped>
+
+</style>

package/components/features/payment/process/PaymentTopUpSidePanel.vue

@@ -1,119 +1,134 @@
-<script setup lang="ts">
-const emit = defineEmits<{
-  (e: 'next', sum: number): void
-}>()
-
-const isOpen = defineModel({ default: false })
-
-const { t } = useI18n()
-
-const money = ref<number | string>(0)
-const errorAlert = ref(false)
-
-const sumArr = [
-  { id: 1, value: 2000, label: '2 000 ₸', dataTestId: 'topup-balance-amount-2000-button' },
-  { id: 2, value: 5000, label: '5 000 ₸', dataTestId: 'topup-balance-amount-5000-button' },
-  { id: 3, value: 10000, label: '10 000 ₸', dataTestId: 'topup-balance-amount-10000-button' },
-  { id: 4, value: 20000, label: '20 000 ₸', dataTestId: 'topup-balance-amount-20000-button' },
-]
-
-const amount = computed(() => Number(money.value) || 0)
-const filterMoney = computed(() => amount.value >= 1)
-
-function onSelectAmount(value: number) {
-  money.value = value
-  errorAlert.value = false
-}
-
-function onClose() {
-  isOpen.value = false
-  errorAlert.value = false
-}
-
-function handlePayment() {
-  if (amount.value <= 1000000) {
-    emit('next', amount.value)
-    errorAlert.value = false
-  }
-  else {
-    errorAlert.value = true
-  }
-}
-</script>
-
-<template>
-  <a-side-panel
-    v-model="isOpen"
-    width="484px"
-    data-test-id="topup-balance-modal"
-  >
-    <template #header>
-      <div class="text-h3 text-primary">
-        {{ t('payment.topUp.title') }}
-      </div>
-    </template>
-
-    <div class="flex flex-col gap-6">
-      <div class="flex flex-col items-center gap-4 rounded-xl bg-muted p-6 text-center">
-        <a-ill-bill class="size-[120px]" />
-        <p class="text-body-md-medium text-quaternary">
-          {{ t('payment.topUp.info') }}
-        </p>
-      </div>
-
-      <div class="flex flex-col gap-3">
-        <a-input-v2
-          v-model="money"
-          :label="t('payment.topUp.enterAmount')"
-          type="number"
-          size="md"
-          clearable
-          data-test-id="topup-topup-balance-amount-input"
-          :error="errorAlert ? t('modals.replenish_modal.error') : undefined"
-        />
-
-        <div class="grid grid-cols-2 gap-2 sm:grid-cols-4">
-          <button
-            v-for="item in sumArr"
-            :key="item.id"
-            type="button"
-            class="rounded-lg border px-3 py-2.5 text-body-md-strong transition-colors"
-            :data-test-id="item.dataTestId"
-            :class="amount === item.value
-              ? 'border-brand bg-brand-subtle text-brand'
-              : 'border-default bg-main text-primary hover:border-strong hover:bg-action-secondary-hover'"
-            @click.stop="onSelectAmount(item.value)"
-          >
-            {{ item.label }}
-          </button>
-        </div>
-      </div>
-    </div>
-
-    <template #footer>
-      <div class="flex flex-col gap-2">
-        <a-button-v2
-          size="lg"
-          data-test-id="topup-balance-submit-button"
-          block
-          :disabled="!filterMoney"
-          @click="handlePayment"
-        >
-          {{ t('actions.topUp') }}
-        </a-button-v2>
-        <a-button-v2
-          view="outline"
-          color="gray"
-          size="lg"
-          data-test-id="topup-balance-back-button"
-          block
-          @click="onClose"
-        >
-          {{ t('actions.back') }}
-        </a-button-v2>
-      </div>
-    </template>
-  </a-side-panel>
-</template>
-
-<style scoped></style>
+<script setup lang="ts">
+const emit = defineEmits<{
+  (e: 'next', sum: number): void
+}>()
+
+const isOpen = defineModel({ default: false })
+
+const { t } = useI18n()
+const { topUpPresetAmount } = usePayment()
+
+const money = ref<number | string>(0)
+const errorAlert = ref(false)
+
+const sumArr = [
+  { id: 1, value: 2000, label: '2 000 ₸', dataTestId: 'topup-balance-amount-2000-button' },
+  { id: 2, value: 5000, label: '5 000 ₸', dataTestId: 'topup-balance-amount-5000-button' },
+  { id: 3, value: 10000, label: '10 000 ₸', dataTestId: 'topup-balance-amount-10000-button' },
+  { id: 4, value: 20000, label: '20 000 ₸', dataTestId: 'topup-balance-amount-20000-button' },
+]
+
+// Панель монтируется один раз и не размонтируется, поэтому поле суммы задаём
+// сами — но только при открытии, а не при закрытии: иначе сброс виден сквозь
+// анимацию ухода панели. Предвыбранная сумма приходит снаружи (быстрые суммы)
+// и с шага выбора способа оплаты, так что «Назад» не теряет введённое значение,
+// а обычное открытие всегда стартует с нуля.
+watch(isOpen, (open) => {
+  if (!open) return
+
+  money.value = topUpPresetAmount.value ?? 0
+  errorAlert.value = false
+  topUpPresetAmount.value = undefined
+})
+
+const amount = computed(() => Number(money.value) || 0)
+const filterMoney = computed(() => amount.value >= 1)
+
+function onSelectAmount(value: number) {
+  money.value = value
+  errorAlert.value = false
+}
+
+function onClose() {
+  // Ошибку не гасим здесь — она, как и сумма, сбрасывается при открытии,
+  // иначе смена состояния видна сквозь анимацию закрытия.
+  isOpen.value = false
+}
+
+function handlePayment() {
+  if (amount.value <= 1000000) {
+    emit('next', amount.value)
+    errorAlert.value = false
+  }
+  else {
+    errorAlert.value = true
+  }
+}
+</script>
+
+<template>
+  <a-side-panel
+    v-model="isOpen"
+    width="484px"
+    data-test-id="topup-balance-modal"
+  >
+    <template #header>
+      <div class="text-h3 text-primary">
+        {{ t('payment.topUp.title') }}
+      </div>
+    </template>
+
+    <div class="flex flex-col gap-6">
+      <div class="flex flex-col items-center gap-4 rounded-xl bg-muted p-6 text-center">
+        <a-ill-bill class="size-[120px]" />
+        <p class="text-body-md-medium text-quaternary">
+          {{ t('payment.topUp.info') }}
+        </p>
+      </div>
+
+      <div class="flex flex-col gap-3">
+        <a-input-v2
+          v-model="money"
+          :label="t('payment.topUp.enterAmount')"
+          type="number"
+          size="md"
+          clearable
+          data-test-id="topup-topup-balance-amount-input"
+          :error="errorAlert ? t('modals.replenish_modal.error') : undefined"
+        />
+
+        <div class="grid grid-cols-2 gap-2 sm:grid-cols-4">
+          <button
+            v-for="item in sumArr"
+            :key="item.id"
+            type="button"
+            class="rounded-lg border px-3 py-2.5 text-body-md-strong transition-colors"
+            :data-test-id="item.dataTestId"
+            :class="amount === item.value
+              ? 'border-brand bg-brand-subtle text-brand'
+              : 'border-default bg-main text-primary hover:border-strong hover:bg-action-secondary-hover'"
+            @click.stop="onSelectAmount(item.value)"
+          >
+            {{ item.label }}
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <template #footer>
+      <div class="flex flex-col gap-2">
+        <a-button-v2
+          size="lg"
+          data-test-id="topup-balance-submit-button"
+          block
+          :disabled="!filterMoney"
+          @click="handlePayment"
+        >
+          {{ t('actions.topUp') }}
+        </a-button-v2>
+        <a-button-v2
+          view="outline"
+          color="gray"
+          size="lg"
+          data-test-id="topup-balance-back-button"
+          block
+          @click="onClose"
+        >
+          {{ t('actions.back') }}
+        </a-button-v2>
+      </div>
+    </template>
+  </a-side-panel>
+</template>
+
+<style scoped></style>