| @@ -108,8 +108,10 @@ | ||
| 108 | 108 | if ( 'null' == $trial || 'off' === $trial_mode ) { |
| 109 | 109 | esc_html_e( 'Start date', 'subscription' ); |
| 110 | 110 | } elseif ( 'extended' === $trial_mode ) { |
| 111 | 111 | esc_html_e( 'Trial End & Subscription Start', 'subscription' ); |
| 112 | + } elseif ( ! Helper::has_next_payment( $status ) ) { | |
| 113 | + esc_html_e( 'Trial End', 'subscription' ); | |
| 112 | 114 | } else { |
| 113 | 115 | esc_html_e( 'Trial End & First Billing', 'subscription' ); |
| 114 | 116 | } |
| 115 | 117 | ?> |
| @@ -115,9 +117,9 @@ | ||
| 115 | 117 | ?> |
| 116 | 118 | </td> |
| 117 | 119 | <td><?php echo esc_html( $start_date ); ?></td> |
| 118 | 120 | </tr> |
| 119 | - <?php if ( ( null == $trial || in_array( $trial_mode, array( 'off', 'extended' ), true ) ) && get_post_meta( $id, '_subscrpt_next_date', true ) ) : ?> | |
| 121 | + <?php if ( ( null == $trial || in_array( $trial_mode, array( 'off', 'extended' ), true ) ) && get_post_meta( $id, '_subscrpt_next_date', true ) && Helper::has_next_payment( $status ) ) : ?> | |
| 120 | 122 | <tr> |
| 121 | 123 | <td> |
| 122 | 124 | <?php |
| 123 | 125 | esc_html_e( 'Next payment date', 'subscription' ); |