@medipass/utils 11.54.5-feature-wsv.0 → 11.55.1

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [11.55.1](https://github.com/medipass/web/compare/@medipass/utils@11.55.0...@medipass/utils@11.55.1) (2021-10-29)
+
+
+### Bug Fixes
+
+* comcare verify endpoint ([#577](https://github.com/medipass/web/issues/577)) ([e9aab21](https://github.com/medipass/web/commit/e9aab21))
+
+
+
+
+
+# [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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medipass/utils",
-  "version": "11.54.5-feature-wsv.0",
+  "version": "11.55.1",
   "description": "",
   "main": "index.js",
   "module": "index.js",
@@ -44,10 +44,10 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-runtime": "7.8.3",
-    "@medipass/web-sdk": "^11.18.5-feature-wsv.0",
+    "@medipass/web-sdk": "^11.18.7",
     "redux-mock-store": "^1.3.0",
     "redux-thunk": "^2.2.0",
     "rimraf": "^2.6.2"
   },
-  "gitHead": "2abed80d5e42153dff8f4052d960a42f3bc3de51"
+  "gitHead": "31512948e6b2e351037d9b12fe006aa8abf44bb1"
 }

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;