Merge remote branch 'canonical/master' into merge-forward

[civicrm-core.git] / templates / CRM / Price / Page / LineItem.tpl

diff --git a/templates/CRM/Price/Page/LineItem.tpl b/templates/CRM/Price/Page/LineItem.tpl
index 600e00826bebe56e935a4dbeab16b36e5c133c95..9bccacc711337cbedc79a9e0e30911c8795c4944 100644 (file)
--- a/templates/CRM/Price/Page/LineItem.tpl
+++ b/templates/CRM/Price/Page/LineItem.tpl
@@ -41,7 +41,16 @@
         {else}
           <th class="right">{ts}Qty{/ts}</th>
           <th class="right">{ts}Unit Price{/ts}</th>
-          <th class="right">{ts}Total Price{/ts}</th>
+          {if !$getTaxDetails}
+            <th class="right">{ts}Total Price{/ts}</th>
+          {/if}
+        {/if}
+
+        {if $getTaxDetails}
+          <th class="right">{ts}Subtotal{/ts}</th>
+          <th class="right">{ts}Tax Rate{/ts}</th>
+          <th class="right">{ts}Tax Amount{/ts}</th>
+          <th class="right">{ts}Total Amount{/ts}</th>
         {/if}
 
         {if $pricesetFieldsCount}
@@ -54,8 +63,23 @@
           {if $context NEQ "Membership"}
             <td class="right">{$line.qty}</td>
             <td class="right">{$line.unit_price|crmMoney}</td>
+         {else}
+            <td class="right">{$line.line_total|crmMoney}</td>
           {/if}
-          <td class="right">{$line.line_total|crmMoney}</td>
+         {if !$getTaxDetails && $context NEQ "Membership"}
+           <td class="right">{$line.line_total|crmMoney}</td>
+         {/if}
+         {if $getTaxDetails}
+           <td class="right">{$line.line_total|crmMoney}</td>
+           {if $line.tax_rate != "" || $line.tax_amount != ""}
+             <td class="right">{$taxTerm} ({$line.tax_rate|string_format:"%.2f"}%)</td>
+             <td class="right">{$line.tax_amount|crmMoney}</td>
+           {else}
+             <td></td>
+             <td></td>
+           {/if}
+           <td class="right">{$line.line_total+$line.tax_amount|crmMoney}</td>
+         {/if}
           {if $pricesetFieldsCount}
             <td class="right">{$line.participant_count}</td>
           {/if}
@@ -67,9 +91,15 @@
 
 <div class="crm-section no-label total_amount-section">
   <div class="content bold">
+    {if $getTaxDetails && $totalTaxAmount}
+      {ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney}<br />
+    {/if}
     {if $context EQ "Contribution"}
       {ts}Contribution Total{/ts}:
     {elseif $context EQ "Event"}
+      {if $totalTaxAmount}
+        {ts}Event SubTotal: {$totalAmount-$totalTaxAmount|crmMoney}{/ts}<br />
+      {/if}
       {ts}Event Total{/ts}:
     {elseif $context EQ "Membership"}
       {ts}Membership Fee Total{/ts}: