Index: openacs-4/packages/value-based-shipping/www/admin/rates.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rates.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/rates.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/rates.adp	16 Aug 2002 00:06:56 -0000	1.2
@@ -55,8 +55,8 @@
 	<td>@shipping_rates.to_zip_code@</td>
 	<td align="right">@shipping_rates.shipping_rate@</td>
 	<td width="30"></td>
-	<td>[ <a href="rate-edit?shipping_rate_id=@shipping_rates.shipping_rate_id@">edit</a> ]</td>
-	<td>[ <a href="rate-delete?shipping_rate_id=@shipping_rates.shipping_rate_id@">delete</a> ]</td>
+	<td>[&nbsp;<a href="rate-edit?shipping_rate_id=@shipping_rates.shipping_rate_id@">edit</a>&nbsp;]</td>
+	<td>[&nbsp;<a href="rate-delete?shipping_rate_id=@shipping_rates.shipping_rate_id@">delete</a>&nbsp;]</td>
       </tr>
       </multiple>
       <tr>
Index: openacs-4/packages/value-based-shipping/www/admin/rates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rates.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/rates.tcl	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/rates.tcl	16 Aug 2002 00:06:56 -0000	1.2
@@ -51,4 +51,4 @@
 	r.from_zip_code, r.to_zip_code, round(r.shipping_rate, 2) as shipping_rate
     from vbs_rates r left join countries c on (r.country_iso = c.iso), vbs_service_levels l
     where r.service_level_id = l.service_level_id
-    order by l.service_level_description, c.default_name, r.from_value"
+    order by l.service_level_description, c.default_name, r.from_value, coalesce(r.to_value, 0), coalesce(r.from_zip_code, '0')"
Index: openacs-4/packages/value-based-shipping/www/admin/rates.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rates.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/rates.xql	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/rates.xql	16 Aug 2002 00:06:56 -0000	1.2
@@ -17,7 +17,7 @@
 	  r.from_zip_code, r.to_zip_code, round(r.shipping_rate, 2) as shipping_rate
       from vbs_rates r left join countries c on (r.country_iso = c.iso), vbs_service_levels l
       where r.service_level_id = l.service_level_id
-      order by l.service_level_description, c.default_name, r.from_value
+      order by l.service_level_description, c.default_name, r.from_value, coalesce(r.to_value, 0), coalesce(r.from_zip_code, '0')
     </querytext>
   </fullquery>