fix: отрицательная накидка и сохранность накидок в notes

Отрицательная «Накидка, %» отбрасывалась в четырёх местах (ввод, сохранение,
восстановление, отображение) — теперь любое ненулевое значение сохраняется,
отрицательное работает как скидка. Коэффициент (аплифт + накидка/100)
ограничен снизу нулём и в UI, и в CSV-экспорте. Принимается «−» (U+2212).

Накидки пропадали после синхронизации: клиент до v3.41 собирает notes заново
из трёх старых полей и при сохранении стирает sale_row_markups на сервере,
а следующий pull перезаписывает локальную копию. Клиент теперь переносит
незнакомые ключи notes/pricing_ui как есть, чтобы будущие поля не терялись.
ADL исправлен (неверное утверждение «старые клиенты игнорируют ключ»).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Mikhail ChusavitinandClaude Opus 5.5 committed 2026-09-24 10:08:34 +03:00
1 parent 4501193423
commit 6b9652e3ac
5 files changed
+66 -16

No files matched your search

+5 -1
View File
@@ -85,12 +85,16 @@ Sale per-row pricing (`_saleRowPrice`/`recomputeSalePrices` in `index.html`,
- `Цена = base × (Аплифт к estimate + row's own Накидка% / 100)` — Накидка is a
per-row percentage, additive to the table-wide uplift, entered directly in the
row's own input; unset rows default to 0% (no change to older configs' totals);
negative values are discounts, and the factor is floored at 0 so no price goes
negative (`_saleRowPrice` / `applySaleRowPricing`);
Склад/Конкуренты are not shown or exported for the Sale table;
- per-row Накидка is keyed by `"<vendorPN>::<lot>"` (uppercased, "NONE" when there's
no vendor PN) — plain `lot_name` isn't a safe key since the same LOT can appear
under more than one vendor-PN group (see row expansion rules below) — and persisted
as an additive key, `Notes.pricing_ui.sale_row_markups`, alongside the existing
`sale_uplift`/`sale_custom_price` (see
`sale_uplift`/`sale_custom_price`; unknown `Notes` / `pricing_ui` keys are carried
through verbatim on save (`loadedNotesExtra` / `loadedPricingUIExtra`) so a client
never erases fields added by a newer version (see
[decisions/2026-09-15-sale-row-markup-and-minimal-csv.md](decisions/2026-09-15-sale-row-markup-and-minimal-csv.md));
- the Sale table's own "Экспорт CSV" button additionally sends
`minimal_sale_columns: true` + `sale_row_markups`, which collapses
@@ -47,11 +47,22 @@ and a final price.
## Consequences
- Old clients / already-saved configurations are unaffected: `sale_row_markups` absent
from `Notes` means every row's markup defaults to 0%, reproducing the exact totals
the table produced before this change (uplift-only). Old clients that don't know the
new `Notes` key simply ignore it, exactly like `sale_uplift` is ignored by even older
code.
- Already-saved configurations are unaffected: `sale_row_markups` absent from `Notes`
means every row's markup defaults to 0%, reproducing the exact totals the table
produced before this change (uplift-only).
- **Correction (2026-09-24):** the original claim that old clients "simply ignore" the
new key was wrong. A pre-v3.41 client rebuilds `Notes` from scratch on save
(only `buy_custom_price`/`sale_uplift`/`sale_custom_price`), so opening and saving a
config in an old client — including the best-effort save on page exit — erases
`sale_row_markups` on the server, and the next pull overwrites every other client's
local copy. Observed in the field: a markup saved and pushed on 09-22 came back as
`null` on the 09-23 pull. From this fix on the client carries unknown `Notes` /
`pricing_ui` keys through verbatim, so future additive keys survive a save by the
current version; nothing can protect against clients older than this fix — all users
must upgrade.
- Negative Накидка is allowed (a per-row discount). The factor
`uplift + pct/100` is floored at 0 on both client and CSV export, so a large discount
gives a zero price instead of a negative one.
- If a future caller needs the full-column DDP CSV format with per-row markup applied,
it must do so explicitly — `MinimalSaleColumns` intentionally couples "reduced
columns" and "per-row markup applied" as one request-level switch rather than two