Refactor part of calculate.tpl towards CRM-16929

diff --git a/templates/CRM/Price/Form/Calculate.tpl b/templates/CRM/Price/Form/Calculate.tpl
index e8d24ca407381ed5a1b59dba233e69e3234ca265..1227b798ce33c0ccac5b269e3d786e7f29d6b476 100644 (file)
--- a/templates/CRM/Price/Form/Calculate.tpl
+++ b/templates/CRM/Price/Form/Calculate.tpl
@@ -120,53 +120,49 @@ cj("input,#priceset select,#priceset").each(function () {
 
   case 'select-one':
 
-    //default calcution of element.
-    var ele = cj(this).attr('id');
-    if ( ! price[ele] ) {
-      price[ele] = 0;
-    }
-    eval( 'var selectedText = ' + cj(this).attr('price') );
-    var addprice = 0;
-    if ( cj(this).val( ) ) {
-      optionPart = selectedText[cj(this).val( )].split(optionSep);
-      addprice   = parseFloat( optionPart[0] );
-    }
-
-    if ( addprice ) {
-      totalfee   = parseFloat(totalfee) + addprice - parseFloat(price[ele]);
-      price[ele] = addprice;
+    //default calculation of element.
+    var elementID = cj(this).attr('id');
+    if ( ! price[elementID] ) {
+      price[elementID] = 0;
     }
+    var addPrice = calculateSelectLineItemValue(this);
+    // In other words we subtract any existing value before adding the new value it seems.
+    totalfee   = parseFloat(totalfee) + addPrice - parseFloat(price[elementID]);
+    price[elementID] = addPrice;
 
     //event driven calculation of element.
     cj(this).change( function() {
-      var ele = cj(this).attr('id');
-      if ( ! price[ele] ) {
-        price[ele] = 0;
-      }
-      eval( 'var selectedText = ' + cj(this).attr('price') );
-
-      var addprice = 0;
-      if ( cj(this).val( ) ) {
-        optionPart = selectedText[cj(this).val( )].split(optionSep);
-        addprice   = parseFloat( optionPart[0] );
+      var elementID = cj(this).attr('id');
+      if ( ! price[elementID] ) {
+        price[elementID] = 0;
       }
 
-      if ( addprice ) {
-        totalfee   = parseFloat(totalfee) + addprice - parseFloat(price[ele]);
-        price[ele] = addprice;
-      }
-      else {
-        totalfee   = parseFloat(totalfee) - parseFloat(price[ele]);
-        price[ele] = parseFloat('0');
-      }
+      var addPrice = calculateSelectLineItemValue(this);
+      totalfee   = parseFloat(totalfee) + addPrice - parseFloat(price[elementID]);
+      price[elementID] = addPrice;
       display( totalfee );
     });
+
     display( totalfee );
     break;
     }
   }
 });
 
+/**
+ * Calculate the value of the line item for a select value.
+ */
+function calculateSelectLineItemValue(priceElement) {
+  eval( 'var selectedText = ' + cj(priceElement).attr('price') );
+  var addprice = parseFloat('0');
+  if ( cj(priceElement).val( ) ) {
+    optionPart = selectedText[cj(priceElement).val( )].split(optionSep);
+    addprice   = parseFloat( optionPart[0] );
+  }
+  return addprice;
+
+}
+
 //calculation for text box.
 function calculateText( object ) {
   //CRM-16034 - comma acts as decimal in price set text pricing