adata-ui 2.1.40-beta.2 → 2.1.40-beta.20

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

@@ -1,161 +1,179 @@
-<script setup lang="ts">
-import { toCanvas } from 'qrcode'
-import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
-
-const props = defineProps<{
-  requestUrl: string
-  requestId: number
-}>()
-
-const emit = defineEmits<{
-  (e: 'back', type: 'kaspi'): void
-  (e:  'updateUserRate'): void
-}>()
-
-const isOpen = defineModel({ default: false })
-
-const { t, locale } = useI18n()
-const { commonAuth } = useAppConfig()
-const accessToken = useCookie('accessToken')
-const colorMode = useColorMode()
-
-const userApiURL = commonAuth.userApiURL
-
-const paymentSuccess = ref(false)
-let intervalId: NodeJS.Timeout | null = null
-
-function onBack() {
-  emit('back', 'kaspi')
-}
-
-async function checkPayment() {
-  try {
-    const { data } = await $fetch(`${removeTrailingSlash(userApiURL)}/user/kaspi-balance/invoice-status`, {
-      method: 'GET',
-      credentials: 'include',
-      headers: {
-        Authorization: `Bearer ${accessToken.value}`,
-        lang: locale.value,
-      },
-      params: {
-        request_id: props.requestId,
-        initial: 0,
-      },
-    })
-
-    if (data.status === 'completed') {
-      paymentSuccess.value = true
-    }
-  }
-  catch (e) {
-    console.error(e)
-  }
-}
-
-watch(isOpen, async (value) => {
-  if (!value) {
-    if (intervalId) {
-      clearInterval(intervalId)
-    }
-    return
-  }
-
-  await nextTick()
-
-  const canvas = document.getElementById('kaspiQr') as HTMLCanvasElement | null
-  if (!canvas) return
-
-  toCanvas(
-    canvas,
-    props.requestUrl,
-    {
-      errorCorrectionLevel: 'H',
-      width: 300,
-      margin: 0,
-      color: {
-        dark: colorMode.value === 'dark' ? '#FFFFFF' : '#000000', // квадраты
-        light: colorMode.value === 'dark' ? '#000000' : '#FFFFFF' // фон
-      }
-    },
-    (error) => {
-
-      if (error) {
-        console.error(error)
-        return
-      }
-
-      const ctx = canvas.getContext('2d')
-      if (!ctx) return
-
-      const logo = new Image()
-      logo.src = '/kaspi/logo.svg'
-      logo.onload = () => {
-        const size = canvas.width * 0.2
-        const x = (canvas.width - size) / 2
-        const y = (canvas.height - size) / 2
-
-        ctx.fillStyle = colorMode.value === 'dark' ? '#000000' : '#fff'
-        ctx.fillRect(x - 6, y - 6, size + 12, size + 12)
-
-        ctx.drawImage(logo, x, y, size, size)
-      }
-    })
-
-  intervalId = setInterval(() => {
-    if (paymentSuccess.value && intervalId) {
-      clearInterval(intervalId)
-      emit('updateUserRate')
-      return
-    }
-    checkPayment()
-  }, 1000)
-})
-
-</script>
-
-<template>
-  <a-side-panel
-    v-model="isOpen"
-    width="484px"
-  >
-    <template #header>
-      <div class="flex items-center gap-2">
-        <button @click="onBack">
-          <a-icon-chevron-left class="size-6" />
-        </button>
-        <p class="text-xl font-semibold">
-          {{ t('payment.kaspi.title') }}
-        </p>
-      </div>
-    </template>
-
-    <div class="flex flex-col gap-6">
-      <div class="flex flex-col items-center text-center text-black dark:text-white">
-        <p class="mb-4 font-semibold text-sm">
-          {{ t('payment.kaspi.description') }}
-        </p>
-
-        <div class="flex gap-3 items-center">
-          <a-icon-kaspi-qr class="size-16" />
-          <span class="font-bold text-[44px]">
-          {{ t('payment.kaspi.qr') }}
-          </span>
-        </div>
-
-        <p class="mt-5 font-bold text-2xl">{{ t('payment.kaspi.scan') }}</p>
-
-        <canvas class="mt-5" id="kaspiQr"></canvas>
-
-        <p class="mt-10 text-lg">{{ t('payment.kaspi.adata') }}</p>
-      </div>
-
-      <a-button @click="onBack" view="outline">
-        {{ t('payment.kaspi.changeMethod') }}
-      </a-button>
-    </div>
-  </a-side-panel>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+import { toCanvas } from 'qrcode'
+
+const props = defineProps<{
+  requestUrl: string
+  requestId: number
+}>()
+
+const emit = defineEmits<{
+  (e: 'back', type: 'kaspi'): void
+  (e: 'updateUserRate'): void
+}>()
+
+const isOpen = defineModel({ default: false })
+
+const { t, locale } = useI18n()
+const { commonAuth } = useAppConfig()
+const accessToken = useCookie('accessToken')
+const colorMode = useColorMode()
+
+const userApiURL = commonAuth.userApiURL
+
+const paymentSuccess = ref(false)
+let intervalId: NodeJS.Timeout | null = null
+
+function onBack() {
+  emit('back', 'kaspi')
+}
+
+async function checkPayment() {
+  try {
+    const { data } = await $fetch(`${removeTrailingSlash(userApiURL)}/user/kaspi-balance/invoice-status`, {
+      method: 'GET',
+      credentials: 'include',
+      headers: {
+        Authorization: `Bearer ${accessToken.value}`,
+        lang: locale.value,
+      },
+      params: {
+        request_id: props.requestId,
+        initial: 0,
+      },
+    })
+
+    if (data.status === 'completed') {
+      paymentSuccess.value = true
+    }
+  }
+  catch (e) {
+    console.error(e)
+  }
+}
+
+watch(isOpen, async (value) => {
+  if (!value) {
+    if (intervalId) {
+      clearInterval(intervalId)
+    }
+    return
+  }
+
+  await nextTick()
+
+  const canvas = document.getElementById('kaspiQr') as HTMLCanvasElement | null
+  if (!canvas) return
+
+  toCanvas(
+    canvas,
+    props.requestUrl,
+    {
+      errorCorrectionLevel: 'H',
+      width: 300,
+      margin: 0,
+      color: {
+        dark: colorMode.value === 'dark' ? '#FFFFFF' : '#000000', // квадраты
+        light: colorMode.value === 'dark' ? '#000000' : '#FFFFFF', // фон
+      },
+    },
+    (error) => {
+      if (error) {
+        console.error(error)
+        return
+      }
+
+      const ctx = canvas.getContext('2d')
+      if (!ctx) return
+
+      const logo = new Image()
+      logo.src = '/kaspi/logo.svg'
+      logo.onload = () => {
+        const size = canvas.width * 0.2
+        const x = (canvas.width - size) / 2
+        const y = (canvas.height - size) / 2
+
+        ctx.fillStyle = colorMode.value === 'dark' ? '#000000' : '#fff'
+        ctx.fillRect(x - 6, y - 6, size + 12, size + 12)
+
+        ctx.drawImage(logo, x, y, size, size)
+      }
+    },
+  )
+
+  intervalId = setInterval(() => {
+    if (paymentSuccess.value && intervalId) {
+      clearInterval(intervalId)
+      emit('updateUserRate')
+      return
+    }
+    checkPayment()
+  }, 1000)
+})
+</script>
+
+<template>
+  <a-side-panel
+    v-model="isOpen"
+    width="484px"
+  >
+    <template #header>
+      <div class="flex items-center gap-2">
+        <button
+          type="button"
+          class="rounded-md p-1 transition-colors hover:bg-gray-100 dark:hover:bg-white/[0.06]"
+          data-test-id="kaspi-qr-back-button"
+          @click="onBack"
+        >
+          <a-icon-chevron-left class="size-6" />
+        </button>
+        <p class="text-xl font-semibold text-deepblue-900 dark:text-gray-100" data-test-id="kaspi-qr-title">
+          {{ t('payment.kaspi.title') }}
+        </p>
+      </div>
+    </template>
+
+    <div class="flex flex-col gap-6">
+      <p class="text-center text-sm font-medium text-gray-600 dark:text-gray-300">
+        {{ t('payment.kaspi.description') }}
+      </p>
+
+      <div class="flex flex-col items-center gap-5 rounded-xl border border-gray-200 bg-white p-6 dark:border-gray-700 dark:bg-gray-900" data-test-id="kaspi-qr-payment-block">
+        <div class="flex items-center gap-3">
+          <a-icon-kaspi-qr class="size-14" />
+          <span class="text-[40px] font-bold leading-none text-deepblue-900 dark:text-white">
+            {{ t('payment.kaspi.qr') }}
+          </span>
+        </div>
+
+        <p class="text-center text-xl font-bold text-deepblue-900 dark:text-white">
+          {{ t('payment.kaspi.scan') }}
+        </p>
+
+        <canvas
+          id="kaspiQr"
+          class="rounded-md"
+        />
+
+        <p class="text-center text-base text-gray-600 dark:text-gray-300">
+          {{ t('payment.kaspi.adata') }}
+        </p>
+      </div>
+    </div>
+
+    <template #footer>
+      <a-button-v2
+        view="outline"
+        color="gray"
+        size="lg"
+        data-test-id="kaspi-qr-change-payment-method-button"
+        block
+        @click="onBack"
+      >
+        {{ t('payment.kaspi.changeMethod') }}
+      </a-button-v2>
+    </template>
+  </a-side-panel>
+</template>
+
+<style scoped></style>

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

