taxtank-core 0.29.9 → 0.29.12-1

package/bundles/taxtank-core.umd.js

@@ -2230,7 +2230,7 @@
         };
         Object.defineProperty(TransactionBase.prototype, "amountWithGst", {
             get: function () {
-                return this.isGST ? +(this.amount * ChartAccounts.GSTCoefficient).toFixed(2) : this.amount;
+                return this.isGST ? +(Math.round(this.amount * ChartAccounts.GSTCoefficient)).toFixed(2) : this.amount;
             },
             enumerable: false,
             configurable: true
@@ -6193,7 +6193,7 @@
         __extends(PropertyDocument, _super);
         function PropertyDocument() {
             var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            _this.type = exports.AssetTypeEnum.DOCUMENT;
+            _this.type = exports.AssetTypeEnum.PROPERTY;
             _this.entityType = exports.AssetEntityTypeEnum.PROPERTIES;
             return _this;
         }
@@ -9056,7 +9056,7 @@
             var _this = this;
             this.items = [];
             properties.items.forEach(function (property) {
-                var depreciationsByType = new CollectionDictionary(depreciations, 'type');
+                var depreciationsByType = new CollectionDictionary(depreciations.filterBy('property.id', property.id), 'type');
                 depreciationsByType.keys.map(function (type) {
                     _this.items.push(new PropertyReportItemDepreciation(depreciationsByType.get(type), property, chartAccounts.findBy('id', depreciationsByType.get(type).first.chartAccounts.id)));
                 });
@@ -18158,6 +18158,8 @@
                 this.chartAccountsService.get()
             ]).pipe(operators.map(function (_a) {
                 var _b = __read(_a, 4), properties = _b[0], transactions = _b[1], depreciations = _b[2], chartAccounts = _b[3];
+                var r = _this.create(transactions, depreciations, properties, chartAccounts);
+                debugger;
                 return new CollectionDictionary(_this.create(transactions, depreciations, properties, chartAccounts), 'propertyId');
             }));
         };
@@ -19215,30 +19217,6 @@
         return SoleBusinessLossForm;
     }(AbstractForm));
 
-    var phonePattern = /^(((\s*)?([- ()]?\d[- ()]?){0,30}(\s*)?)|)$/;
-    /**
-     * Validator for phone number
-     * Allowed special symbols"-", "(", ")"
-     */
-    function phoneNumberValidator() {
-        return function (control) {
-            return phonePattern.test(control.value) ? null : { phoneInvalid: true };
-        };
-    }
-
-    var PhoneForm = /** @class */ (function (_super) {
-        __extends(PhoneForm, _super);
-        function PhoneForm(phone) {
-            if (phone === void 0) { phone = classTransformer.plainToClass(Phone, {}); }
-            return _super.call(this, {
-                type: new forms.FormControl(phone.type, forms.Validators.required),
-                country: new forms.FormControl(phone.country, forms.Validators.required),
-                number: new forms.FormControl(phone.number, [forms.Validators.required, phoneNumberValidator()])
-            }, phone) || this;
-        }
-        return PhoneForm;
-    }(AbstractForm));
-
     var SoleContactForm = /** @class */ (function (_super) {
         __extends(SoleContactForm, _super);
         function SoleContactForm(contact) {
@@ -19249,7 +19227,7 @@
                 firstName: new forms.FormControl(contact.firstName, forms.Validators.required),
                 lastName: new forms.FormControl(contact.lastName, forms.Validators.required),
                 email: new forms.FormControl(contact.email, [forms.Validators.required, forms.Validators.email]),
-                phone: new PhoneForm(contact.phone || classTransformer.plainToClass(Phone, {})),
+                phone: new forms.FormControl(contact.phone),
                 address: new AddressForm(contact.address || classTransformer.plainToClass(Address, {}))
             }, contact) || this;
         }
@@ -19803,6 +19781,31 @@
         return LoginForm;
     }(AbstractForm));
 
+    var phonePattern = /^(((\s*)?([- ()]?\d[- ()]?){0,30}(\s*)?)|)$/;
+    /**
+     * Validator for phone number
+     * Allowed special symbols"-", "(", ")"
+     */
+    function phoneNumberValidator() {
+        return function (control) {
+            return phonePattern.test(control.value) ? null : { phoneInvalid: true };
+        };
+    }
+
+    var PhoneForm = /** @class */ (function (_super) {
+        __extends(PhoneForm, _super);
+        function PhoneForm(
+        // no default value because this form is always built-in, so phone passed from parent form
+        phone) {
+            return _super.call(this, {
+                type: new forms.FormControl((phone === null || phone === void 0 ? void 0 : phone.type) || exports.PhoneTypeEnum.MOBILE, forms.Validators.required),
+                country: new forms.FormControl((phone === null || phone === void 0 ? void 0 : phone.country) || Country.australia, forms.Validators.required),
+                number: new forms.FormControl((phone === null || phone === void 0 ? void 0 : phone.number) || null, [forms.Validators.required, phoneNumberValidator()])
+            }, phone) || this;
+        }
+        return PhoneForm;
+    }(AbstractForm));
+
     // @TODO Alex: Create a model and handle request fields via class-transformer
     var PasswordForm = /** @class */ (function (_super) {
         __extends(PasswordForm, _super);
@@ -20855,10 +20858,8 @@
             }, controls), transaction) || this;
             _this.registeredForGst = registeredForGst;
             _this.watchChartAccounts();
-            if (_this.isGstApplicable()) {
-                _this.watchAmountWithGST();
-                _this.watchIsGst();
-            }
+            _this.watchAmountWithGST();
+            _this.watchIsGst();
             return _this;
         }
         TransactionBaseForm.prototype.watchIsGst = function () {
@@ -21148,6 +21149,11 @@
             });
             return _this;
         }
+        DepreciationForm.prototype.submit = function (data, includeDisabledFields) {
+            if (data === void 0) { data = {}; }
+            if (includeDisabledFields === void 0) { includeDisabledFields = false; }
+            return _super.prototype.submit.call(this, data, true);
+        };
         return DepreciationForm;
     }(TransactionBaseForm));