=== modified file 'ca/ca.module'
--- ca/ca.module 2010-04-09 14:18:53 +0000
+++ ca/ca.module 2010-05-24 20:44:27 +0000
@@ -349,7 +349,7 @@
*/
function ca_evaluate_conditions($predicate, $arguments) {
// Automatically pass if there are no conditions.
- if (count($predicate['#conditions']) == 0) {
+ if (empty($predicate['#conditions'])) {
return TRUE;
}
=== modified file 'payment/uc_2checkout/uc_2checkout.module'
--- payment/uc_2checkout/uc_2checkout.module 2010-05-18 20:14:02 +0000
+++ payment/uc_2checkout/uc_2checkout.module 2010-06-03 15:57:46 +0000
@@ -106,7 +106,7 @@
*
* @see uc_2checkout_uc_payment_method()
*/
-function uc_payment_method_2checkout($op, &$arg1) {
+function uc_payment_method_2checkout($op, &$order, $form = NULL, &$form_state = NULL) {
switch ($op) {
case 'cart-details':
if (variable_get('uc_2checkout_check', FALSE)) {
@@ -135,7 +135,7 @@
return $build;
case 'cart-process':
- $_SESSION['pay_method'] = $_POST['pay_method'];
+ $_SESSION['pay_method'] = $form_state['values']['panes']['payment']['details']['pay_method'];
return;
case 'settings':
=== modified file 'payment/uc_credit/uc_credit.module'
--- payment/uc_credit/uc_credit.module 2010-04-06 15:51:15 +0000
+++ payment/uc_credit/uc_credit.module 2010-06-03 15:57:46 +0000
@@ -118,11 +118,6 @@
break;
case 'uc_cart_checkout_form':
- if (isset($_POST['cc_number'])) {
- $order = new stdClass();
- uc_payment_method_credit('cart-process', $order, TRUE);
- }
-
// Cache the CC details for use in other functions.
if (isset($_SESSION['sescrd'])) {
uc_credit_cache('save', $_SESSION['sescrd']);
@@ -301,9 +296,9 @@
/**
* Implement hook_uc_order().
*/
-function uc_credit_uc_order($op, &$arg1, $arg2) {
+function uc_credit_uc_order($op, &$order, $arg2) {
// Set up the encryption key and object for saving and loading.
- if (isset($arg1->payment_method) && $arg1->payment_method == 'credit' && ($op == 'save' || $op == 'load')) {
+ if (isset($order->payment_method) && $order->payment_method == 'credit' && ($op == 'save' || $op == 'load')) {
// Log an error if encryption isn't configured properly.
if (!uc_credit_encryption_key()) {
watchdog('uc_credit', 'Credit card encryption must be set up to process credit cards.');
@@ -312,7 +307,7 @@
switch ($op) {
case 'submit':
- if (isset($arg1->payment_method) && $arg1->payment_method == 'credit') {
+ if (isset($order->payment_method) && $order->payment_method == 'credit') {
// Clear out that session variable denoting this as a CC paid order.
unset($_SESSION['cc_pay']);
@@ -325,7 +320,7 @@
);
// Attempt to process the CC payment.
- $pass = uc_payment_process_payment('credit', $arg1->order_id, $arg1->order_total, $data, TRUE, NULL, FALSE);
+ $pass = uc_payment_process_payment('credit', $order->order_id, $order->order_total, $data, TRUE, NULL, FALSE);
// If the payment failed, store the data back in the session and
// halt the checkout process.
@@ -338,45 +333,45 @@
// If we aren't set to process transactions immediately and we're in
// debug mode, store the CC data in the order so it can be viewed
// later for test processing.
- $cc_data = $arg1->payment_details;
+ $cc_data = $order->payment_details;
- _uc_credit_save_cc_data_to_order($cc_data, $arg1->order_id);
+ _uc_credit_save_cc_data_to_order($cc_data, $order->order_id);
}
}
break;
case 'save':
- if (isset($arg1->payment_method) && $arg1->payment_method == 'credit') {
+ if (isset($order->payment_method) && $order->payment_method == 'credit') {
// Build an array of CC data to store with the order.
- if (!empty($arg1->payment_details)) {
+ if (!empty($order->payment_details)) {
// Check for debug mode.
if (variable_get('uc_credit_debug', FALSE) && arg(1) != 'checkout') {
// If enabled, store the full payment details.
- $cc_data = $arg1->payment_details;
+ $cc_data = $order->payment_details;
}
else {
// Otherwise, save only some limited, PCI compliant data.
$cc_data = array(
- 'cc_number' => substr($arg1->payment_details['cc_number'], -4),
- 'cc_exp_month' => $arg1->payment_details['cc_exp_month'],
- 'cc_exp_year' => $arg1->payment_details['cc_exp_year'],
- 'cc_type' => $arg1->payment_details['cc_type'],
+ 'cc_number' => substr($order->payment_details['cc_number'], -4),
+ 'cc_exp_month' => $order->payment_details['cc_exp_month'],
+ 'cc_exp_year' => $order->payment_details['cc_exp_year'],
+ 'cc_type' => $order->payment_details['cc_type'],
);
}
- _uc_credit_save_cc_data_to_order($cc_data, $arg1->order_id);
+ _uc_credit_save_cc_data_to_order($cc_data, $order->order_id);
}
}
break;
case 'load':
- if (isset($arg1->payment_method) && $arg1->payment_method == 'credit') {
+ if (isset($order->payment_method) && $order->payment_method == 'credit') {
// Load the CC details from the credit cache if available.
- $arg1->payment_details = uc_credit_cache('load');
+ $order->payment_details = uc_credit_cache('load');
// Otherwise load any details that might be stored in the data array.
- if (empty($arg1->payment_details) && isset($arg1->data['cc_data'])) {
- $arg1->payment_details = uc_credit_cache('save', $arg1->data['cc_data']);
+ if (empty($order->payment_details) && isset($order->data['cc_data'])) {
+ $order->payment_details = uc_credit_cache('save', $order->data['cc_data']);
}
}
break;
@@ -418,35 +413,28 @@
******************************************************************************/
// Callback function for the Credit Card payment method.
-function uc_payment_method_credit($op, &$arg1, $silent = FALSE) {
+function uc_payment_method_credit($op, &$order, $form = NULL, &$form_state = NULL) {
switch ($op) {
case 'cart-details':
- $details = drupal_get_form('uc_payment_method_credit_form', $arg1);
- return uc_strip_form($details);
+ $details = uc_payment_method_credit_form(array(), $form_state, $order);
+ return $details;
case 'cart-process':
// Fetch the CC details from the $_POST directly.
- $cc_data = array(
- 'cc_type' => check_plain($_POST['cc_type']),
- 'cc_owner' => check_plain($_POST['cc_owner']),
- 'cc_number' => check_plain(str_replace(' ', '', $_POST['cc_number'])),
- 'cc_start_month' => check_plain($_POST['cc_start_month']),
- 'cc_start_year' => check_plain($_POST['cc_start_year']),
- 'cc_exp_month' => check_plain($_POST['cc_exp_month']),
- 'cc_exp_year' => check_plain($_POST['cc_exp_year']),
- 'cc_issue' => check_plain($_POST['cc_issue']),
- 'cc_cvv' => check_plain($_POST['cc_cvv']),
- 'cc_bank' => check_plain($_POST['cc_bank']),
- );
-
- // Recover cached CC data in $_POST if it exists.
- if (isset($_POST['payment_details_data'])) {
- $cache = uc_credit_cache('save', $_POST['payment_details_data']);
+ $cc_data = $form_state['values']['panes']['payment']['details'];
+
+ $cc_data['cc_number'] = str_replace(' ', '', $cc_data['cc_number']);
+
+ array_walk($cc_data, 'check_plain');
+
+ // Recover cached CC data in $form_state['values']['panes']['payment']['details'] if it exists.
+ if (isset($form_state['values']['panes']['payment']['details']['payment_details_data'])) {
+ $cache = uc_credit_cache('save', $form_state['values']['panes']['payment']['details']['payment_details_data']);
}
// Account for partial CC numbers when masked by the system.
if (substr($cc_data['cc_number'], 0, strlen(t('(Last4)'))) == t('(Last4)')) {
- // Recover the number from the encrypted data in $_POST if truncated.
+ // Recover the number from the encrypted data in the form if truncated.
if (isset($cache['cc_number'])) {
$cc_data['cc_number'] = $cache['cc_number'];
}
@@ -467,66 +455,54 @@
}
// Go ahead and put the CC data in the payment details array.
- $arg1->payment_details = $cc_data;
+ $order->payment_details = $cc_data;
// Default our value for validation.
$return = TRUE;
// Make sure an owner value was entered.
if (variable_get('uc_credit_owner_enabled', FALSE) && empty($cc_data['cc_owner'])) {
- if (!$silent) {
- drupal_set_message(t('Enter the owner name as it appears on the card.'), 'error');
- }
+ form_set_error('panes][payment][details][cc_owner', t('Enter the owner name as it appears on the card.'));
$return = FALSE;
}
// Validate the CC number if that's turned on/check for non-digits.
if ((variable_get('uc_credit_validate_numbers', TRUE) && !_uc_credit_valid_card_number($cc_data['cc_number']))
|| !ctype_digit($cc_data['cc_number'])) {
- if (!$silent) {
- drupal_set_message(t('You have entered an invalid credit card number.'), 'error');
- }
+ form_set_error('panes][payment][details][cc_number', t('You have entered an invalid credit card number.'));
$return = FALSE;
}
// Validate the start date (if entered).
if (variable_get('uc_credit_start_enabled', FALSE) && !_uc_credit_valid_card_start($cc_data['cc_start_month'], $cc_data['cc_start_year'])) {
- if (!$silent) {
- drupal_set_message(t('The start date you entered is invalid.'), 'error');
- }
+ form_set_error('panes][payment][details][cc_start_month', t('The start date you entered is invalid.'));
+ form_set_error('panes][payment][details][cc_start_year');
$return = FALSE;
}
// Validate the card expiration date.
if (!_uc_credit_valid_card_expiration($cc_data['cc_exp_month'], $cc_data['cc_exp_year'])) {
- if (!$silent) {
- drupal_set_message(t('The credit card you entered has expired.'), 'error');
- }
+ form_set_error('panes][payment][details][cc_exp_month', t('The credit card you entered has expired.'));
+ form_set_error('panes][payment][details][cc_exp_year');
$return = FALSE;
}
// Validate the issue number (if entered). With issue numbers, '01' is
// different from '1', but is_numeric() is still appropriate.
if (variable_get('uc_credit_issue_enabled', FALSE) && !_uc_credit_valid_card_issue($cc_data['cc_issue'])) {
- if (!$silent) {
- drupal_set_message(t('The issue number you entered is invalid.'), 'error');
- }
+ form_set_error('panes][payment][details][cc_issue', t('The issue number you entered is invalid.'));
$return = FALSE;
}
// Validate the CVV number if enabled.
if (variable_get('uc_credit_cvv_enabled', TRUE) && !_uc_credit_valid_cvv($cc_data['cc_cvv'])) {
- if (!$silent) {
- drupal_set_message(t('You have entered an invalid CVV number.'), 'error');
- }
+ form_set_error('panes][payment][details][cc_ccv', t('You have entered an invalid CVV number.'));
$return = FALSE;
}
// Validate the bank name if enabled.
if (variable_get('uc_credit_bank_enabled', FALSE) && empty($cc_data['cc_bank'])) {
- if (!$silent) {
- drupal_set_message(t('You must enter the issuing bank for that card.'), 'error');
- }
+ form_set_error('panes][payment][details][cc_bank', t('You must enter the issuing bank for that card.'));
$return = FALSE;
}
@@ -535,7 +511,7 @@
$crypt = new uc_encryption_class;
// Store the encrypted details in the session for the next pageload.
- $_SESSION['sescrd'] = $crypt->encrypt($key, serialize($arg1->payment_details));
+ $_SESSION['sescrd'] = $crypt->encrypt($key, serialize($order->payment_details));
// Log any errors to the watchdog.
uc_store_encryption_errors($crypt, 'uc_credit');
@@ -550,25 +526,25 @@
case 'cart-review':
if (variable_get('uc_credit_type_enabled', FALSE)) {
- $review[] = array('title' => t('Card Type'), 'data' => check_plain($arg1->payment_details['cc_type']));
+ $review[] = array('title' => t('Card Type'), 'data' => check_plain($order->payment_details['cc_type']));
}
if (variable_get('uc_credit_owner_enabled', FALSE)) {
- $review[] = array('title' => t('Card Owner'), 'data' => check_plain($arg1->payment_details['cc_owner']));
+ $review[] = array('title' => t('Card Owner'), 'data' => check_plain($order->payment_details['cc_owner']));
}
- $review[] = array('title' => t('Card Number'), 'data' => uc_credit_display_number($arg1->payment_details['cc_number']));
+ $review[] = array('title' => t('Card Number'), 'data' => uc_credit_display_number($order->payment_details['cc_number']));
if (variable_get('uc_credit_start_enabled', FALSE)) {
- $start = $arg1->payment_details['cc_start_month'] . '/' . $arg1->payment_details['cc_start_year'];
+ $start = $order->payment_details['cc_start_month'] . '/' . $order->payment_details['cc_start_year'];
$review[] = array('title' => t('Start Date'), 'data' => strlen($start) > 1 ? $start : '');
}
- $review[] = array('title' => t('Expiration'), 'data' => $arg1->payment_details['cc_exp_month'] . '/' . $arg1->payment_details['cc_exp_year']);
+ $review[] = array('title' => t('Expiration'), 'data' => $order->payment_details['cc_exp_month'] . '/' . $order->payment_details['cc_exp_year']);
if (variable_get('uc_credit_issue_enabled', FALSE)) {
- $review[] = array('title' => t('Issue Number'), 'data' => user_access('view cc numbers') ? $arg1->payment_details['cc_issue'] : str_repeat('-', strlen($arg1->payment_details['cc_issue'])));
+ $review[] = array('title' => t('Issue Number'), 'data' => user_access('view cc numbers') ? $order->payment_details['cc_issue'] : str_repeat('-', strlen($order->payment_details['cc_issue'])));
}
if (variable_get('uc_credit_cvv_enabled', TRUE)) {
- $review[] = array('title' => t('CVV'), 'data' => user_access('view cc numbers') ? $arg1->payment_details['cc_cvv'] : str_repeat('-', strlen($arg1->payment_details['cc_cvv'])));
+ $review[] = array('title' => t('CVV'), 'data' => user_access('view cc numbers') ? $order->payment_details['cc_cvv'] : str_repeat('-', strlen($order->payment_details['cc_cvv'])));
}
if (variable_get('uc_credit_bank_enabled', FALSE)) {
- $review[] = array('title' => t('Issuing Bank'), 'data' => check_plain($arg1->payment_details['cc_bank']));
+ $review[] = array('title' => t('Issuing Bank'), 'data' => check_plain($order->payment_details['cc_bank']));
}
return $review;
@@ -582,50 +558,50 @@
$rows = array();
if (variable_get('uc_credit_type_enabled', TRUE)) {
- $type = check_plain($arg1->payment_details['cc_type']);
+ $type = check_plain($order->payment_details['cc_type']);
if (strlen($type) > 0) {
$rows[] = array(t('Card Type:'), $type);
}
}
if (variable_get('uc_credit_owner_enabled', FALSE)) {
- $owner = check_plain($arg1->payment_details['cc_owner']);
+ $owner = check_plain($order->payment_details['cc_owner']);
if (strlen($owner) > 0) {
$rows[] = array(t('Card Owner:'), $owner);
}
}
- $rows[] = array(t('Card Number:'), uc_credit_display_number($arg1->payment_details['cc_number']));
+ $rows[] = array(t('Card Number:'), uc_credit_display_number($order->payment_details['cc_number']));
- $exp = $arg1->payment_details['cc_exp_month'] . '/' . $arg1->payment_details['cc_exp_year'];
+ $exp = $order->payment_details['cc_exp_month'] . '/' . $order->payment_details['cc_exp_year'];
if (strlen($exp) > 1) {
$rows[] = array(t('Expiration:'), $exp);
}
if (variable_get('uc_credit_debug', FALSE)) {
if (variable_get('uc_credit_start_enabled', FALSE)) {
- $start = $arg1->payment_details['cc_start_month'] . '/' . $arg1->payment_details['cc_start_year'];
+ $start = $order->payment_details['cc_start_month'] . '/' . $order->payment_details['cc_start_year'];
if (strlen($start) > 1) {
$rows[] = array(t('Start Date:'), $start);
}
}
if (variable_get('uc_credit_issue_enabled', FALSE)) {
- $issue = $arg1->payment_details['cc_issue'];
+ $issue = $order->payment_details['cc_issue'];
if (strlen($issue) > 0) {
$rows[] = array(t('Issue Number:'), $issue);
}
}
if (variable_get('uc_credit_cvv_enabled', TRUE)) {
- $cvv = user_access('view cc numbers') ? $arg1->payment_details['cc_cvv'] : str_repeat('-', strlen($arg1->payment_details['cc_cvv']));
+ $cvv = user_access('view cc numbers') ? $order->payment_details['cc_cvv'] : str_repeat('-', strlen($order->payment_details['cc_cvv']));
if (strlen($cvv) > 0) {
$rows[] = array(t('CVV:'), $cvv);
}
}
if (variable_get('uc_credit_bank_enabled', TRUE)) {
- $bank = check_plain($arg1->payment_details['cc_bank']);
+ $bank = check_plain($order->payment_details['cc_bank']);
if (strlen($bank) > 0) {
$rows[] = array(t('Issuing Bank:'), $bank);
}
@@ -644,7 +620,7 @@
// Add the form to process the card if applicable.
if (user_access('process credit cards')) {
- $build['terminal'] = drupal_get_form('uc_credit_order_view_form', $arg1->order_id);
+ $build['terminal'] = drupal_get_form('uc_credit_order_view_form', $order->order_id);
}
}
@@ -652,13 +628,13 @@
case 'customer-view':
$build['#markup'] = t('Card Number:') . '';
- $grand_total = 0;
-
- $context = array(
- 'type' => 'line_item',
- 'subject' => array(
- 'order' => $order,
- ),
- );
-
- foreach ($order->line_items as $line) {
- if (!empty($line['title'])) {
- $context['revision'] = 'themed';
- $context['subject']['line_item'] = $line;
-
- $output .= '' . filter_xss($line['title']) . ': ' . uc_price($line['amount'], $context) . ' ';
+ $grand_total = 0;
+
+ $context = array(
+ 'type' => 'line_item',
+ 'subject' => array(
+ 'order' => $order,
+ ),
+ );
+
+ foreach ($order->line_items as $line) {
+ if (!empty($line['title'])) {
+ $context['revision'] = 'themed';
+ $context['subject']['line_item'] = $line;
+
+ $output .= '' . filter_xss($line['title']) . ': ' . uc_price($line['amount'], $context) . ' ' . t('Order total:') . ' ' . uc_price(uc_order_get_total($order), $context)
- . '
';
- }
-
- if ($return) {
- return $output;
- }
-
- print $output;
- exit();
+ }
+
+ $context['revision'] = 'themed';
+ $context['type'] = 'amount';
+ unset($context['subject']);
+ $output .= '' . t('Order total:') . ' ' . uc_price(uc_order_get_total($order), $context)
+ . '
';
+
+ return $output;
}
function uc_payment_get_details($method_id, $view = 'cart', $order = NULL) {
@@ -552,8 +530,8 @@
// If the payment processed successfully...
if ($result['success'] === TRUE) {
// Log the payment to the order if not disabled.
- if ($result['log_payment'] !== FALSE) {
- uc_payment_enter($order_id, $method, $amount, empty($result['uid']) ? 0 : $result['uid'], $result['data'], $result['comment']);
+ if (!isset($result['log_payment']) || $result['log_payment'] !== FALSE) {
+ uc_payment_enter($order_id, $method, $amount, empty($result['uid']) ? 0 : $result['uid'], empty($result['data']) ? '' : $result['data'], empty($result['comment']) ? '' : $result['comment']);
}
}
else {
=== modified file 'payment/uc_payment/uc_payment_checkout_pane.inc'
--- payment/uc_payment/uc_payment_checkout_pane.inc 2010-03-24 13:11:48 +0000
+++ payment/uc_payment/uc_payment_checkout_pane.inc 2010-06-03 19:32:27 +0000
@@ -9,35 +9,25 @@
* preview of the line items and order total.
*/
-function uc_checkout_pane_payment($op, &$arg1, $arg2) {
+function uc_checkout_pane_payment($op, &$order, $form = NULL, &$form_state = NULL) {
switch ($op) {
case 'view':
- // Add the default payment message as a JS variable.
- // Add URL paths as JS variables (be nice to i18n, allow URL rewrite).
- drupal_add_js(array(
- 'defPaymentMsg' => addslashes(variable_get('uc_default_payment_msg', t('Continue with checkout to complete payment.'))),
- 'ucURL' => array(
- 'adminOrders' => url('admin/store/orders/'),
- 'checkoutPaymentDetails' => url('cart/checkout/payment_details/'),
- 'checkoutLineItems' => url('cart/checkout/line_items'),
- 'creditCardCVVInfo' => url('cart/checkout/credit/cvv_info'),
- ),
- ), 'setting');
+ if (empty($order->line_items)) {
+ $order->line_items = uc_order_load_line_items($order, FALSE);
+ }
if (variable_get('uc_payment_show_order_total_preview', TRUE)) {
- drupal_add_js('misc/progress.js');
-
$contents['current_total'] = array(
'#type' => 'hidden',
- '#value' => isset($arg1->order_total) && $arg1->order_total > 0 ? $arg1->order_total : NULL,
+ '#value' => isset($order->order_total) && $order->order_total > 0 ? $order->order_total : NULL,
);
- $contents['shown_total'] = array(
- '#markup' => '' . t('Javascript must be enabled to view the order total preview.') . '
',
+ $contents['line_items'] = array(
+ '#theme' => 'uc_payment_totals',
+ '#order' => $order,
+ '#prefix' => '',
+ '#suffix' => '
',
'#weight' => -20,
);
-
- // let the script know we need to show a progressbar
- drupal_add_js(array('ucShowProgressBar' => TRUE), 'setting');
}
$methods = _uc_payment_method_list();
@@ -51,11 +41,11 @@
}
if (count($options)) {
- if (isset($_POST['panes']) && in_array($_POST['panes']['payment']['payment_method'], array_keys($options))) {
- $default = $_POST['panes']['payment']['payment_method'];
+ if (isset($form_state['values']) && in_array($form_state['values']['panes']['payment']['payment_method'], array_keys($options))) {
+ $default = $form_state['values']['panes']['payment']['payment_method'];
}
else {
- $default = (count($options) == 1 || !isset($arg1->payment_method)) ? key($options) : $arg1->payment_method;
+ $default = (count($options) == 1 || empty($order->payment_method)) ? key($options) : $order->payment_method;
}
}
@@ -73,20 +63,33 @@
'#default_value' => $default,
'#disabled' => count($options) == 1 ? TRUE : FALSE,
'#required' => TRUE,
- '#attributes' => array('onclick' => "get_payment_details(Drupal.settings.ucURL.checkoutPaymentDetails + this.value);"),
'#theme' => 'uc_payment_method_select',
+ '#ajax' => array(
+ 'callback' => 'uc_payment_checkout_payment_details',
+ 'wrapper' => 'payment_details',
+ ),
);
+
$contents['details'] = array(
- '#markup' => '
',
+ '#prefix' => '',
+ '#suffix' => '
',
);
+ $func = _uc_payment_method_data($default, 'callback');
+ if (function_exists($func)) {
+ $details = $func('cart-details', $order, $form, $form_state);
+ if (is_array($details) && !empty($details)) {
+ $contents['details'] += $details;
+ }
+ }
+
return array('description' => $description, 'contents' => $contents);
case 'process':
- $arg1->payment_method = $arg2['payment_method'];
- $func = _uc_payment_method_data($arg1->payment_method, 'callback');
+ $order->payment_method = $form_state['values']['panes']['payment']['payment_method'];
+ $func = _uc_payment_method_data($order->payment_method, 'callback');
if (function_exists($func)) {
- $result = $func('cart-process', $arg1);
+ $result = $func('cart-process', $order, $form, $form_state);
if ($result === FALSE) {
return FALSE;
}
@@ -94,11 +97,11 @@
return TRUE;
case 'review':
- $line_items = $arg1->line_items;
+ $line_items = $order->line_items;
$items = _uc_line_item_list();
foreach ($items as $item) {
if (isset($item['display_only']) && $item['display_only'] == TRUE) {
- $result = $item['callback']('display', $arg1);
+ $result = $item['callback']('display', $order);
if (is_array($result)) {
foreach ($result as $line) {
$line_items[] = array(
@@ -116,21 +119,21 @@
'revision' => 'themed',
'type' => 'line_item',
'subject' => array(
- 'order' => $arg1,
+ 'order' => $order,
),
);
foreach ($line_items as $line_item) {
$context['subject']['line_item'] = $line_item;
$review[] = array('title' => $line_item['title'], 'data' => uc_price($line_item['amount'], $context));
}
- $review_data = _uc_payment_method_data($arg1->payment_method, 'review');
+ $review_data = _uc_payment_method_data($order->payment_method, 'review');
if (empty($review_data)) {
- $review_data = _uc_payment_method_data($arg1->payment_method, 'name');
+ $review_data = _uc_payment_method_data($order->payment_method, 'name');
}
$review[] = array('border' => 'top', 'title' => t('Paying by'), 'data' => $review_data);
- $func = _uc_payment_method_data($arg1->payment_method, 'callback');
+ $func = _uc_payment_method_data($order->payment_method, 'callback');
if (function_exists($func)) {
- $result = $func('cart-review', $arg1);
+ $result = $func('cart-review', $order);
if (is_array($result)) {
$review = array_merge($review, $result);
}
@@ -148,6 +151,13 @@
}
/**
+ * AJAX callback for payment method details on the checkout form.
+ */
+function uc_payment_checkout_payment_details($form, $form_state) {
+ return $form['panes']['payment']['details'];
+}
+
+/**
* We need a theme function for the radios element in case another module alters
* the default or available payment methods... we need the JS to grab the right
* default payment details.
@@ -160,9 +170,5 @@
return;
}
- // Perhaps instead this should be a normal JS function and we just print the
- // default payment method to a JS variable or use a selector. -RS
- drupal_add_js(array('ucDefaultPayment' => $form['#default_value']), 'setting');
-
return drupal_render_children($form);
}
=== modified file 'payment/uc_payment/uc_payment_order_pane.inc'
--- payment/uc_payment/uc_payment_order_pane.inc 2010-05-18 20:14:02 +0000
+++ payment/uc_payment/uc_payment_order_pane.inc 2010-06-03 15:57:46 +0000
@@ -15,7 +15,7 @@
/**
* Handle the Payment order pane.
*/
-function uc_order_pane_payment($op, $arg1) {
+function uc_order_pane_payment($op, $order) {
switch ($op) {
case 'view':
if (variable_get('uc_payment_tracking', TRUE)) {
@@ -23,20 +23,20 @@
'revision' => 'formatted-original',
'type' => 'amount',
);
- $build['balance'] = array('#markup' => t('Balance: @balance', array('@balance' => uc_price(uc_payment_balance($arg1), $context))));
+ $build['balance'] = array('#markup' => t('Balance: @balance', array('@balance' => uc_price(uc_payment_balance($order), $context))));
$build['view_payments'] = array(
- '#markup' => ' (' . l(t('View'), 'admin/store/orders/' . $arg1->order_id . '/payments') . ')',
+ '#markup' => ' (' . l(t('View'), 'admin/store/orders/' . $order->order_id . '/payments') . ')',
'#suffix' => '';
- foreach (element_children($arg1['payment']) as $field) {
- $title = $arg1['payment'][$field]['#title'];
- $arg1['payment'][$field]['#title'] = NULL;
+ foreach (element_children($order['payment']) as $field) {
+ $title = $order['payment'][$field]['#title'];
+ $order['payment'][$field]['#title'] = NULL;
$output .= '' . $title . ': '
- . drupal_render($arg1['payment'][$field]) . '
';
return $output;
case 'edit-process':
- $changes['payment_method'] = $arg1['payment_method'];
- $func = _uc_payment_method_data($arg1['payment_method'], 'callback');
- if (function_exists($func) && ($return = $func('edit-process', $arg1)) != NULL && is_array($return)) {
+ $changes['payment_method'] = $order['payment_method'];
+ $func = _uc_payment_method_data($order['payment_method'], 'callback');
+ if (function_exists($func) && ($return = $func('edit-process', $order)) != NULL && is_array($return)) {
$changes = array_merge($changes, $return);
}
return $changes;
=== modified file 'payment/uc_payment_pack/uc_payment_pack.module'
--- payment/uc_payment_pack/uc_payment_pack.module 2010-04-07 16:15:47 +0000
+++ payment/uc_payment_pack/uc_payment_pack.module 2010-06-03 15:57:46 +0000
@@ -87,18 +87,18 @@
/**
* Handle the generic payment method "Other."
*/
-function uc_payment_method_other($op, &$arg1) {
+function uc_payment_method_other($op, &$order) {
switch ($op) {
case 'order-view':
case 'customer-view':
// Fetch the description for the payment entered by the administrator.
- if ($description = db_query("SELECT description FROM {uc_payment_other} WHERE order_id = :id", array(':id' => $arg1->order_id))->fetchField()) {
+ if ($description = db_query("SELECT description FROM {uc_payment_other} WHERE order_id = :id", array(':id' => $order->order_id))->fetchField()) {
return array('#markup' => t('Description: @desc', array('@desc' => $description)));
}
break;
case 'order-details':
- $details = drupal_get_form('uc_payment_method_other_form', $arg1);
+ $details = drupal_get_form('uc_payment_method_other_form', $order);
return uc_strip_form($details);
case 'edit-process':
@@ -106,24 +106,24 @@
return $changes;
case 'order-load':
- if ($description = db_query("SELECT description FROM {uc_payment_other} WHERE order_id = :id", array(':id' => $arg1->order_id))->fetchField()) {
- $arg1->payment_details['description'] = $description;
+ if ($description = db_query("SELECT description FROM {uc_payment_other} WHERE order_id = :id", array(':id' => $order->order_id))->fetchField()) {
+ $order->payment_details['description'] = $description;
}
break;
case 'order-save':
- if (empty($arg1->payment_details['pm_other_description'])) {
+ if (empty($order->payment_details['pm_other_description'])) {
db_delete('uc_payment_other')
- ->condition('order_id', $arg1->order_id)
+ ->condition('order_id', $order->order_id)
->execute();
}
else {
db_merge('uc_payment_other')
->key(array(
- 'order_id' => $arg1->order_id,
+ 'order_id' => $order->order_id,
))
->fields(array(
- 'description' => $arg1->payment_details['pm_other_description'],
+ 'description' => $order->payment_details['pm_other_description'],
))
->execute();
}
@@ -156,7 +156,7 @@
/**
* Handle the Cash on Delivery payment method.
*/
-function uc_payment_method_cod($op, &$arg1) {
+function uc_payment_method_cod($op, &$order) {
switch ($op) {
case 'cart-details':
$build['policy'] = array('#markup' => variable_get('uc_cod_policy', t('Full payment is expected upon delivery or prior to pick-up.')));
@@ -170,24 +170,24 @@
}
if (variable_get('uc_cod_delivery_date', FALSE)) {
- $build['form'] = uc_strip_form(drupal_get_form('uc_payment_method_cod_form', $arg1));
+ $build['form'] = uc_strip_form(drupal_get_form('uc_payment_method_cod_form', $order));
}
return $build;
case 'cart-process':
if (variable_get('uc_cod_delivery_date', FALSE)) {
- $arg1->payment_details['delivery_month'] = intval($_POST['cod_delivery_month']);
- $arg1->payment_details['delivery_day'] = intval($_POST['cod_delivery_day']);
- $arg1->payment_details['delivery_year'] = intval($_POST['cod_delivery_year']);
+ $order->payment_details['delivery_month'] = intval($_POST['cod_delivery_month']);
+ $order->payment_details['delivery_day'] = intval($_POST['cod_delivery_day']);
+ $order->payment_details['delivery_year'] = intval($_POST['cod_delivery_year']);
}
return TRUE;
case 'cart-review':
if (variable_get('uc_cod_delivery_date', FALSE)) {
- $date = uc_date_format($arg1->payment_details['delivery_month'],
- $arg1->payment_details['delivery_day'],
- $arg1->payment_details['delivery_year']);
+ $date = uc_date_format($order->payment_details['delivery_month'],
+ $order->payment_details['delivery_day'],
+ $order->payment_details['delivery_year']);
$review[] = array('title' => t('Delivery Date'), 'data' => $date);
}
return $review;
@@ -198,9 +198,9 @@
if (variable_get('uc_cod_delivery_date', FALSE)) {
$build['#markup'] = t('Desired delivery date:') . '
',
);
- // small hack; automatically looks for shipping quotes on page load
- drupal_add_js("jQuery(document).ready(function() { jQuery('#edit-quote-button').click(); });", 'inline');
-
// Fake the checkout form delivery information.
$form['delivery_first_name'] = array('#type' => 'hidden', '#value' => $order->delivery_first_name);
$form['delivery_last_name'] = array('#type' => 'hidden', '#value' => $order->delivery_last_name);
=== modified file 'shipping/uc_quote/uc_quote.install'
--- shipping/uc_quote/uc_quote.install 2010-04-01 18:42:54 +0000
+++ shipping/uc_quote/uc_quote.install 2010-06-03 19:32:27 +0000
@@ -159,10 +159,6 @@
'not null' => TRUE,
'default' => 0,
),
- 'quote_form' => array(
- 'description' => 'HTML form used to choose the shipping quote.',
- 'type' => 'text',
- ),
),
'unique keys' => array(
'order_id_quote_method' => array('order_id', 'method'),
@@ -186,3 +182,9 @@
variable_del('uc_store_shipping_type');
}
+/**
+ * Drop {uc_order_quotes}.quote_form.
+ */
+function uc_quote_update_7001() {
+ db_drop_field('uc_order_quotes', 'quote_form');
+}
=== removed file 'shipping/uc_quote/uc_quote.js'
--- shipping/uc_quote/uc_quote.js 2010-03-23 20:10:29 +0000
+++ shipping/uc_quote/uc_quote.js 1970-01-01 00:00:00 +0000
@@ -1,209 +0,0 @@
-// $Id$
-
-/**
- * @file
- * Handle asynchronous calls on checkout page to retrieve shipping quotes.
- */
-
-var page;
-var details;
-var methods;
-
-/**
- * Set event handlers on address fields.
- */
-function setQuoteCallbacks(products, context) {
- triggerQuoteCallback = function() {
- quoteCallback(products);
- };
- jQuery("input[name*=delivery_postal_code]:not(.getQuotes-processed)", context).addClass('getQuotes-processed').change(triggerQuoteCallback);
- jQuery("input[id*=quote-button]:not(.getQuotes-processed)", context).addClass('getQuotes-processed').click(function() {
- // returns false to prevent default actions and propogation
- return quoteCallback(products);
- });
- jQuery("input[name*=quote_method]:not(.getQuotes-processed)", context).addClass('getQuotes-processed').change(function() {
- // returns false to prevent default actions and propogation
- return quoteCallback(products);
- });
- jQuery("select[name*=delivery_address_select]:not(.getQuotes-processed)", context).addClass('getQuotes-processed').change(function() {
- jQuery("input[name*=delivery_postal_code]").trigger('change');
- });
- jQuery("input[name*=copy_address]:not(.getQuotes-processed)", context).addClass('getQuotes-processed').click(function() {
- if (copy_box_checked == true) {
- jQuery("input[name*=billing_postal_code]:not(.getQuotes-processed)", context).addClass('getQuotes-processed').bind('change', triggerQuoteCallback);
- jQuery("select[name*=billing_address_select]:not(.getQuotes-processed)", context).addClass('getQuotes-processed').bind('change', triggerQuoteCallback);
- triggerQuoteCallback();
- }
- else {
- jQuery("input[name*=billing_postal_code].getQuotes-processed").removeClass('getQuotes-processed').unbind('change', triggerQuoteCallback);
- jQuery("select[name*=billing_address_select].getQuotes-processed").removeClass('getQuotes-processed').unbind('change', triggerQuoteCallback);
- }
- });
-}
-
-/**
- * Refresh line item list when a shipping method is selected.
- */
-function setTaxCallbacks() {
- // Choosing to use click because of IE's bloody stupid bug not to
- // trigger onChange until focus is lost. Click is better than doing
- // set_line_item() and getTax() twice, I believe.
- jQuery("#quote").find("input:radio").click(function() {
- var i = jQuery(this).val();
- if (window.set_line_item) {
- var label = jQuery(this).parent().text();
- set_line_item("shipping", label.substr(0, label.indexOf(":")), jQuery(this).parent().prev().val(), 1, 1);
- }
- });
-}
-
-/**
- * Retrieve a list of available shipping quotes.
- *
- * @param products
- * Pipe- and carat-delimited values string representing the current contents
- * of the shopping cart. Products are separated by | and product data by ^.
- */
-function quoteCallback(products) {
- var updateCallback = function (progress, status, pb) {
- if (progress == 100) {
- pb.stopMonitoring();
- }
- };
-
- page = jQuery("input:hidden[name*=page]").val();
- details = new Object();
- details["uid"] = jQuery("input[name*=uid]").val();
- //details["details[zone]"] = jQuery("select[name*=delivery_zone] option:selected").val();
- //details["details[country]"] = jQuery("select[name*=delivery_country] option:selected").val();
-
- jQuery("select[name*=delivery_]").each(function(i) {
- details["details[delivery][" + jQuery(this).attr("name").split("delivery_")[1].replace(/]/, "") + "]"] = jQuery(this).val();
- });
- jQuery("input[name*=delivery_]").each(function(i) {
- details["details[delivery][" + jQuery(this).attr("name").split("delivery_")[1].replace(/]/, "") + "]"] = jQuery(this).val();
- });
- jQuery("select[name*=billing_]").each(function(i) {
- details["details[billing][" + jQuery(this).attr("name").split("billing_")[1].replace(/]/, "") + "]"] = jQuery(this).val();
- });
- jQuery("input[name*=billing_]").each(function(i) {
- details["details[billing][" + jQuery(this).attr("name").split("billing_")[1].replace(/]/, "") + "]"] = jQuery(this).val();
- });
-
- if (!!products) {
- details["products"] = products;
- }
- else {
- products = "";
- var i = 0;
- while (jQuery("input[name^='products[" + i + "]']").length) {
- products += "|" + jQuery("input[name^='products[" + i + "]']").filter("[name$='[nid]']").val();
- products += "^" + jQuery("input[name^='products[" + i + "]']").filter("[name$='[title]']").val();
- products += "^" + jQuery("input[name^='products[" + i + "]']").filter("[name$='[model]']").val();
- products += "^" + jQuery("input[name^='products[" + i + "]']").filter("[name$='[qty]']").val();
- products += "^" + jQuery("input[name^='products[" + i + "]']").filter("[name$='[cost]']").val();
- products += "^" + jQuery("input[name^='products[" + i + "]']").filter("[name$='[price]']").val();
- products += "^" + jQuery("input[name^='products[" + i + "]']").filter("[name$='[weight]']").val();
- products += "^" + jQuery("input[name^='products[" + i + "]']").filter("[name$='[data]']").val();
- i++;
- }
- details["products"] = products.substr(1);
- }
- var progress = new Drupal.progressBar("quoteProgress");
- progress.setProgress(-1, Drupal.settings.uc_quote.progress_msg);
- jQuery("#quote").empty().append(progress.element);
- jQuery("#quote").addClass("solid-border");
- // progress.startMonitoring(Drupal.settings.basePath + "?q=shipping/quote", 0);
- jQuery.ajax({
- type: "POST",
- url: Drupal.settings.ucURL.shippingQuotes,
- data: details,
- dataType: "json",
- success: displayQuote
- });
-
- return false;
-}
-
-/**
- * Parse and render the returned shipping quotes.
- */
-function displayQuote(data) {
- var quoteDiv = jQuery("#quote").empty()/* .append(""
- + " ";
- }
- else {
- item = "" + label + ": " + data[i].format + " ";
- if (page == "checkout") {
- if (label != "" && window.set_line_item) {
- set_line_item("shipping", label, data[i].rate, 1);
- }
- }
- }
- }
- if (data[i].error) {
- item += '' + data[i].error + "
";
- }
- if (data[i].notes) {
- item += '' + data[i].notes + "
";
- }
- if (data[i].rate == undefined && item.length) {
- item = label + ': ' + item;
- }
- quoteDiv.append('' + item + "
\n");
- Drupal.attachBehaviors(quoteDiv);
- if (page == "checkout") {
- // Choosing to use click because of IE's bloody stupid bug not to
- // trigger onChange until focus is lost. Click is better than doing
- // set_line_item() and getTax() twice, I believe.
- quoteDiv.find("input:radio[value=" + i +"]").click(function() {
- var i = jQuery(this).val();
- if (window.set_line_item) {
- set_line_item("shipping", data[i].option_label, data[i].rate, 1, 1);
- }
- });
- }
- }
- if (data[i].debug != undefined) {
- quoteDiv.append("" + data[i].debug + " ");
- }
- }
- if (quoteDiv.find("input").length == 0) {
- quoteDiv.append(Drupal.settings.uc_quote.err_msg);
- }
- else {
- quoteDiv.find("input:radio").eq(0).click().attr("checked", "checked");
- var quoteForm = quoteDiv.html();
- quoteDiv.append("' . print_r($quote_data, TRUE) . ' ');
+
if ($messages && variable_get('uc_quote_log_errors', FALSE)) {
watchdog('quote', '!messages', array('!messages' => $messages), WATCHDOG_WARNING);
watchdog('quote', '@data ', array('@data' => print_r($quote_data, TRUE)), WATCHDOG_WARNING);
@@ -515,12 +539,18 @@
if (!variable_get('uc_cap_quotes_enabled', FALSE) || (variable_get('uc_cart_delivery_not_shippable', TRUE) && !uc_cart_is_shippable())) {
return array();
}
- }
+
+ $body = drupal_get_form('uc_cart_pane_quotes', $items);
+ }
+ else {
+ $body = '';
+ }
+
$panes[] = array('id' => 'quotes',
'title' => t('Shipping quotes'),
'enabled' => FALSE,
'weight' => 5,
- 'body' => drupal_get_form('uc_cart_pane_quotes', $items),
+ 'body' => $body,
);
return $panes;
@@ -530,7 +560,8 @@
* Define the shipping quote checkout pane.
*/
function uc_quote_uc_checkout_pane() {
- $panes[] = array('id' => 'quotes',
+ $panes[] = array(
+ 'id' => 'quotes',
'callback' => 'uc_checkout_pane_quotes',
'title' => t('Calculate shipping cost'),
'desc' => t('Extra information necessary to ship.'),
@@ -560,48 +591,31 @@
}
/**
- * Implement hook_uc_add_to_cart().
- */
-function uc_quote_uc_add_to_cart() {
- unset($_SESSION['quote']);
-}
-
-/**
- * Implement hook_uc_update_cart_item().
- */
-function uc_quote_uc_update_cart_item() {
- unset($_SESSION['quote']);
-}
-
-/**
* Implement hook_uc_order().
*/
-function uc_quote_uc_order($op, &$arg1, $arg2) {
+function uc_quote_uc_order($op, &$order, $arg2) {
switch ($op) {
- case 'submit':
- unset($_SESSION['quote']);
- break;
case 'save':
- if (isset($arg1->quote['method'])) {
+ if (isset($order->quote['method'])) {
db_merge('uc_order_quotes')
- ->key(array('order_id' => $arg1->order_id))
+ ->key(array('order_id' => $order->order_id))
->fields(array(
- 'method' => $arg1->quote['method'],
- 'accessorials' => $arg1->quote['accessorials'],
- 'rate' => $arg1->quote['rate'],
- 'quote_form' => $arg1->quote['quote_form'],
+ 'method' => $order->quote['method'],
+ 'accessorials' => $order->quote['accessorials'],
+ 'rate' => $order->quote['rate'],
+ 'quote_form' => $order->quote['quote_form'],
))
->execute();
}
break;
case 'load':
- $quote = db_query("SELECT method, accessorials, rate, quote_form FROM {uc_order_quotes} WHERE order_id = :id", array(':id' => $arg1->order_id))->fetchAssoc();
- $arg1->quote = $quote;
- $arg1->quote['accessorials'] = strval($quote['accessorials']);
+ $quote = db_query("SELECT method, accessorials, rate, quote_form FROM {uc_order_quotes} WHERE order_id = :id", array(':id' => $order->order_id))->fetchAssoc();
+ $order->quote = $quote;
+ $order->quote['accessorials'] = strval($quote['accessorials']);
break;
case 'delete':
db_delete('uc_order_quotes')
- ->condition('order_id', $arg1->order_id)
+ ->condition('order_id', $order->order_id)
->execute();
break;
}
@@ -738,87 +752,53 @@
*/
function uc_cart_pane_quotes($form, &$form_state, $items) {
global $user;
- // Get all quote types neccessary to fulfill order.
- $shipping_types = array();
- foreach ($items as $product) {
- $shipping_types[] = uc_product_get_shipping_type($product);
- }
- $shipping_types = array_unique($shipping_types);
- $all_types = uc_quote_get_shipping_types();
- $shipping_type = '';
- $type_weight = 1000; // arbitrary large number
- foreach ($shipping_types as $type) {
- if ($all_types[$type]['weight'] < $type_weight) {
- $shipping_type = $all_types[$type]['id'];
- $type_weight = $all_types[$type]['weight'];
- }
- }
- $methods = array_filter(module_invoke_all('uc_shipping_method'), '_uc_quote_method_enabled');
- uasort($methods, '_uc_quote_type_sort');
- $method_choices = array();
- foreach ($methods as $method) {
- if ($method['quote']['type'] == 'order' || $method['quote']['type'] == $shipping_type) {
- $method_choices[$method['id']] = $method['title'];
- }
- }
- $form['delivery_country'] = uc_country_select(uc_get_field_name('country'), uc_store_default_country(), NULL, 'name', TRUE);
+
+ $form['delivery_country'] = uc_country_select(uc_get_field_name('country'), isset($form_state['values']['delivery_country']) ? $form_state['values']['delivery_country'] : uc_store_default_country(), NULL, 'name', TRUE);
$country_id = isset($_POST['delivery_country']) ? intval($_POST['delivery_country']) : uc_store_default_country();
- $form['delivery_zone'] = uc_zone_select(uc_get_field_name('zone'), NULL, NULL, $country_id, 'name', TRUE);
- $form['delivery_postal_code'] = uc_textfield(uc_get_field_name('postal_code'), '', TRUE, NULL, 10, 10);
- $form['quote_method'] = array(
- '#type' => 'hidden',
- '#value' => key($method_choices),
- );
+ $form['delivery_zone'] = uc_zone_select(uc_get_field_name('zone'), isset($form_state['values']['delivery_zone']) ? $form_state['values']['delivery_zone'] : NULL, NULL, $country_id, 'name', TRUE);
+ $form['delivery_postal_code'] = uc_textfield(uc_get_field_name('postal_code'), isset($form_state['values']['delivery_postal_code']) ? $form_state['values']['delivery_postal_code'] : '', TRUE, NULL, 10, 10);
$form['get_quote'] = array(
'#type' => 'button',
'#value' => t('Calculate'),
+ '#ajax' => array(
+ 'callback' => 'uc_quote_cart_returned_rates',
+ 'wrapper' => 'quote',
+ ),
);
$form['page'] = array(
'#type' => 'hidden',
'#value' => 'cart',
);
- $form['uid'] = array(
- '#type' => 'hidden',
- '#value' => $user->uid,
- );
+
+ $order = new UcOrder();
+ $order->uid = $user->uid;
+ $order->delivery_country = $form['delivery_country']['#default_value'];
+ $order->delivery_zone = $form['delivery_zone']['#default_value'];
+ $order->delivery_postal_code = $form['delivery_postal_code']['#default_value'];
+ $order->products = $items;
+
+ module_load_include('inc', 'uc_quote', 'uc_quote.pages');
+ $quotes = uc_quote_assemble_quotes($order);
+
+ if (!empty($quotes)) {
+ foreach ($quotes as $method => $data) {
+ foreach ($data as $accessorial => $quote) {
+ $key = $method . '---' . $accessorial;
+
+ if (isset($quote['rate'])) {
+ $quote_options[$key] = t('!label: !price', array('!label' => $quote['option_label'], '!price' => $quote['format']));
+ }
+ }
+ }
+ }
+
$form['quote'] = array(
- '#markup' => '
',
+ '#theme' => 'item_list',
+ '#items' => $quote_options,
+ '#prefix' => '',
);
- drupal_add_js(array(
- 'uc_quote' => array(
- 'progress_msg' => t('Receiving quotes:'),
- 'err_msg' => check_markup(variable_get('uc_quote_err_msg', t("There were problems getting a shipping quote. Please verify the delivery and product information and try again.\nIf this does not resolve the issue, please call in to complete your order.")), variable_get('uc_quote_msg_format', filter_default_format())),
- ),
- 'ucURL' => array(
- 'shippingQuotes' => url('cart/checkout/shipping/quote'),
- ),
- ), 'setting');
- drupal_add_js('misc/progress.js');
- drupal_add_js(drupal_get_path('module', 'uc_quote') . '/uc_quote.js');
- $prod_string = '';
- foreach (uc_cart_get_contents() as $item) {
- $prod_string .= '|' . $item->nid;
- $prod_string .= '^' . $item->title;
- $prod_string .= '^' . $item->model;
- $prod_string .= '^' . $item->manufacturer;
- $prod_string .= '^' . $item->qty;
- $prod_string .= '^' . $item->cost;
- $prod_string .= '^' . $item->price;
- $prod_string .= '^' . $item->weight;
- $prod_string .= '^' . serialize($item->data);
- }
- $prod_string = substr($prod_string, 1);
- // If a previous quote gets loaded, make sure it gets saved again.
- // Also, make sure the previously checked option is checked by default.
- drupal_add_js('jQuery(function() {
- setQuoteCallbacks("' . drupal_encode_path($prod_string) . '");
- jQuery("#uc-cart-pane-quotes").submit(function() {
- quoteCallback("' . drupal_encode_path($prod_string) . '");
- return false;
- });
- })', 'inline');
-
return $form;
}
@@ -851,8 +831,9 @@
*
* Adds a line item to the order that records the chosen shipping quote.
*/
-function uc_checkout_pane_quotes($op, &$arg1, $arg2) {
+function uc_checkout_pane_quotes($op, &$order, $form = NULL, &$form_state = NULL) {
global $user;
+
switch ($op) {
case 'view':
$description = check_markup(variable_get('uc_quote_pane_description', t('Shipping quotes are generated automatically when you enter your address and may be updated manually with the button below.')), variable_get('uc_quote_desc_format', filter_default_format()));
@@ -870,70 +851,50 @@
'#type' => 'button',
'#value' => t('Click to calculate shipping'),
'#weight' => 0,
- );
-
- drupal_add_js(array(
- 'uc_quote' => array(
- 'progress_msg' => t('Receiving quotes...'),
- 'err_msg' => check_markup(variable_get('uc_quote_err_msg', t("There were problems getting a shipping quote. Please verify the delivery address and product information and try again.\nIf this does not resolve the issue, please call @phone to complete your order.", array('@phone' => variable_get('uc_store_phone', NULL)))), variable_get('uc_quote_msg_format', filter_default_format())),
- ),
- 'ucURL' => array(
- 'shippingQuotes' => url('cart/checkout/shipping/quote'),
- ),
- ), 'setting');
- drupal_add_js('misc/progress.js');
- drupal_add_js(drupal_get_path('module', 'uc_quote') . '/uc_quote.js');
-
- if (!empty($arg1->quote)) {
- $default = $arg1->quote['method'] . '---' . ($arg1->quote['accessorials'] ? $arg1->quote['accessorials'] : 0);
- }
- else {
- $default = '---';
- }
-
- $prod_string = '';
- foreach (uc_cart_get_contents() as $item) {
- $prod_string .= '|' . $item->nid;
- $prod_string .= '^' . $item->title;
- $prod_string .= '^' . $item->model;
- $prod_string .= '^' . $item->qty;
- $prod_string .= '^' . $item->cost;
- $prod_string .= '^' . $item->price;
- $prod_string .= '^' . $item->weight;
- $prod_string .= '^' . serialize($item->data);
- }
- $prod_string = substr($prod_string, 1);
- // If a previous quote gets loaded, make sure it gets saved again.
- // Also, make sure the previously checked option is checked by default.
- drupal_add_js('
- Drupal.behaviors.getQuotes = {
- attach: function (context) {
- setQuoteCallbacks("' . drupal_encode_path($prod_string) . '", context);
- }
- };
- jQuery(function() {
- var quoteButton = jQuery("input:radio[name=quote-option]").click(function() {
- var quoteButton = jQuery(this);
- var label = quoteButton.parent("label").text().split(":", 2)[0];
- var rate = jQuery("input:hidden[name=\'rate[" + quoteButton.val() + "]\']").val();
- set_line_item("shipping", label, rate, 1, 1, false);
- if (window.getTax) {
- getTax();
- }
- else if (window.render_line_items) {
- render_line_items();
- }
- }).filter("[value=' . $default . ']").click();
- var quoteDiv = jQuery("#quote");
- if (quoteDiv.length && jQuery("#quote input[name=quote-form]").length == 0) {
- quoteDiv.append("',
+ '#suffix' => '
',
+ '#weight' => 1,
+ );
+
+ $contents['quotes'] += uc_quote_build_quote_form($order);
return array('description' => $description, 'contents' => $contents);
case 'process':
- if (!isset($_POST['quote-option'])) {
+ if (!isset($form_state['values']['panes']['quotes']['quotes']['quote_option'])) {
+ // Get first returned quote as a default value.
+ module_load_include('inc', 'uc_quote', 'uc_quote.pages');
+
+ $quotes = uc_quote_assemble_quotes($order);
+
+ $quote_options = array();
+ if ($quotes) {
+ foreach ($quotes as $method => $data) {
+ foreach ($data as $accessorial => $quote) {
+ $key = $method . '---' . $accessorial;
+ if (isset($quote['rate'])) {
+ $form_state['values']['panes']['quotes']['quotes']['quote_option'] = $key;
+ $form_state['values']['panes']['quotes']['quotes'][$key]['rate'] = $quote['rate'];
+
+ break 2;
+ }
+ }
+ }
+ }
+ }
+
+ if (!isset($form_state['values']['panes']['quotes']['quotes']['quote_option'])) {
if (variable_get('uc_quote_require_quote', TRUE)) {
drupal_set_message(t('You must select a shipping option before continuing.'), 'error');
return FALSE;
@@ -942,84 +903,46 @@
return TRUE;
}
}
- $details = array();
- foreach ($arg1 as $key => $value) {
- if (strpos($key, 'delivery_') !== FALSE) {
- $details[substr($key, 9)] = $value;
- }
- }
- $products = array();
- foreach ($arg1->products as $id => $product) {
- $node = (array)node_load($product->nid);
- foreach ($node as $key => $value) {
- if (!isset($product->$key)) {
- $product->$key = $value;
- }
- }
- $arg1->products[$id] = $product;
- }
- $quote_option = explode('---', $_POST['quote-option']);
- $arg1->quote['method'] = $quote_option[0];
- $arg1->quote['accessorials'] = $quote_option[1];
- $_SESSION['quote']['quote_form'] = rawurldecode($_POST['quote-form']);
+
+ $quote_option = explode('---', $form_state['values']['panes']['quotes']['quotes']['quote_option']);
+ $order->quote['method'] = $quote_option[0];
+ $order->quote['accessorials'] = $quote_option[1];
$methods = array_filter(module_invoke_all('uc_shipping_method'), '_uc_quote_method_enabled');
$method = $methods[$quote_option[0]];
- $quote_data = array();
-
- $arguments = array(
- 'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
- '#data' => $arg1,
- ),
- 'method' => array(
- '#entity' => 'quote_method',
- '#title' => t('Quote method'),
- '#data' => $method,
- ),
- 'account' => array(
- '#entity' => 'user',
- '#title' => t('User'),
- '#data' => $user,
- ),
- );
-
- $predicates = ca_load_trigger_predicates('get_quote_from_' . $method['id']);
- $predicate = array_shift($predicates);
- if ($predicate && ca_evaluate_conditions($predicate, $arguments)) {
- $quote_data = uc_quote_action_get_quote($arg1, $method, $user);
- }
-
- if (!isset($quote_data[$quote_option[1]])) {
- drupal_set_message(t('Invalid option selected. Recalculate shipping quotes to continue.'), 'error');
- return FALSE;
- }
$label = $method['quote']['accessorials'][$quote_option[1]];
- $arg1->quote['rate'] = $quote_data[$quote_option[1]]['rate'];
-
- $result = db_query("SELECT line_item_id FROM {uc_order_line_items} WHERE order_id = :id AND type = :type", array(':id' => $arg1->order_id, ':type' => 'shipping'));
+
+ $quote_option = $form_state['values']['panes']['quotes']['quotes']['quote_option'];
+ $order->quote['rate'] = $form_state['values']['panes']['quotes']['quotes'][$quote_option]['rate'];
+
+ $result = db_query("SELECT line_item_id FROM {uc_order_line_items} WHERE order_id = :id AND type = :type", array(':id' => $order->order_id, ':type' => 'shipping'));
if ($lid = $result->fetchField()) {
uc_order_update_line_item($lid,
$label,
- $arg1->quote['rate']
+ $order->quote['rate']
);
}
else {
- uc_order_line_item_add($arg1->order_id, 'shipping',
+ uc_order_line_item_add($order->order_id, 'shipping',
$label,
- $arg1->quote['rate']
+ $order->quote['rate']
);
}
+ // Update line items.
+ $order->line_items = uc_order_load_line_items($order, TRUE);
+ // Update calculated line items.
+ $order->line_items = array_merge($order->line_items, uc_order_load_line_items($order, FALSE));
+ usort($order->line_items, 'uc_weight_sort');
+
return TRUE;
case 'review':
$context = array(
'revision' => 'themed',
'type' => 'line_item',
- 'subject' => array('order' => $arg1),
+ 'subject' => array('order' => $order),
);
- $result = db_query("SELECT * FROM {uc_order_line_items} WHERE order_id = :id AND type = :type", array(':id' => $arg1->order_id, ':type' => 'shipping'));
+ $result = db_query("SELECT * FROM {uc_order_line_items} WHERE order_id = :id AND type = :type", array(':id' => $order->order_id, ':type' => 'shipping'));
if ($line_item = $result->fetchAssoc()) {
$context['subject']['line_item'] = $line_item;
$review[] = array('title' => $line_item['title'], 'data' => uc_price($line_item['amount'], $context));
@@ -1032,7 +955,7 @@
/**
* Shipping quote order pane callback.
*/
-function uc_order_pane_quotes($op, $arg1) {
+function uc_order_pane_quotes($op, $order, $form = NULL, &$form_state = NULL) {
switch ($op) {
case 'edit-form':
// Let Javascript know where we are.
@@ -1043,183 +966,220 @@
$form['quotes']['quote_button'] = array(
'#type' => 'submit',
'#value' => t('Get shipping quotes'),
+ '#submit' => array('uc_quote_order_pane_quotes_submit'),
+ '#ajax' => array(
+ 'callback' => 'uc_quote_order_returned_rates',
+ 'effect' => 'slide',
+ 'progress' => array(
+ 'type' => 'bar',
+ 'message' => t('Receiving quotes...'),
+ ),
+ ),
);
$form['quotes']['add_quote'] = array(
'#type' => 'submit',
'#value' => t('Apply to order'),
'#attributes' => array('class' => array('save-button')),
'#disabled' => TRUE,
- );
-
- $form['quotes']['quote'] = array(
- '#markup' => '
',
- );
-
- drupal_add_js(array(
- 'uc_quote' => array(
- 'progress_msg' => t('Receiving quotes...'),
- 'err_msg' => check_markup(variable_get('uc_quote_err_msg', t("There were problems getting a shipping quote. Please verify the delivery and product information and try again.\nIf this does not resolve the issue, please call in to complete your order.")), variable_get('uc_quote_msg_format', filter_default_format())),
- ),
- 'ucURL' => array(
- 'shippingQuotes' => url('cart/checkout/shipping/quote'),
- ),
- ), 'setting');
-
- drupal_add_js('misc/progress.js');
- drupal_add_js(drupal_get_path('module', 'uc_quote') . '/uc_quote.js');
-
- $default = $arg1->quote['accessorials'] ? $arg1->quote['accessorials'] : 0;
- // If a previous quote gets loaded, make sure it gets saved again.
- // Also, make sure the previously checked option is checked by default.
- drupal_add_js('jQuery(function() {
- setQuoteCallbacks();
- jQuery("input:radio[name=quote-option]").filter("[value=' . $default . ']").attr("checked", "checked");
- var quoteDiv = jQuery("#quote");
- if (quoteDiv.length && jQuery("#quote input[name=quote-form]").length == 0) {
- quoteDiv.append("',
+ '#suffix' => '
',
+ );
+
+ if (isset($form_state['quote_requested']) && $form_state['quote_requested'] == TRUE) {
+ $form['quotes']['quotes'] += uc_quote_build_quote_form($order);
+ }
+
return $form;
+
case 'edit-theme':
- return drupal_render($arg1['quotes']);
- case 'edit-process':
- //drupal_set_message('' . print_r($_POST, TRUE) . ' ');
- if (isset($_POST['quote-option'])) {
- list($changes['quote']['method'], $changes['quote']['accessorials']) = explode('---', $_POST['quote-option']);
- }
- $changes['quote']['rate'] = $_POST['rate'][$_POST['quote-option']];
- $changes['quote']['quote_form'] = rawurldecode($_POST['quote-form']);
- return $changes;
- case 'edit-ops':
- return array(t('Apply to order'));
- case t('Apply to order'):
- if (isset($_POST['quote-option'])) {
- if ($order = uc_order_load($arg1['order_id'])) {
- $user = user_load($order->uid);
- $products = array();
- foreach ($order->products as $product) {
- if ($product->nid) {
- $node = (array)node_load($product->nid);
- foreach ($node as $key => $value) {
- if (!isset($product->$key)) {
- $product->$key = $value;
- }
- }
- }
- $products[] = $product;
- }
-
- //drupal_set_message('' . print_r($order, TRUE) . ' ');
- $quote_option = explode('---', $_POST['quote-option']);
- $order->quote['method'] = $quote_option[0];
- $order->quote['accessorials'] = $quote_option[1];
- $order->quote['quote_form'] = rawurldecode($_POST['quote-form']);
- $methods = array_filter(module_invoke_all('uc_shipping_method'), '_uc_quote_method_enabled');
- $method = $methods[$quote_option[0]];
- $quote_data = array();
-
- $predicate = ca_load_trigger_predicates('get_quote_from_' . $method['id']);
- $arguments = array(
- 'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
- '#data' => $arg1,
- ),
- 'method' => array(
- '#entity' => 'quote_method',
- '#title' => t('Quote method'),
- '#data' => $method,
- ),
- 'account' => array(
- '#entity' => 'user',
- '#title' => t('User'),
- '#data' => $user,
- ),
- );
- if (ca_evaluate_conditions($predicate, $arguments)) {
- $quote_data = uc_quote_action_get_quote($order, $method, $user);
- }
-
- //drupal_set_message('Chosen quote method:' . print_r($method, TRUE) . ' ');
- //drupal_set_message('Chosen quote data:' . print_r($quote_data, TRUE) . ' ');
- if (!isset($quote_data[$quote_option[1]])) {
- drupal_set_message(t('Invalid option selected. Recalculate shipping quotes to continue.'), 'error');
- break;
- }
- $label = $method['quote']['accessorials'][$quote_option[1]];
- $order->quote['rate'] = $quote_data[$quote_option[1]]['rate'];
- $result = db_query("SELECT line_item_id FROM {uc_order_line_items} WHERE order_id = :id AND type = :type", array(':id' => $arg1['order_id'], ':type' => 'shipping'));
- if ($lid = $result->fetchField()) {
- uc_order_update_line_item($lid,
- $label,
- $order->quote['rate']
- );
- }
- else {
- uc_order_line_item_add($order->order_id, 'shipping',
- $label,
- $order->quote['rate']
- );
- }
- }
- }
- break;
- }
-}
-
-/**
- * Validate handler added to uc_cart_checkout_form().
- *
- * Save the choice of shipping method in the customer's session.
- */
-function uc_quote_save_choice($form, &$form_state) {
- $quote_option = explode('---', $_POST['quote-option']);
- $_SESSION['quote'] = array('method' => $quote_option[0],
- 'accessorials' => $quote_option[1],
- 'rate' => $_POST['rate'][$_POST['quote-option']],
- 'quote_form' => $_POST['quote-form'],
- );
-}
-
-/**
- * Pre-render callback added to uc_cart_checkout_form().
- *
- * Render the shipping quotes without an asynchronous call to create them if a
- * choice had been cached in the session.
- */
-function uc_quote_cache_quotes($form) {
- if ($form['#id'] == 'uc-cart-checkout-form') {
- if (isset($_SESSION['quote']) && isset($_SESSION['quote']['rate'])) {
- $quote = $_SESSION['quote'];
- $form['panes']['quotes']['quote'] = array(
- '#markup' => '' . rawurldecode($_SESSION['quote']['quote_form']) . '
',
- '#weight' => 1,
- );
- $methods = module_invoke_all('uc_shipping_method');
- $method = $methods[$quote['method']];
-
- drupal_add_js('jQuery(document).ready(function() {
- jQuery("#quote").find("input:radio[value=' . $quote['method'] . '---' . $quote['accessorials'] . ']").eq(0).change().attr("checked", "checked");
- if (window.set_line_item) {
- set_line_item("shipping", "' . $method['quote']['accessorials'][$quote['accessorials']] . '", ' . $quote['rate'] . ', 1, 1, false);
- }
- if (window.getTax) {
- getTax();
- setTaxCallbacks();
- }
- else if (window.render_line_items) {
- render_line_items();
- }
- });', 'inline');
- }
- else {
- $form['panes']['quotes']['quote'] = array(
- '#markup' => '
',
- '#weight' => 1,
- );
- }
- }
- return $form;
+ return drupal_render($order['quotes']);
+ }
+}
+
+function uc_quote_order_pane_quotes_submit($form, &$form_state) {
+ $form_state['quote_requested'] = ($form_state['triggering_element']['#value'] == $form['quotes']['quote_button']['#value']);
+}
+
+function uc_quote_apply_quote_to_order($form, &$form_state) {
+ if (isset($form_state['values']['quotes']['quote_option'])) {
+ if ($order = $form_state['build_info']['args'][0]) {
+ $user = user_load($order->uid);
+
+ $quote_option = explode('---', $form_state['values']['quotes']['quote_option']);
+ $order->quote['method'] = $quote_option[0];
+ $order->quote['accessorials'] = $quote_option[1];
+ $methods = array_filter(module_invoke_all('uc_shipping_method'), '_uc_quote_method_enabled');
+ $method = $methods[$quote_option[0]];
+
+ $label = $method['quote']['accessorials'][$quote_option[1]];
+
+ $quote_option = $form_state['values']['quotes']['quote_option'];
+ $order->quote['rate'] = $form_state['values']['quotes'][$quote_option]['rate'];
+
+ $result = db_query("SELECT line_item_id FROM {uc_order_line_items} WHERE order_id = :id AND type = :type", array(':id' => $order->order_id, ':type' => 'shipping'));
+ if ($lid = $result->fetchField()) {
+ uc_order_update_line_item($lid,
+ $label,
+ $order->quote['rate']
+ );
+ }
+ else {
+ uc_order_line_item_add($order->order_id, 'shipping',
+ $label,
+ $order->quote['rate']
+ );
+ }
+
+ // Update line items.
+ $order->line_items = uc_order_load_line_items($order, TRUE);
+ // Update calculated line items.
+ $order->line_items = array_merge($order->line_items, uc_order_load_line_items($order, FALSE));
+ usort($order->line_items, 'uc_weight_sort');
+ }
+ }
+}
+
+function uc_quote_build_quote_form($order) {
+ $return = array();
+
+ module_load_include('inc', 'uc_quote', 'uc_quote.pages');
+ $quotes = uc_quote_assemble_quotes($order);
+
+ if (!empty($quotes)) {
+ foreach ($quotes as $method => $data) {
+ foreach ($data as $accessorial => $quote) {
+ $key = $method . '---' . $accessorial;
+
+ if (isset($quote['rate'])) {
+ $quote_options[$key] = t('!label: !price', array('!label' => $quote['option_label'], '!price' => $quote['format']));
+ $return[$key]['rate'] = array(
+ '#type' => 'hidden',
+ '#value' => $quote['rate'],
+ );
+ }
+
+ if (!empty($quote['error'])) {
+ $return[$key]['error'] = array(
+ '#markup' => '' . $quote['error'] . '
',
+ );
+ }
+
+ if (!empty($quote['notes'])) {
+ $return[$key]['notes'] = array(
+ '#markup' => '' . $quote['notes'] . '
',
+ );
+ }
+
+ if (!empty($quote['debug'])) {
+ $return[$key]['debug'] = array(
+ '#markup' => '' . $quote['debug'] . ' ',
+ );
+ }
+
+ if (!isset($quote['rate']) && count($return[$key])) {
+ $return[$key]['#prefix'] = $quote['label'] . ': ';
+ }
+ }
+ }
+ }
+
+ $num_quotes = count($quote_options);
+ $default = key($quote_options);
+ if ($num_quotes > 1) {
+ if (isset($order->quote['method']) && isset($order->quote['accessorials'])) {
+ $default = $order->quote['method'] . '---' . $order->quote['accessorials'];
+ }
+
+ $return['quote_option'] = array(
+ '#type' => 'radios',
+ '#options' => $quote_options,
+ '#default_value' => $default,
+ );
+ }
+ elseif ($num_quotes == 1) {
+ $return['quote_option'] = array(
+ '#type' => 'hidden',
+ '#value' => $default,
+ '#suffix' => $quote_options[$default],
+ );
+ }
+ else {
+ $return['error'] = array(
+ '#markup' => check_markup(variable_get('uc_quote_err_msg', t("There were problems getting a shipping quote. Please verify the delivery address and product information and try again.\nIf this does not resolve the issue, please call @phone to complete your order.", array('@phone' => variable_get('uc_store_phone', NULL)))), variable_get('uc_quote_msg_format', filter_default_format())),
+ );
+ }
+
+ $return['#theme'] = 'uc_quote_returned_rates';
+
+ return $return;
+}
+
+function uc_quote_cart_returned_rates($form, $form_state) {
+ $commands[] = ajax_command_replace('#quote', drupal_render($form['quote']));
+ $commands[] = ajax_command_prepend('#quote', theme('status_messages'));
+
+ return array('#type' => 'ajax', '#commands' => $commands);
+}
+
+/**
+ * AJAX callback for calculated shipping rates.
+ */
+function uc_quote_checkout_returned_rates($form, $form_state) {
+ $commands[] = ajax_command_replace('#quote', drupal_render($form['panes']['quotes']['quotes']));
+ $commands[] = ajax_command_prepend('#quote', theme('status_messages'));
+
+ // Show default shipping rate as a line item.
+ if (isset($form['panes']['payment']['line_items'])) {
+ $commands[] = ajax_command_replace('#line-items-div', drupal_render($form['panes']['payment']['line_items']));
+ $commands[] = ajax_command_prepend('#line-items-div', theme('status_messages'));
+ }
+
+ return array('#type' => 'ajax', '#commands' => $commands);
+}
+
+/**
+ * AJAX callback for calculated shipping rates.
+ */
+function uc_quote_order_returned_rates($form, $form_state) {
+ $commands[] = ajax_command_replace('#quote', drupal_render($form['quotes']['quotes']));
+ $commands[] = ajax_command_prepend('#quote', theme('status_messages'));
+
+ return array('#type' => 'ajax', '#commands' => $commands);
+}
+
+/**
+ * Display the returned shipping rates.
+ *
+ * @ingroup themeable
+ */
+function theme_uc_quote_returned_rates($variables) {
+ $form = $variables['form'];
+ $output = '';
+
+ $keys = element_children($form);
+
+ // Render notes and error messages after each radio button.
+ if (count($keys) > 1) {
+ foreach ($keys as $key) {
+ if ($key == 'quote_option') {
+ continue;
+ }
+
+ if (isset($form['quote_option'][$key])) {
+ $output .= drupal_render($form['quote_option'][$key]);
+ }
+ $output .= drupal_render($form[$key]);
+ }
+ }
+
+ $output .= drupal_render_children($form);
+
+ return '' . $output . '
';
}
/**
=== modified file 'shipping/uc_quote/uc_quote.pages.inc'
--- shipping/uc_quote/uc_quote.pages.inc 2010-03-23 20:16:16 +0000
+++ shipping/uc_quote/uc_quote.pages.inc 2010-06-03 15:57:46 +0000
@@ -6,15 +6,34 @@
* Menu callbacks for shipping quotes requested through AJAX.
*/
+function uc_quote_checkout_request_quotes($form, &$form_state) {
+ global $user;
+
+ $order = $form_state['storage']['order'];
+
+ // Build address info from form values.
+ $matches = array();
+ foreach ($form_state['values'] as $key => $value) {
+ if (preg_match('/^(delivery|billing)_/', $key, $matches)) {
+ // Set $order->delivery['first_name'], etc.
+ $order->{$matches[1]}[substr($key, strlen($matches[0]))] = $value;
+ }
+ }
+
+ // Consider the total to be from products only, because line items are
+ // mostly non-existent at this point.
+ // @todo: Get line item information from $form_state.
+ $order->order_total = uc_order_get_total($order, TRUE);
+ // Get all quote types neccessary to fulfill order.
+ $quote_data = _uc_quote_assemble_quotes($order);
+
+ $form_state['storage']['quotes'] = $quote_data;
+}
+
/**
* Callback to return the shipping quote(s) of the appropriate quoting method(s).
*/
-function uc_quote_request_quotes() {
-
- /* print '';
- print_r($_POST);
- print ' '; */
-
+function uc_quote_request_quotes($form, &$form_state) {
$products = array();
foreach (explode('|', urldecode($_POST['products'])) as $item) {
$props = explode('^', $item);
@@ -59,8 +78,6 @@
$fake_order->order_total = uc_order_get_total($fake_order, TRUE);
// Get all quote types neccessary to fulfill order.
$quote_data = _uc_quote_assemble_quotes($fake_order);
- //drupal_set_message('' . print_r($methods, TRUE) . ' ');
- //drupal_set_message('' . print_r($quote_data, TRUE) . ' ');
$return_quotes = array();
foreach ($quote_data as $method_id => $options) {
foreach ($options as $accsrl => $data) {
@@ -73,10 +90,10 @@
/**
* Pull the get_quote_from_* triggers and assemble their returned data.
*/
-function _uc_quote_assemble_quotes($order) {
+function uc_quote_assemble_quotes($order) {
global $user;
- $account = user_load($order->uid);
- if (!$account) {
+
+ if (!$order->uid || !($account = user_load($order->uid))) {
$account = $user;
}
@@ -115,7 +132,6 @@
),
);
- //drupal_set_message('' . print_r($products, TRUE) . ' ');
$quote_data = array();
$arguments = array(
'order' => array(
=== modified file 'shipping/uc_shipping/uc_shipping.admin.inc'
--- shipping/uc_shipping/uc_shipping.admin.inc 2010-04-07 21:11:20 +0000
+++ shipping/uc_shipping/uc_shipping.admin.inc 2010-06-03 15:57:46 +0000
@@ -290,7 +290,7 @@
$result = db_query("SELECT order_product_id, SUM(qty) AS quantity FROM {uc_packaged_products} AS pp LEFT JOIN {uc_packages} AS p ON pp.package_id = p.package_id WHERE p.order_id = :id GROUP BY order_product_id", array(':id' => $order->order_id));
foreach ($result as $packaged_product) {
- //Make already packaged products unavailable, except those in this package.
+ // Make already packaged products unavailable, except those in this package.
$products[$packaged_product->order_product_id]->qty = $products[$packaged_product->order_product_id]->qty - $packaged_product->quantity + $package->products[$packaged_product->order_product_id]->qty;
}
@@ -579,7 +579,6 @@
'#value' => t('Ship packages'),
);
}
- //drupal_set_message('' . print_r($form, TRUE) . ' ');
return $form;
}
@@ -610,7 +609,6 @@
'#rows' => $rows,
);
}
- //$output .= drupal_render($form[$shipping_type]['methods']);
}
$output .= drupal_render_children($form);
@@ -1005,9 +1003,6 @@
}
}
- //$output .= dpr($order, TRUE, 'order');
- //$output .= dpr($shipment, TRUE, 'shipment');
-
$output .= '