work-license-server 1.0.19 → 1.0.20

package/assets/landing.js

@@ -397,12 +397,92 @@
 
     let franchiseCountdownTimer = null;
     let activeCabinetTab = 'servers';
+    const openServerAddonBuilders = new Map();
+    const openInvoiceOrderIds = new Set();
+
+    function cleanCompanyName(val = '') {
+        const s = String(val || '').trim();
+        if (!s || s.includes('@') || s === 'Организация WORK' || s === 'Клиент ODANT-WORK') return '';
+        return s;
+    }
 
     function switchCabinetTab(tab = 'servers') {
-        activeCabinetTab = tab === 'franchises' ? 'franchises' : 'servers';
+        activeCabinetTab = (tab === 'franchises' || tab === 'requisites') ? tab : 'servers';
         $$('[data-cab-tab]').forEach(b => b.classList.toggle('active', b.dataset.cabTab === activeCabinetTab));
         if ($('#cabSecServers')) $('#cabSecServers').style.display = activeCabinetTab === 'servers' ? '' : 'none';
         if ($('#cabSecFranchises')) $('#cabSecFranchises').style.display = activeCabinetTab === 'franchises' ? '' : 'none';
+        if ($('#cabSecRequisites')) $('#cabSecRequisites').style.display = activeCabinetTab === 'requisites' ? '' : 'none';
+        if (activeCabinetTab === 'requisites') renderCabinetRequisites();
+    }
+
+    function renderCabinetRequisites() {
+        const u = currentUser || {};
+        const comp = cleanCompanyName(u.companyName);
+        const hasReq = Boolean(comp && u.inn);
+        if ($('#navCabRequisites')) {
+            $('#navCabRequisites').textContent = hasReq ? `Реквизиты организации (✓)` : `Реквизиты организации`;
+        }
+        if ($('#reqCompanyName')) $('#reqCompanyName').value = comp;
+        if ($('#reqInn')) $('#reqInn').value = u.inn || '';
+        if ($('#reqKpp')) $('#reqKpp').value = u.kpp || '';
+        if ($('#reqLegalAddress')) $('#reqLegalAddress').value = u.legalAddress || '';
+        if ($('#reqSignerPosition')) $('#reqSignerPosition').value = u.signerPosition || u.position || '';
+        if ($('#reqSignerName')) $('#reqSignerName').value = u.signerName || '';
+        if ($('#reqBankName')) $('#reqBankName').value = u.bankName || '';
+        if ($('#reqBik')) $('#reqBik').value = u.bik || '';
+        if ($('#reqPhone')) $('#reqPhone').value = u.phone || '';
+        if ($('#reqBankAccount')) $('#reqBankAccount').value = u.bankAccount || '';
+        if ($('#reqCorrAccount')) $('#reqCorrAccount').value = u.corrAccount || '';
+    }
+
+    async function saveCabinetRequisites() {
+        if (!currentUser?.sessionKey) return;
+        const st = $('#reqSaveStatus');
+        const companyName = $('#reqCompanyName')?.value.trim() || '';
+        const inn = $('#reqInn')?.value.trim() || '';
+        if (!companyName || !inn) {
+            if (st) {
+                st.style.color = 'var(--danger)';
+                st.textContent = 'Укажите как минимум Наименование организации и ИНН.';
+            }
+            (!companyName ? $('#reqCompanyName') : $('#reqInn'))?.focus();
+            return;
+        }
+        if (st) {
+            st.style.color = 'var(--muted)';
+            st.textContent = 'Сохранение реквизитов…';
+        }
+        try {
+            const res = await api('/api/cabinet/profile', {
+                sessionKey: currentUser.sessionKey,
+                companyName,
+                inn,
+                kpp: $('#reqKpp')?.value.trim() || '',
+                legalAddress: $('#reqLegalAddress')?.value.trim() || '',
+                signerPosition: $('#reqSignerPosition')?.value.trim() || '',
+                signerName: $('#reqSignerName')?.value.trim() || '',
+                bankName: $('#reqBankName')?.value.trim() || '',
+                bik: $('#reqBik')?.value.trim() || '',
+                phone: $('#reqPhone')?.value.trim() || '',
+                bankAccount: $('#reqBankAccount')?.value.trim() || '',
+                corrAccount: $('#reqCorrAccount')?.value.trim() || '',
+            });
+            if (res.user) {
+                currentUser = { ...res.user, sessionKey: res.user.sessionKey || currentUser.sessionKey };
+                persistSessionInBrowser(currentUser.sessionKey, currentUser.email, currentUser.isAdmin, currentUser);
+                onAuthenticated();
+            }
+            if (st) {
+                st.style.color = 'var(--ok)';
+                st.textContent = '✓ Реквизиты организации сохранены в Личном кабинете и применены к вашим счетам.';
+            }
+        }
+        catch (err) {
+            if (st) {
+                st.style.color = 'var(--danger)';
+                st.textContent = err.message;
+            }
+        }
     }
 
     function onAuthenticated() {
@@ -415,17 +495,19 @@
                 sessionStorage.setItem('odant_work_admin_token', currentUser.sessionKey);
             } catch { /* ignore */ }
         }
-        if ($('#btnAuthText')) $('#btnAuthText').textContent = currentUser.companyName || currentUser.email;
+        const comp = cleanCompanyName(currentUser.companyName);
+        if ($('#btnAuthText')) $('#btnAuthText').textContent = comp || currentUser.email;
         if ($('#authEmail')) $('#authEmail').value = currentUser.email || '';
         if ($('#authOfertaCheck')) $('#authOfertaCheck').checked = Boolean(currentUser.ofertaAccepted);
         if ($('#userBadgeBox')) {
-            const orgInfo = currentUser.companyName ? `${esc(currentUser.companyName)}${currentUser.inn ? ' (ИНН ' + esc(currentUser.inn) + ')' : ''} · ` : '';
+            const orgInfo = comp ? `${esc(comp)}${currentUser.inn ? ' (ИНН ' + esc(currentUser.inn) + ')' : ''} · ` : '';
             const adminBadge = currentUser.isAdmin ? `<span class="tag ok" style="margin-right:6px">Администратор</span> <a href="/admin" style="font-weight:700;margin-right:8px">Открыть Админ-панель →</a> · ` : '';
             $('#userBadgeBox').innerHTML = `${adminBadge}${orgInfo}Аккаунт: <b>${esc(currentUser.email)}</b> · <a href="#" data-action="logout" style="color:var(--muted)">Выйти</a>`;
         }
         syncClientServerPicker();
         renderCabinetServers();
         renderCabinetFranchises();
+        renderCabinetRequisites();
         moveIndicator();
     }
 
@@ -482,6 +564,116 @@
         }
     }
 
+    function formatOrderSummaryHtml(o = {}) {
+        const parts = [];
+        if (o.includeBasePak) {
+            parts.push(`<b>Комплекс ODANT-WORK с сервером</b> (10 вечных мест + ИИ)`);
+        }
+        else if (o.includeBaseLicenseOnly) {
+            parts.push(`<b>Базовая лицензия ODANT-WORK</b> (10 вечных мест + ИИ)`);
+        }
+        const seats = Number(o.addonSeats || 0);
+        if (seats > 0) {
+            const years = Number(o.years || 1);
+            const tierObj = tierById(o.tier || 'business');
+            const tierName = o.tierName || tierObj?.name || 'Business';
+            const disc = volumeDiscount(seats).discountPercent;
+            const gross = seats * (tierObj?.pricePerUserYearRub || 15_000) * years;
+            const net = (!o.includeBasePak && !o.includeBaseLicenseOnly && o.amountRub)
+                ? Number(o.amountRub)
+                : Math.round(gross * (1 - disc / 100));
+            const perSeat = Math.round(net / seats);
+            const discStr = disc > 0 ? `, скидка −${disc}%` : '';
+            parts.push(`Дополнительные рабочие места: <b>${seats} мест</b> × <b>${years} г.</b> · тариф <b>${esc(tierName)}</b> (${rub(perSeat)}/место${discStr})`);
+        }
+        if (!parts.length && Array.isArray(o.items) && o.items.length) {
+            for (const it of o.items) {
+                const q = Number(it.quantity || 1);
+                const hasQtyInTitle = /\b\d+\s*(раб\.?\s*мест|мест|шт)/i.test(String(it.title || ''));
+                parts.push(`${(!hasQtyInTitle && q > 1) ? `<b>${q} мест</b> · ` : ''}${esc(it.title)}`);
+            }
+        }
+        return parts.join(' + ') || esc(o.tierName || o.orderId);
+    }
+
+    function calcInlineAddonQuote(cfg = {}) {
+        const seats = Math.max(1, Math.min(2000, Math.floor(Number(cfg.seats) || 10)));
+        const years = Math.max(1, Math.min(5, Math.floor(Number(cfg.years) || 1)));
+        const tier = tierById(cfg.tier || 'business');
+        const disc = volumeDiscount(seats).discountPercent;
+        const gross = seats * tier.pricePerUserYearRub * years;
+        const saved = Math.round(gross * disc / 100);
+        const net = gross - saved;
+        const perSeat = Math.round(net / seats);
+        return { seats, years, tier, disc, gross, saved, net, perSeat };
+    }
+
+    function renderServerAddonBuilderHtml(lid, srvName) {
+        const cfg = openServerAddonBuilders.get(lid);
+        if (!cfg) return '';
+        const q = calcInlineAddonQuote(cfg);
+        const presets = [5, 10, 25, 50, 100];
+        const tiers = D.tiers || [
+            { id: 'start', name: 'Start', pricePerUserYearRub: 10_000 },
+            { id: 'business', name: 'Business', pricePerUserYearRub: 15_000 },
+            { id: 'enterprise', name: 'Enterprise', pricePerUserYearRub: 20_000 },
+        ];
+        const yearOpts = [1, 2, 3, 5];
+
+        return `<div style="margin-top:12px;padding:14px 16px;border-radius:10px;border:1px solid var(--brand);background:color-mix(in srgb, var(--brand) 6%, var(--panel-solid))">
+            <div style="display:flex;justify-content:space-between;align-items:center;gap:10px;flex-wrap:wrap;margin-bottom:12px">
+                <div style="font-weight:700;font-size:14px">Докупка дополнительных рабочих мест для «${esc(srvName)}»</div>
+                <button type="button" class="btn btn-ghost btn-sm" style="padding:4px 10px;font-size:12px" data-close-addon-builder="${esc(lid)}">✕ Закрыть</button>
+            </div>
+
+            <div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(220px,1fr));gap:12px;align-items:end">
+                <div>
+                    <div class="small muted" style="margin-bottom:6px">1. Количество дополнительных мест:</div>
+                    <div style="display:flex;gap:6px;align-items:center;flex-wrap:wrap">
+                        <input type="number" min="1" max="2000" value="${q.seats}" data-addon-seats-input="${esc(lid)}" style="width:90px;padding:6px 10px;font-weight:700;font-size:14px">
+                        ${presets.map(p => {
+                            const d = volumeDiscount(p).discountPercent;
+                            const active = q.seats === p;
+                            return `<button type="button" class="btn ${active ? 'btn-primary' : 'btn-ghost'} btn-sm" style="padding:5px 9px;font-size:12px" data-addon-preset="${esc(lid)}" data-seats="${p}">${p}${d ? ` (−${d}%)` : ''}</button>`;
+                        }).join('')}
+                    </div>
+                </div>
+
+                <div>
+                    <div class="small muted" style="margin-bottom:6px">2. Уровень поддержки (SLA):</div>
+                    <div style="display:flex;gap:6px;flex-wrap:wrap">
+                        ${tiers.map(t => {
+                            const active = q.tier.id === t.id;
+                            return `<button type="button" class="btn ${active ? 'btn-primary' : 'btn-ghost'} btn-sm" style="padding:5px 10px;font-size:12px" data-addon-tier="${esc(lid)}" data-tier="${esc(t.id)}">${esc(t.name)} · ${rub(t.pricePerUserYearRub)}/г.</button>`;
+                        }).join('')}
+                    </div>
+                </div>
+
+                <div>
+                    <div class="small muted" style="margin-bottom:6px">3. Срок действия лицензий:</div>
+                    <div style="display:flex;gap:6px;flex-wrap:wrap">
+                        ${yearOpts.map(y => {
+                            const active = q.years === y;
+                            const lbl = y === 1 ? '1 год' : (y < 5 ? `${y} года` : '5 лет');
+                            return `<button type="button" class="btn ${active ? 'btn-primary' : 'btn-ghost'} btn-sm" style="padding:5px 10px;font-size:12px" data-addon-years="${esc(lid)}" data-years="${y}">${lbl}</button>`;
+                        }).join('')}
+                    </div>
+                </div>
+            </div>
+
+            <div id="addonQuoteSummary-${esc(lid)}" style="margin-top:12px;padding:10px 12px;border-radius:8px;background:var(--field);border:1px solid var(--line);display:flex;justify-content:space-between;align-items:center;gap:12px;flex-wrap:wrap">
+                <div class="small">
+                    Выбрано: <b>${q.seats} раб. мест</b> × <b>${q.years} г.</b> · Тариф <b>${esc(q.tier.name)}</b> · Цена за место: <b>${rub(q.perSeat)}</b>${q.disc > 0 ? ` <span class="tag ok" style="margin-left:4px">скидка −${q.disc}% (−${rub(q.saved)})</span>` : ''}
+                </div>
+                <div style="display:flex;align-items:center;gap:8px;flex-wrap:wrap">
+                    <span style="font-size:15px;font-weight:800;margin-right:4px">Итого: ${rub(q.net)}</span>
+                    <button type="button" class="btn btn-primary btn-sm" style="padding:6px 12px;font-size:12.5px" data-submit-addon="${esc(lid)}" data-pay-mode="yookassa">Оплатить ЮKassa</button>
+                    <button type="button" class="btn btn-ghost btn-sm" style="padding:6px 12px;font-size:12.5px" data-submit-addon="${esc(lid)}" data-pay-mode="invoice">Счёт юрлицу</button>
+                </div>
+            </div>
+        </div>`;
+    }
+
     function renderCabinetServers() {
         const box = $('#cabinetServersRegistry');
         if (!box) return;
@@ -495,6 +687,11 @@
             return;
         }
 
+        const savedCompany = cleanCompanyName(currentUser?.companyName);
+        const savedInn = currentUser?.inn || '';
+        const savedKpp = currentUser?.kpp || '';
+        const savedAddr = currentUser?.legalAddress || '';
+
         box.innerHTML = servers.map((s, idx) => {
             const lid = s.licenseId;
             const name = s.serverName || `Сервер WORK #${idx + 1}`;
@@ -516,8 +713,8 @@
             const canDelete = !s.baseActivated && !activeAddons.length && !paidOrders.length;
 
             const baseActionsHtml = !s.baseActivated
-                ? `<button class="btn btn-primary btn-sm" data-buy-for-server="${esc(lid)}" data-buy-variant="license_only">Купить базовую (${rub(D.product?.baseLicensePriceRub || 4_000_000)})</button>
-                   <button class="btn btn-ghost btn-sm" data-buy-for-server="${esc(lid)}" data-buy-variant="pak">Купить ПАК с сервером (${rub(D.product?.basePriceRub || 5_000_000)})</button>`
+                ? `<button type="button" class="btn btn-primary btn-sm" data-buy-for-server="${esc(lid)}" data-buy-variant="license_only">Купить базовую (${rub(D.product?.baseLicensePriceRub || 4_000_000)})</button>
+                   <button type="button" class="btn btn-ghost btn-sm" data-buy-for-server="${esc(lid)}" data-buy-variant="pak">Купить ПАК с сервером (${rub(D.product?.basePriceRub || 5_000_000)})</button>`
                 : '';
 
             const addonsSummaryHtml = activeAddons.length
@@ -530,27 +727,59 @@
             const filesHtml = files.length
                 ? `<div style="margin-top:8px;display:flex;gap:8px;flex-wrap:wrap;align-items:center">
                     <span class="small muted">Файлы лицензий (<code>#system</code>):</span>
-                    ${files.map((f, fIdx) => `<button class="btn btn-ghost btn-sm" style="padding:4px 10px;font-size:12px" data-download-lic="${esc(lid)}" data-file-idx="${fIdx}">↓ ${esc(f.fileName || 'license.lic.json')}</button>`).join('')}
+                    ${files.map((f, fIdx) => `<button type="button" class="btn btn-ghost btn-sm" style="padding:4px 10px;font-size:12px" data-download-lic="${esc(lid)}" data-file-idx="${fIdx}">↓ ${esc(f.fileName || 'license.lic.json')}</button>`).join('')}
                    </div>`
                 : '';
 
+            const addonBuilderHtml = renderServerAddonBuilderHtml(lid, name);
+
             const pendingOrdersHtml = pendingOrders.length
-                ? `<div style="margin-top:10px;padding:10px 12px;border-radius:8px;border:1px solid var(--line-strong);background:color-mix(in srgb, var(--warn) 6%, transparent)">
+                ? `<div style="margin-top:10px;display:flex;flex-direction:column;gap:8px">
                     ${pendingOrders.map(o => {
-                        const title = (o.items && o.items.length) ? o.items.map(it => esc(it.title)).join(' + ') : esc(o.tierName || o.orderId);
-                        return `<div style="display:flex;justify-content:space-between;gap:12px;flex-wrap:wrap;align-items:center">
-                            <div class="small"><b>Ожидает оплаты:</b> ${title} · <b>${rub(o.amountRub)}</b></div>
-                            <div style="display:flex;gap:6px;flex-wrap:wrap">
-                                <button class="btn btn-primary btn-sm" style="padding:5px 10px;font-size:12px" data-pay-order="${esc(o.orderId)}" data-pay-method="yookassa">Оплатить ЮKassa</button>
-                                <button class="btn btn-ghost btn-sm" style="padding:5px 10px;font-size:12px" data-invoice-toggle="${esc(o.orderId)}">Счёт юрлицу</button>
-                                <button class="btn btn-ghost btn-sm" style="padding:5px 10px;font-size:12px;color:var(--danger)" data-cancel-order="${esc(o.orderId)}">Отменить</button>
+                        const summaryHtml = formatOrderSummaryHtml(o);
+                        const ordComp = cleanCompanyName(o.customer?.name) || savedCompany;
+                        const ordInn = o.customer?.inn || savedInn;
+                        const ordKpp = o.customer?.kpp || savedKpp;
+                        const ordAddr = o.customer?.legalAddress || savedAddr;
+                        const isInvOpen = openInvoiceOrderIds.has(o.orderId) || (o.paymentMethod === 'invoice' && (!ordComp || !ordInn));
+                        const hasReadyInvoice = Boolean(o.invoiceNumber && ordComp && ordInn);
+
+                        return `<div style="padding:12px 14px;border-radius:10px;border:1px solid var(--line-strong);background:color-mix(in srgb, var(--warn) 6%, transparent)">
+                            <div style="display:flex;justify-content:space-between;gap:12px;flex-wrap:wrap;align-items:center">
+                                <div class="small"><b>Ожидает оплаты:</b> ${summaryHtml} · <b style="font-size:14px">${rub(o.amountRub)}</b></div>
+                                <div style="display:flex;gap:6px;flex-wrap:wrap;align-items:center">
+                                    <button type="button" class="btn btn-primary btn-sm" style="padding:5px 10px;font-size:12px" data-pay-order="${esc(o.orderId)}" data-pay-method="yookassa">Оплатить ЮKassa</button>
+                                    <button type="button" class="btn ${isInvOpen ? 'btn-primary' : 'btn-ghost'} btn-sm" style="padding:5px 10px;font-size:12px" data-invoice-toggle="${esc(o.orderId)}">Счёт юрлицу</button>
+                                    ${hasReadyInvoice ? `<a class="btn btn-ghost btn-sm" style="padding:5px 10px;font-size:12px;text-decoration:none" href="/api/orders/${encodeURIComponent(o.orderId)}/invoice" target="_blank" rel="noopener">📄 Счёт № ${esc(o.invoiceNumber)} ↗</a>` : ''}
+                                    <button type="button" class="btn btn-ghost btn-sm" style="padding:5px 10px;font-size:12px;color:var(--danger)" data-cancel-order="${esc(o.orderId)}">Отменить</button>
+                                </div>
                             </div>
-                        </div>
-                        <div id="invBox-${esc(o.orderId)}" style="display:none;margin-top:10px;padding-top:10px;border-top:1px solid var(--line)">
-                            <div style="display:flex;gap:8px;flex-wrap:wrap;align-items:center">
-                                <input type="text" id="invCompany-${esc(o.orderId)}" value="${esc(o.customer?.name || currentUser?.companyName || '')}" placeholder="Организация (ООО «Маслоторг»)" style="width:240px;padding:6px 10px;font-size:13px">
-                                <input type="text" id="invInn-${esc(o.orderId)}" value="${esc(o.customer?.inn || currentUser?.inn || '')}" placeholder="ИНН" style="width:150px;padding:6px 10px;font-size:13px">
-                                <button class="btn btn-primary btn-sm" style="padding:6px 12px;font-size:12.5px" data-pay-order="${esc(o.orderId)}" data-pay-method="invoice">Открыть счёт-договор →</button>
+
+                            <div id="invBox-${esc(o.orderId)}" style="display:${isInvOpen ? '' : 'none'};margin-top:12px;padding-top:12px;border-top:1px solid var(--line)">
+                                <div style="display:flex;justify-content:space-between;align-items:center;gap:8px;flex-wrap:wrap;margin-bottom:8px">
+                                    <span class="small"><b>Реквизиты организации (Лицензиата) для выставления счёта-договора:</b> <span class="muted">(автоматически сохраняются в ЛК)</span></span>
+                                    <button type="button" class="btn btn-ghost btn-sm" style="padding:3px 8px;font-size:11.5px" data-cab-tab="requisites">Полные банковские реквизиты →</button>
+                                </div>
+                                <div style="display:grid;grid-template-columns:2fr 1fr 1fr 2fr auto;gap:8px;align-items:end">
+                                    <div class="field" style="margin:0">
+                                        <label style="font-size:11.5px">Организация / ИП *</label>
+                                        <input type="text" id="invCompany-${esc(o.orderId)}" value="${esc(ordComp)}" placeholder="ООО «Маслоторг»" style="padding:6px 10px;font-size:13px">
+                                    </div>
+                                    <div class="field" style="margin:0">
+                                        <label style="font-size:11.5px">ИНН *</label>
+                                        <input type="text" id="invInn-${esc(o.orderId)}" value="${esc(ordInn)}" placeholder="10 или 12 цифр" maxlength="12" style="padding:6px 10px;font-size:13px">
+                                    </div>
+                                    <div class="field" style="margin:0">
+                                        <label style="font-size:11.5px">КПП</label>
+                                        <input type="text" id="invKpp-${esc(o.orderId)}" value="${esc(ordKpp)}" placeholder="9 цифр" maxlength="9" style="padding:6px 10px;font-size:13px">
+                                    </div>
+                                    <div class="field" style="margin:0">
+                                        <label style="font-size:11.5px">Юридический адрес</label>
+                                        <input type="text" id="invAddr-${esc(o.orderId)}" value="${esc(ordAddr)}" placeholder="Город, улица, дом" style="padding:6px 10px;font-size:13px">
+                                    </div>
+                                    <button type="button" class="btn btn-primary btn-sm" style="padding:8px 14px;font-size:12.5px;height:36px;white-space:nowrap" data-pay-order="${esc(o.orderId)}" data-pay-method="invoice">Открыть счёт-договор ↗</button>
+                                </div>
+                                <div id="invErr-${esc(o.orderId)}" class="small" style="color:var(--danger);margin-top:6px;display:none"></div>
                             </div>
                         </div>`;
                     }).join('')}
@@ -566,8 +795,8 @@
                     </div>
                     <div style="display:flex;gap:6px;align-items:center;flex-wrap:wrap">
                         <span class="small muted" style="margin-right:4px">Сессий: <b>${s.totalSeats}</b></span>
-                        <button class="btn btn-ghost btn-sm" style="padding:5px 10px;font-size:12px" data-rename-server="${esc(lid)}" data-current-name="${esc(name)}">Переименовать</button>
-                        ${canDelete ? `<button class="btn btn-ghost btn-sm" style="padding:5px 10px;font-size:12px;color:var(--danger)" data-delete-server="${esc(lid)}">Удалить</button>` : ''}
+                        <button type="button" class="btn btn-ghost btn-sm" style="padding:5px 10px;font-size:12px" data-rename-server="${esc(lid)}" data-current-name="${esc(name)}">Переименовать</button>
+                        ${canDelete ? `<button type="button" class="btn btn-ghost btn-sm" style="padding:5px 10px;font-size:12px;color:var(--danger)" data-delete-server="${esc(lid)}">Удалить</button>` : ''}
                     </div>
                 </div>
 
@@ -575,8 +804,8 @@
                 <div style="display:flex;align-items:center;gap:8px;flex-wrap:wrap;margin-top:10px">
                     <span class="small muted" style="min-width:115px">Токен привязки:</span>
                     <input type="text" id="srvTok-${esc(lid)}" readonly value="${esc(tok)}" style="flex:1;min-width:200px;max-width:440px;padding:6px 10px;font-family:monospace;font-size:12px;border-radius:8px">
-                    <button class="btn btn-primary btn-sm" style="padding:6px 12px;font-size:12px" data-copy-server-token="${esc(lid)}">Скопировать токен</button>
-                    <button class="btn btn-ghost btn-sm" style="padding:6px 10px;font-size:12px" data-regen-server-token="${esc(lid)}">Перевыпустить</button>
+                    <button type="button" class="btn btn-primary btn-sm" style="padding:6px 12px;font-size:12px" data-copy-server-token="${esc(lid)}">Скопировать токен</button>
+                    <button type="button" class="btn btn-ghost btn-sm" style="padding:6px 10px;font-size:12px" data-regen-server-token="${esc(lid)}">Перевыпустить</button>
                     <span class="small" id="srvTokStatus-${esc(lid)}" style="color:var(--ok)"></span>
                 </div>
 
@@ -588,10 +817,11 @@
                     </div>
                     <div style="display:flex;gap:6px;flex-wrap:wrap">
                         ${baseActionsHtml}
-                        <button class="btn btn-ghost btn-sm" style="padding:5px 10px;font-size:12px" data-buy-for-server="${esc(lid)}" data-buy-variant="addons_only">+ Докупить рабочие места</button>
+                        <button type="button" class="btn ${openServerAddonBuilders.has(lid) ? 'btn-primary' : 'btn-ghost'} btn-sm" style="padding:5px 10px;font-size:12px" data-buy-for-server="${esc(lid)}" data-buy-variant="addons_only">+ Докупить рабочие места</button>
                     </div>
                 </div>
 
+                ${addonBuilderHtml}
                 ${filesHtml}
                 ${pendingOrdersHtml}
             </div>`;
@@ -865,10 +1095,13 @@
 
     async function buyForSpecificServer(licenseId, variant = 'license_only') {
         if (variant === 'addons_only') {
-            $$('#segPakVariant button').forEach(b => b.classList.toggle('on', b.dataset.variant === 'addons_only'));
-            syncClientSeats(5);
-            syncClientServerPicker(licenseId);
-            switchStage('clients');
+            if (openServerAddonBuilders.has(licenseId)) {
+                openServerAddonBuilders.delete(licenseId);
+            }
+            else {
+                openServerAddonBuilders.set(licenseId, { seats: 10, tier: 'business', years: 1 });
+            }
+            renderCabinetServers();
             return;
         }
         try {
@@ -883,6 +1116,7 @@
             });
             if (data.user) {
                 currentUser = { ...data.user, sessionKey: currentUser.sessionKey };
+                persistSessionInBrowser(currentUser.sessionKey, currentUser.email, currentUser.isAdmin, currentUser);
                 onAuthenticated();
             }
         }
@@ -891,6 +1125,71 @@
         }
     }
 
+    function updateServerAddonConfig(licenseId, patch = {}, { focusInput = false } = {}) {
+        const prev = openServerAddonBuilders.get(licenseId) || { seats: 10, tier: 'business', years: 1 };
+        const next = {
+            seats: Math.max(1, Math.min(2000, Math.floor(Number(patch.seats ?? prev.seats) || 10))),
+            tier: String(patch.tier ?? prev.tier ?? 'business'),
+            years: Math.max(1, Math.min(5, Math.floor(Number(patch.years ?? prev.years) || 1))),
+        };
+        openServerAddonBuilders.set(licenseId, next);
+        renderCabinetServers();
+        if (focusInput) {
+            const inp = $(`[data-addon-seats-input="${licenseId}"]`);
+            if (inp) {
+                inp.focus();
+                try { inp.setSelectionRange(inp.value.length, inp.value.length); } catch { /* ignore */ }
+            }
+        }
+    }
+
+    async function submitServerAddonOrder(licenseId, payMode = 'yookassa') {
+        const cfg = openServerAddonBuilders.get(licenseId) || { seats: 10, tier: 'business', years: 1 };
+        const q = calcInlineAddonQuote(cfg);
+        const isDirectInvoice = payMode === 'invoice' && Boolean(cleanCompanyName(currentUser?.companyName) && currentUser?.inn);
+        const popupWin = isDirectInvoice ? window.open('about:blank', '_blank') : null;
+        try {
+            const data = await api('/api/cabinet/orders/draft', {
+                sessionKey: currentUser?.sessionKey || '',
+                licenseId,
+                includeBasePak: false,
+                includeBaseLicenseOnly: false,
+                tier: q.tier.id,
+                addonSeats: q.seats,
+                years: q.years,
+                paymentMethod: payMode === 'invoice' ? 'invoice' : 'yookassa',
+            });
+            openServerAddonBuilders.delete(licenseId);
+            if (data.user) {
+                currentUser = { ...data.user, sessionKey: currentUser.sessionKey };
+                persistSessionInBrowser(currentUser.sessionKey, currentUser.email, currentUser.isAdmin, currentUser);
+            }
+            const createdOrderId = data.order?.orderId;
+            if (payMode === 'invoice' && createdOrderId) {
+                openInvoiceOrderIds.add(createdOrderId);
+                onAuthenticated();
+                if (isDirectInvoice && (data.invoiceUrl || data.order?.invoiceUrl)) {
+                    const invUrl = data.invoiceUrl || data.order.invoiceUrl;
+                    if (popupWin) popupWin.location.href = invUrl;
+                    else window.open(invUrl, '_blank');
+                }
+                else {
+                    if (popupWin) popupWin.close();
+                    setTimeout(() => $(`#invCompany-${createdOrderId}`)?.focus(), 40);
+                }
+                return;
+            }
+            onAuthenticated();
+            if (payMode === 'yookassa' && createdOrderId) {
+                await payCabinetOrder(createdOrderId, 'yookassa');
+            }
+        }
+        catch (err) {
+            if (popupWin) popupWin.close();
+            alert(err.message);
+        }
+    }
+
     async function payFranchiseInstallment(reservationId, { monthNumber = null, earlyPayoff = false, paymentMethod = 'yookassa' } = {}) {
         try {
             const data = await api('/api/cabinet/franchises/pay-installment', {
@@ -1046,16 +1345,38 @@
         if (!orderId) return;
         let companyName = '';
         let inn = '';
+        let kpp = '';
+        let legalAddress = '';
+        const errBox = $(`#invErr-${orderId}`);
+        if (errBox) {
+            errBox.style.display = 'none';
+            errBox.textContent = '';
+        }
+
         if (paymentMethod === 'invoice') {
-            companyName = $(`#invCompany-${orderId}`)?.value.trim() || currentUser?.companyName || '';
+            openInvoiceOrderIds.add(orderId);
+            const invBox = $(`#invBox-${orderId}`);
+            if (invBox) invBox.style.display = '';
+            companyName = cleanCompanyName($(`#invCompany-${orderId}`)?.value) || cleanCompanyName(currentUser?.companyName);
             inn = $(`#invInn-${orderId}`)?.value.trim() || currentUser?.inn || '';
+            kpp = $(`#invKpp-${orderId}`)?.value.trim() || currentUser?.kpp || '';
+            legalAddress = $(`#invAddr-${orderId}`)?.value.trim() || currentUser?.legalAddress || '';
+
             if (!companyName || !inn) {
-                const invBox = $(`#invBox-${orderId}`);
-                if (invBox) invBox.style.display = '';
-                $(`#invCompany-${orderId}`)?.focus();
+                if (errBox) {
+                    errBox.style.display = '';
+                    errBox.textContent = !companyName
+                        ? 'Укажите наименование организации или ИП (например, ООО «Маслоторг») для выставления счёта-договора.'
+                        : 'Укажите ИНН организации (10 или 12 цифр) для выставления счёта-договора.';
+                }
+                (!companyName ? $(`#invCompany-${orderId}`) : $(`#invInn-${orderId}`))?.focus();
                 return;
             }
         }
+
+        // Открываем вкладку синхронно в момент клика пользователя (до await), чтобы браузер не блокировал окно
+        const popupWin = window.open('about:blank', '_blank');
+
         try {
             const data = await api('/api/cabinet/orders/pay', {
                 sessionKey: currentUser?.sessionKey || '',
@@ -1063,16 +1384,32 @@
                 paymentMethod,
                 companyName,
                 inn,
+                kpp,
+                legalAddress,
             });
             if (data.user) {
-                currentUser = { ...data.user, sessionKey: currentUser.sessionKey };
+                currentUser = { ...data.user, sessionKey: data.user.sessionKey || currentUser.sessionKey };
+                persistSessionInBrowser(currentUser.sessionKey, currentUser.email, currentUser.isAdmin, currentUser);
                 onAuthenticated();
             }
-            const url = data.invoiceUrl || data.confirmationUrl;
-            if (url) window.open(url, '_blank', 'noopener');
+            const url = data.invoiceUrl || data.confirmationUrl || (paymentMethod === 'invoice' ? `/api/orders/${encodeURIComponent(orderId)}/invoice` : '');
+            if (url) {
+                if (popupWin) popupWin.location.href = url;
+                else location.href = url;
+            }
+            else if (popupWin) {
+                popupWin.close();
+            }
         }
         catch (err) {
-            alert(err.message);
+            if (popupWin) popupWin.close();
+            if (errBox) {
+                errBox.style.display = '';
+                errBox.textContent = err.message;
+            }
+            else {
+                alert(err.message);
+            }
         }
     }
 
@@ -1766,15 +2103,26 @@
     /* ================= Привязка событий ================= */
     function bind() {
         document.addEventListener('click', (e) => {
-            const el = e.target.closest('[data-stage],[data-cab-tab],[data-action],[data-reserve],[data-pay-order],[data-invoice-toggle],[data-cancel-order],[data-copy-server-token],[data-regen-server-token],[data-rename-server],[data-delete-server],[data-download-lic],[data-buy-for-server],[data-pay-installment],[data-cancel-franchise],[data-ask],[data-district],th[data-sort],#regionsTableBody tr');
+            const el = e.target.closest('[data-stage],[data-cab-tab],[data-action],[data-reserve],[data-pay-order],[data-invoice-toggle],[data-cancel-order],[data-copy-server-token],[data-regen-server-token],[data-rename-server],[data-delete-server],[data-download-lic],[data-buy-for-server],[data-close-addon-builder],[data-addon-preset],[data-addon-tier],[data-addon-years],[data-submit-addon],[data-pay-installment],[data-cancel-franchise],[data-ask],[data-district],th[data-sort],#regionsTableBody tr');
             if (!el) return;
             if (el.matches('[data-cab-tab]')) { e.preventDefault(); switchCabinetTab(el.dataset.cabTab); return; }
             if (el.matches('[data-reserve]')) { e.stopPropagation(); reserveRegionFranchise(el.dataset.reserve); return; }
             if (el.matches('[data-pay-order]')) { e.stopPropagation(); payCabinetOrder(el.dataset.payOrder, el.dataset.payMethod || 'yookassa'); return; }
             if (el.matches('[data-invoice-toggle]')) {
                 e.stopPropagation();
-                const box = $(`#invBox-${el.dataset.invoiceToggle}`);
-                if (box) box.style.display = box.style.display === 'none' ? '' : 'none';
+                const oid = el.dataset.invoiceToggle;
+                const box = $(`#invBox-${oid}`);
+                if (box) {
+                    const nextVisible = box.style.display === 'none';
+                    box.style.display = nextVisible ? '' : 'none';
+                    if (nextVisible) {
+                        openInvoiceOrderIds.add(oid);
+                        setTimeout(() => $(`#invCompany-${oid}`)?.focus(), 30);
+                    }
+                    else {
+                        openInvoiceOrderIds.delete(oid);
+                    }
+                }
                 return;
             }
             if (el.matches('[data-cancel-order]')) { e.stopPropagation(); cancelCabinetOrder(el.dataset.cancelOrder); return; }
@@ -1784,6 +2132,32 @@
             if (el.matches('[data-delete-server]')) { e.stopPropagation(); deleteCabinetServer(el.dataset.deleteServer); return; }
             if (el.matches('[data-download-lic]')) { e.stopPropagation(); downloadServerLicFile(el.dataset.downloadLic, el.dataset.fileIdx || 0); return; }
             if (el.matches('[data-buy-for-server]')) { e.stopPropagation(); buyForSpecificServer(el.dataset.buyForServer, el.dataset.buyVariant || 'license_only'); return; }
+            if (el.matches('[data-close-addon-builder]')) {
+                e.stopPropagation();
+                openServerAddonBuilders.delete(el.dataset.closeAddonBuilder);
+                renderCabinetServers();
+                return;
+            }
+            if (el.matches('[data-addon-preset]')) {
+                e.stopPropagation();
+                updateServerAddonConfig(el.dataset.addonPreset, { seats: Number(el.dataset.seats || 10) });
+                return;
+            }
+            if (el.matches('[data-addon-tier]')) {
+                e.stopPropagation();
+                updateServerAddonConfig(el.dataset.addonTier, { tier: el.dataset.tier || 'business' });
+                return;
+            }
+            if (el.matches('[data-addon-years]')) {
+                e.stopPropagation();
+                updateServerAddonConfig(el.dataset.addonYears, { years: Number(el.dataset.years || 1) });
+                return;
+            }
+            if (el.matches('[data-submit-addon]')) {
+                e.stopPropagation();
+                submitServerAddonOrder(el.dataset.submitAddon, el.dataset.payMode || 'yookassa');
+                return;
+            }
             if (el.matches('[data-pay-installment]')) {
                 e.stopPropagation();
                 payFranchiseInstallment(el.dataset.payInstallment, {
@@ -1841,6 +2215,7 @@
                     break;
                 case 'buy-client-config': buyClientConfig(); break;
                 case 'create-server': createCabinetServer(); break;
+                case 'save-requisites': saveCabinetRequisites(); break;
                 case 'gen-hub-token': generateCabinetToken(); break;
                 case 'refresh-cabinet': refreshCabinetUser(); break;
                 case 'reserve-selected': reserveRegionFranchise(selectedCode); break;
@@ -1864,6 +2239,31 @@
                 else sendAuthCode();
             }
         });
+        document.addEventListener('input', (e) => {
+            const inp = e.target.closest?.('[data-addon-seats-input]');
+            if (!inp) return;
+            const lid = inp.dataset.addonSeatsInput;
+            const prev = openServerAddonBuilders.get(lid) || { seats: 10, tier: 'business', years: 1 };
+            const seats = Math.max(1, Math.min(2000, Math.floor(Number(inp.value) || 1)));
+            prev.seats = seats;
+            openServerAddonBuilders.set(lid, prev);
+            const q = calcInlineAddonQuote(prev);
+            const sumBox = $(`#addonQuoteSummary-${lid}`);
+            if (sumBox) {
+                sumBox.innerHTML = `<div class="small">
+                    Выбрано: <b>${q.seats} раб. мест</b> × <b>${q.years} г.</b> · Тариф <b>${esc(q.tier.name)}</b> · Цена за место: <b>${rub(q.perSeat)}</b>${q.disc > 0 ? ` <span class="tag ok" style="margin-left:4px">скидка −${q.disc}% (−${rub(q.saved)})</span>` : ''}
+                </div>
+                <div style="display:flex;align-items:center;gap:8px;flex-wrap:wrap">
+                    <span style="font-size:15px;font-weight:800;margin-right:4px">Итого: ${rub(q.net)}</span>
+                    <button type="button" class="btn btn-primary btn-sm" style="padding:6px 12px;font-size:12.5px" data-submit-addon="${esc(lid)}" data-pay-mode="yookassa">Оплатить ЮKassa</button>
+                    <button type="button" class="btn btn-ghost btn-sm" style="padding:6px 12px;font-size:12.5px" data-submit-addon="${esc(lid)}" data-pay-mode="invoice">Счёт юрлицу</button>
+                </div>`;
+            }
+            $$(`[data-addon-preset="${lid}"]`).forEach(btn => {
+                btn.classList.toggle('btn-primary', Number(btn.dataset.seats) === q.seats);
+                btn.classList.toggle('btn-ghost', Number(btn.dataset.seats) !== q.seats);
+            });
+        });
         $('#aiInput')?.addEventListener('keydown', (e) => { if (e.key === 'Enter') sendAi(); });
         $('#inpPakExtraSeats')?.addEventListener('input', (e) => syncClientSeats(e.target.value));
         $('#inpPakExtraSeatsNum')?.addEventListener('input', (e) => syncClientSeats(e.target.value));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "work-license-server",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Лицензионный сервер, биллинг ЮKassa, боты поддержки (MAX, Telegram, VK) и лендинг ПАК WORK (work.odant.org)",
   "type": "module",
   "main": "src/index.js",

package/src/catalog.js

@@ -315,7 +315,7 @@ export function calculateOrderQuote({
         const discSuffix = volumeDiscountPercent > 0 ? `, скидка −${volumeDiscountPercent}% за объём` : '';
         items.push({
             sku: `WORK-LIC-ADDON-${tierSpec.id.toUpperCase()}`,
-            title: `Годовая лицензия ODANT-WORK на доп. рабочее место (уровень ${tierSpec.name}, ${periodYears} г.${discSuffix})`,
+            title: `Дополнительные лицензии ODANT-WORK: ${seats} раб. мест × ${periodYears} г. (уровень ${tierSpec.name}, ${effectiveUnitPriceRub.toLocaleString('ru-RU')} ₽/место${discSuffix})`,
             quantity: seats,
             unitPriceRub: effectiveUnitPriceRub,
             totalRub: addonsAmountRub,

package/src/landing.js

@@ -343,6 +343,8 @@ export function renderLandingPage({ publicKey = '', regions = null, assetVersion
                 <aside class="sec-nav" aria-label="Разделы Личного кабинета">
                     <button type="button" class="sec-nav-item active" data-cab-tab="servers" id="navCabServers">Серверы и устройства (0)</button>
                     <button type="button" class="sec-nav-item" data-cab-tab="franchises" id="navCabFranchises">Региональные франшизы (0)</button>
+                    <div class="sec-nav-sep"></div>
+                    <button type="button" class="sec-nav-item" data-cab-tab="requisites" id="navCabRequisites">Реквизиты организации</button>
                 </aside>
 
                 <div class="sec-main">
@@ -368,6 +370,77 @@ export function renderLandingPage({ publicKey = '', regions = null, assetVersion
                         </div>
                         <div class="sec-box" id="cabinetFranchisesRegistry"></div>
                     </div>
+
+                    <!-- 1.3 РЕКВИЗИТЫ ОРГАНИЗАЦИИ (ЮРЛИЦА / ИП) ДЛЯ СЧЕТОВ И ДОГОВОРОВ -->
+                    <div id="cabSecRequisites" style="display:none">
+                        <div class="sec-bar" style="margin-bottom:12px">
+                            <h2 class="sec-title">Реквизиты организации (Лицензиата)</h2>
+                            <div class="sec-controls">
+                                <button type="button" class="btn btn-primary btn-sm" data-action="save-requisites">Сохранить реквизиты</button>
+                            </div>
+                        </div>
+                        <div class="sec-box">
+                            <div class="sec-item">
+                                <div class="small muted" style="margin-bottom:14px">
+                                    Сохранённые реквизиты автоматически подставляются во все счета-договоры и закрывающие документы в Личном кабинете.
+                                </div>
+                                <div class="grid g2" style="gap:14px">
+                                    <div class="field" style="margin:0">
+                                        <label for="reqCompanyName">Наименование организации / ИП *</label>
+                                        <input type="text" id="reqCompanyName" placeholder="ООО «Маслоторг»">
+                                    </div>
+                                    <div style="display:grid;grid-template-columns:1fr 1fr;gap:10px">
+                                        <div class="field" style="margin:0">
+                                            <label for="reqInn">ИНН *</label>
+                                            <input type="text" id="reqInn" placeholder="10 или 12 цифр" maxlength="12">
+                                        </div>
+                                        <div class="field" style="margin:0">
+                                            <label for="reqKpp">КПП (для ООО)</label>
+                                            <input type="text" id="reqKpp" placeholder="9 цифр" maxlength="9">
+                                        </div>
+                                    </div>
+                                    <div class="field" style="margin:0;grid-column:1 / -1">
+                                        <label for="reqLegalAddress">Юридический адрес</label>
+                                        <input type="text" id="reqLegalAddress" placeholder="Индекс, город, улица, дом, офис">
+                                    </div>
+                                    <div class="field" style="margin:0">
+                                        <label for="reqSignerPosition">Должность руководителя (подписанта)</label>
+                                        <input type="text" id="reqSignerPosition" placeholder="Генеральный директор">
+                                    </div>
+                                    <div class="field" style="margin:0">
+                                        <label for="reqSignerName">ФИО руководителя (подписанта)</label>
+                                        <input type="text" id="reqSignerName" placeholder="Иванов Иван Иванович">
+                                    </div>
+                                    <div class="field" style="margin:0">
+                                        <label for="reqBankName">Наименование банка</label>
+                                        <input type="text" id="reqBankName" placeholder="ПАО Сбербанк">
+                                    </div>
+                                    <div style="display:grid;grid-template-columns:1fr 1fr;gap:10px">
+                                        <div class="field" style="margin:0">
+                                            <label for="reqBik">БИК</label>
+                                            <input type="text" id="reqBik" placeholder="9 цифр" maxlength="9">
+                                        </div>
+                                        <div class="field" style="margin:0">
+                                            <label for="reqPhone">Контактный телефон</label>
+                                            <input type="text" id="reqPhone" placeholder="+7 (___) ___-__-__">
+                                        </div>
+                                    </div>
+                                    <div class="field" style="margin:0">
+                                        <label for="reqBankAccount">Расчётный счёт (р/с)</label>
+                                        <input type="text" id="reqBankAccount" placeholder="40702810..." maxlength="20">
+                                    </div>
+                                    <div class="field" style="margin:0">
+                                        <label for="reqCorrAccount">Корреспондентский счёт (к/с)</label>
+                                        <input type="text" id="reqCorrAccount" placeholder="30101810..." maxlength="20">
+                                    </div>
+                                </div>
+                                <div style="display:flex;align-items:center;justify-content:space-between;margin-top:16px;gap:12px;flex-wrap:wrap">
+                                    <div class="small" id="reqSaveStatus" style="color:var(--ok);font-weight:600"></div>
+                                    <button type="button" class="btn btn-primary" data-action="save-requisites">Сохранить реквизиты в Личном кабинете</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </section>

package/src/server.js

@@ -539,6 +539,14 @@ export function createLicenseServerApp(options = {}) {
                 return sendJson(res, 200, result);
             }
 
+            if (req.method === 'POST' && pathname === '/api/cabinet/profile') {
+                const body = await readJsonBody(req);
+                const key = extractBearerToken(req, body, url) || body.email || body.accountId || '';
+                const user = store.updateUserProfile(key, body);
+                res.setHeader('Set-Cookie', `odant_work_session=${encodeURIComponent(user.sessionKey)}; Path=/; Max-Age=31536000; SameSite=Lax`);
+                return sendJson(res, 200, { ok: true, user });
+            }
+
             if (req.method === 'POST' && pathname === '/api/auth/accept-oferta') {
                 const body = await readJsonBody(req);
                 const key = extractBearerToken(req, body, url) || body.email || '';
@@ -641,8 +649,16 @@ export function createLicenseServerApp(options = {}) {
                         createNewServer: Boolean(body.createNewServer || body.licenseId === 'NEW'),
                         ownerAccountId: user?.userId || '',
                         customer: {
-                            name: body.customer?.name || user?.companyName || user?.email || '',
+                            name: body.customer?.name || user?.companyName || '',
                             inn: body.customer?.inn || user?.inn || '',
+                            kpp: body.customer?.kpp || user?.kpp || '',
+                            legalAddress: body.customer?.legalAddress || user?.legalAddress || '',
+                            signerName: body.customer?.signerName || user?.signerName || '',
+                            signerPosition: body.customer?.signerPosition || user?.signerPosition || '',
+                            bankName: body.customer?.bankName || user?.bankName || '',
+                            bik: body.customer?.bik || user?.bik || '',
+                            bankAccount: body.customer?.bankAccount || user?.bankAccount || '',
+                            corrAccount: body.customer?.corrAccount || user?.corrAccount || '',
                             email: body.customer?.email || user?.email || '',
                             phone: body.customer?.phone || user?.phone || '',
                         },
@@ -652,6 +668,10 @@ export function createLicenseServerApp(options = {}) {
                 return sendJson(res, 200, {
                     ok: true,
                     ...(payment || {}),
+                    ...(order?.paymentMethod === 'invoice' ? {
+                        invoiceUrl: `${reqOrigin}${order.invoiceUrl}`,
+                        confirmationUrl: `${reqOrigin}${order.invoiceUrl}`,
+                    } : {}),
                     order,
                     reservation,
                     user: updatedUser,
@@ -715,8 +735,20 @@ export function createLicenseServerApp(options = {}) {
                     paymentMethod: body.paymentMethod || 'yookassa',
                     companyName: body.companyName || user?.companyName || '',
                     inn: body.inn || user?.inn || '',
+                    kpp: body.kpp ?? user?.kpp ?? '',
+                    legalAddress: body.legalAddress ?? user?.legalAddress ?? '',
+                    signerName: body.signerName ?? user?.signerName ?? '',
+                    signerPosition: body.signerPosition ?? user?.signerPosition ?? '',
+                    bankName: body.bankName ?? user?.bankName ?? '',
+                    bik: body.bik ?? user?.bik ?? '',
+                    bankAccount: body.bankAccount ?? user?.bankAccount ?? '',
+                    corrAccount: body.corrAccount ?? user?.corrAccount ?? '',
+                    phone: body.phone ?? user?.phone ?? '',
                 });
                 const updatedUser = store.findUserBySessionKey(user?.sessionKey);
+                if (updatedUser?.sessionKey) {
+                    res.setHeader('Set-Cookie', `odant_work_session=${encodeURIComponent(updatedUser.sessionKey)}; Path=/; Max-Age=31536000; SameSite=Lax`);
+                }
                 if (order.paymentMethod === 'invoice') {
                     return sendJson(res, 200, {
                         ok: true,

package/src/store.js

@@ -789,10 +789,16 @@ export class LicenseStore {
             contractNumber: method === 'invoice' ? `ДОГ-${dateTag}-${shortRand}` : '',
             invoiceUrl: method === 'invoice' ? `/api/orders/${orderId}/invoice` : '',
             customer: {
-                name: customer.name || targetLic.customer?.name || 'Организация WORK',
+                name: (customer.name && !String(customer.name).includes('@')) ? customer.name : ((targetLic.customer?.name && !String(targetLic.customer.name).includes('@')) ? targetLic.customer.name : ''),
                 inn: customer.inn || targetLic.customer?.inn || '',
-                kpp: customer.kpp || '',
-                legalAddress: customer.legalAddress || '',
+                kpp: customer.kpp || targetLic.customer?.kpp || '',
+                legalAddress: customer.legalAddress || targetLic.customer?.legalAddress || '',
+                signerName: customer.signerName || targetLic.customer?.signerName || '',
+                signerPosition: customer.signerPosition || targetLic.customer?.signerPosition || '',
+                bankName: customer.bankName || targetLic.customer?.bankName || '',
+                bik: customer.bik || targetLic.customer?.bik || '',
+                bankAccount: customer.bankAccount || targetLic.customer?.bankAccount || '',
+                corrAccount: customer.corrAccount || targetLic.customer?.corrAccount || '',
                 email: customer.email || targetLic.customer?.email || 'billing@odant.org',
                 phone: customer.phone || targetLic.customer?.phone || '',
             },
@@ -977,11 +983,13 @@ export class LicenseStore {
         if (!ord)
             return null;
         const dateStr = new Date(ord.createdAt || Date.now()).toLocaleDateString('ru-RU');
+        const c = ord.customer || {};
+        const custName = (c.name && !String(c.name).includes('@')) ? c.name : 'Организация (не указана)';
         const rowsHtml = (ord.items || []).map((it, idx) => `
             <tr>
                 <td style="text-align:center;">${idx + 1}</td>
                 <td>${it.title}</td>
-                <td style="text-align:center;">${it.quantity}</td>
+                <td style="text-align:center;font-weight:700;">${it.quantity}</td>
                 <td style="text-align:right;">${Number(it.unitPriceRub || 0).toLocaleString('ru-RU')} ₽</td>
                 <td style="text-align:right;font-weight:700;">${Number(it.totalRub || 0).toLocaleString('ru-RU')} ₽</td>
             </tr>
@@ -993,50 +1001,81 @@ export class LicenseStore {
     <meta charset="utf-8">
     <title>Счёт-договор № ${ord.invoiceNumber || ord.orderId} от ${dateStr}</title>
     <style>
-        body { font-family: Arial, sans-serif; color: #111827; max-width: 860px; margin: 24px auto; padding: 20px; line-height: 1.45; }
-        h1 { font-size: 20px; margin-bottom: 6px; }
+        body { font-family: Arial, sans-serif; color: #111827; max-width: 880px; margin: 20px auto; padding: 20px; line-height: 1.45; }
+        h1 { font-size: 20px; margin: 0 0 4px; }
         table { width: 100%; border-collapse: collapse; margin: 16px 0; font-size: 13px; }
         th, td { border: 1px solid #cbd5e1; padding: 8px 10px; }
         th { background: #f1f5f9; text-align: left; }
-        .meta { background: #f8fafc; border: 1px solid #e2e8f0; border-radius: 8px; padding: 12px 16px; font-size: 13px; }
-        .status { display: inline-block; padding: 4px 10px; border-radius: 999px; font-size: 12px; font-weight: 700; background: ${ord.status === 'paid' ? '#dcfce7' : '#fef3c7'}; color: ${ord.status === 'paid' ? '#166534' : '#92400e'}; }
+        .meta { background: #f8fafc; border: 1px solid #e2e8f0; border-radius: 8px; padding: 14px 16px; font-size: 13px; }
+        .status { display: inline-block; padding: 5px 12px; border-radius: 999px; font-size: 12px; font-weight: 700; background: ${ord.status === 'paid' ? '#dcfce7' : '#fef3c7'}; color: ${ord.status === 'paid' ? '#166534' : '#92400e'}; }
+        .toolbar { display: flex; justify-content: space-between; align-items: center; background: #0f172a; color: #f8fafc; padding: 10px 16px; border-radius: 10px; margin-bottom: 18px; }
+        .toolbar button { background: #2563eb; color: #fff; border: none; border-radius: 6px; padding: 8px 14px; font-size: 13px; font-weight: 700; cursor: pointer; }
+        .toolbar button.sec { background: #334155; margin-left: 8px; }
+        .sig-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 24px; margin-top: 28px; font-size: 13px; }
+        .sig-box { border-top: 1px solid #cbd5e1; padding-top: 10px; }
+        @media print { .no-print { display: none !important; } body { margin: 0; padding: 10px; } }
     </style>
 </head>
 <body>
-    <div style="display:flex;justify-content:space-between;align-items:center;">
+    <div class="toolbar no-print">
+        <div style="font-size:13.5px;font-weight:700;">Счёт-договор № ${ord.invoiceNumber || ord.orderId} · ODANT-WORK</div>
+        <div>
+            <button type="button" onclick="window.print()">Печать / Сохранить в PDF</button>
+            <button type="button" class="sec" onclick="window.close()">Закрыть вкладку</button>
+        </div>
+    </div>
+    <div style="display:flex;justify-content:space-between;align-items:flex-start;gap:16px;">
         <div>
             <h1>Счёт-договор № ${ord.invoiceNumber || ord.orderId} от ${dateStr}</h1>
-            <div>Договор № ${ord.contractNumber || ord.orderId} · Заказ № ${ord.orderId}</div>
+            <div style="font-size:13px;color:#475569;">Договор № ${ord.contractNumber || ord.orderId} · Заказ № ${ord.orderId} · Сервер: ${ord.licenseId || '—'}</div>
         </div>
         <span class="status">${ord.status === 'paid' ? 'ОПЛАЧЕН' : 'ОЖИДАЕТ ОПЛАТЫ ПО СЧЁТУ'}</span>
     </div>
     <div class="meta" style="margin-top:14px;">
-        <div><strong>Поставщик (Правообладатель):</strong> ООО «${VENDOR_CONTACTS.company}», адрес: ${VENDOR_CONTACTS.address}, тел.: ${VENDOR_CONTACTS.phones.join(', ')}</div>
-        <div style="margin-top:6px;"><strong>Покупатель (Лицензиат):</strong> ${ord.customer?.name || '—'}, ИНН: ${ord.customer?.inn || '—'}${ord.customer?.kpp ? ', КПП: ' + ord.customer.kpp : ''}, Email: ${ord.customer?.email || '—'}</div>
+        <div><strong>Поставщик (Лицензиар):</strong> ООО «${VENDOR_CONTACTS.company}», адрес: ${VENDOR_CONTACTS.address}, тел.: ${VENDOR_CONTACTS.phones.join(', ')}</div>
+        <div style="margin-top:8px;">
+            <strong>Покупатель (Лицензиат):</strong> ${custName}, ИНН: ${c.inn || '—'}${c.kpp ? ', КПП: ' + c.kpp : ''}
+            ${c.legalAddress ? `<br><strong>Юридический адрес:</strong> ${c.legalAddress}` : ''}
+            ${c.bankName || c.bankAccount ? `<br><strong>Банковские реквизиты:</strong> р/с ${c.bankAccount || '—'} в ${c.bankName || '—'}${c.bik ? ', БИК ' + c.bik : ''}${c.corrAccount ? ', к/с ' + c.corrAccount : ''}` : ''}
+            ${c.signerName ? `<br><strong>Уполномоченное лицо:</strong> ${c.signerPosition ? c.signerPosition + ' ' : ''}${c.signerName}` : ''}
+            <br><strong>Контакты:</strong> Email: ${c.email || '—'}${c.phone ? ', тел.: ' + c.phone : ''}
+        </div>
     </div>
     <table>
         <thead>
             <tr>
                 <th style="width:40px;">№</th>
-                <th>Наименование товара / лицензии / услуги</th>
-                <th style="width:70px;">Кол-во</th>
-                <th style="width:130px;">Цена</th>
-                <th style="width:140px;">Сумма</th>
+                <th>Наименование лицензии / программно-аппаратного комплекса / услуги</th>
+                <th style="width:85px;text-align:center;">Кол-во мест / шт.</th>
+                <th style="width:130px;text-align:right;">Цена за ед.</th>
+                <th style="width:140px;text-align:right;">Сумма</th>
             </tr>
         </thead>
         <tbody>${rowsHtml}</tbody>
         <tfoot>
             <tr>
-                <td colspan="4" style="text-align:right;font-weight:700;">ИТОГО К ОПЛАТЕ (без НДС):</td>
+                <td colspan="4" style="text-align:right;font-weight:700;">ИТОГО К ОПЛАТЕ (НДС не облагается на основании пп. 26 п. 2 ст. 149 НК РФ / УСН):</td>
                 <td style="text-align:right;font-weight:800;font-size:15px;">${Number(ord.amountRub || 0).toLocaleString('ru-RU')} ₽</td>
             </tr>
         </tfoot>
     </table>
     <p style="font-size:12.5px;color:#475569;">
-        Оплата настоящего счёта-договора означает полное согласие Лицензиата с условиями Публичной оферты ODANT-WORK.
-        После зачисления средств лицензии автоматически формируются в личном кабинете владельца (${ord.customer?.email || ''})
-        и загружаются локальной системой по привязанному токену.
+        1. Оплата настоящего счёта-договора означает акцепт Лицензиатом условий Публичного договора-оферты ODANT-WORK (${PUBLIC_OFERTA.version}).<br>
+        2. В назначении платежа обязательно укажите: «Оплата по счёту-договору № ${ord.invoiceNumber || ord.orderId} от ${dateStr} за лицензии ODANT-WORK (заказ ${ord.orderId}). Без НДС».<br>
+        3. После зачисления средств файлы лицензий (<code>.lic.json</code>) автоматически активируются в Личном кабинете (${c.email || ''}) для сервера <code>${ord.licenseId || ''}</code>.
     </p>
+    <div class="sig-grid">
+        <div class="sig-box">
+            <strong>От Поставщика (Лицензиара):</strong><br>
+            ООО «${VENDOR_CONTACTS.company}»<br><br>
+            ______________________ / Руководитель /
+        </div>
+        <div class="sig-box">
+            <strong>От Покупателя (Лицензиата):</strong><br>
+            ${custName}<br><br>
+            ______________________ / ${c.signerName || 'Руководитель'} /
+        </div>
+    </div>
 </body>
 </html>`;
     }
@@ -1295,8 +1334,10 @@ export class LicenseStore {
             ownerEmail: user.email,
             hubUrl: hubUrl || user.hubUrl || 'https://work.odant.org',
             customer: {
-                name: user.companyName || user.name || user.email,
+                name: (user.companyName && !String(user.companyName).includes('@')) ? user.companyName : '',
                 inn: user.inn || '',
+                kpp: user.kpp || '',
+                legalAddress: user.legalAddress || '',
                 email: user.email,
                 phone: user.phone || '',
             },
@@ -1452,6 +1493,7 @@ export class LicenseStore {
             .sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
         const userFranchises = this.listUserFranchises(user, now);
         const userServers = this.listUserServers(user, now);
+        const cleanCompany = (user.companyName && !String(user.companyName).includes('@')) ? user.companyName : '';
         return {
             userId: user.userId,
             email: user.email,
@@ -1460,8 +1502,16 @@ export class LicenseStore {
             authProvider: user.authProvider || 'email',
             name: user.name,
             position: user.position || '',
-            companyName: user.companyName,
-            inn: user.inn,
+            companyName: cleanCompany,
+            inn: user.inn || '',
+            kpp: user.kpp || '',
+            legalAddress: user.legalAddress || '',
+            signerName: user.signerName || '',
+            signerPosition: user.signerPosition || user.position || '',
+            bankName: user.bankName || '',
+            bik: user.bik || '',
+            bankAccount: user.bankAccount || '',
+            corrAccount: user.corrAccount || '',
             phone: user.phone || '',
             licenseId: user.licenseId,
             sessionKey: user.sessionKey,
@@ -1483,6 +1533,89 @@ export class LicenseStore {
         };
     }
 
+    /**
+     * Обновить и сохранить реквизиты организации (юридического лица / ИП) в профиле Личного кабинета.
+     */
+    updateUserProfile(sessionKeyOrEmail = '', {
+        companyName = undefined,
+        inn = undefined,
+        kpp = undefined,
+        legalAddress = undefined,
+        signerName = undefined,
+        signerPosition = undefined,
+        bankName = undefined,
+        bik = undefined,
+        bankAccount = undefined,
+        corrAccount = undefined,
+        phone = undefined,
+    } = {}) {
+        const user = this._findUser(sessionKeyOrEmail);
+        if (!user)
+            throw new Error('Пользователь не найден. Пожалуйста, войдите в Личный кабинет.');
+        if (companyName !== undefined) {
+            const c = String(companyName || '').trim();
+            user.companyName = c.includes('@') ? '' : c;
+        }
+        if (inn !== undefined) user.inn = String(inn || '').trim();
+        if (kpp !== undefined) user.kpp = String(kpp || '').trim();
+        if (legalAddress !== undefined) user.legalAddress = String(legalAddress || '').trim();
+        if (signerName !== undefined) user.signerName = String(signerName || '').trim();
+        if (signerPosition !== undefined) {
+            user.signerPosition = String(signerPosition || '').trim();
+            user.position = user.signerPosition;
+        }
+        if (bankName !== undefined) user.bankName = String(bankName || '').trim();
+        if (bik !== undefined) user.bik = String(bik || '').trim();
+        if (bankAccount !== undefined) user.bankAccount = String(bankAccount || '').trim();
+        if (corrAccount !== undefined) user.corrAccount = String(corrAccount || '').trim();
+        if (phone !== undefined) user.phone = String(phone || '').trim();
+
+        // Синхронизируем реквизиты со всеми серверами и неоплаченными заказами этого клиента
+        for (const lic of Object.values(this.state.licenses || {})) {
+            if (!lic) continue;
+            if (lic.ownerAccountId === user.userId || String(lic.ownerEmail || '').toLowerCase() === user.email) {
+                lic.customer = lic.customer || {};
+                if (user.companyName) lic.customer.name = user.companyName;
+                if (user.inn) lic.customer.inn = user.inn;
+                if (user.kpp !== undefined) lic.customer.kpp = user.kpp;
+                if (user.legalAddress !== undefined) lic.customer.legalAddress = user.legalAddress;
+                if (user.phone !== undefined) lic.customer.phone = user.phone;
+                this.state.licenses[lic.licenseId] = signCertificate(lic, this.authorityKeys);
+            }
+        }
+        for (const ord of Object.values(this.state.orders || {})) {
+            if (!ord || ord.status === 'paid') continue;
+            if (ord.ownerAccountId === user.userId || String(ord.customer?.email || '').toLowerCase() === user.email) {
+                ord.customer = ord.customer || {};
+                if (user.companyName) ord.customer.name = user.companyName;
+                if (user.inn) ord.customer.inn = user.inn;
+                if (user.kpp !== undefined) ord.customer.kpp = user.kpp;
+                if (user.legalAddress !== undefined) ord.customer.legalAddress = user.legalAddress;
+                if (user.signerName !== undefined) ord.customer.signerName = user.signerName;
+                if (user.signerPosition !== undefined) ord.customer.signerPosition = user.signerPosition;
+                if (user.bankName !== undefined) ord.customer.bankName = user.bankName;
+                if (user.bik !== undefined) ord.customer.bik = user.bik;
+                if (user.bankAccount !== undefined) ord.customer.bankAccount = user.bankAccount;
+                if (user.corrAccount !== undefined) ord.customer.corrAccount = user.corrAccount;
+                if (user.phone !== undefined) ord.customer.phone = user.phone;
+            }
+        }
+
+        // Обновляем подписанный токен сессии с новыми реквизитами
+        user.sessionKey = createSessionToken({
+            userId: user.userId,
+            email: user.email,
+            name: user.name,
+            companyName: user.companyName,
+            inn: user.inn,
+            isAdmin: Boolean(user.isAdmin),
+            issuedAt: Date.now(),
+        }, this.authorityKeys);
+
+        this._save();
+        return this._formatUserResponse(user);
+    }
+
     /**
      * Зарегистрировать или авторизовать пользователя личного кабинета ODANT-WORK
      * (по email, через OAuth или через мессенджеры Telegram / MAX / VK).
@@ -1515,6 +1648,7 @@ export class LicenseStore {
         const userId = user?.userId || ('USR-' + crypto.createHash('sha256').update(cleanEmail).digest('hex').slice(0, 10).toUpperCase());
 
         if (!user) {
+            const safeCompany = (companyName && !String(companyName).includes('@')) ? String(companyName).trim() : '';
             let lic = licenseId ? this.findLicense(licenseId) : null;
             if (!lic) {
                 const summary = this.issueOrUpdateLicense({
@@ -1522,7 +1656,7 @@ export class LicenseStore {
                     ownerEmail: cleanEmail,
                     baseActivated: false,
                     customer: {
-                        name: companyName || name || cleanEmail,
+                        name: safeCompany,
                         inn: inn || '',
                         email: cleanEmail,
                         phone: phone || '',
@@ -1541,10 +1675,18 @@ export class LicenseStore {
                 userId,
                 email: cleanEmail,
                 authProvider: cleanProvider,
-                name: String(name || companyName || cleanEmail.split('@')[0]).trim(),
+                name: String(name || safeCompany || cleanEmail.split('@')[0]).trim(),
                 position: String(position || '').trim(),
-                companyName: String(companyName || '').trim(),
+                companyName: safeCompany,
                 inn: String(inn || '').trim(),
+                kpp: '',
+                legalAddress: '',
+                signerName: '',
+                signerPosition: String(position || '').trim(),
+                bankName: '',
+                bik: '',
+                bankAccount: '',
+                corrAccount: '',
                 phone: String(phone || '').trim(),
                 licenseId: lic.licenseId,
                 sessionKey: 'wks_' + crypto.randomBytes(16).toString('hex'),
@@ -2285,7 +2427,7 @@ export class LicenseStore {
     }
 
     /**
-     * Обновить способ оплаты и реквизиты юрлица для существующего заказа из Личного кабинета.
+     * Обновить способ оплаты и реквизиты юрлица для существующего заказа из Личного кабинета (и запомнить реквизиты в ЛК).
      */
     prepareOrderPayment(orderId, {
         paymentMethod = 'yookassa',
@@ -2293,16 +2435,31 @@ export class LicenseStore {
         inn = '',
         kpp = '',
         legalAddress = '',
+        signerName = '',
+        signerPosition = '',
+        bankName = '',
+        bik = '',
+        bankAccount = '',
+        corrAccount = '',
+        phone = '',
     } = {}) {
         const order = this.state.orders[orderId];
         if (!order)
             throw new Error(`Заказ ${orderId} не найден`);
         order.paymentMethod = paymentMethod === 'invoice' ? 'invoice' : 'yookassa';
         order.customer = order.customer || {};
-        if (companyName) order.customer.name = String(companyName).trim();
+        const cleanComp = (companyName && !String(companyName).includes('@')) ? String(companyName).trim() : '';
+        if (cleanComp) order.customer.name = cleanComp;
         if (inn) order.customer.inn = String(inn).trim();
-        if (kpp) order.customer.kpp = String(kpp).trim();
-        if (legalAddress) order.customer.legalAddress = String(legalAddress).trim();
+        if (kpp !== undefined && kpp !== '') order.customer.kpp = String(kpp).trim();
+        if (legalAddress !== undefined && legalAddress !== '') order.customer.legalAddress = String(legalAddress).trim();
+        if (signerName !== undefined && signerName !== '') order.customer.signerName = String(signerName).trim();
+        if (signerPosition !== undefined && signerPosition !== '') order.customer.signerPosition = String(signerPosition).trim();
+        if (bankName !== undefined && bankName !== '') order.customer.bankName = String(bankName).trim();
+        if (bik !== undefined && bik !== '') order.customer.bik = String(bik).trim();
+        if (bankAccount !== undefined && bankAccount !== '') order.customer.bankAccount = String(bankAccount).trim();
+        if (corrAccount !== undefined && corrAccount !== '') order.customer.corrAccount = String(corrAccount).trim();
+        if (phone !== undefined && phone !== '') order.customer.phone = String(phone).trim();
         if (!order.invoiceNumber) {
             order.invoiceNumber = 'СЧ-' + new Date().toISOString().slice(0, 10).replace(/-/g, '') + '-' + orderId.slice(-4);
         }
@@ -2313,14 +2470,26 @@ export class LicenseStore {
             order.invoiceUrl = `/api/orders/${encodeURIComponent(orderId)}/invoice`;
         }
         if (order.reservationId && this.state.reservations[order.reservationId]) {
-            if (companyName) this.state.reservations[order.reservationId].companyName = String(companyName).trim();
+            if (cleanComp) this.state.reservations[order.reservationId].companyName = cleanComp;
             if (inn) this.state.reservations[order.reservationId].inn = String(inn).trim();
         }
         if (order.ownerAccountId) {
             const u = Object.values(this.state.users).find(usr => usr.userId === order.ownerAccountId);
             if (u) {
-                if (companyName) u.companyName = String(companyName).trim();
+                if (cleanComp) u.companyName = cleanComp;
                 if (inn) u.inn = String(inn).trim();
+                if (kpp) u.kpp = String(kpp).trim();
+                if (legalAddress) u.legalAddress = String(legalAddress).trim();
+                if (signerName) u.signerName = String(signerName).trim();
+                if (signerPosition) {
+                    u.signerPosition = String(signerPosition).trim();
+                    u.position = u.signerPosition;
+                }
+                if (bankName) u.bankName = String(bankName).trim();
+                if (bik) u.bik = String(bik).trim();
+                if (bankAccount) u.bankAccount = String(bankAccount).trim();
+                if (corrAccount) u.corrAccount = String(corrAccount).trim();
+                if (phone) u.phone = String(phone).trim();
             }
         }
         this._save();