From 129a5c2488dc3631ca44c730392aa6778333dbf8 Mon Sep 17 00:00:00 2001
From: Jason King <jason@typeplusdesign.com.au>
Date: Fri, 14 Apr 2017 20:21:19 +0930
Subject: [PATCH] Woocommerce 3.0.0 Support

---
 woocommerce/myaccount/downloads.php | 88 ++++++++++++++---------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/woocommerce/myaccount/downloads.php b/woocommerce/myaccount/downloads.php
index 6bfe3cf..2384631 100644
--- a/woocommerce/myaccount/downloads.php
+++ b/woocommerce/myaccount/downloads.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Downloads
- *
+ * Updated for Understrap to maintain Woocommerce 3.0.3 compatability.
  * Shows downloads on the account page.
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/downloads.php.
@@ -15,7 +15,7 @@
  * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.6.0
+ * @version 3.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -43,55 +43,55 @@ do_action( 'woocommerce_before_account_downloads', $has_downloads ); ?>
 			<tr>
 				<?php foreach ( wc_get_account_downloads_columns() as $column_id => $column_name ) : ?>
 					<td class="<?php echo esc_attr( $column_id ); ?>" data-title="<?php echo esc_attr( $column_name ); ?>">
-						<?php if ( has_action( 'woocommerce_account_downloads_column_' . $column_id ) ) : ?>
-							<?php do_action( 'woocommerce_account_downloads_column_' . $column_id, $download ); ?>
-
-						<?php elseif ( 'download-file' === $column_id ) : ?>
-							<a href="<?php echo esc_url( get_permalink( $download['product_id'] ) ); ?>">
-								<?php echo esc_html( $download['download_name'] ); ?>
-							</a>
-
-						<?php elseif ( 'download-remaining' === $column_id ) : ?>
-							<?php
-								if ( is_numeric( $download['downloads_remaining'] ) ) {
-									echo esc_html( $download['downloads_remaining'] );
-								} else {
-									_e( '&infin;', 'understrap' );
+						<?php
+							if ( has_action( 'woocommerce_account_downloads_column_' . $column_id ) ) {
+								do_action( 'woocommerce_account_downloads_column_' . $column_id, $download );
+							} else {
+								switch ( $column_id ) {
+									case 'download-product' : ?>
+										<a href="<?php echo esc_url( get_permalink( $download['product_id'] ) ); ?>">
+											<?php echo esc_html( $download['product_name'] ); ?>
+										</a>
+										<?php break;
+									case 'download-file' : ?>
+										<a href="<?php echo esc_url( $download['download_url'] ); ?>" class="woocommerce-MyAccount-downloads-file">
+											<?php echo esc_html( $download['file']['name'] ); ?>
+										</a>
+										<?php break;
+									case 'download-remaining' :
+										echo is_numeric( $download['downloads_remaining'] ) ? esc_html( $download['downloads_remaining'] ) : __( '&infin;', 'woocommerce' );
+										break;
+									case 'download-expires' : ?>
+										<?php if ( ! empty( $download['access_expires'] ) ) : ?>
+											<time datetime="<?php echo date( 'Y-m-d', strtotime( $download['access_expires'] ) ); ?>" title="<?php echo esc_attr( strtotime( $download['access_expires'] ) ); ?>"><?php echo date_i18n( get_option( 'date_format' ), strtotime( $download['access_expires'] ) ); ?></time>
+										<?php else : ?>
+											<?php _e( 'Never', 'understrap' ); ?>
+										<?php endif; ?>
+										<?php break;
+									case 'download-actions' : ?>
+										<?php
+											$actions = array(
+												'download'  => array(
+													'url'  => $download['download_url'],
+													'name' => __( 'Download', 'understrap' ),
+												),
+											);
+											if ( $actions = apply_filters( 'woocommerce_account_download_actions', $actions, $download ) ) {
+												foreach ( $actions as $key => $action ) {
+													echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-outline-primary' . sanitize_html_class( $key ) . '">' . esc_html( $action['name'] ) . '</a>';
+												}
+											}
+										?>
+										<?php break;
 								}
-							?>
-
-						<?php elseif ( 'download-expires' === $column_id ) : ?>
-							<?php if ( ! empty( $download['access_expires'] ) ) : ?>
-								<time datetime="<?php echo date( 'Y-m-d', strtotime( $download['access_expires'] ) ); ?>" title="<?php echo esc_attr( strtotime( $download['access_expires'] ) ); ?>"><?php echo date_i18n( get_option( 'date_format' ), strtotime( $download['access_expires'] ) ); ?></time>
-							<?php else : ?>
-								<?php _e( 'Never', 'understrap' ); ?>
-							<?php endif; ?>
-
-						<?php elseif ( 'download-actions' === $column_id ) : ?>
-							<?php
-								$actions = array(
-									'download'  => array(
-										'url'  => $download['download_url'],
-										'name' => __( 'Download', 'understrap' )
-									)
-								);
-
-								if ( $actions = apply_filters( 'woocommerce_account_download_actions', $actions, $download ) ) {
-									foreach ( $actions as $key => $action ) {
-										echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-outline-primary ' . sanitize_html_class( $key ) . '">' . esc_html( $action['name'] ) . '</a>';
-									}
-								}
-							?>
-
-						<?php endif; ?>
+							}
+						?>
 					</td>
 				<?php endforeach; ?>
 			</tr>
 		<?php endforeach; ?>
 	</table>
-
 	<?php do_action( 'woocommerce_after_available_downloads' ); ?>
-
 <?php else : ?>
 	<div class="woocommerce-Message woocommerce-Message--info woocommerce-info">
 		<a class="btn btn-outline-primary" href="<?php echo esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ); ?>">