QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 05:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove empty lines from address formats

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-10-05 16:08:09 +02:00
parent c5ff1e4d4a
commit a0a9f4a768
3 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/server/src/system/models/TenantMetadata.ts
View File

@@ -1,4 +1,7 @@
import { organizationAddressTextFormat } from '@/utils/address-text-format';
import {
defaultOrganizationAddressFormat,
organizationAddressTextFormat,
} from '@/utils/address-text-format';
import BaseModel from 'models/Model';
import { getUploadedObjectUri } from '../../services/Attachments/utils';
@@ -67,14 +70,7 @@ export default class TenantMetadata extends BaseModel {
* @returns {string}
*/
public get addressTextFormatted() {
const defaultMessage = `<strong>{ORGANIZATION_NAME}</strong>
{ADDRESS_1}
{ADDRESS_2}
{CITY}, {STATE} {POSTAL_CODE}
{COUNTRY}
{PHONE}
`;
return organizationAddressTextFormat(defaultMessage, {
return organizationAddressTextFormat(defaultOrganizationAddressFormat, {
organizationName: this.name,
address1: this.address?.address1,
address2: this.address?.address2,