- get_gateway() ) ) {
- if ( ! empty( $pmpro_gateways[ $item->get_gateway() ] ) ) {
- echo $pmpro_gateways[ $item->get_gateway() ];
- } else {
- echo esc_html( ucwords( $item->get_gateway() ) );
- }
- if ( $item->get_gateway_environment() == 'sandbox' ) {
- echo ' (test)';
- }
- }
- ?>
-
sprintf(
- // translators: %s is the Subscription ID.
- __( 'ID: %s', 'paid-memberships-pro' ),
- esc_attr( $item->get_id() )
- ),
'view' => sprintf(
'
%3$s',
esc_attr__( 'View Details', 'paid-memberships-pro' ),
@@ -555,16 +538,36 @@ public function column_level( $item ) {
}
/**
- * Renders the columns subscription billing information
+ * Renders the columns subscription fee information
*
* @param object $item
*
* @return string
*/
- public function column_billing( $item ) {
+ public function column_fee( $item ) {
echo esc_html( $item->get_cost_text() );
}
+ /**
+ * Renders the columns gateway information
+ *
+ * @param object $item
+ *
+ * @return string
+ */
+ public function column_gateway( $item ) {
+ if ( ! empty( $item->get_gateway() ) ) {
+ if ( ! empty( $pmpro_gateways[ $item->get_gateway() ] ) ) {
+ echo $pmpro_gateways[ $item->get_gateway() ];
+ } else {
+ echo esc_html( ucwords( $item->get_gateway() ) );
+ }
+ if ( $item->get_gateway_environment() == 'sandbox' ) {
+ echo ' (test)';
+ }
+ }
+ }
+
/**
* Renders the columns subscription status
*
@@ -599,7 +602,12 @@ public function column_status( $item ) {
* @return string
*/
public function column_startdate( $item ) {
- echo esc_html( $item->get_startdate( get_option( 'date_format' ) ) );
+ echo esc_html( sprintf(
+ // translators: %1$s is the date and %2$s is the time.
+ __( '%1$s at %2$s', 'paid-memberships-pro' ),
+ esc_html( $item->get_startdate( get_option( 'date_format' ) ) ),
+ esc_html( $item->get_startdate( get_option( 'time_format' ) ) )
+ ) );
}
/**
@@ -610,9 +618,17 @@ public function column_startdate( $item ) {
* @return string
*/
public function column_next_payment_date( $item ) {
- $next_payment_date = $item->get_next_payment_date( get_option( 'date_format' ) );
- if ( ! empty( $next_payment_date ) ) {
- echo esc_html( $next_payment_date );
+ $date_to_show = $item->get_next_payment_date( get_option( 'date_format' ) );
+ $time_to_show = $item->get_next_payment_date( get_option( 'time_format' ) );
+ if ( ! empty( $date_to_show ) ) {
+ echo esc_html(
+ sprintf(
+ // translators: %1$s is the date and %2$s is the time.
+ __( '%1$s at %2$s', 'paid-memberships-pro' ),
+ esc_html( $date_to_show ),
+ esc_html( $time_to_show )
+ )
+ );
} else {
esc_html_e( '—', 'paid-memberships-pro' );
}
@@ -626,9 +642,17 @@ public function column_next_payment_date( $item ) {
* @return string
*/
public function column_enddate( $item ) {
- $enddate = $item->get_enddate( get_option( 'date_format' ) );
- if ( ! empty( $enddate ) ) {
- echo esc_html( $enddate );
+ $date_to_show = $item->get_enddate( get_option( 'date_format' ) );
+ $time_to_show = $item->get_enddate( get_option( 'time_format' ) );
+ if ( ! empty( $date_to_show ) ) {
+ echo esc_html(
+ sprintf(
+ // translators: %1$s is the date and %2$s is the time.
+ __( '%1$s at %2$s', 'paid-memberships-pro' ),
+ esc_html( $date_to_show ),
+ esc_html( $time_to_show )
+ )
+ );
} else {
esc_html_e( '—', 'paid-memberships-pro' );
}
diff --git a/css/admin.css b/css/admin.css
index bbcac3587..a79bf3f43 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -504,6 +504,10 @@ body[class*="memberships_page_pmpro-"] {
text-wrap: nowrap;
}
+td > .pmpro_tag {
+ text-wrap: wrap;
+}
+
.pmpro_tag-has_icon:before {
font: normal 12px/1 dashicons;
margin-right: 3px;