@medipass/utils 11.57.1-fix-select-options-undefined.0 → 11.58.2-fix-prod-issues.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.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)
+
+
+### Features
+
+* validation for service text dva and medicare ([#598](https://github.com/medipass/web-medicules/issues/598)) ([963f9a6](https://github.com/medipass/web-medicules/commit/963f9a6))
+
+
+
+
+
 # [11.57.0](https://github.com/medipass/web/compare/@medipass/utils@11.56.1...@medipass/utils@11.57.0) (2021-11-16)
 
 

package/get-select-options.js

@@ -28,13 +28,13 @@ var getSelectOptions = function getSelectOptions(values, labelKey, valueKey, opt
   });
 };
 var getNameMobileEmail = function getNameMobileEmail(value) {
-  return _get(value, 'firstName', '') + " " + _get(value, 'lastName', '') + " " + _get(value, 'mobile', '') + " " + _get(value, 'email', '');
+  return _get(value, 'firstName') + " " + _get(value, 'lastName') + " " + _get(value, 'mobile', '') + " " + _get(value, 'email', '');
 };
 var getDisplayNameAndICDCode = function getDisplayNameAndICDCode(value) {
   return _get(value, 'icdCode') + " - " + _get(value, 'displayName');
 };
 var getFullName = function getFullName(value) {
-  return _get(value, 'firstName', '') + " " + _get(value, 'lastName', '');
+  return _get(value, 'firstName') + " " + _get(value, 'lastName');
 };
 var getSelectOptionsWithNameMobileEmail = function getSelectOptionsWithNameMobileEmail(data) {
   return getSelectOptions(data, null, null, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medipass/utils",
-  "version": "11.57.1-fix-select-options-undefined.0",
+  "version": "11.58.2-fix-prod-issues.0",
   "description": "",
   "main": "index.js",
   "module": "index.js",
@@ -47,5 +47,5 @@
     "redux-thunk": "^2.2.0",
     "rimraf": "^2.6.2"
   },
-  "gitHead": "b93e7cdd9275e80bf3c37fc2209c47610dc9bedd"
+  "gitHead": "bf8ffaaa47a36e0a4dd4f6b263102828925e37f4"
 }

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.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 ? 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,
+      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/validate-form.js

@@ -309,6 +309,12 @@ var hasInvalidCharacters = function hasInvalidCharacters(value) {
 var hasStrictInvalidCharacters = function hasStrictInvalidCharacters(value) {
   return value && /[^A-Za-z0-9-' ]/.test(value) ? 'This field cannot contain any special characters except for space, hyphen and apostrophe under certain conditions' : undefined;
 };
+var hasDoubleSpaces = function hasDoubleSpaces(value) {
+  return value && /\s\s+/g.test(value) ? 'There can be no double spaces in the supplied value' : undefined;
+};
+var hasWhitespaceAtStartOrEnd = function hasWhitespaceAtStartOrEnd(value) {
+  return value && /(^\s+)|(\s+$)/.test(value) ? 'There can be no spaces at the start or end of the supplied value' : undefined;
+};
 var hasSpaceAfterHyphen = function hasSpaceAfterHyphen(value) {
   return value && /([-]\s)/.test(value) ? 'Name cannot have a space after a hyphen (-)' : undefined;
 };
@@ -340,6 +346,7 @@ var validateForm = (function () {
 });
 
 exports.default = validateForm;
+exports.hasDoubleSpaces = hasDoubleSpaces;
 exports.hasInvalidCharacters = hasInvalidCharacters;
 exports.hasNumber = hasNumber;
 exports.hasSpaceAfterApostrophe = hasSpaceAfterApostrophe;
@@ -349,6 +356,7 @@ exports.hasSpaceBeforeHyphen = hasSpaceBeforeHyphen;
 exports.hasSpecialChar = hasSpecialChar;
 exports.hasStrictInvalidCharacters = hasStrictInvalidCharacters;
 exports.hasUppercaseLetter = hasUppercaseLetter;
+exports.hasWhitespaceAtStartOrEnd = hasWhitespaceAtStartOrEnd;
 exports.isEqualTo = isEqualTo;
 exports.isFutureDate = isFutureDate;
 exports.isGreaterThan = isGreaterThan;