From bfa9afdb4513829b3f773c3b9269d0e06f771e85 Mon Sep 17 00:00:00 2001 From: Knee Cola Date: Tue, 18 Nov 2025 13:06:29 +0100 Subject: [PATCH] Add rent amount field to location form MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add rentAmount field to BillingLocation interface (stored in cents) - Implement Zod validation with conditional requirement when rent notification is enabled - Add rent amount input field to LocationEditForm with decimal display - Update all database operations to persist rentAmount - Add localization strings for both English and Croatian - Fix missing notes field in insertOne/insertMany operations 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- app/lib/actions/locationActions.ts | 20 +++++++++++++++ app/lib/db-types.ts | 2 ++ app/ui/LocationEditForm.tsx | 39 ++++++++++++++++++++++++------ messages/en.json | 4 +++ messages/hr.json | 4 +++ 5 files changed, 61 insertions(+), 8 deletions(-) diff --git a/app/lib/actions/locationActions.ts b/app/lib/actions/locationActions.ts index d90c530..3c1e0d1 100644 --- a/app/lib/actions/locationActions.ts +++ b/app/lib/actions/locationActions.ts @@ -22,6 +22,7 @@ export type State = { billFwdStrategy?: string[]; rentDueNotification?: string[]; rentDueDay?: string[]; + rentAmount?: string[]; }; message?:string | null; }; @@ -41,6 +42,7 @@ const FormSchema = (t:IntlTemplateFn) => z.object({ billFwdStrategy: z.enum(["when-payed", "when-attached"]).optional().nullable(), rentDueNotification: z.boolean().optional().nullable(), rentDueDay: z.coerce.number().min(1).max(31).optional().nullable(), + rentAmount: z.coerce.number().positive(t("rent-amount-positive")).optional().nullable(), addToSubsequentMonths: z.boolean().optional().nullable(), updateScope: z.enum(["current", "subsequent", "all"]).optional().nullable(), }) @@ -73,6 +75,15 @@ const FormSchema = (t:IntlTemplateFn) => z.object({ }, { message: t("tenant-email-required"), path: ["tenantEmail"], + }) + .refine((data) => { + if (data.rentDueNotification) { + return !!data.rentAmount && data.rentAmount > 0; + } + return true; + }, { + message: t("rent-amount-required"), + path: ["rentAmount"], }); /** @@ -98,6 +109,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat billFwdStrategy: formData.get('billFwdStrategy') as "when-payed" | "when-attached" | undefined, rentDueNotification: formData.get('rentDueNotification') === 'on', rentDueDay: formData.get('rentDueDay') || null, + rentAmount: formData.get('rentAmount') || null, addToSubsequentMonths: formData.get('addToSubsequentMonths') === 'on', updateScope: formData.get('updateScope') as "current" | "subsequent" | "all" | undefined, }); @@ -120,6 +132,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat billFwdStrategy, rentDueNotification, rentDueDay, + rentAmount, addToSubsequentMonths, updateScope, } = validatedFields.data; @@ -160,6 +173,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat billFwdStrategy: billFwdStrategy || "when-payed", rentDueNotification: rentDueNotification || false, rentDueDay: rentDueDay || null, + rentAmount: rentAmount || null, } } ); @@ -188,6 +202,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat billFwdStrategy: billFwdStrategy || "when-payed", rentDueNotification: rentDueNotification || false, rentDueDay: rentDueDay || null, + rentAmount: rentAmount || null, } } ); @@ -209,6 +224,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat billFwdStrategy: billFwdStrategy || "when-payed", rentDueNotification: rentDueNotification || false, rentDueDay: rentDueDay || null, + rentAmount: rentAmount || null, } } ); @@ -220,6 +236,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat userId, userEmail, name: locationName, + notes: null, generateTenantCode: generateTenantCode || false, tenantFirstName: tenantFirstName || null, tenantLastName: tenantLastName || null, @@ -228,6 +245,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat billFwdStrategy: billFwdStrategy || "when-payed", rentDueNotification: rentDueNotification || false, rentDueDay: rentDueDay || null, + rentAmount: rentAmount || null, yearMonth: yearMonth, bills: [], }); @@ -291,6 +309,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat userId, userEmail, name: locationName, + notes: null, generateTenantCode: generateTenantCode || false, tenantFirstName: tenantFirstName || null, tenantLastName: tenantLastName || null, @@ -299,6 +318,7 @@ export const updateOrAddLocation = withUser(async (user:AuthenticatedUser, locat billFwdStrategy: billFwdStrategy || "when-payed", rentDueNotification: rentDueNotification || false, rentDueDay: rentDueDay || null, + rentAmount: rentAmount || null, yearMonth: { year: monthData.year, month: monthData.month }, bills: [], }); diff --git a/app/lib/db-types.ts b/app/lib/db-types.ts index 3e73c11..ad1982c 100644 --- a/app/lib/db-types.ts +++ b/app/lib/db-types.ts @@ -61,6 +61,8 @@ export interface BillingLocation { rentDueNotification?: boolean | null; /** (optional) day of month when rent is due (1-31) */ rentDueDay?: number | null; + /** (optional) monthly rent amount in cents */ + rentAmount?: number | null; }; export enum BilledTo { diff --git a/app/ui/LocationEditForm.tsx b/app/ui/LocationEditForm.tsx index 3dd5652..38d4a99 100644 --- a/app/ui/LocationEditForm.tsx +++ b/app/ui/LocationEditForm.tsx @@ -194,14 +194,37 @@ export const LocationEditForm: FC = ({ location, yearMont {rentDueNotification && ( -
- {t("rent-due-day-label")} - -
+ <> +
+ {t("rent-due-day-label")} + +
+
+ {t("rent-amount-label")} + +
+ {state.errors?.rentAmount && + state.errors.rentAmount.map((error: string) => ( +

+ {error} +

+ ))} +
+
+ )} diff --git a/messages/en.json b/messages/en.json index 280615c..bdd9f5d 100644 --- a/messages/en.json +++ b/messages/en.json @@ -142,6 +142,8 @@ "auto-rent-notification-info": "This option enables automatic sending of monthly rent bill to the tenant via email on the specified day of the month.", "auto-rent-notification-toggle-label": "send rent notification", "rent-due-day-label": "Day of month when rent is due", + "rent-amount-label": "Monthly rent amount", + "rent-amount-placeholder": "Enter rent amount", "tenant-email-legend": "TENANT EMAIL", "tenant-email-placeholder": "Enter tenant's email", "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.", @@ -161,6 +163,8 @@ "tenant-last-name-required": "tenant last name is missing", "tenant-email-required": "tenant email is missing", "tenant-email-invalid": "email address is invalid", + "rent-amount-required": "rent amount is required when rent notification is enabled", + "rent-amount-positive": "rent amount must be a positive number", "validation-failed": "Validation failed. Please check the form and try again." } }, diff --git a/messages/hr.json b/messages/hr.json index 342ae79..f7b01db 100644 --- a/messages/hr.json +++ b/messages/hr.json @@ -141,6 +141,8 @@ "auto-rent-notification-info": "Ova opcija omogućuje automatsko slanje mjesečnog računa za najamninu podstanaru putem emaila na zadani dan u mjesecu.", "auto-rent-notification-toggle-label": "pošalji obavijest o najamnini", "rent-due-day-label": "Dan u mjesecu kada dospijeva najamnina", + "rent-amount-label": "Iznos najamnine", + "rent-amount-placeholder": "Unesite iznos najamnine", "tenant-email-legend": "EMAIL PODSTANARA", "tenant-email-placeholder": "Unesite email podstanara", "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.", @@ -160,6 +162,8 @@ "tenant-last-name-required": "nedostaje prezime podstanara", "tenant-email-required": "nedostaje email podstanara", "tenant-email-invalid": "email adresa nije ispravna", + "rent-amount-required": "iznos najamnine je obavezan kada je uključena obavijest o najamnini", + "rent-amount-positive": "iznos najamnine mora biti pozitivan broj", "validation-failed": "Validacija nije uspjela. Molimo provjerite formu i pokušajte ponovno." } },