File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed
view/frontend/templates/tracking Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -1567,7 +1567,7 @@ private function processTrackingDetails($trackInfo): array
1567
1567
}
1568
1568
1569
1569
if ($ datetime ) {
1570
- $ result ['shippeddate ' ] = gmdate ('Y-m-d ' , $ datetime ->getTimestamp ());
1570
+ $ result ['shippeddate ' ] = gmdate ('Y-m-d H:i:s ' , $ datetime ->getTimestamp ());
1571
1571
}
1572
1572
}
1573
1573
@@ -1586,7 +1586,7 @@ private function processTrackingDetails($trackInfo): array
1586
1586
1587
1587
$ datetime = $ this ->getDeliveryDateTime ($ trackInfo );
1588
1588
if ($ datetime ) {
1589
- $ result ['deliverydate ' ] = gmdate ('Y-m-d ' , $ datetime ->getTimestamp ());
1589
+ $ result ['deliverydate ' ] = gmdate ('Y-m-d H:i:s ' , $ datetime ->getTimestamp ());
1590
1590
$ result ['deliverytime ' ] = gmdate ('H:i:s ' , $ datetime ->getTimestamp ());
1591
1591
}
1592
1592
@@ -1699,7 +1699,7 @@ private function processTrackDetailsEvents(array $events): array
1699
1699
1700
1700
$ datetime = $ this ->parseDate (!empty ($ event ['date ' ]) ? $ event ['date ' ] : null );
1701
1701
if ($ datetime ) {
1702
- $ item ['deliverydate ' ] = gmdate ('Y-m-d ' , $ datetime ->getTimestamp ());
1702
+ $ item ['deliverydate ' ] = gmdate ('Y-m-d H:i:s ' , $ datetime ->getTimestamp ());
1703
1703
$ item ['deliverytime ' ] = gmdate ('H:i:s ' , $ datetime ->getTimestamp ());
1704
1704
}
1705
1705
Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ public function formatDeliveryDate($date)
92
92
public function formatDeliveryTime ($ time , $ date = null )
93
93
{
94
94
if (!empty ($ date )) {
95
- $ time = $ date . ' ' . $ time ;
95
+ $ time = $ date ;
96
96
}
97
97
98
98
$ format = $ this ->_localeDate ->getTimeFormat (\IntlDateFormatter::SHORT );
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ $track = $block->getData('track');
22
22
<tbody>
23
23
<?php foreach ($ track ->getProgressdetail () as $ detail ) : ?>
24
24
<?php $ detailDate = (!empty ($ detail ['deliverydate ' ]) ?
25
- $ parentBlock ->formatDeliveryDate ($ detail ['deliverydate ' ] . ' ' . $ detail [ ' deliverytime ' ] ) :
25
+ $ parentBlock ->formatDeliveryDate ($ detail ['deliverydate ' ]) :
26
26
'' ); ?>
27
27
<?php $ detailTime = (!empty ($ detail ['deliverytime ' ]) ?
28
28
$ parentBlock ->formatDeliveryTime ($ detail ['deliverytime ' ], $ detail ['deliverydate ' ]) :
You can’t perform that action at this time.
0 commit comments