@@ -72,9 +72,10 @@ class invoice extends Base {
7272 let cityDebitor = "" ;
7373 let addressDebitor = "" ;
7474 let countryDebitor = "CH" ;
75+ let regexAllUnderscores = / _ / g;
7576
7677 if ( nDebitorAddressFields > 0 ) {
77- nameDebitor = this . config . get ( 'invoiceAddress' ) [ 0 ] . replace ( "/_/g" , " " ) ;
78+ nameDebitor = this . config . get ( 'invoiceAddress' ) [ 0 ] . replace ( regexAllUnderscores , " " ) ;
7879 }
7980 else {
8081 nameDebitor = this . config . get ( 'invoiceAddress' ) . toString ( ) ;
@@ -83,10 +84,10 @@ class invoice extends Base {
8384 if ( nDebitorAddressFields > 2 ) {
8485 let endOfZipPosDebitor = this . config . get ( 'invoiceAddress' ) [ nDebitorAddressFields - 1 ] . search ( "[ _]" ) ;
8586 if ( endOfZipPosDebitor > 0 ) {
86- zipDebitor = this . config . get ( 'invoiceAddress' ) [ nDebitorAddressFields - 1 ] . substring ( 0 , endOfZipPosDebitor ) . replace ( "/_/g" , " " ) ;
87- cityDebitor = this . config . get ( 'invoiceAddress' ) [ nDebitorAddressFields - 1 ] . substring ( endOfZipPosDebitor + 1 ) . replace ( "/_/g" , " " ) ;
87+ zipDebitor = this . config . get ( 'invoiceAddress' ) [ nDebitorAddressFields - 1 ] . substring ( 0 , endOfZipPosDebitor ) . replace ( regexAllUnderscores , " " ) ;
88+ cityDebitor = this . config . get ( 'invoiceAddress' ) [ nDebitorAddressFields - 1 ] . substring ( endOfZipPosDebitor + 1 ) . replace ( regexAllUnderscores , " " ) ;
8889 }
89- addressDebitor = this . config . get ( 'invoiceAddress' ) [ nDebitorAddressFields - 2 ] . replace ( "/_/g" , " " ) ;
90+ addressDebitor = this . config . get ( 'invoiceAddress' ) [ nDebitorAddressFields - 2 ] . replace ( regexAllUnderscores , " " ) ;
9091 if ( zipDebitor . search ( "-" ) > 0 )
9192 {
9293 let countryZip = zipDebitor . split ( "-" ) ;
0 commit comments