| @@ -46,22 +46,45 @@ | ||
| 46 | 46 | 'date_format' => 'Y-m-d', |
| 47 | 47 | 'time_format' => 'H:i', |
| 48 | 48 | 'frontend_primary_color' => '#3b82f6', |
| 49 | 49 | 'frontend_container_max_width' => '', |
| 50 | + // Trip listing card density. 'standard' = the current comfortable card; | |
| 51 | + // 'compact_mobile' = compact card on phones/tablets only (desktop grid | |
| 52 | + // unchanged); 'compact_all' = compact card at every screen size. | |
| 53 | + 'frontend_listing_card_layout' => 'standard', | |
| 50 | 54 | |
| 51 | 55 | // Booking Settings |
| 52 | 56 | 'booking_confirmation' => true, |
| 57 | + // Legacy boolean, kept for backward compatibility. Superseded by | |
| 58 | + // 'auto_confirm_mode' below; the mode is authoritative once stored. | |
| 53 | 59 | 'auto_confirm_bookings' => false, |
| 60 | + // Auto-confirm mode: 'none' (never), 'online' (only successful online | |
| 61 | + // gateway payments), or 'all' (confirm every booking at checkout). | |
| 62 | + // Default 'online' (payment complete => confirmed). Existing sites with | |
| 63 | + // no stored mode resolve on the fly via yatra_get_auto_confirm_mode() | |
| 64 | + // (legacy true->all, false->online), preserving their prior behaviour. | |
| 65 | + 'auto_confirm_mode' => 'online', | |
| 54 | 66 | 'auto_confirm_pay_later' => true, |
| 55 | 67 | 'require_login' => false, |
| 56 | 68 | 'allow_guest_checkout' => true, |
| 57 | - 'cancellation_policy' => 'full_refund', | |
| 58 | - 'cancellation_days' => 7, | |
| 59 | - 'refund_policy' => '', | |
| 69 | + // cancellation_policy / cancellation_days / refund_policy were | |
| 70 | + // removed in 3.0.5 — they only inserted text into the booking | |
| 71 | + // confirmation email but did NOT enforce a cancellation cutoff | |
| 72 | + // because Yatra has no customer-facing self-service | |
| 73 | + // cancellation flow. Per-trip cancellation copy on the Trip | |
| 74 | + // editor is the supported way to communicate policy. If those | |
| 75 | + // legacy options still exist in wp_options on upgraded sites | |
| 76 | + // they're harmless orphans — the save endpoint no longer | |
| 77 | + // accepts them, and the email template skips the cancellation | |
| 78 | + // paragraph when the global setting is absent. | |
| 60 | 79 | 'booking_expiry_hours' => 24, |
| 61 | 80 | 'booking_reminder_days' => 3, |
| 81 | + 'availability_horizon_months' => 12, | |
| 62 | 82 | 'allow_waitlist' => true, |
| 63 | 83 | 'waitlist_auto_confirm' => false, |
| 84 | + // Pro: render available departure dates as a <select> instead of a | |
| 85 | + // flatpickr calendar on the single-trip sidebar (desktop + mobile). | |
| 86 | + 'date_picker_as_dropdown' => false, | |
| 64 | 87 | |
| 65 | 88 | // Payment Settings |
| 66 | 89 | 'currency' => 'USD', |
| 67 | 90 | 'payment_test_mode' => true, |
| @@ -72,9 +95,21 @@ | ||
| 72 | 95 | 'deposit_required' => false, |
| 73 | 96 | 'deposit_percentage' => 20, |
| 74 | 97 | 'gateway_configs' => [], |
| 75 | 98 | 'gateway_order' => [], |
| 76 | - | |
| 99 | + | |
| 100 | + // Discount Stacking Mode — controls how the Advanced Discount and | |
| 101 | + // Dynamic Pricing modules combine when both can fire on the same | |
| 102 | + // booking. Default 'both' preserves the legacy stacked behavior | |
| 103 | + // (discount on top of DP-adjusted price). The Settings → Pricing | |
| 104 | + // tab only surfaces this setting when BOTH modules are enabled, | |
| 105 | + // and CalculationService only enforces a non-default mode when | |
| 106 | + // BOTH modules are loaded — so sites with only one (or neither) | |
| 107 | + // module see zero behavior change. | |
| 108 | + // | |
| 109 | + // Allowed: 'both' | 'discount_only' | 'dynamic_pricing_only' | 'best_for_customer' | |
| 110 | + 'discount_stacking_mode' => 'both', | |
| 111 | + | |
| 77 | 112 | // Scheduled/Recurring Payment Settings (Pro feature - defaults disabled) |
| 78 | 113 | 'enable_scheduled_payments' => false, |
| 79 | 114 | 'scheduled_payment_type' => 'single', // single, installments |
| 80 | 115 | 'scheduled_payment_days' => 15, // Days until first scheduled payment |
| @@ -80,8 +115,10 @@ | ||
| 80 | 115 | 'scheduled_payment_days' => 15, // Days until first scheduled payment |
| 81 | 116 | 'scheduled_payment_installments' => 1, // Number of installments (if type is installments) |
| 82 | 117 | 'scheduled_payment_interval' => 30, // Days between installments |
| 83 | 118 | 'scheduled_payment_reminder_days' => 3, // Days before to send reminder |
| 119 | + 'balance_anchor' => 'booking', // 'booking' (BC default) | 'tour' (relative to tour date) | |
| 120 | + 'balance_due_days' => 14, // When anchor=tour: balance due this many days before the tour | |
| 84 | 121 | 'allow_save_payment_methods' => false, |
| 85 | 122 | |
| 86 | 123 | // Email Settings (WordPress site defaults when Yatra options are missing) |
| 87 | 124 | 'admin_email' => $wpAdminEmail, |
| @@ -86,10 +123,16 @@ | ||
| 86 | 123 | // Email Settings (WordPress site defaults when Yatra options are missing) |
| 87 | 124 | 'admin_email' => $wpAdminEmail, |
| 88 | 125 | 'from_email' => $wpAdminEmail, |
| 89 | 126 | 'from_name' => $wpSiteName, |
| 127 | + // Blind copy of every outgoing Yatra email, for archiving/monitoring. | |
| 128 | + // Empty means no copy is sent; accepts several comma-separated addresses. | |
| 129 | + 'email_always_bcc' => '', | |
| 90 | 130 | 'email_template_booking' => true, |
| 91 | 131 | 'email_template_confirmation' => true, |
| 132 | + // Separate part-payment email. Off by default so existing sites keep | |
| 133 | + // sending the single payment template for every payment. | |
| 134 | + 'email_template_partial_payment' => false, | |
| 92 | 135 | 'email_template_cancellation' => true, |
| 93 | 136 | 'email_template_reminder' => true, |
| 94 | 137 | 'email_template_admin_new_booking' => true, |
| 95 | 138 | 'email_template_admin_payment' => true, |
| @@ -95,8 +138,11 @@ | ||
| 95 | 138 | 'email_template_admin_payment' => true, |
| 96 | 139 | 'email_template_admin_cancellation' => true, |
| 97 | 140 | 'email_template_trip_consent' => true, |
| 98 | 141 | 'email_template_customer_verification' => true, |
| 142 | + 'email_template_guest_verification' => true, | |
| 143 | + 'email_template_account_email_change' => true, | |
| 144 | + 'email_template_account_email_changed' => true, | |
| 99 | 145 | 'email_template_booking_completed' => true, |
| 100 | 146 | 'email_template_booking_expired_customer' => true, |
| 101 | 147 | 'email_template_admin_booking_expired' => true, |
| 102 | 148 | 'email_template_scheduled_payment_reminder' => true, |
| @@ -106,9 +152,11 @@ | ||
| 106 | 152 | 'email_template_enquiry_received' => true, |
| 107 | 153 | 'email_template_enquiry_admin' => true, |
| 108 | 154 | 'email_template_enquiry_response' => true, |
| 109 | 155 | 'email_template_review_request' => true, |
| 110 | - 'email_template_abandoned_booking_recovery' => true, | |
| 156 | + 'email_template_abandoned_booking_recovery_first' => true, | |
| 157 | + 'email_template_abandoned_booking_recovery_second' => true, | |
| 158 | + 'email_template_abandoned_booking_recovery_final' => true, | |
| 111 | 159 | 'smtp_enabled' => false, |
| 112 | 160 | 'smtp_host' => 'smtp.gmail.com', |
| 113 | 161 | 'smtp_port' => 587, |
| 114 | 162 | 'smtp_username' => '', |
| @@ -118,8 +166,13 @@ | ||
| 118 | 166 | // Customer Settings |
| 119 | 167 | 'customer_registration' => true, |
| 120 | 168 | 'customer_fields' => [], |
| 121 | 169 | 'require_email_verification' => false, |
| 170 | + // Per-booking verification for guest checkouts. Distinct from the | |
| 171 | + // account-creation `require_email_verification` flag because a guest | |
| 172 | + // never registers — the verification is gated on the booking itself | |
| 173 | + // (BookingSessionController checks this when admitting a guest). | |
| 174 | + 'require_guest_email_verification' => false, | |
| 122 | 175 | 'customer_account_page' => '', |
| 123 | 176 | 'allow_customer_reviews' => true, |
| 124 | 177 | 'customer_dashboard_enabled' => true, |
| 125 | 178 | |
| @@ -162,9 +215,16 @@ | ||
| 162 | 215 | 'facebook_pixel' => '', |
| 163 | 216 | 'recaptcha_enabled' => false, |
| 164 | 217 | 'recaptcha_site_key' => '', |
| 165 | 218 | 'recaptcha_secret_key' => '', |
| 166 | - | |
| 219 | + // reCAPTCHA v3: score threshold (0.0-1.0) + per-form protection toggles. | |
| 220 | + // All off by default so enabling reCAPTCHA alone changes nothing until | |
| 221 | + // the operator picks which forms to protect. | |
| 222 | + 'recaptcha_score_threshold' => 0.5, | |
| 223 | + 'recaptcha_protect_enquiry' => false, | |
| 224 | + 'recaptcha_protect_booking' => false, | |
| 225 | + 'recaptcha_protect_registration' => false, | |
| 226 | + | |
| 167 | 227 | // Permalink Settings |
| 168 | 228 | 'trip_base' => 'trip', |
| 169 | 229 | 'destination_base' => 'destination', |
| 170 | 230 | 'activity_base' => 'activity', |
| @@ -171,9 +231,29 @@ | ||
| 171 | 231 | 'trip_category_base' => 'trip-category', |
| 172 | 232 | 'booking_base' => 'book', |
| 173 | 233 | // Wishlist (Pro) — stored in free options; active only when Pro + setting on |
| 174 | 234 | 'enable_wishlist' => false, |
| 175 | - | |
| 235 | + // Sold-out date visibility on the storefront. Default true keeps the | |
| 236 | + // existing behaviour (sold-out dates stay visible, badged "sold out" and | |
| 237 | + // able to drive the waitlist); owners can switch it off to hide them the | |
| 238 | + // same way blocked dates are hidden. | |
| 239 | + 'show_sold_out' => true, | |
| 240 | + | |
| 241 | + // Search & Listing storefront UX. Defaults preserve current behaviour: | |
| 242 | + // every search field shown (true) and mobile filters expanded (false), | |
| 243 | + // so existing installs are unchanged until the owner opts in. Booleans | |
| 244 | + // are auto-sanitized from the default type. | |
| 245 | + 'search_show_keyword' => true, | |
| 246 | + 'search_show_destination' => true, | |
| 247 | + 'search_show_activities' => true, | |
| 248 | + 'search_show_duration' => true, | |
| 249 | + 'search_show_budget' => true, | |
| 250 | + // Date field is opt-in (default false) so updating the plugin never | |
| 251 | + // changes an existing site's search bar. Operators enable it to let | |
| 252 | + // customers find trips with a departure on a specific date. | |
| 253 | + 'search_show_date' => false, | |
| 254 | + 'collapse_filters_on_mobile' => false, | |
| 255 | + | |
| 176 | 256 | // Booking Page Settings |
| 177 | 257 | 'use_booking_page' => false, |
| 178 | 258 | 'booking_page_id' => 0, |
| 179 | 259 | |
| @@ -185,9 +265,17 @@ | ||
| 185 | 265 | 'seo_trip_meta_title' => '', |
| 186 | 266 | 'seo_trip_meta_description' => '', |
| 187 | 267 | 'seo_trip_meta_keywords' => '', |
| 188 | 268 | 'seo_trip_meta_image' => 0, |
| 189 | - | |
| 269 | + 'enable_sitemap' => true, | |
| 270 | + // Which Yatra content types appear in /yatra-sitemap.xml. Defaults to | |
| 271 | + // every type, so a site that never touches this keeps today's sitemap. | |
| 272 | + 'sitemap_types' => ['archive', 'trip', 'destination', 'activity', 'category'], | |
| 273 | + // Opt-in, and deliberately separate from the list above: dropping a type | |
| 274 | + // from the sitemap is housekeeping, while noindex de-indexes pages that | |
| 275 | + // may currently rank. That should never happen as a side effect. | |
| 276 | + 'sitemap_noindex_excluded' => false, | |
| 277 | + | |
| 190 | 278 | // Advanced Settings |
| 191 | 279 | 'debug_mode' => false, |
| 192 | 280 | 'enable_logging' => false, |
| 193 | 281 | 'cache_enabled' => true, |
| @@ -234,8 +322,26 @@ | ||
| 234 | 322 | 'permission_callback' => [$this, 'check_permission'], |
| 235 | 323 | ], |
| 236 | 324 | ]); |
| 237 | 325 | |
| 326 | + // Booking form config, optionally resolved for one trip (Pro form | |
| 327 | + // conditions). Readable by anyone who can view bookings, so the | |
| 328 | + // booking detail screen can label the fields a trip actually asked. | |
| 329 | + register_rest_route($namespace, '/' . $base . '/booking-form', [ | |
| 330 | + [ | |
| 331 | + 'methods' => \WP_REST_Server::READABLE, | |
| 332 | + 'callback' => [$this, 'get_booking_form_config'], | |
| 333 | + 'permission_callback' => [$this, 'check_booking_form_permission'], | |
| 334 | + 'args' => [ | |
| 335 | + 'trip_id' => [ | |
| 336 | + 'type' => 'integer', | |
| 337 | + 'required' => false, | |
| 338 | + 'sanitize_callback' => 'absint', | |
| 339 | + ], | |
| 340 | + ], | |
| 341 | + ], | |
| 342 | + ]); | |
| 343 | + | |
| 238 | 344 | // Get WordPress pages for booking page selection |
| 239 | 345 | register_rest_route($namespace, '/' . $base . '/pages', [ |
| 240 | 346 | [ |
| 241 | 347 | 'methods' => \WP_REST_Server::READABLE, |
| @@ -303,20 +409,60 @@ | ||
| 303 | 409 | return $this->error_response($e->getMessage(), 500); |
| 304 | 410 | } |
| 305 | 411 | } |
| 306 | 412 | |
| 413 | + /** | |
| 414 | + * Plugin settings — high-sensitivity cap. By default only the | |
| 415 | + * Owner role holds `yatra_manage_settings` (Manager doesn't, by | |
| 416 | + * design — settings include payment gateway routing, email | |
| 417 | + * delivery configuration, currency formatting and similar | |
| 418 | + * global behaviour). WP admins pass via the Team module's | |
| 419 | + * admin-fallback filter. | |
| 420 | + */ | |
| 307 | 421 | public function check_permission(?WP_REST_Request $request = null): bool |
| 308 | 422 | { |
| 309 | 423 | if (!is_user_logged_in()) { |
| 310 | 424 | return false; |
| 311 | 425 | } |
| 426 | + return current_user_can('yatra_manage_settings'); | |
| 427 | + } | |
| 312 | 428 | |
| 313 | - // Match other Yatra admin surfaces (e.g. Email Automation, Pro modules) | |
| 314 | - return current_user_can('manage_options') | |
| 315 | - || current_user_can('manage_yatra'); | |
| 429 | + /** | |
| 430 | + * The booking form config is needed to label booking data, so it is | |
| 431 | + * readable by booking staff, not only settings managers. | |
| 432 | + */ | |
| 433 | + public function check_booking_form_permission(?WP_REST_Request $request = null): bool | |
| 434 | + { | |
| 435 | + if (!is_user_logged_in()) { | |
| 436 | + return false; | |
| 437 | + } | |
| 438 | + return current_user_can('yatra_manage_settings') | |
| 439 | + || current_user_can('yatra_view_bookings') | |
| 440 | + || current_user_can('yatra_edit_bookings'); | |
| 316 | 441 | } |
| 317 | 442 | |
| 318 | 443 | /** |
| 444 | + * GET /settings/booking-form[?trip_id=N] | |
| 445 | + * | |
| 446 | + * Without trip_id: the full config exactly as the Settings screen sees it. | |
| 447 | + * With trip_id: the config as that trip's checkout renders it — Pro form | |
| 448 | + * conditions resolved (no Pro / no conditions → identical to the global). | |
| 449 | + */ | |
| 450 | + public function get_booking_form_config(WP_REST_Request $request) | |
| 451 | + { | |
| 452 | + try { | |
| 453 | + $trip_id = (int) $request->get_param('trip_id'); | |
| 454 | + | |
| 455 | + return $this->success_response([ | |
| 456 | + 'booking_form_config' => \Yatra\Services\SettingsService::getBookingFormConfig($trip_id > 0 ? $trip_id : null), | |
| 457 | + 'trip_id' => $trip_id > 0 ? $trip_id : null, | |
| 458 | + ]); | |
| 459 | + } catch (\Exception $e) { | |
| 460 | + return $this->error_response($e->getMessage(), 500); | |
| 461 | + } | |
| 462 | + } | |
| 463 | + | |
| 464 | + /** | |
| 319 | 465 | * Get all settings |
| 320 | 466 | */ |
| 321 | 467 | public function get_settings(WP_REST_Request $request) |
| 322 | 468 | { |
| @@ -322,18 +468,36 @@ | ||
| 322 | 468 | { |
| 323 | 469 | try { |
| 324 | 470 | $settings = []; |
| 325 | 471 | |
| 326 | - // Get all settings from WordPress options table with yatra_ prefix | |
| 472 | + // Get all settings from WordPress options table with yatra_ prefix. | |
| 473 | + // A sentinel default is essential here: get_option() returns boolean | |
| 474 | + // false for a stored-false option just as it does for a missing one, | |
| 475 | + // so checking `=== false` would reset every saved-off boolean back to | |
| 476 | + // its default. That is exactly the "Show sold-out dates" bug — the | |
| 477 | + // storefront honoured the saved value (isEnabled coerces '' -> false) | |
| 478 | + // while the admin checkbox re-appeared enabled because this endpoint | |
| 479 | + // handed React the default (true) instead of the saved false. | |
| 480 | + $unset_sentinel = "\0__yatra_option_unset__\0"; | |
| 327 | 481 | foreach ($this->default_settings as $key => $default_value) { |
| 328 | 482 | $option_name = 'yatra_' . $key; |
| 329 | - $value = get_option($option_name, false); | |
| 330 | - | |
| 331 | - // Only use default if option doesn't exist (wasn't set by InstallerService) | |
| 332 | - if ($value === false) { | |
| 483 | + $value = get_option($option_name, $unset_sentinel); | |
| 484 | + | |
| 485 | + // Only use default when the option truly does not exist. | |
| 486 | + if ($value === $unset_sentinel) { | |
| 333 | 487 | $value = $default_value; |
| 334 | 488 | } |
| 335 | 489 | |
| 490 | + // Auto-Confirm mode has no stored default — it is resolved on | |
| 491 | + // the fly. Return the effective mode so the admin shows the | |
| 492 | + // site's real behaviour: a stored choice if the operator made | |
| 493 | + // one, otherwise derived from the legacy boolean | |
| 494 | + // (true -> 'all', false -> 'online'). Prevents an existing | |
| 495 | + // "confirm all" site from displaying (and re-saving) as 'online'. | |
| 496 | + if ($key === 'auto_confirm_mode' && function_exists('yatra_get_auto_confirm_mode')) { | |
| 497 | + $value = yatra_get_auto_confirm_mode(); | |
| 498 | + } | |
| 499 | + | |
| 336 | 500 | // Stored empty string should behave like "unset" for delivery identity (matches installer / backfill). |
| 337 | 501 | if (($key === 'admin_email' || $key === 'from_email') && is_string($value) && trim($value) === '') { |
| 338 | 502 | $wp = (string) get_option('admin_email', ''); |
| 339 | 503 | $value = $wp !== '' ? $wp : $value; |
| @@ -351,9 +515,18 @@ | ||
| 351 | 515 | // Ensure arrays are returned as arrays (not objects) |
| 352 | 516 | if (is_array($default_value) && !is_array($value)) { |
| 353 | 517 | $value = []; |
| 354 | 518 | } |
| 355 | - | |
| 519 | + | |
| 520 | + // Boolean settings must round-trip to the admin as real booleans. | |
| 521 | + // update_option() stores false as '' and the object cache can | |
| 522 | + // return boolean false, so without this a disabled toggle would | |
| 523 | + // reach React as '' / false and the checkbox (checked unless the | |
| 524 | + // value is strictly !== false) would render enabled again. | |
| 525 | + if (is_bool($default_value)) { | |
| 526 | + $value = filter_var($value, FILTER_VALIDATE_BOOLEAN); | |
| 527 | + } | |
| 528 | + | |
| 356 | 529 | $settings[$key] = $value; |
| 357 | 530 | } |
| 358 | 531 | |
| 359 | 532 | // Special handling for booking_form_config - always use getBookingFormConfig which handles locked fields |
| @@ -378,8 +551,10 @@ | ||
| 378 | 551 | 'scheduled_payment_days', |
| 379 | 552 | 'scheduled_payment_installments', |
| 380 | 553 | 'scheduled_payment_interval', |
| 381 | 554 | 'scheduled_payment_reminder_days', |
| 555 | + 'balance_anchor', | |
| 556 | + 'balance_due_days', | |
| 382 | 557 | ] as $sk |
| 383 | 558 | ) { |
| 384 | 559 | if (array_key_exists($sk, $this->default_settings)) { |
| 385 | 560 | $settings[$sk] = \Yatra\Services\SettingsService::get( |
| @@ -390,8 +565,14 @@ | ||
| 390 | 565 | } |
| 391 | 566 | |
| 392 | 567 | $settings = $this->syncAccountRouteSettingsForResponse($settings); |
| 393 | 568 | |
| 569 | + /** | |
| 570 | + * Allow Pro modules to align REST payloads with canonical option stores | |
| 571 | + * (e.g. GA4 settings that also live in yatra_google_analytics_settings). | |
| 572 | + */ | |
| 573 | + $settings = apply_filters('yatra_rest_settings', $settings); | |
| 574 | + | |
| 394 | 575 | return $this->success_response($settings); |
| 395 | 576 | } catch (\Exception $e) { |
| 396 | 577 | return $this->error_response($e->getMessage(), 500); |
| 397 | 578 | } |
| @@ -432,8 +613,10 @@ | ||
| 432 | 613 | 'scheduled_payment_days', |
| 433 | 614 | 'scheduled_payment_installments', |
| 434 | 615 | 'scheduled_payment_interval', |
| 435 | 616 | 'scheduled_payment_reminder_days', |
| 617 | + 'balance_anchor', | |
| 618 | + 'balance_due_days', | |
| 436 | 619 | ]; |
| 437 | 620 | |
| 438 | 621 | // Collect flexible payment settings to delegate to Pro |
| 439 | 622 | $flexible_payment_settings = []; |
| @@ -551,12 +734,78 @@ | ||
| 551 | 734 | if (!empty($updated)) { |
| 552 | 735 | \Yatra\Services\SettingsService::reload(); |
| 553 | 736 | } |
| 554 | 737 | |
| 555 | - return $this->success_response([ | |
| 738 | + // Cross-validation: booking-auth settings interact via OR | |
| 739 | + // logic in booking-content.php, so some combinations are | |
| 740 | + // semantically inconsistent or redundant. We don't block | |
| 741 | + // the save (the resulting state still has well-defined | |
| 742 | + // behavior), but we surface a clear notice so the operator | |
| 743 | + // understands what they just configured. | |
| 744 | + // | |
| 745 | + // require_login=true + allow_guest_checkout=true → | |
| 746 | + // require_login wins; allow_guest_checkout is a no-op. | |
| 747 | + // require_login=true + allow_guest_checkout=false → | |
| 748 | + // Strictest setting (login required, no guest path). | |
| 749 | + // Internally consistent. | |
| 750 | + // require_login=false + allow_guest_checkout=false → | |
| 751 | + // Guests blocked, logged-in users can book. Consistent. | |
| 752 | + // require_login=false + allow_guest_checkout=true → | |
| 753 | + // Default. Permissive. | |
| 754 | + $notices = []; | |
| 755 | + $effective_require_login = \array_key_exists('require_login', $data) | |
| 756 | + ? (bool) $data['require_login'] | |
| 757 | + : (bool) \Yatra\Services\SettingsService::get('require_login', false); | |
| 758 | + $effective_allow_guest = \array_key_exists('allow_guest_checkout', $data) | |
| 759 | + ? (bool) $data['allow_guest_checkout'] | |
| 760 | + : (bool) \Yatra\Services\SettingsService::get('allow_guest_checkout', true); | |
| 761 | + | |
| 762 | + if ($effective_require_login && $effective_allow_guest) { | |
| 763 | + $notices[] = [ | |
| 764 | + 'level' => 'warning', | |
| 765 | + 'code' => 'booking_auth_redundant', | |
| 766 | + 'message' => __( | |
| 767 | + 'Heads up: "Require login" is on, so "Allow guest checkout" has no effect — every customer will need to log in to book. To accept guests, turn "Require login" off.', | |
| 768 | + 'yatra' | |
| 769 | + ), | |
| 770 | + ]; | |
| 771 | + } | |
| 772 | + | |
| 773 | + // Scheduled Payments + guest checkout — incompatible at | |
| 774 | + // the gateway level. Scheduled charges require a saved | |
| 775 | + // payment-method tied to a customer record on the | |
| 776 | + // gateway side (Stripe Customer, etc.), which in turn | |
| 777 | + // requires a logged-in WP user. When both settings are | |
| 778 | + // on, the system gracefully skips installment creation | |
| 779 | + // for guest bookings — but operators expect them to | |
| 780 | + // work and only discover the gap when reconciling | |
| 781 | + // unpaid bookings weeks later. Surface this proactively. | |
| 782 | + $effective_scheduled_payments = \array_key_exists('enable_scheduled_payments', $data) | |
| 783 | + ? (bool) $data['enable_scheduled_payments'] | |
| 784 | + : (bool) \Yatra\Services\SettingsService::get('enable_scheduled_payments', false); | |
| 785 | + if ( | |
| 786 | + $effective_scheduled_payments | |
| 787 | + && $effective_allow_guest | |
| 788 | + && !$effective_require_login | |
| 789 | + ) { | |
| 790 | + $notices[] = [ | |
| 791 | + 'level' => 'info', | |
| 792 | + 'code' => 'scheduled_payments_guest_caveat', | |
| 793 | + 'message' => __( | |
| 794 | + 'Scheduled Payments is on with guest checkout allowed. Scheduled installments only run for bookings made by logged-in customers (they need a saved payment method tied to their account). Guest bookings will be charged in full at checkout instead. Turn on "Require login" if every booking must support installments.', | |
| 795 | + 'yatra' | |
| 796 | + ), | |
| 797 | + ]; | |
| 798 | + } | |
| 799 | + | |
| 800 | + $response = [ | |
| 556 | 801 | 'message' => 'Settings updated successfully', |
| 557 | 802 | 'updated' => $updated, |
| 558 | - ]); | |
| 803 | + ]; | |
| 804 | + if ($notices !== []) { | |
| 805 | + $response['notices'] = $notices; | |
| 806 | + } | |
| 807 | + return $this->success_response($response); | |
| 559 | 808 | } catch (\Exception $e) { |
| 560 | 809 | return $this->error_response($e->getMessage(), 500); |
| 561 | 810 | } |
| 562 | 811 | } |
| @@ -578,8 +827,19 @@ | ||
| 578 | 827 | if ($filtered_value !== null) { |
| 579 | 828 | return $filtered_value; |
| 580 | 829 | } |
| 581 | 830 | |
| 831 | + // The booking-form config has its own structured sanitiser (field type | |
| 832 | + // and width whitelists, locked core fields, text-block content, per-trip | |
| 833 | + // conditions). It must run BEFORE the generic | |
| 834 | + // is_array($default) branch below: that branch only text-sanitises | |
| 835 | + // values and was catching this key first — because its default is [] — | |
| 836 | + // so the structured sanitiser further down was never reached and any | |
| 837 | + // shape at all was stored. | |
| 838 | + if ($key === 'booking_form_config') { | |
| 839 | + return is_array($value) ? $this->sanitize_booking_form_config($value) : []; | |
| 840 | + } | |
| 841 | + | |
| 582 | 842 | // Handle null values - use default |
| 583 | 843 | if ($value === null) { |
| 584 | 844 | return $default; |
| 585 | 845 | } |
| @@ -625,12 +885,15 @@ | ||
| 625 | 885 | return null; |
| 626 | 886 | } |
| 627 | 887 | $int_value = (int) $value; |
| 628 | 888 | // Validate ranges for specific fields |
| 629 | - if ($key === 'cancellation_days' && $int_value < 0) { | |
| 889 | + if ($key === 'booking_expiry_hours' && $int_value < 0) { | |
| 630 | 890 | return null; |
| 631 | 891 | } |
| 632 | - if ($key === 'booking_expiry_hours' && $int_value < 0) { | |
| 892 | + // Storefront booking horizon: 1–36 months. Out of range is rejected | |
| 893 | + // (not clamped) so a bad write can never blank the calendar — the | |
| 894 | + // previously stored value, or the 12-month default, stays in force. | |
| 895 | + if ($key === 'availability_horizon_months' && ($int_value < 1 || $int_value > 36)) { | |
| 633 | 896 | return null; |
| 634 | 897 | } |
| 635 | 898 | if ($key === 'partial_payment_percentage' && ($int_value < 0 || $int_value > 100)) { |
| 636 | 899 | return null; |
| @@ -679,8 +942,17 @@ | ||
| 679 | 942 | $v = is_string($value) ? strtolower(trim($value)) : ''; |
| 680 | 943 | |
| 681 | 944 | return in_array($v, $allowed, true) ? $v : (is_string($default) ? $default : 'left'); |
| 682 | 945 | } |
| 946 | + if ($key === 'discount_stacking_mode') { | |
| 947 | + // Strict enum — any other value silently falls back to the | |
| 948 | + // backward-compatible default so a malformed POST cannot | |
| 949 | + // change pricing behavior unexpectedly. | |
| 950 | + $allowed = ['both', 'discount_only', 'dynamic_pricing_only', 'best_for_customer']; | |
| 951 | + $v = is_string($value) ? strtolower(trim($value)) : ''; | |
| 952 | + | |
| 953 | + return in_array($v, $allowed, true) ? $v : 'both'; | |
| 954 | + } | |
| 683 | 955 | // Special handling for specific fields |
| 684 | 956 | if ($key === 'company_email' || $key === 'admin_email' || $key === 'from_email' || $key === 'smtp_username') { |
| 685 | 957 | return sanitize_email($value); |
| 686 | 958 | } |
| @@ -686,11 +958,8 @@ | ||
| 686 | 958 | } |
| 687 | 959 | if ($key === 'company_website' || $key === 'company_logo' || $key === 'google_analytics' || $key === 'facebook_pixel') { |
| 688 | 960 | return esc_url_raw($value); |
| 689 | 961 | } |
| 690 | - if ($key === 'refund_policy' || $key === 'cancellation_policy') { | |
| 691 | - return sanitize_textarea_field($value); | |
| 692 | - } | |
| 693 | 962 | if ($key === 'seo_trip_meta_title') { |
| 694 | 963 | // Allow more characters for meta title, but strip HTML |
| 695 | 964 | return wp_strip_all_tags($value); |
| 696 | 965 | } |
| @@ -709,8 +978,18 @@ | ||
| 709 | 978 | return \Yatra\Utils\FrontendThemeCss::sanitizeContainerMaxWidthSetting( |
| 710 | 979 | is_string($value) ? $value : '' |
| 711 | 980 | ); |
| 712 | 981 | } |
| 982 | + if ($key === 'frontend_listing_card_layout') { | |
| 983 | + $allowed = ['standard', 'compact_mobile', 'compact_all']; | |
| 984 | + $v = is_string($value) ? strtolower(trim($value)) : ''; | |
| 985 | + return in_array($v, $allowed, true) ? $v : 'standard'; | |
| 986 | + } | |
| 987 | + if ($key === 'auto_confirm_mode') { | |
| 988 | + $allowed = ['none', 'online', 'all']; | |
| 989 | + $v = is_string($value) ? strtolower(trim($value)) : ''; | |
| 990 | + return in_array($v, $allowed, true) ? $v : 'online'; | |
| 991 | + } | |
| 713 | 992 | if (is_string($key) && strpos($key, 'email_tpl_') === 0 && substr($key, -5) === '_body') { |
| 714 | 993 | return wp_kses_post((string) $value); |
| 715 | 994 | } |
| 716 | 995 | if (is_string($key) && strpos($key, 'email_tpl_') === 0 && substr($key, -8) === '_subject') { |
| @@ -726,15 +1005,8 @@ | ||
| 726 | 1005 | return $this->sanitize_gateway_configs($value); |
| 727 | 1006 | } |
| 728 | 1007 | return []; |
| 729 | 1008 | } |
| 730 | - if ($key === 'booking_form_config') { | |
| 731 | - // Handle nested array structure for booking form config | |
| 732 | - if (is_array($value)) { | |
| 733 | - return $this->sanitize_booking_form_config($value); | |
| 734 | - } | |
| 735 | - return []; | |
| 736 | - } | |
| 737 | 1009 | if ($key === 'tax_rates') { |
| 738 | 1010 | // Handle nested array structure for tax rates |
| 739 | 1011 | if (is_array($value)) { |
| 740 | 1012 | return $this->sanitize_tax_rates($value); |
| @@ -960,70 +1232,194 @@ | ||
| 960 | 1232 | private function sanitize_booking_form_config(array $config): array |
| 961 | 1233 | { |
| 962 | 1234 | $sanitized = []; |
| 963 | 1235 | $allowed_form_types = ['contact_form', 'emergency_contact_form', 'traveler_form']; |
| 964 | - $allowed_field_types = ['text', 'email', 'tel', 'date', 'select', 'country', 'textarea', 'checkbox', 'number']; | |
| 965 | - $allowed_widths = ['full', 'half', 'third']; | |
| 966 | - | |
| 1236 | + | |
| 967 | 1237 | foreach ($config as $form_type => $form_config) { |
| 968 | 1238 | if (!in_array($form_type, $allowed_form_types, true)) { |
| 969 | 1239 | continue; |
| 970 | 1240 | } |
| 971 | - | |
| 1241 | + | |
| 972 | 1242 | $sanitized[$form_type] = [ |
| 973 | 1243 | 'title' => isset($form_config['title']) ? sanitize_text_field($form_config['title']) : '', |
| 974 | 1244 | 'description' => isset($form_config['description']) ? sanitize_text_field($form_config['description']) : '', |
| 975 | 1245 | 'enabled' => isset($form_config['enabled']) ? (bool) $form_config['enabled'] : true, |
| 976 | - 'fields' => [], | |
| 1246 | + 'fields' => $this->sanitize_booking_form_fields($form_config['fields'] ?? null, $form_type), | |
| 977 | 1247 | ]; |
| 978 | - | |
| 979 | - if (!empty($form_config['fields']) && is_array($form_config['fields'])) { | |
| 980 | - foreach ($form_config['fields'] as $field) { | |
| 981 | - if (!is_array($field) || empty($field['id'])) { | |
| 982 | - continue; | |
| 1248 | + | |
| 1249 | + // Per-trip form conditions (Pro Dynamic Form Field): each condition | |
| 1250 | + // is a complete alternative version of this section — its own | |
| 1251 | + // title, description and field list — used on the trips it names. | |
| 1252 | + // Only persisted when there is at least one, so configs saved | |
| 1253 | + // without the feature stay byte-identical. | |
| 1254 | + $conditions = $this->sanitize_booking_form_conditions($form_config['conditions'] ?? null, $form_type); | |
| 1255 | + if ($conditions !== []) { | |
| 1256 | + $sanitized[$form_type]['conditions'] = $conditions; | |
| 1257 | + } | |
| 1258 | + } | |
| 1259 | + | |
| 1260 | + return apply_filters('yatra_save_booking_form_config', $sanitized, $config); | |
| 1261 | + } | |
| 1262 | + | |
| 1263 | + /** | |
| 1264 | + * Sanitise one section's field list (global fields or a condition's fields). | |
| 1265 | + * | |
| 1266 | + * @param mixed $fields | |
| 1267 | + * @return array<int, array<string, mixed>> | |
| 1268 | + */ | |
| 1269 | + private function sanitize_booking_form_fields($fields, string $form_type): array | |
| 1270 | + { | |
| 1271 | + $allowed_field_types = ['text', 'email', 'tel', 'date', 'select', 'country', 'textarea', 'checkbox', 'number', 'text_block']; | |
| 1272 | + $allowed_widths = ['full', 'half', 'third']; | |
| 1273 | + $sanitized = []; | |
| 1274 | + | |
| 1275 | + if (empty($fields) || !is_array($fields)) { | |
| 1276 | + return $sanitized; | |
| 1277 | + } | |
| 1278 | + | |
| 1279 | + foreach ($fields as $field) { | |
| 1280 | + if (!is_array($field) || empty($field['id'])) { | |
| 1281 | + continue; | |
| 1282 | + } | |
| 1283 | + | |
| 1284 | + $sanitized_field = [ | |
| 1285 | + 'id' => sanitize_key($field['id']), | |
| 1286 | + 'type' => in_array($field['type'] ?? 'text', $allowed_field_types, true) ? $field['type'] : 'text', | |
| 1287 | + 'label' => isset($field['label']) ? sanitize_text_field($field['label']) : '', | |
| 1288 | + 'placeholder' => isset($field['placeholder']) ? sanitize_text_field($field['placeholder']) : '', | |
| 1289 | + 'required' => isset($field['required']) ? (bool) $field['required'] : false, | |
| 1290 | + 'enabled' => isset($field['enabled']) ? (bool) $field['enabled'] : true, | |
| 1291 | + 'order' => isset($field['order']) ? (int) $field['order'] : 0, | |
| 1292 | + 'width' => in_array($field['width'] ?? 'full', $allowed_widths, true) ? ($field['width'] ?? 'full') : 'full', | |
| 1293 | + ]; | |
| 1294 | + | |
| 1295 | + // Only persist `locked` when set: every reader treats a missing key | |
| 1296 | + // as unlocked, and configs saved before this sanitiser ran never | |
| 1297 | + // carried a `locked => false`, so they stay byte-identical. | |
| 1298 | + if (!empty($field['locked'])) { | |
| 1299 | + $sanitized_field['locked'] = true; | |
| 1300 | + } | |
| 1301 | + | |
| 1302 | + // Handle optional section | |
| 1303 | + if (!empty($field['section'])) { | |
| 1304 | + $sanitized_field['section'] = sanitize_key($field['section']); | |
| 1305 | + } | |
| 1306 | + | |
| 1307 | + // Per-traveler targeting — Traveler section only. Whitelist | |
| 1308 | + // the allowed values; only persist the non-default "lead" so | |
| 1309 | + // other sections and existing configs stay byte-identical. | |
| 1310 | + if ( | |
| 1311 | + $form_type === 'traveler_form' | |
| 1312 | + && ($field['applies_to'] ?? 'all') === 'lead' | |
| 1313 | + ) { | |
| 1314 | + $sanitized_field['applies_to'] = 'lead'; | |
| 1315 | + } | |
| 1316 | + | |
| 1317 | + // Handle options for select fields | |
| 1318 | + if ($sanitized_field['type'] === 'select' && !empty($field['options']) && is_array($field['options'])) { | |
| 1319 | + $sanitized_field['options'] = []; | |
| 1320 | + foreach ($field['options'] as $option) { | |
| 1321 | + if (is_array($option) && isset($option['value'])) { | |
| 1322 | + $sanitized_field['options'][] = [ | |
| 1323 | + 'value' => sanitize_key($option['value']), | |
| 1324 | + 'label' => isset($option['label']) ? sanitize_text_field($option['label']) : $option['value'], | |
| 1325 | + ]; | |
| 983 | 1326 | } |
| 984 | - | |
| 985 | - $sanitized_field = [ | |
| 986 | - 'id' => sanitize_key($field['id']), | |
| 987 | - 'type' => in_array($field['type'] ?? 'text', $allowed_field_types, true) ? $field['type'] : 'text', | |
| 988 | - 'label' => isset($field['label']) ? sanitize_text_field($field['label']) : '', | |
| 989 | - 'placeholder' => isset($field['placeholder']) ? sanitize_text_field($field['placeholder']) : '', | |
| 990 | - 'required' => isset($field['required']) ? (bool) $field['required'] : false, | |
| 991 | - 'enabled' => isset($field['enabled']) ? (bool) $field['enabled'] : true, | |
| 992 | - 'order' => isset($field['order']) ? (int) $field['order'] : 0, | |
| 993 | - 'width' => in_array($field['width'] ?? 'full', $allowed_widths, true) ? $field['width'] : 'full', | |
| 994 | - 'locked' => isset($field['locked']) ? (bool) $field['locked'] : false, | |
| 995 | - ]; | |
| 996 | - | |
| 997 | - // Handle optional section | |
| 998 | - if (!empty($field['section'])) { | |
| 999 | - $sanitized_field['section'] = sanitize_key($field['section']); | |
| 1327 | + } | |
| 1328 | + } | |
| 1329 | + | |
| 1330 | + // A text block is display-only content placed between fields: | |
| 1331 | + // keep its (safe-HTML) content, and it can never be required. | |
| 1332 | + if ($sanitized_field['type'] === 'text_block') { | |
| 1333 | + $sanitized_field['content'] = isset($field['content']) ? wp_kses_post($field['content']) : ''; | |
| 1334 | + $sanitized_field['required'] = false; | |
| 1335 | + } | |
| 1336 | + | |
| 1337 | + // Phone fields: the country-code selector is ON by default. | |
| 1338 | + // Only persist the non-default `false`, so existing configs | |
| 1339 | + // (which never carried this key) stay byte-identical and read | |
| 1340 | + // back as ON. | |
| 1341 | + if ( | |
| 1342 | + $sanitized_field['type'] === 'tel' | |
| 1343 | + && array_key_exists('show_country_code', $field) | |
| 1344 | + && !$field['show_country_code'] | |
| 1345 | + ) { | |
| 1346 | + $sanitized_field['show_country_code'] = false; | |
| 1347 | + } | |
| 1348 | + | |
| 1349 | + $sanitized[] = $sanitized_field; | |
| 1350 | + } | |
| 1351 | + | |
| 1352 | + // Sort fields by order | |
| 1353 | + usort($sanitized, function ($a, $b) { | |
| 1354 | + return ($a['order'] ?? 0) - ($b['order'] ?? 0); | |
| 1355 | + }); | |
| 1356 | + | |
| 1357 | + return $sanitized; | |
| 1358 | + } | |
| 1359 | + | |
| 1360 | + /** | |
| 1361 | + * Sanitise a section's per-trip conditions. A condition without any | |
| 1362 | + * target (trip, category or trip type) can never match and is dropped. | |
| 1363 | + * | |
| 1364 | + * @param mixed $conditions | |
| 1365 | + * @return array<int, array<string, mixed>> | |
| 1366 | + */ | |
| 1367 | + private function sanitize_booking_form_conditions($conditions, string $form_type): array | |
| 1368 | + { | |
| 1369 | + if (empty($conditions) || !is_array($conditions)) { | |
| 1370 | + return []; | |
| 1371 | + } | |
| 1372 | + | |
| 1373 | + $allowed_trip_types = ['single_day', 'multi_day', 'flexible']; | |
| 1374 | + $sanitized = []; | |
| 1375 | + $n = 0; | |
| 1376 | + | |
| 1377 | + foreach ($conditions as $condition) { | |
| 1378 | + if (!is_array($condition)) { | |
| 1379 | + continue; | |
| 1380 | + } | |
| 1381 | + $n++; | |
| 1382 | + | |
| 1383 | + $raw_targets = is_array($condition['targets'] ?? null) ? $condition['targets'] : []; | |
| 1384 | + $targets = []; | |
| 1385 | + foreach (['trips', 'categories'] as $selector) { | |
| 1386 | + $ids = array_values(array_unique(array_filter( | |
| 1387 | + array_map('intval', is_array($raw_targets[$selector] ?? null) ? $raw_targets[$selector] : []), | |
| 1388 | + static function ($id) { | |
| 1389 | + return $id > 0; | |
| 1000 | 1390 | } |
| 1001 | - | |
| 1002 | - // Handle options for select fields | |
| 1003 | - if ($sanitized_field['type'] === 'select' && !empty($field['options']) && is_array($field['options'])) { | |
| 1004 | - $sanitized_field['options'] = []; | |
| 1005 | - foreach ($field['options'] as $option) { | |
| 1006 | - if (is_array($option) && isset($option['value'])) { | |
| 1007 | - $sanitized_field['options'][] = [ | |
| 1008 | - 'value' => sanitize_key($option['value']), | |
| 1009 | - 'label' => isset($option['label']) ? sanitize_text_field($option['label']) : $option['value'], | |
| 1010 | - ]; | |
| 1011 | - } | |
| 1012 | - } | |
| 1013 | - } | |
| 1014 | - | |
| 1015 | - $sanitized[$form_type]['fields'][] = $sanitized_field; | |
| 1391 | + ))); | |
| 1392 | + if ($ids !== []) { | |
| 1393 | + $targets[$selector] = $ids; | |
| 1016 | 1394 | } |
| 1017 | - | |
| 1018 | - // Sort fields by order | |
| 1019 | - usort($sanitized[$form_type]['fields'], function($a, $b) { | |
| 1020 | - return ($a['order'] ?? 0) - ($b['order'] ?? 0); | |
| 1021 | - }); | |
| 1022 | 1395 | } |
| 1396 | + $types = array_values(array_unique(array_filter( | |
| 1397 | + array_map(static function ($t) { | |
| 1398 | + return sanitize_key((string) $t); | |
| 1399 | + }, is_array($raw_targets['trip_types'] ?? null) ? $raw_targets['trip_types'] : []), | |
| 1400 | + static function ($t) use ($allowed_trip_types) { | |
| 1401 | + return in_array($t, $allowed_trip_types, true); | |
| 1402 | + } | |
| 1403 | + ))); | |
| 1404 | + if ($types !== []) { | |
| 1405 | + $targets['trip_types'] = $types; | |
| 1406 | + } | |
| 1407 | + if ($targets === []) { | |
| 1408 | + continue; | |
| 1409 | + } | |
| 1410 | + | |
| 1411 | + $id = sanitize_key((string) ($condition['id'] ?? '')); | |
| 1412 | + $sanitized[] = [ | |
| 1413 | + 'id' => $id !== '' ? $id : 'condition_' . $n, | |
| 1414 | + 'targets' => $targets, | |
| 1415 | + 'title' => isset($condition['title']) ? sanitize_text_field($condition['title']) : '', | |
| 1416 | + 'description' => isset($condition['description']) ? sanitize_text_field($condition['description']) : '', | |
| 1417 | + 'fields' => $this->sanitize_booking_form_fields($condition['fields'] ?? null, $form_type), | |
| 1418 | + ]; | |
| 1023 | 1419 | } |
| 1024 | - | |
| 1025 | - return apply_filters('yatra_save_booking_form_config', $sanitized, $config); | |
| 1420 | + | |
| 1421 | + return $sanitized; | |
| 1026 | 1422 | } |
| 1027 | 1423 | |
| 1028 | 1424 | /** |
| 1029 | 1425 | * Flush rewrite rules |
