From d68baaaff7e464a780f23beea7bb95b8098fb16b Mon Sep 17 00:00:00 2001
From: Jason King <jason@typeplusdesign.com.au>
Date: Thu, 19 Oct 2017 23:04:03 +1030
Subject: [PATCH 1/5] Update for Woocommerce 3.2.1 Compatibility

---
 woocommerce/cart/mini-cart.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/woocommerce/cart/mini-cart.php b/woocommerce/cart/mini-cart.php
index 18a76a8..f7679de 100644
--- a/woocommerce/cart/mini-cart.php
+++ b/woocommerce/cart/mini-cart.php
@@ -15,7 +15,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.1.0
+ * @version 3.2.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -42,10 +42,11 @@ do_action( 'woocommerce_before_mini_cart' ); ?>
 					<li class="woocommerce-mini-cart-item <?php echo esc_attr( apply_filters( 'woocommerce_mini_cart_item_class', 'mini_cart_item', $cart_item, $cart_item_key ) ); ?>">
 						<?php
 						echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf(
-							'<a href="%s" class="remove" aria-label="%s" data-product_id="%s" data-product_sku="%s">&times;</a>',
+							'<a href="%s" class="remove remove_from_cart_button" aria-label="%s" data-product_id="%s" data-cart_item_key="%s" data-product_sku="%s">&times;</a>',
 							esc_url( WC()->cart->get_remove_url( $cart_item_key ) ),
-							esc_attr__( 'Remove this item', 'woocommerce' ),
+							__( 'Remove this item', 'woocommerce' ),
 							esc_attr( $product_id ),
+							esc_attr( $cart_item_key ),
 							esc_attr( $_product->get_sku() )
 						), $cart_item_key );
 						?>

From d9dafe925f2cfe53c0321d6c1188c9ddb5ad447c Mon Sep 17 00:00:00 2001
From: Jason King <jason@typeplusdesign.com.au>
Date: Thu, 19 Oct 2017 23:04:38 +1030
Subject: [PATCH 2/5] Update for Woocommerce 3.2.1 Compatibility

---
 woocommerce/global/quantity-input.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/woocommerce/global/quantity-input.php b/woocommerce/global/quantity-input.php
index 37b5bbd..bd50f96 100644
--- a/woocommerce/global/quantity-input.php
+++ b/woocommerce/global/quantity-input.php
@@ -13,13 +13,24 @@
  * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     3.1.0
+ * @version     3.2.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
+}
+
+if ( $max_value && $min_value === $max_value ) {
+	?>
+	<div class="quantity hidden">
+		<input type="hidden" id="<?php echo esc_attr( $input_id ); ?>" class="qty" name="<?php echo esc_attr( $input_name ); ?>" value="<?php echo esc_attr( $min_value ); ?>" />
+	</div>
+	<?php
+} else {
+	?>
+	<div class="quantity">
+		<label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>"><?php esc_html_e( 'Quantity', 'woocommerce' ); ?></label>
+		<input type="number" id="<?php echo esc_attr( $input_id ); ?>" class="input-text qty text" step="<?php echo esc_attr( $step ); ?>" min="<?php echo esc_attr( $min_value ); ?>" max="<?php echo esc_attr( 0 < $max_value ? $max_value : '' ); ?>" name="<?php echo esc_attr( $input_name ); ?>" value="<?php echo esc_attr( $input_value ); ?>" title="<?php echo esc_attr_x( 'Qty', 'Product quantity input tooltip', 'woocommerce' ) ?>" size="4" pattern="<?php echo esc_attr( $pattern ); ?>" inputmode="<?php echo esc_attr( $inputmode ); ?>" />
+	</div>
+	<?php
 }
