@medipass/utils 11.58.1 → 11.58.3

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.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.1",
+  "version": "11.58.3",
   "description": "",
   "main": "index.js",
   "module": "index.js",
@@ -47,5 +47,5 @@
     "redux-thunk": "^2.2.0",
     "rimraf": "^2.6.2"
   },
-  "gitHead": "c49f7daca78a8752ab17653f2d711695add164d5"
+  "gitHead": "f524d6cfe9e2383b8a1bc07b85efc3057504cbc5"
 }

package/service-items.js

@@ -33,11 +33,9 @@ var calculateTotalAmount = function calculateTotalAmount(serviceItems, opts) {
       includeQuantity = false;
     }
 
-    var prices = calculatePrices({
+    var prices = calculateAmounts({
       isTaxable: Boolean(opts.includeGST && item.isTaxable),
-      isGross: item.isGross,
-      initialFeeAmount: (item == null ? void 0 : item.feeAmount) ? parseFloat((item == null ? void 0 : item.feeAmount) || 0) : parseFloat((item == null ? void 0 : item.initialFeeAmount) || 0),
-      isExtendedPrice: item == null ? void 0 : item.isExtendedPrice,
+      initialGrossAmount: parseFloat((item == null ? void 0 : item.grossAmount) || 0),
       quantity: includeQuantity ? item.quantity : 1
     });
     var itemTotal = undefined;
@@ -74,11 +72,9 @@ var calculateTotalGSTAmount = function calculateTotalGSTAmount(serviceItems, opt
       includeQuantity = false;
     }
 
-    var prices = calculatePrices({
+    var prices = calculateAmounts({
       isTaxable: item.isTaxable,
-      isGross: item.isGross,
-      initialFeeAmount: (item == null ? void 0 : item.feeAmount) ? parseFloat((item == null ? void 0 : item.feeAmount) || 0) : parseFloat((item == null ? void 0 : item.initialFeeAmount) || 0),
-      isExtendedPrice: item == null ? void 0 : item.isExtendedPrice,
+      initialGrossAmount: parseFloat((item == null ? void 0 : item.grossAmount) || 0),
       quantity: includeQuantity ? item.quantity : 1
     });
     var gstAmount = prices == null ? void 0 : prices.taxAmount;
@@ -196,64 +192,32 @@ function mapItemsToClaimItems(transaction) {
   });
   return newItems;
 }
-
-var round2DecimalPlaces = function round2DecimalPlaces(num) {
-  return Math.round((num + Number.EPSILON) * 100) / 100;
-};
-
-var calculatePrices = function calculatePrices(_ref3) {
+var calculateAmounts = function calculateAmounts(_ref3) {
   var isTaxable = _ref3.isTaxable,
-      isGross = _ref3.isGross,
-      initialFeeAmount = _ref3.initialFeeAmount,
-      isExtendedPrice = _ref3.isExtendedPrice,
-      _ref3$quantity = _ref3.quantity,
-      quantity = _ref3$quantity === void 0 ? 1 : _ref3$quantity;
-
-  function getTotalsWithQuantity(_ref4) {
-    var taxAmount = _ref4.taxAmount,
-        feeAmount = _ref4.feeAmount,
-        grossAmount = _ref4.grossAmount;
-    if (isExtendedPrice) return {
-      taxAmount: taxAmount,
-      feeAmount: feeAmount,
-      grossAmount: grossAmount
-    };
-    return {
-      grossAmount: grossAmount * quantity,
-      feeAmount: feeAmount * quantity,
-      taxAmount: taxAmount * 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) {
-    return getTotalsWithQuantity({
-      grossAmount: grossAmount,
+    return {
+      taxAmount: taxAmount,
       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;
+      grossAmount: grossAmount
+    };
   }
 
-  return getTotalsWithQuantity({
-    grossAmount: grossAmount,
+  feeAmount = feeAmount - feeAmount / 11;
+  taxAmount = parseFloat((feeAmount * 1.1).toFixed(6)) - feeAmount;
+  return {
+    taxAmount: taxAmount,
     feeAmount: feeAmount,
-    taxAmount: taxAmount
-  });
+    grossAmount: grossAmount
+  };
 };
 
 exports.applyDiscountToServiceItems = applyDiscountToServiceItems;
-exports.calculatePrices = calculatePrices;
+exports.calculateAmounts = calculateAmounts;
 exports.calculateTotalAmount = calculateTotalAmount;
 exports.calculateTotalDiscountAmount = calculateTotalDiscountAmount;
 exports.calculateTotalGSTAmount = calculateTotalGSTAmount;