base commit

server/src/routes/api/admin-orders.js

@@ -57,6 +57,7 @@ export async function registerAdminOrderRoutes(fastify) {
           id: o.id,
           status: o.status,
           deliveryType: o.deliveryType,
+          paymentMethod: o.paymentMethod,
           totalCents: o.totalCents,
           currency: o.currency,
           createdAt: o.createdAt,

server/src/routes/auth.js

@@ -420,10 +420,23 @@ export async function registerAuthRoutes(fastify) {
       const commentRaw = request.body?.comment
       const comment = commentRaw === null || commentRaw === undefined ? null : String(commentRaw).trim()
 
+      const paymentMethodRaw = request.body?.paymentMethod
+      const paymentMethod =
+        paymentMethodRaw === undefined || paymentMethodRaw === null || paymentMethodRaw === ''
+          ? 'online'
+          : String(paymentMethodRaw).trim()
+      if (paymentMethod !== 'online' && paymentMethod !== 'on_pickup') {
+        return reply.code(400).send({ error: 'paymentMethod должен быть online | on_pickup' })
+      }
+
       if (deliveryType !== 'delivery' && deliveryType !== 'pickup') {
         return reply.code(400).send({ error: 'deliveryType должен быть delivery | pickup' })
       }
 
+      if (paymentMethod === 'on_pickup' && deliveryType !== 'pickup') {
+        return reply.code(400).send({ error: 'Оплата при получении доступна только для самовывоза' })
+      }
+
       let address = null
       if (deliveryType === 'delivery') {
         if (!addressId) return reply.code(400).send({ error: 'Выберите адрес доставки' })
@@ -472,6 +485,8 @@ export async function registerAuthRoutes(fastify) {
               lng: address.lng,
             })
 
+      const initialStatus = paymentMethod === 'on_pickup' ? 'IN_PROGRESS' : 'PENDING_PAYMENT'
+
       let created
       try {
         created = await prisma.$transaction(async (tx) => {
@@ -491,8 +506,9 @@ export async function registerAuthRoutes(fastify) {
           const order = await tx.order.create({
             data: {
               userId,
-              status: 'PENDING_PAYMENT',
+              status: initialStatus,
               deliveryType,
+              paymentMethod,
               itemsSubtotalCents,
               deliveryFeeCents,
               totalCents,
@@ -678,6 +694,12 @@ export async function registerAuthRoutes(fastify) {
       const { id } = request.params
       const order = await prisma.order.findFirst({ where: { id, userId } })
       if (!order) return reply.code(404).send({ error: 'Заказ не найден' })
+
+      const paymentMethod = order.paymentMethod ?? 'online'
+      if (paymentMethod === 'on_pickup') {
+        return reply.code(409).send({ error: 'Для этого заказа оплата при получении — кнопка оплаты не нужна.' })
+      }
+
       let nextStatus = order.status
       if (order.status === 'DRAFT') {
         await prisma.order.update({ where: { id }, data: { status: 'PENDING_PAYMENT' } })