taxtank-core 0.28.85 → 0.28.87

package/bundles/taxtank-core.umd.js

@@ -600,23 +600,25 @@
         AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_UPDATED"] = 49] = "SOLE_DETAILS_UPDATED";
         AppEventTypeEnum[AppEventTypeEnum["SOLE_INVOICE_PUBLISHED"] = 50] = "SOLE_INVOICE_PUBLISHED";
         AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 51] = "TAX_REVIEW_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 52] = "TRANSACTION_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 53] = "TRANSACTION_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 54] = "TRANSACTION_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 55] = "TRANSACTION_UPDATED_WITH_RECEIPT";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 56] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 57] = "TRANSACTION_RECEIPT_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 58] = "TRANSACTION_RECEIPT_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 59] = "TRANSACTIONS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 60] = "USER_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 61] = "VEHICLE_CLAIM_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 62] = "VEHICLE_CLAIM_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 63] = "VEHICLE_CLAIM_DETAILS_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 64] = "VEHICLE_CLAIM_DETAILS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 65] = "VEHICLE_LOGBOOK_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 66] = "VEHICLE_LOGBOOK_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 67] = "VEHICLE_LOGBOOK_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 68] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_ALLOCATION_CREATED"] = 52] = "TRANSACTION_ALLOCATION_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_ALLOCATION_DELETED"] = 53] = "TRANSACTION_ALLOCATION_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 54] = "TRANSACTION_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 55] = "TRANSACTION_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 56] = "TRANSACTION_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 57] = "TRANSACTION_UPDATED_WITH_RECEIPT";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 58] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 59] = "TRANSACTION_RECEIPT_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 60] = "TRANSACTION_RECEIPT_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 61] = "TRANSACTIONS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 62] = "USER_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 63] = "VEHICLE_CLAIM_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 64] = "VEHICLE_CLAIM_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 65] = "VEHICLE_CLAIM_DETAILS_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 66] = "VEHICLE_CLAIM_DETAILS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 67] = "VEHICLE_LOGBOOK_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 68] = "VEHICLE_LOGBOOK_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 69] = "VEHICLE_LOGBOOK_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 70] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
     })(exports.AppEventTypeEnum || (exports.AppEventTypeEnum = {}));
 
     var EventDispatcherService = /** @class */ (function () {
@@ -6234,7 +6236,7 @@
          * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217415928/Dashboard+Property
          */
         Property.prototype.getTaxPosition = function (transactions, depreciations) {
-            return transactions.cashPosition - Math.abs(depreciations.claimAmount);
+            return transactions.grossClaimAmount - Math.abs(depreciations.claimAmount);
         };
         return Property;
     }(Property$1));
@@ -7888,7 +7890,7 @@
         PropertyCategoryMovementCollection.prototype.getByForecast = function (property, forecast) {
             var financialYear = new FinancialYear(forecast.financialYear);
             return this.filterBy('property.id', property.id).filter(function (movement) {
-                return movement.fromDate <= financialYear.endDate && movement.toDate >= financialYear.startDate;
+                return movement.fromDate <= financialYear.endDate && !movement.toDate || movement.toDate >= financialYear.startDate;
             });
         };
         PropertyCategoryMovementCollection.prototype.hasCategory = function (categoryId) {
@@ -7955,18 +7957,6 @@
                 return sum + transaction.getUnallocatedAmount(allocations.filterBy('transaction.id', transaction.id));
             }, 0);
         };
-        Object.defineProperty(TransactionCollection.prototype, "cashPosition", {
-            /**
-             * Get cash position
-             * Cash Position = Income - Expenses
-             * Cash position is equal to Total Amount because income is positive and expense is negative,
-             */
-            get: function () {
-                return this.grossAmount;
-            },
-            enumerable: false,
-            configurable: true
-        });
         /**
          * get date of the last transaction
          */
