@ketvietlab/ketsuite 0.1.5 → 0.1.6

package/dist/modules/crm_backend/routes.js

@@ -1,13 +1,14 @@
 import { randomUUID } from 'node:crypto';
 import { encodeListState, parseListState, table, text } from '@ketvietlab/ketjs';
 import { formatDateTime, formatMoney, modalWorkspace } from '../../ui/index.js';
-import { readForm, seeOther } from '../backend/forms.js';
+import { formRefusal, readForm, seeOther } from '../backend/forms.js';
 import { choices, adminPage, inLocale, localeQuery, optional, timezoneOf } from '../backend/screen.js';
 import { withParam } from '../backend/paging.js';
 import { receiveAttachment } from '../storage/routes.js';
 import { caseListSearch } from '../crm/search.js';
+import { caseFormSchema } from '../crm/functions.js';
 import { assigneeControl, caseControl, partnerControl, productControl, stageControl, tagsControl, teamControl, } from './relation-control.js';
-import { CONFIGURATION_TABS, caseConvertModal, caseCreateScreen, caseDetailScreen, casesListScreen, configurationScreen, leaderboardScreen, plannerScreen, permissionScreen, pipelineScreen, } from './screens/index.js';
+import { CONFIGURATION_TABS, caseCloseModal, caseConvertModal, caseCreateScreen, caseDetailScreen, casesListScreen, configurationScreen, leaderboardScreen, plannerScreen, permissionScreen, pipelineScreen, teamConfigurationScreen, } from './screens/index.js';
 import { keepForListSearch, LIST_PAGE_SIZE, listFacets, listMenus, loadListGroups, } from '../backend/list-search.js';
 const bool = (value) => ['1', 'true', 'on'].includes(value ?? '');
 const errorsOf = (result, _) => (result?.errors ?? []).map((error) => {
@@ -61,72 +62,105 @@ const references = async (ctx, url, req) => {
     return { config, partners, users, tags };
 };
 const options = (rows) => rows.map((row) => ({ value: String(row.id), label: String(row.name ?? row.code ?? row.id) }));
-const caseFields = (_, row = {}, controls = {}) => [
-    {
-        name: 'name',
-        label: _('crm_backend.field.name'),
-        value: String(row.name ?? ''),
-        required: true,
-        span: 'full',
-    },
-    {
-        name: 'kind',
-        label: _('crm_backend.field.kind'),
-        type: 'select',
-        value: String(row.kind ?? 'lead'),
-        disabled: Boolean(row.id),
-        required: true,
-        options: ['lead', 'opportunity'].map((value) => ({ value, label: _(`crm.kind.${value}`) })),
-    },
-    /*
-     * Only where creating one. On a record that already exists the stage is moved
-     * by the action beside the form, which records the move on the timeline and
-     * refuses a stale version; a second field quietly writing the same column would
-     * be a change nobody could later account for.
-     */
-    ...(controls.stage
-        ? [{ name: 'stageId', label: _('crm_backend.field.stage'), control: controls.stage }]
-        : []),
-    { name: 'partnerId', label: _('crm_backend.field.partner'), control: controls.partner },
-    { name: 'contactName', label: _('crm_backend.field.contactName'), value: String(row.contactName ?? '') },
-    { name: 'email', label: _('crm_backend.field.email'), type: 'email', value: String(row.email ?? '') },
-    { name: 'phone', label: _('crm_backend.field.phone'), type: 'tel', value: String(row.phone ?? '') },
-    { name: 'teamId', label: _('crm_backend.field.team'), control: controls.team },
-    { name: 'assigneeUserId', label: _('crm_backend.field.assignee'), control: controls.assignee },
-    {
-        name: 'priority',
-        label: _('crm_backend.field.priority'),
-        type: 'select',
-        value: String(row.priority ?? '1'),
-        options: ['0', '1', '2', '3'].map((value) => ({ value, label: _(`crm_backend.priority.${value}`) })),
-    },
-    { name: 'tagIds', label: _('crm_backend.field.tags'), control: controls.tags, span: 'full' },
-    {
-        name: 'expectedRevenue',
-        label: _('crm_backend.field.expectedRevenue'),
-        type: 'decimal',
-        value: String(row.salesDetail?.expectedRevenue ?? 0),
-    },
-    {
-        name: 'probability',
-        label: _('crm_backend.field.probability'),
-        type: 'decimal',
-        value: String(row.salesDetail?.probability ?? 0),
-    },
-    {
-        name: 'expectedClosing',
-        label: _('crm_backend.field.expectedClosing'),
-        type: 'date',
-        value: String(row.salesDetail?.expectedClosing ?? ''),
-    },
-    {
-        name: 'description',
-        label: _('crm_backend.field.description'),
-        type: 'textarea',
-        value: String(row.description ?? ''),
-        span: 'full',
-    },
-];
+const caseFields = (_, row = {}, controls = {}, requirements = {}) => {
+    const source = String(row.utmSource ?? (requirements.need ? 'pancake' : ''));
+    const sources = ['pancake', 'zalo', 'facebook', 'website', 'customer_care', 'referral'];
+    if (source && !sources.includes(source))
+        sources.push(source);
+    return [
+        {
+            name: 'name',
+            label: _('crm_backend.field.name'),
+            value: String(row.name ?? ''),
+            required: true,
+            span: 'full',
+            error: requirements.error?.('name'),
+        },
+        {
+            name: 'kind',
+            label: _('crm_backend.field.kind'),
+            type: 'select',
+            value: String(row.kind ?? 'lead'),
+            disabled: Boolean(row.id),
+            required: true,
+            error: requirements.error?.('kind'),
+            options: ['lead', 'opportunity'].map((value) => ({ value, label: _(`crm.kind.${value}`) })),
+        },
+        /*
+         * Only where creating one. On a record that already exists the stage is moved
+         * by the action beside the form, which records the move on the timeline and
+         * refuses a stale version; a second field quietly writing the same column would
+         * be a change nobody could later account for.
+         */
+        ...(controls.stage
+            ? [{ name: 'stageId', label: _('crm_backend.field.stage'), control: controls.stage }]
+            : []),
+        {
+            name: 'partnerId',
+            label: _('crm_backend.field.partner'),
+            control: controls.partner,
+            required: requirements.partner,
+            error: requirements.error?.('partnerId'),
+        },
+        {
+            name: 'utmSource',
+            label: _('crm_backend.field.source'),
+            type: 'select',
+            value: source,
+            options: [
+                { value: '', label: '—' },
+                ...sources.map((value) => ({
+                    value,
+                    label: _.resolves(`crm_backend.source.${value}`) ? _(`crm_backend.source.${value}`) : value,
+                })),
+            ],
+        },
+        { name: 'contactName', label: _('crm_backend.field.contactName'), value: String(row.contactName ?? '') },
+        { name: 'email', label: _('crm_backend.field.email'), type: 'email', value: String(row.email ?? '') },
+        { name: 'phone', label: _('crm_backend.field.phone'), type: 'tel', value: String(row.phone ?? '') },
+        { name: 'teamId', label: _('crm_backend.field.team'), control: controls.team },
+        { name: 'assigneeUserId', label: _('crm_backend.field.assignee'), control: controls.assignee },
+        {
+            name: 'priority',
+            label: _('crm_backend.field.priority'),
+            type: 'select',
+            value: String(row.priority ?? '1'),
+            options: ['0', '1', '2', '3'].map((value) => ({ value, label: _(`crm_backend.priority.${value}`) })),
+            error: requirements.error?.('priority'),
+        },
+        { name: 'tagIds', label: _('crm_backend.field.tags'), control: controls.tags, span: 'full' },
+        {
+            name: 'expectedRevenue',
+            label: _('crm_backend.field.expectedRevenue'),
+            type: 'decimal',
+            value: String(row.salesDetail?.expectedRevenue ?? 0),
+            error: requirements.error?.('expectedRevenue'),
+        },
+        {
+            name: 'probability',
+            label: _('crm_backend.field.probability'),
+            type: 'decimal',
+            value: String(row.salesDetail?.probability ?? 0),
+            error: requirements.error?.('probability'),
+        },
+        {
+            name: 'expectedClosing',
+            label: _('crm_backend.field.expectedClosing'),
+            type: 'date',
+            value: String(row.salesDetail?.expectedClosing ?? ''),
+            error: requirements.error?.('expectedClosing'),
+        },
+        {
+            name: 'description',
+            label: requirements.need ? _('crm_backend.field.need') : _('crm_backend.field.description'),
+            type: 'textarea',
+            value: String(row.description ?? ''),
+            required: requirements.need,
+            span: 'full',
+            error: requirements.error?.('description'),
+        },
+    ];
+};
 const caseControls = async (ctx, url, req, _, data, prefix, row = {}, 
 /** The stage picker belongs to the create form only — see the note in `caseFields`. */
 wants = {}) => {
@@ -178,6 +212,7 @@ const saveInput = (id, form, kind = form.kind ?? 'lead') => ({
     ...optional(form, 'assigneeUserId'),
     ...optional(form, 'stageId'),
     ...optional(form, 'description'),
+    ...optional(form, 'utmSource'),
     ...optional(form, 'expectedClosing'),
     priority: form.priority ?? '1',
     expectedRevenue: form.expectedRevenue || '0',
@@ -209,13 +244,17 @@ const caseCreateHref = (url, preset = {}) => {
     target.searchParams.set('returnTo', `${url.pathname}${url.search}`);
     return `${target.pathname}${target.search}`;
 };
-/** Only the CRM board and case list are valid destinations carried through the create form. */
+/** Only CRM views and a Partner record are valid destinations carried through the create form. */
 const caseReturnTo = (url, raw) => {
-    const fallback = inLocale(url, '/admin/crm/cases');
+    const partnerId = url.searchParams.get('partnerId');
+    const fallback = partnerId
+        ? inLocale(url, `/admin/partner/partners/${encodeURIComponent(partnerId)}`)
+        : inLocale(url, '/admin/crm/cases');
     if (!raw)
         return fallback;
     const target = new URL(raw, 'http://ket.local');
-    return ['/admin/crm/cases', '/admin/crm/pipeline'].includes(target.pathname)
+    return ['/admin/crm/cases', '/admin/crm/pipeline'].includes(target.pathname) ||
+        /^\/admin\/partner\/partners\/[^/]+$/.test(target.pathname)
         ? `${target.pathname}${target.search}`
         : fallback;
 };
@@ -224,9 +263,25 @@ const caseCreatePage = async (ctx, url, req, options) => {
     const askedStage = url.searchParams.get('stageId');
     const askedKind = url.searchParams.get('kind');
     const submitted = options.form ?? {};
+    const partnerIntent = url.searchParams.has('partnerId') || submitted.partnerIntent === '1';
+    const askedPartnerId = url.searchParams.get('partnerId') || (partnerIntent ? submitted.partnerId : null);
+    const [selectedPartner, data] = await Promise.all([
+        askedPartnerId
+            ? ctx.call('partner.getPartner', { id: askedPartnerId }, url, req)
+            : Promise.resolve(null),
+        references(ctx, url, req),
+    ]);
     const preset = {
         ...(askedStage ? { stageId: askedStage } : {}),
         ...(askedKind === 'lead' || askedKind === 'opportunity' ? { kind: askedKind } : {}),
+        ...(selectedPartner
+            ? {
+                partnerId: selectedPartner.id,
+                contactName: selectedPartner.kind === 'person' ? selectedPartner.name : '',
+                email: selectedPartner.email ?? '',
+                phone: selectedPartner.phone ?? '',
+            }
+            : {}),
         ...submitted,
         ...(options.form
             ? {
@@ -238,18 +293,31 @@ const caseCreatePage = async (ctx, url, req, options) => {
             }
             : {}),
     };
-    const data = await references(ctx, url, req);
+    if (selectedPartner && !data.partners.some((partner) => partner.id === selectedPartner.id))
+        data.partners.unshift(selectedPartner);
     const controls = await caseControls(ctx, url, req, _, data, 'crm-create', preset);
     const returnTo = caseReturnTo(url, submitted.returnTo ?? url.searchParams.get('returnTo'));
     return adminPage(ctx, url, req, {
         title: 'crm_backend.cases.title',
         active: '/admin/crm/cases',
         body: (_, frame) => caseCreateScreen(_, frame, {
-            fields: caseFields(_, preset, controls),
+            title: partnerIntent ? _('crm_backend.action.createLead') : _('crm_backend.action.create'),
+            fields: caseFields(_, preset, controls, {
+                partner: Boolean(selectedPartner),
+                need: Boolean(selectedPartner),
+                error: options.refusal?.error,
+            }),
             action: inLocale(url, options.actionPath),
             cancelHref: returnTo,
             returnTo,
             errors: options.errors,
+            guidance: partnerIntent && selectedPartner
+                ? {
+                    title: _('crm_backend.case.create.partnerHintTitle'),
+                    description: _('crm_backend.case.create.partnerHint'),
+                }
+                : undefined,
+            partnerIntent: partnerIntent && Boolean(selectedPartner),
         }),
     });
 };
@@ -375,6 +443,82 @@ const configurationTabOf = (url) => {
     const asked = url.searchParams.get('tab') ?? '';
     return CONFIGURATION_TABS.includes(asked) ? asked : 'teams';
 };
+const configurationStatusOf = (url) => {
+    const asked = url.searchParams.get('status') ?? 'active';
+    return ['active', 'archived', 'all'].includes(asked) ? asked : 'active';
+};
+const teamConfigurationRoute = (ctx, creating) => async (url, req, params) => {
+    const refused = refusePost(req);
+    if (refused)
+        return refused;
+    const _ = ctx.translate(ctx.localeOf(url, req));
+    const requestedId = creating ? '' : params.id;
+    const memberAsked = url.searchParams.get('member');
+    let errors = [];
+    let teamId = requestedId;
+    if (req.method === 'POST') {
+        const form = await readForm(req);
+        const call = (name, input) => ctx.call(name, input, url, req);
+        if (memberAsked && !creating) {
+            const result = await teamMemberWrite(call, form, requestedId, form.id || randomUUID());
+            if (result.ok)
+                return seeOther(inLocale(url, `/admin/crm/configuration/teams/${encodeURIComponent(requestedId)}`));
+            errors = errorsOf(result, _);
+        }
+        else {
+            teamId = form.id || requestedId || randomUUID();
+            const result = await configurationWrite(call, 'teams', form, teamId);
+            if (result.ok)
+                return seeOther(inLocale(url, `/admin/crm/configuration/teams/${encodeURIComponent(teamId)}`));
+            errors = errorsOf(result, _);
+        }
+    }
+    else if (req.method !== 'GET')
+        return text('GET or POST', { status: 405 });
+    const [config, users, listedMembers] = await Promise.all([
+        configuration(ctx, url, req),
+        ctx.call('user.listUsers', { includeArchived: false, limit: 200 }, url, req),
+        creating
+            ? Promise.resolve([])
+            : ctx.call('crm.team.member.list', { teamId: requestedId, limit: 200 }, url, req),
+    ]);
+    const team = creating
+        ? {}
+        : ((config.teams ?? []).find((row) => String(row.id) === requestedId) ?? null);
+    if (!team)
+        return text('not found', { status: 404 });
+    const memberEditing = memberAsked && memberAsked !== 'new'
+        ? (listedMembers.find((row) => String(row.id) === memberAsked) ?? null)
+        : null;
+    const path = creating
+        ? '/admin/crm/configuration/teams/new'
+        : `/admin/crm/configuration/teams/${encodeURIComponent(requestedId)}`;
+    const action = inLocale(url, path);
+    const memberAction = memberAsked
+        ? inLocale(url, `${path}?member=${encodeURIComponent(memberAsked)}`)
+        : undefined;
+    return adminPage(ctx, url, req, {
+        title: 'crm_backend.configuration.title',
+        active: '/admin/crm/configuration',
+        body: (_, frame) => teamConfigurationScreen(_, frame, {
+            team,
+            fields: configurationFields(_, 'teams', team, config.teams ?? [], users),
+            members: listedMembers,
+            action,
+            cancelHref: inLocale(url, '/admin/crm/configuration?tab=teams'),
+            errors,
+            creating,
+            memberCreateHref: creating ? undefined : inLocale(url, `${path}?member=new`),
+            memberEditHref: creating
+                ? undefined
+                : (row) => inLocale(url, `${path}?member=${encodeURIComponent(String(row.id))}`),
+            memberEditing,
+            memberCreating: memberAsked === 'new',
+            memberFields: memberAsked ? teamMemberFields(_, memberEditing, users) : undefined,
+            memberAction,
+        }),
+    });
+};
 export const routes = {
     '/admin/crm': () => async (url, req) => req.method === 'GET' ? seeOther(inLocale(url, '/admin/crm/pipeline')) : text('GET', { status: 405 }),
     '/admin/crm/pipeline': (ctx) => async (url, req) => {
@@ -595,14 +739,24 @@ export const routes = {
             return refused;
         if (req.method === 'POST') {
             const form = await readForm(req);
+            const refusal = formRefusal(ctx.translate(ctx.localeOf(url, req)));
+            const fromPartner = form.partnerIntent === '1';
+            if (!refusal.check(caseFormSchema({ partner: fromPartner, need: fromPartner }), form))
+                return caseCreatePage(ctx, url, req, {
+                    actionPath: '/admin/crm/cases',
+                    form,
+                    refusal,
+                });
             const id = randomUUID();
             const result = (await ctx.call('crm.case.save', saveInput(id, form), url, req));
             if (result.ok)
                 return seeOther(inLocale(url, `/admin/crm/cases/${id}`));
+            refusal.add(errorsOf(result, ctx.translate(ctx.localeOf(url, req))));
             return caseCreatePage(ctx, url, req, {
                 actionPath: '/admin/crm/cases',
-                errors: errorsOf(result, ctx.translate(ctx.localeOf(url, req))),
+                errors: refusal.sentences(),
                 form,
+                refusal,
             });
         }
         if (req.method !== 'GET')
@@ -658,14 +812,24 @@ export const routes = {
             return refused;
         if (req.method === 'POST') {
             const form = await readForm(req);
+            const refusal = formRefusal(ctx.translate(ctx.localeOf(url, req)));
+            const fromPartner = form.partnerIntent === '1';
+            if (!refusal.check(caseFormSchema({ partner: fromPartner, need: fromPartner }), form))
+                return caseCreatePage(ctx, url, req, {
+                    actionPath: '/admin/crm/cases/new',
+                    form,
+                    refusal,
+                });
             const id = randomUUID();
             const result = (await ctx.call('crm.case.save', saveInput(id, form), url, req));
             if (result.ok)
                 return seeOther(inLocale(url, `/admin/crm/cases/${id}`));
+            refusal.add(errorsOf(result, ctx.translate(ctx.localeOf(url, req))));
             return caseCreatePage(ctx, url, req, {
                 actionPath: '/admin/crm/cases/new',
-                errors: errorsOf(result, ctx.translate(ctx.localeOf(url, req))),
+                errors: refusal.sentences(),
                 form,
+                refusal,
             });
         }
         if (req.method !== 'GET')
@@ -689,7 +853,7 @@ export const routes = {
             // behind these actions match by construction: a stale tab would win
             // silently. A request that does not say which version it saw is refused
             // instead of being handed the current one.
-            const VERSIONED = ['move', 'convert', 'won', 'lost', 'assign', 'merge'];
+            const VERSIONED = ['move', 'convert', 'close', 'won', 'lost', 'assign', 'merge'];
             if (VERSIONED.includes(String(form.action ?? '')) && !form.expectedVersion)
                 return text(_('crm_backend.convert.versionRequired'), { status: 422 });
             const base = {
@@ -711,8 +875,49 @@ export const routes = {
                         ok: false,
                         errors: [{ field: 'confirm', code: 'crm_backend.convert.confirmRequired' }],
                     };
+                else if (!String(form.expectedRevenue ?? '').trim())
+                    result = {
+                        ok: false,
+                        errors: [{ field: 'expectedRevenue', code: 'crm_backend.convert.revenueRequired' }],
+                    };
+                else if (!String(form.expectedClosing ?? '').trim())
+                    result = {
+                        ok: false,
+                        errors: [{ field: 'expectedClosing', code: 'crm_backend.convert.closingRequired' }],
+                    };
+                else
+                    result = await call('crm.case.convertLead', {
+                        ...base,
+                        ...optional(form, 'stageId'),
+                        ...optional(form, 'expectedRevenue'),
+                        ...optional(form, 'expectedClosing'),
+                    });
+            }
+            else if (form.action === 'close') {
+                const reason = String(form.closeReason ?? '').trim();
+                if (!form.confirm)
+                    result = {
+                        ok: false,
+                        errors: [{ field: 'confirm', code: 'crm_backend.close.confirmRequired' }],
+                    };
+                else if (!reason)
+                    result = {
+                        ok: false,
+                        errors: [{ field: 'closeReason', code: 'crm_backend.close.reasonRequired' }],
+                    };
+                else if (form.terminal === 'won')
+                    result = await call('crm.case.markWon', { ...base, closeReason: reason });
+                else if (form.terminal === 'lost')
+                    result = await call('crm.case.markLost', {
+                        ...base,
+                        lostReason: reason,
+                        closeReason: reason,
+                    });
                 else
-                    result = await call('crm.case.convertLead', { ...base, ...optional(form, 'stageId') });
+                    result = {
+                        ok: false,
+                        errors: [{ field: 'terminal', code: 'crm_backend.close.invalidResult' }],
+                    };
             }
             else if (form.action === 'won')
                 result = await call('crm.case.markWon', base);
@@ -832,6 +1037,9 @@ export const routes = {
         // Converting is confirmed in a step the URL owns, so the opportunity
         // stages are only read when that step is open — and only for a lead.
         const converting = row.kind === 'lead' && url.searchParams.get('modal') === 'convert';
+        const closing = row.kind === 'opportunity' &&
+            row.terminalState === 'open' &&
+            url.searchParams.get('modal') === 'close';
         const conversionStages = converting ? stagesFor('opportunity') : [];
         const [warehouses, plans, activityTypes, duplicateResult, quotations, products] = await Promise.all([
             ctx.call('stock.listWarehouses', {}, url, req),
@@ -897,7 +1105,7 @@ export const routes = {
                 }
                 : {}),
         };
-        const closeConvert = () => {
+        const closeOverlay = () => {
             const back = new URLSearchParams(url.searchParams);
             back.delete('modal');
             const query = back.toString();
@@ -919,7 +1127,7 @@ export const routes = {
                     controls,
                     // A conversion that was refused belongs to the step that asked for
                     // it, not to the save form behind it.
-                    errors: converting ? [] : errors,
+                    errors: converting || closing ? [] : errors,
                     locale: localeQuery(url),
                     tab: ['overview', 'sales', 'activities', 'timeline'].includes(url.searchParams.get('tab') ?? '')
                         ? String(url.searchParams.get('tab'))
@@ -930,11 +1138,17 @@ export const routes = {
                         // Posting back to the step keeps it open when the answer is
                         // no, with the reason inside it rather than on the page behind.
                         action: inLocale(url, `${url.pathname}?${url.searchParams.toString()}`),
-                        cancelHref: inLocale(url, closeConvert()),
+                        cancelHref: inLocale(url, closeOverlay()),
                         control: controls.convertStage,
                         errors,
                     }))
-                    : detail;
+                    : closing
+                        ? modalWorkspace(detail, caseCloseModal(_, row, {
+                            action: inLocale(url, `${url.pathname}?${url.searchParams.toString()}`),
+                            cancelHref: inLocale(url, closeOverlay()),
+                            errors,
+                        }))
+                        : detail;
             },
         });
     },
@@ -1078,7 +1292,13 @@ export const routes = {
             return refused;
         const _ = ctx.translate(ctx.localeOf(url, req));
         const tab = configurationTabOf(url);
-        const back = inLocale(url, `/admin/crm/configuration?tab=${tab}`);
+        const status = configurationStatusOf(url);
+        const statusQuery = status === 'active' ? '' : `&status=${status}`;
+        const back = inLocale(url, `/admin/crm/configuration?tab=${tab}${statusQuery}`);
+        if (tab === 'teams' && url.searchParams.has('edit'))
+            return seeOther(inLocale(url, `/admin/crm/configuration/teams/${encodeURIComponent(String(url.searchParams.get('edit')))}`));
+        if (tab === 'teams' && url.searchParams.get('create') === '1')
+            return seeOther(inLocale(url, '/admin/crm/configuration/teams/new'));
         let errors = [];
         if (req.method === 'POST') {
             if (crossSite(req))
@@ -1093,19 +1313,15 @@ export const routes = {
         }
         else if (req.method !== 'GET')
             return text('GET or POST', { status: 405 });
-        const [config, tags, members, users] = await Promise.all([
+        const [config, tags, users] = await Promise.all([
             configuration(ctx, url, req),
             ctx.call('crm.tag.list', { includeArchived: true, limit: 200 }, url, req),
-            tab === 'members'
-                ? ctx.call('crm.team.member.list', { limit: 200 }, url, req)
-                : Promise.resolve([]),
-            tab === 'members'
-                ? ctx.call('user.listUsers', { includeArchived: false, limit: 200 }, url, req)
-                : Promise.resolve([]),
+            ctx.call('user.listUsers', { includeArchived: false, limit: 200 }, url, req),
         ]);
-        const rows = tab === 'tags' ? tags : tab === 'members' ? members : (config[tab] ?? []);
+        const allRows = tab === 'tags' ? tags : (config[tab] ?? []);
+        const rows = allRows.filter((row) => status === 'all' ? true : status === 'active' ? row.active !== false : row.active === false);
         const asked = url.searchParams.get('edit');
-        const editing = asked ? (rows.find((row) => String(row.id) === asked) ?? null) : null;
+        const editing = asked ? (allRows.find((row) => String(row.id) === asked) ?? null) : null;
         const teams = config.teams ?? [];
         return adminPage(ctx, url, req, {
             title: 'crm_backend.configuration.title',
@@ -1116,50 +1332,27 @@ export const routes = {
                 creating: url.searchParams.get('create') === '1' || (req.method === 'POST' && !editing),
                 errors,
                 locale: localeQuery(url),
+                status,
+                teams,
+                users,
                 fields: configurationFields(_, tab, editing, teams, users),
-                ...(tab === 'members'
-                    ? {
-                        label: (row) => String(row.userName ?? row.userId),
-                        detail: (row) => _('crm_backend.configuration.member.detail', {
-                            capacity: String(row.capacity ?? 1),
-                            assigned: String(row.assignedCount ?? 0),
-                        }),
-                    }
-                    : {}),
-                ...(tab === 'stages' ? { detail: (row) => String(row.terminalState ?? 'open') } : {}),
             }),
         });
     },
+    '/admin/crm/configuration/teams/new': (ctx) => teamConfigurationRoute(ctx, true),
+    '/admin/crm/configuration/teams/{id}': (ctx) => teamConfigurationRoute(ctx, false),
 };
 /**
  * One write per configuration tab.
  *
- * The tabs do not share a function signature — a tag saves by name, a team saves
- * a values bag with an idempotency key, a member is a join row — so the mapping
- * is spelled out rather than guessed from the tab name.
+ * The tabs do not share a function signature — a tag saves by name while the
+ * other configuration records save a versioned values bag.
  */
 async function configurationWrite(call, tab, form, id) {
-    const archiving = form.action === 'archive';
-    const restoring = form.action === 'restore';
-    const active = archiving ? false : restoring ? true : bool(form.active);
+    const active = bool(form.active);
     if (tab === 'tags') {
-        if (archiving)
-            return call('crm.tag.archive', { id });
         return call('crm.tag.save', { id, name: form.name ?? '', active });
     }
-    if (tab === 'members') {
-        if (archiving)
-            return call('crm.team.member.remove', { id });
-        return call('crm.team.member.save', {
-            id,
-            teamId: form.teamId ?? '',
-            userId: form.userId ?? '',
-            capacity: Number(form.capacity ?? 1),
-            sequence: Number(form.sequence ?? 10),
-            active,
-            idempotencyKey: randomUUID(),
-        });
-    }
     const fn = {
         teams: 'crm.team.save',
         stages: 'crm.stage.save',
@@ -1171,20 +1364,67 @@ async function configurationWrite(call, tab, form, id) {
         id,
         active,
         ...(form.expectedVersion ? { expectedVersion: Number(form.expectedVersion) } : {}),
-        ...(form.allowedKinds === undefined
-            ? {}
-            : {
-                allowedKinds: form.allowedKinds
-                    .split(',')
-                    .map((item) => item.trim())
-                    .filter(Boolean),
-            }),
+        ...(['stages', 'assignmentRules'].includes(tab)
+            ? { allowedKinds: ['lead', 'opportunity'].filter((kind) => bool(form[`kind_${kind}`])) }
+            : {}),
         ...(form.sequence === undefined ? {} : { sequence: Number(form.sequence) }),
         ...(form.priority === undefined ? {} : { priority: Number(form.priority) }),
+        ...(form.minimumScore === undefined || form.minimumScore === ''
+            ? { minimumScore: null }
+            : { minimumScore: form.minimumScore }),
+        ...(form.teamId === '' ? { teamId: null } : {}),
+        ...(form.assigneeUserId === '' ? { assigneeUserId: null } : {}),
+        ...(form.leaderUserId === '' ? { leaderUserId: null } : {}),
+        ...(form.fold === undefined ? {} : { fold: bool(form.fold) }),
     };
     delete values.action;
+    delete values.kind_lead;
+    delete values.kind_opportunity;
     return call(fn, { values, idempotencyKey: randomUUID() });
 }
+async function teamMemberWrite(call, form, teamId, id) {
+    return call('crm.team.member.save', {
+        id,
+        teamId,
+        userId: form.userId ?? '',
+        capacity: Number(form.capacity ?? 1),
+        sequence: Number(form.sequence ?? 10),
+        active: bool(form.active),
+        idempotencyKey: randomUUID(),
+    });
+}
+function teamMemberFields(_, editing, users) {
+    const value = (name, fallback = '') => String(editing?.[name] ?? fallback);
+    return [
+        {
+            name: 'userId',
+            label: _('crm_backend.field.assignee'),
+            type: 'select',
+            required: true,
+            value: value('userId'),
+            options: choices(users),
+        },
+        {
+            name: 'capacity',
+            label: _('crm_backend.field.capacity'),
+            type: 'number',
+            value: value('capacity', '1'),
+            help: _('crm_backend.field.capacityHint'),
+        },
+        {
+            name: 'sequence',
+            label: _('crm_backend.field.sequence'),
+            type: 'number',
+            value: value('sequence', '10'),
+        },
+        {
+            name: 'active',
+            label: _('crm_backend.field.active'),
+            type: 'checkbox',
+            value: editing ? editing.active !== false : true,
+        },
+    ];
+}
 /** The form for one configuration tab, pre-filled when a row is being edited. */
 function configurationFields(_, tab, editing, teams, users) {
     const value = (name, fallback = '') => String(editing?.[name] ?? fallback);
@@ -1197,49 +1437,19 @@ function configurationFields(_, tab, editing, teams, users) {
             value: editing ? editing.active !== false : true,
         },
     ];
-    if (tab === 'members')
-        return [
-            {
-                name: 'teamId',
-                label: _('crm_backend.field.team'),
-                type: 'select',
-                required: true,
-                value: value('teamId'),
-                options: choices(teams),
-            },
-            {
-                name: 'userId',
-                label: _('crm_backend.field.assignee'),
-                type: 'select',
-                required: true,
-                value: value('userId'),
-                options: choices(users),
-            },
-            {
-                name: 'capacity',
-                label: _('crm_backend.field.capacity'),
-                type: 'number',
-                value: value('capacity', '1'),
-            },
-            {
-                name: 'sequence',
-                label: _('crm_backend.field.sequence'),
-                type: 'number',
-                value: value('sequence', '10'),
-            },
-            {
-                name: 'active',
-                label: _('crm_backend.field.active'),
-                type: 'checkbox',
-                value: editing ? editing.active !== false : true,
-            },
-        ];
     if (tab === 'tags')
         return common;
     if (tab === 'teams')
         return [
             ...common,
             { name: 'code', label: _('crm_backend.field.code'), value: value('code'), required: true },
+            {
+                name: 'leaderUserId',
+                label: _('crm_backend.field.teamLeader'),
+                type: 'select',
+                value: value('leaderUserId'),
+                options: [{ value: '', label: _('crm_backend.value.unset') }, ...choices(users)],
+            },
             {
                 name: 'assignmentMode',
                 label: _('crm_backend.field.assignmentMode'),
@@ -1264,9 +1474,23 @@ function configurationFields(_, tab, editing, teams, users) {
             {
                 name: 'allowedKinds',
                 label: _('crm_backend.field.allowedKinds'),
-                value: Array.isArray(editing?.allowedKinds)
-                    ? editing.allowedKinds.map(String).join(',')
-                    : 'lead,opportunity',
+                type: 'checkbox-group',
+                required: true,
+                options: ['lead', 'opportunity'].map((kind) => ({
+                    name: `kind_${kind}`,
+                    value: '1',
+                    label: _(`crm.kind.${kind}`),
+                    checked: editing
+                        ? Array.isArray(editing.allowedKinds) && editing.allowedKinds.includes(kind)
+                        : true,
+                })),
+            },
+            {
+                name: 'teamId',
+                label: _('crm_backend.field.team'),
+                type: 'select',
+                value: value('teamId'),
+                options: [{ value: '', label: _('crm_backend.value.allTeams') }, ...choices(teams)],
             },
             {
                 name: 'terminalState',
@@ -1275,6 +1499,12 @@ function configurationFields(_, tab, editing, teams, users) {
                 value: value('terminalState', 'open'),
                 options: ['open', 'won', 'lost'].map((item) => ({ value: item, label: _(`crm.terminal.${item}`) })),
             },
+            {
+                name: 'fold',
+                label: _('crm_backend.field.fold'),
+                type: 'checkbox',
+                value: editing?.fold === true,
+            },
         ];
     if (tab === 'assignmentRules')
         return [
@@ -1288,9 +1518,16 @@ function configurationFields(_, tab, editing, teams, users) {
             {
                 name: 'allowedKinds',
                 label: _('crm_backend.field.allowedKinds'),
-                value: Array.isArray(editing?.allowedKinds)
-                    ? editing.allowedKinds.map(String).join(',')
-                    : 'lead,opportunity',
+                type: 'checkbox-group',
+                required: true,
+                options: ['lead', 'opportunity'].map((kind) => ({
+                    name: `kind_${kind}`,
+                    value: '1',
+                    label: _(`crm.kind.${kind}`),
+                    checked: editing
+                        ? Array.isArray(editing.allowedKinds) && editing.allowedKinds.includes(kind)
+                        : true,
+                })),
             },
             {
                 name: 'teamId',
@@ -1300,11 +1537,34 @@ function configurationFields(_, tab, editing, teams, users) {
                 value: value('teamId'),
                 options: choices(teams),
             },
+            {
+                name: 'assigneeUserId',
+                label: _('crm_backend.field.assignee'),
+                type: 'select',
+                value: value('assigneeUserId'),
+                options: [{ value: '', label: _('crm_backend.value.teamMode') }, ...choices(users)],
+            },
             { name: 'utmSource', label: _('crm_backend.field.utmSource'), value: value('utmSource') },
+            {
+                name: 'minimumScore',
+                label: _('crm_backend.field.minimumScore'),
+                type: 'number',
+                value: value('minimumScore'),
+            },
         ];
     return [
         ...common,
-        { name: 'field', label: _('crm_backend.field.ruleField'), value: value('field'), required: true },
+        {
+            name: 'field',
+            label: _('crm_backend.field.ruleField'),
+            type: 'select',
+            value: value('field', 'email'),
+            required: true,
+            options: ['email', 'utmSource', 'expectedRevenue'].map((field) => ({
+                value: field,
+                label: _(`crm_backend.scoreField.${field}`),
+            })),
+        },
         {
             name: 'operator',
             label: _('crm_backend.field.operator'),