← All changes | includes/Frontend/Order.php +4 -12 1.9.6 → 2.0.0 View file →

		@@ -50,19 +50,11 @@
50	50
51	51	$next_date_string = $subscription_data['next_date'] ?? '';
52	52	$next_date = ! empty( $next_date_string ) ? wp_date( 'F d, Y', strtotime( $next_date_string ) ) : '-';
53	53
54		- $cost = $subscription_data['price'] ?? '0.00';
55		- $price_excl_tax = (float) $order_item->get_total();
56		- $tax_amount = (float) $order_item->get_total_tax();
	54	+ // Strikes the original amount when a discount carries into renewals.
	55	+ $recurring_amount_string = Helper::get_subscription_recurring_price_html( $subscription_id, $order_item );
57	56
58		- if ( $tax_amount > 0 ) {
59		- $cost = $price_excl_tax + $tax_amount;
60		- $cost = number_format( (float) $cost, 2, '.', '' );
61		- }
62		-
63		- $recurring_amount_string = Helper::format_price_with_order_item( $cost, $order_item_id );
64		-
65	57	$is_grace_period = isset( $subscription_data['grace_period'] );
66	58	$grace_remaining = $subscription_data['grace_period']['remaining_days'] ?? 0;
67	59
68	60	$trial = isset( $subscription_data['trial'] );
		@@ -85,9 +77,9 @@
85	77	<?php esc_html_e( 'Status', 'subscription' ); ?>:
86	78	</th>
87	79	<td>
88	80	<?php if ( $is_grace_period && $grace_remaining > 0 ) : ?>
89		- <span class="subscrpt-active grace-active">
	81	+ <span class="subscrpt-legacy-status subscrpt-legacy-status--active grace-active">
90	82	Active
91	83
92	84	<?php
93	85	$grace_remaining_text = sprintf(
		@@ -100,9 +92,9 @@
100	92	<span class="dashicons dashicons-warning"></span>
101	93	</span>
102	94	</span>
103	95	<?php else : ?>
104		- <span class="subscrpt-<?php echo esc_attr( strtolower( $subscrpt_status ) ); ?>">
	96	+ <span class="subscrpt-legacy-status subscrpt-legacy-status--<?php echo esc_attr( strtolower( $subscrpt_status ) ); ?>">
105	97	<?php echo esc_html( $verbose_status ); ?>
106	98	</span>
107	99	<?php endif; ?>
108	100	</td>