') {
$_SESSION['uc_cart_last_url'] = uc_referer_uri();
return $redirect;
=== modified file 'uc_cart/uc_cart.pages.inc'
--- uc_cart/uc_cart.pages.inc 2009-02-13 15:43:12 +0000
+++ uc_cart/uc_cart.pages.inc 2009-02-13 19:59:31 +0000
@@ -54,7 +54,7 @@
$items = uc_cart_get_contents();
if (count($items) == 0 || !variable_get('uc_checkout_enabled', TRUE)) {
- drupal_goto('cart');
+ drupal_goto('uc-cart');
}
if (($min = variable_get('uc_minimum_subtotal', 0)) > 0) {
@@ -70,7 +70,7 @@
}
if ($subtotal < $min) {
drupal_set_message(variable_get('uc_minimum_subtotal_text', t('The minimum order subtotal for checkout is !min.', array('!min' => uc_currency_format($min)))), 'error');
- drupal_goto('cart');
+ drupal_goto('uc-cart');
}
}
@@ -107,13 +107,13 @@
uc_order_comment_save($_SESSION['cart_order'], 0, t('Customer cancelled this order from the checkout form.'));
unset($_SESSION['cart_order']);
}
- drupal_goto('cart');
+ drupal_goto('uc-cart');
}
$order = uc_order_load($_SESSION['cart_order']);
// Check the referer URI to clear order details and prevent identity theft.
- if (uc_referer_check(array('cart/checkout', 'cart/checkout/review'))) {
+ if (uc_referer_check(array('uc-cart/checkout', 'uc-cart/checkout/review'))) {
if ($order == FALSE || uc_order_status_data($order->order_status, 'state') != 'in_checkout') {
unset($_SESSION['cart_order']);
$order = NULL;
@@ -267,10 +267,10 @@
function uc_cart_checkout_form_submit($form, &$form_state) {
if ($_SESSION['checkout_valid'] === FALSE) {
- $url = 'cart/checkout';
+ $url = 'uc-cart/checkout';
}
else {
- $url = 'cart/checkout/review';
+ $url = 'uc-cart/checkout/review';
$_SESSION['do_review'] = TRUE;
}
@@ -286,8 +286,8 @@
drupal_add_js(drupal_get_path('module', 'uc_cart') .'/uc_cart.js');
$form = drupal_get_form('uc_cart_checkout_review_form');
- if ($_SESSION['do_review'] !== TRUE && !uc_referer_check('cart/checkout')) {
- drupal_goto('cart/checkout');
+ if ($_SESSION['do_review'] !== TRUE && !uc_referer_check('uc-cart/checkout')) {
+ drupal_goto('uc-cart/checkout');
}
unset($_SESSION['do_review']);
@@ -295,7 +295,7 @@
if ($order === FALSE || uc_order_status_data($order->order_status, 'state') != 'in_checkout') {
unset($_SESSION['cart_order']);
- drupal_goto('cart/checkout');
+ drupal_goto('uc-cart/checkout');
}
$panes = _checkout_pane_list();
@@ -395,7 +395,7 @@
function uc_cart_checkout_review_form_back($form, &$form_state) {
unset($_SESSION['do_review']);
- $form_state['redirect'] = 'cart/checkout';
+ $form_state['redirect'] = 'uc-cart/checkout';
}
function uc_cart_checkout_review_form_submit($form, &$form_state) {
@@ -425,17 +425,17 @@
if ($error) {
$_SESSION['do_review'] = TRUE;
- $form_state['redirect'] = 'cart/checkout/review';
+ $form_state['redirect'] = 'uc-cart/checkout/review';
}
else {
$_SESSION['do_complete'] = TRUE;
- $form_state['redirect'] = 'cart/checkout/complete';
+ $form_state['redirect'] = 'uc-cart/checkout/complete';
}
}
function uc_cart_checkout_complete() {
if (!$_SESSION['do_complete']) {
- drupal_goto('cart');
+ drupal_goto('uc-cart');
}
$order = uc_order_load(intval($_SESSION['cart_order']));
@@ -444,7 +444,7 @@
// Display messages to customers and the administrator if the order was lost.
drupal_set_message(t("We're sorry. An error occurred while processing your order that prevents us from completing it at this time. Please contact us and we will resolve the issue as soon as possible."), 'error');
watchdog('uc_cart', 'An empty order made it to checkout! Cart order ID: @cart_order', array('@cart_order' => $_SESSION['cart_order']), WATCHDOG_ERROR);
- drupal_goto('cart');
+ drupal_goto('uc-cart');
}
$output = uc_cart_complete_sale($order, variable_get('uc_new_customer_login', FALSE));
=== modified file 'uc_cart/uc_cart_checkout_pane.inc'
--- uc_cart/uc_cart_checkout_pane.inc 2008-12-31 13:50:42 +0000
+++ uc_cart/uc_cart_checkout_pane.inc 2009-02-13 19:59:51 +0000
@@ -55,7 +55,7 @@
$description = t('Order information will be sent to your account e-mail listed below.');// .'
'
$contents['primary_email'] = array('#type' => 'hidden', '#value' => check_plain($email));
$contents['email_text'] = array(
- '#value' => ''. t('
E-mail address: @email (
edit)', array('@email' => $email, '!url' => url('user/'. $user->uid .'/edit', array('query' => 'destination=cart/checkout')))) .'
'. t('
E-mail address: @email (
edit)', array('@email' => $email, '!url' => url('user/'. $user->uid .'/edit', array('query' => 'destination=uc-cart/checkout')))) .'
This example will empty the cart, add 5 of product 1 to the cart, track clicks with the ID \"monday_special\", and redirect the user to the cart."
+msgid "Example: /cart/add/e-p1_q5-imonday_special?destination=uc-cart
This example will empty the cart, add 5 of product 1 to the cart, track clicks with the ID \"monday_special\", and redirect the user to the cart."
msgstr ""
#: uc_cart_links.module:118
=== modified file 'uc_cart_links/uc_cart_links.admin.inc'
--- uc_cart_links/uc_cart_links.admin.inc 2008-10-06 18:28:05 +0000
+++ uc_cart_links/uc_cart_links.admin.inc 2009-02-13 20:03:21 +0000
@@ -97,7 +97,7 @@
*/
function uc_cart_links_creation_help() {
$items = array(
- t('The cart link should be /cart/add/cart_link_content.'),
+ t('The cart link should be /uc-cart/add/cart_link_content.'),
t('Chain together as many actions as you want with dashes.'),
t('Do not put any spaces or use dashes in any action arguments.'),
t('Use the table below to learn about actions and their arguments.'),
@@ -120,8 +120,8 @@
);
$output = ''. t('There is currently no user interface for creating cart links, but this section includes some basic instructions.
Cart links are simple to form using a few actions and arguments with the following rules:')
- .'
'. theme('item_list', $items) .'
'. theme('table', $header, $rows) .'
'. theme('item_list', $items2) .'
'. t('Example: /cart/add/e-p1_q5-imonday_special?destination=cart
This example will empty the cart, add 5 of product 1 to the cart, track clicks with the ID "monday_special", and redirect the user to the cart. To use this on your site, simply create an HTML link to the URL you create:')
- .'
<a href="http://www.example.com/cart/add/e-p1_q5-imonday_special?destination=cart">'. t('Link text.') .'</a>
'. theme('item_list', $items) .'
'. theme('table', $header, $rows) .'
'. theme('item_list', $items2) .'
'. t('Example: /uc-cart/add/e-p1_q5-imonday_special?destination=cart
This example will empty the cart, add 5 of product 1 to the cart, track clicks with the ID "monday_special", and redirect the user to the cart. To use this on your site, simply create an HTML link to the URL you create:')
+ .'
<a href="http://www.example.com/uc-cart/add/e-p1_q5-imonday_special?destination=uc-cart">'. t('Link text.') .'</a>
';
return $output;
}
=== modified file 'uc_cart_links/uc_cart_links.module'
--- uc_cart_links/uc_cart_links.module 2008-10-09 19:06:25 +0000
+++ uc_cart_links/uc_cart_links.module 2009-02-13 20:03:25 +0000
@@ -43,7 +43,7 @@
'type' => MENU_NORMAL_ITEM,
'file' => 'uc_cart_links.admin.inc',
);
- $items['cart/add/%'] = array(
+ $items['uc-cart/add/%'] = array(
'title' => 'Add to cart',
'page callback' => 'uc_cart_links_process',
'page arguments' => array(2),
=== modified file 'uc_googleanalytics/uc_googleanalytics.module'
--- uc_googleanalytics/uc_googleanalytics.module 2009-02-03 20:01:11 +0000
+++ uc_googleanalytics/uc_googleanalytics.module 2009-02-13 20:00:01 +0000
@@ -49,7 +49,7 @@
*/
function uc_googleanalytics_order($op, &$arg1, $arg2) {
// If a new order is created during the checkout process...
- if ($op == 'new' && arg(0) == 'cart') {
+ if ($op == 'new' && arg(0) == 'uc-cart') {
// Store the order ID for later use.
$_SESSION['ucga_order_id'] = $arg1->order_id;
}
@@ -63,8 +63,8 @@
* TRUE or FALSE indicating whether or not to display the GA e-commerce JS.
*/
function uc_googleanalytics_display() {
- // Display the GA e-commerce JS if the URL is cart/checkout/complete...
- if (arg(0) == 'cart' && arg(1) == 'checkout' && arg(2) == 'complete') {
+ // Display the GA e-commerce JS if the URL is uc-cart/checkout/complete...
+ if (arg(0) == 'uc-cart' && arg(1) == 'checkout' && arg(2) == 'complete') {
return TRUE;
}
=== modified file 'uc_product_kit/uc_product_kit.module'
--- uc_product_kit/uc_product_kit.module 2009-02-10 21:51:13 +0000
+++ uc_product_kit/uc_product_kit.module 2009-02-13 19:44:17 +0000
@@ -587,7 +587,7 @@
*/
function uc_product_kit_add_to_cart_form_submit($form, &$form_state) {
$node = node_load($form_state['values']['nid']);
- drupal_set_message(t('@product-title added to your shopping cart.', array('@product-title' => $node->title, '!url' => url('cart'))));
+ drupal_set_message(t('@product-title added to your shopping cart.', array('@product-title' => $node->title, '!url' => url('uc-cart'))));
$form_state['redirect'] = uc_cart_add_item($form_state['values']['nid'], $form_state['values']['qty'], $form_state['values']);
}
@@ -694,7 +694,7 @@
drupal_goto();
}
- $redirect = variable_get('uc_add_item_redirect', 'cart');
+ $redirect = variable_get('uc_add_item_redirect', 'uc-cart');
if ($redirect != '') {
$_SESSION['last_url'] = uc_referer_uri();
return $redirect;