-?>
-<div class="quantity">
-	<input type="number" step="<?php echo esc_attr( $step ); ?>" min="<?php echo esc_attr( $min_value ); ?>" max="<?php echo esc_attr( $max_value ); ?>" name="<?php echo esc_attr( $input_name ); ?>" value="<?php echo esc_attr( $input_value ); ?>" title="<?php echo esc_attr_x( 'Qty', 'Product quantity input tooltip', 'woocommerce' ) ?>" class="input-text qty text form-control" size="4" pattern="<?php echo esc_attr( $pattern ); ?>" inputmode="<?php echo esc_attr( $inputmode ); ?>" />
-</div>

From 64a81a46fb0f4c8ba844a00cbbd0c1ec1f7c1124 Mon Sep 17 00:00:00 2001
From: Jason King <jason@typeplusdesign.com.au>
Date: Thu, 19 Oct 2017 23:05:15 +1030
Subject: [PATCH 3/5] Update for Woocommerce 3.2.1 Compatibility

---
 woocommerce/myaccount/downloads.php | 67 +++--------------------------
 1 file changed, 5 insertions(+), 62 deletions(-)

diff --git a/woocommerce/myaccount/downloads.php b/woocommerce/myaccount/downloads.php
index e7856ed..ff6b095 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 3.1.0
+ * @version 3.2.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -31,67 +31,10 @@ do_action( 'woocommerce_before_account_downloads', $has_downloads ); ?>
 
 	<?php do_action( 'woocommerce_before_available_downloads' ); ?>
 
-	<table class="woocommerce-MyAccount-downloads shop_table shop_table_responsive">
-		<thead>
-			<tr>
-				<?php foreach ( wc_get_account_downloads_columns() as $column_id => $column_name ) : ?>
-					<th class="<?php echo esc_attr( $column_id ); ?>"><span class="nobr"><?php echo esc_html( $column_name ); ?></span></th>
-				<?php endforeach; ?>
-			</tr>
-		</thead>
-		<?php foreach ( $downloads as $download ) : ?>
-			<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 ) ) {
-								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', 'woocommerce' ); ?>
-										<?php endif; ?>
-										<?php break;
-									case 'download-actions' : ?>
-										<?php
-											$actions = array(
-												'download'  => array(
-													'url'  => $download['download_url'],
-													'name' => __( 'Download', 'woocommerce' ),
-												),
-											);
-											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;
-								}
-							}
-						?>
-					</td>
-				<?php endforeach; ?>
-			</tr>
-		<?php endforeach; ?>
-	</table>
+	<?php do_action( 'woocommerce_available_downloads', $downloads ); ?>
+
 	<?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' ) ) ); ?>">

From 3479a9a8c66982925e913ba8ecb1932851c8d4f4 Mon Sep 17 00:00:00 2001
From: Jason King <jason@typeplusdesign.com.au>
Date: Thu, 19 Oct 2017 23:05:43 +1030
Subject: [PATCH 4/5] Update for Woocommerce 3.2.1 Compatibility

---
 woocommerce/myaccount/form-login.php | 32 ++++++++++++----------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/woocommerce/myaccount/form-login.php b/woocommerce/myaccount/form-login.php
index 0753487..6014fec 100644
--- a/woocommerce/myaccount/form-login.php
+++ b/woocommerce/myaccount/form-login.php
@@ -13,7 +13,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.1.0
+ * @version 3.2.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -36,17 +36,17 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 		<h2><?php _e( 'Login', 'woocommerce' ); ?></h2>
 
-		<form method="post" class="login">
+		<form class="woocommerce-form woocommerce-form-login login" method="post">
 
 			<?php do_action( 'woocommerce_login_form_start' ); ?>
 
-			<p class="woocommerce-FormRow woocommerce-FormRow--wide form-row form-row-wide">
+			<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 				<label for="username"><?php _e( 'Username or email address', 'woocommerce' ); ?> <span class="required">*</span></label>
-				<input type="text" class="woocommerce-Input woocommerce-Input--text input-text form-control" name="username" id="username" value="<?php if ( ! empty( $_POST['username'] ) ) echo esc_attr( $_POST['username'] ); ?>" />
+				<input type="text" class="woocommerce-Input woocommerce-Input--text input-text" name="username" id="username" value="<?php echo ( ! empty( $_POST['username'] ) ) ? esc_attr( $_POST['username'] ) : ''; ?>" />
 			</p>
-			<p class="woocommerce-FormRow woocommerce-FormRow--wide form-row form-row-wide">
+			<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 				<label for="password"><?php _e( 'Password', 'woocommerce' ); ?> <span class="required">*</span></label>
-				<input class="woocommerce-Input woocommerce-Input--text input-text form-control" type="password" name="password" id="password" />
+				<input class="woocommerce-Input woocommerce-Input--text input-text" type="password" name="password" id="password" />
 			</p>
 
 			<?php do_action( 'woocommerce_login_form' ); ?>
@@ -54,8 +54,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<p class="form-row">
 				<?php wp_nonce_field( 'woocommerce-login', 'woocommerce-login-nonce' ); ?>
 				<input type="submit" class="btn btn-outline-primary" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>" />
-				<label for="rememberme" class="inline">
-					<input class="woocommerce-Input woocommerce-Input--checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <?php _e( 'Remember me', 'woocommerce' ); ?>
+				<label class="woocommerce-form__label woocommerce-form__label-for-checkbox inline">
+					<input class="woocommerce-form__input woocommerce-form__input-checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php _e( 'Remember me', 'woocommerce' ); ?></span>
 				</label>
 			</p>
 			<p class="woocommerce-LostPassword lost_password">
@@ -80,34 +80,30 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 			<?php if ( 'no' === get_option( 'woocommerce_registration_generate_username' ) ) : ?>
 
-				<p class="woocommerce-FormRow woocommerce-FormRow--wide form-row form-row-wide">
+				<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 					<label for="reg_username"><?php _e( 'Username', 'woocommerce' ); ?> <span class="required">*</span></label>
-					<input type="text" class="woocommerce-Input woocommerce-Input--text input-text" name="username" id="reg_username" value="<?php if ( ! empty( $_POST['username'] ) ) echo esc_attr( $_POST['username'] ); ?>" />
+					<input type="text" class="woocommerce-Input woocommerce-Input--text input-text" name="username" id="reg_username" value="<?php echo ( ! empty( $_POST['username'] ) ) ? esc_attr( $_POST['username'] ) : ''; ?>" />
 				</p>
 
 			<?php endif; ?>
 
-			<p class="woocommerce-FormRow woocommerce-FormRow--wide form-row form-row-wide">
+			<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 				<label for="reg_email"><?php _e( 'Email address', 'woocommerce' ); ?> <span class="required">*</span></label>
-				<input type="email" class="woocommerce-Input woocommerce-Input--text input-text" name="email" id="reg_email" value="<?php if ( ! empty( $_POST['email'] ) ) echo esc_attr( $_POST['email'] ); ?>" />
+				<input type="email" class="woocommerce-Input woocommerce-Input--text input-text" name="email" id="reg_email" value="<?php echo ( ! empty( $_POST['email'] ) ) ? esc_attr( $_POST['email'] ) : ''; ?>" />
 			</p>
 
 			<?php if ( 'no' === get_option( 'woocommerce_registration_generate_password' ) ) : ?>
 
-				<p class="woocommerce-FormRow woocommerce-FormRow--wide form-row form-row-wide">
+				<p class="woocommerce-form-row woocommerce-form-row--wide form-row form-row-wide">
 					<label for="reg_password"><?php _e( 'Password', 'woocommerce' ); ?> <span class="required">*</span></label>
 					<input type="password" class="woocommerce-Input woocommerce-Input--text input-text" name="password" id="reg_password" />
 				</p>
 
 			<?php endif; ?>
 
-			<!-- Spam Trap -->
-			<div style="<?php echo ( ( is_rtl() ) ? 'right' : 'left' ); ?>: -999em; position: absolute;"><label for="trap"><?php _e( 'Anti-spam', 'woocommerce' ); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" autocomplete="off" /></div>
-
 			<?php do_action( 'woocommerce_register_form' ); ?>
-			<?php do_action( 'register_form' ); ?>
 
-			<p class="woocomerce-FormRow form-row">
+			<p class="woocommerce-FormRow form-row">
 				<?php wp_nonce_field( 'woocommerce-register', 'woocommerce-register-nonce' ); ?>
 				<input type="submit" class="woocommerce-Button button" name="register" value="<?php esc_attr_e( 'Register', 'woocommerce' ); ?>" />
 			</p>

From 9cc649c282e487a64b8120dbf4408090128420fe Mon Sep 17 00:00:00 2001
From: Jason King <jason@typeplusdesign.com.au>
Date: Thu, 19 Oct 2017 23:06:11 +1030
Subject: [PATCH 5/5] Update for Woocommerce 3.2.1 Compatibility

---
 woocommerce/myaccount/orders.php | 39 ++++++++------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/woocommerce/myaccount/orders.php b/woocommerce/myaccount/orders.php
index a940a35..bacce62 100644
--- a/woocommerce/myaccount/orders.php
+++ b/woocommerce/myaccount/orders.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Orders
- * Updated for Understrap to maintain Woocommerce 3.0.3 compatability.
+ *
  * Shows orders on the account page.
  *
  * This template can be overridden by copying it to yourtheme/woocommerce/myaccount/orders.php.
@@ -15,7 +15,7 @@
  * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.1.0
+ * @version 3.2.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -26,7 +26,7 @@ do_action( 'woocommerce_before_account_orders', $has_orders ); ?>
 
 <?php if ( $has_orders ) : ?>
 
-	<table class="woocommerce-orders-table woocommerce-MyAccount-orders shop_table shop_table_responsive my_account_orders account-orders-table table-hover table-striped">
+	<table class="woocommerce-orders-table woocommerce-MyAccount-orders shop_table shop_table_responsive my_account_orders account-orders-table">
 		<thead>
 			<tr>
 				<?php foreach ( wc_get_account_orders_columns() as $column_id => $column_name ) : ?>
@@ -65,34 +65,13 @@ do_action( 'woocommerce_before_account_orders', $has_orders ); ?>
 
 							<?php elseif ( 'order-actions' === $column_id ) : ?>
 								<?php
-									$actions = array(
-										'pay'    => array(
-											'url'  => $order->get_checkout_payment_url(),
-											'name' => __( 'Pay', 'woocommerce' )
-										),
-										'view'   => array(
-											'url'  => $order->get_view_order_url(),
-											'name' => __( 'View', 'woocommerce' )
-										),
-										'cancel' => array(
-											'url'  => $order->get_cancel_order_url( wc_get_page_permalink( 'myaccount' ) ),
-											'name' => __( 'Cancel', 'woocommerce' )
-										)
-									);
-
-									if ( ! $order->needs_payment() ) {
-										unset( $actions['pay'] );
-									}
-
-									if ( ! in_array( $order->get_status(), apply_filters( 'woocommerce_valid_order_statuses_for_cancel', array( 'pending', 'failed' ), $order ) ) ) {
-										unset( $actions['cancel'] );
-									}
-
-									if ( $actions = apply_filters( 'woocommerce_my_account_my_orders_actions', $actions, $order ) ) {
-										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>';
-										}
+								$actions = wc_get_account_orders_actions( $order );
+								
+								if ( ! empty( $actions ) ) {
+									foreach ( $actions as $key => $action ) {
+										echo '<a href="' . esc_url( $action['url'] ) . '" class="woocommerce-button button ' . sanitize_html_class( $key ) . '">' . esc_html( $action['name'] ) . '</a>';
 									}
+								}
 								?>
 							<?php endif; ?>
 						</td>