-
- -
-
-
+
+ -
+
+
-
-
-- qty; ?> x title . ' - ' . uc_currency_format($product->price * $product->qty); ?>
- model; ?>
- data['attributes']) && count($product->data['attributes']) > 0) { ?>
- data['attributes'] as $attribute => $option) {
- echo ' ' . t('@attribute: @options', array('@attribute' => $attribute, '@options' => implode(', ', (array)$option))) . '
';
- } ?>
-
+
+
+- qty; ?> x title . ' - ' . $product->total_price; ?>
+ model; ?>
+attributes as $attribute): ?>
+
+
-
+
-
-
+
+
-
|
- |||||||||||||||||||||||||||||||||||||||||||||||||||
+
|
+ |||||||||||||||||||||||||||||||||||||||||||||||||||
|
-
- $order_first_name)); ?> + +$order_first_name)); ?> - -- +
-
- |
-
-
- |
-
-
+
|
-
+
|
+
+ |
+
+
+ |
+
-
+
|
-
+ |
+
+ |
+
+
|
-
- |
+
+ |
+
+
|
+
+ |
+
+
+ |
+ : |
+
+ |
- |
- - -
+ +
+ |
+ + + +
|
diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module
index 15eaade..17fc2b0 100644
--- a/uc_order/uc_order.module
+++ b/uc_order/uc_order.module
@@ -1789,6 +1789,8 @@ function _uc_order_get_screen_titles() {
* Preprocesses a formatted invoice with an order's data.
*/
function template_preprocess_uc_order(&$variables) {
+ $order = &$variables['order'];
+
switch ($variables['op']) {
case 'checkout-mail':
$variables['thank_you_message'] = TRUE;
@@ -1803,16 +1805,31 @@ function template_preprocess_uc_order(&$variables) {
break;
}
- $variables['products'] = $variables['order']->products;
- if (!is_array($variables['products'])) {
- $variables['products'] = array();
+ $variables['shippable'] = uc_order_is_shippable($order);
+
+ $variables['products'] = $order->products;
+ foreach ($order->products as &$product) {
+ $product->total_price = uc_currency_format($product->price * $product->qty);
+ if ($product->qty > 1) {
+ $product->individual_price = t('(!price each)', array('!price' => uc_currency_format($product->price)));
+ }
+ else {
+ $product->individual_price = '';
+ }
+
+
+ $product->attributes = array();
+ if (isset($product->data['attributes'])) {
+ foreach ($product->data['attributes'] as $attribute => $option) {
+ $product->attributes[] = t('@attribute: @options', array('@attribute' => $attribute, '@options' => implode(', ', (array)$option)));
+ }
+ }
}
- $variables['line_items'] = $variables['order']->line_items;
- $items = _uc_line_item_list();
- foreach ($items as $item) {
+ $variables['line_items'] = $order->line_items;
+ foreach (_uc_line_item_list() as $item) {
if (isset($item['display_only']) && $item['display_only'] == TRUE) {
- $result = $item['callback']('display', $variables['order']);
+ $result = $item['callback']('display', $order);
if (is_array($result)) {
foreach ($result as $line) {
$variables['line_items'][] = array(
@@ -1826,14 +1843,14 @@ function template_preprocess_uc_order(&$variables) {
}
}
}
- if (!is_array($variables['line_items'])) {
- $variables['line_items'] = array();
+ foreach ($variables['line_items'] as &$item) {
+ $item['amount'] = uc_currency_format($item['amount']);
}
usort($variables['line_items'], 'uc_weight_sort');
// Generate tokens to use as template variables.
$types = array(
- 'uc_order' => $variables['order'],
+ 'uc_order' => $order,
);
$token_info = token_info();
||||||||||||||||||||||||||||||||