Mattsson
619b446c52
* fix(invoices): make the Swish QR encode the amount to pay after ROT/RUT deduction The Swish payment QR on invoice PDFs encoded the pre-deduction invoice total (getDisplayTotal), while the totals block and the invoice email state "Att betala" as total minus the ROT/RUT deduction (getAmountToPay, fakturamodellen). Since the Swish payload locks the amount (editmask 0), a customer scanning a RUT/ROT invoice was asked to pay the full total with no way to correct it: overpaying by the entire skattereduktion. Swap the QR amount source to getAmountToPay(...).toPay so the QR, the printed "Att betala" and the email always agree. A fully deducted invoice (toPay = 0) now renders no QR via the existing amount > 0 guard. All seven render surfaces (send, preview, pdf, v1 send/pdf, MCP commit, recurring, issue-and-book) go through this one helper. Reported by a user: "QR-koden for swish stammer INTE med beloppet man ska betala. Den tar INTE hansyn till reduktionen." Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): select the amount-to-pay columns on the v1 pdf and send surfaces Skeptic review of the Swish QR fix found it was a silent no-op on the v1 GET pdf route: its column projection predated ROT/RUT and omitted deduction_total (and ore_rounding), so getAmountToPay saw undefined, treated it as "no deduction", and the route kept emitting a locked full-amount QR while the sent email said the deducted "Att betala". INVOICE_FULL_COLUMNS (v1 send renders from it) likewise omitted ore_rounding, ignoring the per-invoice oresavrundning override there. Move INVOICE_PDF_COLUMNS into lib/api/v1/invoice-columns.ts, add deduction_total, deduction_personnummer_last4 and ore_rounding to it, add ore_rounding to INVOICE_FULL_COLUMNS, and pin the amount-path columns of both projections with a test: a projection gap does not error, it renders the wrong money on one surface only, so it must be caught structurally. Also records the defect and remediation in DECISIONS.md per the compliance-swarm change-risk finding (the repo has no risk_register.csv; the decision log is its equivalent). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): gate the Swish QR to payable documents and restore delivery_date on the v1 pdf Swedish accounting review round 2: buildSwishQrDataUrl had no non-payable gate, so a kreditfaktura (a refund document) still produced a locked Swish payment QR at helper level; the template happens to hide the payment box for credit notes, but a payment request against a refund must stay impossible rather than merely unrendered. Apply the same document gate buildPaymentLinkQrDataUrl already has (invoice documents without credited_invoice_id only) and pin it with tests replacing the credit-note parity case. Also add delivery_date to INVOICE_PDF_COLUMNS: ML 17 kap 24 p.7 requires leveransdatum on the invoice when it differs from the invoice date, the template renders exactly that, and the v1 pdf projection silently dropped it. Same projection-starvation class as the previous commit. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(invoices): name the covered render surfaces and drop the contested lagrum point number CodeRabbit round 3, both documentation-only: the DECISIONS defect record said "all surfaces" while the editor preview is deferred to #1686, so it now lists the covered surfaces explicitly; and the delivery_date comment cited ML 17 kap 24 p.7 where CodeRabbit reads p.8 in SFS 2023:200 while the repo's swedish-invoice-compliance reference table says p.7, so the citation drops the point number and stays at the paragraph, which is correct under either enumeration. No behavior change. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
39 lines
2.7 KiB
TypeScript
39 lines
2.7 KiB
TypeScript
/**
|
|
* Shared v1 invoice response projections.
|
|
*
|
|
* The create (POST), detail (GET), and draft-update (PATCH) endpoints all
|
|
* return the same invoice shape; keeping the column lists in one module
|
|
* prevents response-shape drift between them (a PATCH caller must see the
|
|
* same fields a GET caller does). Explicit projection: excludes user_id,
|
|
* company_id (internal scoping) and the encrypted personnummer blob
|
|
* (deduction_personnummer_last4 is the display-safe representation).
|
|
* Schema migrations adding columns must update these lists before the
|
|
* field becomes visible on the public API.
|
|
*/
|
|
|
|
export const INVOICE_FULL_COLUMNS =
|
|
'id, invoice_number, customer_id, invoice_date, due_date, delivery_date, status, currency, exchange_rate, exchange_rate_date, subtotal, subtotal_sek, vat_amount, vat_amount_sek, total, total_sek, ore_rounding, vat_treatment, vat_rate, moms_ruta, your_reference, our_reference, notes, payment_link_url, stripe_payment_link_id, payment_link_auto, reverse_charge_text, credited_invoice_id, document_type, converted_from_id, paid_at, paid_amount, remaining_amount, default_dimensions, deduction_total, deduction_personnummer_last4, created_at, updated_at'
|
|
|
|
/**
|
|
* Projection for the v1 PDF download route. Narrower than INVOICE_FULL_COLUMNS
|
|
* (no payment-link/dimension internals), but it MUST contain every column the
|
|
* render path reads to compute the customer-facing amount: getAmountToPay
|
|
* derives "Att betala" from total, ore_rounding, deduction_total and
|
|
* credited_invoice_id, and the same figure is locked into the Swish QR
|
|
* (editmask 0). A column missing here silently zeroes that part of the
|
|
* calculation for this surface only: the v1 PDF then disagrees with the
|
|
* dashboard PDF and the sent email for the same invoice, which is exactly
|
|
* the byte-equivalence this endpoint promises. delivery_date is statutory
|
|
* content on top of that: ML 17 kap 24 § requires leveransdatum on the
|
|
* invoice when it differs from the invoice date, and the template renders it
|
|
* exactly then. Pinned by __tests__/invoice-columns.test.ts.
|
|
*/
|
|
export const INVOICE_PDF_COLUMNS =
|
|
'id, invoice_number, customer_id, invoice_date, due_date, delivery_date, status, document_type, ' +
|
|
'currency, subtotal, vat_amount, total, ore_rounding, vat_treatment, vat_rate, moms_ruta, ' +
|
|
'reverse_charge_text, your_reference, our_reference, notes, credited_invoice_id, ' +
|
|
'paid_amount, remaining_amount, deduction_total, deduction_personnummer_last4'
|
|
|
|
export const INVOICE_ITEM_FULL_COLUMNS =
|
|
'id, sort_order, line_type, description, quantity, unit, unit_price, line_total, vat_rate, vat_amount, article_id, revenue_account, deduction_type, deduction_amount, labor_hours, work_type, housing_designation, apartment_number, brf_org_number, dimensions, created_at'
|