@medipass/utils 11.58.2 → 11.58.5-feature-nib.0
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/CHANGELOG.md +22 -0
- package/constants.js +3 -1
- package/funders.js +8 -2
- package/package.json +2 -2
- package/service-items.js +6 -7
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,28 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [11.58.4](https://github.com/medipass/web/compare/@medipass/utils@11.58.3...@medipass/utils@11.58.4) (2021-12-22)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* calculate totals ([#606](https://github.com/medipass/web/issues/606)) ([214c51b](https://github.com/medipass/web/commit/214c51b))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [11.58.3](https://github.com/medipass/web/compare/@medipass/utils@11.58.2...@medipass/utils@11.58.3) (2021-12-22)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* item totals section ([#605](https://github.com/medipass/web/issues/605)) ([1b12e67](https://github.com/medipass/web/commit/1b12e67))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
6
28
|
## [11.58.2](https://github.com/medipass/web/compare/@medipass/utils@11.58.1...@medipass/utils@11.58.2) (2021-12-17)
|
|
7
29
|
|
|
8
30
|
|
package/constants.js
CHANGED
|
@@ -97,13 +97,14 @@ var FUNDERS = {
|
|
|
97
97
|
HICAPS: 'nab',
|
|
98
98
|
ICARE: 'icare',
|
|
99
99
|
MEDICARE: 'medicare',
|
|
100
|
+
NIB: 'nib',
|
|
100
101
|
NDIS: 'ndis',
|
|
101
102
|
OHC: 'ohc',
|
|
102
103
|
PATIENT: 'patient-funded',
|
|
103
104
|
WCQ: 'wcq',
|
|
104
105
|
WSV: 'wsv'
|
|
105
106
|
};
|
|
106
|
-
var FUNDERS_FORMATTED = (_FUNDERS_FORMATTED = {}, _FUNDERS_FORMATTED[FUNDERS.ADF] = 'Australian Defence Force', _FUNDERS_FORMATTED[FUNDERS.COMCARE] = 'Comcare', _FUNDERS_FORMATTED[FUNDERS.GARRISON] = 'Garrison', _FUNDERS_FORMATTED[FUNDERS.HBF] = 'HBF', _FUNDERS_FORMATTED[FUNDERS.HEALTHPOINT] = 'HEALTHPOINT', _FUNDERS_FORMATTED[FUNDERS.HICAPS] = 'HICAPS', _FUNDERS_FORMATTED[FUNDERS.ICARE] = 'icare', _FUNDERS_FORMATTED[FUNDERS.MEDICARE] = 'Medicare', _FUNDERS_FORMATTED[FUNDERS.NDIS] = 'NDIS', _FUNDERS_FORMATTED[FUNDERS.OHC] = 'Overseas health cover', _FUNDERS_FORMATTED[FUNDERS.PATIENT] = 'Patient funded', _FUNDERS_FORMATTED[FUNDERS.WCQ] = 'Workcover Queensland', _FUNDERS_FORMATTED[FUNDERS.WSV] = 'WorkSafe Victoria', _FUNDERS_FORMATTED);
|
|
107
|
+
var FUNDERS_FORMATTED = (_FUNDERS_FORMATTED = {}, _FUNDERS_FORMATTED[FUNDERS.ADF] = 'Australian Defence Force', _FUNDERS_FORMATTED[FUNDERS.COMCARE] = 'Comcare', _FUNDERS_FORMATTED[FUNDERS.GARRISON] = 'Garrison', _FUNDERS_FORMATTED[FUNDERS.HBF] = 'HBF', _FUNDERS_FORMATTED[FUNDERS.HEALTHPOINT] = 'HEALTHPOINT', _FUNDERS_FORMATTED[FUNDERS.HICAPS] = 'HICAPS', _FUNDERS_FORMATTED[FUNDERS.ICARE] = 'icare', _FUNDERS_FORMATTED[FUNDERS.MEDICARE] = 'Medicare', _FUNDERS_FORMATTED[FUNDERS.NDIS] = 'NDIS', _FUNDERS_FORMATTED[FUNDERS.NIB] = 'NIB', _FUNDERS_FORMATTED[FUNDERS.OHC] = 'Overseas health cover', _FUNDERS_FORMATTED[FUNDERS.PATIENT] = 'Patient funded', _FUNDERS_FORMATTED[FUNDERS.WCQ] = 'Workcover Queensland', _FUNDERS_FORMATTED[FUNDERS.WSV] = 'WorkSafe Victoria', _FUNDERS_FORMATTED);
|
|
107
108
|
/* ====== END: FUNDERS ======= */
|
|
108
109
|
|
|
109
110
|
/* ====== START: FUTURES ======= */
|
|
@@ -341,6 +342,7 @@ var INVOICE_ORIGINATING_FLOW = {
|
|
|
341
342
|
MEDICARE_BULK_BILLED: 'medicare-bulk-billed',
|
|
342
343
|
MEDICARE_PATIENT_CLAIM: 'medicare-patient-claim',
|
|
343
344
|
NDIS: 'ndis',
|
|
345
|
+
NIB: 'nib',
|
|
344
346
|
OVERSEAS_HEALTH_COVER: 'overseas-health-cover',
|
|
345
347
|
PATIENT_FUNDED: 'patient-funded',
|
|
346
348
|
VIRTUAL_TERMINAL: 'virtual-terminal',
|
package/funders.js
CHANGED
|
@@ -7,8 +7,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
|
|
|
7
7
|
var constants = require('./constants.js');
|
|
8
8
|
var _get = _interopDefault(require('lodash/get'));
|
|
9
9
|
|
|
10
|
-
var FUNDERS_WITH_ONBOARDING = [constants.FUNDERS.HICAPS, constants.FUNDERS.MEDICARE, constants.FUNDERS.ICARE, constants.FUNDERS.WCQ, constants.FUNDERS.COMCARE, constants.FUNDERS.WSV];
|
|
11
|
-
var CLAIMABLE_FUNDERS = [constants.FUNDERS.ADF, constants.FUNDERS.COMCARE, constants.FUNDERS.DVA, constants.FUNDERS.GARRISON, constants.FUNDERS.HEALTHPOINT, constants.FUNDERS.HICAPS, constants.FUNDERS.ICARE, constants.FUNDERS.MEDICARE, constants.FUNDERS.OHC, constants.FUNDERS.WCQ, constants.FUNDERS.WSV];
|
|
10
|
+
var FUNDERS_WITH_ONBOARDING = [constants.FUNDERS.HICAPS, constants.FUNDERS.MEDICARE, constants.FUNDERS.ICARE, constants.FUNDERS.WCQ, constants.FUNDERS.COMCARE, constants.FUNDERS.WSV, constants.FUNDERS.NIB];
|
|
11
|
+
var CLAIMABLE_FUNDERS = [constants.FUNDERS.ADF, constants.FUNDERS.COMCARE, constants.FUNDERS.DVA, constants.FUNDERS.GARRISON, constants.FUNDERS.HEALTHPOINT, constants.FUNDERS.HICAPS, constants.FUNDERS.ICARE, constants.FUNDERS.MEDICARE, constants.FUNDERS.NIB, constants.FUNDERS.OHC, constants.FUNDERS.WCQ, constants.FUNDERS.WSV];
|
|
12
12
|
var getFunderCodeFromTransaction = function getFunderCodeFromTransaction(transaction, funderCode) {
|
|
13
13
|
if (transaction.isPatientFunded || _get(transaction, 'claims[0].isPatientFunded')) {
|
|
14
14
|
return constants.FUNDERS.PATIENT;
|
|
@@ -40,6 +40,8 @@ var getFunderCodeFromTransaction = function getFunderCodeFromTransaction(transac
|
|
|
40
40
|
return constants.FUNDERS.HEALTHPOINT;
|
|
41
41
|
} else if (funderCode === constants.FUNDERS.WSV) {
|
|
42
42
|
return constants.FUNDERS.WSV;
|
|
43
|
+
} else if (funderCode === constants.FUNDERS.NIB) {
|
|
44
|
+
return constants.FUNDERS.NIB;
|
|
43
45
|
}
|
|
44
46
|
|
|
45
47
|
return constants.FUNDERS.PATIENT;
|
|
@@ -74,6 +76,9 @@ var isMedicare = function isMedicare(funderCode) {
|
|
|
74
76
|
var isNDIS = function isNDIS(funderCode) {
|
|
75
77
|
return funderCode === constants.FUNDERS.NDIS;
|
|
76
78
|
};
|
|
79
|
+
var isNib = function isNib(funderCode) {
|
|
80
|
+
return funderCode === constants.FUNDERS.NIB;
|
|
81
|
+
};
|
|
77
82
|
var isOHC = function isOHC(funderCode) {
|
|
78
83
|
return funderCode === constants.FUNDERS.OHC;
|
|
79
84
|
};
|
|
@@ -104,6 +109,7 @@ exports.isHealthPoint = isHealthPoint;
|
|
|
104
109
|
exports.isIcare = isIcare;
|
|
105
110
|
exports.isMedicare = isMedicare;
|
|
106
111
|
exports.isNDIS = isNDIS;
|
|
112
|
+
exports.isNib = isNib;
|
|
107
113
|
exports.isOHC = isOHC;
|
|
108
114
|
exports.isPatientFunded = isPatientFunded;
|
|
109
115
|
exports.isWCQ = isWCQ;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@medipass/utils",
|
|
3
|
-
"version": "11.58.
|
|
3
|
+
"version": "11.58.5-feature-nib.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"module": "index.js",
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"redux-thunk": "^2.2.0",
|
|
48
48
|
"rimraf": "^2.6.2"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "2854472d76c09c6141921024955a60cecc6905d1"
|
|
51
51
|
}
|
package/service-items.js
CHANGED
|
@@ -35,7 +35,7 @@ var calculateTotalAmount = function calculateTotalAmount(serviceItems, opts) {
|
|
|
35
35
|
|
|
36
36
|
var prices = calculateAmounts({
|
|
37
37
|
isTaxable: Boolean(opts.includeGST && item.isTaxable),
|
|
38
|
-
|
|
38
|
+
initialGrossAmount: (item == null ? void 0 : item.grossAmount) ? parseFloat((item == null ? void 0 : item.grossAmount) || 0) : parseFloat((item == null ? void 0 : item.feeAmount) || 0),
|
|
39
39
|
quantity: includeQuantity ? item.quantity : 1
|
|
40
40
|
});
|
|
41
41
|
var itemTotal = undefined;
|
|
@@ -74,7 +74,7 @@ var calculateTotalGSTAmount = function calculateTotalGSTAmount(serviceItems, opt
|
|
|
74
74
|
|
|
75
75
|
var prices = calculateAmounts({
|
|
76
76
|
isTaxable: item.isTaxable,
|
|
77
|
-
|
|
77
|
+
initialGrossAmount: parseFloat((item == null ? void 0 : item.grossAmount) || 0),
|
|
78
78
|
quantity: includeQuantity ? item.quantity : 1
|
|
79
79
|
});
|
|
80
80
|
var gstAmount = prices == null ? void 0 : prices.taxAmount;
|
|
@@ -194,10 +194,9 @@ function mapItemsToClaimItems(transaction) {
|
|
|
194
194
|
}
|
|
195
195
|
var calculateAmounts = function calculateAmounts(_ref3) {
|
|
196
196
|
var isTaxable = _ref3.isTaxable,
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
var
|
|
200
|
-
var feeAmount = parseFloat(initialFeeAmount || 0);
|
|
197
|
+
initialGrossAmount = _ref3.initialGrossAmount;
|
|
198
|
+
var grossAmount = parseFloat(initialGrossAmount || 0);
|
|
199
|
+
var feeAmount = parseFloat(initialGrossAmount || 0);
|
|
201
200
|
var taxAmount = 0;
|
|
202
201
|
|
|
203
202
|
if (!isTaxable) {
|
|
@@ -208,8 +207,8 @@ var calculateAmounts = function calculateAmounts(_ref3) {
|
|
|
208
207
|
};
|
|
209
208
|
}
|
|
210
209
|
|
|
210
|
+
feeAmount = feeAmount - feeAmount / 11;
|
|
211
211
|
taxAmount = parseFloat((feeAmount * 1.1).toFixed(6)) - feeAmount;
|
|
212
|
-
grossAmount = feeAmount + taxAmount;
|
|
213
212
|
return {
|
|
214
213
|
taxAmount: taxAmount,
|
|
215
214
|
feeAmount: feeAmount,
|