CI / Coding Standards (pull_request) Successful in 51s
CI / No Debug Code (pull_request) Successful in 3s
CI / Tests (PHP 8.2) (pull_request) Successful in 50s
CI / Tests (PHP 8.3) (pull_request) Successful in 1m2s
CI / Build Plugin Zip (pull_request) Has been skipped
CI / Tests (PHP 8.1) (pull_request) Successful in 53s
CI / PHPStan (pull_request) Successful in 1m24s
The booking block gains a loginPageId attribute choosing which page its logged-out "log in to book a lesson" link points to (default remains the WordPress login screen), and the student-login block gains a bookingPageId attribute controlling the logged-in "View available lessons" link and the post-login redirect target (default remains the current page). Both blocks also gain an autoRedirect toggle, off by default, that sends the visitor straight to the target page; block rendering starts after output, so the redirect runs on template_redirect by parsing the queried page's content for the block, with a self-target guard against redirect loops. The link targets are also available to the shortcodes as login_page_id/booking_page_id. Also fixes a pre-existing fatal: WordPress passes an empty string (not an array) to shortcode callbacks when a shortcode is used without attributes, so bare [us_booking] etc. threw a TypeError against the strictly-typed render(array $atts) methods. ShortcodeRegistrar now wraps each callback to normalize non-array attribute values. Closes #51 Co-Authored-By: Claude Fable 5 <[email protected]>
74 lines
3.1 KiB
PHP
74 lines
3.1 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
namespace Unsupervised\Schedular;
|
|
|
|
use Unsupervised\Schedular\Auth\LoginPage;
|
|
use Unsupervised\Schedular\Auth\RegistrationPage;
|
|
use Unsupervised\Schedular\Booking\BookingPage;
|
|
use Unsupervised\Schedular\GroupClass\GroupClassPage;
|
|
use Unsupervised\Schedular\Payment\StudioSettings;
|
|
|
|
class ShortcodeRegistrar {
|
|
|
|
public function __construct(
|
|
private BookingPage $bookingPage,
|
|
private LoginPage $loginPage,
|
|
private RegistrationPage $registrationPage,
|
|
private GroupClassPage $groupClassPage,
|
|
) {}
|
|
|
|
public function register(): void {
|
|
add_shortcode( 'us_booking', self::shortcode( [ $this->bookingPage, 'render' ] ) );
|
|
add_shortcode( 'us_student_login', self::shortcode( [ $this->loginPage, 'render' ] ) );
|
|
add_shortcode( 'us_student_register', self::shortcode( [ $this->registrationPage, 'render' ] ) );
|
|
add_shortcode( 'us_group_classes', self::shortcode( [ $this->groupClassPage, 'render' ] ) );
|
|
add_action( 'template_redirect', [ $this->registrationPage, 'maybeRedirectToRegistrationPage' ] );
|
|
add_action( 'wp_enqueue_scripts', [ $this, 'enqueueAssets' ] );
|
|
}
|
|
|
|
/**
|
|
* Wraps a page renderer so bare shortcode usage is safe: WordPress passes
|
|
* an empty string, not an array, to the callback when a shortcode is used
|
|
* without attributes (`shortcode_parse_atts( '' )` returns `''`).
|
|
*
|
|
* @param callable(array<int|string, mixed>): string $render
|
|
* @return \Closure(mixed): string
|
|
*/
|
|
private static function shortcode( callable $render ): \Closure {
|
|
return static fn( mixed $atts ): string => $render( is_array( $atts ) ? $atts : [] );
|
|
}
|
|
|
|
public function enqueueAssets(): void {
|
|
wp_register_style( 'us-scheduler', USC_PLUGIN_URL . 'assets/css/frontend.css', [], USC_VERSION );
|
|
|
|
$settings = new StudioSettings();
|
|
|
|
// Stripe.js (loaded from Stripe's CDN per their terms) only when card billing
|
|
// is available; the payment helper degrades to e-transfer messaging without it.
|
|
$paymentDeps = [];
|
|
if ( $settings->isStripeConfigured() ) {
|
|
// Stripe pins the version in the URL path (/v3/) and forbids self-hosting,
|
|
// so no query-string version applies here.
|
|
wp_register_script( 'us-scheduler-stripe', 'https://js.stripe.com/v3/', [], null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
|
|
$paymentDeps[] = 'us-scheduler-stripe';
|
|
}
|
|
|
|
wp_register_script( 'us-scheduler-payment', USC_PLUGIN_URL . 'assets/js/payment.js', $paymentDeps, USC_VERSION, true );
|
|
|
|
$data = [
|
|
'restUrl' => rest_url( 'us-scheduler/v1/' ),
|
|
'nonce' => wp_create_nonce( 'wp_rest' ),
|
|
'stripeKey' => $settings->publishableKey(),
|
|
'startOfWeek' => Val::int( get_option( 'start_of_week', 1 ) ),
|
|
];
|
|
|
|
// Attach the shared config to the payment helper so it is defined before the
|
|
// booking/group scripts (which depend on it) run.
|
|
wp_localize_script( 'us-scheduler-payment', 'usScheduler', $data );
|
|
|
|
wp_register_script( 'us-scheduler', USC_PLUGIN_URL . 'assets/js/booking.js', [ 'us-scheduler-payment' ], USC_VERSION, true );
|
|
wp_register_script( 'us-scheduler-group', USC_PLUGIN_URL . 'assets/js/group-classes.js', [ 'us-scheduler-payment' ], USC_VERSION, true );
|
|
}
|
|
}
|