| @@ -58,9 +58,9 @@ | ||
| 58 | 58 | $start_date = $subscription_data['start_date'] ?? ''; |
| 59 | 59 | $start_date = ! empty( $start_date ) ? wp_date( 'F j, Y', strtotime( $start_date ) ) : '-'; |
| 60 | 60 | |
| 61 | 61 | $next_date = $subscription_data['next_date'] ?? ''; |
| 62 | - $next_date = ! empty( $next_date ) && SpringDevs\Subscription\Illuminate\Helper::has_next_payment( $subscrpt_status ) ? wp_date( 'F j, Y', strtotime( $next_date ) ) : '-'; | |
| 62 | + $next_date = ! empty( $next_date ) ? wp_date( 'F j, Y', strtotime( $next_date ) ) : '-'; | |
| 63 | 63 | |
| 64 | 64 | $trial = get_post_meta( get_the_ID(), '_subscrpt_trial', true ); |
| 65 | 65 | $trial_mode = get_post_meta( get_the_ID(), '_subscrpt_trial_mode', true ); |
| 66 | 66 | $trial_mode = empty( $trial_mode ) ? 'off' : $trial_mode; |
| @@ -107,9 +107,9 @@ | ||
| 107 | 107 | </td> |
| 108 | 108 | |
| 109 | 109 | <td data-title="Product"><?php echo esc_html( $product_name ); ?></td> |
| 110 | 110 | |
| 111 | - <?php if ( 'on' !== $trial_mode || ! SpringDevs\Subscription\Illuminate\Helper::has_next_payment( $subscrpt_status ) ) : ?> | |
| 111 | + <?php if ( 'on' !== $trial_mode ) : ?> | |
| 112 | 112 | <td data-title="Next Payment"><?php echo esc_html( $next_date ); ?></td> |
| 113 | 113 | <?php else : ?> |
| 114 | 114 | <td data-title="Next Payment"><small>First Billing : </small><?php echo esc_html( $start_date ); ?></td> |
| 115 | 115 | <?php endif; ?> |