') {
- if (variable_get('uc_continue_shopping_type', 'link') == 'link') {
+ // Add the continue shopping element and cart submit buttons.
+ if (($type = variable_get('uc_continue_shopping_type', 'link')) != 'none') {
+ // Render the continue shopping element into a variable.
+ $cs_element = drupal_render($form['continue_shopping']);
+
+ // Add the element with the appropriate markup based on the display type.
+ if ($type == 'link') {
$output .= '';
+ . $cs_element .''. drupal_render($form) .'';
}
- else {
- $button = drupal_render($form['continue_shopping']);
+ elseif ($type == 'button') {
$output .= '';
+ . $cs_element .'';
}
}
else {
@@ -784,45 +836,41 @@
return $table;
}
-function uc_cart_view_form_continue_submit($form, &$form_state) {
- // Instead of using $_SESSION, can we use $form_state?
- if (isset($_SESSION['cart_order'])) {
- unset($_SESSION['cart_order']);
- }
-
- $form_state['redirect'] = variable_get('uc_continue_shopping_url', '');
-}
-
-function uc_cart_view_form_update_submit($form, &$form_state) {
- // Instead of using $_SESSION, can we use $form_state?
- if (isset($_SESSION['cart_order'])) {
- unset($_SESSION['cart_order']);
- }
-
- cache_clear_all();
- uc_cart_update_item_object((object)$form_state['values']);
- drupal_set_message(t('Your cart has been updated.'));
- $form_state['redirect'] = 'cart';
-}
-
-function uc_cart_view_form_submit($form, &$form_state) {
- // Instead of using $_SESSION, can we use $form_state?
- if (isset($_SESSION['cart_order'])) {
- unset($_SESSION['cart_order']);
- }
-
- cache_clear_all();
- if (!variable_get('uc_checkout_enabled', TRUE)) {
- $form_state['redirect'] = 'cart';
- }
- uc_cart_update_item_object((object)$form_state['values']);
- $form_state['redirect'] = 'cart/checkout';
-}
/*******************************************************************************
* Module and Helper Functions
******************************************************************************/
+
+/**
+ * Returns the URL redirect for the continue shopping element on the cart page.
+ *
+ * @param $unset
+ * TRUE or FALSE indicating whether or not to unset the last URL variable.
+ * @return
+ * The URL or Drupal path that will be used for the continue shopping element.
+ */
+function uc_cart_continue_shopping_url($unset = TRUE) {
+ $url = '';
+
+ // Use the last URL if enabled and available.
+ if (variable_get('uc_continue_shopping_use_last_url', TRUE)) {
+ $url = $_SESSION['uc_cart_last_url'];
+ }
+
+ // If the URL is still empty, fall back to the default.
+ if (empty($url)) {
+ $url = variable_get('uc_continue_shopping_url', '');
+ }
+
+ // Unset the last URL if specified.
+ if ($unset) {
+ unset($_SESSION['uc_cart_last_url']);
+ }
+
+ return $url;
+}
+
/**
* Completes a sale, including adjusting order status and creating user account.
*
@@ -1044,7 +1092,7 @@
}
$redirect = variable_get('uc_add_item_redirect', 'cart');
if ($redirect != '') {
- $_SESSION['last_url'] = uc_referer_uri();
+ $_SESSION['uc_cart_last_url'] = uc_referer_uri();
return $redirect;
}
else {
@@ -1087,7 +1135,7 @@
$redirect = variable_get('uc_add_item_redirect', 'cart');
if ($redirect != '') {
- $_SESSION['last_url'] = uc_referer_uri();
+ $_SESSION['uc_cart_last_url'] = uc_referer_uri();
return $redirect;
}
else {
=== modified file 'uc_cart/uc_cart.pages.inc'
--- uc_cart/uc_cart.pages.inc 2008-11-06 15:00:37 +0000
+++ uc_cart/uc_cart.pages.inc 2009-01-13 14:44:35 +0000
@@ -11,36 +11,36 @@
function uc_cart_view() {
// Failsafe so that this function only works when called with no arguments.
// This prevents the accidental wiping of the cart_order session variable.
- if ((func_num_args() > 0)) {
+ if (func_num_args() > 0) {
return drupal_not_found();
}
+ // Clear the cart order session variable if it exists.
if (!empty($_SESSION['cart_order'])) {
unset($_SESSION['cart_order']);
}
+ // Load the array of shopping cart items.
$items = uc_cart_get_contents();
+ // Display the empty cart page if there are no items in the cart.
if (empty($items)) {
return theme('uc_empty_cart');
}
- $panes = uc_cart_cart_pane_list($items);
- foreach ($panes as $pane) {
+ // Load through the cart panes...
+ foreach (uc_cart_cart_pane_list($items) as $pane) {
+ // If the pane is enabled...
if ($pane['enabled']) {
+ // Add its output to the cart view.
$output .= $pane['body'];
}
}
- if (isset($_SESSION['last_url'])) {
- drupal_set_breadcrumb(array(l(t('Back'), check_plain($_SESSION['last_url']))));
- unset($_SESSION['last_url']);
- }
- else {
- if (($text = variable_get('uc_cart_breadcrumb_text', t('Home'))) !== '') {
- $link = l($text, variable_get('uc_cart_breadcrumb_url', ''));
- drupal_set_breadcrumb(array($link));
- }
+ // Add a custom cart breadcrumb if specified.
+ if (($text = variable_get('uc_cart_breadcrumb_text', '')) !== '') {
+ $link = l($text, variable_get('uc_cart_breadcrumb_url', ''));
+ drupal_set_breadcrumb(array($link));
}
return $output;