taxtank-core 0.17.5 → 0.17.8

package/bundles/taxtank-core.umd.js

@@ -4242,6 +4242,13 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(Property.prototype, "shareRatio", {
+            get: function () {
+                return this.myShare.percent / 100;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(Property.prototype, "previousCategory", {
             get: function () {
                 var previousCategory;
@@ -4284,13 +4291,13 @@
          * gross capital gain tax: sale costs - cost base
          */
         Property.prototype.calculateCGT = function (sale) {
-            return sale.price - sale.saleCostsTotalAmount - sale.capitalLoss - this.calculateCostBase(sale);
+            return (sale.price - sale.saleCostsTotalAmount - this.calculateCostBase(sale)) * this.shareRatio - sale.capitalLoss;
         };
         /**
          * net capital gain tax (includes tax exemptions)
          */
         Property.prototype.calculateNetCGT = function (sale) {
-            return this.getCGTExemptionRatio(sale) * sale.cgt;
+            return this.getCGTExemptionRatio(sale) * sale.grossCGT;
         };
         /**
          * guess tax exemption based on property details
@@ -4341,7 +4348,7 @@
             }
         };
         Property.prototype.isOneYearExemptionApplicable = function (sale) {
-            return sale.cgt > 0 && this.getOwnershipDuration(sale, 'years') > 0;
+            return sale.grossCGT > 0 && this.getOwnershipDuration(sale, 'years') > 0;
         };
         /**
          * ownership duration from purchase till sale
@@ -13874,7 +13881,7 @@
         return LoginForm;
     }(AbstractForm));
 
-    var passwordPattern = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&#])[\w@$!%*?&#]{8,}$/;
+    var passwordPattern = /^(((?=.*[a-z])(?=.*[A-Z]))|((?=.*[a-z])(?=.*[0-9]))|((?=.*[A-Z])(?=.*[0-9])))(?=.{6,})./;
     function passwordValidator() {
         return function (control) {
             return passwordPattern.test(control.value) ? null : { passwordInvalid: true };