taxtank-core 0.28.85 → 0.28.86

package/bundles/taxtank-core.umd.js

@@ -6234,7 +6234,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));
@@ -7955,18 +7955,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 +7962,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);
@@ -17092,7 +17084,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 +17226,7 @@
             if (!forecastedCashPosition) {
                 return 0;
             }
-            return (transactions.cashPosition - forecastedCashPosition) / forecastedCashPosition;
+            return (transactions.grossClaimAmount - forecastedCashPosition) / forecastedCashPosition;
         };
         /**
          * Get Badge for single property in collection
@@ -17600,22 +17592,26 @@
                     }]
             }] });
 
+    /**
+     * @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) {
+                console.log('getSubscription');
+                this._serviceSubscription = null;
                 this.http.get(this.environment.apiV2 + "/subscriptions/last")
                     .pipe(operators.map(function (response) {
                     return classTransformer.plainToClass(ServiceSubscription, response);
@@ -17691,14 +17687,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 +17704,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']
                         }] }];