Add e-transfer destination email (studio default + offering/booking overrides)
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards (pull_request) Successful in 46s
CI / Tests (PHP 8.1) (pull_request) Successful in 52s
CI / Tests (PHP 8.3) (pull_request) Successful in 52s
CI / Tests (PHP 8.2) (pull_request) Successful in 57s
CI / PHPStan (pull_request) Successful in 1m12s
CI / Build Plugin Zip (pull_request) Has been skipped
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards (pull_request) Successful in 46s
CI / Tests (PHP 8.1) (pull_request) Successful in 52s
CI / Tests (PHP 8.3) (pull_request) Successful in 52s
CI / Tests (PHP 8.2) (pull_request) Successful in 57s
CI / PHPStan (pull_request) Successful in 1m12s
CI / Build Plugin Zip (pull_request) Has been skipped
The e-transfer destination is resolved at booking time (offering override -> studio default) and frozen onto the payment, so each record keeps where the student was directed. It can then be corrected per booking. - StudioSettings: us_etransfer_email option + a Default e-transfer email field on the Studio Settings page. - Offering: etransfer_email column/field (instructor override) across VO, repo, REST endpoint, admin controller, and form. - Payment: etransfer_email column on the payment (frozen record) + PaymentRepository::updateEtransferEmail; PaymentService freezes it from the offering override or studio default at creation; booking/enrolment pass the offering override. - My Lessons: instructors edit the e-transfer email per pending lesson payment (ownership-checked). - Payments queue: studio admin can correct the email at confirmation (for when a student sends it to the wrong place). - Docs updated. Tests: Payment/Offering rows + PaymentService freezing. composer test (148), cs, and PHPStan level 6 all pass. Refs #7 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
+22
-12
@@ -5,12 +5,12 @@ if (! defined('ABSPATH')) {
|
||||
exit;
|
||||
}
|
||||
|
||||
/** @var list<\Unsupervised\Schedular\Model\Lesson> $lessons */
|
||||
/** @var list<array{student: string, instructor: string, slot_id: int, status: string, notes: string, payment_id: int, etransfer_email: string, etransfer_editable: bool}> $rows */
|
||||
?>
|
||||
<div class="wrap">
|
||||
<h1><?php esc_html_e('Lessons', 'unsupervised-schedular'); ?></h1>
|
||||
|
||||
<?php if (empty($lessons)) : ?>
|
||||
<?php if (empty($rows)) : ?>
|
||||
<p><?php esc_html_e('No upcoming lessons.', 'unsupervised-schedular'); ?></p>
|
||||
<?php else : ?>
|
||||
<table class="wp-list-table widefat fixed striped">
|
||||
@@ -20,21 +20,31 @@ if (! defined('ABSPATH')) {
|
||||
<th><?php esc_html_e('Instructor', 'unsupervised-schedular'); ?></th>
|
||||
<th><?php esc_html_e('Slot ID', 'unsupervised-schedular'); ?></th>
|
||||
<th><?php esc_html_e('Status', 'unsupervised-schedular'); ?></th>
|
||||
<th><?php esc_html_e('E-transfer email', 'unsupervised-schedular'); ?></th>
|
||||
<th><?php esc_html_e('Notes', 'unsupervised-schedular'); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($lessons as $lesson) : ?>
|
||||
<?php
|
||||
$student = get_userdata($lesson->studentId);
|
||||
$instructor = get_userdata($lesson->instructorId);
|
||||
?>
|
||||
<?php foreach ($rows as $row) : ?>
|
||||
<tr>
|
||||
<td><?php echo esc_html($student ? $student->display_name : (string) $lesson->studentId); ?></td>
|
||||
<td><?php echo esc_html($instructor ? $instructor->display_name : (string) $lesson->instructorId); ?></td>
|
||||
<td><?php echo esc_html((string) $lesson->slotId); ?></td>
|
||||
<td><?php echo esc_html($lesson->status); ?></td>
|
||||
<td><?php echo esc_html($lesson->notes ?? ''); ?></td>
|
||||
<td><?php echo esc_html($row['student']); ?></td>
|
||||
<td><?php echo esc_html($row['instructor']); ?></td>
|
||||
<td><?php echo esc_html((string) $row['slot_id']); ?></td>
|
||||
<td><?php echo esc_html($row['status']); ?></td>
|
||||
<td>
|
||||
<?php if ($row['etransfer_editable']) : ?>
|
||||
<form method="post" style="display:flex; gap:4px;">
|
||||
<?php wp_nonce_field('usc_lesson_action'); ?>
|
||||
<input type="hidden" name="usc_action" value="set_etransfer">
|
||||
<input type="hidden" name="payment_id" value="<?php echo esc_attr((string) $row['payment_id']); ?>">
|
||||
<input type="email" name="etransfer_email" value="<?php echo esc_attr($row['etransfer_email']); ?>">
|
||||
<button type="submit" class="button button-small"><?php esc_html_e('Save', 'unsupervised-schedular'); ?></button>
|
||||
</form>
|
||||
<?php else : ?>
|
||||
<?php echo esc_html('' !== $row['etransfer_email'] ? $row['etransfer_email'] : '—'); ?>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td><?php echo esc_html($row['notes']); ?></td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
|
||||
@@ -59,6 +59,10 @@ if (! defined('ABSPATH')) {
|
||||
<th><label for="schedule_note"><?php esc_html_e('Schedule note', 'unsupervised-schedular'); ?></label></th>
|
||||
<td><input type="text" name="schedule_note" id="schedule_note" class="regular-text" placeholder="<?php esc_attr_e('e.g. Tuesdays 4:00pm', 'unsupervised-schedular'); ?>"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><label for="etransfer_email"><?php esc_html_e('E-transfer email', 'unsupervised-schedular'); ?></label></th>
|
||||
<td><input type="email" name="etransfer_email" id="etransfer_email" class="regular-text" placeholder="<?php esc_attr_e('Overrides the studio default', 'unsupervised-schedular'); ?>"></td>
|
||||
</tr>
|
||||
</table>
|
||||
<?php submit_button(esc_html__('Add Offering', 'unsupervised-schedular')); ?>
|
||||
</form>
|
||||
|
||||
@@ -5,11 +5,11 @@ if (! defined('ABSPATH')) {
|
||||
exit;
|
||||
}
|
||||
|
||||
/** @var list<array{id: int, student: string, amount: string, method: string, for: string}> $rows */
|
||||
/** @var list<array{id: int, student: string, amount: string, method: string, for: string, etransfer_email: string}> $rows */
|
||||
?>
|
||||
<div class="wrap">
|
||||
<h1><?php esc_html_e('Payments', 'unsupervised-schedular'); ?></h1>
|
||||
<p class="description"><?php esc_html_e('Pending payments awaiting confirmation. Marking one received confirms the booking and emails a receipt.', 'unsupervised-schedular'); ?></p>
|
||||
<p class="description"><?php esc_html_e('Pending payments awaiting confirmation. Marking one received confirms the booking and emails a receipt. You can correct the e-transfer email here if the student sent it elsewhere.', 'unsupervised-schedular'); ?></p>
|
||||
|
||||
<?php if (empty($rows)) : ?>
|
||||
<p><?php esc_html_e('No pending payments.', 'unsupervised-schedular'); ?></p>
|
||||
@@ -21,26 +21,28 @@ if (! defined('ABSPATH')) {
|
||||
<th><?php esc_html_e('For', 'unsupervised-schedular'); ?></th>
|
||||
<th><?php esc_html_e('Amount', 'unsupervised-schedular'); ?></th>
|
||||
<th><?php esc_html_e('Method', 'unsupervised-schedular'); ?></th>
|
||||
<th><?php esc_html_e('E-transfer email', 'unsupervised-schedular'); ?></th>
|
||||
<th><?php esc_html_e('Actions', 'unsupervised-schedular'); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($rows as $row) : ?>
|
||||
<tr>
|
||||
<td><?php echo esc_html($row['student']); ?></td>
|
||||
<td><?php echo esc_html($row['for']); ?></td>
|
||||
<td><?php echo esc_html($row['amount']); ?></td>
|
||||
<td><?php echo esc_html($row['method']); ?></td>
|
||||
<td>
|
||||
<form method="post" style="display:inline;">
|
||||
<?php wp_nonce_field('usc_payment_action'); ?>
|
||||
<input type="hidden" name="usc_action" value="mark_paid">
|
||||
<input type="hidden" name="payment_id" value="<?php echo esc_attr((string) $row['id']); ?>">
|
||||
<form method="post">
|
||||
<?php wp_nonce_field('usc_payment_action'); ?>
|
||||
<input type="hidden" name="usc_action" value="mark_paid">
|
||||
<input type="hidden" name="payment_id" value="<?php echo esc_attr((string) $row['id']); ?>">
|
||||
<td><?php echo esc_html($row['student']); ?></td>
|
||||
<td><?php echo esc_html($row['for']); ?></td>
|
||||
<td><?php echo esc_html($row['amount']); ?></td>
|
||||
<td><?php echo esc_html($row['method']); ?></td>
|
||||
<td><input type="email" name="etransfer_email" class="regular-text" value="<?php echo esc_attr($row['etransfer_email']); ?>"></td>
|
||||
<td>
|
||||
<button type="submit" class="button button-small button-primary">
|
||||
<?php esc_html_e('Mark received', 'unsupervised-schedular'); ?>
|
||||
</button>
|
||||
</form>
|
||||
</td>
|
||||
</td>
|
||||
</form>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
|
||||
@@ -10,6 +10,7 @@ if (! defined('ABSPATH')) {
|
||||
* @var string $secretKey
|
||||
* @var string $mode
|
||||
* @var string $currency
|
||||
* @var string $etransferEmail
|
||||
* @var bool $stripeConfigured
|
||||
*/
|
||||
?>
|
||||
@@ -53,6 +54,17 @@ if (! defined('ABSPATH')) {
|
||||
<td><input type="text" name="currency" id="currency" class="small-text" maxlength="3" value="<?php echo esc_attr($currency); ?>"></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<h2><?php esc_html_e('E-transfer', 'unsupervised-schedular'); ?></h2>
|
||||
<table class="form-table">
|
||||
<tr>
|
||||
<th><label for="etransfer_email"><?php esc_html_e('Default e-transfer email', 'unsupervised-schedular'); ?></label></th>
|
||||
<td>
|
||||
<input type="email" name="etransfer_email" id="etransfer_email" class="regular-text" value="<?php echo esc_attr($etransferEmail); ?>">
|
||||
<p class="description"><?php esc_html_e('Where students send e-transfers, unless an offering overrides it. Instructors can also override per offering or per booking.', 'unsupervised-schedular'); ?></p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<?php submit_button(esc_html__('Save Settings', 'unsupervised-schedular')); ?>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user