Skip to content
Snippets Groups Projects
Commit e5ed33cf authored by madhu sr's avatar madhu sr
Browse files

Handled the decimal field values to user preffered format

parent 911235f4
No related branches found
No related tags found
No related merge requests found
......@@ -405,7 +405,8 @@ class ListViewController {
}
}
} elseif ($fieldDataType == 'double') {
$value = decimalFormat($value);
//Converting the decimal value to user preferred format, considering number of decimals and decimal separator
$value = CurrencyField::convertToUserFormat(decimalFormat($value));
} elseif($fieldDataType == 'url') {
$matchPattern = "^[\w]+:\/\/^";
preg_match($matchPattern, $rawValue, $matches);
......
......@@ -105,6 +105,9 @@
{assign var=FIELD_VALUE value=$FIELD_MODEL->get('fieldvalue')}
{if $fieldDataType eq 'multipicklist'}
{assign var=FIELD_DISPLAY_VALUE value=$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))}
{else if $fieldDataType eq 'double'}
<!-- Converting the decimal value to user format, considering the number of decimals and decimal separator and assigning the value-->
{assign var=FIELD_DISPLAY_VALUE value=Vtiger_Util_Helper::toSafeHTML(CurrencyField::convertToUserFormat($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))))}
{else}
{assign var=FIELD_DISPLAY_VALUE value=Vtiger_Util_Helper::toSafeHTML($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue')))}
{/if}
......
......@@ -15,7 +15,8 @@
{if $MODULE eq 'HelpDesk' && ($FIELD_MODEL->get('name') eq 'days' || $FIELD_MODEL->get('name') eq 'hours')}
{assign var="FIELD_VALUE" value=$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))}
{else if $FIELD_MODEL->getFieldDataType() eq 'double'}
{assign var="FIELD_VALUE" value=$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))}
<!-- Converting the decimal value to user format, considering the number of decimals and decimal separator -->
{assign var="FIELD_VALUE" value=CurrencyField::convertToUserFormat($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue')))}
{else}
{assign var="FIELD_VALUE" value=$FIELD_MODEL->get('fieldvalue')}
{/if}
......
......@@ -41,6 +41,9 @@
{/if}
{else if $FIELD_MODEL->get('name') eq 'signature'}
{decode_html($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD))}
{else if $FIELD_MODEL->getFieldDataType() eq 'double'}
<!-- Converting the decimal value to user format, considering the number of decimals and decimal separator -->
{CurrencyField::convertToUserFormat($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD))}
{else}
{$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD)}
{/if}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment