Merge branch 'hotfix' of github.com:NETivism/netiCRM into hotfix

NETivism · Aug 2, 2024 · e917f10 · e917f10
2 parents ff4ca78 + a01b001
commit e917f10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/css/civicrm.css b/css/civicrm.css
@@ -2040,21 +2040,25 @@ table.campaign td,
   text-align: center;
   font-size: 1rem;
 }
-.crm-container .pcp-amount-goal-top {
+.crm-container .pcp-amount-goal-top,
+.crm-container .pcp-amount-raised-top {
   position: relative;
   margin: 50px 0 0 0;
   padding: 0;
   text-align: center;
   font-weight: bold;
   font-size: 20px;
 }
-.crm-container .pcp-amount-goal-top .counter {
+.crm-container .pcp-amount-goal-top .counter,
+.crm-container .pcp-amount-raised-top .counter {
   color: var(--color-crm-special-contribute-primary);
 }
-.crm-container .pcp-amount-goal-top + .pcp-donate {
+.crm-container .pcp-amount-goal-top + .pcp-donate,
+.crm-container .pcp-amount-raised-top + .pcp-donate {
   margin: 20px 0 0 0;
 }
-.crm-container .pcp-amount-goal-top + .pcp-donate + .pcp-donate-desc {
+.crm-container .pcp-amount-goal-top + .pcp-donate + .pcp-donate-desc,
+.crm-container .pcp-amount-raised-top + .pcp-donate + .pcp-donate-desc {
   margin-bottom: 30px;
 }
 .crm-container .pcp-campaign {

diff --git a/templates/CRM/Contribute/Page/PCPInfo.tpl b/templates/CRM/Contribute/Page/PCPInfo.tpl
@@ -80,11 +80,12 @@
 
   {if $progress.display == "2"} {* Display amount raised only *}
     {if $progress.type}
-    <div class="pcp-amount-goal pcp-amount-goal-top">
+    <div class="pcp-amount-raised pcp-amount-raised-top">
       {if $progress.type|strstr:"amount"}
-        {$progress.label} <span class="counter">{$progress.goal|crmMoney}</span>
-      {elseif $progress.type == "recurring"}
-        {$progress.label} <span class="counter">{$progress.goal}</span>{ts}People{/ts}
+        {capture assign=amount_achieved}<span class="counter">{$progress.current|crmMoney}</span>{/capture}
+        {ts 1=$amount_achieved}Raised %1{/ts}
+      {else}
+        <span class="counter">{$progress.current}</span> {ts}People{/ts}
       {/if}
     </div>
     {/if}