← All changes | templates/myaccount/subscriptions.php +22 -19 2.0.0 → 2.4.0 View file →

		@@ -7,8 +7,11 @@
7	7	*
8	8	* This template can be overridden by copying it to <your_theme>/subscription/myaccount/subscriptions.php
9	9	*/
10	10
	11	+use SpringDevs\Subscription\Illuminate\Helper;
	12	+use SpringDevs\Subscription\Illuminate\Subscription\Subscription;
	13	+
11	14	// Exit if accessed directly.
12	15	if ( ! defined( 'ABSPATH' ) ) {
13	16	exit;
14	17	}
		@@ -21,9 +24,9 @@
21	24	<th scope="col" class="order-status"><?php esc_html_e( 'Status', 'subscription' ); ?></th>
22	25	<th scope="col" class="order-product"><?php esc_html_e( 'Product', 'subscription' ); ?></th>
23	26	<th scope="col" class="subscrpt-next-date"><?php esc_html_e( 'Next Payment', 'subscription' ); ?></th>
24	27	<th scope="col" class="subscrpt-total"><?php esc_html_e( 'Total', 'subscription' ); ?></th>
25		- <th scope="col" class="subscrpt-action">Actions</th>
	28	+ <th scope="col" class="subscrpt-action"><?php esc_html_e( 'Actions', 'subscription' ); ?></th>
26	29	</tr>
27	30	</thead>
28	31	<tbody>
29	32	<?php
		@@ -31,9 +34,9 @@
31	34	while ( $postslist->have_posts() ) :
32	35	$postslist->the_post();
33	36
34	37	$subscription_id = get_the_ID();
35		- $subscription_data = SpringDevs\Subscription\Illuminate\Helper::get_subscription_data( $subscription_id );
	38	+ $subscription_data = Helper::get_subscription_data( $subscription_id );
36	39
37	40	if ( ! $subscription_data ) {
38	41	continue;
39	42	}
		@@ -38,9 +41,9 @@
38	41	continue;
39	42	}
40	43
41	44	$subscrpt_status = $subscription_data['status'] ?? '';
42		- $verbose_status = SpringDevs\Subscription\Illuminate\Helper::get_verbose_status( $subscrpt_status );
	45	+ $verbose_status = Helper::get_verbose_status( $subscrpt_status );
43	46
44	47	$order_id = $subscription_data['order']['order_id'] ?? 0;
45	48	$order_item_id = $subscription_data['order']['order_item_id'] ?? 0;
46	49
		@@ -58,9 +61,9 @@
58	61	$start_date = $subscription_data['start_date'] ?? '';
59	62	$start_date = ! empty( $start_date ) ? wp_date( 'F j, Y', strtotime( $start_date ) ) : '-';
60	63
61	64	$next_date = $subscription_data['next_date'] ?? '';
62		- $next_date = ! empty( $next_date ) ? wp_date( 'F j, Y', strtotime( $next_date ) ) : '-';
	65	+ $next_date = ! empty( $next_date ) && SpringDevs\Subscription\Illuminate\Helper::has_next_payment( $subscrpt_status ) ? wp_date( 'F j, Y', strtotime( $next_date ) ) : '-';
63	66
64	67	$trial = get_post_meta( get_the_ID(), '_subscrpt_trial', true );
65	68	$trial_mode = get_post_meta( get_the_ID(), '_subscrpt_trial_mode', true );
66	69	$trial_mode = empty( $trial_mode ) ? 'off' : $trial_mode;
		@@ -65,12 +68,12 @@
65	68	$trial_mode = get_post_meta( get_the_ID(), '_subscrpt_trial_mode', true );
66	69	$trial_mode = empty( $trial_mode ) ? 'off' : $trial_mode;
67	70
68	71	// Renewal total, already net of any discount that recurs.
69		- $display_totals = SpringDevs\Subscription\Illuminate\Helper::get_subscription_display_totals( $subscription_id, $order_item );
	72	+ $display_totals = Helper::get_subscription_display_totals( $subscription_id, $order_item );
70	73	$price = $display_totals['total'];
71	74
72		- $product_price_html = SpringDevs\Subscription\Illuminate\Helper::format_price_with_order_item( $price, $order_item->get_id() );
	75	+ $product_price_html = Helper::format_price_with_order_item( $price, $order_item->get_id() );
73	76
74	77	$is_grace_period = isset( $subscription_data['grace_period'] );
75	78	$grace_remaining = $subscription_data['grace_period']['remaining_days'] ?? 0;
76	79
		@@ -75,19 +78,19 @@
75	78	$grace_remaining = $subscription_data['grace_period']['remaining_days'] ?? 0;
76	79
77	80	$my_account_page_id = get_option( 'woocommerce_myaccount_page_id' );
78	81	$my_account_url = get_permalink( $my_account_page_id );
79		- $view_sub_endpoint = SpringDevs\Subscription\Illuminate\Subscription\Subscription::get_user_endpoint( 'view_subs' );
	82	+ $view_sub_endpoint = Subscription::get_user_endpoint( 'view_subs' );
80	83	$view_sub_url = wc_get_endpoint_url( $view_sub_endpoint, get_the_ID(), $my_account_url );
81	84	?>
82	85
83	86	<tr>
84		- <td data-title="Subscription"><?php the_ID(); ?></td>
	87	+ <td data-title="<?php echo esc_attr__( 'Subscription', 'subscription' ); ?>"><?php the_ID(); ?></td>
