Mk
/
supersam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge main (edge function fix)

This commit is contained in:
Hermes 2026-08-21 14:25:21 +02:00
parent f35a84084b dc0f7f51c5
commit a505ce6ca7
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supabase/functions/_shared/delivery-invitations.ts
View File

@ -88,7 +88,7 @@ export const getClientInvitationStateFromOrderGroupStatus = (
deliveryStatus: string | null | undefined,
invitationState: string | null | undefined,
): DeliveryInvitationPublicState => {
if (deliveryStatus === "agreed") {
if (deliveryStatus === "agreed" || deliveryStatus === "driver_assigned") {
return "agreed";
}
@ -96,6 +96,10 @@ export const getClientInvitationStateFromOrderGroupStatus = (
return "delivered";
}
if (deliveryStatus === "paid_storage") {
return "paid_storage";
}
if (["awaiting_choice", "opened", "reminder_sent"].includes(String(invitationState || ""))) {
return invitationState as DeliveryInvitationPublicState;
}

12
supabase/functions/confirm-delivery-choice/index.ts
View File

@ -20,6 +20,14 @@ import {
const MAX_BODY_BYTES = 8 * 1024;
// Order groups a client may still self-book (choose delivery date+time) on.
// manual_confirmation_required (ручная обработка) stays bookable until the
// order leaves these states (date assigned / paid storage / finished).
const CLIENT_BOOKABLE_STATUSES = new Set([
"pending_confirmation",
"manual_confirmation_required",
]);
type ConfirmBody = {
token?: string;
deliveryDate?: string;
@ -191,7 +199,9 @@ Deno.serve(async (request) => {
? "agreed"
: "requires_address";
if (!isActiveInvitationState(invitation.state) || currentGroup.delivery_status !== "pending_confirmation") {
const bookingBlocked = !CLIENT_BOOKABLE_STATUSES.has(currentGroup.delivery_status || "");
if (!isActiveInvitationState(invitation.state) || bookingBlocked) {
return jsonResponse(
{
ok: false,