taxtank-core 0.29.36 → 0.29.37

package/bundles/taxtank-core.umd.js

@@ -3075,6 +3075,7 @@
 
     exports.ChartAccountsListEnum = void 0;
     (function (ChartAccountsListEnum) {
+        ChartAccountsListEnum[ChartAccountsListEnum["HOME_OFFICE_WORK_HOURS"] = 103] = "HOME_OFFICE_WORK_HOURS";
         ChartAccountsListEnum[ChartAccountsListEnum["PARTNERSHIP_EXPENSES"] = 156] = "PARTNERSHIP_EXPENSES";
         ChartAccountsListEnum[ChartAccountsListEnum["TRUST_EXPENSES"] = 157] = "TRUST_EXPENSES";
         ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_CHARGED_BY_ATO"] = 278] = "INTEREST_CHARGED_BY_ATO";
@@ -3488,6 +3489,50 @@
         return ChartAccountsMetadata;
     }(ChartAccountsMetadata$1));
 
+    /**
+     * @TODO move to pipe/translation
+     * enum with months short names.
+     * Order of items match with financial year months order
+     */
+    exports.MonthNameShortEnum = void 0;
+    (function (MonthNameShortEnum) {
+        MonthNameShortEnum["JULY"] = "Jul";
+        MonthNameShortEnum["AUGUST"] = "Aug";
+        MonthNameShortEnum["SEPTEMBER"] = "Sep";
+        MonthNameShortEnum["OCTOBER"] = "Oct";
+        MonthNameShortEnum["NOVEMBER"] = "Nov";
+        MonthNameShortEnum["DECEMBER"] = "Dec";
+        MonthNameShortEnum["JANUARY"] = "Jan";
+        MonthNameShortEnum["FEBRUARY"] = "Feb";
+        MonthNameShortEnum["MARCH"] = "Mar";
+        MonthNameShortEnum["APRIL"] = "Apr";
+        MonthNameShortEnum["MAY"] = "May";
+        MonthNameShortEnum["JUNE"] = "Jun";
+    })(exports.MonthNameShortEnum || (exports.MonthNameShortEnum = {}));
+
+    /**
+     * enum with months indexes.
+     * item value match with js Date month index from 0 to 11
+     * Order of items match with financial year months order
+     */
+    exports.MonthNumberEnum = void 0;
+    (function (MonthNumberEnum) {
+        MonthNumberEnum[MonthNumberEnum["JULY"] = 6] = "JULY";
+        MonthNumberEnum[MonthNumberEnum["AUGUST"] = 7] = "AUGUST";
+        MonthNumberEnum[MonthNumberEnum["SEPTEMBER"] = 8] = "SEPTEMBER";
+        MonthNumberEnum[MonthNumberEnum["OCTOBER"] = 9] = "OCTOBER";
+        MonthNumberEnum[MonthNumberEnum["NOVEMBER"] = 10] = "NOVEMBER";
+        MonthNumberEnum[MonthNumberEnum["DECEMBER"] = 11] = "DECEMBER";
+        MonthNumberEnum[MonthNumberEnum["JANUARY"] = 0] = "JANUARY";
+        MonthNumberEnum[MonthNumberEnum["FEBRUARY"] = 1] = "FEBRUARY";
+        MonthNumberEnum[MonthNumberEnum["MARCH"] = 2] = "MARCH";
+        MonthNumberEnum[MonthNumberEnum["APRIL"] = 3] = "APRIL";
+        MonthNumberEnum[MonthNumberEnum["MAY"] = 4] = "MAY";
+        MonthNumberEnum[MonthNumberEnum["JUNE"] = 5] = "JUNE";
+    })(exports.MonthNumberEnum || (exports.MonthNumberEnum = {}));
+
+    var MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan'];
+
     exports.ChartAccountsTaxLabelsEnum = void 0;
     (function (ChartAccountsTaxLabelsEnum) {
         ChartAccountsTaxLabelsEnum["TAX_WITHHELD"] = "Tax withheld";
@@ -5399,8 +5444,6 @@
         classTransformer.Type(function () { return ChartSerie; })
     ], ChartData.prototype, "data", void 0);
 
-    var MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan'];
-
     /**
      * Collection of transactions
      */
@@ -6368,7 +6411,7 @@
             return this.getInactive().getTrials();
         };
         ServiceSubscriptionCollection.prototype.getExpiredAfter = function (date) {
-            return this.filter(function (item) { return !date || item.endDate >= date; });
+            return this.getInactive().filter(function (item) { return !date || item.endDate >= date; });
         };
         ServiceSubscriptionCollection.prototype.getPaid = function () {
             return this.filter(function (subscription) { return !!subscription.stripeId; });
@@ -7649,48 +7692,6 @@
         classTransformer.Type(function () { return ServiceSubscriptionItem; })
     ], ServiceSubscription.prototype, "items", void 0);
 
