diff --git a/src/output/invoice.js b/src/output/invoice.js index 6ad80ba..0b07ee3 100644 --- a/src/output/invoice.js +++ b/src/output/invoice.js @@ -72,9 +72,10 @@ class invoice extends Base { let cityDebitor = ""; let addressDebitor = ""; let countryDebitor = "CH"; + let regexAllUnderscores = /_/g; if(nDebitorAddressFields > 0) { - nameDebitor = this.config.get('invoiceAddress') [0].replace("/_/g", " "); + nameDebitor = this.config.get('invoiceAddress') [0].replace(regexAllUnderscores, " "); } else { nameDebitor = this.config.get('invoiceAddress').toString(); @@ -83,10 +84,10 @@ class invoice extends Base { if(nDebitorAddressFields > 2) { let endOfZipPosDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].search("[ _]"); if(endOfZipPosDebitor > 0){ - zipDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(0, endOfZipPosDebitor).replace("/_/g", " "); - cityDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(endOfZipPosDebitor + 1).replace("/_/g", " "); + zipDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(0, endOfZipPosDebitor).replace(regexAllUnderscores, " "); + cityDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(endOfZipPosDebitor + 1).replace(regexAllUnderscores, " "); } - addressDebitor = this.config.get('invoiceAddress') [nDebitorAddressFields-2].replace("/_/g", " "); + addressDebitor = this.config.get('invoiceAddress') [nDebitorAddressFields-2].replace(regexAllUnderscores, " "); if(zipDebitor.search("-") > 0) { let countryZip = zipDebitor.split("-");