Skip to content

Develop #19

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 3 commits into from
Jul 26, 2022
Merged

Develop #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43eccd9
improved addr handling
Jul 26, 2022
0b99ff5
changed replaceAll to replace with global match, for better node vers…
Jul 26, 2022
057a683
Merge pull request #18 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
16 changes: 11 additions & 5 deletions src/output/invoice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,27 @@ class invoice extends Base {
let city = this.config.get('invoiceSettings').from[3].substring(endOfZipPos + 1);

// debitor
let nDebitorAddressFields = this.config.get('invoiceAddress').length;
let nDebitorAddressFields = Array.isArray(this.config.get('invoiceAddress'))? this.config.get('invoiceAddress').length: -1;
let nameDebitor = "";
let zipDebitor = "";
let cityDebitor = "";
let addressDebitor = "";
let countryDebitor = "CH";

if(nDebitorAddressFields > 0) {
nameDebitor = this.config.get('invoiceAddress') [0].replaceAll("_", " ");
nameDebitor = this.config.get('invoiceAddress') [0].replace("/_/g", " ");
}
else {
nameDebitor = this.config.get('invoiceAddress').toString();
}

if(nDebitorAddressFields > 2) {
let endOfZipPosDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].search("[ _]");
zipDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(0, endOfZipPosDebitor).replaceAll("_", " ");
cityDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(endOfZipPosDebitor + 1).replaceAll("_", " ");
addressDebitor = this.config.get('invoiceAddress') [nDebitorAddressFields-2].replaceAll("_", " ");
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", " ");
}
addressDebitor = this.config.get('invoiceAddress') [nDebitorAddressFields-2].replace("/_/g", " ");
if(zipDebitor.search("-") > 0)
{
let countryZip = zipDebitor.split("-");
Expand Down