--- payment/uc_payment/uc_payment.js.old	2009-06-26 09:58:39.000000000 +0200
+++ payment/uc_payment/uc_payment.js	2009-05-19 15:16:36.000000000 +0200
@@ -35,7 +35,7 @@ if (Drupal.jsEnabled) {
       // disable the submission buttons and get payment details
       if (Drupal.settings.ucOrderInitiate) {
         add_order_save_hold();
-        get_payment_details('admin/store/orders/' + $('#edit-order-id').val() + '/payment_details/' + $('#edit-payment-method').val());
+        get_payment_details(Drupal.settings.basePath + '?q=' + 'admin/store/orders/' + $('#edit-order-id').val() + '/payment_details/' + $('#edit-payment-method').val());
       }
     }
   )
@@ -128,7 +128,7 @@ function remove_line_item(key) {
  */
 function init_payment_details(payment_method) {
   if (payment_update == 0) {
-    get_payment_details('cart/checkout/payment_details/' + payment_method);
+    get_payment_details(Drupal.settings.basePath + '?q=' + 'cart/checkout/payment_details/' + payment_method);
   }
 }
 
@@ -153,7 +153,7 @@ function get_payment_details(path) {
     data = {};
   }
   // Make the post to get the details for the chosen payment method.
-  $.post(Drupal.settings.basePath + '?q=' + path, data,
+  $.post(path, data,
     function(details) {
       if (this_update.getTime() == payment_update) {
         // If the response was empty, throw up the default message.
--- payment/uc_payment/uc_payment_order_pane.inc.old	2009-06-26 09:58:43.000000000 +0200
+++ payment/uc_payment/uc_payment_order_pane.inc	2009-05-19 15:17:00.000000000 +0200
@@ -76,7 +76,7 @@ function uc_order_pane_payment($op, $arg
         '#title' => t('Payment method'),
         '#default_value' => $arg1->payment_method,
         '#options' => (is_array($options)) ? $options : array(t('None available')),
-        '#attributes' => array('onchange' => "add_order_save_hold(); get_payment_details('admin/store/orders/". $arg1->order_id ."/payment_details/' + this.value);"),
+        '#attributes' => array('onchange' => "add_order_save_hold(); get_payment_details('" . url('admin/store/orders/'. $arg1->order_id) . "/payment_details/' + this.value);"),
         '#disabled' => (is_array($options)) ? FALSE : TRUE,
       );
       return $form;
--- payment/uc_payment/uc_payment_checkout_pane.inc.old	2009-06-26 10:02:08.000000000 +0200
+++ payment/uc_payment/uc_payment_checkout_pane.inc	2009-05-19 15:13:10.000000000 +0200
@@ -62,7 +62,7 @@ function uc_checkout_pane_payment($op, &
         '#default_value' => $default,
         '#disabled' => count($options) == 1 ? TRUE : FALSE,
         '#required' => TRUE,
-        '#attributes' => array('onclick' => "get_payment_details('cart/checkout/payment_details/' + this.value);"),
+        '#attributes' => array('onclick' => "get_payment_details('" . url('cart/checkout/payment_details/') . "' + this.value);"),
         '#theme' => 'uc_payment_method_select',
       );
       $contents['details'] = array(