85	88
86		- <td data-title="Status">
	89	+ <td data-title="<?php echo esc_attr__( 'Status', 'subscription' ); ?>">
87	90	<?php if ( $is_grace_period && $grace_remaining > 0 ) : ?>
88	91	<span class="subscrpt-legacy-status subscrpt-legacy-status--active grace-active">
89		- Active
	92	+ <?php esc_html_e( 'Active', 'subscription' ); ?>
90	93
91	94	<?php
92	95	$grace_remaining_text = sprintf(
93	96	// translators: Number of days remaining in grace period.
		@@ -100,24 +103,24 @@
100	103	</span>
101	104	</span>
102	105	<?php else : ?>
103	106	<span class="subscrpt-legacy-status subscrpt-legacy-status--<?php echo esc_attr( strtolower( $subscrpt_status ) ); ?>">
104		- <?php echo esc_html( strlen( $verbose_status ) > 9 ? substr( $verbose_status, 0, 9 ) . '...' : $verbose_status ); ?>
	107	+ <?php echo esc_html( mb_strlen( $verbose_status ) > 9 ? mb_substr( $verbose_status, 0, 9 ) . '...' : $verbose_status ); ?>
105	108	</span>
106	109	<?php endif; ?>
107	110	</td>
108	111
109		- <td data-title="Product"><?php echo esc_html( $product_name ); ?></td>
	112	+ <td data-title="<?php echo esc_attr__( 'Product', 'subscription' ); ?>"><?php echo esc_html( $product_name ); ?></td>
110	113
111		- <?php if ( 'on' !== $trial_mode ) : ?>
112		- <td data-title="Next Payment"><?php echo esc_html( $next_date ); ?></td>
	114	+ <?php if ( 'on' !== $trial_mode || ! SpringDevs\Subscription\Illuminate\Helper::has_next_payment( $subscrpt_status ) ) : ?>
	115	+ <td data-title="<?php echo esc_attr__( 'Next Payment', 'subscription' ); ?>"><?php echo esc_html( $next_date ); ?></td>
113	116	<?php else : ?>
114		- <td data-title="Next Payment"><small>First Billing : </small><?php echo esc_html( $start_date ); ?></td>
	117	+ <td data-title="<?php echo esc_attr__( 'Next Payment', 'subscription' ); ?>"><small><?php esc_html_e( 'First Billing:', 'subscription' ); ?> </small><?php echo esc_html( $start_date ); ?></td>
115	118	<?php endif; ?>
116	119
117		- <td data-title="Total"><?php echo wp_kses_post( $product_price_html ); ?></td>
	120	+ <td data-title="<?php echo esc_attr__( 'Total', 'subscription' ); ?>"><?php echo wp_kses_post( $product_price_html ); ?></td>
118	121
119		- <td data-title="Actions">
	122	+ <td data-title="<?php echo esc_attr__( 'Actions', 'subscription' ); ?>">
120	123	<a href="<?php echo esc_url( $view_sub_url ); ?>" class="woocommerce-button <?php echo esc_attr( $wp_button_class ); ?> button view">
121	124	<?php echo esc_html_e( 'View', 'subscription' ); ?>
122	125	</a>
123	126	</td>
		@@ -142,12 +145,12 @@
142	145
143	146	<?php if ( 1 < $postslist->max_num_pages ) : ?>
144	147	<div class="woocommerce-pagination woocommerce-pagination--without-numbers woocommerce-Pagination">
145	148	<?php if ( 1 !== $current_page ) : ?>
146		- <a class="woocommerce-button woocommerce-button--previous woocommerce-Button woocommerce-Button--previous button<?php echo esc_attr( $wp_button_class ); ?>" href="<?php echo esc_url( wc_get_endpoint_url( 'subscriptions', $current_page - 1 ) ); ?>"><?php esc_html_e( 'Previous', 'subscription' ); ?></a>
	149	+ <a class="woocommerce-button woocommerce-button--previous woocommerce-Button woocommerce-Button--previous button<?php echo esc_attr( $wp_button_class ); ?>" href="<?php echo esc_url( wc_get_endpoint_url( Subscription::get_user_endpoint( 'subs_list' ), $current_page - 1 ) ); ?>"><?php esc_html_e( 'Previous', 'subscription' ); ?></a>
147	150	<?php endif; ?>
148	151
149	152	<?php if ( intval( $postslist->max_num_pages ) !== $current_page ) : ?>
150		- <a class="woocommerce-button woocommerce-button--next woocommerce-Button woocommerce-Button--next button<?php echo esc_attr( $wp_button_class ); ?>" href="<?php echo esc_url( wc_get_endpoint_url( 'subscriptions', $current_page + 1 ) ); ?>"><?php esc_html_e( 'Next', 'subscription' ); ?></a>
	153	+ <a class="woocommerce-button woocommerce-button--next woocommerce-Button woocommerce-Button--next button<?php echo esc_attr( $wp_button_class ); ?>" href="<?php echo esc_url( wc_get_endpoint_url( Subscription::get_user_endpoint( 'subs_list' ), $current_page + 1 ) ); ?>"><?php esc_html_e( 'Next', 'subscription' ); ?></a>
151	154	<?php endif; ?>
152	155	</div>
153	156	<?php endif; ?>