| @@ -8,11 +8,9 @@ | ||
| 8 | 8 | |
| 9 | 9 | $renewalAmount = $subscription->recurring_total ?? 0; |
| 10 | 10 | $billingInterval = $subscription->billing_interval ?? ''; |
| 11 | 11 | $reactivateUrl = $subscription->getReactivateUrl(); |
| 12 | -$accessUntilLabel = !empty($subscription->next_billing_date) | |
| 13 | - ? \FluentCart\App\Services\DateTime\DateTime::gmtToTimezone($subscription->next_billing_date)->format('M d, Y') | |
| 14 | - : ''; | |
| 12 | +$accessUntilLabel = \FluentCart\App\Services\DateTime\DateFormatter::format($subscription->next_billing_date, false, $order); | |
| 15 | 13 | ?> |
| 16 | 14 | |
| 17 | 15 | <div class="space_bottom_30"> |
| 18 | 16 | <p> |
| @@ -29,9 +27,9 @@ | ||
| 29 | 27 | <?php |
| 30 | 28 | printf( |
| 31 | 29 | /* translators: %s is the subscription item name */ |
| 32 | 30 | esc_html__( 'Your subscription for %s has been canceled.', 'fluent-cart' ), |
| 33 | - '<b>' . esc_html( $subscription->item_name ) . '</b>' | |
| 31 | + '<b>' . esc_html( $subscription->display_item_name ) . '</b>' | |
| 34 | 32 | ); |
| 35 | 33 | ?> |
| 36 | 34 | </p> |
| 37 | 35 | |
| @@ -38,9 +36,9 @@ | ||
| 38 | 36 | <table role="presentation" cellpadding="0" cellspacing="0" width="100%" style="border:1px solid #e5e7eb;border-radius:8px;padding:14px 16px;margin:12px 0 0;"> |
| 39 | 37 | <tbody> |
| 40 | 38 | <tr> |
| 41 | 39 | <td style="font-size:13px;color:#6b7280;padding:0 0 6px;"><?php esc_html_e('Subscription', 'fluent-cart'); ?></td> |
| 42 | - <td style="font-size:13px;color:#111827;font-weight:600;padding:0 0 6px;text-align:right;"><?php echo esc_html($subscription->item_name); ?></td> | |
| 40 | + <td style="font-size:13px;color:#111827;font-weight:600;padding:0 0 6px;text-align:right;"><?php echo esc_html($subscription->display_item_name); ?></td> | |
| 43 | 41 | </tr> |
| 44 | 42 | <?php if ($renewalAmount): ?> |
| 45 | 43 | <tr> |
| 46 | 44 | <td style="font-size:13px;color:#6b7280;padding:0 0 6px;"><?php esc_html_e('Amount', 'fluent-cart'); ?></td> |
