taxtank-core 0.32.44 → 0.32.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -7,6 +7,7 @@ export class WorkExpenseForm extends WorkTransactionForm {
|
|
|
7
7
|
// amount set automatically for chartAccounts with hours meta field
|
|
8
8
|
if (transaction.getMetaFieldValue(ChartAccountsMetaFieldListEnum.HOURS)) {
|
|
9
9
|
this.get('amount').disable();
|
|
10
|
+
this.get('amountWithGST').disable();
|
|
10
11
|
}
|
|
11
12
|
}
|
|
12
13
|
listenEvents() {
|
|
@@ -19,10 +20,14 @@ export class WorkExpenseForm extends WorkTransactionForm {
|
|
|
19
20
|
return;
|
|
20
21
|
}
|
|
21
22
|
// for home office hours expense amount is a fixed rate per hour
|
|
23
|
+
const amount = this.get('chartAccounts').value.getCurrentYearValue().value * +hoursMetaField.value;
|
|
22
24
|
this.get('amount').reset();
|
|
23
25
|
this.get('amount').disable();
|
|
24
|
-
this.get('amount').setValue(
|
|
26
|
+
this.get('amount').setValue(amount);
|
|
27
|
+
this.get('amountWithGST').reset();
|
|
28
|
+
this.get('amountWithGST').disable();
|
|
29
|
+
this.get('amountWithGST').setValue(amount);
|
|
25
30
|
});
|
|
26
31
|
}
|
|
27
32
|
}
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29yay1leHBlbnNlLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvdHJhbnNhY3Rpb24vd29yay93b3JrLWV4cGVuc2UuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHbkUsTUFBTSxPQUFPLGVBQWdCLFNBQVEsbUJBQW1CO0lBQ3RELFlBQ0UsV0FBd0IsRUFDeEIsZ0JBQXlCLEVBQ3pCLFdBQW9DLEVBQ3BDLFdBQStDLEVBQUU7UUFFakQsS0FBSyxDQUFDLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDNUQsbUVBQW1FO1FBQ25FLElBQUksV0FBVyxDQUFDLGlCQUFpQixDQUFDLDhCQUE4QixDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ3ZFLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDN0IsSUFBSSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztTQUNyQztJQUNILENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxDQUFDLDRCQUE0QixFQUFFLENBQUM7SUFDdEMsQ0FBQztJQUVELDRCQUE0QjtRQUMxQixJQUFJLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQyxVQUFrQyxFQUFFLEVBQUU7WUFDbkYsTUFBTSxjQUFjLEdBQUcsSUFBSSxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUMsTUFBTSxDQUFDLDJCQUEyQixFQUFFLDhCQUE4QixDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzVILElBQUksQ0FBQyxjQUFjLEVBQUU7Z0JBQ25CLE9BQU87YUFDUjtZQUVELGdFQUFnRTtZQUNoRSxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLEtBQUssR0FBRyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUM7WUFDbkcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUMzQixJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQzdCLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDbEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNwQyxJQUFJLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM3QyxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElFdmVudExpc3RlbmVyIH0gZnJvbSAnLi4vLi4vLi4vaW50ZXJmYWNlcyc7XG5pbXBvcnQgeyBUcmFuc2FjdGlvbiwgVHJhbnNhY3Rpb25BbGxvY2F0aW9uLCBUcmFuc2FjdGlvbk1ldGFGaWVsZCB9IGZyb20gJy4uLy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBXb3JrVHJhbnNhY3Rpb25Gb3JtIH0gZnJvbSAnLi93b3JrLXRyYW5zYWN0aW9uLmZvcm0nO1xuaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uL2NvbGxlY3Rpb25zJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNNZXRhRmllbGRMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uL2RiL0VudW1zJztcbmltcG9ydCB7IEFic3RyYWN0Q29udHJvbCB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcblxuZXhwb3J0IGNsYXNzIFdvcmtFeHBlbnNlRm9ybSBleHRlbmRzIFdvcmtUcmFuc2FjdGlvbkZvcm0gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHRyYW5zYWN0aW9uOiBUcmFuc2FjdGlvbixcbiAgICByZWdpc3RlcmVkRm9yR3N0OiBib29sZWFuLFxuICAgIGFsbG9jYXRpb25zOiBUcmFuc2FjdGlvbkFsbG9jYXRpb25bXSxcbiAgICBjb250cm9sczogeyBba2V5OiBzdHJpbmddOiBBYnN0cmFjdENvbnRyb2wgfSA9IHt9XG4gICkge1xuICAgIHN1cGVyKHRyYW5zYWN0aW9uLCByZWdpc3RlcmVkRm9yR3N0LCBhbGxvY2F0aW9ucywgY29udHJvbHMpO1xuICAgIC8vIGFtb3VudCBzZXQgYXV0b21hdGljYWxseSBmb3IgY2hhcnRBY2NvdW50cyB3aXRoIGhvdXJzIG1ldGEgZmllbGRcbiAgICBpZiAodHJhbnNhY3Rpb24uZ2V0TWV0YUZpZWxkVmFsdWUoQ2hhcnRBY2NvdW50c01ldGFGaWVsZExpc3RFbnVtLkhPVVJTKSkge1xuICAgICAgdGhpcy5nZXQoJ2Ftb3VudCcpLmRpc2FibGUoKTtcbiAgICAgIHRoaXMuZ2V0KCdhbW91bnRXaXRoR1NUJykuZGlzYWJsZSgpO1xuICAgIH1cbiAgfVxuXG4gIGxpc3RlbkV2ZW50cygpIHtcbiAgICB0aGlzLndhdGNoQ2hhcnRBY2NvdW50c01ldGFGaWVsZHMoKTtcbiAgfVxuXG4gIHdhdGNoQ2hhcnRBY2NvdW50c01ldGFGaWVsZHMoKTogdm9pZCB7XG4gICAgdGhpcy5nZXQoJ21ldGFGaWVsZHMnKS52YWx1ZUNoYW5nZXMuc3Vic2NyaWJlKChtZXRhRmllbGRzOiBUcmFuc2FjdGlvbk1ldGFGaWVsZFtdKSA9PiB7XG4gICAgICBjb25zdCBob3Vyc01ldGFGaWVsZCA9IG5ldyBDb2xsZWN0aW9uKG1ldGFGaWVsZHMpLmZpbmRCeSgnY2hhcnRBY2NvdW50c01ldGFGaWVsZC5pZCcsIENoYXJ0QWNjb3VudHNNZXRhRmllbGRMaXN0RW51bS5IT1VSUyk7XG4gICAgICBpZiAoIWhvdXJzTWV0YUZpZWxkKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cblxuICAgICAgLy8gZm9yIGhvbWUgb2ZmaWNlIGhvdXJzIGV4cGVuc2UgYW1vdW50IGlzIGEgZml4ZWQgcmF0ZSBwZXIgaG91clxuICAgICAgY29uc3QgYW1vdW50ID0gdGhpcy5nZXQoJ2NoYXJ0QWNjb3VudHMnKS52YWx1ZS5nZXRDdXJyZW50WWVhclZhbHVlKCkudmFsdWUgKiAraG91cnNNZXRhRmllbGQudmFsdWU7XG4gICAgICB0aGlzLmdldCgnYW1vdW50JykucmVzZXQoKTtcbiAgICAgIHRoaXMuZ2V0KCdhbW91bnQnKS5kaXNhYmxlKCk7XG4gICAgICB0aGlzLmdldCgnYW1vdW50Jykuc2V0VmFsdWUoYW1vdW50KTtcbiAgICAgIHRoaXMuZ2V0KCdhbW91bnRXaXRoR1NUJykucmVzZXQoKTtcbiAgICAgIHRoaXMuZ2V0KCdhbW91bnRXaXRoR1NUJykuZGlzYWJsZSgpO1xuICAgICAgdGhpcy5nZXQoJ2Ftb3VudFdpdGhHU1QnKS5zZXRWYWx1ZShhbW91bnQpO1xuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -63,8 +63,13 @@ export class ChatService extends RestService {
|
|
|
63
63
|
listenMessages() {
|
|
64
64
|
this.listenCSE(Message, (messages) => {
|
|
65
65
|
const message = messages[0];
|
|
66
|
+
console.log(message);
|
|
66
67
|
const cache = this.cache.toArray();
|
|
67
68
|
const updatedChat = cache.find((chat) => chat?.id === message.chat?.id);
|
|
69
|
+
// @TODO vik
|
|
70
|
+
if (!updatedChat) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
68
73
|
updatedChat.updatedAt = message?.createdAt;
|
|
69
74
|
this.handleResponse([updatedChat], 'put');
|
|
70
75
|
}, ['post']);
|
|
@@ -81,4 +86,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
81
86
|
type: Inject,
|
|
82
87
|
args: ['environment']
|
|
83
88
|
}] }]; } });
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhdC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2h0dHAvY2hhdC9jaGF0LnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsT0FBTyxFQUFjLFdBQVcsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNsRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHdEQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDOztBQUVyQzs7R0FFRztBQUlILE1BQU0sT0FBTyxXQUFZLFNBQVEsV0FBMkM7SUFNMUUsWUFBNkMsV0FBZ0I7UUFDM0QsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBRHdCLGdCQUFXLEdBQVgsV0FBVyxDQUFLO1FBTDdELGVBQVUsR0FBZ0IsSUFBSSxDQUFDO1FBQy9CLG9CQUFlLEdBQTBCLGNBQWMsQ0FBQztRQUN4RCxnQkFBVyxHQUFHLE9BQU8sQ0FBQztRQUN0QixvQkFBZSxHQUFpQixDQUFDLE1BQU0sRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFJaEcsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3RCLENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ25CLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztJQUN4QixDQUFDO0lBRUQsR0FBRyxDQUFDLE9BQWUsSUFBSSxDQUFDLE1BQU07UUFDNUIs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cnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IENoYXQgYXMgQ2hhdEJhc2UgfSBmcm9tICcuLi8uLi8uLi9kYi9Nb2RlbHMnO1xuaW1wb3J0IHsgUmVzdE1ldGhvZCwgUmVzdFNlcnZpY2UgfSBmcm9tICcuLi9yZXN0JztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IENoYXQsIE1lc3NhZ2UgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgQ2hhdENvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBJRXZlbnRMaXN0ZW5lciB9IGZyb20gJy4uLy4uLy4uL2ludGVyZmFjZXMnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG4vKipcbiAqIFNlcnZpY2UgZm9yIHdvcmsgd2l0aCBjaGF0c1xuICovXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBDaGF0U2VydmljZSBleHRlbmRzIFJlc3RTZXJ2aWNlPENoYXRCYXNlLCBDaGF0LCBDaGF0Q29sbGVjdGlvbj4gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIG1vZGVsQ2xhc3M6IHR5cGVvZiBDaGF0ID0gQ2hhdDtcbiAgY29sbGVjdGlvbkNsYXNzOiB0eXBlb2YgQ2hhdENvbGxlY3Rpb24gPSBDaGF0Q29sbGVjdGlvbjtcbiAgZW5kcG9pbnRVcmkgPSAnY2hhdHMnO1xuICBkaXNhYmxlZE1ldGhvZHM6IFJlc3RNZXRob2RbXSA9IFsncG9zdCcsICdwb3N0QmF0Y2gnLCAncHV0JywgJ3B1dEJhdGNoJywgJ2RlbGV0ZScsICdkZWxldGVCYXRjaCddO1xuXG4gIGNvbnN0cnVjdG9yKEBJbmplY3QoJ2Vudmlyb25tZW50JykgcHJvdGVjdGVkIGVudmlyb25tZW50OiBhbnkpIHtcbiAgICBzdXBlcihlbnZpcm9ubWVudCk7XG4gICAgdGhpcy5saXN0ZW5FdmVudHMoKTtcbiAgfVxuXG4gIGxpc3RlbkV2ZW50cygpIHtcbiAgICB0aGlzLmxpc3RlbkNoYXRzKCk7XG4gICAgdGhpcy5saXN0ZW5NZXNzYWdlcygpO1xuICB9XG5cbiAgZ2V0KHBhdGg6IHN0cmluZyA9IHRoaXMuYXBpVXJsKTogT2JzZXJ2YWJsZTxDaGF0Q29sbGVjdGlvbj4ge1xuICAgIC8vIHVzZXJzIGNvbnRhY3QgdHRBZHZpc29yIHRocm91Z2ggaW50ZXJjb20gc3VwcG9ydFxuICAgIHJldHVybiBzdXBlci5nZXQocGF0aCkucGlwZShcbiAgICAgIG1hcCgoY2hhdHMpID0+IGNoYXRzLmZpbHRlcigoY2hhdCkgPT4gY2hhdC5lbXBsb3llZS5lbWFpbCAhPT0gdGhpcy5lbnZpcm9ubWVudC50dEFkdmlzb3IpKVxuICAgICk7XG4gIH1cblxuICAvKipcbiAgICogQFRPRE8gcmVmYWN0b3Igd2l0aCBsaXN0ZW5TU0UgbWV0aG9kXG4gICAqL1xuICBsaXN0ZW5DaGF0cygpOiB2b2lkIHtcbiAgICB0aGlzLnNzZVNlcnZpY2Uub24oYGNoYXRzYCkuc3Vic2NyaWJlKChjaGF0QmFzZTogQ2hhdEJhc2UpOiB2b2lkID0+IHtcbiAgICAgIGNvbnN0IGFycmF5OiBDaGF0W10gPSB0aGlzLmNhY2hlLnRvQXJyYXkoKTtcbiAgICAgIC8vIGNoYXQgaW5zdGFuY2UgZnJvbSBldmVudFxuICAgICAgY29uc3QgZXZlbnRDaGF0OiBDaGF0ID0gcGxhaW5Ub0NsYXNzKENoYXQsIGNoYXRCYXNlKTtcbiAgICAgIC8vIGNoYXQgaW5zdGFuY2UgZnJvbSBjYWNoZVxuICAgICAgY29uc3QgY2FjaGVkQ2hhdDogQ2hhdCA9IGFycmF5LmZpbmQoKGNoYXQ6IENoYXQpOiBib29sZWFuID0+IGNoYXQuaWQgPT09IGV2ZW50Q2hhdC5pZCk7XG5cbiAgICAgIHN3aXRjaCAodHJ1ZSkge1xuICAgICAgICAvLyBhZGQgbmV3IGNoYXRcbiAgICAgICAgY2FzZSAoIWNhY2hlZENoYXQpOlxuICAgICAgICAgIHRoaXMuaGFuZGxlUmVzcG9uc2UoW2V2ZW50Q2hhdF0sICdwb3N0Jyk7XG4gICAgICAgICAgYnJlYWs7XG5cbiAgICAgICAgLy8gcmVtb3ZlIGRlYWN0aXZhdGVkIGNoYXRcbiAgICAgICAgY2FzZSAhZXZlbnRDaGF0LmlzQWN0aXZlKCk6XG4gICAgICAgICAgdGhpcy5oYW5kbGVSZXNwb25zZShbZXZlbnRDaGF0XSwgJ2RlbGV0ZScpO1xuICAgICAgICAgIGJyZWFrO1xuXG4gICAgICAgIC8vIHVwZGF0ZSBjaGF0IHdpdGggbmV3IGZpcm0gKHJlYXNzaWduKVxuICAgICAgICBjYXNlIGV2ZW50Q2hhdC5lbXBsb3llZS5pZCAhPT0gY2FjaGVkQ2hhdC5lbXBsb3llZS5pZDpcbiAgICAgICAgICB0aGlzLmhhbmRsZVJlc3BvbnNlKFtldmVudENoYXRdLCAncHV0Jyk7XG4gICAgICAgICAgYnJlYWs7XG5cbiAgICAgICAgLy8gQFRPRE8gdHlwaW5nIHdvcmtzIGJhZCB3aXRoIG1hdC10YWJzIG9uIHVzZXItYXJlYS4gTmVlZCB0byByZWZhY3RvciB0eXBpbmcgZnVuY3Rpb25hbGl0eVxuICAgICAgICAvLyB1cGRhdGUgY2FjaGUgd2l0aCB0eXBpbmcgdXNlclxuICAgICAgICAvLyBkZWZhdWx0OlxuICAgICAgICAvLyBjYWNoZWRDaGF0LnR5cGluZ1VzZXJzLnB1c2gobmV3IFVzZXIoZXZlbnRDaGF0LnR5cGluZ1VzZXIpKTtcbiAgICAgICAgLy8gcmVwbGFjZShjYWNoZSwgXy5jbG9uZShjYWNoZWRDaGF0KSk7XG4gICAgICB9XG4gICAgfSk7XG4gIH1cblxuICAvKipcbiAgICogVXBkYXRlIGNoYXQncyAndXBkYXRlZEF0JyBmaWVsZCB3aXRoIHRoZSBsYXN0IGNoYXQncyBtZXNzYWdlIGRhdGUgZm9yIGNoYXQgbGlzdCBzb3J0aW5nXG4gICAqL1xuICBwcml2YXRlIGxpc3Rlbk1lc3NhZ2VzKCk6IHZvaWQge1xuICAgIHRoaXMubGlzdGVuQ1NFKE1lc3NhZ2UsIChtZXNzYWdlczogTWVzc2FnZVtdKSA9PiB7XG4gICAgICBjb25zdCBtZXNzYWdlOiBNZXNzYWdlID0gbWVzc2FnZXNbMF07XG4gICAgICBjb25zb2xlLmxvZyhtZXNzYWdlKTtcbiAgICAgIGNvbnN0IGNhY2hlOiBDaGF0W10gPSB0aGlzLmNhY2hlLnRvQXJyYXkoKTtcbiAgICAgIGNvbnN0IHVwZGF0ZWRDaGF0OiBDaGF0ID0gY2FjaGUuZmluZCgoY2hhdDogQ2hhdCk6IGJvb2xlYW4gPT4gY2hhdD8uaWQgPT09IG1lc3NhZ2UuY2hhdD8uaWQpO1xuICAgICAgLy8gQFRPRE8gdmlrXG4gICAgICBpZiAoIXVwZGF0ZWRDaGF0KSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cblxuICAgICAgdXBkYXRlZENoYXQudXBkYXRlZEF0ID0gbWVzc2FnZT8uY3JlYXRlZEF0O1xuXG4gICAgICB0aGlzLmhhbmRsZVJlc3BvbnNlKFt1cGRhdGVkQ2hhdF0sICdwdXQnKTtcbiAgICB9LCBbJ3Bvc3QnXSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -11726,8 +11726,13 @@ class ChatService extends RestService$1 {
|
|
|
11726
11726
|
listenMessages() {
|
|
11727
11727
|
this.listenCSE(Message, (messages) => {
|
|
11728
11728
|
const message = messages[0];
|
|
11729
|
+
console.log(message);
|
|
11729
11730
|
const cache = this.cache.toArray();
|
|
11730
11731
|
const updatedChat = cache.find((chat) => chat?.id === message.chat?.id);
|
|
11732
|
+
// @TODO vik
|
|
11733
|
+
if (!updatedChat) {
|
|
11734
|
+
return;
|
|
11735
|
+
}
|
|
11731
11736
|
updatedChat.updatedAt = message?.createdAt;
|
|
11732
11737
|
this.handleResponse([updatedChat], 'put');
|
|
11733
11738
|
}, ['post']);
|
|
@@ -23388,6 +23393,7 @@ class WorkExpenseForm extends WorkTransactionForm {
|
|
|
23388
23393
|
// amount set automatically for chartAccounts with hours meta field
|
|
23389
23394
|
if (transaction.getMetaFieldValue(ChartAccountsMetaFieldListEnum.HOURS)) {
|
|
23390
23395
|
this.get('amount').disable();
|
|
23396
|
+
this.get('amountWithGST').disable();
|
|
23391
23397
|
}
|
|
23392
23398
|
}
|
|
23393
23399
|
listenEvents() {
|
|
@@ -23400,9 +23406,13 @@ class WorkExpenseForm extends WorkTransactionForm {
|
|
|
23400
23406
|
return;
|
|
23401
23407
|
}
|
|
23402
23408
|
// for home office hours expense amount is a fixed rate per hour
|
|
23409
|
+
const amount = this.get('chartAccounts').value.getCurrentYearValue().value * +hoursMetaField.value;
|
|
23403
23410
|
this.get('amount').reset();
|
|
23404
23411
|
this.get('amount').disable();
|
|
23405
|
-
this.get('amount').setValue(
|
|
23412
|
+
this.get('amount').setValue(amount);
|
|
23413
|
+
this.get('amountWithGST').reset();
|
|
23414
|
+
this.get('amountWithGST').disable();
|
|
23415
|
+
this.get('amountWithGST').setValue(amount);
|
|
23406
23416
|
});
|
|
23407
23417
|
}
|
|
23408
23418
|
}
|