[waritctd]

Why

On the designer route, an accepted designer quotation made ยืนยันคำสั่งซื้อ the deal page's only button. Pressing it confirmed the customer and moved the deal from ขั้น 4 to ขั้น 10, then ขั้น 11 on the deposit, skipping the owner and buyer (QA deal 51).

The first version of this PR (10-22) offered the next party after an acceptance. A code review against main (10-27) found it dead-ends: the server keeps one ACCEPTED quotation per deal (R8), so the owner's and buyer's acceptances were refused.

Owner rulings 2026-10-27: hold the PR and make it safe to ship; pick the next party when the designer's or owner's quotation is sent; a quotation to redo gets เสนอใบราคา<party>; a sent designer/owner quotation's outcome is always in the ⋯ menu. Frontend only, no server change.

What changes (frontend only)

A. The route choice comes when a designer or owner quotation is sent

• The furthest party (ผู้ออกแบบ → เจ้าของโครงการ → ผู้ซื้อ) whose quotation went out (ISSUED, SUPERSEDED, REJECTED or EXPIRED) gives เสนอราคา<next party>; with two parties left it is a menu, เสนอราคาเจ้าของโครงการ / ข้ามไปเสนอราคาผู้ซื้อ. Picking one opens the price-request form with ผู้รับ pre-filled.
• Line in the bar: ใบเสนอราคาผู้ออกแบบส่งแล้ว เลือกเสนอราคาเจ้าของโครงการ หรือข้ามไปผู้ซื้อ (one party: …ถัดไปเสนอราคาผู้ซื้อ; a rejected or expired one reads …ไม่ผ่าน…).
• ⋯ บันทึกผลใบเสนอราคา → the request page, whenever a sent designer/owner quotation has no outcome yet, whatever the main button is.
• A later party's request still a DRAFT → ส่งคำขอราคาถึง<party> sends it to import (the panel's own ส่งให้ฝ่ายนำเข้า). With import/CEO → no main button.
• Pipeline card: ถัดไป: 5. เสนอราคาเจ้าของโครงการ หรือข้ามไป 8. …. The route comes from the served catalog.routes; there is no route choice until both the route and the deal's quotation list are read.

B. An acceptance is the order, as on main

• Any accepted, unconfirmed request → ยืนยันคำสั่งซื้อ, and it confirms that request. After an acceptance nothing else is quoted, waited on or approved on the deal.
• On the request page, ลูกค้ายอมรับ on a designer or owner request first asks ยืนยันว่าลูกค้ายอมรับใบเสนอราคานี้. ยกเลิก records nothing.

C. เสนอใบราคา<party> opens the new-engine quotation (UAT ruling R2)

• CEO-settled price → writes the quotation draft and opens /quotations/:id; an existing draft opens with no new write.
• Awaiting approval: the rep reads รอ ผจก.ขาย/CEO อนุมัติใบเสนอราคา <number>; ผจก.ขาย (when they may approve it) and the CEO get อนุมัติใบเสนอราคา → the quotation. A price changed from the CEO's needs the CEO.
• A refusal (409) shows the server's message and opens the request page; later clicks go straight there.
• The deal page's old-engine one-click create and issue path is removed.

D. A quotation to redo gets the same button

