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

		@@ -50,20 +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		- $quantity = (int) $order_item->get_quantity();
55		- $cost = (float) ( $subscription_data['price'] ?? 0 ) * max( 1, $quantity );
56		- $price_excl_tax = (float) $order_item->get_total();
57		- $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 );
58	56
59		- if ( $tax_amount > 0 ) {
60		- $cost = $price_excl_tax + $tax_amount;
61		- $cost = number_format( (float) $cost, 2, '.', '' );
62		- }
63		-
64		- $recurring_amount_string = Helper::format_price_with_order_item( $cost, $order_item_id );
65		-
66	57	$is_grace_period = isset( $subscription_data['grace_period'] );
67	58	$grace_remaining = $subscription_data['grace_period']['remaining_days'] ?? 0;
68	59
69	60	$trial = isset( $subscription_data['trial'] );
		@@ -86,9 +77,9 @@
86	77	<?php esc_html_e( 'Status', 'subscription' ); ?>:
87	78	</th>
88	79	<td>
89	80	<?php if ( $is_grace_period && $grace_remaining > 0 ) : ?>
90		- <span class="subscrpt-active grace-active">
	81	+ <span class="subscrpt-legacy-status subscrpt-legacy-status--active grace-active">
91	82	Active
92	83
93	84	<?php
94	85	$grace_remaining_text = sprintf(
		@@ -101,9 +92,9 @@
101	92	<span class="dashicons dashicons-warning"></span>
102	93	</span>
103	94	</span>
104	95	<?php else : ?>
105		- <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 ) ); ?>">
106	97	<?php echo esc_html( $verbose_status ); ?>
107	98	</span>
108	99	<?php endif; ?>
109	100	</td>