diff --git a/app/lib/actions/locationActions.ts b/app/lib/actions/locationActions.ts index 940d948..c3daf65 100644 --- a/app/lib/actions/locationActions.ts +++ b/app/lib/actions/locationActions.ts @@ -20,6 +20,7 @@ export type State = { tenantLastName?: string[]; autoBillFwd?: string[]; tenantEmail?: string[]; + billFwdStrategy?: string[]; }; message?:string | null; }; @@ -37,6 +38,7 @@ const FormSchema = (t:IntlTemplateFn) => z.object({ tenantLastName: z.string().optional().nullable(), autoBillFwd: z.boolean().optional().nullable(), tenantEmail: z.string().email(t("tenant-email-invalid")).optional().or(z.literal("")).nullable(), + billFwdStrategy: z.enum(["when-payed", "when-attached"]).optional().nullable(), addToSubsequentMonths: z.boolean().optional().nullable(), updateScope: z.enum(["current", "subsequent", "all"]).optional().nullable(), }) @@ -92,6 +94,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat tenantLastName: formData.get('tenantLastName') || null, autoBillFwd: formData.get('autoBillFwd') === 'on', tenantEmail: formData.get('tenantEmail') || null, + billFwdStrategy: formData.get('billFwdStrategy') as "when-payed" | "when-attached" | undefined, addToSubsequentMonths: formData.get('addToSubsequentMonths') === 'on', updateScope: formData.get('updateScope') as "current" | "subsequent" | "all" | undefined, }); @@ -112,6 +115,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat tenantLastName, autoBillFwd, tenantEmail, + billFwdStrategy, addToSubsequentMonths, updateScope, } = validatedFields.data; @@ -150,6 +154,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat tenantLastName: tenantLastName || null, autoBillFwd: autoBillFwd || false, tenantEmail: tenantEmail || null, + billFwdStrategy: billFwdStrategy || "when-payed", } } ); @@ -176,6 +181,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat tenantLastName: tenantLastName || null, autoBillFwd: autoBillFwd || false, tenantEmail: tenantEmail || null, + billFwdStrategy: billFwdStrategy || "when-payed", } } ); @@ -195,6 +201,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat tenantLastName: tenantLastName || null, autoBillFwd: autoBillFwd || false, tenantEmail: tenantEmail || null, + billFwdStrategy: billFwdStrategy || "when-payed", } } ); @@ -212,6 +219,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat tenantLastName: tenantLastName || null, autoBillFwd: autoBillFwd || false, tenantEmail: tenantEmail || null, + billFwdStrategy: billFwdStrategy || "when-payed", yearMonth: yearMonth, bills: [], }); @@ -281,6 +289,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat tenantLastName: tenantLastName || null, autoBillFwd: autoBillFwd || false, tenantEmail: tenantEmail || null, + billFwdStrategy: billFwdStrategy || "when-payed", yearMonth: { year: monthData.year, month: monthData.month }, bills: [], }); diff --git a/app/lib/db-types.ts b/app/lib/db-types.ts index 4789525..103f303 100644 --- a/app/lib/db-types.ts +++ b/app/lib/db-types.ts @@ -53,6 +53,8 @@ export interface BillingLocation { autoBillFwd?: boolean | null; /** (optional) tenant email */ tenantEmail?: string | null; + /** (optional) bill forwarding strategy */ + billFwdStrategy?: "when-payed" | "when-attached" | null; }; export enum BilledTo { diff --git a/app/ui/LocationEditForm.tsx b/app/ui/LocationEditForm.tsx index eb08593..5eaf7cd 100644 --- a/app/ui/LocationEditForm.tsx +++ b/app/ui/LocationEditForm.tsx @@ -79,107 +79,143 @@ export const LocationEditForm: FC = ({ location, yearMont

))} +
+ {t("tenant-2d-code-legend")} -
- -
- - {generateTenantCode && ( - <> -
- +
+
- -
- - handleTenantFieldChange("tenantLastName", e.target.value)} - /> -
- {state.errors?.tenantLastName && - state.errors.tenantLastName.map((error: string) => ( -

- {error} -

- ))} -
-
- - )} - -
- -
- - {autoBillFwd && ( -
- - handleTenantFieldChange("tenantEmail", e.target.value)} - /> -
- {state.errors?.tenantEmail && - state.errors.tenantEmail.map((error: string) => ( -

- {error} -

- ))} -
- )} + + {generateTenantCode && ( + <> +
+ + handleTenantFieldChange("tenantFirstName", e.target.value)} + /> +
+ {state.errors?.tenantFirstName && + state.errors.tenantFirstName.map((error: string) => ( +

+ {error} +

+ ))} +
+
+ +
+ + handleTenantFieldChange("tenantLastName", e.target.value)} + /> +
+ {state.errors?.tenantLastName && + state.errors.tenantLastName.map((error: string) => ( +

+ {error} +

+ ))} +
+
+ + )} +
+ + +
+ {t("auto-utility-bill-forwarding-legend")} +
+ +
+ + {autoBillFwd && ( + <> +
+
+ {t("utility-bill-forwarding-strategy-label")} +
+
+ + +
+
+
+ + handleTenantFieldChange("tenantEmail", e.target.value)} + /> +
+ {state.errors?.tenantEmail && + state.errors.tenantEmail.map((error: string) => ( +

+ {error} +

+ ))} +
+
+ + )} +
{/* Show different options for add vs edit operations */} {!location ? ( diff --git a/messages/en.json b/messages/en.json index 589996a..03319ed 100644 --- a/messages/en.json +++ b/messages/en.json @@ -124,14 +124,19 @@ "location-edit-form": { "location-name-placeholder": "Realestate name", "notes-placeholder": "Notes", - "generate-tenant-code": "generate 2D code for tenant", + "tenant-2d-code-legend": "TENANT 2D CODE", + "tenant-2d-code-toggle-label": "generate 2d code", "tenant-first-name-label": "Tenant First Name", "tenant-first-name-placeholder": "Enter tenant's first name", "tenant-last-name-label": "Tenant Last Name", "tenant-last-name-placeholder": "Enter tenant's last name", - "auto-utility-bill-forwarding": "automatic utility bill forwarding", + "auto-utility-bill-forwarding-legend": "AUTOMATIC UTILITY BILL FORWARDING", + "auto-utility-bill-forwarding-toggle-label": "forward utility bills", "tenant-email-label": "Tenant Email", "tenant-email-placeholder": "Enter tenant's email", + "utility-bill-forwarding-strategy-label": "Forward utility bills when ...", + "utility-bill-forwarding-when-payed": "all bills are marked as paid", + "utility-bill-forwarding-when-attached": "a bill (PDF) is attached to all items", "warning-missing-tenant-names": "Warning: Tenant first and last name are missing. The 2D barcode will not be displayed to the tenant when they open the shared link until both fields are filled in.", "save-button": "Save", "cancel-button": "Cancel", diff --git a/messages/hr.json b/messages/hr.json index d072a3c..60e8960 100644 --- a/messages/hr.json +++ b/messages/hr.json @@ -123,14 +123,19 @@ "location-edit-form": { "location-name-placeholder": "Ime nekretnine", "notes-placeholder": "Bilješke", - "generate-tenant-code": "generiraj 2D barkod za podstanara", + "tenant-2d-code-legend": "2D BARKOD ZA PODSTANARA", + "tenant-2d-code-toggle-label": "generiraj 2D barkod", "tenant-first-name-label": "Ime podstanara", "tenant-first-name-placeholder": "Unesite ime podstanara", "tenant-last-name-label": "Prezime podstanara", "tenant-last-name-placeholder": "Unesite prezime podstanara", - "auto-utility-bill-forwarding": "automatsko prosljeđivanje režija", + "auto-utility-bill-forwarding-legend": "AUTOMATSKO PROSLJEĐIVANJE REŽIJA", + "auto-utility-bill-forwarding-toggle-label": "proslijedi režije automatski", "tenant-email-label": "Email podstanara", "tenant-email-placeholder": "Unesite email podstanara", + "utility-bill-forwarding-strategy-label": "Režije proslijedi kada...", + "utility-bill-forwarding-when-payed": "sve režije označim kao plaćene", + "utility-bill-forwarding-when-attached": "za sve stavke priložim račun (PDF)", "warning-missing-tenant-names": "Upozorenje: Ime i prezime podstanara nedostaju. 2D barkod neće biti prikazan podstanaru kada otvori podijeljenu poveznicu dok oba polja ne budu popunjena.", "save-button": "Spremi", "cancel-button": "Odbaci",