taxtank-core 0.8.2 → 0.8.6

package/bundles/taxtank-core.umd.js

@@ -1261,7 +1261,7 @@
         Collection.prototype.getIds = function () {
             return this.items.map(function (item) { return item['id']; });
         };
-        Collection.prototype.getOneBy = function (path, value) {
+        Collection.prototype.findBy = function (path, value) {
             return this.items.find(function (item) { return get__default["default"](item, path) === value; });
         };
         Collection.prototype.getBy = function (path, value) {
@@ -1952,8 +1952,8 @@
         });
         DepreciationCollection.prototype.getClaimAmountByYear = function (year) {
             if (year === void 0) { year = +localStorage.getItem('financialYear'); }
-            return this.items.reduce(function (sum, depreciation) {
-                return sum + depreciation.getClaimAmountByYear(year);
+            return this.amount - this.items.reduce(function (sum, depreciation) {
+                return sum + depreciation.getCloseBalanceByYear(year);
             }, 0);
         };
         DepreciationCollection.prototype.getCloseBalanceByYear = function (year) {
@@ -2536,12 +2536,12 @@
     /**
      * collection for tax return category items
      */
-    var TaxReturnCategoryItemCollection = /** @class */ (function (_super) {
-        __extends(TaxReturnCategoryItemCollection, _super);
-        function TaxReturnCategoryItemCollection() {
+    var ReportItemCollection = /** @class */ (function (_super) {
+        __extends(ReportItemCollection, _super);
+        function ReportItemCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "salary", {
+        Object.defineProperty(ReportItemCollection.prototype, "salary", {
             /**
              * Work income
              */
@@ -2552,7 +2552,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "workExpenses", {
+        Object.defineProperty(ReportItemCollection.prototype, "workExpenses", {
             /**
              * Work expenses
              */
@@ -2563,7 +2563,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "rentalIncome", {
+        Object.defineProperty(ReportItemCollection.prototype, "rentalIncome", {
             /**
              * Property income
              */
@@ -2574,7 +2574,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "rentalDeductions", {
+        Object.defineProperty(ReportItemCollection.prototype, "rentalDeductions", {
             /**
              * Property rental deductions
              */
@@ -2585,7 +2585,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "propertyExpenses", {
+        Object.defineProperty(ReportItemCollection.prototype, "propertyExpenses", {
             /**
              * Property expenses
              */
@@ -2595,7 +2595,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "interestDeductions", {
+        Object.defineProperty(ReportItemCollection.prototype, "interestDeductions", {
             /**
              * Property interest
              */
@@ -2606,7 +2606,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "capitalWorks", {
+        Object.defineProperty(ReportItemCollection.prototype, "capitalWorks", {
             /**
              * Property capital works depreciations
              */
@@ -2617,7 +2617,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "plantEquipment", {
+        Object.defineProperty(ReportItemCollection.prototype, "plantEquipment", {
             /**
              * Property plant & equipment depreciations
              */
@@ -2628,7 +2628,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "propertyDepreciations", {
+        Object.defineProperty(ReportItemCollection.prototype, "propertyDepreciations", {
             /**
              * Total property depreciaions
              */
@@ -2638,7 +2638,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "partnershipsAndTrusts", {
+        Object.defineProperty(ReportItemCollection.prototype, "partnershipsAndTrusts", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.PARTNERSHIPS_TRUSTS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2646,7 +2646,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "pciAndSbeIncome", {
+        Object.defineProperty(ReportItemCollection.prototype, "pciAndSbeIncome", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.PCI_SBE_INCOME)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2654,7 +2654,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "capitalGains", {
+        Object.defineProperty(ReportItemCollection.prototype, "capitalGains", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.CAPITAL_GAINS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2662,7 +2662,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "foreignSourceIncome", {
+        Object.defineProperty(ReportItemCollection.prototype, "foreignSourceIncome", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.FOREIGN_SOURCE_INCOME)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2670,7 +2670,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "otherIncome", {
+        Object.defineProperty(ReportItemCollection.prototype, "otherIncome", {
             /**
              * Other income
              */
@@ -2685,7 +2685,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "otherDeductions", {
+        Object.defineProperty(ReportItemCollection.prototype, "otherDeductions", {
             /**
              * Other expenses
              */
@@ -2696,7 +2696,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "taxInstalments", {
+        Object.defineProperty(ReportItemCollection.prototype, "taxInstalments", {
             get: function () {
                 var _a;
                 return ((_a = this.getTaxCreditsCollection().getByCategory(exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2704,7 +2704,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "frankingCredits", {
+        Object.defineProperty(ReportItemCollection.prototype, "frankingCredits", {
             get: function () {
                 var _a;
                 return ((_a = this.getTaxCreditsCollection().getByCategory(exports.TaxReturnCategoryListEnum.FRANKING_CREDITS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2712,7 +2712,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "taxOffsets", {
+        Object.defineProperty(ReportItemCollection.prototype, "taxOffsets", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.TAX_OFFSETS)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2720,7 +2720,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "borrowingExpenses", {
+        Object.defineProperty(ReportItemCollection.prototype, "borrowingExpenses", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2728,7 +2728,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(TaxReturnCategoryItemCollection.prototype, "grossTaxPayable", {
+        Object.defineProperty(ReportItemCollection.prototype, "grossTaxPayable", {
             get: function () {
                 var _a;
                 return ((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.GROSS_TAX_PAYABLE)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
@@ -2739,22 +2739,22 @@
         /**
          * taxWithheld by section (work or other)
          */
-        TaxReturnCategoryItemCollection.prototype.getTaxWithheld = function (section) {
+        ReportItemCollection.prototype.getTaxWithheld = function (section) {
             if (section === void 0) { section = exports.TaxReturnCategorySectionEnum.WORK_TANK; }
             var _a;
             return ((_a = this.getTaxCreditsCollection().getByCategory(exports.TaxReturnCategoryListEnum.TAX_WITHHELD)) === null || _a === void 0 ? void 0 : _a.details.filter(function (details) { return details.section === section; }).reduce(function (sum, details) { return sum + details.amount; }, 0)) || 0;
         };
-        TaxReturnCategoryItemCollection.prototype.getTaxCreditsCollection = function () {
+        ReportItemCollection.prototype.getTaxCreditsCollection = function () {
             var _a;
-            return new TaxReturnCategoryItemCollection(((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.TAX_CREDITS)) === null || _a === void 0 ? void 0 : _a.items) || []);
+            return new ReportItemCollection(((_a = this.getByCategory(exports.TaxReturnCategoryListEnum.TAX_CREDITS)) === null || _a === void 0 ? void 0 : _a.items) || []);
         };
-        TaxReturnCategoryItemCollection.prototype.getTotalAmountByIncomeSourceName = function (name) {
+        ReportItemCollection.prototype.getTotalAmountByIncomeSourceName = function (name) {
             return this.items.reduce((function (sum, item) { return sum + item.getAmountByIncomeSourceName(name); }), 0);
         };
-        TaxReturnCategoryItemCollection.prototype.getByCategory = function (category) {
+        ReportItemCollection.prototype.getByCategory = function (category) {
             return this.items.find(function (item) { return item.taxReturnCategory.id === category; });
         };
-        return TaxReturnCategoryItemCollection;
+        return ReportItemCollection;
     }(Collection));
 
     /**
@@ -4756,7 +4756,7 @@
          * net capital gain tax (includes tax exemptions)
          */
         Property.prototype.calculateNetCGT = function (sale) {
-            return this.getCGTExemptionRatio(sale) * this.calculateCGT(sale);
+            return this.getCGTExemptionRatio(sale) * sale.cgt;
         };
         /**
          * guess tax exemption based on property details
@@ -4770,7 +4770,7 @@
                 case this.category.id === PropertyCategoryListEnum.OWNER_OCCUPIED:
                     return exports.TaxExemptionEnum.PPR;
                 // exemption for investment properties owned for at least one year
-                case this.getOwnershipDuration(sale, 'years') >= 1:
+                case this.isOneYearExemptionApplicable(sale):
                     return exports.TaxExemptionEnum.ONE_YEAR_RULE;
                 default:
                     return null;
@@ -4793,7 +4793,7 @@
                 // main residence become investment (exemption for home office percent usage)
                 case exports.TaxExemptionEnum.PPR_TO_INVESTMENT:
                     // 1 year CGT discount can still apply (on the income producing % if used for 12 months or more)
-                    var ratio = this.getOwnershipDuration(sale, 'years') >= 1 ? 0.5 : 1;
+                    var ratio = this.isOneYearExemptionApplicable(sale) ? 0.5 : 1;
                     return metadata.getClaimPercent() / 100 * ratio;
                 // full exemption
                 case exports.TaxExemptionEnum.PPR:
@@ -4806,6 +4806,9 @@
                     return 1;
             }
         };
+        Property.prototype.isOneYearExemptionApplicable = function (sale) {
+            return sale.cgt > 0 && this.getOwnershipDuration(sale, 'years') > 0;
+        };
         /**
          * ownership duration from purchase till sale
          */
@@ -7790,30 +7793,30 @@
      * Used in tax summary reports to show amounts relating to a tax return category entity and details of what this
      * amount is comprised of. Example here shows an amount of $951.96 and also details of what this amount is comprised of:
      */
-    var TaxReturnCategoryItem = /** @class */ (function () {
-        function TaxReturnCategoryItem() {
+    var ReportItem = /** @class */ (function () {
+        function ReportItem() {
         }
         /**
          * Get amount for one income source
          * @param name Name of income source for filter
          */
-        TaxReturnCategoryItem.prototype.getAmountByIncomeSourceName = function (name) {
+        ReportItem.prototype.getAmountByIncomeSourceName = function (name) {
             var _a;
             return ((_a = this.details.find(function (detail) { return detail.name === name; })) === null || _a === void 0 ? void 0 : _a.amount) || 0;
         };
-        return TaxReturnCategoryItem;
+        return ReportItem;
     }());
 
     /**
      * Used in tax summary reports to show specific details relating to an amount in the report.
-     * See structure in TaxReturnCategoryItem class.
+     * See structure in ReportItem class.
      * Example an amount of $550 for property income could be comprised of 2 different property amounts of $300 and $250.
      * This is useful in providing drill-down information for the tax summary report.
      */
-    var TaxReturnCategoryItemDetails = /** @class */ (function () {
-        function TaxReturnCategoryItemDetails() {
+    var ReportItemDetails = /** @class */ (function () {
+        function ReportItemDetails() {
         }
-        return TaxReturnCategoryItemDetails;
+        return ReportItemDetails;
     }());
 
     /**
@@ -7826,10 +7829,10 @@
         return TaxSummarySection;
     }());
     __decorate([
-        classTransformer.Type(function () { return TaxReturnCategoryItem; }),
+        classTransformer.Type(function () { return ReportItem; }),
         classTransformer.Transform(function (_a) {
             var value = _a.value;
-            return new TaxReturnCategoryItemCollection(value);
+            return new ReportItemCollection(value);
         })
     ], TaxSummarySection.prototype, "items", void 0);
     __decorate([
@@ -11406,17 +11409,24 @@
             }] });
 
     var SubscriptionService = /** @class */ (function () {
-        function SubscriptionService(http, eventDispatcherService, environment) {
+        function SubscriptionService(http, eventDispatcherService, sseService, environment) {
             this.http = http;
             this.eventDispatcherService = eventDispatcherService;
+            this.sseService = sseService;
             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.listenEvents();
         }
-        SubscriptionService.prototype.getSubscription = function () {
+        SubscriptionService.prototype.listenEvents = function () {
+            this.listenSubscriptions();
+        };
+        SubscriptionService.prototype.getSubscription = function (force) {
             var _this = this;
-            if (!this._serviceSubscription) {
+            if (force === void 0) { force = false; }
+            if (!this._serviceSubscription || force) {
                 this.http.get(this.environment.apiV2 + "/subscriptions/last")
                     .pipe(operators.map(function (response) {
                     return classTransformer.plainToClass(ServiceSubscription, response);
@@ -11443,8 +11453,18 @@
                     .subscribe(function (prices) {
                     _this._serviceSubscriptions = new ServiceSubscriptionCollection([
                         classTransformer.plainToClass(ServiceSubscription, { items: [] }),
-                        classTransformer.plainToClass(ServiceSubscription, { items: [classTransformer.plainToClass(ServiceSubscriptionItem, { price: prices.property, quantity: 2 })] }),
-                        classTransformer.plainToClass(ServiceSubscription, { items: [classTransformer.plainToClass(ServiceSubscriptionItem, { price: prices.property, quantity: 3 })] })
+                        classTransformer.plainToClass(ServiceSubscription, {
+                            items: [classTransformer.plainToClass(ServiceSubscriptionItem, {
+                                    price: prices.property,
+                                    quantity: 2
+                                })]
+                        }),
+                        classTransformer.plainToClass(ServiceSubscription, {
+                            items: [classTransformer.plainToClass(ServiceSubscriptionItem, {
+                                    price: prices.property,
+                                    quantity: 3
+                                })]
+                        })
                     ]);
                     _this._serviceSubscriptions.items.forEach(function (subscription) {
                         subscription.items.push(classTransformer.plainToClass(ServiceSubscriptionItem, { price: prices.work, quantity: 1 }));
@@ -11514,19 +11534,21 @@
          * Change subscription plan
          */
         SubscriptionService.prototype.changeSubscription = function (items) {
+            return this.http.put(this.environment.apiV2 + "/subscriptions/items", items);
+        };
+        SubscriptionService.prototype.listenSubscriptions = function () {
             var _this = this;
-            return this.http.put(this.environment.apiV2 + "/subscriptions/items", items).pipe(operators.map(function () {
-                // Set cache value as null and fire request to backend to get updated subscription value
-                _this._serviceSubscription = null;
-                _this.serviceSubscriptionSubject.next(_this._serviceSubscription);
-                // update property list
+            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.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED, null));
-                _this.getSubscription().subscribe();
-            }));
+            });
         };
         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: '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: '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,
@@ -11534,7 +11556,7 @@
                         providedIn: 'root'
                     }]
             }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
                         }] }];
@@ -13083,6 +13105,9 @@
     exports.RegisterClientForm = RegisterClientForm;
     exports.RegisterFirmForm = RegisterFirmForm;
     exports.RegistrationInvite = RegistrationInvite;
+    exports.ReportItem = ReportItem;
+    exports.ReportItemCollection = ReportItemCollection;
+    exports.ReportItemDetails = ReportItemDetails;
     exports.ResetPasswordForm = ResetPasswordForm;
     exports.SUBSCRIPTION_DESCRIPTION = SUBSCRIPTION_DESCRIPTION;
     exports.SUBSCRIPTION_TITLE = SUBSCRIPTION_TITLE;
@@ -13103,9 +13128,6 @@
     exports.TaxExemption = TaxExemption;
     exports.TaxExemptionMetadata = TaxExemptionMetadata;
     exports.TaxExemptionService = TaxExemptionService;
-    exports.TaxReturnCategoryItem = TaxReturnCategoryItem;
-    exports.TaxReturnCategoryItemCollection = TaxReturnCategoryItemCollection;
-    exports.TaxReturnCategoryItemDetails = TaxReturnCategoryItemDetails;
     exports.TaxReview = TaxReview;
     exports.TaxReviewCollection = TaxReviewCollection;
     exports.TaxReviewHistoryService = TaxReviewHistoryService;