merge: bring latest origin/main into dev (design local, logic main)
Keep the local Ant screens and icon pack. Take treasury parties, routine self-service, Tahesab auto-sync, public lead registration, and contact merge from main.
This commit is contained in:
@@ -843,7 +843,7 @@ export const ROLE_PERMISSION_ITEMS: Array<{
|
||||
{ key: "treasury_recurring", label: "مالی — تکرارشونده" },
|
||||
{ key: "treasury_reports", label: "مالی — گزارش" },
|
||||
{ key: "treasury_audit", label: "مالی — سوابق" },
|
||||
{ key: "treasury_categories", label: "مالی — دستهبندیها" },
|
||||
{ key: "treasury_categories", label: "مالی — دستهبندی" },
|
||||
{ key: "behavior", label: "شخصیتشناسی و دستیار فروش" },
|
||||
];
|
||||
|
||||
@@ -4329,6 +4329,11 @@ export interface TahesabConnectionDto {
|
||||
lastHealthAt: string | null;
|
||||
lastHealthOk: boolean | null;
|
||||
lastError: string | null;
|
||||
/** ساعتهای ۰ تا ۲۳ به وقت تهران. خالی یعنی بروزرسانی خودکار خاموش است. */
|
||||
customerSyncHours: number[];
|
||||
customerSyncLastRunAt: string | null;
|
||||
customerSyncLastSummary: string | null;
|
||||
customerSyncLastError: string | null;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
}
|
||||
@@ -4343,7 +4348,11 @@ export interface CreateTahesabConnectionRequest {
|
||||
allowInsecureTls?: boolean;
|
||||
}
|
||||
|
||||
export type UpdateTahesabConnectionRequest = Partial<CreateTahesabConnectionRequest>;
|
||||
export interface UpdateTahesabConnectionRequest
|
||||
extends Partial<CreateTahesabConnectionRequest> {
|
||||
/** آرایهٔ خالی بروزرسانی خودکار را خاموش میکند. */
|
||||
customerSyncHours?: number[];
|
||||
}
|
||||
|
||||
export interface PersonAccountingLinkDto {
|
||||
id: string;
|
||||
@@ -6303,6 +6312,8 @@ export interface RoutineDto {
|
||||
entityLink: RoutineEntityLink;
|
||||
reminderMinutesBefore: number | null;
|
||||
isActive: boolean;
|
||||
/** سازندهٔ روتین؛ عضو عادی فقط روتین خودش را ویرایش میکند */
|
||||
createdById: string | null;
|
||||
recurrenceLabel: string;
|
||||
/** درصد اجرا در ۳۰ روز اخیر */
|
||||
executionRate: number | null;
|
||||
@@ -6503,6 +6514,7 @@ export interface RoutineUserSettingsDto {
|
||||
export type FinancialAccountType = "bank" | "cash" | "petty";
|
||||
export type FinancialDocKind = "income" | "expense";
|
||||
export type FinancialDocStatus = "open" | "partial" | "settled" | "void";
|
||||
export type FinancialPartyKind = "person" | "company" | "user" | "other";
|
||||
export type FinancialPayMethod = "cash" | "card_to_card" | "pos" | "transfer" | "other";
|
||||
|
||||
export interface FinancialAccountDto {
|
||||
@@ -6541,7 +6553,10 @@ export interface FinancialDocumentDto {
|
||||
dueAt: string | null;
|
||||
categoryId: string | null;
|
||||
categoryName: string | null;
|
||||
partyKind: FinancialPartyKind | null;
|
||||
personId: string | null;
|
||||
companyId: string | null;
|
||||
userId: string | null;
|
||||
partyName: string | null;
|
||||
accountId: string | null;
|
||||
accountName: string | null;
|
||||
@@ -6594,6 +6609,26 @@ export interface FinancialReceivableDto {
|
||||
createdAt: string;
|
||||
}
|
||||
|
||||
export interface TreasuryPartyChoiceDto {
|
||||
id: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
export interface TreasuryPartySearchDto {
|
||||
people: TreasuryPartyChoiceDto[];
|
||||
companies: TreasuryPartyChoiceDto[];
|
||||
users: TreasuryPartyChoiceDto[];
|
||||
}
|
||||
|
||||
export interface TreasuryPartyBalanceDto {
|
||||
key: string;
|
||||
partyKind: FinancialPartyKind | null;
|
||||
partyName: string;
|
||||
amount: string;
|
||||
settledAmount: string;
|
||||
remaining: string;
|
||||
}
|
||||
|
||||
export interface TreasuryDashboardDto {
|
||||
bookedIncome: string;
|
||||
actualReceipts: string;
|
||||
|
||||
Reference in New Issue
Block a user