• The customer asked for changes, or the buyer said no or let it expire → เสนอใบราคา<party> writes a fresh quotation from the same request (the request page's เขียนใบเสนอราคาใหม่จากคำขอราคา). An open redo draft opens with no new write. A designer or owner who said no keeps the route choice.

E. Pages and pieces

• The quotation panel shows the request's new-engine quotation (number, status, เปิดใบเสนอราคา), also when an old-engine quotation on the request is cancelled or rejected. ยืนยันคำสั่งซื้อ acts on the accepted request.
• The request page reads past a cancelled revision draft to the quotation it revised.
• The dashboard reads each quoted deal's quotation list, so waits and redos show as on the deal page.
• The เอกสาร tab links a new-engine quotation's number to /quotations/:id.
• OverflowMenu: focus returns to the trigger without scrolling (also from a dialog and on Escape), triggerProps, triggerIcon={null}, a labelled trigger lays out with a gap, onOpenChange. The deal page's sticky header holds still while one of its menus is open.
• mockApi.createFromPricingRequest refuses what the service refuses and allows its re-quote from QUOTATION_ISSUED.

Not changed

Backend (R8 included), stage numbers, the request chain, ยืนยันคำสั่งซื้อ itself, the direct-quotation engine's own confirm.

Tests

Written first and run red, then implemented. Existing tests were revised where they covered the old behaviour; tests that pinned impossible states or could not fail were deleted.

• salesActions.test.js: route choice (sent ISSUED/SUPERSEDED/REJECTED/EXPIRED, furthest party, dead later request, another deal's request, off-route party, unknown route); a later DRAFT → ส่งคำขอราคาถึง…; later request with import/CEO → nothing (the designer's ISSUED or REJECTED quotation included); redo (designer REVISION_REQUESTED or DRAFT, owner after the designer, buyer REJECTED/EXPIRED/REVISION_REQUESTED, SUPERSEDED → nothing, an earlier party's redo draft never takes over the buyer's); acceptance (ยืนยันคำสั่งซื้อ with a later request SUBMITTED/APPROVED/pending; after a confirmed order nothing is quoted: stale same-party request, earlier redo draft, later approved request, later quotation awaiting approval); bucket 2 opens an existing DRAFT.
• workState.test.js: the bar line (two parties, one party, ไม่ผ่าน); approval wait for the rep; อนุมัติใบเสนอราคา for ผจก.ขาย and the CEO, and not for a cancelled request's, a CEO-only, or an after-acceptance quotation; ⋯ บันทึกผลใบเสนอราคา beside the route choice, while the owner's request is with import/CEO, not once the designer said no.
• TicketDetailPage.test.jsx: menu, line and form pre-fill; the ⋯ pair (บันทึกผลใบเสนอราคา, แก้ใบเสนอราคา) at the owner stage; rejected designer quotation; BUYER_DIRECT route; nothing while the stage list loads (⋯ still offers the outcome); nothing while the quotation list cannot be read; a redo draft opens with no write; the later DRAFT is submitted; an accepted designer quotation with a later approved request → ยืนยันคำสั่งซื้อ confirms the accepted one; เสนอใบราคา writes, refreshes, opens; leaving first does not navigate; existing DRAFT; approval wait; 409 vs 500; after a 409 no second write; panel rows (incl. a cancelled old-engine row); the header condenses by sentinel and holds while a menu is open.
• PricingRequestDetailPage.test.jsx: buyer accept records at once, also behind a cancelled revision draft; designer/owner accept asks first (both engines); ยกเลิก records nothing; an outcome refreshes the deal page's lists.
• OverflowMenu.test.jsx: focus to the trigger before the item and back from its dialog without scrolling; Escape; trigger props, no stray icon, a row with a gap.
• SalesOverview.test.jsx: the next party follows each deal's route; a redo reads เสนอใบราคาผู้ออกแบบ.
• quotationMeta.test.js: a cancelled draft never stands in for the quotation it revised.
• DealStagePanel, DealDocumentRegister, mockApi.pricingRequestQuotation, mockApi.dealQuotationOutcome (re-quote, superseded 409).

Deliberately not covered: real scrolling, focus jumps and remounts (jsdom has no layout; checked in headless Chrome); the request page when the deal's list is not readable (falls back to the server's row); the session lifetime of the 409 memory; e2e-real.

Verification

• Targeted vitest on the pushed tip (develop 50cc572 merged in): 1,126 tests in 14 files, plus 765 in 20 files that use the menu, dialog focus or header. Lint clean.
• /code-review max against main (main 0d36985 + this PR): 15 findings, all fixed in cacff6d; an earlier Opus review of the 10-27 design approved with notes, all fixed.
• Browser, this branch's frontend against main's backend (headless Chrome, seeded deals): route choice, owner-direct, full D → O → B route to ขั้น 10; approver and rep views of a pending quotation; phone width; redo (one write, then the same draft reopens); draft request submitted from the bar; chevron gap; menu stays open on scroll; no jump when a dialog closes.

Merge notes

• fix(sales): pricing-request มัดจำ draft accepts the new-engine ACCEPTED quotation of that pricing request #1166 first: every deal-page quotation is new-engine now, and the deposit step 409s for those until fix(sales): pricing-request มัดจำ draft accepts the new-engine ACCEPTED quotation of that pricing request #1166's backend is deployed.
• fix(ui): stop the deal page snapping back to its sticky header on desktop #1158: conflicts with this PR in one hunk (TicketDetailPage.jsx, the deal-quotation-panel wrapper): keep fix(ui): stop the deal page snapping back to its sticky header on desktop #1158's mobile:scroll-mt-[420px] outline-none and this PR's quotationByRequest prop. The page's other in-page jumps still need fix(ui): stop the deal page snapping back to its sticky header on desktop #1158 on desktop; this PR's own CTAs no longer use them.

Known gaps

• The dashboard still has no route choice for a deal while the stage list fails to load (the deal page offers the outcome in ⋯).
• On the server, cancelling a request leaves its quotation PENDING_APPROVAL, so it can still be approved from the approvals queue (backend follow-up).
• The request page still shows only the newest quotation while a revision draft is open (pre-existing).
• The remaining-invoice resolver reads legacy quotations only (fix(sales): remaining invoice sources the accepted new-engine quotation when no deposit notice was issued #1175).

🤖 Generated with Claude Code

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated
demo-glr	Ready	Preview	Oct 27, 2026 4:05pm UTC