extra position on invoice

Author: Andreas Müller

src/gtt-report.js

@@ -74,6 +74,8 @@ program
     .option('--invoiceDate <number>', 'date string')
     .option('--invoiceCurrencyMaxUnit <number>', 'rouning invoice total, e.g. 0.01, 0.05 or 1')
     .option('--invoicePositionText <text>', 'invoice position text')
+    .option('--invoicePositionExtraText <text>', 'extra invoice position: text')
+    .option('--invoicePositionExtraValue <number>', 'extra invoice position: value')
     .parse(process.argv);
 
 // init helpers
@@ -142,6 +144,8 @@ config
     .set('invoiceDate', program.opts().invoiceDate)
     .set('invoiceCurrencyMaxUnit', program.opts().invoiceCurrencyMaxUnit)
     .set('invoicePositionText', program.opts().invoicePositionText)
+    .set('invoicePositionExtraText', program.opts().invoicePositionExtraText)
+    .set('invoicePositionExtraValue', program.opts().invoicePositionExtraValue)
     .set('_createDump', program.opts().output === 'dump');
 
 // date shortcuts

src/output/invoice.js

@@ -21,11 +21,18 @@ class invoice extends Base {
         this.invoiceCurrencyPerHour = this.config.get('invoiceCurrencyPerHour');
         this.invoiceVAT = this.config.get('invoiceVAT');
         this.invoicePositionText = this.config.get('invoicePositionText');
+        this.invoicePositionExtraText = this.config.get('invoicePositionExtraText');
+        this.invoicePositionExtraValue = parseFloat(this.config.get('invoicePositionExtraValue'));
+        if(!this.invoicePositionExtraValue > 0) {
+            this.invoicePositionExtraValue = 0.0;
+        }
         this.invoiceCurrencyMaxUnit = this.config.get('invoiceCurrencyMaxUnit');
-        this.totalhForInvoice = (this.spent-this.spentFree) / 3600.0;
+        this.totalhForInvoice = (this.spent-this.spentFree-(this.spentHalfPrice*0.5)) / 3600.0;
         // round subtotals to 0.01 and total to invoiceCurrencyMaxUnit.
-        this.totalForInvoiceExkl = Math.round(this.totalhForInvoice * this.invoiceCurrencyPerHour * 100) * 0.01;
-        this.totalForInvoiceMwst = Math.round(this.totalhForInvoice * this.invoiceCurrencyPerHour * this.invoiceVAT * 100) * 0.01;
+        let invoiceTotal = this.totalhForInvoice * this.invoiceCurrencyPerHour + this.invoicePositionExtraValue;
+        this.totalForInvoiceH = Math.round(this.totalhForInvoice * this.invoiceCurrencyPerHour * 100) * 0.01;
+        this.totalForInvoiceExkl = Math.round(invoiceTotal * 100) * 0.01;
+        this.totalForInvoiceMwst = Math.round(invoiceTotal * this.invoiceVAT * 100) * 0.01;
         this.totalForInvoice = Math.round((this.totalForInvoiceExkl + this.totalForInvoiceMwst)/this.invoiceCurrencyMaxUnit)*this.invoiceCurrencyMaxUnit;
     }
 
@@ -124,6 +131,11 @@ class invoice extends Base {
         svg.instance.viewBox(0,0,740,420)
         svg.instance.height("");
         svg.instance.width("");
+        let extra = "";
+        if(this.invoicePositionExtraValue > 0) {
+            extra = `<div class="positionDesc">${this.invoicePositionExtraText}</div>
+            <div class="positionValue">${this.invoiceCurrency} ${this.invoicePositionExtraValue.toFixed(2)}</div>`;
+        }
 
         this.out += 
 `<div class="senderBox">${from}</div>
@@ -140,7 +152,8 @@ ${opening}
 
 <div class="positionBox">
 <div class="positionDesc">${this.invoicePositionText} (${this.totalhForInvoice.toFixed(2)} Stunden zu ${this.invoiceCurrencyPerHour} ${this.invoiceCurrency})</div>
-<div class="positionValue">${this.invoiceCurrency} ${this.totalForInvoiceExkl.toFixed(2)}</div>
+<div class="positionValue">${this.invoiceCurrency} ${this.totalForInvoiceH.toFixed(2)}</div>
+${extra}
 <div class="positionDesc">MWST (${this.invoiceVAT*100}%)</div>
 <div class="positionValue">${this.invoiceCurrency} ${this.totalForInvoiceMwst.toFixed(2)}</div>
 <div class="positionDescTot">Rechnungsbetrag inkl. MWST</div>