@@ -7974,15 +7964,19 @@
             return new Date(Math.max.apply(Math, this.items.map(function (transaction) { return transaction.date; })));
         };
         Object.defineProperty(TransactionCollection.prototype, "claimAmount", {
-            /**
-             * Get summary of claim amounts
-             */
             get: function () {
                 return this.items.reduce(function (sum, transaction) { return sum + transaction.claimAmount; }, 0);
             },
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(TransactionCollection.prototype, "grossClaimAmount", {
+            get: function () {
+                return this.items.reduce(function (sum, transaction) { return sum + transaction.grossClaimAmount; }, 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(TransactionCollection.prototype, "grossAmount", {
             get: function () {
                 return this.items.reduce(function (sum, transaction) { return sum + transaction.grossAmount; }, 0);
@@ -12990,6 +12984,9 @@
             _this.isHydra = true;
             return _this;
         }
+        SoleInvoiceService.prototype.listenEvents = function () {
+            this.listenAllocations();
+        };
         SoleInvoiceService.prototype.add = function (invoice) {
             var _this = this;
             return _super.prototype.add.call(this, invoice).pipe(operators.map(function (newInvoice) {
@@ -13038,6 +13035,15 @@
             var number = (_b = (_a = last__default["default"](this.cache)) === null || _a === void 0 ? void 0 : _a.number) !== null && _b !== void 0 ? _b : 0;
             return number + 1;
         };
+        SoleInvoiceService.prototype.listenAllocations = function () {
+            var _this = this;
+            this.eventDispatcherService.on([
+                exports.AppEventTypeEnum.TRANSACTION_ALLOCATION_CREATED,
+                exports.AppEventTypeEnum.TRANSACTION_ALLOCATION_DELETED
+            ]).subscribe(function () {
+                _this.resetCache();
+            });
+        };
         return SoleInvoiceService;
     }(RestService));
     SoleInvoiceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleInvoiceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
@@ -14133,6 +14139,28 @@
         TransactionAllocationService.prototype.add = function (allocation) {
             return this.addBatch([allocation]).pipe(operators.map(function (newAllocations) { return newAllocations[0]; }));
         };
+        TransactionAllocationService.prototype.addBatch = function (models, queryParams) {
+            var _this = this;
+            return _super.prototype.addBatch.call(this, models, queryParams)
+                .pipe(operators.map(function (allocations) {
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.TRANSACTION_ALLOCATION_CREATED, allocations));
+                return allocations;
+            }));
+        };
+        TransactionAllocationService.prototype.delete = function (model) {
+            var _this = this;
+            return _super.prototype.delete.call(this, model)
+                .pipe(operators.map(function () {
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.TRANSACTION_ALLOCATION_DELETED, null));
+            }));
+        };
+        TransactionAllocationService.prototype.deleteBatch = function (models) {
+            var _this = this;
+            return _super.prototype.deleteBatch.call(this, models)
+                .pipe(operators.map(function () {
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.TRANSACTION_ALLOCATION_DELETED, null));
+            }));
+        };
         /**
          * get list of transactions allocations related with passed bank transactions list
          */
@@ -17092,7 +17120,7 @@
         }
         PropertyCalculationService.prototype.getTaxPosition = function (transactions, depreciations) {
             // @TODO hack: math abs added because we have mismatching of real values signs
-            return transactions.cashPosition - Math.abs(depreciations.claimAmount);
+            return transactions.grossClaimAmount - Math.abs(depreciations.claimAmount);
         };
         PropertyCalculationService.prototype.getTaxPosition$ = function (transactions$, depreciations$) {
             var _this = this;
@@ -17234,7 +17262,7 @@
             if (!forecastedCashPosition) {
                 return 0;
             }
-            return (transactions.cashPosition - forecastedCashPosition) / forecastedCashPosition;
+            return (transactions.grossClaimAmount - forecastedCashPosition) / forecastedCashPosition;
         };
         /**
          * Get Badge for single property in collection
@@ -17600,22 +17628,25 @@
                     }]
             }] });
 
+    /**
+     * @TODO Alex refactor
+     */
     var SubscriptionService = /** @class */ (function () {
-        function SubscriptionService(http, eventDispatcherService, sseService, environment) {
+        function SubscriptionService(http, eventDispatcherService, sseService, toastService, environment) {
             this.http = http;
             this.eventDispatcherService = eventDispatcherService;
             this.sseService = sseService;
+            this.toastService = toastService;
             this.environment = environment;
             this.serviceSubscriptionSubject = new rxjs.ReplaySubject(1);
-            this.serviceSubscriptionsSubject = new rxjs.ReplaySubject(1);
             this.servicePaymentsSubject = new rxjs.ReplaySubject(1);
-            this.subscriptionChangeSubject = new rxjs.BehaviorSubject(null);
             this.listenSubscriptions();
         }
         SubscriptionService.prototype.getSubscription = function (force) {
             var _this = this;
             if (force === void 0) { force = false; }
-            if (!this._serviceSubscription || force) {
+            if (this._serviceSubscription === undefined || force) {
+                this._serviceSubscription = null;
                 this.http.get(this.environment.apiV2 + "/subscriptions/last")
                     .pipe(operators.map(function (response) {
                     return classTransformer.plainToClass(ServiceSubscription, response);
@@ -17691,14 +17722,16 @@
             this.sseService.on("serviceSubscriptions")
                 .pipe(operators.map(function (event) { return classTransformer.plainToClass(ServiceSubscription, event); }))
                 .subscribe(function (subscription) {
-                _this.getSubscription(true).subscribe();
-                _this.subscriptionChangeSubject.next(subscription);
+                _this._serviceSubscription = subscription;
+                _this.serviceSubscriptionSubject.next(_this._serviceSubscription);
                 _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED, null));
+                // @TODO move?
+                _this.toastService.success('Subscription successfully updated');
             });
         };
         return SubscriptionService;
     }());
-    SubscriptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SubscriptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: ToastService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     SubscriptionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, decorators: [{
                 type: i0.Injectable,
@@ -17706,7 +17739,7 @@
                         providedIn: 'root'
                     }]
             }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
+            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: SseService }, { type: ToastService }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
                         }] }];