Skip to content

Commit

Permalink
Fixed issue #316
Browse files Browse the repository at this point in the history
  • Loading branch information
Al Brookbanks committed Mar 4, 2015
1 parent e666699 commit bc65ebf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 3 additions & 1 deletion classes/cubecart.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1224,6 +1224,7 @@ private function _complete() {
}
$order[$key] = $GLOBALS['tax']->priceFormat($value);
}
$order['order_date_formatted'] = formatTime($order['order_date']);
$GLOBALS['smarty']->assign('SUM', $order);

switch ($order['status']) {
Expand Down Expand Up @@ -2171,14 +2172,14 @@ private function _orders() {

if ($order['discount']>0) {
$GLOBALS['smarty']->assign('DISCOUNT', true);

}

// Loop through price values, and do the formatting
foreach (array('discount', 'shipping', 'subtotal', 'total', 'total_tax') as $key) {
$order[$key] = $GLOBALS['tax']->priceFormat($order[$key], true);
}
$order['order_status'] = $GLOBALS['language']->order_state['name_'.$order['status']];
$order['order_date_formatted'] = formatTime($order['order_date']);

$GLOBALS['smarty']->assign('SUM', $order);
$GLOBALS['smarty']->assign('ORDER', $order);
Expand Down Expand Up @@ -2317,6 +2318,7 @@ private function _orders() {
$order[$key] = $GLOBALS['tax']->priceFormat($order[$key], true);
}
$order['order_status'] = $GLOBALS['language']->order_state['name_'.$order['status']];
$order['order_date_formatted'] = formatTime($order['order_date']);
$GLOBALS['smarty']->assign('SUM', $order);
$GLOBALS['smarty']->assign('ORDER', $order);
}
Expand Down
1 change: 1 addition & 0 deletions skins/foundation/templates/content.receipt.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*}
<h2>{$LANG.orders.order_number}: #{$SUM.cart_order_id}</h2>
<div class="order_status marg-top">{$LANG.orders.title_order_status}: <span class="order_status_{$SUM.status}">{$SUM.order_status}</span></div>
<div><strong>{$LANG.basket.order_date}:</strong> {$SUM.order_date_formatted}</div>
<hr>
<h3>{$LANG.basket.customer_info}</h3>
<div class="row">
Expand Down

0 comments on commit bc65ebf

Please sign in to comment.