taxtank-core 0.8.3 → 0.8.4

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) {
@@ -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
          */