| @@ -2,8 +2,9 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Booktics\Order\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Booktics\Abstracts\Base_Rest_Controller; |
| 6 | +use Booktics\Appointment\Services\Appointment_Validator; | |
| 6 | 7 | use Booktics\Abstracts\Booktics_Database; |
| 7 | 8 | use Booktics\Abstracts\User_Model; |
| 8 | 9 | use Booktics\Cart\Cart_Manager; |
| 9 | 10 | use Booktics\Customer\Handlers\Customer_Event_Handler; |
| @@ -14,8 +15,11 @@ | ||
| 14 | 15 | use Booktics\Models\Payment_Model; |
| 15 | 16 | use Booktics\Models\Service_Model; |
| 16 | 17 | use Booktics\Models\Team_Member_Model; |
| 17 | 18 | use Booktics\Order\Order_Validator; |
| 19 | +use Booktics\Order\Services\Order_Key; | |
| 20 | +use Booktics\Order\Services\Order_Notifier; | |
| 21 | +use Booktics\Order\Services\Abandoned_Booking_Cleanup; | |
| 18 | 22 | use Booktics\Payment\Payment_Method_Manager; |
| 19 | 23 | use Booktics\Payment\Payment_Status; |
| 20 | 24 | use Booktics\Services\Time_Zone_Handler; |
| 21 | 25 | use DateTime; |
| @@ -154,9 +158,9 @@ | ||
| 154 | 158 | 'methods' => WP_REST_Server::EDITABLE, |
| 155 | 159 | 'callback' => array( $this, 'refund_payment' ), |
| 156 | 160 | 'permission_callback' => array( |
| 157 | 161 | $this, |
| 158 | - 'update_payment_status_permission', | |
| 162 | + 'refund_payment_permission', | |
| 159 | 163 | ), |
| 160 | 164 | ), |
| 161 | 165 | ) |
| 162 | 166 | ); |
| @@ -214,12 +218,14 @@ | ||
| 214 | 218 | $db->roll_back(); |
| 215 | 219 | return $this->error( $e->getMessage() ); |
| 216 | 220 | } |
| 217 | 221 | |
| 218 | - $this->send_notifications( $db, $order_model, $input_data['customer_id'], $appointments ); | |
| 222 | + if ( empty( $input_data['pay_now'] ) ) { | |
| 223 | + $this->send_notifications( $db, $order_model, $input_data['customer_id'], $appointments ); | |
| 224 | + } | |
| 219 | 225 | $response = $this->format_order_response( $db, $order_model, $input_data, $payment_intent ); |
| 220 | 226 | do_action('booktics_after_order_created', $order_model, $appointments); |
| 221 | - | |
| 227 | + | |
| 222 | 228 | $response_message = 'Order created successfully'; |
| 223 | 229 | if ( isset( $input_data['pay_now']) && $input_data['pay_now'] ) { |
| 224 | 230 | $response_message = 'Order pending, please proceed payment'; |
| 225 | 231 | } |
| @@ -265,8 +271,22 @@ | ||
| 265 | 271 | ); |
| 266 | 272 | if ( is_wp_error( $validate ) ) { |
| 267 | 273 | return $validate; |
| 268 | 274 | } |
| 275 | + | |
| 276 | + // WooCommerce checkout carries one booking at a time: the cart is | |
| 277 | + // emptied and a single line item added, so a multi-item order would | |
| 278 | + // silently lose everything but the first appointment. | |
| 279 | + if ( | |
| 280 | + 'woocommerce' === strtolower( (string) $input_data['payment_method'] ) | |
| 281 | + && is_array( $input_data['items'] ?? null ) | |
| 282 | + && count( $input_data['items'] ) > 1 | |
| 283 | + ) { | |
| 284 | + return new WP_Error( | |
| 285 | + 'items', | |
| 286 | + __( 'WooCommerce checkout supports one service at a time. Please book them separately.', 'booktics' ) | |
| 287 | + ); | |
| 288 | + } | |
| 269 | 289 | } |
| 270 | 290 | |
| 271 | 291 | // Step 4: Process and validate each item |
| 272 | 292 | if ( ! is_array( $input_data['items'] ) || count( $input_data['items'] ) == 0 ) { |
| @@ -274,18 +294,32 @@ | ||
| 274 | 294 | } |
| 275 | 295 | |
| 276 | 296 | foreach ( $input_data['items'] as $key => $item ) { |
| 277 | 297 | // Validate required fields for each item |
| 278 | - $item_validate = booktics_validate( | |
| 279 | - $item, array( | |
| 280 | - 'date' => array( 'required' ), | |
| 281 | - 'start_time' => array( 'required' ), | |
| 282 | - 'end_time' => array( 'required' ), | |
| 283 | - 'team_member_id' => array( 'required' ), | |
| 284 | - 'service_id' => array( 'required' ), | |
| 285 | - ) | |
| 298 | + $item_rules = array( | |
| 299 | + 'date' => array( 'required' ), | |
| 300 | + 'start_time' => array( 'required' ), | |
| 301 | + 'end_time' => array( 'required' ), | |
| 302 | + 'team_member_id' => array( 'required' ), | |
| 303 | + 'service_id' => array( 'required' ), | |
| 286 | 304 | ); |
| 287 | 305 | |
| 306 | + /** | |
| 307 | + * Filters the validation rules applied to a single order item. | |
| 308 | + * | |
| 309 | + * Extensions that assign a team member server-side (Booktics Pro | |
| 310 | + * round robin) drop the team_member_id requirement here. | |
| 311 | + * | |
| 312 | + * @since 1.0.26 | |
| 313 | + * | |
| 314 | + * @param array $item_rules Validation rules. | |
| 315 | + * @param array $item The order item being validated. | |
| 316 | + * @param array $input_data The whole order payload. | |
| 317 | + */ | |
| 318 | + $item_rules = apply_filters( 'booktics_order_item_validation_rules', $item_rules, $item, $input_data ); | |
| 319 | + | |
| 320 | + $item_validate = booktics_validate( $item, $item_rules ); | |
| 321 | + | |
| 288 | 322 | if ( is_wp_error( $item_validate ) ) { |
| 289 | 323 | return $item_validate; |
| 290 | 324 | } |
| 291 | 325 | |
| @@ -308,19 +342,18 @@ | ||
| 308 | 342 | if ( ! $start_time || ! $end_time || $start_time >= $end_time ) { |
| 309 | 343 | return new WP_Error( 'time_invalid', __( 'Invalid time range provided', 'booktics' ) ); |
| 310 | 344 | } |
| 311 | 345 | |
| 312 | - // In validate_and_prepare_order_data(), after converting times: | |
| 313 | - $item_with_converted_times = array_merge($item, [ | |
| 314 | - 'start_time' => $converted_start_time['time'], | |
| 315 | - 'end_time' => $converted_end_time['time'], | |
| 316 | - 'date' => gmdate('Y-m-d', strtotime($converted_start_time['date'])) | |
| 317 | - ]); | |
| 346 | + // Attendee count decides both capacity and price, so resolve it once | |
| 347 | + // here and reuse the same number everywhere. Reading it separately | |
| 348 | + // let a client book N seats while paying for one. | |
| 349 | + $attendees = $this->resolve_item_attendees( $item, $input_data ); | |
| 318 | 350 | |
| 319 | - $item_timet_slot_validate = $this->validate_appointment_time_is_free($item_with_converted_times); | |
| 320 | - | |
| 321 | - if ( is_wp_error( $item_timet_slot_validate ) ) { | |
| 322 | - return $item_timet_slot_validate; | |
| 351 | + // Money is never taken from the request. Whatever price/subtotal/total | |
| 352 | + // the client sent is discarded and rebuilt from the service record. | |
| 353 | + $amount = $this->calculate_item_amount( $item, $attendees ); | |
| 354 | + if ( is_wp_error( $amount ) ) { | |
| 355 | + return $amount; | |
| 323 | 356 | } |
| 324 | 357 | |
| 325 | 358 | // Sanitize and prepare item data |
| 326 | 359 | $input_data['items'][ $key ] = array( |
| @@ -329,17 +362,32 @@ | ||
| 329 | 362 | 'date' => gmdate( 'Y-m-d', strtotime( $item['date'] ) ), |
| 330 | 363 | 'customer_id' => isset( $item['customer_id'] ) ? absint( $item['customer_id'] ) : null, |
| 331 | 364 | 'team_member_id' => absint( $item['team_member_id'] ), |
| 332 | 365 | 'service_id' => absint( $item['service_id'] ), |
| 333 | - 'additional_duration_id' => $item['additional_duration_id'] ?? '', | |
| 334 | - 'price' => floatval( $item['price'] ?? 0 ), | |
| 335 | - 'subtotal' => floatval( $item['subtotal'] ?? 0 ), | |
| 366 | + 'additional_duration_id' => booktics_sanitize_id_string( $item['additional_duration_id'] ?? '' ), | |
| 367 | + 'price' => $amount['price'], | |
| 368 | + 'subtotal' => $amount['total'], | |
| 369 | + 'total' => $amount['total'], | |
| 336 | 370 | 'quantity' => absint( $item['quantity'] ?? 1 ), |
| 337 | - 'total_attendees' => absint( $item['total_attendees'] ?? 1 ), | |
| 371 | + 'total_attendees' => $attendees, | |
| 338 | 372 | ); |
| 339 | 373 | $input_data['items'][$key] = apply_filters('booktics_pro_appointment_validate', $input_data['items'][$key], $item); |
| 340 | 374 | } |
| 341 | 375 | |
| 376 | + // Order totals are the sum of the recalculated lines. Tax and coupons are | |
| 377 | + // settled by the gateway after checkout (WooCommerce writes the real | |
| 378 | + // values back), so nothing the client sent for them is trusted here. | |
| 379 | + $order_total = 0.0; | |
| 380 | + foreach ( $input_data['items'] as $prepared_item ) { | |
| 381 | + $order_total += (float) $prepared_item['total']; | |
| 382 | + } | |
| 383 | + | |
| 384 | + $input_data['subtotal'] = round( $order_total, 2 ); | |
| 385 | + $input_data['total'] = round( $order_total, 2 ); | |
| 386 | + $input_data['tax_total'] = 0; | |
| 387 | + $input_data['coupon_discount'] = 0; | |
| 388 | + $input_data['coupon_code'] = ''; | |
| 389 | + | |
| 342 | 390 | $input_data = apply_filters( 'booktics_pro_order_validate', $input_data ); |
| 343 | 391 | |
| 344 | 392 | return $input_data; |
| 345 | 393 | } |
| @@ -344,131 +392,120 @@ | ||
| 344 | 392 | return $input_data; |
| 345 | 393 | } |
| 346 | 394 | |
| 347 | 395 | /** |
| 348 | - * Check if the requested time slot has available capacity for the given team member | |
| 349 | - * Works by checking all appointments for this team member on this date and calculating remaining capacity | |
| 350 | - * | |
| 351 | - * @param array $item Appointment item data | |
| 352 | - * @return bool|WP_Error True if time slot has capacity, WP_Error if not | |
| 396 | + * Resolve how many attendees a single booking line is for. | |
| 397 | + * | |
| 398 | + * Group booking sends the count inside the item; older payloads put a single | |
| 399 | + * count at the root. One resolved value is then used for the capacity check, | |
| 400 | + * the price and the stored appointment. | |
| 401 | + * | |
| 402 | + * @param array $item Raw item from the request. | |
| 403 | + * @param array $input_data Raw order payload. | |
| 404 | + * | |
| 405 | + * @return int | |
| 353 | 406 | */ |
| 354 | - private function validate_appointment_time_is_free( $item ) { | |
| 355 | - try { | |
| 356 | - // Convert times to DateTime objects | |
| 357 | - $requested_start = new \DateTime( $item['date'] . ' ' . $item['start_time'] ); | |
| 358 | - $requested_end = new \DateTime( $item['date'] . ' ' . $item['end_time'] ); | |
| 359 | - | |
| 360 | - // Get the requested attendee count (default to 1 for backward compatibility) | |
| 361 | - $requested_attendees = isset( $item['total_attendees'] ) ? (int) $item['total_attendees'] : 1; | |
| 362 | - | |
| 363 | - // Get service to check if group booking is enabled and get max capacity | |
| 364 | - $service = Service_Model::find($item['service_id']); | |
| 365 | - if ( ! $service ) { | |
| 366 | - return new \WP_Error( 'service_not_found', __( 'Service not found', 'booktics' ) ); | |
| 367 | - } | |
| 368 | - | |
| 369 | - $max_group_size = $this->get_service_max_group_size( $service->id ); | |
| 407 | + private function resolve_item_attendees( $item, $input_data ) { | |
| 408 | + $group_booking = is_array( $item['group_booking'] ?? null ) ? $item['group_booking'] : array(); | |
| 370 | 409 | |
| 371 | - | |
| 372 | - $args = [ | |
| 373 | - 'team_member_id' => $item['team_member_id'], | |
| 374 | - 'date' => $item['date'], | |
| 375 | - 'post_status' => booktics_get_option('appointment_statuses_for_blocked_slot', []), | |
| 376 | - ]; | |
| 410 | + $attendees = $group_booking['attendee_count'] | |
| 411 | + ?? $item['total_attendees'] | |
| 412 | + ?? $input_data['total_attendees'] | |
| 413 | + ?? 1; | |
| 377 | 414 | |
| 378 | - // Get all non-cancelled appointments for this team member on this date | |
| 379 | - $appointments = Appointment_Model::all( $args ); | |
| 415 | + return max( 1, absint( $attendees ) ); | |
| 416 | + } | |
| 380 | 417 | |
| 381 | - if ( ! is_array( $appointments ) || empty( $appointments ) ) { | |
| 382 | - // No existing appointments, check if requested attendees fit within max capacity | |
| 383 | - if ( $requested_attendees > $max_group_size ) { | |
| 384 | - /* translators: %1$d = requested attendees, %2$d = maximum group size */ | |
| 385 | - return new \WP_Error( 'exceeds_max_capacity', sprintf( __( 'Requested attendees (%1$d) exceeds maximum group size (%2$d) for this service.', 'booktics' ), $requested_attendees, $max_group_size ) ); | |
| 386 | - } | |
| 418 | + /** | |
| 419 | + * Calculate what a booking line actually costs, from the service record. | |
| 420 | + * | |
| 421 | + * @param array $item Raw item from the request. | |
| 422 | + * @param int $attendees Resolved attendee count for this line. | |
| 423 | + * | |
| 424 | + * @return array|WP_Error array{price: float, total: float} | |
| 425 | + */ | |
| 426 | + private function calculate_item_amount( $item, $attendees ) { | |
| 427 | + $service_id = absint( $item['service_id'] ?? 0 ); | |
| 428 | + $service = Service_Model::find( $service_id ); | |
| 387 | 429 | |
| 388 | - return true; | |
| 389 | - } | |
| 430 | + if ( ! $service ) { | |
| 431 | + return new WP_Error( 'service_not_found', __( 'Service not found', 'booktics' ) ); | |
| 432 | + } | |
| 390 | 433 | |
| 391 | - // Calculate total attendees for overlapping time slots | |
| 392 | - $overlapping_attendees = 0; | |
| 434 | + $durations = is_array( $service->additional_durations ) ? $service->additional_durations : array(); | |
| 393 | 435 | |
| 394 | - foreach ( $appointments as $appointment ) { | |
| 395 | - // Skip if this is the same appointment (for updates) | |
| 396 | - if ( isset($item['id']) && $appointment->ID == $item['id'] ) { | |
| 397 | - continue; | |
| 398 | - } | |
| 399 | - | |
| 400 | - $appt_start = new \DateTime( $appointment->date . ' ' . $appointment->start_time ); | |
| 401 | - $appt_end = new \DateTime( $appointment->date . ' ' . $appointment->end_time ); | |
| 436 | + if ( empty( $durations ) ) { | |
| 437 | + return new WP_Error( 'invalid_duration', __( 'This service has no bookable duration.', 'booktics' ) ); | |
| 438 | + } | |
| 402 | 439 | |
| 403 | - // Check for time overlap | |
| 404 | - if ( ! ( $requested_end <= $appt_start || $requested_start >= $appt_end ) ) { | |
| 405 | - // Times overlap, add this appointment's attendees to the count | |
| 406 | - $appointment_attendees = $appointment->total_attendees ?? 1; | |
| 407 | - $overlapping_attendees += $appointment_attendees; | |
| 408 | - } | |
| 440 | + $requested_id = booktics_sanitize_id_string( $item['additional_duration_id'] ?? '' ); | |
| 441 | + $selected = null; | |
| 442 | + | |
| 443 | + foreach ( $durations as $duration ) { | |
| 444 | + if ( (string) ( $duration['id'] ?? '' ) === (string) $requested_id ) { | |
| 445 | + $selected = $duration; | |
| 446 | + break; | |
| 409 | 447 | } |
| 410 | - | |
| 411 | - // Check if adding the requested attendees would exceed capacity | |
| 412 | - $total_after_booking = $overlapping_attendees + $requested_attendees; | |
| 413 | - | |
| 414 | - if ($total_after_booking > $max_group_size) { | |
| 415 | - return new \WP_Error( 'insufficient_capacity', __( 'Insufficient capacity' , 'booktics' ) ); | |
| 448 | + } | |
| 449 | + | |
| 450 | + // A single-duration service may be booked without naming the duration, | |
| 451 | + // but an unknown id must never silently fall back to a cheaper one. | |
| 452 | + if ( null === $selected ) { | |
| 453 | + if ( '' !== $requested_id ) { | |
| 454 | + return new WP_Error( 'invalid_duration', __( 'Invalid duration selected for this service.', 'booktics' ) ); | |
| 416 | 455 | } |
| 456 | + $selected = reset( $durations ); | |
| 457 | + } | |
| 417 | 458 | |
| 418 | - return true; | |
| 419 | - } catch ( \Throwable $e ) { | |
| 420 | - return new \WP_Error( | |
| 421 | - 'time_validation_error', | |
| 422 | - __( 'Error validating appointment time. Please try another slot.', 'booktics' ) | |
| 423 | - ); | |
| 424 | - } | |
| 459 | + $price = (float) ( $selected['charge_amount'] ?? 0 ); | |
| 460 | + | |
| 461 | + // Add-ons priced by booktics-pro (extra services). Runs before the | |
| 462 | + // attendee multiplier so add-ons scale with the group, matching the | |
| 463 | + // price the booking form showed. | |
| 464 | + $total = (float) apply_filters( 'booktics_order_item_amount', $price, $item, $service, $attendees ); | |
| 465 | + $total = $total * $this->get_attendee_multiplier( $service_id, $attendees ); | |
| 466 | + | |
| 467 | + return array( | |
| 468 | + 'price' => round( max( 0, $price ), 2 ), | |
| 469 | + 'total' => round( max( 0, $total ), 2 ), | |
| 470 | + ); | |
| 425 | 471 | } |
| 426 | 472 | |
| 427 | 473 | /** |
| 428 | - * Get max group size for a specific service | |
| 429 | - * | |
| 430 | - * @param int $service_id Service ID | |
| 431 | - * | |
| 432 | - * @return int Max group size | |
| 474 | + * How many times a line price is charged for a group booking. | |
| 475 | + * | |
| 476 | + * Services that charge per attendee bill the flat price once; the rest | |
| 477 | + * multiply it by the number of people, which is what the booking form does. | |
| 478 | + * | |
| 479 | + * @param int $service_id Service ID. | |
| 480 | + * @param int $attendees Resolved attendee count. | |
| 481 | + * | |
| 482 | + * @return int | |
| 433 | 483 | */ |
| 434 | - private function get_service_max_group_size( $service_id ) { | |
| 435 | - $default_max_size = 1; | |
| 436 | - $group_booking_meta = get_post_meta( $service_id, 'group_booking', true ); | |
| 437 | - | |
| 438 | - if ( ! $this->is_group_booking_enabled( $group_booking_meta ) ) { | |
| 439 | - return $default_max_size; | |
| 484 | + private function get_attendee_multiplier( $service_id, $attendees ) { | |
| 485 | + $group_booking = get_post_meta( $service_id, 'group_booking', true ); | |
| 486 | + | |
| 487 | + if ( ! $this->is_group_booking_enabled( $group_booking ) ) { | |
| 488 | + return 1; | |
| 440 | 489 | } |
| 441 | 490 | |
| 442 | - return $this->extract_max_booking_size( $group_booking_meta, $default_max_size ); | |
| 491 | + if ( ! empty( $group_booking['charge_per_attendee'] ) ) { | |
| 492 | + return 1; | |
| 493 | + } | |
| 494 | + | |
| 495 | + return max( 1, (int) $attendees ); | |
| 443 | 496 | } |
| 444 | - | |
| 497 | + | |
| 445 | 498 | /** |
| 446 | 499 | * Checks if group booking is enabled for a services group booking meta data |
| 447 | - * | |
| 500 | + * | |
| 448 | 501 | * @param array $group_booking_meta Group booking meta data |
| 449 | - * | |
| 502 | + * | |
| 450 | 503 | * @return bool True if group booking is enabled, false otherwise |
| 451 | 504 | */ |
| 452 | 505 | private function is_group_booking_enabled( $group_booking_meta ) { |
| 453 | 506 | return !empty( $group_booking_meta ) && is_array( $group_booking_meta ) && !empty( $group_booking_meta['enable_group_booking'] ); |
| 454 | 507 | } |
| 455 | - | |
| 456 | - /** | |
| 457 | - * Extracts the max booking size from the group booking meta data of a service | |
| 458 | - * | |
| 459 | - * @param array $group_booking_meta Group booking meta data | |
| 460 | - * @param int $default_size Default max booking size | |
| 461 | - * | |
| 462 | - * @return int Max booking size | |
| 463 | - */ | |
| 464 | - private function extract_max_booking_size( $group_booking_meta, $default_size ) { | |
| 465 | - if ( isset( $group_booking_meta['max_booking'] ) && is_numeric( $group_booking_meta['max_booking'] ) ) { | |
| 466 | - return (int) $group_booking_meta['max_booking']; | |
| 467 | - } | |
| 468 | - | |
| 469 | - return $default_size; | |
| 470 | - } | |
| 471 | 508 | |
| 472 | 509 | /** |
| 473 | 510 | * Resolve the customer ID from input data, creating or finding the customer as needed |
| 474 | 511 | * |
| @@ -531,16 +568,25 @@ | ||
| 531 | 568 | ( new Cart_Manager() )->remove_cart_item( $item['uuid'] ); |
| 532 | 569 | } |
| 533 | 570 | $total_duration_min = $this->calculate_total_duration( $item ); |
| 534 | 571 | |
| 572 | + // Store date/time in a locale-independent format. wp_date() localizes digits and | |
| 573 | + // am/pm markers (e.g. Bengali "১১:০০ সকাল"), and such values cannot be parsed back | |
| 574 | + // by DateTime, breaking slot validation and notifications. DateTime::format() keeps | |
| 575 | + // the same timezone-aware value but is never localized. | |
| 576 | + $time_format = get_option( 'time_format' ); | |
| 577 | + $start_local = ( new \DateTime( '@' . strtotime( $item['start_time'] ) ) )->setTimezone( $input_timezone ); | |
| 578 | + $end_local = ( new \DateTime( '@' . strtotime( $item['end_time'] ) ) )->setTimezone( $input_timezone ); | |
| 579 | + $date_local = ( new \DateTime( '@' . strtotime( $item['date'] ) ) )->setTimezone( $input_timezone ); | |
| 580 | + | |
| 535 | 581 | $appointment_data = array( |
| 536 | - 'start_time' => wp_date('g:i A', strtotime($item['start_time']), $input_timezone) ?? '', | |
| 537 | - 'end_time' => wp_date('g:i A', strtotime($item['end_time']), $input_timezone) ?? '', | |
| 538 | - 'date' => wp_date( 'Y-m-d', strtotime( $item['date'] ), $input_timezone ), | |
| 582 | + 'start_time' => $start_local->format( $time_format ), | |
| 583 | + 'end_time' => $end_local->format( $time_format ), | |
| 584 | + 'date' => $date_local->format( 'Y-m-d' ), | |
| 539 | 585 | 'customer_id' => $input_data['customer_id'] ?? '', |
| 540 | 586 | 'team_member_id' => $item['team_member_id'] ?? '', |
| 541 | 587 | 'service_id' => $item['service_id'] ?? '', |
| 542 | - 'additional_duration_id' => $item['additional_duration_id'] ?? '', | |
| 588 | + 'additional_duration_id' => booktics_sanitize_id_string( $item['additional_duration_id'] ?? '' ), | |
| 543 | 589 | 'duration' => $total_duration_min, |
| 544 | 590 | 'order_id' => $order_model->id, |
| 545 | 591 | 'quantity' => $item['quantity'] ?? 1, |
| 546 | 592 | 'price' => $item['price'] ?? 0, |
| @@ -546,16 +592,21 @@ | ||
| 546 | 592 | 'price' => $item['price'] ?? 0, |
| 547 | 593 | 'subtotal' => $item['subtotal'] ?? 0, |
| 548 | 594 | 'total' => $item['total'] ?? $item['subtotal'] ?? 0, |
| 549 | 595 | 'status' => booktics_get_option( 'appointment_status', 'pending' ), |
| 550 | - 'total_attendees' => $input_data['total_attendees'] ?? 1, | |
| 596 | + 'total_attendees' => $item['total_attendees'] ?? $input_data['total_attendees'] ?? 1, | |
| 551 | 597 | 'timezone' => $original_timezone, |
| 552 | 598 | ); |
| 553 | - | |
| 554 | - | |
| 555 | - | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 556 | 602 | $appointment_data = apply_filters( 'booktics_appointment_pro_format', $appointment_data, $item ); |
| 557 | - | |
| 603 | + | |
| 604 | + $conflict = Appointment_Validator::validate_slot_available( $appointment_data ); | |
| 605 | + if ( $conflict ) { | |
| 606 | + throw new Exception( esc_html( $conflict->get_error_message() ) ); | |
| 607 | + } | |
| 608 | + | |
| 558 | 609 | $appointment = Appointment_Model::create( $appointment_data ); |
| 559 | 610 | if ( is_wp_error( $appointment ) ) { |
| 560 | 611 | throw new Exception( esc_html( $appointment->get_error_message() ) ); |
| 561 | 612 | } |
| @@ -596,12 +647,10 @@ | ||
| 596 | 647 | } |
| 597 | 648 | |
| 598 | 649 | if ( $payment_intent['status'] === 'success' ) { |
| 599 | 650 | $this->update_payment_records( $db, $order_model, $input_data, $payment_intent ); |
| 600 | - | |
| 601 | - // Update orders payment status on successfull payment completion | |
| 602 | - $order_model_id = is_object( $order_model ) ? $order_model->id : $order_model['id']; | |
| 603 | - ( new Order_Model($db) )->update( $order_model_id, [ 'payment_status' => 'fully_paid' ] ); | |
| 651 | + // Do NOT set fully_paid here — PaymentIntent created ≠ payment collected. | |
| 652 | + // Status is updated after client-side confirmation via update_payment_status endpoint. | |
| 604 | 653 | } |
| 605 | 654 | |
| 606 | 655 | return $payment_intent; |
| 607 | 656 | } |
| @@ -619,9 +668,9 @@ | ||
| 619 | 668 | */ |
| 620 | 669 | private function update_payment_records( $db, $order_model, $input_data, $payment_intent ) { |
| 621 | 670 | ( new Order_Model( $db ) )->update( |
| 622 | 671 | $order_model->id, |
| 623 | - array( 'payment_intent_id' => $payment_intent['payment_intent'] ) | |
| 672 | + array( 'payment_intent_id' => $payment_intent['payment_intent'] ?? null ) | |
| 624 | 673 | ); |
| 625 | 674 | |
| 626 | 675 | ( new Payment_Model( $db ) )->create( |
| 627 | 676 | array( |
| @@ -628,9 +677,9 @@ | ||
| 628 | 677 | 'order_id' => $order_model->id, |
| 629 | 678 | 'customer_id' => $input_data['customer_id'], |
| 630 | 679 | 'amount' => $input_data['total'] * 100, |
| 631 | 680 | 'currency' => $input_data['currency'] ?? booktics_get_option( 'currency', 'USD' ), |
| 632 | - 'intent_id' => $payment_intent['payment_intent'], | |
| 681 | + 'intent_id' => $payment_intent['payment_intent'] ?? null, | |
| 633 | 682 | 'transaction_id' => null, |
| 634 | 683 | 'payment_method' => $input_data['payment_method'], |
| 635 | 684 | 'status' => $payment_intent['status'] == 'success' ? 'completed' : 'pending', |
| 636 | 685 | 'date' => gmdate( 'Y-m-d' ), |
| @@ -639,8 +688,20 @@ | ||
| 639 | 688 | ); |
| 640 | 689 | } |
| 641 | 690 | |
| 642 | 691 | /** |
| 692 | + * Resolve team member email with WP user fallback. | |
| 693 | + * | |
| 694 | + * @param string $primary | |
| 695 | + * @param mixed $team_member_id | |
| 696 | + * | |
| 697 | + * @return string | |
| 698 | + */ | |
| 699 | + private function resolve_team_member_email( string $primary, $team_member_id ): string { | |
| 700 | + return Order_Notifier::resolve_team_member_email( $primary, $team_member_id ); | |
| 701 | + } | |
| 702 | + | |
| 703 | + /** | |
| 643 | 704 | * Helper: Format a single appointment for API output |
| 644 | 705 | * |
| 645 | 706 | * @param Appointment_Model|array $appointment |
| 646 | 707 | * |
| @@ -646,52 +707,9 @@ | ||
| 646 | 707 | * |
| 647 | 708 | * @return array |
| 648 | 709 | */ |
| 649 | 710 | private function format_appointment( $appointment ): array { |
| 650 | - if ( is_object( $appointment ) && method_exists( $appointment, 'to_array' ) ) { | |
| 651 | - $appointment = $appointment->to_array(); | |
| 652 | - } | |
| 653 | - $team_member = ( new Team_Member_Model() )->find( $appointment['team_member_id'] ); | |
| 654 | - $service = ( new Service_Model() )->find( $appointment['service_id'] ); | |
| 655 | - $service = $service ? $service->to_array() : array(); | |
| 656 | - $additional_durations = $service['additional_durations'] ?? array(); | |
| 657 | - $additional_durations = ! empty( $additional_durations ) | |
| 658 | - ? array_filter( | |
| 659 | - $additional_durations, function ( $duration ) use ( $appointment ) { | |
| 660 | - return $duration['id'] === $appointment['additional_duration_id']; | |
| 661 | - } | |
| 662 | - ) : array(); | |
| 663 | - $additional_duration = ! empty( $additional_durations ) ? reset( $additional_durations ) : array(); | |
| 664 | - $formatted_appointment = array( | |
| 665 | - 'id' => $appointment['id'] ?? 0, | |
| 666 | - 'date' => $appointment['date'] ?? '', | |
| 667 | - 'start_time' => $appointment['start_time'] ?? '', | |
| 668 | - 'end_time' => $appointment['end_time'] ?? '', | |
| 669 | - 'additional_duration_id' => $appointment['additional_duration_id'] ?? '', | |
| 670 | - 'team' => array( | |
| 671 | - 'id' => $team_member->id ?? null, | |
| 672 | - 'display_name' => $team_member->display_name ?? '', | |
| 673 | - 'image' => $team_member->image ?? '', | |
| 674 | - 'user_email' => $team_member->user_email ?? '', | |
| 675 | - ), | |
| 676 | - 'service' => array( | |
| 677 | - 'id' => $appointment['service_id'] ?? '', | |
| 678 | - 'title' => $service['title'] ?? '', | |
| 679 | - 'additional_duration' => $additional_duration, | |
| 680 | - 'enable_google_meet' => $service['enable_google_meet'] ?? false, | |
| 681 | - ), | |
| 682 | - 'duration' => $appointment['duration'] ?? null, | |
| 683 | - 'quantity' => $appointment['quantity'] ?? 1, | |
| 684 | - 'price' => $appointment['price'] ?? 0, | |
| 685 | - 'subtotal' => $appointment['subtotal'] ?? 0, | |
| 686 | - 'total' => $appointment['total'] ?? 0, | |
| 687 | - 'status' => $appointment['status'] ?? '', | |
| 688 | - 'total_attendees' => $appointment['total_attendees'] ?? 1, | |
| 689 | - 'appointment_token' => $appointment['security_token'] ?? '', | |
| 690 | - 'cancel_note' => $appointment['cancel_note'] ?? '', | |
| 691 | - ); | |
| 692 | - $formatted_appointment = apply_filters( 'booktics_appointment_pro_format', $formatted_appointment, $appointment ); | |
| 693 | - return $formatted_appointment; | |
| 711 | + return Order_Notifier::format_appointment( $appointment ); | |
| 694 | 712 | } |
| 695 | 713 | |
| 696 | 714 | /** |
| 697 | 715 | * Helper: Format order for API output |
| @@ -725,8 +743,14 @@ | ||
| 725 | 743 | 'email' => $customer->email ?? '', |
| 726 | 744 | ), |
| 727 | 745 | 'status' => is_object( $order_model ) ? $order_model->status : ( $order_model['status'] ?? null ), |
| 728 | 746 | 'subtotal' => is_object( $order_model ) ? $order_model->subtotal : ( $order_model['subtotal'] ?? null ), |
| 747 | + // Tax and coupons are settled at checkout (WooCommerce owns them for | |
| 748 | + // those bookings), so the invoice has to show them, not just the | |
| 749 | + // subtotal. Missing here is what left the order looking untaxed. | |
| 750 | + 'tax_total' => is_object( $order_model ) ? $order_model->tax_total : ( $order_model['tax_total'] ?? null ), | |
| 751 | + 'coupon_discount' => is_object( $order_model ) ? $order_model->coupon_discount : ( $order_model['coupon_discount'] ?? null ), | |
| 752 | + 'coupon_code' => is_object( $order_model ) ? $order_model->coupon_code : ( $order_model['coupon_code'] ?? null ), | |
| 729 | 753 | 'total' => is_object( $order_model ) ? $order_model->total : ( $order_model['total'] ?? null ), |
| 730 | 754 | 'payment_status' => is_object( $order_model ) ? $order_model->payment_status : ( $order_model['payment_status'] ?? null ), |
| 731 | 755 | 'payment_method' => is_object( $order_model ) ? $order_model->payment_method : $order_model['payment_method'], |
| 732 | 756 | 'items' => $appointment_details, |
| @@ -731,8 +755,11 @@ | ||
| 731 | 755 | 'payment_method' => is_object( $order_model ) ? $order_model->payment_method : $order_model['payment_method'], |
| 732 | 756 | 'items' => $appointment_details, |
| 733 | 757 | 'payment_intent_id' => $payment_intent['payment_intent'] ?? '', |
| 734 | 758 | 'client_secret' => $payment_intent['client_secret'] ?? '', |
| 759 | + // Gateways that collect payment on their own page (WooCommerce | |
| 760 | + // checkout) return where to send the customer instead of a secret. | |
| 761 | + 'redirect_url' => $payment_intent['redirect_url'] ?? '', | |
| 735 | 762 | 'total_services' => $input_data['total_services'] ?? 1, |
| 736 | 763 | ); |
| 737 | 764 | |
| 738 | 765 | $order_data = apply_filters( 'booktics_pro_order_format', $order_data, $order_model ); |
| @@ -742,8 +769,12 @@ | ||
| 742 | 769 | |
| 743 | 770 | /** |
| 744 | 771 | * Helper: Send notifications for order and appointment creation |
| 745 | 772 | * |
| 773 | + * Delegates to Order_Notifier so gateways that confirm a booking outside a | |
| 774 | + * REST request (WooCommerce) fire exactly the same events. | |
| 775 | + * | |
| 776 | + * @param Booktics_Database $db | |
| 746 | 777 | * @param Order_Model $order_model |
| 747 | 778 | * @param int $customer_id |
| 748 | 779 | * @param array $appointments |
| 749 | 780 | * |
| @@ -749,54 +780,9 @@ | ||
| 749 | 780 | * |
| 750 | 781 | * @return void |
| 751 | 782 | */ |
| 752 | 783 | private function send_notifications( $db, $order_model, $customer_id, $appointments ): void { |
| 753 | - $customer = ( new Guest_Model( $db ) )->find( array( 'id' => $customer_id ) ); | |
| 754 | - foreach ( $appointments as $appointment ) { | |
| 755 | - $formatted_appointment = $this->format_appointment( $appointment ); | |
| 756 | - $appointment_time = $formatted_appointment['date'] . ' ' . $formatted_appointment['start_time']; | |
| 757 | - $dt = new DateTime( $appointment_time, wp_timezone() ); | |
| 758 | - $timestamp = $dt->getTimestamp(); | |
| 759 | - $appointment_datetime = wp_date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $timestamp, wp_timezone() ); | |
| 760 | - $notification_flow_data_for_appointment = array( | |
| 761 | - 'appointment_service' => $formatted_appointment['service']['title'] ?? '', | |
| 762 | - 'appointment_team_member' => $formatted_appointment['team']['display_name'] ?? '', | |
| 763 | - 'start_time' => $formatted_appointment['start_time'], | |
| 764 | - 'appointment_date' => $formatted_appointment['date'], | |
| 765 | - 'appointment_time' => $appointment_datetime, | |
| 766 | - 'attendee_count' => $formatted_appointment['attendee_count'] ?? null, | |
| 767 | - 'customer_name' => $customer->name ?? '', | |
| 768 | - 'user_email' => $customer->email ?? '', | |
| 769 | - 'appointment_team_member_email' => $formatted_appointment['team']['user_email'] ?? '', | |
| 770 | - ); | |
| 771 | - $notification_flow_data_for_appointment = apply_filters( 'booktics_appointment_scheduled_notification_flow_data', $notification_flow_data_for_appointment, $formatted_appointment ); | |
| 772 | - | |
| 773 | - do_action( 'global_notification_hook', 'appointment_scheduled', $notification_flow_data_for_appointment ); | |
| 774 | - } | |
| 775 | - | |
| 776 | - $appointment = $appointments[0]; // As currently only one appointment is created for each user | |
| 777 | - $formatted_appointment = $this->format_appointment( $appointment ); | |
| 778 | - $notification_flow_data_for_order = [ | |
| 779 | - 'order_no' => $order_model->order_no ?? '', | |
| 780 | - 'order_date' => $order_model->created_at ?? '', | |
| 781 | - 'order_total' => $order_model->total ?? 0, | |
| 782 | - 'customer_name' => $customer->name ?? '', | |
| 783 | - 'user_email' => $customer->email ?? '', | |
| 784 | - 'order_status' => $order_model->status ?? '', | |
| 785 | - 'service_name' => $formatted_appointment['service']['title'] ?? '', | |
| 786 | - 'team_name' => $formatted_appointment['team']['display_name'] ?? '', | |
| 787 | - 'start_time' => $formatted_appointment['start_time'] ?? '', | |
| 788 | - 'end_time' => $formatted_appointment['end_time'] ?? '', | |
| 789 | - 'appointment_date' => $formatted_appointment['date'] ?? '', | |
| 790 | - 'location_address' => $formatted_appointment['location']['address'] ?? '', | |
| 791 | - 'appointment_status' => $formatted_appointment['status'] ?? '', | |
| 792 | - 'appointment_cancel_url' => $appointment->get_cancel_link(), | |
| 793 | - 'appointment_reschedule_url' => $appointment->get_reschedule_link(), | |
| 794 | - ]; | |
| 795 | - | |
| 796 | - $notification_flow_data_for_order = apply_filters( 'booktics_order_created_notification_flow_data', $notification_flow_data_for_order, $formatted_appointment, $order_model ); | |
| 797 | - | |
| 798 | - do_action( 'global_notification_hook', 'order_created', $notification_flow_data_for_order ); | |
| 784 | + Order_Notifier::order_created( $db, $order_model, $customer_id, $appointments ); | |
| 799 | 785 | } |
| 800 | 786 | |
| 801 | 787 | /** |
| 802 | 788 | * Find existing customer by email or create new customer |
| @@ -861,9 +847,9 @@ | ||
| 861 | 847 | * @return object|null Guest_Model instance or null |
| 862 | 848 | */ |
| 863 | 849 | private function find_and_update_guest( $db, $customer, $wp_user_id = null ) { |
| 864 | 850 | $guest = ( new Guest_Model( $db ) )->find( array( 'email' => $customer['email'] ) ); |
| 865 | - if ( $guest ) { | |
| 851 | + if ( $guest && $this->caller_owns_customer_email( $guest, $customer['email'] ) ) { | |
| 866 | 852 | ( new Guest_Model( $db ) )->update( |
| 867 | 853 | $guest->id, array( |
| 868 | 854 | 'name' => $customer['name'] ?? '', |
| 869 | 855 | 'phone' => $customer['phone'] ?? '', |
| @@ -875,8 +861,40 @@ | ||
| 875 | 861 | return $guest; |
| 876 | 862 | } |
| 877 | 863 | |
| 878 | 864 | /** |
| 865 | + * Determine whether the current request is authorized to overwrite an | |
| 866 | + * existing customer's stored contact details (name, phone, wp_user_id). | |
| 867 | + * | |
| 868 | + * @param object $guest Existing Guest_Model record. | |
| 869 | + * @param string $email Submitted customer email. | |
| 870 | + * | |
| 871 | + * @return bool True when the caller may overwrite the stored record. | |
| 872 | + */ | |
| 873 | + private function caller_owns_customer_email( $guest, $email ) { | |
| 874 | + // Admin or team member managing a booking on the customer's behalf. | |
| 875 | + if ( booktics_is_admin_or_team_member() ) { | |
| 876 | + return true; | |
| 877 | + } | |
| 878 | + | |
| 879 | + if ( ! is_user_logged_in() ) { | |
| 880 | + return false; | |
| 881 | + } | |
| 882 | + | |
| 883 | + // The record is already linked to the logged-in user. | |
| 884 | + if ( ! empty( $guest->wp_user_id ) && intval( $guest->wp_user_id ) === get_current_user_id() ) { | |
| 885 | + return true; | |
| 886 | + } | |
| 887 | + | |
| 888 | + // The logged-in user's own account email matches the submitted email. | |
| 889 | + $current_user = wp_get_current_user(); | |
| 890 | + | |
| 891 | + return $current_user | |
| 892 | + && ! empty( $current_user->user_email ) | |
| 893 | + && strtolower( $current_user->user_email ) === strtolower( (string) $email ); | |
| 894 | + } | |
| 895 | + | |
| 896 | + /** | |
| 879 | 897 | * Create a new guest record |
| 880 | 898 | * |
| 881 | 899 | * @param Booktics_Database $db |
| 882 | 900 | * @param array $customer |
| @@ -1030,9 +1048,9 @@ | ||
| 1030 | 1048 | $customer_data_for_order['phone'] = $customer ? $customer->phone : ''; |
| 1031 | 1049 | } |
| 1032 | 1050 | $order->customer = $customer_data_for_order; |
| 1033 | 1051 | $order->total_services = ( new Appointment_Model() )->get_appointments_count_by_order_id( $order->id ); |
| 1034 | - | |
| 1052 | + | |
| 1035 | 1053 | // Hide payment intent fields from team members (not admins) |
| 1036 | 1054 | if ( booktics_is_team_member() && ! current_user_can( 'manage_options' ) ) { |
| 1037 | 1055 | $order->payment_intent_id = ''; |
| 1038 | 1056 | $order->client_secret = ''; |
| @@ -1080,8 +1098,13 @@ | ||
| 1080 | 1098 | 'payment_status' => $payment_status, |
| 1081 | 1099 | ) |
| 1082 | 1100 | ); |
| 1083 | 1101 | |
| 1102 | + if ( $status !== $order->status ) { | |
| 1103 | + /** This action is documented in core/appointment/services/appointment-service.php */ | |
| 1104 | + do_action( 'booktics_order_status_updated', $order_id, $status, $order->status ); | |
| 1105 | + } | |
| 1106 | + | |
| 1084 | 1107 | if ( isset( $data['customer'] ) && isset( $data['customer']['id'] ) ) { |
| 1085 | 1108 | $customer_id = absint( $data['customer']['id'] ); |
| 1086 | 1109 | $customer_data = $data['customer']; |
| 1087 | 1110 | $customer_data['id'] = $customer_id; |
| @@ -1163,9 +1186,9 @@ | ||
| 1163 | 1186 | * |
| 1164 | 1187 | * @return string |
| 1165 | 1188 | */ |
| 1166 | 1189 | private function get_order_view_key( $order_id, $order_no ) { |
| 1167 | - return hash_hmac( 'sha256', (string) $order_id . '|' . $order_no, wp_salt( 'booktics_order_view' ) ); | |
| 1190 | + return Order_Key::make( $order_id, $order_no ); | |
| 1168 | 1191 | } |
| 1169 | 1192 | |
| 1170 | 1193 | /** |
| 1171 | 1194 | * @param int $order_id |
| @@ -1174,15 +1197,9 @@ | ||
| 1174 | 1197 | * |
| 1175 | 1198 | * @return bool |
| 1176 | 1199 | */ |
| 1177 | 1200 | private function verify_order_view_key( $order_id, $order_no, $provided_key ) { |
| 1178 | - if ( '' === $provided_key || strlen( $provided_key ) > 128 ) { | |
| 1179 | - return false; | |
| 1180 | - } | |
| 1181 | - | |
| 1182 | - $expected = $this->get_order_view_key( $order_id, $order_no ); | |
| 1183 | - | |
| 1184 | - return hash_equals( $expected, $provided_key ); | |
| 1201 | + return Order_Key::verify( $order_id, $order_no, $provided_key ); | |
| 1185 | 1202 | } |
| 1186 | 1203 | |
| 1187 | 1204 | /** |
| 1188 | 1205 | * Get single order. |
| @@ -1207,9 +1224,15 @@ | ||
| 1207 | 1224 | // Add extra fields specific to GET if needed |
| 1208 | 1225 | $response['status'] = $order->status; |
| 1209 | 1226 | $response['created_at'] = $this->format_datetime_to_dayjs_format( $order->created_at ); |
| 1210 | 1227 | $response['payment_gateway'] = $order->payment_method; |
| 1228 | + $response['payment_method'] = $order->payment_method; | |
| 1211 | 1229 | |
| 1230 | + // format_order_response() builds this from a freshly created payment | |
| 1231 | + // intent, which a GET does not have, so read the stored one instead. | |
| 1232 | + // The team-member guard below still strips it for non-admins. | |
| 1233 | + $response['payment_intent_id'] = $order->payment_intent_id ?? ''; | |
| 1234 | + | |
| 1212 | 1235 | // Hide payment intent fields from team members (not admins) |
| 1213 | 1236 | if ( booktics_is_team_member() && ! current_user_can( 'manage_options' ) ) { |
| 1214 | 1237 | $response['payment_intent_id'] = ''; |
| 1215 | 1238 | $response['client_secret'] = ''; |
| @@ -1225,9 +1248,28 @@ | ||
| 1225 | 1248 | * |
| 1226 | 1249 | * @return bool |
| 1227 | 1250 | */ |
| 1228 | 1251 | public function update_payment_status_permission( $request ) { |
| 1229 | - return current_user_can( 'manage_options' ); | |
| 1252 | + if ( current_user_can( 'manage_options' ) ) { | |
| 1253 | + return true; | |
| 1254 | + } | |
| 1255 | + | |
| 1256 | + // Allow order owner with a valid order_key (guest checkout support). | |
| 1257 | + $order_id = absint( $request->get_param( 'id' ) ); | |
| 1258 | + $order_key = sanitize_text_field( (string) $request->get_param( 'order_key' ) ); | |
| 1259 | + | |
| 1260 | + if ( ! $order_id || ! $order_key ) { | |
| 1261 | + return false; | |
| 1262 | + } | |
| 1263 | + | |
| 1264 | + $db = new Booktics_Database(); | |
| 1265 | + $order = ( new Order_Model( $db ) )->find( array( 'id' => $order_id ) ); | |
| 1266 | + | |
| 1267 | + if ( ! $order ) { | |
| 1268 | + return false; | |
| 1269 | + } | |
| 1270 | + | |
| 1271 | + return $this->verify_order_view_key( $order_id, (string) $order->order_no, $order_key ); | |
| 1230 | 1272 | } |
| 1231 | 1273 | |
| 1232 | 1274 | /** |
| 1233 | 1275 | * Update payment status for an order. |
| @@ -1236,13 +1278,16 @@ | ||
| 1236 | 1278 | * |
| 1237 | 1279 | * @return WP_Error|WP_HTTP_Response |
| 1238 | 1280 | */ |
| 1239 | 1281 | public function update_payment_status( $request ) { |
| 1240 | - $data = json_decode( $request->get_body(), true ); | |
| 1241 | - $order_id = ! empty( $data['order_id'] ) ? intval( $data['order_id'] ) : 0; | |
| 1242 | - $payment_status = ! empty( $data['payment_status'] ) ? $data['payment_status'] : 0; | |
| 1243 | - $payment_method = ! empty( $data['payment_method'] ) ? $data['payment_method'] : null; | |
| 1282 | + $data = json_decode( $request->get_body(), true ); | |
| 1283 | + $data = is_array( $data ) ? $data : array(); | |
| 1244 | 1284 | |
| 1285 | + // Only the order in the route is touched. The permission callback | |
| 1286 | + // authorized that id against the order_key; an order id in the body | |
| 1287 | + // would let a valid key for one order act on somebody else's. | |
| 1288 | + $order_id = absint( $request->get_param( 'id' ) ); | |
| 1289 | + | |
| 1245 | 1290 | $db = new Booktics_Database(); |
| 1246 | 1291 | $order_model = new Order_Model( $db ); |
| 1247 | 1292 | $order = $order_model->find( array( 'id' => $order_id ) ); |
| 1248 | 1293 | |
| @@ -1249,8 +1294,14 @@ | ||
| 1249 | 1294 | if ( ! $order ) { |
| 1250 | 1295 | return $this->error( __( 'Order not found', 'booktics' ) ); |
| 1251 | 1296 | } |
| 1252 | 1297 | |
| 1298 | + // The gateway that took the money is the one that may report on it, so | |
| 1299 | + // prefer what the order was created with over what the client claims. | |
| 1300 | + $payment_method = ! empty( $order->payment_method ) | |
| 1301 | + ? $order->payment_method | |
| 1302 | + : ( ! empty( $data['payment_method'] ) ? sanitize_text_field( (string) $data['payment_method'] ) : '' ); | |
| 1303 | + | |
| 1253 | 1304 | if ( ! array_key_exists( $payment_method, ( new Payment_Method_Manager() )->get_payment_methods() ) ) { |
| 1254 | 1305 | return $this->error( __( 'Unauthorized payment method', 'booktics' ) ); |
| 1255 | 1306 | } |
| 1256 | 1307 | |
| @@ -1267,12 +1318,31 @@ | ||
| 1267 | 1318 | |
| 1268 | 1319 | $order_model->update( |
| 1269 | 1320 | $order_id, array( |
| 1270 | 1321 | 'payment_status' => $status, |
| 1271 | - 'transaction_id' => $data['transaction_id'] ?? null, | |
| 1322 | + 'transaction_id' => isset( $data['transaction_id'] ) ? sanitize_text_field( (string) $data['transaction_id'] ) : null, | |
| 1272 | 1323 | ) |
| 1273 | 1324 | ); |
| 1274 | 1325 | |
| 1326 | + if ( | |
| 1327 | + $status === Payment_Status::COMPLETED | |
| 1328 | + && $order->payment_status !== Payment_Status::COMPLETED | |
| 1329 | + ) { | |
| 1330 | + // The payment status is already persisted above. Sending notifications must | |
| 1331 | + // not fail the request, otherwise a confirmed booking shows an error toast. | |
| 1332 | + try { | |
| 1333 | + $appointments = ( new Appointment_Model() )->where( 'order_id', $order_id ); | |
| 1334 | + $this->send_notifications( $db, $order, $order->customer_id, $appointments ); | |
| 1335 | + } catch ( \Throwable $e ) { | |
| 1336 | + booktics_log( 'failed to send notifications after payment for order ' . $order_id . ': ' . $e->getMessage() ); | |
| 1337 | + } | |
| 1338 | + } elseif ( $status === Payment_Status::FAILED ) { | |
| 1339 | + // Payment was declined/canceled on the processor. Release the held slot | |
| 1340 | + // immediately by canceling the pending appointments for this order, so the | |
| 1341 | + // customer does not have to wait for the admin_init sweep. | |
| 1342 | + ( new Abandoned_Booking_Cleanup() )->release_appointments( $order_id ); | |
| 1343 | + } | |
| 1344 | + | |
| 1275 | 1345 | // Payment model status and transaction id update |
| 1276 | 1346 | return $this->response( |
| 1277 | 1347 | array( |
| 1278 | 1348 | 'payment_status' => $status, |
| @@ -1278,13 +1348,11 @@ | ||
| 1278 | 1348 | 'payment_status' => $status, |
| 1279 | 1349 | ), __( 'Payment status updated successfully', 'booktics' ) |
| 1280 | 1350 | ); |
| 1281 | 1351 | } catch ( \Exception $e ) { |
| 1282 | - | |
| 1283 | - if ( defined( 'WP_DEBUG_LOG' ) && WP_DEBUG_LOG ) { | |
| 1284 | - error_log( 'An error occurred while deleting orders:' . $e->getMessage() ); | |
| 1285 | - } | |
| 1286 | - return $this->error( __( 'An error occurred while deleting orders.', 'booktics' ) ); | |
| 1352 | + | |
| 1353 | + booktics_log( 'An error occurred while updating payment status: ' . $e->getMessage() ); | |
| 1354 | + return $this->error( __( 'An error occurred while updating payment status.', 'booktics' ) ); | |
| 1287 | 1355 | } |
| 1288 | 1356 | } |
| 1289 | 1357 | |
| 1290 | 1358 | /** |
| @@ -1406,8 +1474,24 @@ | ||
| 1406 | 1474 | } |
| 1407 | 1475 | } |
| 1408 | 1476 | |
| 1409 | 1477 | /** |
| 1478 | + * Check if the current user may refund an order. | |
| 1479 | + * | |
| 1480 | + * Refunding moves money and must never be reachable by the customer. This | |
| 1481 | + * route previously reused update_payment_status_permission, which also | |
| 1482 | + * accepts a valid order_key so that a guest can confirm their own payment — | |
| 1483 | + * meaning any customer holding their own order key could refund themselves. | |
| 1484 | + * | |
| 1485 | + * @param WP_REST_Request $request | |
| 1486 | + * | |
| 1487 | + * @return bool | |
| 1488 | + */ | |
| 1489 | + public function refund_payment_permission( $request ) { | |
| 1490 | + return current_user_can( 'manage_options' ); | |
| 1491 | + } | |
| 1492 | + | |
| 1493 | + /** | |
| 1410 | 1494 | * Process payment refund for an order. |
| 1411 | 1495 | * |
| 1412 | 1496 | * @param WP_REST_Request $request |
| 1413 | 1497 | * |
| @@ -1418,17 +1502,29 @@ | ||
| 1418 | 1502 | $db = new Booktics_Database(); |
| 1419 | 1503 | $order_model = new Order_Model( $db ); |
| 1420 | 1504 | $order = $order_model->find( array( 'id' => $order_id ) ); |
| 1421 | 1505 | |
| 1506 | + if ( ! $order || is_wp_error( $order ) ) { | |
| 1507 | + return $this->error( __( 'Order not found', 'booktics' ), 404 ); | |
| 1508 | + } | |
| 1509 | + | |
| 1422 | 1510 | $payment_method = ( new Payment_Method_Manager() )->get_payment_method( $order->payment_method ); |
| 1423 | 1511 | if ( ! $payment_method ) { |
| 1424 | 1512 | return $this->error( __( 'Invalid payment method!', 'booktics' ) ); |
| 1425 | 1513 | } |
| 1426 | 1514 | $response = $payment_method->process_refund( $order ); |
| 1427 | - if ( $response['status'] === 'error' ) { | |
| 1428 | - return $this->error( $response['message'] ); | |
| 1515 | + | |
| 1516 | + // A gateway may refuse outright — WooCommerce-paid orders are refunded | |
| 1517 | + // from WooCommerce admin — and must not leave the order marked refunded | |
| 1518 | + // when no money moved. | |
| 1519 | + if ( is_wp_error( $response ) ) { | |
| 1520 | + return $this->error( $response->get_error_message() ); | |
| 1429 | 1521 | } |
| 1430 | 1522 | |
| 1523 | + if ( ! is_array( $response ) || ( $response['status'] ?? '' ) === 'error' ) { | |
| 1524 | + return $this->error( $response['message'] ?? __( 'Refund failed', 'booktics' ) ); | |
| 1525 | + } | |
| 1526 | + | |
| 1431 | 1527 | $order_model->update( |
| 1432 | 1528 | $order_id, array( |
| 1433 | 1529 | 'payment_status' => Payment_Status::REFUNDED, |
| 1434 | 1530 | ) |
| @@ -1480,8 +1576,9 @@ | ||
| 1480 | 1576 | * |
| 1481 | 1577 | * @return string ISO 8601 formatted datetime with timezone offset (e.g., "2024-01-15T14:00:00-05:00") |
| 1482 | 1578 | */ |
| 1483 | 1579 | private function format_datetime_to_dayjs_format( $datetime ) { |
| 1484 | - $dt = new DateTime( $datetime, wp_timezone() ); | |
| 1485 | - return $dt->format( 'c' ); | |
| 1580 | + $dt = new DateTime( $datetime ); | |
| 1581 | + $dt->setTimezone( wp_timezone() ); | |
| 1582 | + return $dt->format( 'Y-m-d H:i:s' ); | |
| 1486 | 1583 | } |
| 1487 | 1584 | } |
