taxtank-core 0.33.54 → 0.33.56
Sign up to get free protection for your applications and to get access to all the features.
@@ -9,10 +9,11 @@ export class SoleInvoiceCollection extends Collection {
|
|
9
9
|
getPaid(transactions) {
|
10
10
|
const amountPerInvoice = transactions.getAmountPerInvoice();
|
11
11
|
return this.filter(invoice => invoice.grossPrice > 0
|
12
|
-
&& round(amountPerInvoice.get(invoice.id), 2) >= invoice.grossPrice);
|
12
|
+
&& round(amountPerInvoice.get(invoice.id), 2) >= invoice.grossPrice.toFixed(2));
|
13
13
|
}
|
14
14
|
getUnpaid(transactions) {
|
15
|
-
|
15
|
+
const amountPerInvoice = transactions.getAmountPerInvoice();
|
16
|
+
return this.getOpen().filter(invoice => round(amountPerInvoice.get(invoice.id), 2) < invoice.grossPrice.toFixed(2));
|
16
17
|
}
|
17
18
|
getOpen() {
|
18
19
|
return this.filter((invoice) => invoice.isOpen());
|
@@ -36,4 +37,4 @@ export class SoleInvoiceCollection extends Collection {
|
|
36
37
|
return flatten(this.map(invoice => invoice.allocate(bankTransaction, amount)));
|
37
38
|
}
|
38
39
|
}
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1pbnZvaWNlLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvc29sZS9zb2xlLWludm9pY2UuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sT0FBTyxNQUFNLGdCQUFnQixDQUFDO0FBRXJDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRS9FLE9BQU8sS0FBSyxNQUFNLGNBQWMsQ0FBQztBQUVqQyxNQUFNLE9BQU8scUJBQXNCLFNBQVEsVUFBdUI7SUFDaEUsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQW9CLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFRCxPQUFPLENBQUMsWUFBbUM7UUFDekMsTUFBTSxnQkFBZ0IsR0FBRyxZQUFZLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztRQUM1RCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsVUFBVSxHQUFHLENBQUM7ZUFDL0MsS0FBSyxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQy9FLENBQUM7SUFDSixDQUFDO0lBRUQsU0FBUyxDQUFDLFlBQW1DO1FBQzNDLE1BQU0sZ0JBQWdCLEdBQUcsWUFBWSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFDNUQsT0FBTyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN0SCxDQUFDO0lBRUQsT0FBTztRQUNMLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQW9CLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFFRCxrQkFBa0I7UUFDaEIsT0FBTyxPQUFPLENBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQ3hELENBQUM7SUFDSixDQUFDO0lBRUQsWUFBWSxDQUFDLFlBQW1DO1FBQzlDLE1BQU0sZUFBZSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDL0MsTUFBTSxjQUFjLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUVwRCxlQUFlLENBQUMsR0FBRyxDQUFDLG9CQUFvQixDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7UUFDakYsZUFBZSxDQUFDLEdBQUcsQ0FDakIsb0JBQW9CLENBQUMsSUFBSSxFQUN6QixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxZQUFZLENBQUMscUJBQXFCLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQzFHLENBQUM7UUFDRixlQUFlLENBQUMsR0FBRyxDQUNqQix1QkFBdUIsQ0FBQyxJQUFJLEVBQzVCLGVBQWUsQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsVUFBVSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FDekgsQ0FBQztRQUNGLGVBQWUsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsT0FBTyxFQUFFLGNBQWMsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO1FBRS9FLE9BQU8sZUFBZSxDQUFBO0lBQ3hCLENBQUM7SUFFRCxlQUFlLENBQUMsWUFBbUM7UUFDakQsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxHQUFHLFlBQVksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzFGLENBQUM7SUFFRCxRQUFRLENBQUMsZUFBZ0MsRUFBRSxNQUFlO1FBQ3hELE9BQU8sT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWUsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakYsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHsgQmFua1RyYW5zYWN0aW9uLCBTb2xlSW52b2ljZSwgVHJhbnNhY3Rpb24gfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IGZsYXR0ZW4gZnJvbSAnbG9kYXNoL2ZsYXR0ZW4nO1xuaW1wb3J0IHsgVHJhbnNhY3Rpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vdHJhbnNhY3Rpb24nO1xuaW1wb3J0IHsgU29sZUludm9pY2VTdGF0ZUVudW0sIFNvbGVJbnZvaWNlU3RhdHVzZXNFbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMnO1xuaW1wb3J0IHsgQ29sbGVjdGlvbkRpY3Rpb25hcnkgfSBmcm9tICcuLi9jb2xsZWN0aW9uLWRpY3Rpb25hcnknO1xuaW1wb3J0IHJvdW5kIGZyb20gJ2xvZGFzaC9yb3VuZCc7XG5cbmV4cG9ydCBjbGFzcyBTb2xlSW52b2ljZUNvbGxlY3Rpb24gZXh0ZW5kcyBDb2xsZWN0aW9uPFNvbGVJbnZvaWNlPiB7XG4gIGdldE92ZXJkdWUoKTogdGhpcyB7XG4gICAgcmV0dXJuIHRoaXMuZmlsdGVyKChpbnZvaWNlOiBTb2xlSW52b2ljZSkgPT4gaW52b2ljZS5pc092ZXJkdWUoKSk7XG4gIH1cblxuICBnZXRQYWlkKHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uKTogdGhpcyB7XG4gICAgY29uc3QgYW1vdW50UGVySW52b2ljZSA9IHRyYW5zYWN0aW9ucy5nZXRBbW91bnRQZXJJbnZvaWNlKCk7XG4gICAgcmV0dXJuIHRoaXMuZmlsdGVyKGludm9pY2UgPT4gaW52b2ljZS5ncm9zc1ByaWNlID4gMFxuICAgICAgJiYgcm91bmQoYW1vdW50UGVySW52b2ljZS5nZXQoaW52b2ljZS5pZCksIDIpID49IGludm9pY2UuZ3Jvc3NQcmljZS50b0ZpeGVkKDIpXG4gICAgKTtcbiAgfVxuXG4gIGdldFVucGFpZCh0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbik6IHRoaXMge1xuICAgIGNvbnN0IGFtb3VudFBlckludm9pY2UgPSB0cmFuc2FjdGlvbnMuZ2V0QW1vdW50UGVySW52b2ljZSgpO1xuICAgIHJldHVybiB0aGlzLmdldE9wZW4oKS5maWx0ZXIoaW52b2ljZSA9PiByb3VuZChhbW91bnRQZXJJbnZvaWNlLmdldChpbnZvaWNlLmlkKSwgMikgPCBpbnZvaWNlLmdyb3NzUHJpY2UudG9GaXhlZCgyKSk7XG4gIH1cblxuICBnZXRPcGVuKCk6IHRoaXMge1xuICAgIHJldHVybiB0aGlzLmZpbHRlcigoaW52b2ljZTogU29sZUludm9pY2UpID0+IGludm9pY2UuaXNPcGVuKCkpO1xuICB9XG5cbiAgZ2V0SW52b2ljZUl0ZW1zSWRzKCk6IG51bWJlcltdIHtcbiAgICByZXR1cm4gZmxhdHRlbihcbiAgICAgIHRoaXMubWFwKGludm9pY2UgPT4gaW52b2ljZS5pdGVtcy5tYXAoaXRlbSA9PiBpdGVtLmlkKSlcbiAgICApO1xuICB9XG5cbiAgZ3JvdXBCeVN0YXRlKHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uKTogQ29sbGVjdGlvbkRpY3Rpb25hcnk8U29sZUludm9pY2VDb2xsZWN0aW9uPiB7XG4gICAgY29uc3QgaW52b2ljZXNCeVN0YXRlID0gdGhpcy5ncm91cEJ5KCdzdGF0dXMnKTtcbiAgICBjb25zdCB1bnBhaWRJbnZvaWNlcyA9IHRoaXMuZ2V0VW5wYWlkKHRyYW5zYWN0aW9ucyk7XG5cbiAgICBpbnZvaWNlc0J5U3RhdGUuYWRkKFNvbGVJbnZvaWNlU3RhdGVFbnVtLkZVTExZX1BBSUQsIHRoaXMuZ2V0UGFpZCh0cmFuc2FjdGlvbnMpKTtcbiAgICBpbnZvaWNlc0J5U3RhdGUuYWRkKFxuICAgICAgU29sZUludm9pY2VTdGF0ZUVudW0uUEFJRCxcbiAgICAgIHRoaXMuZmlsdGVyQnkoJ2lkJywgdHJhbnNhY3Rpb25zLmZpbHRlckJ5RmluYW5jaWFsWWVhcignZGF0ZScpLm1hcCh0cmFuc2FjdGlvbiA9PiB0cmFuc2FjdGlvbi5pbnZvaWNlSWQpKVxuICAgICk7XG4gICAgaW52b2ljZXNCeVN0YXRlLmFkZChcbiAgICAgIFNvbGVJbnZvaWNlU3RhdHVzZXNFbnVtLk9QRU4sXG4gICAgICBpbnZvaWNlc0J5U3RhdGUuZ2V0KFNvbGVJbnZvaWNlU3RhdHVzZXNFbnVtLk9QRU4pLnJlbW92ZShpbnZvaWNlc0J5U3RhdGUuZ2V0KFNvbGVJbnZvaWNlU3RhdGVFbnVtLkZVTExZX1BBSUQpLnRvQXJyYXkoKSlcbiAgICApO1xuICAgIGludm9pY2VzQnlTdGF0ZS5hZGQoU29sZUludm9pY2VTdGF0ZUVudW0uT1ZFUkRVRSwgdW5wYWlkSW52b2ljZXMuZ2V0T3ZlcmR1ZSgpKTtcblxuICAgIHJldHVybiBpbnZvaWNlc0J5U3RhdGVcbiAgfVxuXG4gIGdldFVucGFpZEFtb3VudCh0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbik6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMuc3VtQnkoJ2dyb3NzUHJpY2UnKSAtIHRyYW5zYWN0aW9ucy5nZXRCeUludm9pY2VzKHRoaXMpLnN1bUJ5KCdncm9zc0Ftb3VudCcpO1xuICB9XG5cbiAgYWxsb2NhdGUoYmFua1RyYW5zYWN0aW9uOiBCYW5rVHJhbnNhY3Rpb24sIGFtb3VudD86IG51bWJlcik6IFRyYW5zYWN0aW9uW10ge1xuICAgIHJldHVybiBmbGF0dGVuKHRoaXMubWFwKGludm9pY2UgPT4gaW52b2ljZS5hbGxvY2F0ZShiYW5rVHJhbnNhY3Rpb24sIGFtb3VudCkpKTtcbiAgfVxufVxuIl19
|
@@ -19,11 +19,14 @@ export class HomeOfficeCalculatorForm extends AbstractForm {
|
|
19
19
|
});
|
20
20
|
}
|
21
21
|
submit() {
|
22
|
-
let occupancyPercent =
|
23
|
-
if (
|
24
|
-
occupancyPercent
|
22
|
+
let occupancyPercent = 0;
|
23
|
+
if (this.value.officeArea && this.value.homeArea) {
|
24
|
+
occupancyPercent = this.value.officeArea * 100 / this.value.homeArea;
|
25
|
+
if (!this.value.dedicatedOffice) {
|
26
|
+
occupancyPercent *= this.value.workUsage / 100;
|
27
|
+
}
|
25
28
|
}
|
26
29
|
return super.submit({ occupancyPercent: round(occupancyPercent, 2) });
|
27
30
|
}
|
28
31
|
}
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZS1vZmZpY2UtY2FsY3VsYXRvci5mb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2Zvcm1zL2hvbWUtb2ZmaWNlL2hvbWUtb2ZmaWNlLWNhbGN1bGF0b3IuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDaEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUMvQyxPQUFPLEtBQUssTUFBTSxjQUFjLENBQUM7QUFHakMsTUFBTSxPQUFPLHdCQUF5QixTQUFRLFlBQTZCO0lBQ3pFLFlBQVksS0FBSyxHQUFHLFlBQVksQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDO1FBQ25ELEtBQUssQ0FBQztZQUNKLFFBQVEsRUFBRSxJQUFJLFdBQVcsQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ2hFLFVBQVUsRUFBRSxJQUFJLFdBQVcsQ0FBQyxLQUFLLENBQUMsVUFBVSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BFLGVBQWUsRUFBRSxJQUFJLFdBQVcsQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzlFLFNBQVMsRUFBRSxJQUFJLFdBQVcsQ0FBQyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUM5RixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRVYsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3RCLENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1lBQ3RELElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDakQsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsTUFBTTtRQUNKLElBQUksZ0JBQWdCLEdBQUcsQ0FBQyxDQUFBO1FBQ3hCLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUU7WUFDaEQsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDO1lBQ3JFLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGVBQWUsRUFBRTtnQkFDL0IsZ0JBQWdCLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLEdBQUcsR0FBRyxDQUFDO2FBQ2hEO1NBQ0Y7UUFFRCxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3hFLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEZvcm1Db250cm9sLCBWYWxpZGF0b3JzIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgcGxhaW5Ub0NsYXNzIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgQWJzdHJhY3RGb3JtIH0gZnJvbSAnLi4vYWJzdHJhY3QuZm9ybSc7XG5pbXBvcnQgeyBIb21lT2ZmaWNlQ2xhaW0gfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHJvdW5kIGZyb20gJ2xvZGFzaC9yb3VuZCc7XG5pbXBvcnQgeyBJRXZlbnRMaXN0ZW5lciB9IGZyb20gJy4uLy4uL2ludGVyZmFjZXMnO1xuXG5leHBvcnQgY2xhc3MgSG9tZU9mZmljZUNhbGN1bGF0b3JGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPEhvbWVPZmZpY2VDbGFpbT4gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIGNvbnN0cnVjdG9yKGNsYWltID0gcGxhaW5Ub0NsYXNzKEhvbWVPZmZpY2VDbGFpbSwge30pKSB7XG4gICAgc3VwZXIoe1xuICAgICAgaG9tZUFyZWE6IG5ldyBGb3JtQ29udHJvbChjbGFpbS5ob21lQXJlYSwgW1ZhbGlkYXRvcnMucmVxdWlyZWRdKSxcbiAgICAgIG9mZmljZUFyZWE6IG5ldyBGb3JtQ29udHJvbChjbGFpbS5vZmZpY2VBcmVhLCBbVmFsaWRhdG9ycy5yZXF1aXJlZF0pLFxuICAgICAgZGVkaWNhdGVkT2ZmaWNlOiBuZXcgRm9ybUNvbnRyb2woY2xhaW0uZGVkaWNhdGVkT2ZmaWNlLCBbVmFsaWRhdG9ycy5yZXF1aXJlZF0pLFxuICAgICAgd29ya1VzYWdlOiBuZXcgRm9ybUNvbnRyb2woeyB2YWx1ZTogY2xhaW0ud29ya1VzYWdlLCBkaXNhYmxlZDogdHJ1ZSB9LCBbVmFsaWRhdG9ycy5yZXF1aXJlZF0pXG4gICAgfSwgY2xhaW0pO1xuXG4gICAgdGhpcy5saXN0ZW5FdmVudHMoKTtcbiAgfVxuXG4gIGxpc3RlbkV2ZW50cygpIHtcbiAgICB0aGlzLmdldCgnZGVkaWNhdGVkT2ZmaWNlJykudmFsdWVDaGFuZ2VzLnN1YnNjcmliZSgoKSA9PiB7XG4gICAgICB0aGlzLnRvZ2dsZUVuYWJsZWRTdGF0ZSh0aGlzLmdldCgnd29ya1VzYWdlJykpO1xuICAgIH0pO1xuICB9XG5cbiAgc3VibWl0KCk6IEhvbWVPZmZpY2VDbGFpbSB7XG4gICAgbGV0IG9jY3VwYW5jeVBlcmNlbnQgPSAwXG4gICAgaWYgKHRoaXMudmFsdWUub2ZmaWNlQXJlYSAmJiB0aGlzLnZhbHVlLmhvbWVBcmVhKSB7XG4gICAgICBvY2N1cGFuY3lQZXJjZW50ID0gdGhpcy52YWx1ZS5vZmZpY2VBcmVhICogMTAwIC8gdGhpcy52YWx1ZS5ob21lQXJlYTtcbiAgICAgIGlmICghdGhpcy52YWx1ZS5kZWRpY2F0ZWRPZmZpY2UpIHtcbiAgICAgICAgb2NjdXBhbmN5UGVyY2VudCAqPSB0aGlzLnZhbHVlLndvcmtVc2FnZSAvIDEwMDtcbiAgICAgIH1cbiAgICB9XG5cbiAgICByZXR1cm4gc3VwZXIuc3VibWl0KHsgb2NjdXBhbmN5UGVyY2VudDogcm91bmQob2NjdXBhbmN5UGVyY2VudCwgMikgfSk7XG4gIH1cbn1cbiJdfQ==
|
@@ -8312,10 +8312,11 @@ class SoleInvoiceCollection extends Collection {
|
|
8312
8312
|
getPaid(transactions) {
|
8313
8313
|
const amountPerInvoice = transactions.getAmountPerInvoice();
|
8314
8314
|
return this.filter(invoice => invoice.grossPrice > 0
|
8315
|
-
&& round(amountPerInvoice.get(invoice.id), 2) >= invoice.grossPrice);
|
8315
|
+
&& round(amountPerInvoice.get(invoice.id), 2) >= invoice.grossPrice.toFixed(2));
|
8316
8316
|
}
|
8317
8317
|
getUnpaid(transactions) {
|
8318
|
-
|
8318
|
+
const amountPerInvoice = transactions.getAmountPerInvoice();
|
8319
|
+
return this.getOpen().filter(invoice => round(amountPerInvoice.get(invoice.id), 2) < invoice.grossPrice.toFixed(2));
|
8319
8320
|
}
|
8320
8321
|
getOpen() {
|
8321
8322
|
return this.filter((invoice) => invoice.isOpen());
|
@@ -24664,9 +24665,12 @@ class HomeOfficeCalculatorForm extends AbstractForm {
|
|
24664
24665
|
});
|
24665
24666
|
}
|
24666
24667
|
submit() {
|
24667
|
-
let occupancyPercent =
|
24668
|
-
if (
|
24669
|
-
occupancyPercent
|
24668
|
+
let occupancyPercent = 0;
|
24669
|
+
if (this.value.officeArea && this.value.homeArea) {
|
24670
|
+
occupancyPercent = this.value.officeArea * 100 / this.value.homeArea;
|
24671
|
+
if (!this.value.dedicatedOffice) {
|
24672
|
+
occupancyPercent *= this.value.workUsage / 100;
|
24673
|
+
}
|
24670
24674
|
}
|
24671
24675
|
return super.submit({ occupancyPercent: round(occupancyPercent, 2) });
|
24672
24676
|
}
|