Index: modules/ecommerce/contrib/shipcalc/partners/ups.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/contrib/shipcalc/partners/ups.inc,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 ups.inc
--- modules/ecommerce/contrib/shipcalc/partners/ups.inc	3 Sep 2006 18:08:01 -0000	1.1.2.3
+++ modules/ecommerce/contrib/shipcalc/partners/ups.inc	3 Sep 2006 21:15:39 -0000
@@ -132,6 +132,22 @@
     '#type' => 'submit',
     '#value' => t('Test configuration')
   );
+
+  $form['ups']['ups_pickuptype'] = array(
+    '#type' => 'select',
+    '#title' => t('UPS Pickup Type'),
+    '#description' => t('Select your desired pickup type.'),
+    '#default_value' => variable_get('shipcalc_ups_pickuptype', '01'),
+    '#options' => array(
+      '01' => t('Daily Pickup'),
+      '03' => t('Customer Counter'),
+      '06' => t('One Time Pickup'),
+      '07' => t('On Call Air'),
+      '11' => t('Suggested Retail Rates'),
+      '19' => t('Letter Center'),
+      '20' => t('Air Service Center'),
+    ),
+  );
 }
 
 /**
@@ -307,18 +323,7 @@
   $xml .= "    <RequestOption>shop</RequestOption>\n";
   $xml .= "  </Request>\n";
   $xml .= "  <PickupType>\n";
-  // TODO: Make Pickup Type Code configurable.
-/*
-  Default value is 01. Valid values are:
-    01 - Daily Pickup
-    03 - Customer Counter
-    06 - One Time Pickup
-    07 - On Call Air
-    11 - Suggested Retail Rates
-    19 - Letter Center
-    20 - Air Service Center
-*/
-  $xml .= "    <Code>01</Code>\n";
+  $xml .= "    <Code>". variable_get('shipcalc_ups_pickuptype', '01') ."</Code>\n";
   $xml .= "  </PickupType>\n";
   // TODO: Optionally support CustomerClassification/Code (for now use defaults)
   $xml .= "  <Shipment>\n";