taxtank-core 0.28.37 → 0.28.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/taxtank-core.umd.js +11 -7
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/collections/tax-summary/report-item.collection.js +2 -2
- package/esm2015/lib/collections/tax-summary/tax-return-categories.const.js +5 -4
- package/esm2015/lib/collections/transaction/transaction-base.collection.js +2 -2
- package/esm2015/lib/db/Enums/tax-return-category-list.enum.js +4 -1
- package/esm2015/lib/models/report/my-tax/my-tax-estimate/my-tax-estimate.js +3 -3
- package/fesm2015/taxtank-core.js +11 -7
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/db/Enums/tax-return-category-list.enum.d.ts +3 -0
- package/package.json +1 -1
|
@@ -7853,7 +7853,7 @@
|
|
|
7853
7853
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
7854
7854
|
}
|
|
7855
7855
|
TransactionBaseCollection.prototype.getClaimAmountByBusiness = function (business) {
|
|
7856
|
-
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);
|
|
7856
|
+
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; }, 0).toFixed(2);
|
|
7857
7857
|
};
|
|
7858
7858
|
return TransactionBaseCollection;
|
|
7859
7859
|
}(Collection));
|
|
@@ -8864,7 +8864,7 @@
|
|
|
8864
8864
|
try {
|
|
8865
8865
|
for (var _b = __values(this.items), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
8866
8866
|
var reportItem = _c.value;
|
|
8867
|
-
if (reportItem.details.length && reportItem.taxReturnCategory.section === section) {
|
|
8867
|
+
if ((reportItem.details.length || reportItem.amount) && reportItem.taxReturnCategory.section === section) {
|
|
8868
8868
|
result.push(reportItem);
|
|
8869
8869
|
}
|
|
8870
8870
|
else {
|
|
@@ -9011,6 +9011,9 @@
|
|
|
9011
9011
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_INSTALMENTS"] = 25] = "TAX_INSTALMENTS";
|
|
9012
9012
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FRANKING_CREDITS"] = 26] = "FRANKING_CREDITS";
|
|
9013
9013
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
|
|
9014
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS_LOW"] = 61] = "TAX_OFFSETS_LOW";
|
|
9015
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS_MIDDLE"] = 62] = "TAX_OFFSETS_MIDDLE";
|
|
9016
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS_SOLE"] = 63] = "TAX_OFFSETS_SOLE";
|
|
9014
9017
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_PAYABLE"] = 28] = "TAX_PAYABLE";
|
|
9015
9018
|
})(exports.TaxReturnCategoryListEnum || (exports.TaxReturnCategoryListEnum = {}));
|
|
9016
9019
|
|
|
@@ -9075,7 +9078,9 @@
|
|
|
9075
9078
|
exports.TaxReturnCategoryListEnum.TAX_CREDITS
|
|
9076
9079
|
],
|
|
9077
9080
|
taxOffsets: [
|
|
9078
|
-
exports.TaxReturnCategoryListEnum.TAX_OFFSETS
|
|
9081
|
+
exports.TaxReturnCategoryListEnum.TAX_OFFSETS,
|
|
9082
|
+
exports.TaxReturnCategoryListEnum.TAX_OFFSETS_LOW,
|
|
9083
|
+
exports.TaxReturnCategoryListEnum.TAX_OFFSETS_MIDDLE,
|
|
9079
9084
|
]
|
|
9080
9085
|
},
|
|
9081
9086
|
sole: {
|
|
@@ -9099,9 +9104,8 @@
|
|
|
9099
9104
|
exports.TaxReturnCategoryListEnum.MOTOR_VEHICLE_EXPENSES,
|
|
9100
9105
|
exports.TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES
|
|
9101
9106
|
],
|
|
9102
|
-
// @TODO TT-2386 Nikita to move sole tax offsets in separated category
|
|
9103
9107
|
taxOffsets: [
|
|
9104
|
-
exports.TaxReturnCategoryListEnum.
|
|
9108
|
+
exports.TaxReturnCategoryListEnum.TAX_OFFSETS_SOLE
|
|
9105
9109
|
],
|
|
9106
9110
|
},
|
|
9107
9111
|
};
|
|
@@ -11248,8 +11252,8 @@
|
|
|
11248
11252
|
});
|
|
11249
11253
|
};
|
|
11250
11254
|
MyTaxEstimate.getLowMiddleIncomeTaxOffsets = function (taxOffsetsReportItem) {
|
|
11251
|
-
var taxOffsetLowIncome = taxOffsetsReportItem.
|
|
11252
|
-
var taxOffsetLowMiddleIncome = taxOffsetsReportItem.
|
|
11255
|
+
var taxOffsetLowIncome = taxOffsetsReportItem.items.findBy('title', 'Tax Offset Low Income');
|
|
11256
|
+
var taxOffsetLowMiddleIncome = taxOffsetsReportItem.items.findBy('title', 'Tax Offset Low and Middle Income');
|
|
11253
11257
|
return taxOffsetLowIncome.amount + taxOffsetLowMiddleIncome.amount;
|
|
11254
11258
|
};
|
|
11255
11259
|
MyTaxEstimate.getTaxOffsets = function (taxOffsetsReportItemAmount, lowMiddleIncomeTaxOffsets) {
|