@medipass/utils 11.58.2-react-core-0.114.1.0 → 11.58.4

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.58.4](https://github.com/medipass/web/compare/@medipass/utils@11.58.3...@medipass/utils@11.58.4) (2021-12-22)
+
+
+### Bug Fixes
+
+* calculate totals ([#606](https://github.com/medipass/web/issues/606)) ([214c51b](https://github.com/medipass/web/commit/214c51b))
+
+
+
+
+
+## [11.58.3](https://github.com/medipass/web/compare/@medipass/utils@11.58.2...@medipass/utils@11.58.3) (2021-12-22)
+
+
+### Bug Fixes
+
+* item totals section ([#605](https://github.com/medipass/web/issues/605)) ([1b12e67](https://github.com/medipass/web/commit/1b12e67))
+
+
+
+
+
+## [11.58.2](https://github.com/medipass/web/compare/@medipass/utils@11.58.1...@medipass/utils@11.58.2) (2021-12-17)
+
+
+### Bug Fixes
+
+* calculate item totals in services section ([#602](https://github.com/medipass/web/issues/602)) ([e6267fe](https://github.com/medipass/web/commit/e6267fe))
+
+
+
+
+
 ## [11.58.1](https://github.com/medipass/web/compare/@medipass/utils@11.58.0...@medipass/utils@11.58.1) (2021-12-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medipass/utils",
-  "version": "11.58.2-react-core-0.114.1.0",
+  "version": "11.58.4",
   "description": "",
   "main": "index.js",
   "module": "index.js",
@@ -47,5 +47,5 @@
     "redux-thunk": "^2.2.0",
     "rimraf": "^2.6.2"
   },
-  "gitHead": "8a05fc61ef0047fbe76cc506e06f10401c8bfde2"
+  "gitHead": "a7686b733dba3197e88fd0b7bac30637a8f5334c"
 }

package/service-items.js

@@ -35,7 +35,7 @@ var calculateTotalAmount = function calculateTotalAmount(serviceItems, opts) {
 
     var prices = calculateAmounts({
       isTaxable: Boolean(opts.includeGST && item.isTaxable),
-      initialFeeAmount: (item == null ? void 0 : item.feeAmount) ? parseFloat((item == null ? void 0 : item.feeAmount) || 0) : parseFloat((item == null ? void 0 : item.initialFeeAmount) || 0),
+      initialGrossAmount: (item == null ? void 0 : item.grossAmount) ? parseFloat((item == null ? void 0 : item.grossAmount) || 0) : parseFloat((item == null ? void 0 : item.feeAmount) || 0),
       quantity: includeQuantity ? item.quantity : 1
     });
     var itemTotal = undefined;
@@ -74,7 +74,7 @@ var calculateTotalGSTAmount = function calculateTotalGSTAmount(serviceItems, opt
 
     var prices = calculateAmounts({
       isTaxable: item.isTaxable,
-      initialFeeAmount: (item == null ? void 0 : item.feeAmount) ? parseFloat((item == null ? void 0 : item.feeAmount) || 0) : parseFloat((item == null ? void 0 : item.initialFeeAmount) || 0),
+      initialGrossAmount: parseFloat((item == null ? void 0 : item.grossAmount) || 0),
       quantity: includeQuantity ? item.quantity : 1
     });
     var gstAmount = prices == null ? void 0 : prices.taxAmount;
@@ -194,11 +194,9 @@ function mapItemsToClaimItems(transaction) {
 }
 var calculateAmounts = function calculateAmounts(_ref3) {
   var isTaxable = _ref3.isTaxable,
-      initialFeeAmount = _ref3.initialFeeAmount,
-      isExtendedPrice = _ref3.isExtendedPrice,
-      _ref3$quantity = _ref3.quantity;
-  var grossAmount = parseFloat(initialFeeAmount || 0);
-  var feeAmount = parseFloat(initialFeeAmount || 0);
+      initialGrossAmount = _ref3.initialGrossAmount;
+  var grossAmount = parseFloat(initialGrossAmount || 0);
+  var feeAmount = parseFloat(initialGrossAmount || 0);
   var taxAmount = 0;
 
   if (!isTaxable) {
@@ -209,8 +207,8 @@ var calculateAmounts = function calculateAmounts(_ref3) {
     };
   }
 
+  feeAmount = feeAmount - feeAmount / 11;
   taxAmount = parseFloat((feeAmount * 1.1).toFixed(6)) - feeAmount;
-  grossAmount = feeAmount + taxAmount;
   return {
     taxAmount: taxAmount,
     feeAmount: feeAmount,