-    /**
-     * @TODO move to pipe/translation
-     * enum with months short names.
-     * Order of items match with financial year months order
-     */
-    exports.MonthNameShortEnum = void 0;
-    (function (MonthNameShortEnum) {
-        MonthNameShortEnum["JULY"] = "Jul";
-        MonthNameShortEnum["AUGUST"] = "Aug";
-        MonthNameShortEnum["SEPTEMBER"] = "Sep";
-        MonthNameShortEnum["OCTOBER"] = "Oct";
-        MonthNameShortEnum["NOVEMBER"] = "Nov";
-        MonthNameShortEnum["DECEMBER"] = "Dec";
-        MonthNameShortEnum["JANUARY"] = "Jan";
-        MonthNameShortEnum["FEBRUARY"] = "Feb";
-        MonthNameShortEnum["MARCH"] = "Mar";
-        MonthNameShortEnum["APRIL"] = "Apr";
-        MonthNameShortEnum["MAY"] = "May";
-        MonthNameShortEnum["JUNE"] = "Jun";
-    })(exports.MonthNameShortEnum || (exports.MonthNameShortEnum = {}));
-
-    /**
-     * enum with months indexes.
-     * item value match with js Date month index from 0 to 11
-     * Order of items match with financial year months order
-     */
-    exports.MonthNumberEnum = void 0;
-    (function (MonthNumberEnum) {
-        MonthNumberEnum[MonthNumberEnum["JULY"] = 6] = "JULY";
-        MonthNumberEnum[MonthNumberEnum["AUGUST"] = 7] = "AUGUST";
-        MonthNumberEnum[MonthNumberEnum["SEPTEMBER"] = 8] = "SEPTEMBER";
-        MonthNumberEnum[MonthNumberEnum["OCTOBER"] = 9] = "OCTOBER";
-        MonthNumberEnum[MonthNumberEnum["NOVEMBER"] = 10] = "NOVEMBER";
-        MonthNumberEnum[MonthNumberEnum["DECEMBER"] = 11] = "DECEMBER";
-        MonthNumberEnum[MonthNumberEnum["JANUARY"] = 0] = "JANUARY";
-        MonthNumberEnum[MonthNumberEnum["FEBRUARY"] = 1] = "FEBRUARY";
-        MonthNumberEnum[MonthNumberEnum["MARCH"] = 2] = "MARCH";
-        MonthNumberEnum[MonthNumberEnum["APRIL"] = 3] = "APRIL";
-        MonthNumberEnum[MonthNumberEnum["MAY"] = 4] = "MAY";
-        MonthNumberEnum[MonthNumberEnum["JUNE"] = 5] = "JUNE";
-    })(exports.MonthNumberEnum || (exports.MonthNumberEnum = {}));
-
     var User = /** @class */ (function (_super) {
         __extends(User, _super);
         function User() {
@@ -21300,7 +21301,10 @@
         __extends(TransactionForm, _super);
         function TransactionForm(transaction, registeredForGst, allocations, controls) {
             if (controls === void 0) { controls = {}; }
-            var _this = _super.call(this, transaction, registeredForGst, Object.assign(controls, { transactions: new forms.FormArray([]) })) || this;
+            var _this = _super.call(this, transaction, registeredForGst, Object.assign(controls, {
+                transactions: new forms.FormArray([]),
+                source: new forms.FormControl(transaction.source || exports.TransactionSourceEnum.BANK_TRANSACTION, forms.Validators.required)
+            })) || this;
             _this.get('date').addValidators([currentFinYearValidator()]);
             // convert child transactions to controls
             transaction.transactions.map(function (transaction) {
@@ -21359,6 +21363,50 @@
         return TransactionForm;
     }(TransactionBaseForm));
 
+    var WorkTransactionForm = /** @class */ (function (_super) {
+        __extends(WorkTransactionForm, _super);
+        function WorkTransactionForm(transaction, registeredForGst, allocations, controls) {
+            if (controls === void 0) { controls = {}; }
+            var _this = _super.call(this, transaction, registeredForGst, allocations, Object.assign(controls, {
+                // additional data related to work (like tax instalments)
+                metadata: new forms.FormArray((transaction.metadata || []).map(function (transactionMetadata) {
+                    return new forms.FormGroup({
+                        value: new forms.FormControl(transactionMetadata.value),
+                        chartAccountsMetadata: new forms.FormControl(transactionMetadata.chartAccountsMetadata)
+                    });
+                }))
+            })) || this;
+            _this.listenEvents();
+            return _this;
+        }
+        WorkTransactionForm.prototype.listenEvents = function () {
+            this.watchChartAccounts();
+        };
+        WorkTransactionForm.prototype.watchChartAccounts = function () {
+            var _this = this;
+            _super.prototype.watchChartAccounts.call(this);
+            this.get('chartAccounts').valueChanges.subscribe(function (chartAccounts) {
+                _this.buildMetadataForm();
+            });
+        };
+        /**
+         * depends on chartAccounts the form could include different extra fields
+         */
+        WorkTransactionForm.prototype.buildMetadataForm = function () {
+            var _this = this;
+            // Remove all controls in the FormArray before pushing
+            this.get('metadata').clear();
+            // create form controls for each metadata object from selected chart accounts
+            (this.get('chartAccounts').value.metadata).forEach(function (chartAccountsMetadata) {
+                _this.get('metadata').push(new forms.FormGroup({
+                    value: new forms.FormControl(chartAccountsMetadata.isSharePercentage() ? 100 : 0),
+                    chartAccountsMetadata: new forms.FormControl(chartAccountsMetadata),
+                }));
+            });
+        };
+        return WorkTransactionForm;
+    }(TransactionForm));
+
     var WorkIncomeForm = /** @class */ (function (_super) {
         __extends(WorkIncomeForm, _super);
         function WorkIncomeForm(transaction, registeredForGst, allocations) {
@@ -21367,13 +21415,6 @@
             // for work income we need to show netAmount instead of amount (because some adjustments are included in amount)
             transaction.amount = transaction.netAmount;
             _this = _super.call(this, transaction, registeredForGst, allocations, {
-                // additional data related to work income (like tax instalments)
-                metadata: new forms.FormArray((transaction.metadata || []).map(function (transactionMetadata) {
-                    return new forms.FormGroup({
-                        value: new forms.FormControl(transactionMetadata.value),
-                        chartAccountsMetadata: new forms.FormControl(transactionMetadata.chartAccountsMetadata)
-                    });
-                })),
                 tax: new forms.FormControl({
                     value: transaction.tax,
                     disabled: !transaction.chartAccounts || transaction.chartAccounts.isNRAS(),
@@ -21400,8 +21441,8 @@
             return _this;
         }
         WorkIncomeForm.prototype.listenEvents = function () {
+            _super.prototype.listenEvents.call(this);
             this.watchIncomeSource();
-            this.watchChartAccounts();
         };
         WorkIncomeForm.prototype.watchIncomeSource = function () {
             var _this = this;
@@ -21419,7 +21460,6 @@
             var _this = this;
             _super.prototype.watchChartAccounts.call(this);
             this.get('chartAccounts').valueChanges.subscribe(function (chartAccounts) {
-                _this.buildMetadataForm();
                 // tax make no sense for pre-paying tax category
                 if (chartAccounts.isNRAS()) {
                     _this.get('tax').disable();
@@ -21436,21 +21476,6 @@
                 }
             });
         };
-        /**
-         * depends on chartAccounts the form could include different extra fields
-         */
-        WorkIncomeForm.prototype.buildMetadataForm = function () {
-            var _this = this;
-            // Remove all controls in the FormArray before pushing
-            this.get('metadata').clear();
-            // create form controls for each metadata object from selected chart accounts
-            (this.get('chartAccounts').value.metadata).forEach(function (chartAccountsMetadata) {
-                _this.get('metadata').push(new forms.FormGroup({
-                    value: new forms.FormControl(chartAccountsMetadata.isSharePercentage() ? 100 : 0),
-                    chartAccountsMetadata: new forms.FormControl(chartAccountsMetadata),
-                }));
-            });
-        };
         /**
          * salary comes to bankAccount together with related transactions like tips (kind of salary, but reported in different tax summary section),
          * adjustments used to clarify received payment by separating it into multiple transactions,
@@ -21468,7 +21493,31 @@
             return _super.prototype.submit.call(this, Object.assign(data, { amount: this.getAmount() }));
         };
         return WorkIncomeForm;
-    }(TransactionForm));
+    }(WorkTransactionForm));
+
+    var WorkExpenseForm = /** @class */ (function (_super) {
+        __extends(WorkExpenseForm, _super);
+        function WorkExpenseForm() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        WorkExpenseForm.prototype.listenEvents = function () {
+            this.watchChartAccountsMetadata();
+        };
+        WorkExpenseForm.prototype.watchChartAccountsMetadata = function () {
+            var _this = this;
+            this.get('metadata').valueChanges.subscribe(function (metadata) {
+                var hoursMetadata = new Collection(metadata).findBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.HOURS);
+                if (!hoursMetadata) {
+                    return;
+                }
+                // for home office hours expense amount is a fixed rate per hour
+                _this.get('amount').reset();
+                _this.get('amount').disable();
+                _this.get('amount').setValue(_this.get('chartAccounts').value.getCurrentYearValue().value * +hoursMetadata.value);
+            });
+        };
+        return WorkExpenseForm;
+    }(WorkTransactionForm));
 
     var DepreciationForm = /** @class */ (function (_super) {
         __extends(DepreciationForm, _super);
@@ -21880,6 +21929,7 @@
     exports.VehicleLogbookForm = VehicleLogbookForm;
     exports.VehicleLogbookService = VehicleLogbookService;
     exports.VehicleService = VehicleService;
+    exports.WorkExpenseForm = WorkExpenseForm;
     exports.WorkIncomeForm = WorkIncomeForm;
     exports.XlsxService = XlsxService;
     exports.atLeastOneCheckedValidator = atLeastOneCheckedValidator;