Moved fees html to checkout template. #418

awesomemotive · Feb 9, 2013 · 3537c41 · 3537c41
1 parent 83d508b
commit 3537c41
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 27 deletions.
diff --git a/includes/class-edd-fees.php b/includes/class-edd-fees.php
@@ -114,33 +114,6 @@ public function total() {
 	}
 
 
-	/**
-	 * Shows fees on checkout
-	 *
-	 * @access      public
-	 * @since       1.5
-	 *
-	 * @return      void
-	 */
-
-	public function show_fees() {
-
-		$fees = $this->get_fees();
-
-		if( ! $this->has_fees() )
-			return;
-
-		foreach( $fees as $fee ) {
-			echo '<tr class="edd_cart_fee">';
-				echo '<td class="edd_cart_fee_label"><span>' . esc_html( $fee['label'] ) . '</span></td>';
-				echo '<td class="edd_cart_fee_amount"><span>' . esc_html( edd_currency_filter( edd_format_amount( $fee['amount'] ) ) ) . '</span></td>';
-				echo '<td></td>';
-			echo '</tr>';
-		}
-
-	}
-
-
 }
 
 

diff --git a/templates/checkout_cart.php b/templates/checkout_cart.php
@@ -38,6 +38,16 @@
 					<?php do_action( 'edd_checkout_table_body_last', $item ); ?>
 				</tr>
 			<?php endforeach; ?>
+			<!-- Show any cart fees, both positive and negative fees -->
+			<?php if( edd_cart_has_fees() ) : ?>
+				<?php foreach( edd_get_cart_fees() as $fee ) : ?>
+					<tr class="edd_cart_fee">
+						<td class="edd_cart_fee_label"><span><?php esc_html_e( $fee['label'] ); ?></span></td>
+						<td class="edd_cart_fee_amount"><span><?php esc_html_e( edd_currency_filter( edd_format_amount( $fee['amount'] ) ) ); ?></span></td>
+						<td></td>
+					</tr>
+				<?php endforeach; ?>
+			<?php endif; ?>
 			<?php do_action( 'edd_cart_items_after' ); ?>
 		<?php else: ?>
 			<tr class="edd_cart_item">