adata-ui 2.0.45 → 2.0.47

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

@@ -1,136 +1,136 @@
-<script setup lang="ts">
-import PaymentTopUpSidePanel from '#adata-ui/components/features/payment/process/PaymentTopUpSidePanel.vue'
-import PaymentMethodSidePanel from '#adata-ui/components/features/payment/process/PaymentMethodSidePanel.vue'
-import PaymentKaspiQrSidePanel from '#adata-ui/components/features/payment/process/PaymentKaspiQrSidePanel.vue'
-import PaymentKaspiRedirectSidePanel from '#adata-ui/components/features/payment/process/PaymentKaspiRedirectSidePanel.vue'
-import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
-
-const { $toast } = useNuxtApp()
-const { locale } = useI18n()
-const { commonAuth } = useAppConfig()
-const accessToken = useCookie('accessToken')
-
-const {
-  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
-  }
-}
-
-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,
-        },
-      })
-      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') {
-    await payByCard(sum)
-  }
-}
-
-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',
-      },
-    })
-    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"
-    @back="onBack"
-    :sum="paymentSum"
-    @next-bank="directionsBanks"
-  />
-
-  <payment-kaspi-qr-side-panel
-    v-model="kaspiQRSidePanel"
-    @back="onBack"
-    :request-url="requestUrl"
-    :request-id="requestId as number"
-    @update-user-rate="updateUserRate"
-  />
-
-  <payment-kaspi-redirect-side-panel
-    v-model="kaspiRedirectSidePanel"
-    @back="onBack"
-    :request-id="requestId as number"
-    @update-user-rate="updateUserRate"
-  />
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import PaymentTopUpSidePanel from '#adata-ui/components/features/payment/process/PaymentTopUpSidePanel.vue'
+import PaymentMethodSidePanel from '#adata-ui/components/features/payment/process/PaymentMethodSidePanel.vue'
+import PaymentKaspiQrSidePanel from '#adata-ui/components/features/payment/process/PaymentKaspiQrSidePanel.vue'
+import PaymentKaspiRedirectSidePanel from '#adata-ui/components/features/payment/process/PaymentKaspiRedirectSidePanel.vue'
+import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+
+const { $toast } = useNuxtApp()
+const { locale } = useI18n()
+const { commonAuth } = useAppConfig()
+const accessToken = useCookie('accessToken')
+
+const {
+  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
+  }
+}
+
+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,
+        },
+      })
+      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') {
+    await payByCard(sum)
+  }
+}
+
+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',
+      },
+    })
+    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"
+    @back="onBack"
+    :sum="paymentSum"
+    @next-bank="directionsBanks"
+  />
+
+  <payment-kaspi-qr-side-panel
+    v-model="kaspiQRSidePanel"
+    @back="onBack"
+    :request-url="requestUrl"
+    :request-id="requestId as number"
+    @update-user-rate="updateUserRate"
+  />
+
+  <payment-kaspi-redirect-side-panel
+    v-model="kaspiRedirectSidePanel"
+    @back="onBack"
+    :request-id="requestId as number"
+    @update-user-rate="updateUserRate"
+  />
+</template>
+
+<style scoped>
+
+</style>

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

@@ -1,113 +1,113 @@
-<script setup lang="ts">
-const emit = defineEmits<{
-  (e: 'next', sum: number): void
-}>()
-
-const isOpen = defineModel({ default: false })
-
-const { t } = useI18n()
-
-const money = ref(0)
-const sumArr = ref([
-  {
-    id: 1,
-    value: 1000,
-    label: '1 000 ₸',
-  },
-  {
-    id: 2,
-    value: 5000,
-    label: '5 000 ₸',
-  },
-  {
-    id: 3,
-    value: 10000,
-    label: '10 000 ₸',
-  },
-  {
-    id: 4,
-    value: 20000,
-    label: '20 000 ₸',
-  },
-])
-
-const filterMoney = computed(() => {
-  return money.value > 0
-})
-
-function onSelectAmount(value: number) {
-  money.value = value
-}
-
-function onClose() {
-  isOpen.value = false
-}
-
-function handlePayment() {
-  emit('next', money.value)
-}
-</script>
-
-<template>
-  <a-side-panel v-model="isOpen"  width="484px">
-    <template #header>
-      <div class="text-xl font-semibold">
-        {{ t('payment.topUp.title') }}
-      </div>
-    </template>
-
-    <div class="flex flex-col gap-6">
-      <div class="flex flex-col items-center gap-4 ">
-        <a-ill-bill class="size-[120px]" />
-        <p class="text-center text-sm font-semibold">
-          {{ t('payment.topUp.info') }}
-        </p>
-      </div>
-
-      <div class="flex flex-col gap-4">
-        <a-input-standard
-          v-model="money"
-          :label="`${t('payment.topUp.enterAmount')}`"
-          type="number"
-          pattern="[0-9]*"
-          clearable
-        />
-        <div class="flex gap-4">
-          <a-chips
-            v-for="item in sumArr"
-            :key="item.id"
-            view="standard"
-            size="lg"
-            :class="[
-              money === item.value
-                ? 'bg-blue-700 text-white hover:bg-blue-700 dark:border-blue-500 dark:bg-transparent dark:text-blue-500 dark:hover:bg-transparent'
-                : '',
-            ]"
-            @click.stop="onSelectAmount(item.value)"
-          >
-            <span>{{ item.label }}</span>
-          </a-chips>
-        </div>
-      </div>
-
-      <div class="flex flex-col gap-2">
-        <a-button
-          :disabled="!filterMoney"
-          @click="handlePayment"
-        >
-          {{ t('actions.topUp') }}
-        </a-button>
-        <a-button
-          view="outline"
-          @click="onClose"
-        >
-          {{ t('actions.back') }}
-        </a-button>
-      </div>
-    </div>
-  </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 money = ref(0)
+const sumArr = ref([
+  {
+    id: 1,
+    value: 1000,
+    label: '1 000 ₸',
+  },
+  {
+    id: 2,
+    value: 5000,
+    label: '5 000 ₸',
+  },
+  {
+    id: 3,
+    value: 10000,
+    label: '10 000 ₸',
+  },
+  {
+    id: 4,
+    value: 20000,
+    label: '20 000 ₸',
+  },
+])
+
+const filterMoney = computed(() => {
+  return money.value > 0
+})
+
+function onSelectAmount(value: number) {
+  money.value = value
+}
+
+function onClose() {
+  isOpen.value = false
+}
+
+function handlePayment() {
+  emit('next', money.value)
+}
+</script>
+
+<template>
+  <a-side-panel v-model="isOpen"  width="484px">
+    <template #header>
+      <div class="text-xl font-semibold">
+        {{ t('payment.topUp.title') }}
+      </div>
+    </template>
+
+    <div class="flex flex-col gap-6">
+      <div class="flex flex-col items-center gap-4 ">
+        <a-ill-bill class="size-[120px]" />
+        <p class="text-center text-sm font-semibold">
+          {{ t('payment.topUp.info') }}
+        </p>
+      </div>
+
+      <div class="flex flex-col gap-4">
+        <a-input-standard
+          v-model="money"
+          :label="`${t('payment.topUp.enterAmount')}`"
+          type="number"
+          pattern="[0-9]*"
+          clearable
+        />
+        <div class="flex gap-4">
+          <a-chips
+            v-for="item in sumArr"
+            :key="item.id"
+            view="standard"
+            size="lg"
+            :class="[
+              money === item.value
+                ? 'bg-blue-700 text-white hover:bg-blue-700 dark:border-blue-500 dark:bg-transparent dark:text-blue-500 dark:hover:bg-transparent'
+                : '',
+            ]"
+            @click.stop="onSelectAmount(item.value)"
+          >
+            <span>{{ item.label }}</span>
+          </a-chips>
+        </div>
+      </div>
+
+      <div class="flex flex-col gap-2">
+        <a-button
+          :disabled="!filterMoney"
+          @click="handlePayment"
+        >
+          {{ t('actions.topUp') }}
+        </a-button>
+        <a-button
+          view="outline"
+          @click="onClose"
+        >
+          {{ t('actions.back') }}
+        </a-button>
+      </div>
+    </div>
+  </a-side-panel>
+</template>
+
+<style scoped>
+
+</style>

package/components/forms/README.md

@@ -1 +1 @@
-# inputs
+# inputs

package/components/modals/ContentNavigationModal.vue

@@ -27,6 +27,8 @@ import IconCalc from '#adata-ui/icons/calculator.vue'
 import { buildLocalizedUrl } from '#adata-ui/utils/localizedNavigation'
 import { AIconFiles } from '#components'
 import MapPinRect from '#adata-ui/icons/map/map-pin-rect.vue'
+import ChartBar from '#adata-ui/icons/chart-bar.vue'
+import Bank from '#adata-ui/icons/bank.vue'
 type Emits = {
   (e: 'pushMain'): void
 }
@@ -35,7 +37,7 @@ const tab = ref(useCurrentModule().value)
 const { myLayer }: any = useAppConfig()
 const { t } = useI18n()
 const emits = defineEmits<Emits>()
-
+const mode = myLayer.mode
 
 const tabOptions = [
   {
@@ -47,8 +49,8 @@ const tabOptions = [
     key: 'pk',
   },
   {
-    name: 'header.products.jobs.label',
-    key: 'work',
+    name: 'header.products.compliance.label',
+    key: 'compliance',
   },
   {
     name: 'header.products.tenders.label',
@@ -58,17 +60,17 @@ const tabOptions = [
     name: 'header.products.analytics.label',
     key: 'analytics',
   },
-  {
-    name: 'header.products.fines.label',
-    key: 'fines',
-  },
   {
     name: 'header.products.fea.label',
     key: 'fea',
   },
   {
-    name: 'header.products.compliance.label',
-    key: 'compliance',
+    name: 'header.products.fines.label',
+    key: 'fines',
+  },
+  {
+    name: 'header.products.jobs.label',
+    key: 'work',
   },
 ]
 const sideLinks = <any>{
@@ -139,6 +141,16 @@ const sideLinks = <any>{
     },
   ],
   tenders: [
+    {
+      icon: ChartBar,
+      label: t('header.products.tenders.items.monitoring.title'),
+      link: `https://zakupki.${mode}.kz` + PAGES.tender.monitoring,
+    },
+    {
+      icon: Bank,
+      label: t('header.products.tenders.items.akimat.title'),
+      link: `https://zakupki.${mode}.kz` + PAGES.tender.akimat,
+    },
     {
       icon: IconSearch,
       label: 'header.products.tenders.items.tenders.title',