put dates back to not including time

diff --git a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
index 64b676248a88cb511a2b865dec698dbab9cfa893..4f055a40740b212ae23c18e8b717dbcbe699ea1c 100644 (file)
--- a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
@@ -1154,7 +1154,7 @@ Price Field - Price Field 1        1    $100.00       $100.00
     $strings = [
       'Total Tax Amount : $' . $this->formatMoneyInput(1000.00),
       'Total Amount : $' . $this->formatMoneyInput(11000.00),
-      'Date Received: April 21st, 2015',
+      'Date Received: 04/21/2015',
       'Paid By: Check',
       'Check Number: 12345',
     ];
@@ -1213,7 +1213,7 @@ Price Field - Price Field 1        1    $100.00       $100.00
     $strings = [
       'Total Tax Amount : $' . $this->formatMoneyInput(2000),
       'Total Amount : $' . $this->formatMoneyInput(22000.00),
-      'Date Received: April 21st, 2015',
+      'Date Received: 04/21/2015',
       'Paid By: Check',
       'Check Number: 12345',
       'Financial Type: Donation',

diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl
index c95b996aca1b955511c74979cbc1c2b3365f1c9e..6340823fe05ac56ebefb0f6177358bf4c2693ebf 100644 (file)
--- a/xml/templates/message_templates/contribution_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_offline_receipt_html.tpl
@@ -157,7 +157,7 @@
         {ts}Date Received{/ts}
        </td>
        <td {$valueStyle}>
-         {contribution.receive_date}
+         {contribution.receive_date|crmDate:"shortdate"}
        </td>
       </tr>
      {/if}
@@ -168,7 +168,7 @@
         {ts}Receipt Date{/ts}
        </td>
        <td {$valueStyle}>
-         {contribution.receipt_date}
+         {contribution.receipt_date|crmDate:"shortdate"}
        </td>
       </tr>
      {/if}

diff --git a/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/xml/templates/message_templates/contribution_offline_receipt_text.tpl
index f895c06ccbede244f8dc962132f8286ab515742b..10ace7ddacbfbbeeba8b97492691e4ce79f81f1f 100644 (file)
--- a/xml/templates/message_templates/contribution_offline_receipt_text.tpl
+++ b/xml/templates/message_templates/contribution_offline_receipt_text.tpl
@@ -49,10 +49,10 @@
 {/if}
 {ts}Total Amount{/ts} : {contribution.total_amount}
 {if '{contribution.receive_date}'}
-{ts}Date Received{/ts}: {contribution.receive_date}
+{ts}Date Received{/ts}: {contribution.receive_date|crmDate:"shortdate"}
 {/if}
 {if '{contribution.receipt_date}'}
-{ts}Receipt Date{/ts}: {contribution.receipt_date}
+{ts}Receipt Date{/ts}: {contribution.receipt_date|crmDate:"shortdate"}
 {/if}
 {if '{contribution.payment_instrument_id}' and empty($formValues.hidden_CreditCard)}
 {ts}Paid By{/ts}: {contribution.payment_instrument_id:label}