fix: JSX structure errors + orderGroupRepository syntax
This commit is contained in:
parent
e05613ac1d
commit
813852ff45
|
|
@ -840,8 +840,7 @@ export const OrderDetailPanel = ({
|
||||||
</Button>
|
</Button>
|
||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : deliveryType === "delivery" ? (
|
||||||
{deliveryType === "delivery" ? (
|
|
||||||
<div className="flex flex-col gap-3 md:flex-row md:items-start md:relative md:z-10">
|
<div className="flex flex-col gap-3 md:flex-row md:items-start md:relative md:z-10">
|
||||||
<div className="space-y-3 md:relative md:z-30 md:min-w-0 md:flex-1 md:pr-4">
|
<div className="space-y-3 md:relative md:z-30 md:min-w-0 md:flex-1 md:pr-4">
|
||||||
<button
|
<button
|
||||||
|
|
@ -971,6 +970,7 @@ export const OrderDetailPanel = ({
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
<button
|
<button
|
||||||
|
|
@ -1034,7 +1034,6 @@ export const OrderDetailPanel = ({
|
||||||
>
|
>
|
||||||
{isSavingDeliveryChoice ? "Сохраняем..." : "Согласовать"}
|
{isSavingDeliveryChoice ? "Сохраняем..." : "Согласовать"}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
|
||||||
{formMessage ? (
|
{formMessage ? (
|
||||||
<p className="text-sm text-[var(--color-text-muted)]">{formMessage}</p>
|
<p className="text-sm text-[var(--color-text-muted)]">{formMessage}</p>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -281,18 +281,6 @@ export const updateOrderGroupDeliveryChoice = async ({
|
||||||
}, "Ошибка сохранения согласования доставки");
|
}, "Ошибка сохранения согласования доставки");
|
||||||
};
|
};
|
||||||
|
|
||||||
.eq("id", orderGroupId)
|
|
||||||
.single();
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
|
|
||||||
await logAction({ orderGroupId, action: "date_assigned", newValue: "manual: " + deliveryDate + " " + (deliveryTime || ""), details: { delivery_date_source: "manual" } }).catch(() => {});
|
|
||||||
|
|
||||||
return mapOrderGroupRowToDeliveryGroup(data);
|
|
||||||
}, "Ошибка сохранения согласования доставки");
|
|
||||||
};
|
|
||||||
|
|
||||||
export const assignDriverToOrderGroup = async ({
|
export const assignDriverToOrderGroup = async ({
|
||||||
orderGroupId,
|
orderGroupId,
|
||||||
|
|
@ -456,3 +444,4 @@ export const fetchOrderGroups = async () => {
|
||||||
return group;
|
return group;
|
||||||
}).filter(Boolean);
|
}).filter(Boolean);
|
||||||
}, "Ошибка загрузки групп доставки");
|
}, "Ошибка загрузки групп доставки");
|
||||||
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue