taxtank-core 0.30.91 → 0.30.93
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.
- package/esm2020/lib/models/report/sole/sole-business/sole-business-loss-report.mjs +2 -2
- package/esm2020/lib/models/toast/toast.mjs +1 -1
- package/esm2020/lib/services/http/property/property-sale/property-sale.service.mjs +1 -1
- package/esm2020/lib/services/http/service-notification/service-notification.service.mjs +13 -1
- package/esm2020/lib/services/toast/toast.service.mjs +4 -2
- package/fesm2015/taxtank-core.mjs +14 -2
- package/fesm2015/taxtank-core.mjs.map +1 -1
- package/fesm2020/taxtank-core.mjs +14 -2
- package/fesm2020/taxtank-core.mjs.map +1 -1
- package/lib/models/toast/toast.d.ts +3 -0
- package/package.json +1 -1
|
@@ -11,7 +11,7 @@ export class SoleBusinessLossReport extends AbstractModel {
|
|
|
11
11
|
const claimAmount = new TransactionCollection(transactions.toArray(), depreciations.toArray())
|
|
12
12
|
.getBusinessClaimAmount(new TransactionAllocationCollection(allocations), loss.business.id);
|
|
13
13
|
this.netIncome = claimAmount;
|
|
14
|
-
this.closeBalance = loss.offsetRule ? 0 : claimAmount - this.openBalance;
|
|
14
|
+
this.closeBalance = loss.offsetRule ? 0 : Math.min(0, claimAmount - this.openBalance);
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1idXNpbmVzcy1sb3NzLXJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvcmVwb3J0L3NvbGUvc29sZS1idXNpbmVzcy9zb2xlLWJ1c2luZXNzLWxvc3MtcmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBeUIsK0JBQStCLEVBQUUscUJBQXFCLEVBQUMsTUFBTSx5QkFBeUIsQ0FBQztBQUN2SCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHdEQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLHNCQUF1QixTQUFRLGFBQWE7SUFhdkQsWUFBWSxJQUFzQixFQUFFLFlBQW1DLEVBQUUsYUFBcUMsRUFBRSxXQUFvQztRQUNsSixLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQztRQUNwQyxNQUFNLFdBQVcsR0FBRyxJQUFJLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxhQUFhLENBQUMsT0FBTyxFQUFFLENBQUM7YUFDM0Ysc0JBQXNCLENBQUMsSUFBSSwrQkFBK0IsQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQzlGLElBQUksQ0FBQyxTQUFTLEdBQUcsV0FBVyxDQUFDO1FBRTdCLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxXQUFXLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3hGLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFNvbGVCdXNpbmVzc0xvc3MgfSBmcm9tICcuLi8uLi8uLi9zb2xlJztcbmltcG9ydCB7RGVwcmVjaWF0aW9uQ29sbGVjdGlvbiwgVHJhbnNhY3Rpb25BbGxvY2F0aW9uQ29sbGVjdGlvbiwgVHJhbnNhY3Rpb25Db2xsZWN0aW9ufSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBBYnN0cmFjdE1vZGVsIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvTW9kZWxzJztcbmltcG9ydCB7VHJhbnNhY3Rpb25BbGxvY2F0aW9ufSBmcm9tICcuLi8uLi8uLi90cmFuc2FjdGlvbic7XG5cbi8qKlxuICogQ2xhc3Mgd2l0aCBidXNpbmVzcyBsb3NzIGRldGFpbHNcbiAqIGh0dHBzOi8vdGF4dGFuay5hdGxhc3NpYW4ubmV0L3dpa2kvc3BhY2VzL1RBWFRBTksvcGFnZXMvNDY0MTM1NzkzMC9SdWxlcyt3aGVuK2ErYnVzaW5lc3MrbWFrZXMrYStsb3NzK1RheCtTdW1tYXJ5XG4gKi9cbmV4cG9ydCBjbGFzcyBTb2xlQnVzaW5lc3NMb3NzUmVwb3J0IGV4dGVuZHMgQWJzdHJhY3RNb2RlbCB7XG4gIC8qKlxuICAgKiBCdXNpbmVzcyBwcmlvciB5ZWFyIGxvc3Nlc1xuICAgKi9cbiAgb3BlbkJhbGFuY2U6IG51bWJlcjtcblxuICAvKipcbiAgICogTmV0IGluY29tZSByZWR1Y2VkIGJ5IHRoZSBvcGVuaW5nIGJhbGFuY2UgYW1vdW50LCB0aGF0IHdpbGwgYmUgY2FycmllZCBvdmVyIHRvIHRoZSBuZXh0IHllYXIsIGlmIGl0IGlzIHBvc2l0aXZlXG4gICAqL1xuICBjbG9zZUJhbGFuY2U6IG51bWJlcjtcblxuICBuZXRJbmNvbWU6IG51bWJlcjtcblxuICBjb25zdHJ1Y3Rvcihsb3NzOiBTb2xlQnVzaW5lc3NMb3NzLCB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiwgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbiwgYWxsb2NhdGlvbnM6IFRyYW5zYWN0aW9uQWxsb2NhdGlvbltdKSB7XG4gICAgc3VwZXIoKTtcbiAgICB0aGlzLm9wZW5CYWxhbmNlID0gbG9zcy5vcGVuQmFsYW5jZTtcbiAgICBjb25zdCBjbGFpbUFtb3VudCA9IG5ldyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24odHJhbnNhY3Rpb25zLnRvQXJyYXkoKSwgZGVwcmVjaWF0aW9ucy50b0FycmF5KCkpXG4gICAgICAuZ2V0QnVzaW5lc3NDbGFpbUFtb3VudChuZXcgVHJhbnNhY3Rpb25BbGxvY2F0aW9uQ29sbGVjdGlvbihhbGxvY2F0aW9ucyksIGxvc3MuYnVzaW5lc3MuaWQpO1xuICAgIHRoaXMubmV0SW5jb21lID0gY2xhaW1BbW91bnQ7XG5cbiAgICB0aGlzLmNsb3NlQmFsYW5jZSA9IGxvc3Mub2Zmc2V0UnVsZSA/IDAgOiBNYXRoLm1pbigwLCBjbGFpbUFtb3VudCAtIHRoaXMub3BlbkJhbGFuY2UpO1xuICB9XG59XG4iXX0=
|
|
@@ -7,4 +7,4 @@ export class Toast {
|
|
|
7
7
|
this.autoClose = true;
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9hc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3RvYXN0L3RvYXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBOztHQUVHO0FBQ0gsTUFBTSxPQUFPLEtBQUs7SUFBbEI7UUFJRSxhQUFRLEdBQUcsSUFBSSxDQUFDO1FBQ2hCLGNBQVMsR0FBRyxJQUFJLENBQUM7SUFJbkIsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVG9hc3RUeXBlRW51bSB9IGZyb20gJy4vdG9hc3QtdHlwZS5lbnVtJztcblxuLyoqXG4gKiBDb21tb24gdG9hc3QgbWVzc2FnZSBjbGFzc1xuICovXG5leHBvcnQgY2xhc3MgVG9hc3Qge1xuICB0eXBlOiBUb2FzdFR5cGVFbnVtO1xuICB0aXRsZTogc3RyaW5nO1xuICBtZXNzYWdlOiBzdHJpbmc7XG4gIGR1cmF0aW9uID0gMzAwMDtcbiAgYXV0b0Nsb3NlID0gdHJ1ZTtcbiAgZGF0ZTogRGF0ZTtcbiAgb25DbG9zZUNsaWNrOiAoKSA9PiB7fTtcbiAgb25DVEFDbGljazogKCkgPT4ge307XG59XG4iXX0=
|
|
@@ -20,4 +20,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
|
|
|
20
20
|
providedIn: 'root'
|
|
21
21
|
}]
|
|
22
22
|
}] });
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktc2FsZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2h0dHAvcHJvcGVydHkvcHJvcGVydHktc2FsZS9wcm9wZXJ0eS1zYWxlLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFjLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNyRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQzs7QUFLakUsTUFBTSxPQUFPLG1CQUFvQixTQUFRLFdBQW1FO0lBSDVHOztRQUlFLGVBQVUsR0FBd0IsWUFBWSxDQUFDO1FBQy9DLG9CQUFlLEdBQWtDLHNCQUFzQixDQUFDO1FBQ3hFLGdCQUFXLEdBQUcsa0JBQWtCLENBQUM7UUFDakMsb0JBQWUsR0FBaUIsQ0FBQyxXQUFXLEVBQUUsVUFBVSxFQUFFLGFBQWEsQ0FBQyxDQUFDO0tBQzFFOztnSEFMWSxtQkFBbUI7b0hBQW5CLG1CQUFtQixjQUZsQixNQUFNOzJGQUVQLG1CQUFtQjtrQkFIL0IsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBQcm9wZXJ0eVNhbGUgYXMgUHJvcGVydHlTYWxlQmFzZSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL01vZGVscyc7XG5pbXBvcnQgeyBQcm9wZXJ0eVNhbGUgfSBmcm9tICcuLi8uLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgUmVzdE1ldGhvZCwgUmVzdFNlcnZpY2UgfSBmcm9tICcuLi8uLi9yZXN0JztcbmltcG9ydCB7IFByb3BlcnR5U2FsZUNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIFByb3BlcnR5U2FsZVNlcnZpY2UgZXh0ZW5kcyBSZXN0U2VydmljZTxQcm9wZXJ0eVNhbGVCYXNlLCBQcm9wZXJ0eVNhbGUsIFByb3BlcnR5U2FsZUNvbGxlY3Rpb24+IHtcbiAgbW9kZWxDbGFzczogdHlwZW9mIFByb3BlcnR5U2FsZSA9IFByb3BlcnR5U2FsZTtcbiAgY29sbGVjdGlvbkNsYXNzOiB0eXBlb2YgUHJvcGVydHlTYWxlQ29sbGVjdGlvbiA9IFByb3BlcnR5U2FsZUNvbGxlY3Rpb247XG4gIGVuZHBvaW50VXJpID0gJ3Byb3BlcnRpZXMvc2FsZXMnO1xuICBkaXNhYmxlZE1ldGhvZHM6IFJlc3RNZXRob2RbXSA9IFsncG9zdEJhdGNoJywgJ3B1dEJhdGNoJywgJ2RlbGV0ZUJhdGNoJ107XG59XG4iXX0=
|
|
@@ -6,6 +6,8 @@ import { RestService } from '../rest/rest-old.service';
|
|
|
6
6
|
import { AppEvent } from '../../../models/event/app-event';
|
|
7
7
|
import { AppEventTypeEnum } from '../../../models/event/app-event-type.enum';
|
|
8
8
|
import clone from 'lodash/clone';
|
|
9
|
+
import { Toast } from "../../../models/toast/toast";
|
|
10
|
+
import { ToastTypeEnum } from "../../../models/toast/toast-type.enum";
|
|
9
11
|
import * as i0 from "@angular/core";
|
|
10
12
|
import * as i1 from "@angular/common/http";
|
|
11
13
|
import * as i2 from "../../event/event-dispatcher.service";
|
|
@@ -40,6 +42,16 @@ export class ServiceNotificationService extends RestService {
|
|
|
40
42
|
}
|
|
41
43
|
else {
|
|
42
44
|
cache.unshift(notification);
|
|
45
|
+
this.toastService.add(plainToClass(Toast, {
|
|
46
|
+
type: ToastTypeEnum.INFO,
|
|
47
|
+
title: 'Information',
|
|
48
|
+
message: notification.message,
|
|
49
|
+
// read notification when user manually closed toast
|
|
50
|
+
onCloseClick: () => {
|
|
51
|
+
notification.isRead = true;
|
|
52
|
+
this.update(notification).subscribe();
|
|
53
|
+
}
|
|
54
|
+
}));
|
|
43
55
|
}
|
|
44
56
|
this.cache = cache;
|
|
45
57
|
this.cacheSubject.next(this.cache);
|
|
@@ -59,4 +71,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
|
|
|
59
71
|
type: Inject,
|
|
60
72
|
args: ['environment']
|
|
61
73
|
}] }, { type: i3.ToastService }, { type: i4.SseService }]; } });
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS1ub3RpZmljYXRpb24uc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9zZXJ2aWNlcy9odHRwL3NlcnZpY2Utbm90aWZpY2F0aW9uL3NlcnZpY2Utbm90aWZpY2F0aW9uLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRXpFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBR3ZELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUM3RSxPQUFPLEtBQUssTUFBTSxjQUFjLENBQUE7QUFFaEMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxhQUFhLEVBQUMsTUFBTSx1Q0FBdUMsQ0FBQzs7Ozs7O0FBRXJFOztHQUVHO0FBSUgsTUFBTSxPQUFPLDBCQUEyQixTQUFRLFdBQTJDO0lBS3pGLFlBQ1ksSUFBZ0IsRUFDaEIsc0JBQThDLEVBQ3ZCLFdBQWdCLEVBQ3ZDLFlBQTBCLEVBQzVCLFVBQXNCO1FBRTlCLEtBQUssQ0FBQyxJQUFJLEVBQUUsc0JBQXNCLEVBQUUsV0FBVyxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBTnJELFNBQUksR0FBSixJQUFJLENBQVk7UUFDaEIsMkJBQXNCLEdBQXRCLHNCQUFzQixDQUF3QjtRQUN2QixnQkFBVyxHQUFYLFdBQVcsQ0FBSztRQUN2QyxpQkFBWSxHQUFaLFlBQVksQ0FBYztRQUM1QixlQUFVLEdBQVYsVUFBVSxDQUFZO1FBVGhDLGVBQVUsR0FBd0IsWUFBWSxDQUFDO1FBQy9DLFFBQUcsR0FBRyx1QkFBdUIsQ0FBQztRQUM5QixZQUFPLEdBQUcsSUFBSSxDQUFDO1FBVWIsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVEOztPQUVHO0lBQ0ssbUJBQW1CO1FBQ3pCLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLHFCQUFxQixDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsZ0JBQWtDLEVBQVEsRUFBRTtZQUMvRixNQUFNLFlBQVksR0FBaUIsWUFBWSxDQUFDLFlBQVksRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO1lBQ2hGLE1BQU0sS0FBSyxHQUFtQixLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2hELDRFQUE0RTtZQUM1RSxJQUFJLFlBQVksQ0FBQyxNQUFNLEVBQUU7Z0JBQ3ZCLE9BQU8sQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLENBQUM7YUFDOUI7aUJBQU07Z0JBQ0wsS0FBSyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQztnQkFDNUIsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRTtvQkFDeEMsSUFBSSxFQUFFLGFBQWEsQ0FBQyxJQUFJO29CQUN4QixLQUFLLEVBQUUsYUFBYTtvQkFDcEIsT0FBTyxFQUFFLFlBQVksQ0FBQyxPQUFPO29CQUM3QixvREFBb0Q7b0JBQ3BELFlBQVksRUFBRSxHQUFHLEVBQUU7d0JBQ2pCLFlBQVksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDO3dCQUMzQixJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDO29CQUN4QyxDQUFDO2lCQUNGLENBQUMsQ0FBQyxDQUFBO2FBQ0o7WUFDRCxJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztZQUNuQixJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDbkMsaUZBQWlGO1lBQ2pGLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsa0JBQWtCLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztRQUN4RyxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7O3VIQTVDVSwwQkFBMEIsa0ZBUTNCLGFBQWE7MkhBUlosMEJBQTBCLGNBRnpCLE1BQU07MkZBRVAsMEJBQTBCO2tCQUh0QyxVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQjs7MEJBU0ksTUFBTTsyQkFBQyxhQUFhIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBTZXJ2aWNlTm90aWZpY2F0aW9uIGFzIE5vdGlmaWNhdGlvbkJhc2UgfSBmcm9tICcuLi8uLi8uLi9kYi9Nb2RlbHMvc2VydmljZS1ub3RpZmljYXRpb24nO1xuaW1wb3J0IHsgTm90aWZpY2F0aW9uIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL25vdGlmaWNhdGlvbi9ub3RpZmljYXRpb24nO1xuaW1wb3J0IHsgSHR0cENsaWVudCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IHJlcGxhY2UgfSBmcm9tICcuLi8uLi8uLi9mdW5jdGlvbnMvYXJyYXknO1xuaW1wb3J0IHsgcGxhaW5Ub0NsYXNzIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgUmVzdFNlcnZpY2UgfSBmcm9tICcuLi9yZXN0L3Jlc3Qtb2xkLnNlcnZpY2UnO1xuaW1wb3J0IHsgRXZlbnREaXNwYXRjaGVyU2VydmljZSB9IGZyb20gJy4uLy4uL2V2ZW50L2V2ZW50LWRpc3BhdGNoZXIuc2VydmljZSc7XG5pbXBvcnQgeyBTc2VTZXJ2aWNlIH0gZnJvbSAnLi4vLi4vZXZlbnQvc3NlLnNlcnZpY2UnO1xuaW1wb3J0IHsgQXBwRXZlbnQgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMvZXZlbnQvYXBwLWV2ZW50JztcbmltcG9ydCB7IEFwcEV2ZW50VHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMvZXZlbnQvYXBwLWV2ZW50LXR5cGUuZW51bSc7XG5pbXBvcnQgY2xvbmUgZnJvbSAnbG9kYXNoL2Nsb25lJ1xuaW1wb3J0IHsgVG9hc3RTZXJ2aWNlIH0gZnJvbSAnLi4vLi4vdG9hc3QvdG9hc3Quc2VydmljZSc7XG5pbXBvcnQgeyBUb2FzdCB9IGZyb20gXCIuLi8uLi8uLi9tb2RlbHMvdG9hc3QvdG9hc3RcIjtcbmltcG9ydCB7IFRvYXN0VHlwZUVudW19IGZyb20gXCIuLi8uLi8uLi9tb2RlbHMvdG9hc3QvdG9hc3QtdHlwZS5lbnVtXCI7XG5cbi8qKlxuICogU2VydmljZSB0byBoYW5kbGUgc2VydmljZSBub3RpZmljYXRpb25zIGxvZ2ljXG4gKi9cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIFNlcnZpY2VOb3RpZmljYXRpb25TZXJ2aWNlIGV4dGVuZHMgUmVzdFNlcnZpY2U8Tm90aWZpY2F0aW9uQmFzZSwgTm90aWZpY2F0aW9uPiB7XG4gIG1vZGVsQ2xhc3M6IHR5cGVvZiBOb3RpZmljYXRpb24gPSBOb3RpZmljYXRpb247XG4gIHVybCA9ICdzZXJ2aWNlLW5vdGlmaWNhdGlvbnMnO1xuICBpc0h5ZHJhID0gdHJ1ZTtcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcm90ZWN0ZWQgaHR0cDogSHR0cENsaWVudCxcbiAgICBwcm90ZWN0ZWQgZXZlbnREaXNwYXRjaGVyU2VydmljZTogRXZlbnREaXNwYXRjaGVyU2VydmljZSxcbiAgICBASW5qZWN0KCdlbnZpcm9ubWVudCcpIHByb3RlY3RlZCBlbnZpcm9ubWVudDogYW55LFxuICAgIHByb3RlY3RlZCB0b2FzdFNlcnZpY2U6IFRvYXN0U2VydmljZSxcbiAgICBwcml2YXRlIHNzZVNlcnZpY2U6IFNzZVNlcnZpY2VcbiAgKSB7XG4gICAgc3VwZXIoaHR0cCwgZXZlbnREaXNwYXRjaGVyU2VydmljZSwgZW52aXJvbm1lbnQsIHRvYXN0U2VydmljZSk7XG4gICAgdGhpcy5saXN0ZW5Ob3RpZmljYXRpb25zKCk7XG4gIH1cblxuICAvKipcbiAgICogc3Vic2NyaWJlIHRvIG5ldyBjaGF0IG1lc3NhZ2VzXG4gICAqL1xuICBwcml2YXRlIGxpc3Rlbk5vdGlmaWNhdGlvbnMoKTogdm9pZCB7XG4gICAgdGhpcy5zc2VTZXJ2aWNlLm9uKGBzZXJ2aWNlTm90aWZpY2F0aW9uYCkuc3Vic2NyaWJlKChub3RpZmljYXRpb25CYXNlOiBOb3RpZmljYXRpb25CYXNlKTogdm9pZCA9PiB7XG4gICAgICBjb25zdCBub3RpZmljYXRpb246IE5vdGlmaWNhdGlvbiA9IHBsYWluVG9DbGFzcyhOb3RpZmljYXRpb24sIG5vdGlmaWNhdGlvbkJhc2UpO1xuICAgICAgY29uc3QgY2FjaGU6IE5vdGlmaWNhdGlvbltdID0gY2xvbmUodGhpcy5jYWNoZSk7XG4gICAgICAvLyB1cGRhdGUgZXhpc3Rpbmcgbm90aWZpY2F0aW9uIGlmIHJlYWQgYW5kIGFkZCBuZXcgbm90aWZpY2F0aW9uIGlmIG5vdCByZWFkXG4gICAgICBpZiAobm90aWZpY2F0aW9uLmlzUmVhZCkge1xuICAgICAgICByZXBsYWNlKGNhY2hlLCBub3RpZmljYXRpb24pO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY2FjaGUudW5zaGlmdChub3RpZmljYXRpb24pO1xuICAgICAgICB0aGlzLnRvYXN0U2VydmljZS5hZGQocGxhaW5Ub0NsYXNzKFRvYXN0LCB7XG4gICAgICAgICAgdHlwZTogVG9hc3RUeXBlRW51bS5JTkZPLFxuICAgICAgICAgIHRpdGxlOiAnSW5mb3JtYXRpb24nLFxuICAgICAgICAgIG1lc3NhZ2U6IG5vdGlmaWNhdGlvbi5tZXNzYWdlLFxuICAgICAgICAgIC8vIHJlYWQgbm90aWZpY2F0aW9uIHdoZW4gdXNlciBtYW51YWxseSBjbG9zZWQgdG9hc3RcbiAgICAgICAgICBvbkNsb3NlQ2xpY2s6ICgpID0+IHtcbiAgICAgICAgICAgIG5vdGlmaWNhdGlvbi5pc1JlYWQgPSB0cnVlO1xuICAgICAgICAgICAgdGhpcy51cGRhdGUobm90aWZpY2F0aW9uKS5zdWJzY3JpYmUoKTtcbiAgICAgICAgICB9XG4gICAgICAgIH0pKVxuICAgICAgfVxuICAgICAgdGhpcy5jYWNoZSA9IGNhY2hlO1xuICAgICAgdGhpcy5jYWNoZVN1YmplY3QubmV4dCh0aGlzLmNhY2hlKTtcbiAgICAgIC8vIEBUT0RPIFRULTIyODAgQWxleCB3cm9uZyBldmVudCwgaXQncyB1cGRhdGVkLCBhZGRlZCBvciBkZWxldGVkLiBOb3QganVzdCBhZGRlZFxuICAgICAgdGhpcy5ldmVudERpc3BhdGNoZXJTZXJ2aWNlLmRpc3BhdGNoKG5ldyBBcHBFdmVudChBcHBFdmVudFR5cGVFbnVtLk5PVElGSUNBVElPTl9BRERFRCwgbm90aWZpY2F0aW9uKSk7XG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -15,7 +15,9 @@ export class ToastService {
|
|
|
15
15
|
return this.toast$.asObservable();
|
|
16
16
|
}
|
|
17
17
|
add(toast) {
|
|
18
|
-
|
|
18
|
+
// set date to prevent closing of equal toasts (extra case)
|
|
19
|
+
toast.date = new Date(),
|
|
20
|
+
this.toast$.next(toast);
|
|
19
21
|
}
|
|
20
22
|
success(message) {
|
|
21
23
|
this.add(plainToClass(Toast, {
|
|
@@ -54,4 +56,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
|
|
|
54
56
|
providedIn: 'root'
|
|
55
57
|
}]
|
|
56
58
|
}] });
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9hc3Quc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9zZXJ2aWNlcy90b2FzdC90b2FzdC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFjLGFBQWEsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNqRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDakQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQzs7QUFFbkU7O0dBRUc7QUFJSCxNQUFNLE9BQU8sWUFBWTtJQUh6QjtRQUlFLFdBQU0sR0FBeUIsSUFBSSxhQUFhLENBQVEsQ0FBQyxDQUFDLENBQUM7S0EyQzVEO0lBekNDLEdBQUc7UUFDRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDcEMsQ0FBQztJQUVELEdBQUcsQ0FBQyxLQUFZO1FBQ2QsMkRBQTJEO1FBQzNELEtBQUssQ0FBQyxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUU7WUFDdkIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDMUIsQ0FBQztJQUVELE9BQU8sQ0FBQyxPQUFlO1FBQ3JCLElBQUksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRTtZQUMzQixJQUFJLEVBQUUsYUFBYSxDQUFDLE9BQU87WUFDM0IsS0FBSyxFQUFFLFVBQVU7WUFDakIsT0FBTztTQUNSLENBQUMsQ0FBQyxDQUFBO0lBQ0wsQ0FBQztJQUVELE9BQU8sQ0FBQyxPQUFlO1FBQ3JCLElBQUksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRTtZQUMzQixJQUFJLEVBQUUsYUFBYSxDQUFDLE9BQU87WUFDM0IsS0FBSyxFQUFFLGVBQWU7WUFDdEIsT0FBTztTQUNSLENBQUMsQ0FBQyxDQUFBO0lBQ0wsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFlO1FBQ25CLElBQUksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRTtZQUMzQixJQUFJLEVBQUUsYUFBYSxDQUFDLEtBQUs7WUFDekIsS0FBSyxFQUFFLFFBQVE7WUFDZixPQUFPO1NBQ1IsQ0FBQyxDQUFDLENBQUE7SUFDTCxDQUFDO0lBRUQsSUFBSSxDQUFDLE9BQWU7UUFDbEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFO1lBQzNCLElBQUksRUFBRSxhQUFhLENBQUMsSUFBSTtZQUN4QixLQUFLLEVBQUUsYUFBYTtZQUNwQixPQUFPO1NBQ1IsQ0FBQyxDQUFDLENBQUE7SUFDTCxDQUFDOzt5R0EzQ1UsWUFBWTs2R0FBWixZQUFZLGNBRlgsTUFBTTsyRkFFUCxZQUFZO2tCQUh4QixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUsIFJlcGxheVN1YmplY3QgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IFRvYXN0IH0gZnJvbSAnLi4vLi4vbW9kZWxzL3RvYXN0L3RvYXN0JztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IFRvYXN0VHlwZUVudW0gfSBmcm9tICcuLi8uLi9tb2RlbHMvdG9hc3QvdG9hc3QtdHlwZS5lbnVtJztcblxuLyoqXG4gKiBwb3B1cCBub3RpZmljYXRpb25zIHNlcnZpY2UgKHRvYXN0LCBzbmFja2JhcikuXG4gKi9cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIFRvYXN0U2VydmljZSB7XG4gIHRvYXN0JDogUmVwbGF5U3ViamVjdDxUb2FzdD4gPSBuZXcgUmVwbGF5U3ViamVjdDxUb2FzdD4oMSk7XG5cbiAgZ2V0KCk6IE9ic2VydmFibGU8VG9hc3Q+IHtcbiAgICByZXR1cm4gdGhpcy50b2FzdCQuYXNPYnNlcnZhYmxlKCk7XG4gIH1cblxuICBhZGQodG9hc3Q6IFRvYXN0KTogdm9pZCB7XG4gICAgLy8gc2V0IGRhdGUgdG8gcHJldmVudCBjbG9zaW5nIG9mIGVxdWFsIHRvYXN0cyAoZXh0cmEgY2FzZSlcbiAgICB0b2FzdC5kYXRlID0gbmV3IERhdGUoKSxcbiAgICB0aGlzLnRvYXN0JC5uZXh0KHRvYXN0KTtcbiAgfVxuXG4gIHN1Y2Nlc3MobWVzc2FnZTogc3RyaW5nKTogdm9pZCB7XG4gICAgdGhpcy5hZGQocGxhaW5Ub0NsYXNzKFRvYXN0LCB7XG4gICAgICB0eXBlOiBUb2FzdFR5cGVFbnVtLlNVQ0NFU1MsXG4gICAgICB0aXRsZTogJ1N1Y2Nlc3MhJyxcbiAgICAgIG1lc3NhZ2UsXG4gICAgfSkpXG4gIH1cblxuICB3YXJuaW5nKG1lc3NhZ2U6IHN0cmluZyk6IHZvaWQge1xuICAgIHRoaXMuYWRkKHBsYWluVG9DbGFzcyhUb2FzdCwge1xuICAgICAgdHlwZTogVG9hc3RUeXBlRW51bS5XQVJOSU5HLFxuICAgICAgdGl0bGU6ICdOb3RpZmljYXRpb24hJyxcbiAgICAgIG1lc3NhZ2UsXG4gICAgfSkpXG4gIH1cblxuICBlcnJvcihtZXNzYWdlOiBzdHJpbmcpOiB2b2lkIHtcbiAgICB0aGlzLmFkZChwbGFpblRvQ2xhc3MoVG9hc3QsIHtcbiAgICAgIHR5cGU6IFRvYXN0VHlwZUVudW0uRVJST1IsXG4gICAgICB0aXRsZTogJ0Vycm9yIScsXG4gICAgICBtZXNzYWdlLFxuICAgIH0pKVxuICB9XG5cbiAgaW5mbyhtZXNzYWdlOiBzdHJpbmcpOiB2b2lkIHtcbiAgICB0aGlzLmFkZChwbGFpblRvQ2xhc3MoVG9hc3QsIHtcbiAgICAgIHR5cGU6IFRvYXN0VHlwZUVudW0uSU5GTyxcbiAgICAgIHRpdGxlOiAnSW5mb3JtYXRpb24nLFxuICAgICAgbWVzc2FnZSxcbiAgICB9KSlcbiAgfVxufVxuIl19
|
|
@@ -10042,7 +10042,9 @@ class ToastService {
|
|
|
10042
10042
|
return this.toast$.asObservable();
|
|
10043
10043
|
}
|
|
10044
10044
|
add(toast) {
|
|
10045
|
-
|
|
10045
|
+
// set date to prevent closing of equal toasts (extra case)
|
|
10046
|
+
toast.date = new Date(),
|
|
10047
|
+
this.toast$.next(toast);
|
|
10046
10048
|
}
|
|
10047
10049
|
success(message) {
|
|
10048
10050
|
this.add(plainToClass(Toast, {
|
|
@@ -11907,7 +11909,7 @@ class SoleBusinessLossReport extends AbstractModel {
|
|
|
11907
11909
|
const claimAmount = new TransactionCollection(transactions.toArray(), depreciations.toArray())
|
|
11908
11910
|
.getBusinessClaimAmount(new TransactionAllocationCollection(allocations), loss.business.id);
|
|
11909
11911
|
this.netIncome = claimAmount;
|
|
11910
|
-
this.closeBalance = loss.offsetRule ? 0 : claimAmount - this.openBalance;
|
|
11912
|
+
this.closeBalance = loss.offsetRule ? 0 : Math.min(0, claimAmount - this.openBalance);
|
|
11911
11913
|
}
|
|
11912
11914
|
}
|
|
11913
11915
|
|
|
@@ -14659,6 +14661,16 @@ class ServiceNotificationService extends RestService {
|
|
|
14659
14661
|
}
|
|
14660
14662
|
else {
|
|
14661
14663
|
cache.unshift(notification);
|
|
14664
|
+
this.toastService.add(plainToClass(Toast, {
|
|
14665
|
+
type: ToastTypeEnum.INFO,
|
|
14666
|
+
title: 'Information',
|
|
14667
|
+
message: notification.message,
|
|
14668
|
+
// read notification when user manually closed toast
|
|
14669
|
+
onCloseClick: () => {
|
|
14670
|
+
notification.isRead = true;
|
|
14671
|
+
this.update(notification).subscribe();
|
|
14672
|
+
}
|
|
14673
|
+
}));
|
|
14662
14674
|
}
|
|
14663
14675
|
this.cache = cache;
|
|
14664
14676
|
this.cacheSubject.next(this.cache);
|