@@ -1,112 +1,123 @@
-<script setup lang="ts">
-import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
-
-const props = defineProps<{
-    requestId: number
-}>()
-
-const emit = defineEmits<{
-  (e: 'back', type: 'kaspi'): void
-  (e:  'updateUserRate'): void
-}>()
-
-const isOpen = defineModel({ default: false })
-
-const { commonAuth } = useAppConfig()
-const { t, locale } = useI18n()
-const localePath = useLocalePath()
-const accessToken = useCookie('accessToken')
-
-const userApiURL = commonAuth.userApiURL
-
-const paymentSuccess = ref(false)
-let intervalId: NodeJS.Timeout | null = null
-
-async function checkPayment() {
-  try {
-    const { data } = await $fetch(`${removeTrailingSlash(userApiURL)}/user/kaspi-balance/invoice-status`, {
-      method: 'GET',
-      credentials: 'include',
-      headers: {
-        Authorization: `Bearer ${accessToken.value}`,
-        lang: locale.value,
-      },
-      params: {
-        request_id: props.requestId,
-        initial: 0,
-      },
-    })
-
-    if (data.status === 'completed') {
-      paymentSuccess.value = true
-    }
-  }
-  catch (e) {
-    console.error(e)
-  }
-}
-
-function goKaspi() {
-  window.open(localePath(`https://kaspi.kz/pay/adata?service_id=5964&9507=${props.requestId}`), '_blank')
-}
-
-function onBack() {
-  emit('back', 'kaspi')
-}
-
-watch(isOpen, async (value) => {
-  if (!value) {
-    if (intervalId) {
-      clearInterval(intervalId)
-    }
-    return
-  }
-
-  intervalId = setInterval(() => {
-    if (paymentSuccess.value && intervalId) {
-      clearInterval(intervalId)
-      emit('updateUserRate')
-      return
-    }
-    checkPayment()
-  }, 1000)
-})
-</script>
-
-<template>
-  <a-side-panel
-    v-model="isOpen"
-    width="484px"
-  >
-    <div class="flex flex-col gap-5">
-      <p class="text-center text-2xl font-bold whitespace-pre-wrap">
-        {{ t('payment.redirect.title') }}
-      </p>
-      <a-button block @click="goKaspi">
-        {{ t('payment.redirect.goKaspi') }}
-      </a-button>
-      <div class="flex flex-col gap-2">
-        <p class="text-center text-sm">
-          {{ t('payment.redirect.paymentId') }}
-        </p>
-        <p class="text-center text-xl	font-semibold">
-          {{ requestId }}
-        </p>
-      </div>
-      <p class="text-center text-sm">
-        {{ t('payment.redirect.description') }}
-      </p>
-      <a-button
-        view="outline"
-        block
-        @click="onBack"
-      >
-        {{ t('payment.redirect.changeMethod') }}
-      </a-button>
-    </div>
-  </a-side-panel>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+
+const props = defineProps<{
+  requestId: number
+}>()
+
+const emit = defineEmits<{
+  (e: 'back', type: 'kaspi'): void
+  (e: 'updateUserRate'): void
+}>()
+
+const isOpen = defineModel({ default: false })
+
+const { commonAuth } = useAppConfig()
+const { t, locale } = useI18n()
+const localePath = useLocalePath()
+const accessToken = useCookie('accessToken')
+
+const userApiURL = commonAuth.userApiURL
+
+const paymentSuccess = ref(false)
+let intervalId: NodeJS.Timeout | null = null
+
+async function checkPayment() {
+  try {
+    const { data } = await $fetch(`${removeTrailingSlash(userApiURL)}/user/kaspi-balance/invoice-status`, {
+      method: 'GET',
+      credentials: 'include',
+      headers: {
+        Authorization: `Bearer ${accessToken.value}`,
+        lang: locale.value,
+      },
+      params: {
+        request_id: props.requestId,
+        initial: 0,
+      },
+    })
+
+    if (data.status === 'completed') {
+      paymentSuccess.value = true
+    }
+  }
+  catch (e) {
+    console.error(e)
+  }
+}
+
+function goKaspi() {
+  window.open(localePath(`https://kaspi.kz/pay/adata?service_id=5964&9507=${props.requestId}`), '_blank')
+}
+
+function onBack() {
+  emit('back', 'kaspi')
+}
+
+watch(isOpen, async (value) => {
+  if (!value) {
+    if (intervalId) {
+      clearInterval(intervalId)
+    }
+    return
+  }
+
+  intervalId = setInterval(() => {
+    if (paymentSuccess.value && intervalId) {
+      clearInterval(intervalId)
+      emit('updateUserRate')
+      return
+    }
+    checkPayment()
+  }, 1000)
+})
+</script>
+
+<template>
+  <a-side-panel
+    v-model="isOpen"
+    width="484px"
+  >
+    <div class="flex flex-col gap-6">
+      <p class="whitespace-pre-wrap text-center text-xl font-bold text-deepblue-900 dark:text-gray-100">
+        {{ t('payment.redirect.title') }}
+      </p>
+
+      <div class="flex flex-col items-center gap-1 rounded-xl bg-gray-50 p-5 text-center dark:bg-white/[0.03]">
+        <span class="text-xs text-gray-500 dark:text-gray-400">
+          {{ t('payment.redirect.paymentId') }}
+        </span>
+        <span class="text-2xl font-bold text-deepblue-900 dark:text-gray-100">
+          {{ requestId }}
+        </span>
+      </div>
+
+      <p class="text-center text-sm text-gray-600 dark:text-gray-300">
+        {{ t('payment.redirect.description') }}
+      </p>
+    </div>
+
+    <template #footer>
+      <div class="flex flex-col gap-2">
+        <a-button-v2
+          size="lg"
+          block
+          @click="goKaspi"
+        >
+          {{ t('payment.redirect.goKaspi') }}
+        </a-button-v2>
+        <a-button-v2
+          view="outline"
+          color="gray"
+          size="lg"
+          block
+          @click="onBack"
+        >
+          {{ t('payment.redirect.changeMethod') }}
+        </a-button-v2>
+      </div>
+    </template>
+  </a-side-panel>
+</template>
+
+<style scoped></style>