deploy

server/src/routes/auth.js

@@ -1,4 +1,5 @@
 import { issueEmailCode, normalizeEmail, verifyEmailCode } from '../lib/auth.js'
+import { isDeliveryCarrier } from '../lib/delivery-carrier.js'
 import { escapeHtml } from '../lib/escape-html.js'
 import { prisma } from '../lib/prisma.js'
 import { getOtherUploadMaxFileBytes } from '../lib/upload-limits.js'
@@ -436,6 +437,24 @@ export async function registerAuthRoutes(fastify) {
         return reply.code(400).send({ error: 'deliveryType должен быть delivery | pickup' })
       }
 
+      const carrierRaw = request.body?.deliveryCarrier
+      let deliveryCarrier = null
+      if (deliveryType === 'delivery') {
+        const carrierStr =
+          carrierRaw === undefined || carrierRaw === null || carrierRaw === ''
+            ? ''
+            : String(carrierRaw).trim()
+        if (!isDeliveryCarrier(carrierStr)) {
+          return reply
+            .code(400)
+            .send({
+              error:
+                'deliveryCarrier обязателен для доставки: RUSSIAN_POST | OZON_PVZ | YANDEX_PVZ | FIVE_POST',
+            })
+        }
+        deliveryCarrier = carrierStr
+      }
+
       if (paymentMethod === 'on_pickup' && deliveryType !== 'pickup') {
         return reply.code(400).send({ error: 'Оплата при получении доступна только для самовывоза' })
       }
@@ -468,9 +487,7 @@ export async function registerAuthRoutes(fastify) {
       }))
 
       const itemsSubtotalCents = itemsPayload.reduce((sum, i) => sum + i.priceCentsSnapshot * i.qty, 0)
-      const totalQty = itemsPayload.reduce((sum, i) => sum + i.qty, 0)
-      const deliveryFeeCents =
-        deliveryType === 'delivery' ? 50000 * Math.max(1, Math.ceil(totalQty / 2)) : 0
+      const deliveryFeeCents = deliveryType === 'delivery' ? 50000 : 0
       const totalCents = itemsSubtotalCents + deliveryFeeCents
 
       const addressSnapshotJson =
@@ -488,7 +505,9 @@ export async function registerAuthRoutes(fastify) {
               lng: address.lng,
             })
 
-      const initialStatus = paymentMethod === 'on_pickup' ? 'IN_PROGRESS' : 'PENDING_PAYMENT'
+      let initialStatus = 'PENDING_PAYMENT'
+      if (paymentMethod === 'on_pickup') initialStatus = 'IN_PROGRESS'
+      else if (deliveryType === 'delivery') initialStatus = 'DELIVERY_FEE_ADJUSTMENT'
 
       let created
       try {
@@ -511,6 +530,7 @@ export async function registerAuthRoutes(fastify) {
               userId,
               status: initialStatus,
               deliveryType,
+              deliveryCarrier,
               paymentMethod,
               itemsSubtotalCents,
               deliveryFeeCents,
@@ -703,6 +723,15 @@ export async function registerAuthRoutes(fastify) {
         return reply.code(409).send({ error: 'Для этого заказа оплата при получении — кнопка оплаты не нужна.' })
       }
 
+      if (order.status === 'DELIVERY_FEE_ADJUSTMENT') {
+        return reply
+          .code(409)
+          .send({
+            error:
+              'Оплата станет доступна после корректировки стоимости доставки администратором.',
+          })
+      }
+
       let nextStatus = order.status
       if (order.status === 'DRAFT') {
         await prisma.order.update({ where: { id }, data: { status: 'PENDING_PAYMENT' } })