projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ian province abbreviation patch - issue 724
[civicrm-core.git]
/
templates
/
CRM
/
Price
/
Form
/
Calculate.tpl
diff --git
a/templates/CRM/Price/Form/Calculate.tpl
b/templates/CRM/Price/Form/Calculate.tpl
index 3129059abc54c8012f471cfa3f38ff50e8bfd3f6..84d2c6673545d1b4419d2ab925c235c3976ccda5 100644
(file)
--- a/
templates/CRM/Price/Form/Calculate.tpl
+++ b/
templates/CRM/Price/Form/Calculate.tpl
@@
-1,8
+1,8
@@
{*
+--------------------------------------------------------------------+
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
5
|
+ | CiviCRM version 4.
7
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-167,7
+167,8
@@
cj("input,#priceset select,#priceset").each(function () {
//calculation for text box.
function calculateText( object ) {
//calculation for text box.
function calculateText( object ) {
- var textval = parseFloat( cj(object).val() );
+ //CRM-16034 - comma acts as decimal in price set text pricing
+ var textval = parseFloat( cj(object).val().replace(thousandMarker, '') );
eval( 'var option = '+ cj(object).attr('price') );
ele = option[0];
eval( 'var option = '+ cj(object).attr('price') );
ele = option[0];