refactoring
Some checks failed
Deploy / build (push) Has been cancelled

This commit is contained in:
alsaze
2025-11-21 12:48:00 +03:00
parent 2984e3780a
commit 2e01f58e67
27 changed files with 403 additions and 445 deletions

View File

@@ -20,6 +20,7 @@
</template>
<script setup lang="ts">
import type { WooOrderCreateResponse } from '#shared/woo_orders_create'
import { useCart } from '~/composables'
import PayBlock from '../components/PayBlock.vue'
@@ -27,11 +28,15 @@ const route = useRoute()
const { cart, cartRemoveAllItems } = useCart()
const { checkoutContacts, checkoutPickupPoint } = useCheckout()
const wait = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
// Зарпос должен быть в админке bsbp, ждём доступов. Текущее решение просто создает order в WooCommerce
onMounted(async () => {
if (!route?.query?.ID || cart.value.line_items.length === 0)
return
await $fetch('/api/create', {
await wait(5000)
await useFetch<WooOrderCreateResponse>('/api/woo_orders_create', {
method: 'POST',
body: {
payment_method: 'bacs',
@@ -58,8 +63,6 @@ onMounted(async () => {
</script>
<style lang="scss">
@use '~/assets/scss/utils' as *;
.cart {
margin-top: 120px;
margin-inline: auto;

View File

@@ -199,8 +199,6 @@ definePageMeta({
</script>
<style lang="scss">
@use '~/assets/scss/utils' as *;
.contacts {
margin-inline: auto;
max-width: 400px;

View File

@@ -89,7 +89,8 @@
</template>
<script setup lang="ts">
import type { PickupPoint, YandexPvzResponse } from '~/server/shared/types/yandex_pvz'
import type { YandexLocationDetectResponse } from '#shared/yandex_location_detect'
import type { YandexPvzPoint, YandexPvzResponse } from '#shared/yandex_pvz'
import { IPvzMapFittingTabs, IPvzMapTabs } from '#shared/types'
import { useGeolocation, useMediaQuery } from '@vueuse/core'
import { computed, onMounted, ref } from 'vue'
@@ -128,7 +129,7 @@ onMounted(async () => {
const openstreetmap = await response.json()
// получение geo_id из названию города
const { data: yandexLocation } = await useFetch('/api/yandex_location', {
const { data: yandexLocation } = await useFetch<YandexLocationDetectResponse>('/api/yandex_location_detect', {
method: 'POST',
body: {
location: openstreetmap?.address?.city,
@@ -146,7 +147,7 @@ onMounted(async () => {
yandexPvz.value = yandexPvzApi.value
})
const filteredPoints = computed<PickupPoint[]>(() => {
const filteredPoints = computed<YandexPvzPoint[]>(() => {
const points = yandexPvz.value?.points || []
const term = searchTerm.value?.toLowerCase() || ''
@@ -178,8 +179,6 @@ definePageMeta({
</script>
<style lang="scss">
@use '~/assets/scss/utils' as *;
.delivery {
display: flex;
flex-direction: row;

View File

@@ -77,8 +77,6 @@ definePageMeta({
</script>
<style lang="scss">
@use '~/assets/scss/utils' as *;
.summary {
max-width: 1200px;
margin-inline: auto;

View File

@@ -34,8 +34,6 @@ const router = useRouter()
</script>
<style lang="scss">
@use '~/assets/scss/utils' as *;
.cards-list {
padding: 15px;

View File

@@ -102,8 +102,6 @@ onUnmounted(() => {
</script>
<style lang="scss">
@use '~/assets/scss/utils' as *;
.product {
position: relative;
width: 100%;