@dvrd/dvr-controls 1.0.33 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [

package/src/js/pdf/invoiceTable/pdfInvoiceTable.tsx

@@ -25,6 +25,7 @@ interface Props {
     height?: number;
     persistent?: PDFElementPersist;
     mainFont: PdfFont;
+    subExclVat?: boolean;
 }
 
 interface State {
@@ -148,13 +149,9 @@ export default class PdfInvoiceTable extends PdfElement<Props, State> {
     };
 
     render = () => {
-        const {dragging, settings} = this.state, {
-            draggable,
-            defaultPosition,
-            width,
-            height,
-            onSaveHistory
-        } = this.props;
+        const {dragging, settings} = this.state;
+        const {draggable, defaultPosition, width, height, onSaveHistory, subExclVat} = this.props;
+        const subTotalLabel = `Subtotaal ${subExclVat ? 'excl.' : 'incl.'} BTW`;
         return (
             <WithEvents events={this.event}>
                 <PDFDraggable dragging={dragging} draggable={draggable} onDragStart={this.onDragStart}
@@ -173,7 +170,7 @@ export default class PdfInvoiceTable extends PdfElement<Props, State> {
                             <span>Aantal</span>
                             <span>Bedrag</span>
                             <span>BTW</span>
-                            <span className='end'>Subtotaal incl. BTW</span>
+                            <span className='end'>{subTotalLabel}</span>
                         </div>
                         {[1, 2].map(this.renderInvoiceLine)}
                         {this.renderTotals()}

package/src/js/pdf/pdfTemplateCreator.tsx

@@ -49,6 +49,7 @@ interface Props {
     options?: PDFOptions;
     singleImage: boolean;
     headerButtons?: Array<ReactElement>;
+    subExclVat?: boolean;
 }
 
 interface State {
@@ -203,7 +204,7 @@ export default class PDFTemplateCreator extends PureComponent<Props, State> {
         };
         const width = dimensions?.width;
         const height = dimensions?.height;
-        const {values, mainFont} = this.props;
+        const {values, mainFont, subExclVat} = this.props;
         const key: string = generateUUID();
         const sharedProps = {
             defaultPosition: position,
@@ -230,7 +231,7 @@ export default class PDFTemplateCreator extends PureComponent<Props, State> {
                 break;
             case PDFElementType.INVOICE_TABLE:
                 element = <PdfInvoiceTable {...sharedProps} width={width} height={height} mainFont={mainFont}
-                                           persistent={PDFElementPersist.PERSISTENT}/>;
+                                           persistent={PDFElementPersist.PERSISTENT} subExclVat={subExclVat}/>;
                 break;
         }
         return {element, config};

package/src/js/util/miscUtil.ts

@@ -136,8 +136,13 @@ export const shuffleArray = (arr: any[]): any[] => {
     return arr;
 };
 
-export const nullify = <T extends string | Array<any>>(value?: T | null): T | null => {
-    return value?.length ? value : null;
+export const nullify = <T extends string | Array<any> | Set<any>>(value?: T | null): T | null => {
+    if (!value) return null;
+    else if (Array.isArray(value) || typeof value === 'string')
+        return value.length ? value : null;
+    else if (value instanceof Set)
+        return value.size ? value : null;
+    return null;
 };
 
 export const undefine = (value?: string | null): string | undefined => {