Additional work for leading zeroes for number fields

Author: sc0ttkclark

classes/fields/number.php

@@ -157,7 +157,7 @@ public function schema( $options = null ) {
 
 		$schema = 'DECIMAL(' . $length . ',' . $decimals . ')';
 
-		if ( 1 === (int) pods_v( static::$type . '_keep_leading_zeroes', $options, 255 ) ) {
+		if ( 1 === (int) pods_v( static::$type . '_keep_leading_zeroes', $options, 0 ) ) {
 			$schema = 'VARCHAR(' . $length . ')';
 		}
 
@@ -358,13 +358,26 @@ public function pre_save( $value, $id = null, $name = null, $options = null, $fi
 			return null;
 		}
 
+		$prefix = null;
+
+		if (
+			1 === (int) pods_v( static::$type . '_keep_leading_zeroes', $options, 0 )
+			&& preg_match( '/^(0+)/', $value, $leading_zeroes )
+		) {
+			$prefix = $leading_zeroes[0];
+		}
+
 		$value = number_format( (float) $value, $decimals, '.', '' );
 
 		// Optionally remove trailing decimal zero's.
 		if ( pods_v( static::$type . '_format_soft', $options, false ) ) {
 			$value = $this->trim_decimals( $value, '.' );
 		}
 
+		if ( null !== $prefix ) {
+			$value = $prefix . $value;
+		}
+
 		return $value;
 	}
 
@@ -383,6 +396,15 @@ public function format( $value = null, $name = null, $options = null, $pod = nul
 		$dot         = $format_args['dot'];
 		$decimals    = $format_args['decimals'];
 
+		$prefix = null;
+
+		if (
+			1 === (int) pods_v( static::$type . '_keep_leading_zeroes', $options, 0 )
+			&& preg_match( '/^(0+)/', $value, $leading_zeroes )
+		) {
+			$prefix = $leading_zeroes[0];
+		}
+
 		if ( 'i18n' === pods_v( static::$type . '_format', $options ) ) {
 			$value = number_format_i18n( (float) $value, $decimals );
 		} else {
@@ -394,6 +416,10 @@ public function format( $value = null, $name = null, $options = null, $pod = nul
 			$value = $this->trim_decimals( $value, $dot );
 		}
 
+		if ( null !== $prefix ) {
+			$value = $prefix . $value;
+		}
+
 		return $value;
 	}
 

ui/js/dfv/src/fields/number-field/index.js

@@ -44,7 +44,7 @@ const NumberField = ( {
 	// a formatted string, so be able to handle either one, but keep
 	// a formatted version available locally.
 	const [ formattedValue, setFormattedValue ] = useState(
-		formatNumberWithPodsFormat( value, format, softFormat )
+		formatNumberWithPodsFormat( value, format, softFormat, keepLeadingZeroes )
 	);
 
 	useEffect( () => {