Index: uc_edi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_edi/uc_edi.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 uc_edi.module
--- uc_edi.module	22 Aug 2008 17:40:56 -0000	1.1.2.2
+++ uc_edi.module	22 Aug 2008 18:31:44 -0000
@@ -698,9 +698,7 @@ function uc_edi_generate_order_product_e
 // Returns a list of replacement values for order export patterns.
 function uc_edi_order_values($order) {
   static $data;
-
   $order = (array) $order;
-
   foreach (array_keys($order) as $key) {
     if (!is_array($order[$key]) && !is_object($order[$key])) {
       $values['!'. $key] = $order[$key];
@@ -741,56 +739,38 @@ function uc_edi_order_values($order) {
     $values['!billing_zone_code'] = $data['zone_code'][$order['delivery_zone']];
   }
 
-  if ($order['delivery_country'] == 124 || $order['delivery_country'] == 840) {
-    $values['!delivery_country_name'] = ' ';
+
+  if (!isset($data['country_name'][$order['delivery_country']])) {
+    $values['!delivery_country_name'] = db_result(db_query("SELECT country_name FROM {uc_countries} WHERE country_id = %d", $order['delivery_country']));
+    $data['country_name'][$order['delivery_country']] = $values['!delivery_country_name'];
   }
   else {
-    if (!isset($data['country_name'][$order['delivery_country']])) {
-      $values['!delivery_country_name'] = db_result(db_query("SELECT country_name FROM {uc_countries} WHERE country_id = %d", $order['delivery_country']));
-      $data['country_name'][$order['delivery_country']] = $values['!delivery_country_name'];
-    }
-    else {
-      $values['!delivery_country_name'] = $data['country_name'][$order['delivery_country']];
-    }
+    $values['!delivery_country_name'] = $data['country_name'][$order['delivery_country']];
   }
-  if ($order['billing_country'] == 124 || $order['billing_country'] == 840) {
-    $values['!billing_country_name'] = ' ';
+
+  if (!isset($data['country_name'][$order['billing_country']])) {
+    $values['!billing_country_name'] = db_result(db_query("SELECT country_name FROM {uc_countries} WHERE country_id = %d", $order['billing_country']));
+    $data['country_name'][$order['billing_country']] = $values['!billing_country_name'];
   }
   else {
-    if (!isset($data['country_name'][$order['billing_country']])) {
-      $values['!billing_country_name'] = db_result(db_query("SELECT country_name FROM {uc_countries} WHERE country_id = %d", $order['billing_country']));
-      $data['country_name'][$order['billing_country']] = $values['!billing_country_name'];
-    }
-    else {
-      $values['!billing_country_name'] = $data['country_name'][$order['billing_country']];
-    }
+    $values['!billing_country_name'] = $data['country_name'][$order['billing_country']];
   }
 
-  if ($order['delivery_country'] == 124 || $order['delivery_country'] == 840) {
-    $values['!delivery_country_code'] = ' ';
+  if (!isset($data['country_code'][$order['delivery_country']])) {
+    $values['!delivery_country_code'] = db_result(db_query("SELECT country_iso_code_3 FROM {uc_countries} WHERE country_id = %d", $order['delivery_country']));
+    $data['country_code'][$order['delivery_country']] = $values['!delivery_country_code'];
   }
   else {
-    if (!isset($data['country_code'][$order['delivery_country']])) {
-      $values['!delivery_country_code'] = db_result(db_query("SELECT country_iso_code_3 FROM {uc_countries} WHERE country_id = %d", $order['delivery_country']));
-      $data['country_code'][$order['delivery_country']] = $values['!delivery_country_code'];
-    }
-    else {
-      $values['!delivery_country_code'] = $data['country_code'][$order['delivery_country']];
-    }
+    $values['!delivery_country_code'] = $data['country_code'][$order['delivery_country']];
   }
-  if ($order['billing_country'] == 124 || $order['billing_country'] == 840) {
-    $values['!billing_country_code'] = ' ';
+
+  if (!isset($data['country_code'][$order['billing_country']])) {
+    $values['!billing_country_code'] = db_result(db_query("SELECT country_iso_code_3 FROM {uc_countries} WHERE country_id = %d", $order['billing_country']));
+    $data['country_code'][$order['billing_country']] = $values['!billing_country_code'];
   }
   else {
-    if (!isset($data['country_code'][$order['billing_country']])) {
-      $values['!billing_country_code'] = db_result(db_query("SELECT country_iso_code_3 FROM {uc_countries} WHERE country_id = %d", $order['billing_country']));
-      $data['country_code'][$order['billing_country']] = $values['!billing_country_code'];
-    }
-    else {
-      $values['!billing_country_code'] = $data['country_code'][$order['billing_country']];
-    }
+    $values['!billing_country_code'] = $data['country_code'][$order['billing_country']];
   }
-
   $values['!spacer'] = ' ';
 
   $price = 0;