From 694fae6a13c49af4e73d93ab74eafee5c0a9927e Mon Sep 17 00:00:00 2001 From: Marek Isalski Date: Wed, 23 May 2018 05:29:50 +0100 Subject: [PATCH] UTC to local time --- fulcrm_shoppingcart_transaction_complete.tpl.php | 11 ++++++----- fulcrm_shoppingcart_transaction_incomplete.tpl.php | 6 +++--- fulcrm_shoppingcart_transaction_mailshot.tpl.php | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/fulcrm_shoppingcart_transaction_complete.tpl.php b/fulcrm_shoppingcart_transaction_complete.tpl.php index af1a085..f88585d 100644 --- a/fulcrm_shoppingcart_transaction_complete.tpl.php +++ b/fulcrm_shoppingcart_transaction_complete.tpl.php @@ -6,16 +6,17 @@ $tz = new DateTimeZone('UTC'); $failed = DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z',$transaction['failed'],$timezone=$tz); if ( $failed ) - print $failed->format( 'j/M/Y \@ g:ia' ); + print format_date( $failed->getTimestamp(), 'custom', 'j/M/Y \@ g:ia' ); ?> + @@ -67,7 +68,7 @@ $tz = new DateTimeZone('UTC'); $created = DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z',$transaction['created'],$timezone=$tz); if ( $created ) - print $created->format( 'j/M/Y \@ g:ia' ); + print format_date( $created->getTimestamp(), 'custom', 'j/M/Y \@ g:ia' ); else print 'pending'; ?>

@@ -75,7 +76,7 @@ $tz = new DateTimeZone('UTC'); $completed = DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z',$transaction['completed'],$timezone=$tz); if ( $completed ) - print $completed->format( 'j/M/Y \@ g:ia' ); + print format_date( $completed->getTimestamp(), 'custom', 'j/M/Y \@ g:ia' ); else print 'pending'; ?>

@@ -83,7 +84,7 @@ $tz = new DateTimeZone('UTC'); $sent = DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z',$transaction['sent'],$timezone=$tz); if ( $sent ) - print $sent->format( 'j/M/Y \@ g:ia' ); + print format_date( $sent->getTimestamp(), 'custom', 'j/M/Y \@ g:ia' ); else print 'pending'; ?>

diff --git a/fulcrm_shoppingcart_transaction_incomplete.tpl.php b/fulcrm_shoppingcart_transaction_incomplete.tpl.php index 6e946ae..5b6f4ef 100644 --- a/fulcrm_shoppingcart_transaction_incomplete.tpl.php +++ b/fulcrm_shoppingcart_transaction_incomplete.tpl.php @@ -6,7 +6,7 @@ $tz = new DateTimeZone('UTC'); $failed = DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z',$transaction['failed'],$timezone=$tz); if ( $failed ) - print $failed->format( 'j/M/Y \@ g:ia' ); + print format_date( $failed->getTimestamp(), 'custom', 'j/M/Y \@ g:ia' ); ?> @@ -16,7 +16,7 @@ $tz = new DateTimeZone('UTC'); $cancelled = DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z',$transaction['cancelled'],$timezone=$tz); if ( $cancelled ) - print $cancelled->format( 'j/M/Y \@ g:ia' ); + print format_date( $cancelled->getTimestamp(), 'custom', 'j/M/Y \@ g:ia' ); ?>. @@ -68,7 +68,7 @@ $tz = new DateTimeZone('UTC'); $created = DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z',$transaction['created'],$timezone=$tz); if ( $created ) - print $created->format( 'j/M/Y \@ g:ia' ); + print format_date( $created->getTimestamp(), 'custom', 'j/M/Y \@ g:ia' ); else print 'pending'; ?>

diff --git a/fulcrm_shoppingcart_transaction_mailshot.tpl.php b/fulcrm_shoppingcart_transaction_mailshot.tpl.php index beafa1f..c7f911b 100644 --- a/fulcrm_shoppingcart_transaction_mailshot.tpl.php +++ b/fulcrm_shoppingcart_transaction_mailshot.tpl.php @@ -3,7 +3,7 @@ $tz = new DateTimeZone('UTC'); $completed = DateTime::createFromFormat('Y-m-d\TH:i:s.u\Z',$mailshot['completed'],$timezone=$tz); if ( $completed ) - print $completed->format( '\s\e\n\t \o\n j/M/Y \a\t ga' ); + print format_date( $completed->getTimestamp(), 'custom', '\s\e\n\t \o\n j/M/Y \@ g:ia' ); ?> $v ): ?> view