|
@@ -51,7 +51,7 @@ $(document).ready(() => {
|
|
const payCalc = (function (b) {
|
|
const payCalc = (function (b) {
|
|
class PayCalc {
|
|
class PayCalc {
|
|
constructor (bases) {
|
|
constructor (bases) {
|
|
- this.percentReg = /[0-9]+%/g;
|
|
|
|
|
|
+ this.percentReg = /((\d+)|((\d+)(\.\d+)))%/g;
|
|
this.bases = bases;
|
|
this.bases = bases;
|
|
this.bases.sort(function (a, b) {
|
|
this.bases.sort(function (a, b) {
|
|
return a.sort - b.sort;
|
|
return a.sort - b.sort;
|