Merge pull request #184 from TycheSoftwares/issues-121-155

issues-155-121

Author: Shasvat7

woocommerce-delivery-notes/includes/wcdn-template-functions.php

@@ -353,23 +353,6 @@ function wcdn_additional_product_fields( $fields, $product, $order ) {
 	return array_merge( $fields, $new_fields );
 }
 
-/**
- * Check if a shipping address is enabled
- *
- * @param object $order Order object.
- */
-function wcdn_has_shipping_address( $order ) {
-	// Works only with WooCommerce 2.2 and higher.
-	if ( version_compare( WC_VERSION, '2.2.0', '>=' ) ) {
-		if ( ! wc_ship_to_billing_address_only() && $order->needs_shipping_address() && 'no' !== get_option( 'woocommerce_calc_shipping' ) ) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	return true;
-}
-
 /**
  * Check if an order contains a refund
  *

woocommerce-delivery-notes/templates/print-order/print-content.php

@@ -30,11 +30,7 @@
 		<?php do_action( 'wcdn_after_branding', $order ); ?>
 	</div><!-- .order-branding -->
 
-	<div class="order-addresses 
-	<?php
-	if ( ! wcdn_has_shipping_address( $order ) ) :
-		?>
-		no-shipping-address<?php endif; ?>">
+	<div class="order-addresses">
 		<div class="billing-address">
 			<h3><?php esc_attr_e( 'Billing Address', 'woocommerce-delivery-notes' ); ?></h3>
 			<address>

woocommerce-delivery-notes/templates/print-order/style.css

@@ -169,16 +169,6 @@ h2 {
 	float: left;
 }
 
-.order-addresses.no-shipping-address .shipping-address {
-	display: none;
-}
-
-/*
-.order-addresses.no-shipping-address .billing-address {
-	margin-left: 50%;
-}
-*/
-
 /* Switch the addresses for invoices */
 
 /* Order Info */