Merge branch 'hotfix-1.2.3' into stable

Author: DominicWatson

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.2.3
+
+* VALIDATION-8 - Min/ Max if other field value
+
+
 ## v1.2.2
 
 * Add missing client side validation for the `requiredifotherfieldmatchsystemlookup` validator
@@ -10,8 +15,8 @@
 
 ## v1.2.0
 
-* [VALIDATION-5](https://projects.pixl8.london/browse/VALIDATION-5) - requiredIfOtherFieldInValues to allow required for multiple values
-* [VALIDATION-4](https://projects.pixl8.london/browse/VALIDATION-4) - Add rule for a field to be required if other field match system config
+* VALIDATION-5 - requiredIfOtherFieldInValues to allow required for multiple values
+* VALIDATION-4 - Add rule for a field to be required if other field match system config
 
 ## v1.1.0
 

services/validation/ValidationExtrasValidators.cfc

@@ -82,8 +82,8 @@ component {
 		return "function( value, el, params ) { return true; }";
 	}
 
-	public boolean function requiredIfOtherFieldInValues( required string fieldName, any value="", required struct data, required string otherField, required string otherFieldValues ) validatorMessage="cms:validation.conditional.required.default" {
 
+	public boolean function requiredIfOtherFieldInValues( required string fieldName, any value="", required struct data, required string otherField, required string otherFieldValues ) validatorMessage="cms:validation.conditional.required.default" {
 		var otherValues = ListToArray( arguments.otherFieldValues );
 		if ( ( !ArrayContains( otherValues, arguments.data[ arguments.otherField ] ?: "" ) ) ) {
 			return true;
@@ -103,6 +103,37 @@ component {
 	}
 
 
+	public boolean function minIfOtherFieldValue( required string fieldName, string value="" ) validatorMessage="cms:validation.min.default" {
+		if ( ( arguments.data[ arguments.otherField ] ?: "" ) != arguments.otherFieldValue ) {
+			return true;
+		}
+
+		if ( not Len( Trim( arguments.value ) ) ) {
+			return true;
+		}
+
+		return Val( Replace( arguments.value, ",", "", "all" ) ) >= arguments.minValue;
+	}
+	public string function minIfOtherFieldValue_js() {
+		return "function( value, el, params ) { return true; }";
+	}
+
+	public boolean function maxIfOtherFieldValue( required string fieldName, string value="" ) validatorMessage="cms:validation.min.default" {
+		if ( ( arguments.data[ arguments.otherField ] ?: "" ) != arguments.otherFieldValue ) {
+			return true;
+		}
+
+		if ( not Len( Trim( arguments.value ) ) ) {
+			return true;
+		}
+
+		return Val( Replace( arguments.value, ",", "", "all" ) ) <= arguments.maxValue;
+	}
+	public string function maxIfOtherFieldValue_js() {
+		return "function( value, el, params ) { return true; }";
+	}
+
+
 	public boolean function ukPhone( required string fieldName, string value="" ) validatorMessage="validationExtras:validation.ukPhone.default" {
 		if ( not Len( Trim( arguments.value ) ) ) {
 			return true;