taxtank-core 0.28.32 → 0.28.34

package/bundles/taxtank-core.umd.js

@@ -2777,9 +2777,7 @@
     var SoleBusinessLoss = /** @class */ (function (_super) {
         __extends(SoleBusinessLoss, _super);
         function SoleBusinessLoss() {
-            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            _this.openBalance = 0;
-            return _this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         Object.defineProperty(SoleBusinessLoss.prototype, "hasOffset", {
             get: function () {
@@ -7522,8 +7520,7 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         TransactionBaseCollection.prototype.getClaimAmountByBusiness = function (business) {
-            return this.filterBy('business.id', business.id)
-                .sumBy('claimAmount');
+            return +this.filterBy('business.id', business.id).items.map(function (transaction) { return transaction instanceof Depreciation ? -transaction.claimAmount : transaction['claimAmount']; }).reduce(function (sum, claimAmount) { return sum + claimAmount; }).toFixed(2);
         };
         return TransactionBaseCollection;
     }(Collection));
@@ -11408,14 +11405,10 @@
         function SoleBusinessLossReport(loss, transactions, depreciations) {
             var _this = _super.call(this) || this;
             _this.openBalance = loss.openBalance;
-            _this.netIncome = transactions.sumBy('claimAmount') + depreciations.sumBy('claimAmount');
-            _this.taxableIncome = _this.calculateTaxableIncome();
-            _this.closeBalance = Math.max(_this.taxableIncome, 0);
+            _this.netIncome = transactions.sumBy('claimAmount') - depreciations.sumBy('claimAmount');
+            _this.closeBalance = _this.netIncome - _this.openBalance;
             return _this;
         }
-        SoleBusinessLossReport.prototype.calculateTaxableIncome = function () {
-            return this.netIncome - this.openBalance;
-        };
         return SoleBusinessLossReport;
     }(AbstractModel));
 
@@ -15574,6 +15567,7 @@
         SoleForecastService.prototype.listenEvents = function () {
             this.listenToAddedIncomeSources();
             this.listenToUpdatedIncomeSources();
+            this.listenBusinessCreated();
         };
         /**
          * Listen to EventDispatcherService event related to added Income Sources
@@ -15623,6 +15617,15 @@
                 return incomeSource.soleForecasts;
             }).flat();
         };
+        /**
+         * Listen business created because we create sole forests together with business
+         */
+        SoleForecastService.prototype.listenBusinessCreated = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.SOLE_BUSINESS_CREATED).subscribe(function () {
+                _this.resetCache();
+            });
+        };
         return SoleForecastService;
     }(RestService));
     SoleForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
@@ -17378,6 +17381,7 @@
         function AbstractForm(controls, model, validatorOrOpts, asyncValidator) {
             var _this = _super.call(this, controls, validatorOrOpts, asyncValidator) || this;
             /**
+             * @TODO Alex bad name, it's also about unchanged
              * Flag display if some form values changed
              */
             _this.unsaved = false;
@@ -17867,18 +17871,18 @@
 
     var SoleBusinessLossForm = /** @class */ (function (_super) {
         __extends(SoleBusinessLossForm, _super);
-        function SoleBusinessLossForm(loss, balance) {
+        function SoleBusinessLossForm(loss, profit) {
             var _this = this;
             var _a;
             _this = _super.call(this, {
                 openBalance: new forms.FormControl(loss.openBalance, forms.Validators.required),
                 offsetRule: new forms.FormControl((_a = loss.offsetRule) === null || _a === void 0 ? void 0 : _a.id),
                 // sum of depreciations/transactions claim amount - openBalance
-                balance: new forms.FormControl({ value: balance, disabled: true }),
+                balance: new forms.FormControl({ value: profit - loss.openBalance, disabled: true }),
             }, loss) || this;
             _this.loss = loss;
             _this.get('openBalance').valueChanges.subscribe(function (openBalance) {
-                _this.get('balance').setValue(balance - openBalance);
+                _this.get('balance').setValue(profit - openBalance);
             });
             return _this;
         }