refactor to avoid need for missing smarty abs

CRM/Banking/PluginImpl/Matcher/Membership.php

@@ -170,14 +170,14 @@
 
     // load last fee
     if (!empty($last_fee_id)) {
-      $last_fee                = civicrm_api3('Contribution', 'getsingle', ['id' => $last_fee_id]);
-      $last_fee['days']        = round((strtotime($btx->booking_date) - (int) strtotime($last_fee['receive_date'])) / (60 * 60 * 24));
+      $last_fee = civicrm_api3('Contribution', 'getsingle', ['id' => $last_fee_id]);
+      $last_fee['days_different'] = $this->getRelativeDays($btx->booking_date, $last_fee['receive_date']);
       $smarty_vars['last_fee'] = $last_fee;
     }
 
     // calculate some stuff
     $date_field = ($config->based_on_start_date) ? 'start_date' : 'join_date';
-    $membership['days'] = round((strtotime($btx->booking_date) - strtotime($membership[$date_field])) / (60 * 60 * 24));
+    $membership['days_different'] = $this->getRelativeDays($btx->booking_date, $membership[$date_field]);
     $membership['percentage_of_minimum'] = round(($btx->amount / (float) $membership_type['minimum_fee']) * 100);
     $membership['title'] = $this->getMembershipOption($membership['membership_type_id'], 'title', $membership_type['name']);
 
@@ -491,4 +491,15 @@
     return $rating;
   }
 
+  private function getRelativeDays($fromDate, $toDate) {
+    $days = round((strtotime($fromDate) - (int) strtotime($toDate)) / (60 * 60 * 24));
+    if ($days > 0) {
+      return E::ts('%1 days earlier', [1 => $days]);
+    }
+    if ($days < 0) {
+      return E::ts('%1 days later', [1 => -$days]);
+    }
+    return E::ts('Same day');
+  }
+
 }

templates/CRM/Banking/PluginImpl/Matcher/Membership.suggestion.tpl

@@ -60,14 +60,8 @@
           <div class="btxvalue">{$last_fee.total_amount|crmMoney:$last_fee.currency}</div>
         </td>
         <td>
-          {capture assign=day_count}{$last_fee.days|abs}{/capture}
-          {if $last_fee.days gt 0}
-            {capture assign=last_fee_days}{ts 1=$day_count domain='org.project60.banking'}(%1 days earlier){/ts}{/capture}
-          {else}
-            {capture assign=last_fee_days}{ts 1=$day_count domain='org.project60.banking'}(%1 days later){/ts}{/capture}
-          {/if}
           <div class="btxlabel">{ts domain='org.project60.banking'}Paid{/ts}:</div>
-          <div class="btxvalue">{$last_fee.receive_date|crmDate:$config->dateformatFull} {$last_fee_days}</div>
+          <div class="btxvalue">{$last_fee.receive_date|crmDate:$config->dateformatFull} ({$last_fee.days_different})</div>
         </td>
         <td>
           <div class="btxlabel">{ts domain='org.project60.banking'}Type{/ts}:</div>
@@ -89,14 +83,8 @@
           <div class="btxvalue"><strong>{ts domain='org.project60.banking'}None{/ts}</strong></div>
         </td>
         <td>
-          {capture assign=day_count}{$membership.days|abs}{/capture}
-          {if $membership.days gt 0}
-            {capture assign=membership_days}{ts 1=$day_count domain='org.project60.banking'}(%1 days earlier){/ts}{/capture}
-          {else}
-            {capture assign=membership_days}{ts 1=$day_count domain='org.project60.banking'}(%1 days later){/ts}{/capture}
-          {/if}
           <div class="btxlabel">{ts domain='org.project60.banking'}Due{/ts}:</div>
-          <div class="btxvalue">{$membership.start_date|crmDate:$config->dateformatFull} {$membership_days}</div>
+          <div class="btxvalue">{$membership.start_date|crmDate:$config->dateformatFull} ({$membership.days_different})</div>
         </td>
         <td>
           <div class="btxlabel">{ts domain='org.project60.banking'}Fee{/ts}:</div>