feat(kontingent): Credits-Stellwerte je Lizenz + Lizenz beim Org-Anlegen
Bedienseite für das Credits-Monatskontingent des Monitors. Das Portal setzt jetzt alle Stellwerte, der Monitor bleibt Herr der Laufzeitfelder. - Lizenz-Modal und Budget-Formular um Abrechnungszeitraum (monthly/total), Übertrag-Checkbox und Warnschwelle erweitert, Vorbelegungen auf das beschlossene Modell (10.000 Credits, monatlich, Übertrag an, 0,20 USD). - Neue Organisation kann direkt eine Lizenz mit Kontingent anlegen (OrgCreate.license, verschachtelt). Org- und Lizenz-Insert laufen in EINER Transaktion, schlägt der Lizenz-Teil fehl, entsteht keine halbe Organisation. Gemeinsamer Helper insert_license_row statt Duplikation der Widerruf- und Audit-Logik. - PUT /api/token-usage/budget validiert credits_period (monthly|total) und budget_warning_percent (1 bis 100), credits_rollover wird wie unlimited_budget normalisiert. Laufzeitfelder bleiben bewusst außerhalb der Whitelist. - Overview und Org-Detail rechnen den Rest jetzt gegen verfügbar = Kontingent + Übertrag, dieselbe Bezugsgröße wie der Hard-Stop im Monitor. Neuer read-only Block Laufzeitwerte im Token-Subtab. - Startup-Check loggt einen deutlichen Fehler, wenn die licenses-Tabelle die Credits-Spalten noch nicht hat (falsche Deploy-Reihenfolge). - Migration migrations/2026-07-25_credits_period.py (idempotent, wortgleich mit der Monitor-Migration) für die Portal-Staging-DB, auf Live gilt: Monitor VOR Portal promoten. - 13 neue Modell-Tests, pytest grün (die zwei bekannten shared-Import-Fehlschläge bestehen unverändert seit vorher). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Dieser Commit ist enthalten in:
claude-dev
@@ -442,14 +442,42 @@ function setupForms() {
|
||||
e.preventDefault();
|
||||
const errEl = document.getElementById("newOrgError");
|
||||
errEl.style.display = "none";
|
||||
const body = {
|
||||
name: document.getElementById("newOrgName").value,
|
||||
slug: document.getElementById("newOrgSlug").value,
|
||||
output_language: document.getElementById("newOrgLanguage").value || "de",
|
||||
};
|
||||
// Optional direkt eine Lizenz mit Credits-Kontingent mitgeben
|
||||
const withLic = document.getElementById("newOrgWithLicense");
|
||||
if (withLic && withLic.checked) {
|
||||
const licType = document.getElementById("newOrgLicType").value;
|
||||
const lic = {
|
||||
license_type: licType,
|
||||
max_users: parseInt(document.getElementById("newOrgLicMaxUsers").value) || 5,
|
||||
unlimited_budget: !!document.getElementById("newOrgLicUnlimited").checked,
|
||||
// Periode und Uebertrag IMMER senden, sonst laesst sich der
|
||||
// Uebertrag ueber das Formular nie abschalten
|
||||
credits_period: document.getElementById("newOrgLicCreditsPeriod").value,
|
||||
credits_rollover: !!document.getElementById("newOrgLicRollover").checked,
|
||||
};
|
||||
if (licType !== "permanent") {
|
||||
lic.duration_days = parseInt(document.getElementById("newOrgLicDuration").value) || undefined;
|
||||
}
|
||||
if (!lic.unlimited_budget) {
|
||||
const ct = document.getElementById("newOrgLicCreditsTotal");
|
||||
const cpc = document.getElementById("newOrgLicCostPerCredit");
|
||||
if (ct && ct.value) lic.credits_total = parseInt(ct.value);
|
||||
if (cpc && cpc.value) lic.cost_per_credit = parseFloat(cpc.value);
|
||||
}
|
||||
const warn = document.getElementById("newOrgLicWarnPercent");
|
||||
if (warn && warn.value) lic.budget_warning_percent = parseInt(warn.value);
|
||||
body.license = lic;
|
||||
}
|
||||
try {
|
||||
await API.post("/api/orgs", {
|
||||
name: document.getElementById("newOrgName").value,
|
||||
slug: document.getElementById("newOrgSlug").value,
|
||||
output_language: document.getElementById("newOrgLanguage").value || "de",
|
||||
});
|
||||
await API.post("/api/orgs", body);
|
||||
closeModal("modalNewOrg");
|
||||
document.getElementById("newOrgForm").reset();
|
||||
onNewOrgLicenseToggle();
|
||||
loadOrgs();
|
||||
loadDashboard();
|
||||
} catch (err) {
|
||||
@@ -515,6 +543,10 @@ function setupForms() {
|
||||
}
|
||||
const unlimitedEl = document.getElementById('newLicUnlimited');
|
||||
body.unlimited_budget = !!(unlimitedEl && unlimitedEl.checked);
|
||||
// Periode und Uebertrag IMMER senden (nicht nur bei gesetztem Wert),
|
||||
// sonst laesst sich der Uebertrag nie abschalten
|
||||
body.credits_period = document.getElementById('newLicCreditsPeriod').value;
|
||||
body.credits_rollover = !!document.getElementById('newLicRollover').checked;
|
||||
if (!body.unlimited_budget) {
|
||||
const creditsTotal = document.getElementById('newLicCreditsTotal');
|
||||
const costPerCredit = document.getElementById('newLicCostPerCredit');
|
||||
@@ -523,6 +555,8 @@ function setupForms() {
|
||||
if (costPerCredit && costPerCredit.value) body.cost_per_credit = parseFloat(costPerCredit.value);
|
||||
if (budgetUsd && budgetUsd.value) body.token_budget_usd = parseFloat(budgetUsd.value);
|
||||
}
|
||||
const warnEl = document.getElementById('newLicWarnPercent');
|
||||
if (warnEl && warnEl.value) body.budget_warning_percent = parseInt(warnEl.value);
|
||||
try {
|
||||
await API.post("/api/licenses", body);
|
||||
closeModal("modalNewLicense");
|
||||
@@ -818,7 +852,11 @@ async function loadOrgTokenUsage(orgId) {
|
||||
el('tokenCreditsRemaining', '∞ Unbegrenzt');
|
||||
el('tokenBudgetUsd', '—');
|
||||
} else {
|
||||
el('tokenCreditsRemaining', budget.credits_remaining != null ? budget.credits_remaining.toLocaleString('de-DE') : '-');
|
||||
var remainingTxt = budget.credits_remaining != null ? budget.credits_remaining.toLocaleString('de-DE') : '-';
|
||||
if (budget.credits_carried > 0 && budget.credits_remaining != null) {
|
||||
remainingTxt += ' (inkl. ' + Math.round(budget.credits_carried).toLocaleString('de-DE') + ' Übertrag)';
|
||||
}
|
||||
el('tokenCreditsRemaining', remainingTxt);
|
||||
el('tokenBudgetUsd', budget.token_budget_usd != null ? '$' + Number(budget.token_budget_usd).toFixed(2) : '-');
|
||||
}
|
||||
el('tokenCostUsd', usage.total_cost_usd != null ? '$' + Number(usage.total_cost_usd).toFixed(2) : '-');
|
||||
@@ -887,37 +925,109 @@ function fillBudgetForm(budget) {
|
||||
el('editCostPerCredit', budget.cost_per_credit);
|
||||
el('editBudgetUsd', budget.token_budget_usd);
|
||||
el('editCreditsUsed', budget.credits_used ? Math.round(budget.credits_used) : 0);
|
||||
el('editWarnPercent', budget.budget_warning_percent);
|
||||
const periodSel = document.getElementById('editCreditsPeriod');
|
||||
if (periodSel) periodSel.value = budget.credits_period || 'monthly';
|
||||
const rolloverCb = document.getElementById('editCreditsRollover');
|
||||
if (rolloverCb) rolloverCb.checked = !!budget.credits_rollover;
|
||||
onEditPeriodChange();
|
||||
const cb = document.getElementById('editUnlimitedBudget');
|
||||
if (cb) {
|
||||
cb.checked = !!budget.unlimited_budget;
|
||||
onUnlimitedToggle();
|
||||
}
|
||||
|
||||
// Laufzeitwerte (verwaltet der Monitor, hier nur Anzeige)
|
||||
const txt = (id, val) => { const e = document.getElementById(id); if (e) e.textContent = val; };
|
||||
const carried = budget.credits_carried || 0;
|
||||
txt('viewCreditsCarried', carried > 0 ? Math.round(carried).toLocaleString('de-DE') + ' Credits' : 'Kein Übertrag');
|
||||
txt('viewCreditsPeriodStart', budget.credits_period_start || 'Noch nicht initialisiert');
|
||||
txt('viewCreditsAvailable', budget.unlimited_budget
|
||||
? '∞ Unbegrenzt'
|
||||
: (budget.credits_available != null ? Math.round(budget.credits_available).toLocaleString('de-DE') + ' Credits' : '-'));
|
||||
}
|
||||
|
||||
// Unlimited-Toggle: Felder ausgrauen wenn aktiv
|
||||
function onUnlimitedToggle() {
|
||||
const cb = document.getElementById('editUnlimitedBudget');
|
||||
const isUnlimited = cb && cb.checked;
|
||||
['editCreditsTotal','editCostPerCredit','editBudgetUsd'].forEach(function(id) {
|
||||
['editCreditsTotal','editCostPerCredit','editBudgetUsd','editCreditsPeriod','editCreditsRollover','editWarnPercent'].forEach(function(id) {
|
||||
const e = document.getElementById(id);
|
||||
if (e) {
|
||||
e.disabled = isUnlimited;
|
||||
e.style.opacity = isUnlimited ? '0.4' : '1';
|
||||
}
|
||||
});
|
||||
if (!isUnlimited) onEditPeriodChange();
|
||||
}
|
||||
|
||||
// Bei Periode "Gesamtlaufzeit" ist der Monats-Uebertrag bedeutungslos
|
||||
function onEditPeriodChange() {
|
||||
const sel = document.getElementById('editCreditsPeriod');
|
||||
const cb = document.getElementById('editCreditsRollover');
|
||||
if (!sel || !cb) return;
|
||||
const unlimitedCb = document.getElementById('editUnlimitedBudget');
|
||||
cb.disabled = sel.value === 'total' || !!(unlimitedCb && unlimitedCb.checked);
|
||||
cb.parentElement.style.opacity = cb.disabled ? '0.4' : '1';
|
||||
}
|
||||
|
||||
// Unlimited-Toggle im Lizenz-Modal
|
||||
function onNewLicUnlimitedToggle() {
|
||||
const cb = document.getElementById('newLicUnlimited');
|
||||
const isUnlimited = cb && cb.checked;
|
||||
['newLicCreditsTotal','newLicCostPerCredit','newLicBudgetUsd'].forEach(function(id) {
|
||||
['newLicCreditsTotal','newLicCostPerCredit','newLicBudgetUsd','newLicCreditsPeriod','newLicRollover','newLicWarnPercent'].forEach(function(id) {
|
||||
const e = document.getElementById(id);
|
||||
if (e) {
|
||||
e.disabled = isUnlimited;
|
||||
e.style.opacity = isUnlimited ? '0.4' : '1';
|
||||
}
|
||||
});
|
||||
if (!isUnlimited) onNewLicPeriodChange();
|
||||
}
|
||||
|
||||
function onNewLicPeriodChange() {
|
||||
const sel = document.getElementById('newLicCreditsPeriod');
|
||||
const cb = document.getElementById('newLicRollover');
|
||||
if (!sel || !cb) return;
|
||||
cb.disabled = sel.value === 'total';
|
||||
cb.parentElement.style.opacity = cb.disabled ? '0.4' : '1';
|
||||
}
|
||||
|
||||
// === Lizenz-Abschnitt im Org-Modal ===
|
||||
function onNewOrgLicenseToggle() {
|
||||
const cb = document.getElementById('newOrgWithLicense');
|
||||
const fields = document.getElementById('newOrgLicenseFields');
|
||||
if (fields) fields.style.display = (cb && cb.checked) ? '' : 'none';
|
||||
}
|
||||
|
||||
function onNewOrgLicTypeChange() {
|
||||
const type = document.getElementById('newOrgLicType').value;
|
||||
const group = document.getElementById('newOrgLicDurationGroup');
|
||||
if (group) group.style.display = type === 'permanent' ? 'none' : '';
|
||||
if (type !== 'permanent') {
|
||||
document.getElementById('newOrgLicDuration').value = type === 'trial' ? '14' : '365';
|
||||
}
|
||||
}
|
||||
|
||||
function onNewOrgLicUnlimitedToggle() {
|
||||
const cb = document.getElementById('newOrgLicUnlimited');
|
||||
const isUnlimited = cb && cb.checked;
|
||||
['newOrgLicCreditsTotal','newOrgLicCostPerCredit','newOrgLicCreditsPeriod','newOrgLicRollover','newOrgLicWarnPercent'].forEach(function(id) {
|
||||
const e = document.getElementById(id);
|
||||
if (e) {
|
||||
e.disabled = isUnlimited;
|
||||
e.style.opacity = isUnlimited ? '0.4' : '1';
|
||||
}
|
||||
});
|
||||
if (!isUnlimited) onNewOrgLicPeriodChange();
|
||||
}
|
||||
|
||||
function onNewOrgLicPeriodChange() {
|
||||
const sel = document.getElementById('newOrgLicCreditsPeriod');
|
||||
const cb = document.getElementById('newOrgLicRollover');
|
||||
if (!sel || !cb) return;
|
||||
cb.disabled = sel.value === 'total';
|
||||
cb.parentElement.style.opacity = cb.disabled ? '0.4' : '1';
|
||||
}
|
||||
|
||||
async function loadDashboardTokenStats() {
|
||||
@@ -977,6 +1087,14 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
if (creditsTotal && creditsTotal.value) body.credits_total = parseInt(creditsTotal.value);
|
||||
if (costPerCredit && costPerCredit.value) body.cost_per_credit = parseFloat(costPerCredit.value);
|
||||
if (budgetUsd && budgetUsd.value) body.token_budget_usd = parseFloat(budgetUsd.value);
|
||||
// Periode und Uebertrag IMMER senden (nicht ueber das if-value-Muster),
|
||||
// sonst laesst sich der Uebertrag nie abschalten und die Periode nie
|
||||
// zurueckstellen. Laufzeitfelder (credits_carried, credits_period_start,
|
||||
// budget_warning_sent) sendet das Portal grundsaetzlich NICHT.
|
||||
body.credits_period = document.getElementById('editCreditsPeriod').value;
|
||||
body.credits_rollover = !!document.getElementById('editCreditsRollover').checked;
|
||||
var warnPercent = document.getElementById('editWarnPercent');
|
||||
if (warnPercent && warnPercent.value) body.budget_warning_percent = parseInt(warnPercent.value);
|
||||
}
|
||||
// credits_used immer mitsenden (auch im Unlimited-Modus, fuer Korrekturen)
|
||||
if (creditsUsed && creditsUsed.value !== '') body.credits_used = parseFloat(creditsUsed.value);
|
||||
|
||||
In neuem Issue referenzieren
Einen Benutzer sperren