From 07f7746a443adf3bb393db62544af2d52e39a984 Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@symbiotic.coop>
Date: Thu, 22 Aug 2019 11:58:59 -0400
Subject: [PATCH] Fix an HTML error in Calculate.tpl

---
 templates/CRM/Price/Form/Calculate.tpl | 73 ++++++++++++--------------
 1 file changed, 33 insertions(+), 40 deletions(-)

diff --git a/templates/CRM/Price/Form/Calculate.tpl b/templates/CRM/Price/Form/Calculate.tpl
index 268ce89acf..ec93545237 100644
--- a/templates/CRM/Price/Form/Calculate.tpl
+++ b/templates/CRM/Price/Form/Calculate.tpl
@@ -25,15 +25,16 @@
 *}
 
 {assign var='hideTotal' value=$quickConfig+$noCalcValueDisplay}
+
 <div id="pricesetTotal" class="crm-section section-pricesetTotal">
-  <div class="label
-{if $hideTotal},  hiddenElement{/if}" id="pricelabel">
-    {if ( $extends eq 'Contribution' ) || ( $extends eq 'Membership' )}
-    <span id='amount_sum_label'>{ts}Total Amount{/ts}{else}{ts}Total Fee(s){/ts}</span>
-     {if $isAdditionalParticipants} {ts}for this participant{/ts}{/if}
+  <div id="pricelabel" class="label {if $hideTotal}hiddenElement{/if}">
+    {if ($extends eq 'Contribution') || ($extends eq 'Membership')}
+      <span id='amount_sum_label'>{ts}Total Amount{/ts}</span>
+    {else}
+      <span id='amount_sum_label'>{ts}Total Fee(s){/ts}{if $isAdditionalParticipants} {ts}for this participant{/ts}{/if}</span>
     {/if}
   </div>
-  <div class="content calc-value" {if $hideTotal}style="display:none;"{/if} id="pricevalue" ></div>
+  <div class="content calc-value" {if $hideTotal}style="display:none;"{/if} id="pricevalue"></div>
 </div>
 
 <script type="text/javascript">
@@ -44,25 +45,23 @@ var separator      = '{/literal}{$config->monetaryDecimalPoint}{literal}';
 var symbol         = '{/literal}{$currencySymbol}{literal}';
 var optionSep      = '|';
 
+// Recalculate the total fees based on user selection
 cj("#priceset [price]").each(function () {
+  var elementType = cj(this).attr('type');
+  if (this.tagName == 'SELECT') {
+    elementType = 'select-one';
+  }
 
-    var elementType =  cj(this).attr('type');
-    if ( this.tagName == 'SELECT' ) {
-      elementType = 'select-one';
-    }
-
-    switch(elementType) {
-      case 'checkbox':
-        //event driven calculation of element.
-        cj(this).click(function(){
-          calculateCheckboxLineItemValue(this);
-          display(calculateTotalFee());
-        });
+  switch(elementType) {
+    case 'checkbox':
+      cj(this).click(function(){
         calculateCheckboxLineItemValue(this);
+        display(calculateTotalFee());
+      });
+      calculateCheckboxLineItemValue(this);
       break;
 
     case 'radio':
-      //event driven calculation of element.
       cj(this).click( function(){
         calculateRadioLineItemValue(this);
         display(calculateTotalFee());
@@ -70,32 +69,26 @@ cj("#priceset [price]").each(function () {
       calculateRadioLineItemValue(this);
       break;
 
-  case 'text':
-
-    //event driven calculation of element.
-    cj(this).bind( 'keyup', function() {
-      calculateText(this);
-    }).bind( 'blur' , function() {
+    case 'text':
+      cj(this).bind( 'keyup', function() {
+        calculateText(this);
+      }).bind( 'blur' , function() {
+        calculateText(this);
+      });
+      //default calculation of element.
       calculateText(this);
-    });
-    //default calculation of element.
-    calculateText(this);
-
-    break;
-
-  case 'select-one':
-    calculateSelectLineItemValue(this);
+      break;
 
-    //event driven calculation of element.
-    cj(this).change( function() {
+    case 'select-one':
       calculateSelectLineItemValue(this);
-      display(calculateTotalFee());
-    });
-
-
-    break;
 
+      cj(this).change(function() {
+        calculateSelectLineItemValue(this);
+        display(calculateTotalFee());
+      });
+      break;
   }
+
   display(calculateTotalFee());
 });
 
-- 
2.25.1