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

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [11.58.1](https://github.com/medipass/web/compare/@medipass/utils@11.58.0...@medipass/utils@11.58.1) (2021-12-15)
+
+
+### Bug Fixes
+
+* calculate item totals and gst ([#600](https://github.com/medipass/web/issues/600)) ([af48c3a](https://github.com/medipass/web/commit/af48c3a))
+
+
+
+
+
 # [11.58.0](https://github.com/medipass/web-medicules/compare/@medipass/utils@11.57.0...@medipass/utils@11.58.0) (2021-12-13)
 
 

package/build-validation-schema.js

@@ -888,7 +888,7 @@ var lib$1 = createCommonjsModule(function (module) {
 }).call(commonjsGlobal);
 });
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var FIELD_VALIDATORS = {

package/form-applications/assign-values-to-sections.js

@@ -6,7 +6,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var _defineProperty = _interopDefault(require('@babel/runtime/helpers/defineProperty'));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 

package/get-env.js

@@ -9,13 +9,13 @@ var _get = _interopDefault(require('lodash/get'));
 var _isEmpty = _interopDefault(require('lodash/isEmpty'));
 var _omitBy = _interopDefault(require('lodash/omitBy'));
 
-function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; 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."); }
+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; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var REQUIRED_VARIABLES = ['APP_URL'];

package/i18n/index.js

@@ -10,7 +10,7 @@ var translations = require('./translations.js');
 var i18n = _interopDefault(require('i18next'));
 var reactI18next = require('react-i18next');
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 

package/intercom.js

@@ -12,7 +12,7 @@ require('lodash/isEmpty');
 require('lodash/omitBy');
 var getEnv = require('./get-env.js');
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var bootIntercom = /*#__PURE__*/function () {

package/package.json

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

package/redux-actions.js

@@ -9,7 +9,7 @@ var _regeneratorRuntime = _interopDefault(require('@babel/runtime/regenerator'))
 var _asyncToGenerator = _interopDefault(require('@babel/runtime/helpers/asyncToGenerator'));
 var _get = _interopDefault(require('lodash/get'));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var REQUEST = 'REQUEST';

package/redux-reducer.js

@@ -12,7 +12,7 @@ var _set = _interopDefault(require('lodash/set'));
 var _pick = _interopDefault(require('lodash/pick'));
 var reduxActions = require('./redux-actions.js');
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var request = function request(state, _temp) {

package/service-items.js

@@ -10,7 +10,7 @@ var _get = _interopDefault(require('lodash/get'));
 var _isEmpty = _interopDefault(require('lodash/isEmpty'));
 var funders = require('./funders.js');
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 function round(value, step) {
@@ -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 && 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,
+      initialFeeAmount: (item == null ? void 0 : item.feeAmount) ? parseFloat((item == null ? void 0 : item.feeAmount) || 0) : parseFloat((item == null ? void 0 : item.initialFeeAmount) || 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 && 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,
+      initialFeeAmount: (item == null ? void 0 : item.feeAmount) ? parseFloat((item == null ? void 0 : item.feeAmount) || 0) : parseFloat((item == null ? void 0 : item.initialFeeAmount) || 0),
       quantity: includeQuantity ? item.quantity : 1
     });
     var gstAmount = prices == null ? void 0 : prices.taxAmount;
@@ -196,64 +192,34 @@ 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
-    };
-  }
-
+      _ref3$quantity = _ref3.quantity;
   var grossAmount = parseFloat(initialFeeAmount || 0);
   var feeAmount = parseFloat(initialFeeAmount || 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,
+  taxAmount = parseFloat((feeAmount * 1.1).toFixed(6)) - feeAmount;
+  grossAmount = feeAmount + taxAmount;
+  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;

package/webpack-config.js

@@ -6,7 +6,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var _defineProperty = _interopDefault(require('@babel/runtime/helpers/defineProperty'));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }