taxtank-core 0.28.85 → 0.28.86

package/fesm2015/taxtank-core.js

@@ -4749,7 +4749,7 @@ class Property extends Property$1 {
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217415928/Dashboard+Property
      */
     getTaxPosition(transactions, depreciations) {
-        return transactions.cashPosition - Math.abs(depreciations.claimAmount);
+        return transactions.grossClaimAmount - Math.abs(depreciations.claimAmount);
     }
 }
 /**
@@ -6263,26 +6263,18 @@ class TransactionCollection extends ExportableCollection {
             return sum + transaction.getUnallocatedAmount(allocations.filterBy('transaction.id', transaction.id));
         }, 0);
     }
-    /**
-     * Get cash position
-     * Cash Position = Income - Expenses
-     * Cash position is equal to Total Amount because income is positive and expense is negative,
-     */
-    get cashPosition() {
-        return this.grossAmount;
-    }
     /**
      * get date of the last transaction
      */
     getLastTransactionDate() {
         return new Date(Math.max.apply(Math, this.items.map((transaction) => transaction.date)));
     }
-    /**
-     * Get summary of claim amounts
-     */
     get claimAmount() {
         return this.items.reduce((sum, transaction) => sum + transaction.claimAmount, 0);
     }
+    get grossClaimAmount() {
+        return this.items.reduce((sum, transaction) => sum + transaction.grossClaimAmount, 0);
+    }
     get grossAmount() {
         return this.items.reduce((sum, transaction) => sum + transaction.grossAmount, 0);
     }
@@ -14293,7 +14285,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
 class PropertyCalculationService {
     getTaxPosition(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);
     }
     getTaxPosition$(transactions$, depreciations$) {
         return combineLatest([
@@ -14424,7 +14416,7 @@ class PropertyCalculationService {
         if (!forecastedCashPosition) {
             return 0;
         }
-        return (transactions.cashPosition - forecastedCashPosition) / forecastedCashPosition;
+        return (transactions.grossClaimAmount - forecastedCashPosition) / forecastedCashPosition;
     }
     /**
      * Get Badge for single property in collection
@@ -14759,20 +14751,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }] });
 
+/**
+ * @TODO Alex refactor
+ */
 class SubscriptionService {
-    constructor(http, eventDispatcherService, sseService, environment) {
+    constructor(http, eventDispatcherService, sseService, toastService, environment) {
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.sseService = sseService;
+        this.toastService = toastService;
         this.environment = environment;
         this.serviceSubscriptionSubject = new ReplaySubject(1);
-        this.serviceSubscriptionsSubject = new ReplaySubject(1);
         this.servicePaymentsSubject = new ReplaySubject(1);
-        this.subscriptionChangeSubject = new BehaviorSubject(null);
         this.listenSubscriptions();
     }
     getSubscription(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(map((response) => {
                 return plainToClass(ServiceSubscription, response);
@@ -14838,20 +14834,22 @@ class SubscriptionService {
         this.sseService.on(`serviceSubscriptions`)
             .pipe(map((event) => plainToClass(ServiceSubscription, event)))
             .subscribe((subscription) => {
-            this.getSubscription(true).subscribe();
-            this.subscriptionChangeSubject.next(subscription);
+            this._serviceSubscription = subscription;
+            this.serviceSubscriptionSubject.next(this._serviceSubscription);
             this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED, null));
+            // @TODO move?
+            this.toastService.success('Subscription successfully updated');
         });
     }
 }
-SubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SubscriptionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+SubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SubscriptionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: ToastService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
 SubscriptionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SubscriptionService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SubscriptionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: SseService }, { type: ToastService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });