thatguygriffandClaude Fable 5
b7d5e3039e
CI / Build Plugin Zip (pull_request) Has been skipped
CI / Tests (PHP 8.2) (pull_request) Successful in 45s
CI / PHPStan (pull_request) Successful in 2m48s
CI / Tests (PHP 8.1) (pull_request) Successful in 41s
CI / No Debug Code (pull_request) Failing after 2s
CI / Coding Standards (pull_request) Successful in 52s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m36s
Availability windows were stored and served as a single bookable row, so a 9:00 AM-4:00 PM window showed to students as one giant slot and booking it consumed the whole day; past and multi-day windows also leaked into the booking page as nonsense entries. - Split windows into consecutive lesson-length slots on save (REST and admin form); each chunk is independently bookable and weekly recurrence creates a series per chunk so "reserve this time weekly" holds the same hour each week - Reject windows spanning multiple days or shorter than the lesson length (400 invalid_window) - Never return slots whose start has passed from GET /availability - Migrate pre-split rows: Plugin::boot re-runs the Installer on version change and AvailabilityRepository::splitOversizedWindows() rewrites unbooked same-day oversized windows in place - Display all times in 12-hour AM/PM form (booking page, wp-admin lists, editor previews) - Add a List | Week view toggle to the student booking page and the instructor availability page, with previous/next-week navigation honouring the site's start_of_week option (new WeekCalendar helper) Co-Authored-By: Claude Fable 5 <[email protected]>
108 lines
4.7 KiB
PHP
108 lines
4.7 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
if (! defined('ABSPATH')) {
|
|
exit;
|
|
}
|
|
|
|
/**
|
|
* @var \WP_User $student
|
|
* @var list<array{start_dt: string, end_dt: string, offering: string, instructor: string, status: string}> $upcoming
|
|
* @var list<array{start_dt: string, end_dt: string, offering: string, instructor: string, status: string}> $past
|
|
* @var list<array{offering: string, status: string}> $enrolments
|
|
* @var string $backUrl
|
|
* @var bool $canBilling
|
|
* @var string $billingOverride
|
|
* @var string $billingDefault
|
|
*/
|
|
|
|
$renderLessons = static function (array $rows): void {
|
|
if (empty($rows)) {
|
|
echo '<p>' . esc_html__('None.', 'unsupervised-schedular') . '</p>';
|
|
return;
|
|
}
|
|
?>
|
|
<table class="wp-list-table widefat fixed striped">
|
|
<thead>
|
|
<tr>
|
|
<th><?php esc_html_e('When', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Offering', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Instructor', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Status', 'unsupervised-schedular'); ?></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<?php foreach ($rows as $row) : ?>
|
|
<tr>
|
|
<td><?php echo esc_html($row['start_dt'] !== '' ? (string) mysql2date('M j, Y g:i A', $row['start_dt']) : '—'); ?></td>
|
|
<td><?php echo esc_html($row['offering']); ?></td>
|
|
<td><?php echo esc_html($row['instructor']); ?></td>
|
|
<td><?php echo esc_html($row['status']); ?></td>
|
|
</tr>
|
|
<?php endforeach; ?>
|
|
</tbody>
|
|
</table>
|
|
<?php
|
|
};
|
|
?>
|
|
<div class="wrap">
|
|
<h1>
|
|
<?php echo esc_html($student->display_name); ?>
|
|
<a href="<?php echo esc_url($backUrl); ?>" class="page-title-action"><?php esc_html_e('Back to students', 'unsupervised-schedular'); ?></a>
|
|
</h1>
|
|
|
|
<h2><?php esc_html_e('Account', 'unsupervised-schedular'); ?></h2>
|
|
<table class="form-table">
|
|
<tr><th><?php esc_html_e('Email', 'unsupervised-schedular'); ?></th><td><?php echo esc_html($student->user_email); ?></td></tr>
|
|
<tr><th><?php esc_html_e('Registered', 'unsupervised-schedular'); ?></th><td><?php echo esc_html($student->user_registered); ?></td></tr>
|
|
</table>
|
|
|
|
<?php if ($canBilling) : ?>
|
|
<h2><?php esc_html_e('Billing method', 'unsupervised-schedular'); ?></h2>
|
|
<form method="post">
|
|
<?php wp_nonce_field('usc_student_billing'); ?>
|
|
<input type="hidden" name="usc_action" value="set_billing">
|
|
<select name="payment_method">
|
|
<option value="">
|
|
<?php
|
|
/* translators: %s: the studio default billing method */
|
|
echo esc_html(sprintf(__('Studio default (%s)', 'unsupervised-schedular'), $billingDefault));
|
|
?>
|
|
</option>
|
|
<option value="card" <?php selected($billingOverride, 'card'); ?>><?php esc_html_e('Credit card', 'unsupervised-schedular'); ?></option>
|
|
<option value="etransfer" <?php selected($billingOverride, 'etransfer'); ?>><?php esc_html_e('E-transfer', 'unsupervised-schedular'); ?></option>
|
|
<option value="comp" <?php selected($billingOverride, 'comp'); ?>><?php esc_html_e('Comp (no charge)', 'unsupervised-schedular'); ?></option>
|
|
</select>
|
|
<?php submit_button(esc_html__('Save', 'unsupervised-schedular'), 'secondary', 'submit', false); ?>
|
|
</form>
|
|
<?php endif; ?>
|
|
|
|
<h2><?php esc_html_e('Upcoming lessons', 'unsupervised-schedular'); ?></h2>
|
|
<?php $renderLessons($upcoming); ?>
|
|
|
|
<h2><?php esc_html_e('Past lessons', 'unsupervised-schedular'); ?></h2>
|
|
<?php $renderLessons($past); ?>
|
|
|
|
<h2><?php esc_html_e('Group-class enrolments', 'unsupervised-schedular'); ?></h2>
|
|
<?php if (empty($enrolments)) : ?>
|
|
<p><?php esc_html_e('None.', 'unsupervised-schedular'); ?></p>
|
|
<?php else : ?>
|
|
<table class="wp-list-table widefat fixed striped">
|
|
<thead>
|
|
<tr>
|
|
<th><?php esc_html_e('Class', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Status', 'unsupervised-schedular'); ?></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<?php foreach ($enrolments as $enrolment) : ?>
|
|
<tr>
|
|
<td><?php echo esc_html($enrolment['offering']); ?></td>
|
|
<td><?php echo esc_html($enrolment['status']); ?></td>
|
|
</tr>
|
|
<?php endforeach; ?>
|
|
</tbody>
|
|
</table>
|
|
<?php endif; ?>
|
|
</div>
|