Add number format

Strategy11 · Feb 4, 2025 · 776bc47 · 776bc47
1 parent dae5ec6
commit 776bc47
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php
@@ -964,7 +964,7 @@ private static function should_allow_input_attribute( $key ) {
 	 */
 	private static function add_pattern_attribute( $field, array &$add_html ) {
 		$format_value = FrmField::get_option( $field, 'format' );
-		$has_format   = $format_value && 'currency' !== $format_value;
+		$has_format   = $format_value && ! FrmCurrencyHelper::is_currency_format( $format_value );
 		$format_field = FrmField::is_field_type( $field, 'text' );
 
 		if ( $field['type'] === 'phone' || ( $has_format && $format_field ) ) {

diff --git a/classes/helpers/FrmCurrencyHelper.php b/classes/helpers/FrmCurrencyHelper.php
@@ -26,6 +26,16 @@ public static function get_currency( $currency ) {
 		return $currency;
 	}
 
+	/**
+	 * Checks if the given format is a valid currency format.
+	 *
+	 * @param string $format_value The format value to check.
+	 * @return bool
+	 */
+	public static function is_currency_format( $format_value ) {
+		return ! empty( $format_value ) && in_array( $format_value, array( 'currency', 'number' ), true );
+	}
+
 	/**
 	 * Get a list of all supported currencies.
 	 *

diff --git a/classes/models/FrmEntryValidate.php b/classes/models/FrmEntryValidate.php
@@ -231,8 +231,8 @@ public static function validate_field_types( &$errors, $posted_field, $value, $a
 
 	public static function validate_phone_field( &$errors, $field, $value, $args ) {
 		$format_value = FrmField::get_option( $field, 'format' );
-		if ( $field->type === 'phone' || ( $field->type === 'text' && $format_value && 'currency' !== $format_value ) ) {
 
+		if ( $field->type === 'phone' || ( $field->type === 'text' && ! FrmCurrencyHelper::is_currency_format( $format_value ) ) ) {
 			$pattern = self::phone_format( $field );
 
 			if ( ! preg_match( $pattern, $value ) ) {
@@ -351,7 +351,7 @@ public static function spam_check( $exclude, $values, &$errors ) {
 	private static function maybe_normalize_formatted_numbers( $field, &$value ) {
 		if (
 			is_callable( 'FrmProCurrencyHelper::normalize_formatted_numbers' )
-			&& 'currency' === FrmField::get_option( $field, 'format' )
+			&& FrmCurrencyHelper::is_currency_format( FrmField::get_option( $field, 'format' ) )
 		) {
 			$value = FrmProCurrencyHelper::normalize_formatted_numbers( $field, $value );
 		}

diff --git a/classes/views/frm-fields/back-end/format-dropdown-options.php b/classes/views/frm-fields/back-end/format-dropdown-options.php
@@ -28,10 +28,21 @@
 	)
 );
 
+FrmHtmlHelper::echo_dropdown_option(
+	__( 'Currency', 'formidable' ),
+	false,
+	array(
+		'value'        => '',
+		'class'        => 'frm_show_upgrade frm_noallow',
+		'data-upgrade' => __( 'Format currency field', 'formidable' ),
+		'data-medium'  => 'format-currency-field',
+	)
+);
+
 if ( 'text' === $field_type ) {
 	FrmHtmlHelper::echo_dropdown_option(
 		__( 'Custom', 'formidable' ),
-		! empty( $format ) && 'currency' !== $format,
+		! empty( $format ) && ! FrmCurrencyHelper::is_currency_format( $format ),
 		array(
 			'value'           => 'custom',
 			'data-dependency' => '#frm-field-format-custom-' . $field_id,

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
@@ -5439,7 +5439,7 @@ function frmAdminBuildJS() {
 			const fieldId = formatElement.dataset.fieldId;
 			const formatInput = document.getElementById( `frm-field-format-custom-${fieldId}` ).querySelector( '.frm_format_opt' );
 
-			if ( 'international' === formatInput.value || 'currency' === formatInput.value ) {
+			if ( 'international' === formatInput.value || 'currency' === formatInput.value || 'number' === formatInput.value ) {
 				formatInput.setAttribute( 'value', '' );
 			}
 		}
@@ -6702,7 +6702,8 @@ function frmAdminBuildJS() {
 		const valueMap = {
 			none: '',
 			international: 'international',
-			currency: 'currency'
+			currency: 'currency',
+			number: 'number'
 		};
 
 		formatTypes.forEach( formatType => {