QA fixes

diff --git a/templates/CRM/Core/BillingBlock.tpl b/templates/CRM/Core/BillingBlock.tpl
index f6c4c830cf785b6bbbb596a250ec43d5d39d3321..268fb97d3cd6d4c67adc55f711635fb8f6fb48ad 100644 (file)
--- a/templates/CRM/Core/BillingBlock.tpl
+++ b/templates/CRM/Core/BillingBlock.tpl
@@ -25,14 +25,15 @@
 *}
 {crmRegion name="billing-block"}
 <div id="payment_information">
-  {if $paymentFields|@count}
+  {if $form.$expressButtonName}
+    {if $paymentProcessor.payment_processor_type NEQ 'PayPal_Express'}
+       {include file= "CRM/Core/paypalexpress.tpl"}
+    {/if}
+  {else $paymentFields|@count}
     <fieldset class="billing_mode-group {$paymentTypeName}_info-group">
       <legend>
         {$paymentTypeLabel}
       </legend>
-      {if $form.$expressButtonName}
-        {include file= "CRM/Core/paypalexpress.tpl"}
-      {elseif $paymentProcessor.billing_mode & 1}
       <div class="crm-section billing_mode-section {$paymentTypeName}_info-section">
         {foreach from=$paymentFields item=paymentField}
           <div class="crm-section {$form.$paymentField.name}-section">
@@ -49,10 +50,8 @@
           </div>
         {/foreach}
       </div>
-     {/if}
     </fieldset>
-  {/if}
-  {if $billingDetailsFields|@count && !$form.$expressButtonName}
+  {if $billingDetailsFields|@count}
     {if $profileAddressFields}
       <input type="checkbox" id="billingcheckbox" value="0">
       <label for="billingcheckbox">{ts}My billing address is the same as above{/ts}</label>
@@ -74,6 +73,7 @@
       </div>
     </fieldset>
   {/if}
+{/if}
 </div>
 {if $profileAddressFields}
   <script type="text/javascript">