adata-ui 2.1.31 → 2.1.33

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

@@ -54,6 +54,8 @@ function onBack(type: 'method' | 'kaspi') {
 const userInfo = useState('user-info', () => ({}))
 
 function pushReplenishmentEventToDataLayer() {
+  window.dataLayer = window.dataLayer || []
+
   window.dataLayer?.push({
     event: 'replenishment',
     user_id: `${userInfo.value.id}`,
@@ -89,8 +91,13 @@ async function directionsBanks(bank: 'kaspi' | 'other', sum: number) {
     }
   }
   else if (bank === 'other') {
-    await payByCard(sum)
-    pushReplenishmentEventToDataLayer()
+    try {
+      await payByCard(sum)
+      pushReplenishmentEventToDataLayer()
+    }
+    catch (error) {
+      console.error(error)
+    }
   }
 }
 

package/components/features/pk-mobile-services/APkMobileServices.vue

@@ -2,6 +2,7 @@
 import { PAGES } from '#adata-ui/shared/constans/pages'
 import { usePkServicesLinks } from '#adata-ui/composables/useHeaderNavigationLinks'
 import { useUrls } from '#adata-ui/composables/useUrls'
+import { NuxtLinkLocale } from '#components'
 
 const services = usePkServicesLinks()
 const route = useRoute()
@@ -9,6 +10,8 @@ const localePath = useLocalePath()
 const { landing } = useUrls()
 const { locale } = useI18n()
 
+const pageUrl = useRequestURL()
+
 const blockStyles = [
   'first-border-gradient',
   'second-border-gradient',
@@ -31,14 +34,20 @@ const linkByIndex = [
   PAGES.pk.sanctions,
   buildLocalizedUrl(locale, landing, '/all-services'),
 ]
+
+const normalize = (path: string) => {
+  const cleaned = path.replace(/\/+$/, '')
+  return cleaned === '' ? '/' : cleaned
+}
 </script>
 
 <template>
   <div class="grid grid-cols-3">
-    <nuxt-link-locale
+    <component
       v-for="(service, index) in services"
       :key="index"
-      :to="service.to"
+      :is="normalize(service.short) === normalize(route.path) && pageUrl.hostname.startsWith('pk') ? 'div' : NuxtLinkLocale"
+      :to="normalize(service.short) === normalize(route.path) ? '' : service.to"
       :class="['flex flex-col items-center gap-2 p-2', blockStyles[index]]"
     >
       <div
@@ -56,7 +65,7 @@ const linkByIndex = [
       <p class="text-xs text-center">
         {{ service.title }}
       </p>
-    </nuxt-link-locale>
+    </component>
   </div>
 </template>
 

package/composables/useHeaderNavigationLinks.ts

@@ -407,47 +407,56 @@ export const usePkServicesLinks = () => {
     {
       title: t('header.products.counterparties.items.counterparty.title'),
       icon: IconSearch,
-      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.main)
+      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.main),
+      short: PAGES.pk.main,
     },
     {
       title: t('header.products.counterparties.items.wholesale.title'),
       icon: AIconUsersThree,
-      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.employees)
+      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.employees),
+      short: PAGES.pk.employees,
     },
     {
       title: t('header.products.counterparties.items.networks.title'),
       icon: IconLink,
-      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.connections)
+      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.connections),
+      short: PAGES.pk.connections,
     },
     {
       title: t('header.products.counterparties.items.offshore.title'),
       icon: IconDollar,
-      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.offshore)
+      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.offshore),
+      short: PAGES.pk.offshore,
     },
     {
       title: t('header.products.counterparties.items.foreign.title'),
       icon: IconGlobe,
-      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.foreign)
+      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.foreign),
+      short: PAGES.pk.foreign,
     },
     {
       title: t('header.products.counterparties.items.unloading.title'),
       icon: AIconArrowSquareDown,
-      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.unload)
+      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.unload),
+      short: PAGES.pk.unload,
     },
     {
       title: t('header.products.counterparties.items.compare.title'),
       icon: IconScales,
-      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.compare)
+      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.compare),
+      short: PAGES.pk.compare,
     },
     {
       title: t('header.products.counterparties.items.sanction.title'),
       icon: IconBlock,
-      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.sanctions)
+      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.sanctions),
+      short: PAGES.pk.sanctions,
     },
     {
       title: t('all_services'),
       icon: AIconExpandWindow,
-      to: buildLocalizedUrl(locale.value, urls.landing, PAGES.allServices)
+      to: buildLocalizedUrl(locale.value, urls.landing, PAGES.allServices),
+      short: PAGES.allServices,
     },
   ]
 }

package/composables/usePayment.ts

@@ -32,30 +32,34 @@ export function usePayment() {
         const { amount, id, user_id } = data
         const widget = new tiptop.Widget()
 
-        widget.pay(
-          'charge',
-          {
-            publicId,
-            description: t('payment.bank.description'),
-            amount: Number.parseInt(amount),
-            currency: 'KZT',
-            invoiceId: id.toString(),
-            accountId: user_id.toString(),
-            skin: 'modern',
-            data: {
-              myProp: 'myProp value',
-              rate,
+        await new Promise((resolve, reject) => {
+          widget.pay(
+            'charge',
+            {
+              publicId,
+              description: t('payment.bank.description'),
+              amount: Number.parseInt(amount),
+              currency: 'KZT',
+              invoiceId: id.toString(),
+              accountId: user_id.toString(),
+              skin: 'modern',
+              data: {
+                myProp: 'myProp value',
+                rate,
+              },
             },
-          },
-          {
-            onSuccess() {
-              $toast.success(t('payment.bank.paySuccess'))
+            {
+              onSuccess() {
+                $toast.success(t('payment.bank.paySuccess'))
+                resolve()
+              },
+              onFail() {
+                $toast.error(t('payment.bank.payError'))
+                reject(new Error(t('payment.bank.payError')))
+              },
             },
-            onFail() {
-              $toast.error(t('payment.bank.payError'))
-            },
-          },
-        )
+          )
+        })
       }
     }
     catch (error) {

package/lang/en.ts

@@ -261,7 +261,7 @@ const EnLocale: RuLocale = {
             st: '',
           },
           sb: {
-            t: 'Security Service check',
+            t: 'Security check',
             st: '',
           },
         },

package/lang/kk.ts

@@ -241,7 +241,7 @@ const KkLocale: RuLocale = {
             st: 'Комплаенс тәуекелдерін автоматты тексеру: бизнесіңізді нақты уақыт режимінде қорғау.',
           },
           assistant: {
-            t: 'Жасанды интеллект көмекшісі',
+            t: 'AI ассистент',
             st: '',
           },
           assignments: {
@@ -249,7 +249,7 @@ const KkLocale: RuLocale = {
             st: '',
           },
           hotline: {
-            t: 'Ыстық желі',
+            t: 'Жедел желі',
             st: '',
           },
           sanctions: {
@@ -257,11 +257,11 @@ const KkLocale: RuLocale = {
             st: '',
           },
           suppliers: {
-            t: 'Құжат',
+            t: 'Досье',
             st: '',
           },
           sb: {
-            t: 'Қауіпсіздік қызметін тексеру',
+            t: 'Қауіпсіздік қызметінің тексеруі',
             st: '',
           },
         },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adata-ui",
   "type": "module",
-  "version": "2.1.31",
+  "version": "2.1.33",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",