order details shipping address

readme.txt

@@ -143,7 +143,9 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 
 == Changelog ==
 
-= 1.5.1 - 02/03/2012 =
+= 1.5.1 =
+* Error suppression on set_time_out
+* Order-details removed shipping when disabled
 * Updated Turkish translation
 
 = 1.5 - 01/03/2012 =

templates/order/order-details.php

@@ -82,10 +82,14 @@ $order = new WC_Order( $order_id );
 ?>
 </dl>
 
+<?php if (get_option('woocommerce_ship_to_billing_address_only')=='no') : ?>
+
 <div class="col2-set addresses">
 
 	<div class="col-1">
 
+<?php endif; ?>
+	
 		<header class="title">
 			<h3><?php _e('Billing Address', 'woocommerce'); ?></h3>
 		</header>
@@ -95,6 +99,8 @@ $order = new WC_Order( $order_id );
 			?>
 		</p></address>
 
+<?php if (get_option('woocommerce_ship_to_billing_address_only')=='no') : ?>
+
 	</div><!-- /.col-1 -->
 	
 	<div class="col-2">
@@ -112,4 +118,6 @@ $order = new WC_Order( $order_id );
 
 </div><!-- /.col2-set -->
 
+<?php endif; ?>
+
 <div class="clear"></div>