@medipass/utils 11.54.4 → 11.55.1-fix-comcare-verify.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [11.55.0](https://github.com/medipass/web/compare/@medipass/utils@11.54.5...@medipass/utils@11.55.0) (2021-10-22)
+
+
+### Features
+
+* worksafe victoria ([#573](https://github.com/medipass/web/issues/573)) ([5a329ba](https://github.com/medipass/web/commit/5a329ba))
+
+
+
+
+
+## [11.54.5](https://github.com/medipass/web/compare/@medipass/utils@11.54.4...@medipass/utils@11.54.5) (2021-10-22)
+
+
+### Bug Fixes
+
+* service item totals ([#574](https://github.com/medipass/web/issues/574)) ([04b60ae](https://github.com/medipass/web/commit/04b60ae))
+
+
+
+
+
 ## [11.54.4](https://github.com/medipass/web-medicules/compare/@medipass/utils@11.54.3...@medipass/utils@11.54.4) (2021-10-21)
 
 **Note:** Version bump only for package @medipass/utils

package/constants.js

@@ -100,9 +100,10 @@ var FUNDERS = {
   NDIS: 'ndis',
   OHC: 'ohc',
   PATIENT: 'patient-funded',
-  WCQ: 'wcq'
+  WCQ: 'wcq',
+  WSV: 'wsv'
 };
-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);
+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);
 /* ====== END: FUNDERS ======= */
 
 /* ====== START: FUTURES ======= */
@@ -334,6 +335,7 @@ var INVOICE_ORIGINATING_FLOW = {
   ALLIED_PHI: 'allied-phi',
   COMCARE: 'comcare',
   DVA: 'dva',
+  HEALTHPOINT: 'healthpoint',
   ICARE: 'icare',
   INSTALMENT_PLAN: 'instalment-plan',
   MEDICARE_BULK_BILLED: 'medicare-bulk-billed',
@@ -343,7 +345,7 @@ var INVOICE_ORIGINATING_FLOW = {
   PATIENT_FUNDED: 'patient-funded',
   VIRTUAL_TERMINAL: 'virtual-terminal',
   WORK_COVER_QUEENSLAND: 'wcq',
-  HEALTHPOINT: 'healthpoint'
+  WORKSAFE_VICTORIA: 'wsv'
 };
 /* ====== END: INVOICE_ORIGINATING_FLOW ======= */
 

package/funders.js

@@ -7,8 +7,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var constants = require('./constants.js');
 var _get = _interopDefault(require('lodash/get'));
 
-var FUNDERS_WITH_ONBOARDING = [constants.FUNDERS.HICAPS, constants.FUNDERS.MEDICARE, constants.FUNDERS.ICARE, constants.FUNDERS.WCQ, constants.FUNDERS.COMCARE];
-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];
+var FUNDERS_WITH_ONBOARDING = [constants.FUNDERS.HICAPS, constants.FUNDERS.MEDICARE, constants.FUNDERS.ICARE, constants.FUNDERS.WCQ, constants.FUNDERS.COMCARE, constants.FUNDERS.WSV];
+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];
 var getFunderCodeFromTransaction = function getFunderCodeFromTransaction(transaction, funderCode) {
   if (transaction.isPatientFunded || _get(transaction, 'claims[0].isPatientFunded')) {
     return constants.FUNDERS.PATIENT;
@@ -38,6 +38,8 @@ var getFunderCodeFromTransaction = function getFunderCodeFromTransaction(transac
     return constants.FUNDERS.COMCARE;
   } else if (funderCode === constants.FUNDERS.HEALTHPOINT) {
     return constants.FUNDERS.HEALTHPOINT;
+  } else if (funderCode === constants.FUNDERS.WSV) {
+    return constants.FUNDERS.WSV;
   }
 
   return constants.FUNDERS.PATIENT;
@@ -81,6 +83,9 @@ var isPatientFunded = function isPatientFunded(funderCode) {
 var isWCQ = function isWCQ(funderCode) {
   return funderCode === constants.FUNDERS.WCQ;
 };
+var isWSV = function isWSV(funderCode) {
+  return funderCode === constants.FUNDERS.WSV;
+};
 var isFunderClaimable = function isFunderClaimable(funderCode) {
   return CLAIMABLE_FUNDERS.includes(funderCode);
 };
@@ -102,3 +107,4 @@ exports.isNDIS = isNDIS;
 exports.isOHC = isOHC;
 exports.isPatientFunded = isPatientFunded;
 exports.isWCQ = isWCQ;
+exports.isWSV = isWSV;

package/get-env.js

@@ -11,7 +11,7 @@ var _omitBy = _interopDefault(require('lodash/omitBy'));
 
 function _createForOfIteratorHelperLoose(o) { var i = 0; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } i = o[Symbol.iterator](); return i.next.bind(i); }
 
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(n); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medipass/utils",
-  "version": "11.54.4",
+  "version": "11.55.1-fix-comcare-verify.0",
   "description": "",
   "main": "index.js",
   "module": "index.js",
@@ -44,10 +44,10 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-runtime": "7.8.3",
-    "@medipass/web-sdk": "^11.18.4",
+    "@medipass/web-sdk": "^11.18.7-fix-comcare-verify.0",
     "redux-mock-store": "^1.3.0",
     "redux-thunk": "^2.2.0",
     "rimraf": "^2.6.2"
   },
-  "gitHead": "dd3fe3619ffe657c1b29c2bafe635d5410271715"
+  "gitHead": "70caac05636eff1b5bd2b1faad93074b4e98423b"
 }

package/service-items.js

@@ -27,32 +27,25 @@ var calculateTotalAmount = function calculateTotalAmount(serviceItems, opts) {
   }
 
   var total = serviceItems.reduce(function (total, item) {
-    var itemTotal = parseFloat(_get(item, 'feeAmount', '0'));
-
-    if (parseFloat(_get(item, 'initialGrossAmount', '0'))) {
-      itemTotal = parseFloat(_get(item, 'initialGrossAmount', '0'));
-    }
-
     var includeQuantity = _get(opts, 'includeQuantity');
 
     if (funders.isIcare(_get(opts, 'funder.code')) && _get(item, 'unit') === 'minutes') {
       includeQuantity = false;
     }
 
-    if (includeQuantity && item.quantity && !item.isExtendedPrice) {
-      itemTotal = parseFloat((itemTotal * item.quantity).toFixed(6));
-    }
+    var prices = calculatePrices({
+      isTaxable: Boolean(opts.includeGST && item.isTaxable),
+      isGross: item.isGross,
+      initialFeeAmount: (item == null ? void 0 : item.initialFeeAmount) ? parseFloat((item == null ? void 0 : item.initialFeeAmount) || 0) : parseFloat((item == null ? void 0 : item.feeAmount) || 0),
+      isExtendedPrice: item == null ? void 0 : item.isExtendedPrice,
+      quantity: includeQuantity ? item.quantity : 1
+    });
+    var itemTotal = undefined;
 
-    if (opts.includeGST && item.isTaxable) {
-      if (opts.isSubTotal) {
-        if (item.isGross) {
-          itemTotal -= parseFloat((itemTotal / 11).toFixed(6));
-        }
-      } else {
-        if (!item.isGross) {
-          itemTotal = parseFloat((itemTotal * 1.1).toFixed(6));
-        }
-      }
+    if (opts.isSubTotal) {
+      itemTotal = prices == null ? void 0 : prices.feeAmount;
+    } else {
+      itemTotal = prices == null ? void 0 : prices.grossAmount;
     }
 
     if (opts.includeDiscount && item.discountAmount) {
@@ -81,27 +74,15 @@ var calculateTotalGSTAmount = function calculateTotalGSTAmount(serviceItems, opt
       includeQuantity = false;
     }
 
-    if (item.isTaxable) {
-      var itemTotal = parseFloat(_get(item, 'feeAmount', '0'));
-
-      if (parseFloat(_get(item, 'initialGrossAmount', '0'))) {
-        itemTotal = parseFloat(_get(item, 'initialGrossAmount', '0'));
-      }
-
-      if (includeQuantity && item.quantity && !item.isExtendedPrice) {
-        itemTotal = parseFloat((itemTotal * item.quantity).toFixed(6));
-      }
-
-      if (item.isGross) {
-        itemTotal = parseFloat((itemTotal / 11).toFixed(6));
-      } else {
-        itemTotal = parseFloat((itemTotal * 0.1).toFixed(6));
-      }
-
-      return total + itemTotal;
-    }
-
-    return total;
+    var prices = calculatePrices({
+      isTaxable: item.isTaxable,
+      isGross: item.isGross,
+      initialFeeAmount: (item == null ? void 0 : item.initialFeeAmount) ? parseFloat((item == null ? void 0 : item.initialFeeAmount) || 0) : parseFloat((item == null ? void 0 : item.feeAmount) || 0),
+      isExtendedPrice: item == null ? void 0 : item.isExtendedPrice,
+      quantity: includeQuantity ? item.quantity : 1
+    });
+    var gstAmount = prices == null ? void 0 : prices.taxAmount;
+    return total + gstAmount;
   }, 0);
 };
 var applyDiscountToServiceItems = function applyDiscountToServiceItems(serviceItems, _ref) {
@@ -216,7 +197,51 @@ function mapItemsToClaimItems(transaction) {
   return newItems;
 }
 
+var round2DecimalPlaces = function round2DecimalPlaces(num) {
+  return Math.round((num + Number.EPSILON) * 100) / 100;
+};
+
+var calculatePrices = function calculatePrices(_ref3) {
+  var isTaxable = _ref3.isTaxable,
+      isGross = _ref3.isGross,
+      initialFeeAmount = _ref3.initialFeeAmount,
+      isExtendedPrice = _ref3.isExtendedPrice,
+      quantity = _ref3.quantity;
+  var grossAmount = parseFloat(initialFeeAmount || 0);
+  var feeAmount = parseFloat(initialFeeAmount || 0);
+  var taxAmount = 0;
+
+  if (!isTaxable) {
+    return {
+      grossAmount: grossAmount,
+      feeAmount: feeAmount,
+      taxAmount: taxAmount
+    };
+  }
+
+  if (isGross) {
+    taxAmount = parseFloat(round2DecimalPlaces(grossAmount / 11).toFixed(2) || 0);
+    feeAmount = grossAmount - taxAmount;
+  } else {
+    taxAmount = parseFloat((feeAmount * 1.1).toFixed(6)) - feeAmount;
+    grossAmount = feeAmount + taxAmount;
+  }
+
+  if (!isExtendedPrice) {
+    taxAmount = taxAmount * quantity;
+    feeAmount = feeAmount * quantity;
+    grossAmount = grossAmount * quantity;
+  }
+
+  return {
+    grossAmount: grossAmount,
+    feeAmount: feeAmount,
+    taxAmount: taxAmount
+  };
+};
+
 exports.applyDiscountToServiceItems = applyDiscountToServiceItems;
+exports.calculatePrices = calculatePrices;
 exports.calculateTotalAmount = calculateTotalAmount;
 exports.calculateTotalDiscountAmount = calculateTotalDiscountAmount;
 exports.calculateTotalGSTAmount = calculateTotalGSTAmount;