Skip to content
Snippets Groups Projects
Unverified Commit 3596d9f9 authored by DaveD's avatar DaveD Committed by GitHub
Browse files

Merge pull request #32574 from mattwire/total

Make it easier to extract totals from LineItems client-side
parents 5164ba60 ac00afb5
Branches
Tags
No related merge requests found
......@@ -84,7 +84,7 @@
{if $getTaxDetails && $totalTaxAmount}
<div class="crm-grid-row">
<div class="crm-grid-cell bold right text-right">{ts 1=$taxTerm}Total %1{/ts}</div>
<div class="crm-grid-cell right text-right">{$totalTaxAmount|crmMoney:$currency}</div>
<div class="crm-grid-cell right text-right" id="totalTaxAmount" data-totalTaxAmount="{$totalTaxAmount}">{$totalTaxAmount|crmMoney:$currency}</div>
</div>
{/if}
{if $context EQ "Event"}
......@@ -92,13 +92,13 @@
{assign var=eventSubTotal value=$totalAmount-$totalTaxAmount}
<div class="crm-grid-row">
<div class="crm-grid-cell bold right text-right">{ts}Subtotal{/ts}</div>
<div class="crm-grid-cell right text-right">{$eventSubTotal|crmMoney:$currency}</div>
<div class="crm-grid-cell right text-right" id="eventSubTotal" data-eventSubTotal="{$eventSubTotal}">{$eventSubTotal|crmMoney:$currency}</div>
</div>
{/if}
{/if}
<div class="crm-grid-row">
<div class="crm-grid-cell bold right text-right">{ts}Total{/ts}</div>
<div class="crm-grid-cell right text-right">{$totalAmount|crmMoney:$currency}</div>
<div class="crm-grid-cell right text-right" id="totalAmount" data-totalAmount="{$totalAmount}">{$totalAmount|crmMoney:$currency}</div>
</div>
{* set by CRM/Contribute/Page/PaymentInfo.tpl *}
<div class="hiddenElement">
......@@ -125,7 +125,7 @@
{assign var="totalcount" value=$totalcount+$lineItemCount}
{/if}
{/foreach}
<div class="crm-grid-cell right text-right">{$totalcount}</div>
<div class="crm-grid-cell right text-right" id="participantTotalCount" data-participantTotalCount="{$totalcount}">{$totalcount}</div>
</div>
{/if}
</div>
......
......@@ -71,7 +71,7 @@ class CRM_Contribute_Form_ContributionViewTest extends CiviUnitTestCase {
unset($_GET['id'], $_REQUEST['id']);
unset($_GET['cid'], $_REQUEST['cid']);
$this->assertMatchesRegularExpression('/>Total<\/div>\s*<div class="[^"]+">\$10\.00/', $contents);
$this->assertMatchesRegularExpression('/>Total<\/div>\s*<div class="[^"]+" id="totalAmount" data-totalAmount="10">\$10\.00/', $contents);
$this->assertStringContainsString('Mr. Anthony Anderson II', $contents);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment