Merge branch 'sz/contract-mgmt'

This commit is contained in:
seaznCode 2025-11-08 16:08:00 +01:00
commit 0bc0bd087f

View File

@ -1385,6 +1385,12 @@ exports.previewLatestForUser = async (req, res) => {
const zipCity = [vars.zip_code, vars.city].filter(Boolean).join(' ');
if (zipCity) addrParts.push(zipCity);
vars.companyFullAddress = addrParts.join(', ');
// Ensure template-prefixed company placeholders are populated
vars.companyCompanyName = vars.companyName;
vars.companyRegistrationNumber = vars.registrationNumber;
vars.companyZipCode = vars.zip_code;
vars.companyCity = vars.city;
}
} catch (e) {
logger.warn('[previewLatestForUser] load company_profiles failed', e && e.message);
@ -1492,6 +1498,12 @@ exports.previewLatestForMe = async (req, res) => {
const zipCity = [vars.zip_code, vars.city].filter(Boolean).join(' ');
if (zipCity) parts.push(zipCity);
vars.companyFullAddress = parts.join(', ');
// Ensure template-prefixed company placeholders are populated
vars.companyCompanyName = vars.companyName;
vars.companyRegistrationNumber = vars.registrationNumber;
vars.companyZipCode = vars.zip_code;
vars.companyCity = vars.city;
}
} catch (e) {
logger.warn('[previewLatestForMe] company profile lookup failed', e && e.message);