Skip to content

Develop #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndu2 merged 2 commits into from
Jul 26, 2022
Merged

Develop #21

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dda2605
fix _ replacement
Jul 26, 2022
c28dbf9
Merge pull request #20 from ndu2/qrinvoice
ndu2 Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix _ replacement
  • Loading branch information
Andreas Müller committed Jul 26, 2022
commit dda2605ee90cc1e54d431d4409ca54436b987bb1
9 changes: 5 additions & 4 deletions src/output/invoice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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("-");
Expand Down