Add additional services system (v0.5.0)

- Service CPT with pricing types: Included, Per Booking, Per Night - ServiceCategory taxonomy with default categories - Booking-services integration with service selector - Real-time price calculation based on nights and quantity - Services total and grand total display in booking admin Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Add guest management and GDPR privacy compliance (v0.4.0)
2026-01-31 15:19:56 +01:00 · 2026-01-31 14:59:43 +01:00 · 2026-01-31 14:41:43 +01:00
13 changed files with 4569 additions and 110 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,105 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [0.5.0] - 2026-01-31
+
+### Added
+
+- Additional Services System:
+  - Custom Post Type: Services (`bnb_service`)
+  - Service pricing types: Included (free), Per Booking (one-time), Per Night
+  - Service configuration: price, status, sort order, max quantity
+  - Custom admin columns with pricing type icons and status badges
+  - Filters by status and pricing type
+  - Service data helper methods for pricing calculations
+- Service Categories Taxonomy (`bnb_service_category`)
+  - Non-hierarchical (tag-like) structure
+  - Icon selection per category
+  - Sort order for custom ordering
+  - Default categories: Food & Dining, Transportation, Wellness & Spa, Activities, Housekeeping
+- Booking-Services Integration:
+  - Services meta box in Booking edit screen
+  - Checkbox-based service selection
+  - Quantity input for services with max_quantity > 1
+  - Real-time price calculation per service based on nights
+  - Services total display
+  - Price breakdown shows services cost
+  - Grand total (room + services) in admin list and pricing meta box
+- Admin UI Enhancements:
+  - Service selector with pricing type indicators
+  - Included services badge
+  - Per-night price suffix display
+  - Service line totals with quantity support
+  - Services total summary in booking
+  - CSS styles for all service-related components
+  - JavaScript for dynamic service pricing calculations
+
+### Changed
+
+- Plugin.php updated to register Service CPT and ServiceCategory taxonomy
+- Admin assets enqueued for Service post type screens
+- Booking admin list shows total price including services
+- Booking pricing meta box displays services breakdown and grand total
+- Admin JavaScript extended with service pricing and selection logic
+- Admin CSS includes comprehensive service styling
+
+## [0.4.0] - 2026-01-31
+
+### Added
+
+- Guest Management System with dedicated CPT:
+  - Custom Post Type: Guests (`bnb_guest`)
+  - Personal information fields (name, email, phone, DOB, nationality)
+  - Address fields (street, city, postal code, country)
+  - Identification fields (ID type, number, expiry date)
+  - Guest status tracking (active, inactive, blocked)
+  - Internal notes and preferences
+  - GDPR consent tracking (marketing, data processing, consent date)
+  - Booking history display with statistics
+  - Helper methods: `get_by_email()`, `get_bookings()`, `get_booking_count()`, `get_total_spent()`, `get_full_name()`, `get_formatted_address()`
+- Guest-Booking Integration:
+  - Guest search by email/name with AJAX autocomplete
+  - Link existing guests to bookings
+  - Create new guests from booking form
+  - Guest profile link in booking admin
+  - Automatic guest data sync when linked
+  - Backward compatibility for legacy bookings without guest_id
+- GDPR/Privacy Compliance (`src/Privacy/Manager.php`):
+  - WordPress Privacy API integration
+  - Personal data exporter (guest profile + booking history)
+  - Personal data eraser with anonymization option
+  - Privacy policy content suggestion
+  - Support for WordPress Tools > Export/Erase Personal Data
+  - Guest anonymization (replaces PII with placeholder data)
+  - Booking anonymization for connected bookings
+- Email Notifier Enhancements:
+  - Guest data retrieval from Guest CPT when available
+  - Fallback to booking meta for legacy bookings
+  - New placeholders: `{guest_first_name}`, `{guest_last_name}`, `{guest_full_address}`
+- Admin UI Styles:
+  - Guest search container and results styling
+  - Linked guest display card
+  - Booking history table in Guest
+  - Consent status indicators
+  - Guest status badges
+  - Privacy action buttons
+  - Anonymized data display
+
+### Changed
+
+- Booking meta box updated with guest search/link functionality
+- Plugin.php now initializes Guest CPT and Privacy Manager
+- Admin JavaScript includes guest search with debounce
+- Admin CSS extended with Guest and Privacy styles
+
+### Security
+
+- Guest email used as unique identifier for deduplication
+- GDPR-compliant data export and erasure
+- Consent tracking with timestamps
+- Anonymization preserves booking records while removing PII
+- AJAX endpoints secured with nonce verification
+
 ## [0.3.0] - 2026-01-31

 ### Added
@@ -191,6 +290,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Input sanitization and output escaping
 - Server secret masking in license settings

+[0.5.0]: https://src.bundespruefstelle.ch/magdev/wp-bnb/releases/tag/v0.5.0
+[0.4.0]: https://src.bundespruefstelle.ch/magdev/wp-bnb/releases/tag/v0.4.0
 [0.3.0]: https://src.bundespruefstelle.ch/magdev/wp-bnb/releases/tag/v0.3.0
 [0.2.0]: https://src.bundespruefstelle.ch/magdev/wp-bnb/releases/tag/v0.2.0
 [0.1.0]: https://src.bundespruefstelle.ch/magdev/wp-bnb/releases/tag/v0.1.0
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -128,6 +128,31 @@ for po in languages/*.po; do msgfmt -o "${po%.po}.mo" "$po"; done
 - Commit messages should follow the established format with Claude Code attribution
 - `.claude/settings.local.json` changes are typically local-only (stash before rebasing)

+**CRITICAL - Release Workflow:**
+
+On every new version, ALWAYS execute this complete workflow:
+
+```bash
+# 1. Commit changes to dev branch
+git add <files>
+git commit -m "Description of changes (vX.X.X)"
+
+# 2. Merge dev to main
+git checkout main
+git merge dev --no-edit
+
+# 3. Create annotated tag
+git tag -a vX.X.X -m "Version X.X.X - Brief description"
+
+# 4. Push everything to origin
+git push origin dev main vX.X.X
+
+# 5. Switch back to dev for continued development
+git checkout dev
+```
+
+Never skip any of these steps. The release is not complete until all branches and the tag are pushed to origin.
+
 #### What Gets Released

 - All plugin source files
@@ -468,3 +493,70 @@ Admin features always work; frontend requires valid license.
 - Calendar displays bookings color-coded by status for quick visual overview
 - HTML email templates with inline CSS for better email client compatibility
 - Status transitions can trigger different email notifications via hooks
+- **Release workflow** must always include: commit to dev → merge to main → create tag → push all to origin
+- Git fast-forward merge works well when dev is ahead of main with no conflicts
+
+**Released:**
+
+- Committed: `0c601df` on dev branch
+- Merged to main (fast-forward)
+- Tagged: `v0.3.0`
+- Pushed to origin: dev, main, v0.3.0
+
+### 2026-01-31 - Version 0.5.0 (Additional Services)
+
+**Completed:**
+
+- Created Custom Taxonomy: Service Categories (`bnb_service_category`)
+  - Non-hierarchical (tag-like) structure
+  - Dashicon selection for visual display
+  - Sort order meta field for custom ordering
+  - Default categories: Food & Dining, Transportation, Wellness & Spa, Activities, Housekeeping
+- Created Custom Post Type: Services (`bnb_service`)
+  - Three pricing types: Included (free), Per Booking, Per Night
+  - Price configuration per service
+  - Service status (active/inactive)
+  - Sort order for display ordering
+  - Maximum quantity setting per service
+  - Custom admin columns: pricing type, price, status
+  - Filters by status and pricing type
+  - Helper methods: `get_service_data()`, `calculate_service_price()`, `get_services_for_booking()`, `format_service_price()`
+- Updated Booking post type with services integration
+  - Added `SERVICES_META_KEY` constant for services storage
+  - New meta box: Additional Services with checkbox selection
+  - Quantity input for services with max_quantity > 1
+  - Real-time per-service line total calculation
+  - Services total display
+  - Price breakdown now shows services cost
+  - Grand total (room + services) in pricing meta box
+  - Admin list price column shows total including services
+  - Helper methods: `calculate_booking_services_total()`, `get_booking_services()`
+- Updated `src/Plugin.php`
+  - Registered ServiceCategory taxonomy
+  - Registered Service post type
+  - Added Service post type to asset enqueuing
+  - Added i18n strings for service pricing descriptions
+- Updated `assets/css/admin.css`
+  - Service status badges
+  - Service pricing meta box styles
+  - Booking services selector styles
+  - Service item with selected state
+  - Quantity inputs and line totals
+  - Services total summary
+  - Grand total display
+- Updated `assets/js/admin.js`
+  - `initServicePricing()`: Toggle price row based on pricing type
+  - `initBookingServices()`: Service selection with real-time price calculation
+  - Quantity change handlers with min/max enforcement
+  - Automatic recalculation when booking dates change
+- Updated version to 0.5.0
+- Updated CHANGELOG.md with Phase 5 changes
+- Updated PLAN.md to mark Phase 5 complete
+
+**Learnings:**
+
+- Service pricing calculation depends on pricing_type: included=0, per_booking=price*qty, per_night=price*qty*nights
+- Services are stored as JSON array in booking meta with service_id, quantity, price, pricing_type
+- Same namespace classes can reference each other directly without use statements
+- Services meta box renders before pricing meta box so services total is available
+- Grand total calculation happens both on save (server-side) and on change (client-side JS)
--- a/PLAN.md
+++ b/PLAN.md
@@ -84,37 +84,37 @@ This document outlines the implementation plan for the WP BnB Management plugin.
 - [x] Email notifications
 - [x] Booking confirmation

-## Phase 4: Guest Management (v0.4.0)
+## Phase 4: Guest Management (v0.4.0) - Complete

 ### Custom Post Type: Guests

- [ ] Personal information (name, email, phone)
- [ ] Address fields
- [ ] ID/Passport information
- [ ] Booking history reference
- [ ] Notes and preferences
+- [x] Personal information (name, email, phone)
+- [x] Address fields
+- [x] ID/Passport information
+- [x] Booking history reference
+- [x] Notes and preferences

 ### Privacy & Compliance

- [ ] GDPR compliance features
- [ ] Data export functionality
- [ ] Data deletion on request
- [ ] Consent tracking
+- [x] GDPR compliance features
+- [x] Data export functionality
+- [x] Data deletion on request
+- [x] Consent tracking

-## Phase 5: Additional Services (v0.5.0)
+## Phase 5: Additional Services (v0.5.0) - Complete

 ### Service Options

- [ ] Custom Post Type: Services
- [ ] Price per service (or included)
- [ ] Per-booking or per-night pricing
- [ ] Service categories
+- [x] Custom Post Type: Services
+- [x] Price per service (or included)
+- [x] Per-booking or per-night pricing
+- [x] Service categories

 ### Booking Services

- [ ] Service selection during booking
- [ ] Automatic price calculation
- [ ] Service summary display
+- [x] Service selection during booking
+- [x] Automatic price calculation
+- [x] Service summary display

 ## Phase 6: Frontend Features (v0.6.0)

@@ -291,8 +291,8 @@ The plugin will provide extensive hooks for customization:
 | 0.1.0   | Data structures | Complete |
 | 0.2.0   | Pricing         | Complete |
 | 0.3.0   | Bookings        | Complete |
-| 0.4.0   | Guests          | TBD      |
-| 0.5.0   | Services        | TBD      |
+| 0.4.0   | Guests          | Complete |
+| 0.5.0   | Services        | Complete |
 | 0.6.0   | Frontend        | TBD      |
 | 0.7.0   | CF7 Integration | TBD      |
 | 0.8.0   | Dashboard       | TBD      |
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -688,3 +688,608 @@
 		gap: 10px;
 	}
 }
+
+/* ==========================================================================
+   Guest Management Styles
+   ========================================================================== */
+
+/* Guest Search Container */
+.bnb-guest-search-container {
+	margin-bottom: 15px;
+	padding: 12px;
+	background: #f6f7f7;
+	border: 1px solid #c3c4c7;
+	border-radius: 4px;
+}
+
+.bnb-guest-search-container label {
+	display: block;
+	margin-bottom: 8px;
+	font-weight: 600;
+}
+
+.bnb-guest-search-container input[type="text"] {
+	width: 100%;
+	max-width: 300px;
+}
+
+/* Guest Search Results */
+.bnb-guest-results {
+	margin-top: 10px;
+	max-height: 200px;
+	overflow-y: auto;
+	border: 1px solid #c3c4c7;
+	border-radius: 4px;
+	background: #fff;
+}
+
+.bnb-guest-result {
+	padding: 10px 12px;
+	border-bottom: 1px solid #f0f0f1;
+	cursor: pointer;
+	transition: background 0.15s ease;
+}
+
+.bnb-guest-result:last-child {
+	border-bottom: none;
+}
+
+.bnb-guest-result:hover {
+	background: #f0f6fc;
+}
+
+.bnb-guest-result-name {
+	font-weight: 600;
+	color: #1d2327;
+}
+
+.bnb-guest-result-email {
+	font-size: 12px;
+	color: #646970;
+	margin-top: 2px;
+}
+
+.bnb-guest-result-meta {
+	font-size: 11px;
+	color: #a7aaad;
+	margin-top: 4px;
+}
+
+.bnb-guest-no-results {
+	padding: 15px;
+	text-align: center;
+	color: #646970;
+	font-style: italic;
+}
+
+.bnb-guest-create-new {
+	padding: 10px 12px;
+	background: #f0f6fc;
+	border-top: 1px solid #c3c4c7;
+	cursor: pointer;
+}
+
+.bnb-guest-create-new:hover {
+	background: #d4e4f7;
+}
+
+.bnb-guest-create-new .dashicons {
+	color: #2271b1;
+	margin-right: 5px;
+	vertical-align: text-bottom;
+}
+
+/* Guest Linked Display */
+.bnb-guest-linked {
+	padding: 12px 15px;
+	background: #d4edda;
+	border: 1px solid #c3e6cb;
+	border-radius: 4px;
+	margin-bottom: 15px;
+}
+
+.bnb-guest-linked-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	margin-bottom: 8px;
+}
+
+.bnb-guest-linked-name {
+	font-size: 14px;
+	font-weight: 600;
+	color: #155724;
+}
+
+.bnb-guest-linked-name .dashicons {
+	font-size: 16px;
+	width: 16px;
+	height: 16px;
+	margin-right: 5px;
+	vertical-align: text-bottom;
+}
+
+.bnb-guest-linked-details {
+	font-size: 13px;
+	color: #155724;
+}
+
+.bnb-guest-linked-details div {
+	margin-top: 4px;
+}
+
+.bnb-guest-linked-actions {
+	display: flex;
+	gap: 8px;
+	margin-top: 10px;
+}
+
+/* Guest Admin Columns */
+.column-email,
+.column-phone,
+.column-country,
+.column-bookings {
+	width: 120px;
+}
+
+.column-bookings a {
+	text-decoration: none;
+}
+
+/* Guest Status Badges */
+.bnb-guest-status {
+	display: inline-block;
+	padding: 3px 8px;
+	border-radius: 3px;
+	font-size: 11px;
+	font-weight: 600;
+	text-transform: uppercase;
+}
+
+.bnb-guest-status-active {
+	background: #d4edda;
+	color: #155724;
+}
+
+.bnb-guest-status-inactive {
+	background: #f6f7f7;
+	color: #646970;
+}
+
+.bnb-guest-status-blocked {
+	background: #f8d7da;
+	color: #721c24;
+}
+
+/* Booking History Table in Guest */
+.bnb-booking-history {
+	width: 100%;
+	border-collapse: collapse;
+	font-size: 12px;
+}
+
+.bnb-booking-history th,
+.bnb-booking-history td {
+	padding: 8px 10px;
+	text-align: left;
+	border-bottom: 1px solid #f0f0f1;
+}
+
+.bnb-booking-history th {
+	background: #f6f7f7;
+	font-weight: 600;
+	color: #1d2327;
+}
+
+.bnb-booking-history tr:hover td {
+	background: #f9f9f9;
+}
+
+.bnb-booking-history-empty {
+	padding: 20px;
+	text-align: center;
+	color: #646970;
+	font-style: italic;
+}
+
+.bnb-booking-stats {
+	display: flex;
+	gap: 20px;
+	padding: 12px 0;
+	border-bottom: 1px solid #c3c4c7;
+	margin-bottom: 15px;
+}
+
+.bnb-booking-stat {
+	text-align: center;
+}
+
+.bnb-booking-stat-value {
+	font-size: 20px;
+	font-weight: 600;
+	color: #135e96;
+}
+
+.bnb-booking-stat-label {
+	font-size: 11px;
+	color: #646970;
+	text-transform: uppercase;
+}
+
+/* ==========================================================================
+   GDPR / Privacy Styles
+   ========================================================================== */
+
+/* Consent Status */
+.bnb-consent-status {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}
+
+.bnb-consent-item {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.bnb-consent-item .dashicons {
+	font-size: 16px;
+	width: 16px;
+	height: 16px;
+}
+
+.bnb-consent-granted {
+	color: #00a32a;
+}
+
+.bnb-consent-not-granted {
+	color: #646970;
+}
+
+.bnb-consent-date {
+	font-size: 11px;
+	color: #646970;
+	margin-left: 24px;
+}
+
+/* Consent Checkboxes in Guest Form */
+.bnb-consent-checkbox {
+	display: flex;
+	align-items: flex-start;
+	gap: 8px;
+	margin: 10px 0;
+}
+
+.bnb-consent-checkbox input[type="checkbox"] {
+	margin-top: 3px;
+}
+
+.bnb-consent-checkbox label {
+	font-weight: normal;
+	cursor: pointer;
+}
+
+.bnb-consent-checkbox-description {
+	font-size: 12px;
+	color: #646970;
+	margin-left: 24px;
+	margin-top: 2px;
+}
+
+/* Privacy Settings Section */
+.bnb-privacy-settings {
+	margin-top: 20px;
+}
+
+.bnb-privacy-section {
+	background: #fff;
+	border: 1px solid #c3c4c7;
+	border-radius: 4px;
+	margin-bottom: 20px;
+}
+
+.bnb-privacy-section-header {
+	padding: 12px 15px;
+	background: #f6f7f7;
+	border-bottom: 1px solid #c3c4c7;
+	font-weight: 600;
+}
+
+.bnb-privacy-section-content {
+	padding: 15px;
+}
+
+.bnb-privacy-notice {
+	display: flex;
+	align-items: flex-start;
+	gap: 10px;
+	padding: 12px 15px;
+	background: #f0f6fc;
+	border-left: 4px solid #72aee6;
+	margin-bottom: 15px;
+}
+
+.bnb-privacy-notice .dashicons {
+	color: #72aee6;
+	flex-shrink: 0;
+}
+
+.bnb-privacy-notice p {
+	margin: 0;
+}
+
+/* Privacy Actions in Guest Profile */
+.bnb-privacy-actions {
+	margin-top: 20px;
+	padding-top: 15px;
+	border-top: 1px solid #f0f0f1;
+}
+
+.bnb-privacy-actions h4 {
+	margin: 0 0 10px 0;
+	font-size: 13px;
+}
+
+.bnb-privacy-actions-buttons {
+	display: flex;
+	gap: 10px;
+	flex-wrap: wrap;
+}
+
+.bnb-privacy-action-button {
+	display: inline-flex;
+	align-items: center;
+	gap: 5px;
+}
+
+.bnb-privacy-action-button .dashicons {
+	font-size: 16px;
+	width: 16px;
+	height: 16px;
+}
+
+/* Anonymized Data Display */
+.bnb-anonymized {
+	font-style: italic;
+	color: #a7aaad;
+}
+
+.bnb-anonymized-badge {
+	display: inline-flex;
+	align-items: center;
+	gap: 5px;
+	padding: 2px 8px;
+	background: #f0f0f1;
+	border-radius: 3px;
+	font-size: 11px;
+	color: #646970;
+}
+
+.bnb-anonymized-badge .dashicons {
+	font-size: 14px;
+	width: 14px;
+	height: 14px;
+}
+
+/* Data Retention Settings */
+.bnb-retention-settings {
+	display: flex;
+	align-items: center;
+	gap: 10px;
+}
+
+.bnb-retention-settings input[type="number"] {
+	width: 80px;
+}
+
+.bnb-retention-description {
+	font-size: 12px;
+	color: #646970;
+	margin-top: 5px;
+}
+
+/* ==========================================================================
+   Services Styles
+   ========================================================================== */
+
+/* Services List in Admin */
+.column-pricing_type,
+.column-service_status {
+	width: 120px;
+}
+
+/* Service Status Badges */
+.bnb-service-status {
+	display: inline-block;
+	padding: 3px 8px;
+	border-radius: 3px;
+	font-size: 11px;
+	font-weight: 600;
+	text-transform: uppercase;
+}
+
+.bnb-service-status-active {
+	background: #d4edda;
+	color: #155724;
+}
+
+.bnb-service-status-inactive {
+	background: #f6f7f7;
+	color: #646970;
+}
+
+.bnb-service-included {
+	color: #00a32a;
+	font-weight: 600;
+}
+
+/* Service Pricing Meta Box */
+.bnb-service-pricing-type fieldset label {
+	display: block;
+	margin-bottom: 15px;
+}
+
+.bnb-service-pricing-type fieldset label input {
+	margin-right: 8px;
+}
+
+.bnb-service-pricing-type fieldset p.description {
+	margin-left: 24px;
+	margin-top: 4px;
+}
+
+/* ==========================================================================
+   Booking Services Selector
+   ========================================================================== */
+
+.bnb-services-selector {
+	padding: 10px 0;
+}
+
+.bnb-services-list {
+	margin: 15px 0;
+}
+
+.bnb-service-item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 12px 15px;
+	background: #f6f7f7;
+	border: 1px solid #c3c4c7;
+	border-radius: 4px;
+	margin-bottom: 8px;
+	transition: background 0.15s ease, border-color 0.15s ease;
+}
+
+.bnb-service-item:hover {
+	background: #f0f6fc;
+}
+
+.bnb-service-item.selected {
+	background: #d4edda;
+	border-color: #c3e6cb;
+}
+
+.bnb-service-checkbox {
+	display: flex;
+	align-items: center;
+	gap: 10px;
+	cursor: pointer;
+	flex: 1;
+}
+
+.bnb-service-checkbox input[type="checkbox"] {
+	margin: 0;
+}
+
+.bnb-service-name {
+	font-weight: 600;
+	color: #1d2327;
+}
+
+.bnb-service-details {
+	display: flex;
+	align-items: center;
+	gap: 15px;
+	flex-shrink: 0;
+}
+
+.bnb-service-price-label {
+	color: #135e96;
+	font-weight: 500;
+}
+
+.bnb-service-included-badge {
+	display: inline-block;
+	padding: 2px 8px;
+	background: #d4edda;
+	color: #155724;
+	border-radius: 3px;
+	font-size: 11px;
+	font-weight: 600;
+	text-transform: uppercase;
+}
+
+.bnb-service-quantity {
+	display: flex;
+	align-items: center;
+	gap: 5px;
+}
+
+.bnb-service-quantity label {
+	display: flex;
+	align-items: center;
+	gap: 5px;
+	font-size: 12px;
+	color: #646970;
+}
+
+.bnb-service-qty-input {
+	width: 50px !important;
+}
+
+.bnb-service-line-total {
+	color: #1d2327;
+}
+
+.bnb-service-total-value {
+	color: #135e96;
+}
+
+/* Services Total */
+.bnb-services-total {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	gap: 15px;
+	padding: 15px;
+	background: #f0f6fc;
+	border: 1px solid #c3c4c7;
+	border-radius: 4px;
+	margin-top: 15px;
+}
+
+.bnb-services-total strong {
+	color: #1d2327;
+}
+
+#bnb-services-total-amount {
+	font-size: 16px;
+	font-weight: 600;
+	color: #135e96;
+}
+
+/* No Services Message */
+.bnb-no-services-message {
+	padding: 20px;
+	text-align: center;
+	color: #646970;
+	font-style: italic;
+}
+
+.bnb-no-services-message a {
+	margin-left: 5px;
+}
+
+/* Booking Pricing with Services */
+.bnb-booking-services-summary {
+	padding: 8px 12px;
+	background: #d4edda;
+	border: 1px solid #c3e6cb;
+	border-radius: 4px;
+	color: #155724;
+}
+
+.bnb-booking-grand-total {
+	padding: 12px 15px;
+	background: #f0f6fc;
+	border: 1px solid #c3c4c7;
+	border-radius: 4px;
+}
+
+.bnb-booking-grand-total strong {
+	font-size: 18px;
+	color: #135e96;
+}
--- a/assets/js/admin.js
+++ b/assets/js/admin.js
@@ -577,6 +577,363 @@
 		});
 	}

+	/**
+	 * Initialize guest search functionality for booking form.
+	 */
+	function initGuestSearch() {
+		var $searchInput = $('#bnb_booking_guest_search');
+		var $searchResults = $('#bnb-guest-search-results');
+		var $guestIdInput = $('#bnb_booking_guest_id');
+		var $linkedGuestInfo = $('#bnb-linked-guest-info');
+		var $searchContainer = $('#bnb-guest-search-container');
+		var $fieldsContainer = $('#bnb-guest-fields-container');
+		var $unlinkBtn = $('#bnb-unlink-guest');
+		var $guestNameInput = $('#bnb_booking_guest_name');
+		var $guestEmailInput = $('#bnb_booking_guest_email');
+		var $guestPhoneInput = $('#bnb_booking_guest_phone');
+
+		// Exit if not on booking form.
+		if (!$searchInput.length) {
+			return;
+		}
+
+		var searchTimer = null;
+
+		/**
+		 * Perform guest search via AJAX.
+		 */
+		function searchGuests() {
+			var query = $searchInput.val().trim();
+
+			if (query.length < 2) {
+				$searchResults.hide().empty();
+				return;
+			}
+
+			$searchResults.html('<div class="bnb-search-loading">' + wpBnbAdmin.i18n.searchingGuests + '</div>').show();
+
+			$.ajax({
+				url: wpBnbAdmin.ajaxUrl,
+				type: 'POST',
+				data: {
+					action: 'wp_bnb_search_guest',
+					nonce: wpBnbAdmin.nonce,
+					search: query
+				},
+				success: function(response) {
+					if (response.success && response.data.guests.length > 0) {
+						var html = '<div class="bnb-guest-search-list">';
+
+						$.each(response.data.guests, function(i, guest) {
+							var isBlocked = guest.status === 'blocked';
+							var statusClass = isBlocked ? 'bnb-guest-blocked' : '';
+							var statusLabel = isBlocked ? ' <span class="bnb-blocked-label">' + wpBnbAdmin.i18n.guestBlocked + '</span>' : '';
+
+							html += '<div class="bnb-guest-search-item ' + statusClass + '" data-guest=\'' + JSON.stringify(guest) + '\'>';
+							html += '<div class="bnb-guest-item-info">';
+							html += '<strong>' + escapeHtml(guest.name) + '</strong>' + statusLabel + '<br>';
+							html += '<small>' + escapeHtml(guest.email || '') + '</small>';
+							if (guest.phone) {
+								html += ' <small>(' + escapeHtml(guest.phone) + ')</small>';
+							}
+							html += '</div>';
+							if (!isBlocked) {
+								html += '<button type="button" class="button button-small bnb-select-guest">' + wpBnbAdmin.i18n.selectGuest + '</button>';
+							}
+							html += '</div>';
+						});
+
+						html += '</div>';
+						$searchResults.html(html);
+					} else {
+						$searchResults.html('<div class="bnb-no-guests">' + wpBnbAdmin.i18n.noGuestsFound + '</div>');
+					}
+				},
+				error: function() {
+					$searchResults.html('<div class="bnb-search-error">' + wpBnbAdmin.i18n.error + '</div>');
+				}
+			});
+		}
+
+		/**
+		 * Escape HTML entities.
+		 *
+		 * @param {string} text Text to escape.
+		 * @return {string} Escaped text.
+		 */
+		function escapeHtml(text) {
+			if (!text) return '';
+			var div = document.createElement('div');
+			div.textContent = text;
+			return div.innerHTML;
+		}
+
+		/**
+		 * Select a guest from search results.
+		 *
+		 * @param {Object} guest Guest data.
+		 */
+		function selectGuest(guest) {
+			// Set hidden guest ID.
+			$guestIdInput.val(guest.id);
+
+			// Populate guest fields (for display/fallback).
+			$guestNameInput.val(guest.name).prop('readonly', true);
+			$guestEmailInput.val(guest.email).prop('readonly', true);
+			$guestPhoneInput.val(guest.phone).prop('readonly', true);
+
+			// Update linked guest display.
+			var infoHtml = '<p>';
+			infoHtml += '<span class="dashicons dashicons-admin-users"></span> ';
+			infoHtml += '<strong>' + escapeHtml(guest.name) + '</strong> ';
+			infoHtml += '<a href="' + wpBnbAdmin.ajaxUrl.replace('admin-ajax.php', 'post.php?post=' + guest.id + '&action=edit') + '" target="_blank" class="button button-small">View Guest Profile</a> ';
+			infoHtml += '<button type="button" id="bnb-unlink-guest" class="button button-small button-link-delete">Unlink</button>';
+			infoHtml += '</p>';
+			if (guest.email) {
+				infoHtml += '<p><small>' + escapeHtml(guest.email) + '</small></p>';
+			}
+
+			$linkedGuestInfo.html(infoHtml).show();
+			$searchContainer.hide();
+			$fieldsContainer.hide();
+			$searchResults.hide().empty();
+			$searchInput.val('');
+
+			// Re-bind unlink button.
+			bindUnlinkButton();
+		}
+
+		/**
+		 * Unlink guest from booking.
+		 */
+		function unlinkGuest() {
+			$guestIdInput.val('');
+			$guestNameInput.val('').prop('readonly', false);
+			$guestEmailInput.val('').prop('readonly', false);
+			$guestPhoneInput.val('').prop('readonly', false);
+
+			$linkedGuestInfo.hide();
+			$searchContainer.show();
+			$fieldsContainer.show();
+		}
+
+		/**
+		 * Bind unlink button event.
+		 */
+		function bindUnlinkButton() {
+			$('#bnb-unlink-guest').off('click').on('click', function(e) {
+				e.preventDefault();
+				unlinkGuest();
+			});
+		}
+
+		// Search input with debounce.
+		$searchInput.on('input', function() {
+			if (searchTimer) {
+				clearTimeout(searchTimer);
+			}
+			searchTimer = setTimeout(searchGuests, 300);
+		});
+
+		// Select guest from results.
+		$searchResults.on('click', '.bnb-select-guest', function(e) {
+			e.preventDefault();
+			var guest = $(this).closest('.bnb-guest-search-item').data('guest');
+			if (guest) {
+				selectGuest(guest);
+			}
+		});
+
+		// Initial unlink button binding.
+		bindUnlinkButton();
+
+		// Close search results when clicking outside.
+		$(document).on('click', function(e) {
+			if (!$(e.target).closest('#bnb_booking_guest_search, #bnb-guest-search-results').length) {
+				$searchResults.hide();
+			}
+		});
+	}
+
+	/**
+	 * Initialize service pricing type toggle.
+	 */
+	function initServicePricing() {
+		var $pricingTypeInputs = $('input[name="bnb_service_pricing_type"]');
+		var $priceRow = $('#bnb-service-price-row');
+		var $priceSuffix = $('#bnb-service-price-suffix');
+		var $priceDescription = $('#bnb-service-price-description');
+
+		if (!$pricingTypeInputs.length) {
+			return;
+		}
+
+		$pricingTypeInputs.on('change', function() {
+			var pricingType = $('input[name="bnb_service_pricing_type"]:checked').val();
+
+			if (pricingType === 'included') {
+				$priceRow.hide();
+			} else {
+				$priceRow.show();
+
+				if (pricingType === 'per_night') {
+					$priceSuffix.text(' / ' + (wpBnbAdmin.i18n.night || 'night'));
+					$priceDescription.text(wpBnbAdmin.i18n.perNightDescription || 'This price will be charged per night of the stay.');
+				} else {
+					$priceSuffix.text('');
+					$priceDescription.text(wpBnbAdmin.i18n.perBookingDescription || 'This price will be charged once for the booking.');
+				}
+			}
+		});
+	}
+
+	/**
+	 * Initialize booking services selector.
+	 */
+	function initBookingServices() {
+		var $servicesSelector = $('.bnb-services-selector');
+		var $servicesList = $servicesSelector.find('.bnb-services-list');
+		var $totalDisplay = $('#bnb-services-total-amount');
+
+		if (!$servicesSelector.length) {
+			return;
+		}
+
+		/**
+		 * Get current number of nights from booking form.
+		 *
+		 * @return {number} Number of nights.
+		 */
+		function getNights() {
+			var checkIn = $('#bnb_booking_check_in').val();
+			var checkOut = $('#bnb_booking_check_out').val();
+
+			if (checkIn && checkOut) {
+				var startDate = new Date(checkIn);
+				var endDate = new Date(checkOut);
+				var nights = Math.ceil((endDate - startDate) / (1000 * 60 * 60 * 24));
+				return Math.max(1, nights);
+			}
+
+			return parseInt($servicesSelector.data('nights'), 10) || 1;
+		}
+
+		/**
+		 * Calculate service line total.
+		 *
+		 * @param {jQuery} $item     Service item element.
+		 * @param {number} nights    Number of nights.
+		 * @return {number} Calculated price.
+		 */
+		function calculateServiceTotal($item, nights) {
+			var price = parseFloat($item.data('price')) || 0;
+			var pricingType = $item.data('pricing-type');
+			var quantity = parseInt($item.find('.bnb-service-qty-input').val(), 10) || 1;
+
+			if (pricingType === 'included') {
+				return 0;
+			}
+
+			if (pricingType === 'per_night') {
+				return price * quantity * nights;
+			}
+
+			return price * quantity;
+		}
+
+		/**
+		 * Update service line total display.
+		 *
+		 * @param {jQuery} $item Service item element.
+		 */
+		function updateServiceLineTotal($item) {
+			var nights = getNights();
+			var total = calculateServiceTotal($item, nights);
+			var $lineTotal = $item.find('.bnb-service-line-total');
+			var $totalValue = $item.find('.bnb-service-total-value');
+			var isSelected = $item.find('input[type="checkbox"]').is(':checked');
+			var pricingType = $item.data('pricing-type');
+
+			if (isSelected && pricingType !== 'included' && total > 0) {
+				$totalValue.text(formatPrice(total));
+				$lineTotal.show();
+			} else {
+				$lineTotal.hide();
+			}
+		}
+
+		/**
+		 * Update total services amount.
+		 */
+		function updateServicesTotal() {
+			var nights = getNights();
+			var total = 0;
+
+			$servicesList.find('.bnb-service-item').each(function() {
+				var $item = $(this);
+				var isSelected = $item.find('input[type="checkbox"]').is(':checked');
+
+				if (isSelected) {
+					total += calculateServiceTotal($item, nights);
+				}
+			});
+
+			$totalDisplay.text(formatPrice(total));
+		}
+
+		/**
+		 * Format price for display (simple formatting).
+		 *
+		 * @param {number} price Price value.
+		 * @return {string} Formatted price.
+		 */
+		function formatPrice(price) {
+			return parseFloat(price).toFixed(2);
+		}
+
+		// Handle service checkbox change.
+		$servicesList.on('change', 'input[type="checkbox"]', function() {
+			var $item = $(this).closest('.bnb-service-item');
+			var isSelected = $(this).is(':checked');
+
+			$item.toggleClass('selected', isSelected);
+
+			// Show/hide quantity input.
+			var $quantity = $item.find('.bnb-service-quantity');
+			if ($quantity.length) {
+				$quantity.toggle(isSelected);
+			}
+
+			updateServiceLineTotal($item);
+			updateServicesTotal();
+		});
+
+		// Handle quantity change.
+		$servicesList.on('change input', '.bnb-service-qty-input', function() {
+			var $item = $(this).closest('.bnb-service-item');
+			var maxQty = parseInt($item.data('max-quantity'), 10) || 1;
+			var value = parseInt($(this).val(), 10) || 1;
+
+			// Enforce min/max.
+			value = Math.max(1, Math.min(value, maxQty));
+			$(this).val(value);
+
+			updateServiceLineTotal($item);
+			updateServicesTotal();
+		});
+
+		// Update when booking dates change.
+		$('#bnb_booking_check_in, #bnb_booking_check_out').on('change', function() {
+			$servicesList.find('.bnb-service-item.selected').each(function() {
+				updateServiceLineTotal($(this));
+			});
+			updateServicesTotal();
+		});
+
+		// Initial calculation.
+		updateServicesTotal();
+	}
+
 	// Initialize on document ready.
 	$(document).ready(function() {
 		initLicenseManagement();
@@ -586,6 +943,9 @@
 		initPricingMetaBox();
 		initBookingForm();
 		initCalendarPage();
+		initGuestSearch();
+		initServicePricing();
+		initBookingServices();
 	});

 })(jQuery);
--- a/src/Booking/EmailNotifier.php
+++ b/src/Booking/EmailNotifier.php
@@ -12,6 +12,7 @@ declare( strict_types=1 );
 namespace Magdev\WpBnb\Booking;

 use Magdev\WpBnb\PostTypes\Booking;
+use Magdev\WpBnb\PostTypes\Guest;
 use Magdev\WpBnb\PostTypes\Room;
 use Magdev\WpBnb\Pricing\Calculator;

@@ -203,8 +204,8 @@ final class EmailNotifier {
 	 * @return array Booking data.
 	 */
 	private static function get_booking_data( int $booking_id ): array {
-		$booking = get_post( $booking_id );
-		$room    = Booking::get_room( $booking_id );
+		$booking  = get_post( $booking_id );
+		$room     = Booking::get_room( $booking_id );
 		$building = Booking::get_building( $booking_id );

 		$check_in  = get_post_meta( $booking_id, '_bnb_booking_check_in', true );
@@ -221,31 +222,84 @@ final class EmailNotifier {

 		$statuses = Booking::get_booking_statuses();

+		// Get guest data - prefer Guest CPT if linked, fallback to booking meta.
+		$guest_data = self::get_guest_data( $booking_id );
+
 		return array(
-			'booking_id'        => $booking_id,
-			'booking_reference' => $booking ? $booking->post_title : '',
-			'guest_name'        => get_post_meta( $booking_id, '_bnb_booking_guest_name', true ),
-			'guest_email'       => get_post_meta( $booking_id, '_bnb_booking_guest_email', true ),
-			'guest_phone'       => get_post_meta( $booking_id, '_bnb_booking_guest_phone', true ),
-			'guest_notes'       => get_post_meta( $booking_id, '_bnb_booking_guest_notes', true ),
-			'adults'            => $adults ?: 1,
-			'children'          => $children ?: 0,
-			'room_name'         => $room ? $room->post_title : '',
-			'room_id'           => $room ? $room->ID : 0,
-			'building_name'     => $building ? $building->post_title : '',
-			'building_id'       => $building ? $building->ID : 0,
-			'check_in_date'     => $check_in ? wp_date( get_option( 'date_format' ), strtotime( $check_in ) ) : '',
-			'check_out_date'    => $check_out ? wp_date( get_option( 'date_format' ), strtotime( $check_out ) ) : '',
-			'check_in_raw'      => $check_in,
-			'check_out_raw'     => $check_out,
-			'nights'            => $nights,
-			'total_price'       => $price ? Calculator::formatPrice( (float) $price ) : '',
-			'status'            => $statuses[ $status ] ?? $status,
-			'status_raw'        => $status,
-			'site_name'         => get_bloginfo( 'name' ),
-			'site_url'          => home_url(),
-			'admin_email'       => get_option( 'admin_email' ),
-			'booking_url'       => admin_url( 'post.php?post=' . $booking_id . '&action=edit' ),
+			'booking_id'         => $booking_id,
+			'booking_reference'  => $booking ? $booking->post_title : '',
+			'guest_name'         => $guest_data['name'],
+			'guest_first_name'   => $guest_data['first_name'],
+			'guest_last_name'    => $guest_data['last_name'],
+			'guest_email'        => $guest_data['email'],
+			'guest_phone'        => $guest_data['phone'],
+			'guest_notes'        => $guest_data['notes'],
+			'guest_full_address' => $guest_data['full_address'],
+			'adults'             => $adults ?: 1,
+			'children'           => $children ?: 0,
+			'room_name'          => $room ? $room->post_title : '',
+			'room_id'            => $room ? $room->ID : 0,
+			'building_name'      => $building ? $building->post_title : '',
+			'building_id'        => $building ? $building->ID : 0,
+			'check_in_date'      => $check_in ? wp_date( get_option( 'date_format' ), strtotime( $check_in ) ) : '',
+			'check_out_date'     => $check_out ? wp_date( get_option( 'date_format' ), strtotime( $check_out ) ) : '',
+			'check_in_raw'       => $check_in,
+			'check_out_raw'      => $check_out,
+			'nights'             => $nights,
+			'total_price'        => $price ? Calculator::formatPrice( (float) $price ) : '',
+			'status'             => $statuses[ $status ] ?? $status,
+			'status_raw'         => $status,
+			'site_name'          => get_bloginfo( 'name' ),
+			'site_url'           => home_url(),
+			'admin_email'        => get_option( 'admin_email' ),
+			'booking_url'        => admin_url( 'post.php?post=' . $booking_id . '&action=edit' ),
+		);
+	}
+
+	/**
+	 * Get guest data from Guest CPT or booking meta.
+	 *
+	 * @param int $booking_id Booking post ID.
+	 * @return array Guest data with keys: name, first_name, last_name, email, phone, notes, full_address.
+	 */
+	private static function get_guest_data( int $booking_id ): array {
+		$guest_id = get_post_meta( $booking_id, '_bnb_booking_guest_id', true );
+
+		// Try to get data from Guest CPT.
+		if ( $guest_id ) {
+			$guest = get_post( $guest_id );
+			if ( $guest && Guest::POST_TYPE === $guest->post_type ) {
+				$first_name = get_post_meta( $guest_id, '_bnb_guest_first_name', true );
+				$last_name  = get_post_meta( $guest_id, '_bnb_guest_last_name', true );
+
+				return array(
+					'name'         => Guest::get_full_name( $guest_id ),
+					'first_name'   => $first_name,
+					'last_name'    => $last_name,
+					'email'        => get_post_meta( $guest_id, '_bnb_guest_email', true ),
+					'phone'        => get_post_meta( $guest_id, '_bnb_guest_phone', true ),
+					'notes'        => get_post_meta( $guest_id, '_bnb_guest_notes', true ),
+					'full_address' => Guest::get_formatted_address( $guest_id ),
+				);
+			}
+		}
+
+		// Fallback to booking meta (legacy bookings).
+		$guest_name = get_post_meta( $booking_id, '_bnb_booking_guest_name', true );
+
+		// Try to split name into first/last for legacy data.
+		$name_parts = explode( ' ', $guest_name, 2 );
+		$first_name = $name_parts[0] ?? '';
+		$last_name  = $name_parts[1] ?? '';
+
+		return array(
+			'name'         => $guest_name,
+			'first_name'   => $first_name,
+			'last_name'    => $last_name,
+			'email'        => get_post_meta( $booking_id, '_bnb_booking_guest_email', true ),
+			'phone'        => get_post_meta( $booking_id, '_bnb_booking_guest_phone', true ),
+			'notes'        => get_post_meta( $booking_id, '_bnb_booking_guest_notes', true ),
+			'full_address' => '', // Legacy bookings don't have full address.
 		);
 	}

--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -16,10 +16,14 @@ use Magdev\WpBnb\Booking\EmailNotifier;
 use Magdev\WpBnb\License\Manager as LicenseManager;
 use Magdev\WpBnb\PostTypes\Booking;
 use Magdev\WpBnb\PostTypes\Building;
+use Magdev\WpBnb\PostTypes\Guest;
 use Magdev\WpBnb\PostTypes\Room;
+use Magdev\WpBnb\PostTypes\Service;
+use Magdev\WpBnb\Privacy\Manager as PrivacyManager;
 use Magdev\WpBnb\Pricing\Season;
 use Magdev\WpBnb\Taxonomies\Amenity;
 use Magdev\WpBnb\Taxonomies\RoomType;
+use Magdev\WpBnb\Taxonomies\ServiceCategory;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;

@@ -92,6 +96,8 @@ final class Plugin {
 		Building::init();
 		Room::init();
 		Booking::init();
+		Guest::init();
+		Service::init();
 	}

 	/**
@@ -103,6 +109,7 @@ final class Plugin {
 		// Taxonomies must be registered before post types that use them.
 		Amenity::init();
 		RoomType::init();
+		ServiceCategory::init();
 	}

 	/**
@@ -144,8 +151,12 @@ final class Plugin {
 		// Initialize email notifier.
 		EmailNotifier::init();

+		// Initialize privacy manager for GDPR compliance.
+		PrivacyManager::init();
+
 		// Register AJAX handlers.
 		add_action( 'wp_ajax_wp_bnb_check_availability', array( $this, 'ajax_check_availability' ) );
+		add_action( 'wp_ajax_wp_bnb_search_guest', array( $this, 'ajax_search_guest' ) );
 	}

 	/**
@@ -181,7 +192,7 @@ final class Plugin {

 		// Check if we're on plugin pages or editing our custom post types.
 		$is_plugin_page   = strpos( $hook_suffix, 'wp-bnb' ) !== false;
-		$is_our_post_type = in_array( $post_type, array( Building::POST_TYPE, Room::POST_TYPE, Booking::POST_TYPE ), true );
+		$is_our_post_type = in_array( $post_type, array( Building::POST_TYPE, Room::POST_TYPE, Booking::POST_TYPE, Guest::POST_TYPE, Service::POST_TYPE ), true );
 		$is_edit_screen   = in_array( $hook_suffix, array( 'post.php', 'post-new.php' ), true );

 		if ( ! $is_plugin_page && ! ( $is_our_post_type && $is_edit_screen ) ) {
@@ -219,22 +230,28 @@ final class Plugin {
 				'nonce'    => wp_create_nonce( 'wp_bnb_admin_nonce' ),
 				'postType' => $post_type,
 				'i18n'     => array(
-					'validating'         => __( 'Validating...', 'wp-bnb' ),
-					'activating'         => __( 'Activating...', 'wp-bnb' ),
-					'error'              => __( 'An error occurred. Please try again.', 'wp-bnb' ),
-					'selectImages'       => __( 'Select Images', 'wp-bnb' ),
-					'addToGallery'       => __( 'Add to Gallery', 'wp-bnb' ),
-					'confirmRemove'      => __( 'Are you sure you want to remove this image?', 'wp-bnb' ),
-					'increase'           => __( 'increase', 'wp-bnb' ),
-					'discount'           => __( 'discount', 'wp-bnb' ),
-					'normalPrice'        => __( 'Normal price', 'wp-bnb' ),
-					'checking'           => __( 'Checking availability...', 'wp-bnb' ),
-					'available'          => __( 'Available', 'wp-bnb' ),
-					'notAvailable'       => __( 'Not available - conflicts with existing booking', 'wp-bnb' ),
-					'selectRoomAndDates' => __( 'Select room and dates to check availability', 'wp-bnb' ),
-					'nights'             => __( 'nights', 'wp-bnb' ),
-					'night'              => __( 'night', 'wp-bnb' ),
-					'calculating'        => __( 'Calculating price...', 'wp-bnb' ),
+					'validating'            => __( 'Validating...', 'wp-bnb' ),
+					'activating'            => __( 'Activating...', 'wp-bnb' ),
+					'error'                 => __( 'An error occurred. Please try again.', 'wp-bnb' ),
+					'selectImages'          => __( 'Select Images', 'wp-bnb' ),
+					'addToGallery'          => __( 'Add to Gallery', 'wp-bnb' ),
+					'confirmRemove'         => __( 'Are you sure you want to remove this image?', 'wp-bnb' ),
+					'increase'              => __( 'increase', 'wp-bnb' ),
+					'discount'              => __( 'discount', 'wp-bnb' ),
+					'normalPrice'           => __( 'Normal price', 'wp-bnb' ),
+					'checking'              => __( 'Checking availability...', 'wp-bnb' ),
+					'available'             => __( 'Available', 'wp-bnb' ),
+					'notAvailable'          => __( 'Not available - conflicts with existing booking', 'wp-bnb' ),
+					'selectRoomAndDates'    => __( 'Select room and dates to check availability', 'wp-bnb' ),
+					'nights'                => __( 'nights', 'wp-bnb' ),
+					'night'                 => __( 'night', 'wp-bnb' ),
+					'calculating'           => __( 'Calculating price...', 'wp-bnb' ),
+					'searchingGuests'       => __( 'Searching...', 'wp-bnb' ),
+					'noGuestsFound'         => __( 'No guests found', 'wp-bnb' ),
+					'selectGuest'           => __( 'Select', 'wp-bnb' ),
+					'guestBlocked'          => __( 'Blocked', 'wp-bnb' ),
+					'perNightDescription'   => __( 'This price will be charged per night of the stay.', 'wp-bnb' ),
+					'perBookingDescription' => __( 'This price will be charged once for the booking.', 'wp-bnb' ),
 				),
 			)
 		);
@@ -875,6 +892,68 @@ final class Plugin {
 		wp_send_json_success( $result );
 	}

+	/**
+	 * AJAX handler for searching guests by email.
+	 *
+	 * @return void
+	 */
+	public function ajax_search_guest(): void {
+		check_ajax_referer( 'wp_bnb_admin_nonce', 'nonce' );
+
+		if ( ! current_user_can( 'edit_posts' ) ) {
+			wp_send_json_error(
+				array( 'message' => __( 'You do not have permission to perform this action.', 'wp-bnb' ) )
+			);
+		}
+
+		$search = isset( $_POST['search'] ) ? sanitize_text_field( wp_unslash( $_POST['search'] ) ) : '';
+
+		if ( strlen( $search ) < 2 ) {
+			wp_send_json_success( array( 'guests' => array() ) );
+		}
+
+		// Search by email or name.
+		$guests = get_posts(
+			array(
+				'post_type'      => Guest::POST_TYPE,
+				'post_status'    => 'publish',
+				'posts_per_page' => 10,
+				'meta_query'     => array(
+					'relation' => 'OR',
+					array(
+						'key'     => '_bnb_guest_email',
+						'value'   => $search,
+						'compare' => 'LIKE',
+					),
+					array(
+						'key'     => '_bnb_guest_first_name',
+						'value'   => $search,
+						'compare' => 'LIKE',
+					),
+					array(
+						'key'     => '_bnb_guest_last_name',
+						'value'   => $search,
+						'compare' => 'LIKE',
+					),
+				),
+			)
+		);
+
+		$results = array();
+		foreach ( $guests as $guest ) {
+			$status   = get_post_meta( $guest->ID, '_bnb_guest_status', true ) ?: 'active';
+			$results[] = array(
+				'id'     => $guest->ID,
+				'name'   => Guest::get_full_name( $guest->ID ),
+				'email'  => get_post_meta( $guest->ID, '_bnb_guest_email', true ),
+				'phone'  => get_post_meta( $guest->ID, '_bnb_guest_phone', true ),
+				'status' => $status,
+			);
+		}
+
+		wp_send_json_success( array( 'guests' => $results ) );
+	}
+
 	/**
 	 * Get Twig environment.
 	 *
--- a/src/PostTypes/Booking.php
+++ b/src/PostTypes/Booking.php
@@ -18,6 +18,13 @@ use Magdev\WpBnb\Pricing\Calculator;
 */
 final class Booking {

+	/**
+	 * Services meta key.
+	 *
+	 * @var string
+	 */
+	public const SERVICES_META_KEY = '_bnb_booking_services';
+
 	/**
 	 * Post type slug.
 	 *
@@ -125,6 +132,15 @@ final class Booking {
 			'high'
 		);

+		add_meta_box(
+			'bnb_booking_services',
+			__( 'Additional Services', 'wp-bnb' ),
+			array( self::class, 'render_services_meta_box' ),
+			self::POST_TYPE,
+			'normal',
+			'default'
+		);
+
 		add_meta_box(
 			'bnb_booking_pricing',
 			__( 'Pricing', 'wp-bnb' ),
@@ -280,41 +296,97 @@ final class Booking {
 	 * @return void
 	 */
 	public static function render_guest_meta_box( \WP_Post $post ): void {
+		$guest_id     = get_post_meta( $post->ID, self::META_PREFIX . 'guest_id', true );
 		$guest_name   = get_post_meta( $post->ID, self::META_PREFIX . 'guest_name', true );
 		$guest_email  = get_post_meta( $post->ID, self::META_PREFIX . 'guest_email', true );
 		$guest_phone  = get_post_meta( $post->ID, self::META_PREFIX . 'guest_phone', true );
 		$adults       = get_post_meta( $post->ID, self::META_PREFIX . 'adults', true );
 		$children     = get_post_meta( $post->ID, self::META_PREFIX . 'children', true );
 		$guest_notes  = get_post_meta( $post->ID, self::META_PREFIX . 'guest_notes', true );
+
+		// If guest_id exists, get guest data from Guest CPT.
+		$linked_guest = null;
+		if ( $guest_id ) {
+			$linked_guest = get_post( $guest_id );
+			if ( $linked_guest && Guest::POST_TYPE === $linked_guest->post_type ) {
+				$guest_name  = Guest::get_full_name( $guest_id );
+				$guest_email = get_post_meta( $guest_id, '_bnb_guest_email', true );
+				$guest_phone = get_post_meta( $guest_id, '_bnb_guest_phone', true );
+			} else {
+				$linked_guest = null;
+				$guest_id     = '';
+			}
+		}
 		?>
+		<input type="hidden" id="bnb_booking_guest_id" name="bnb_booking_guest_id" value="<?php echo esc_attr( $guest_id ); ?>">
+
+		<?php if ( $linked_guest ) : ?>
+			<div id="bnb-linked-guest-info" class="bnb-linked-guest">
+				<p>
+					<span class="dashicons dashicons-admin-users"></span>
+					<strong><?php echo esc_html( $linked_guest->post_title ); ?></strong>
+					<a href="<?php echo esc_url( get_edit_post_link( $guest_id ) ); ?>" target="_blank" class="button button-small">
+						<?php esc_html_e( 'View Guest Profile', 'wp-bnb' ); ?>
+					</a>
+					<button type="button" id="bnb-unlink-guest" class="button button-small button-link-delete">
+						<?php esc_html_e( 'Unlink', 'wp-bnb' ); ?>
+					</button>
+				</p>
+				<?php if ( $guest_email ) : ?>
+					<p><small><?php echo esc_html( $guest_email ); ?></small></p>
+				<?php endif; ?>
+			</div>
+		<?php endif; ?>
+
+		<div id="bnb-guest-search-container" class="bnb-guest-search" <?php echo $linked_guest ? 'style="display:none;"' : ''; ?>>
+			<table class="form-table">
+				<tr>
+					<th scope="row">
+						<label for="bnb_booking_guest_search"><?php esc_html_e( 'Search Guest', 'wp-bnb' ); ?></label>
+					</th>
+					<td>
+						<input type="text" id="bnb_booking_guest_search" class="regular-text"
+							   placeholder="<?php esc_attr_e( 'Search by email...', 'wp-bnb' ); ?>">
+						<p class="description"><?php esc_html_e( 'Search for existing guest or enter details below.', 'wp-bnb' ); ?></p>
+						<div id="bnb-guest-search-results" class="bnb-guest-search-results" style="display:none;"></div>
+					</td>
+				</tr>
+			</table>
+		</div>
+
+		<div id="bnb-guest-fields-container" <?php echo $linked_guest ? 'style="display:none;"' : ''; ?>>
+			<table class="form-table">
+				<tr>
+					<th scope="row">
+						<label for="bnb_booking_guest_name"><?php esc_html_e( 'Guest Name', 'wp-bnb' ); ?> <span class="required">*</span></label>
+					</th>
+					<td>
+						<input type="text" id="bnb_booking_guest_name" name="bnb_booking_guest_name"
+							   value="<?php echo esc_attr( $guest_name ); ?>" class="regular-text" <?php echo $linked_guest ? '' : 'required'; ?>>
+					</td>
+				</tr>
+				<tr>
+					<th scope="row">
+						<label for="bnb_booking_guest_email"><?php esc_html_e( 'Email', 'wp-bnb' ); ?></label>
+					</th>
+					<td>
+						<input type="email" id="bnb_booking_guest_email" name="bnb_booking_guest_email"
+							   value="<?php echo esc_attr( $guest_email ); ?>" class="regular-text">
+					</td>
+				</tr>
+				<tr>
+					<th scope="row">
+						<label for="bnb_booking_guest_phone"><?php esc_html_e( 'Phone', 'wp-bnb' ); ?></label>
+					</th>
+					<td>
+						<input type="tel" id="bnb_booking_guest_phone" name="bnb_booking_guest_phone"
+							   value="<?php echo esc_attr( $guest_phone ); ?>" class="regular-text">
+					</td>
+				</tr>
+			</table>
+		</div>
+
 		<table class="form-table">
-			<tr>
-				<th scope="row">
-					<label for="bnb_booking_guest_name"><?php esc_html_e( 'Guest Name', 'wp-bnb' ); ?> <span class="required">*</span></label>
-				</th>
-				<td>
-					<input type="text" id="bnb_booking_guest_name" name="bnb_booking_guest_name"
-						   value="<?php echo esc_attr( $guest_name ); ?>" class="regular-text" required>
-				</td>
-			</tr>
-			<tr>
-				<th scope="row">
-					<label for="bnb_booking_guest_email"><?php esc_html_e( 'Email', 'wp-bnb' ); ?></label>
-				</th>
-				<td>
-					<input type="email" id="bnb_booking_guest_email" name="bnb_booking_guest_email"
-						   value="<?php echo esc_attr( $guest_email ); ?>" class="regular-text">
-				</td>
-			</tr>
-			<tr>
-				<th scope="row">
-					<label for="bnb_booking_guest_phone"><?php esc_html_e( 'Phone', 'wp-bnb' ); ?></label>
-				</th>
-				<td>
-					<input type="tel" id="bnb_booking_guest_phone" name="bnb_booking_guest_phone"
-						   value="<?php echo esc_attr( $guest_phone ); ?>" class="regular-text">
-				</td>
-			</tr>
 			<tr>
 				<th scope="row">
 					<?php esc_html_e( 'Guests', 'wp-bnb' ); ?>
@@ -343,6 +415,111 @@ final class Booking {
 		<?php
 	}

+	/**
+	 * Render services meta box.
+	 *
+	 * @param \WP_Post $post Current post object.
+	 * @return void
+	 */
+	public static function render_services_meta_box( \WP_Post $post ): void {
+		$selected_services = get_post_meta( $post->ID, self::SERVICES_META_KEY, true ) ?: array();
+		$check_in          = get_post_meta( $post->ID, self::META_PREFIX . 'check_in', true );
+		$check_out         = get_post_meta( $post->ID, self::META_PREFIX . 'check_out', true );
+		$nights            = ( $check_in && $check_out ) ? self::calculate_nights( $check_in, $check_out ) : 1;
+
+		// Get all active services.
+		$available_services = Service::get_services_for_booking();
+
+		if ( empty( $available_services ) ) {
+			?>
+			<p class="bnb-no-services-message">
+				<?php esc_html_e( 'No services available.', 'wp-bnb' ); ?>
+				<a href="<?php echo esc_url( admin_url( 'post-new.php?post_type=' . Service::POST_TYPE ) ); ?>">
+					<?php esc_html_e( 'Add a service', 'wp-bnb' ); ?>
+				</a>
+			</p>
+			<?php
+			return;
+		}
+
+		// Build a lookup map for selected services.
+		$selected_map = array();
+		if ( is_array( $selected_services ) ) {
+			foreach ( $selected_services as $service ) {
+				if ( isset( $service['service_id'] ) ) {
+					$selected_map[ $service['service_id'] ] = $service;
+				}
+			}
+		}
+		?>
+		<div class="bnb-services-selector" data-nights="<?php echo esc_attr( $nights ); ?>">
+			<p class="description">
+				<?php esc_html_e( 'Select additional services for this booking.', 'wp-bnb' ); ?>
+			</p>
+
+			<div class="bnb-services-list">
+				<?php foreach ( $available_services as $service ) : ?>
+					<?php
+					$is_selected   = isset( $selected_map[ $service['id'] ] );
+					$quantity      = $is_selected ? ( $selected_map[ $service['id'] ]['quantity'] ?? 1 ) : 1;
+					$service_total = $is_selected
+						? Service::calculate_service_price( $service['id'], $quantity, $nights )
+						: 0;
+					?>
+					<div class="bnb-service-item <?php echo $is_selected ? 'selected' : ''; ?>"
+						 data-service-id="<?php echo esc_attr( $service['id'] ); ?>"
+						 data-price="<?php echo esc_attr( $service['price'] ); ?>"
+						 data-pricing-type="<?php echo esc_attr( $service['pricing_type'] ); ?>"
+						 data-max-quantity="<?php echo esc_attr( $service['max_quantity'] ); ?>">
+						<label class="bnb-service-checkbox">
+							<input type="checkbox" name="bnb_booking_services[<?php echo esc_attr( $service['id'] ); ?>][selected]"
+								   value="1" <?php checked( $is_selected ); ?>>
+							<span class="bnb-service-name"><?php echo esc_html( $service['name'] ); ?></span>
+						</label>
+						<div class="bnb-service-details">
+							<span class="bnb-service-price-label">
+								<?php
+								if ( 'included' === $service['pricing_type'] ) {
+									echo '<span class="bnb-service-included-badge">' . esc_html__( 'Included', 'wp-bnb' ) . '</span>';
+								} else {
+									echo esc_html( $service['formatted_price'] );
+								}
+								?>
+							</span>
+							<?php if ( $service['max_quantity'] > 1 && 'included' !== $service['pricing_type'] ) : ?>
+								<span class="bnb-service-quantity" <?php echo ! $is_selected ? 'style="display:none;"' : ''; ?>>
+									<label>
+										<?php esc_html_e( 'Qty:', 'wp-bnb' ); ?>
+										<input type="number" name="bnb_booking_services[<?php echo esc_attr( $service['id'] ); ?>][quantity]"
+											   value="<?php echo esc_attr( $quantity ); ?>"
+											   min="1" max="<?php echo esc_attr( $service['max_quantity'] ); ?>"
+											   class="small-text bnb-service-qty-input">
+									</label>
+								</span>
+							<?php else : ?>
+								<input type="hidden" name="bnb_booking_services[<?php echo esc_attr( $service['id'] ); ?>][quantity]" value="1">
+							<?php endif; ?>
+							<span class="bnb-service-line-total" <?php echo ( ! $is_selected || $service_total <= 0 ) ? 'style="display:none;"' : ''; ?>>
+								= <strong class="bnb-service-total-value"><?php echo esc_html( Calculator::formatPrice( $service_total ) ); ?></strong>
+							</span>
+						</div>
+					</div>
+				<?php endforeach; ?>
+			</div>
+
+			<div class="bnb-services-total">
+				<strong><?php esc_html_e( 'Services Total:', 'wp-bnb' ); ?></strong>
+				<span id="bnb-services-total-amount">
+					<?php
+					$services_total = self::calculate_booking_services_total( $post->ID );
+					echo esc_html( Calculator::formatPrice( $services_total ) );
+					?>
+				</span>
+			</div>
+		</div>
+		<?php
+	}
+
 	/**
 	 * Render pricing meta box.
 	 *
@@ -391,6 +568,36 @@ final class Booking {
 					</td>
 				</tr>
 			<?php endif; ?>
+			<?php
+			$services_total = self::calculate_booking_services_total( $post->ID );
+			if ( $services_total > 0 ) :
+				?>
+				<tr>
+					<th scope="row">
+						<?php esc_html_e( 'Services', 'wp-bnb' ); ?>
+					</th>
+					<td>
+						<div class="bnb-booking-services-summary">
+							<?php echo esc_html( Calculator::formatPrice( $services_total ) ); ?>
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<th scope="row">
+						<?php esc_html_e( 'Grand Total', 'wp-bnb' ); ?>
+					</th>
+					<td>
+						<div class="bnb-booking-grand-total">
+							<strong>
+								<?php
+								$room_price = (float) $calculated_price;
+								echo esc_html( Calculator::formatPrice( $room_price + $services_total ) );
+								?>
+							</strong>
+						</div>
+					</td>
+				</tr>
+			<?php endif; ?>
 			<tr>
 				<th scope="row">
 					<label for="bnb_booking_override_price"><?php esc_html_e( 'Override Price', 'wp-bnb' ); ?></label>
@@ -535,21 +742,48 @@ final class Booking {
 			}
 		}

-		// Guest text fields.
-		$guest_fields = array( 'guest_name', 'guest_email', 'guest_phone', 'guest_notes' );
-		foreach ( $guest_fields as $field ) {
-			$key = 'bnb_booking_' . $field;
-			if ( isset( $_POST[ $key ] ) ) {
-				$value = wp_unslash( $_POST[ $key ] );
-				if ( 'guest_email' === $field ) {
-					$value = sanitize_email( $value );
-				} elseif ( 'guest_notes' === $field ) {
-					$value = sanitize_textarea_field( $value );
-				} else {
-					$value = sanitize_text_field( $value );
-				}
-				update_post_meta( $post_id, self::META_PREFIX . $field, $value );
+		// Guest ID (linked guest record).
+		$guest_id = isset( $_POST['bnb_booking_guest_id'] ) ? absint( $_POST['bnb_booking_guest_id'] ) : 0;
+		if ( $guest_id ) {
+			// Verify guest exists.
+			$guest = get_post( $guest_id );
+			if ( $guest && Guest::POST_TYPE === $guest->post_type ) {
+				update_post_meta( $post_id, self::META_PREFIX . 'guest_id', $guest_id );
+				// Sync guest data from Guest CPT for searching/display purposes.
+				update_post_meta( $post_id, self::META_PREFIX . 'guest_name', Guest::get_full_name( $guest_id ) );
+				update_post_meta( $post_id, self::META_PREFIX . 'guest_email', get_post_meta( $guest_id, '_bnb_guest_email', true ) );
+				update_post_meta( $post_id, self::META_PREFIX . 'guest_phone', get_post_meta( $guest_id, '_bnb_guest_phone', true ) );
+			} else {
+				delete_post_meta( $post_id, self::META_PREFIX . 'guest_id' );
 			}
+		} else {
+			delete_post_meta( $post_id, self::META_PREFIX . 'guest_id' );
+
+			// Guest text fields (only save if no guest_id).
+			$guest_fields = array( 'guest_name', 'guest_email', 'guest_phone', 'guest_notes' );
+			foreach ( $guest_fields as $field ) {
+				$key = 'bnb_booking_' . $field;
+				if ( isset( $_POST[ $key ] ) ) {
+					$value = wp_unslash( $_POST[ $key ] );
+					if ( 'guest_email' === $field ) {
+						$value = sanitize_email( $value );
+					} elseif ( 'guest_notes' === $field ) {
+						$value = sanitize_textarea_field( $value );
+					} else {
+						$value = sanitize_text_field( $value );
+					}
+					update_post_meta( $post_id, self::META_PREFIX . $field, $value );
+				}
+			}
+		}
+
+		// Guest notes are always saved (per-booking notes).
+		if ( isset( $_POST['bnb_booking_guest_notes'] ) ) {
+			update_post_meta(
+				$post_id,
+				self::META_PREFIX . 'guest_notes',
+				sanitize_textarea_field( wp_unslash( $_POST['bnb_booking_guest_notes'] ) )
+			);
 		}

 		// Guest counts.
@@ -595,6 +829,43 @@ final class Booking {
 			}
 		}

+		// Services.
+		$services_data = array();
+		if ( isset( $_POST['bnb_booking_services'] ) && is_array( $_POST['bnb_booking_services'] ) ) {
+			$nights = ( $check_in && $check_out ) ? self::calculate_nights( $check_in, $check_out ) : 1;
+
+			foreach ( $_POST['bnb_booking_services'] as $service_id => $service_input ) {
+				$service_id = absint( $service_id );
+				if ( ! $service_id ) {
+					continue;
+				}
+
+				// Only include if selected checkbox is checked.
+				if ( empty( $service_input['selected'] ) ) {
+					continue;
+				}
+
+				// Verify service exists and is active.
+				$service_data = Service::get_service_data( $service_id );
+				if ( ! $service_data || 'active' !== $service_data['status'] ) {
+					continue;
+				}
+
+				$quantity = isset( $service_input['quantity'] ) ? absint( $service_input['quantity'] ) : 1;
+				$quantity = max( 1, min( $quantity, $service_data['max_quantity'] ) );
+
+				$price = Service::calculate_service_price( $service_id, $quantity, $nights );
+
+				$services_data[] = array(
+					'service_id'   => $service_id,
+					'quantity'     => $quantity,
+					'price'        => $price,
+					'pricing_type' => $service_data['pricing_type'],
+				);
+			}
+		}
+		update_post_meta( $post_id, self::SERVICES_META_KEY, $services_data );
+
 		// Trigger status change action.
 		if ( $old_status && $status !== $old_status ) {
 			/**
@@ -664,10 +935,21 @@ final class Booking {
 				break;

 			case 'guest':
+				$guest_id    = get_post_meta( $post_id, self::META_PREFIX . 'guest_id', true );
 				$guest_name  = get_post_meta( $post_id, self::META_PREFIX . 'guest_name', true );
 				$guest_email = get_post_meta( $post_id, self::META_PREFIX . 'guest_email', true );
 				if ( $guest_name ) {
-					echo esc_html( $guest_name );
+					if ( $guest_id ) {
+						// Linked guest - show link to guest profile.
+						printf(
+							'<a href="%s">%s</a>',
+							esc_url( get_edit_post_link( $guest_id ) ),
+							esc_html( $guest_name )
+						);
+						echo ' <span class="dashicons dashicons-admin-users" style="font-size: 14px; vertical-align: middle;" title="' . esc_attr__( 'Linked Guest', 'wp-bnb' ) . '"></span>';
+					} else {
+						echo esc_html( $guest_name );
+					}
 					if ( $guest_email ) {
 						echo '<br><small><a href="mailto:' . esc_attr( $guest_email ) . '">' . esc_html( $guest_email ) . '</a></small>';
 					}
@@ -700,13 +982,21 @@ final class Booking {
 				break;

 			case 'price':
-				$price = get_post_meta( $post_id, self::META_PREFIX . 'calculated_price', true );
-				if ( $price ) {
-					echo esc_html( Calculator::formatPrice( (float) $price ) );
+				$room_price     = (float) get_post_meta( $post_id, self::META_PREFIX . 'calculated_price', true );
+				$services_total = self::calculate_booking_services_total( $post_id );
+				$total_price    = $room_price + $services_total;
+
+				if ( $total_price > 0 ) {
+					echo esc_html( Calculator::formatPrice( $total_price ) );
 					$override = get_post_meta( $post_id, self::META_PREFIX . 'override_price', true );
 					if ( $override ) {
 						echo ' <span class="bnb-price-override" title="' . esc_attr__( 'Price manually overridden', 'wp-bnb' ) . '">*</span>';
 					}
+					if ( $services_total > 0 ) {
+						echo '<br><small style="color: #646970;">' . esc_html__( 'incl. services', 'wp-bnb' ) . '</small>';
+					}
+				} elseif ( $room_price > 0 ) {
+					echo esc_html( Calculator::formatPrice( $room_price ) );
 				} else {
 					echo '—';
 				}
@@ -1071,6 +1361,47 @@ final class Booking {
 		return Room::get_building( $room->ID );
 	}

+	/**
+	 * Get guest for a booking.
+	 *
+	 * Returns the linked Guest post if guest_id exists, or a stdClass object
+	 * with guest data from booking meta for backward compatibility.
+	 *
+	 * @param int $booking_id Booking post ID.
+	 * @return \WP_Post|\stdClass|null Guest post, virtual guest object, or null.
+	 */
+	public static function get_guest( int $booking_id ) {
+		$guest_id = get_post_meta( $booking_id, self::META_PREFIX . 'guest_id', true );
+
+		// If linked to Guest CPT, return the guest post.
+		if ( $guest_id ) {
+			$guest = get_post( $guest_id );
+			if ( $guest && Guest::POST_TYPE === $guest->post_type ) {
+				return $guest;
+			}
+		}
+
+		// Otherwise, create a virtual guest object from booking meta.
+		$guest_name  = get_post_meta( $booking_id, self::META_PREFIX . 'guest_name', true );
+		$guest_email = get_post_meta( $booking_id, self::META_PREFIX . 'guest_email', true );
+		$guest_phone = get_post_meta( $booking_id, self::META_PREFIX . 'guest_phone', true );
+
+		if ( ! $guest_name && ! $guest_email ) {
+			return null;
+		}
+
+		// Return virtual guest object for backward compatibility.
+		$virtual_guest = new \stdClass();
+		$virtual_guest->ID         = 0;
+		$virtual_guest->post_type  = 'virtual_guest';
+		$virtual_guest->post_title = $guest_name ?: '';
+		$virtual_guest->name       = $guest_name ?: '';
+		$virtual_guest->email      = $guest_email ?: '';
+		$virtual_guest->phone      = $guest_phone ?: '';
+
+		return $virtual_guest;
+	}
+
 	/**
 	 * Get all bookings for a room.
 	 *
@@ -1097,6 +1428,56 @@ final class Booking {
 		return get_posts( array_merge( $defaults, $args ) );
 	}

+	/**
+	 * Calculate total services cost for a booking.
+	 *
+	 * @param int $booking_id Booking post ID.
+	 * @return float Total services cost.
+	 */
+	public static function calculate_booking_services_total( int $booking_id ): float {
+		$services = get_post_meta( $booking_id, self::SERVICES_META_KEY, true );
+
+		if ( ! is_array( $services ) || empty( $services ) ) {
+			return 0.0;
+		}
+
+		$total = 0.0;
+		foreach ( $services as $service ) {
+			if ( isset( $service['price'] ) ) {
+				$total += (float) $service['price'];
+			}
+		}
+
+		return $total;
+	}
+
+	/**
+	 * Get selected services for a booking.
+	 *
+	 * @param int $booking_id Booking post ID.
+	 * @return array Array of service data with names.
+	 */
+	public static function get_booking_services( int $booking_id ): array {
+		$services = get_post_meta( $booking_id, self::SERVICES_META_KEY, true );
+
+		if ( ! is_array( $services ) || empty( $services ) ) {
+			return array();
+		}
+
+		$result = array();
+		foreach ( $services as $service ) {
+			$service_post = get_post( $service['service_id'] ?? 0 );
+			if ( $service_post ) {
+				$result[] = array_merge(
+					$service,
+					array( 'name' => $service_post->post_title )
+				);
+			}
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Format price breakdown for display.
 	 *
--- a/src/PostTypes/Guest.php
+++ b/src/PostTypes/Guest.php
--- a/src/PostTypes/Service.php
+++ b/src/PostTypes/Service.php
@@ -0,0 +1,623 @@
+<?php
+/**
+ * Service post type.
+ *
+ * Custom post type for BnB additional services.
+ *
+ * @package Magdev\WpBnb\PostTypes
+ */
+
+declare( strict_types=1 );
+
+namespace Magdev\WpBnb\PostTypes;
+
+use Magdev\WpBnb\Pricing\Calculator;
+
+/**
+ * Service post type class.
+ */
+final class Service {
+
+	/**
+	 * Post type slug.
+	 *
+	 * @var string
+	 */
+	public const POST_TYPE = 'bnb_service';
+
+	/**
+	 * Meta key prefix.
+	 *
+	 * @var string
+	 */
+	private const META_PREFIX = '_bnb_service_';
+
+	/**
+	 * Initialize the post type.
+	 *
+	 * @return void
+	 */
+	public static function init(): void {
+		add_action( 'init', array( self::class, 'register' ) );
+		add_action( 'add_meta_boxes', array( self::class, 'add_meta_boxes' ) );
+		add_action( 'save_post_' . self::POST_TYPE, array( self::class, 'save_meta' ), 10, 2 );
+		add_filter( 'manage_' . self::POST_TYPE . '_posts_columns', array( self::class, 'add_columns' ) );
+		add_action( 'manage_' . self::POST_TYPE . '_posts_custom_column', array( self::class, 'render_column' ), 10, 2 );
+		add_filter( 'manage_edit-' . self::POST_TYPE . '_sortable_columns', array( self::class, 'sortable_columns' ) );
+		add_action( 'restrict_manage_posts', array( self::class, 'add_filters' ) );
+		add_action( 'pre_get_posts', array( self::class, 'filter_query' ) );
+		add_filter( 'enter_title_here', array( self::class, 'change_title_placeholder' ), 10, 2 );
+	}
+
+	/**
+	 * Register the post type.
+	 *
+	 * @return void
+	 */
+	public static function register(): void {
+		$labels = array(
+			'name'                  => _x( 'Services', 'post type general name', 'wp-bnb' ),
+			'singular_name'         => _x( 'Service', 'post type singular name', 'wp-bnb' ),
+			'menu_name'             => _x( 'Services', 'admin menu', 'wp-bnb' ),
+			'name_admin_bar'        => _x( 'Service', 'add new on admin bar', 'wp-bnb' ),
+			'add_new'               => _x( 'Add New', 'service', 'wp-bnb' ),
+			'add_new_item'          => __( 'Add New Service', 'wp-bnb' ),
+			'new_item'              => __( 'New Service', 'wp-bnb' ),
+			'edit_item'             => __( 'Edit Service', 'wp-bnb' ),
+			'view_item'             => __( 'View Service', 'wp-bnb' ),
+			'all_items'             => __( 'Services', 'wp-bnb' ),
+			'search_items'          => __( 'Search Services', 'wp-bnb' ),
+			'parent_item_colon'     => __( 'Parent Services:', 'wp-bnb' ),
+			'not_found'             => __( 'No services found.', 'wp-bnb' ),
+			'not_found_in_trash'    => __( 'No services found in Trash.', 'wp-bnb' ),
+			'archives'              => __( 'Service archives', 'wp-bnb' ),
+			'insert_into_item'      => __( 'Insert into service', 'wp-bnb' ),
+			'uploaded_to_this_item' => __( 'Uploaded to this service', 'wp-bnb' ),
+			'filter_items_list'     => __( 'Filter services list', 'wp-bnb' ),
+			'items_list_navigation' => __( 'Services list navigation', 'wp-bnb' ),
+			'items_list'            => __( 'Services list', 'wp-bnb' ),
+		);
+
+		$args = array(
+			'labels'              => $labels,
+			'public'              => false,
+			'publicly_queryable'  => false,
+			'show_ui'             => true,
+			'show_in_menu'        => 'wp-bnb',
+			'query_var'           => false,
+			'capability_type'     => 'post',
+			'has_archive'         => false,
+			'hierarchical'        => false,
+			'menu_position'       => null,
+			'menu_icon'           => 'dashicons-plus-alt',
+			'supports'            => array( 'title', 'editor', 'thumbnail' ),
+			'show_in_rest'        => true,
+			'rest_base'           => 'services',
+			'rest_controller_class' => 'WP_REST_Posts_Controller',
+		);
+
+		register_post_type( self::POST_TYPE, $args );
+	}
+
+	/**
+	 * Add meta boxes.
+	 *
+	 * @return void
+	 */
+	public static function add_meta_boxes(): void {
+		add_meta_box(
+			'bnb_service_pricing',
+			__( 'Pricing', 'wp-bnb' ),
+			array( self::class, 'render_pricing_meta_box' ),
+			self::POST_TYPE,
+			'normal',
+			'high'
+		);
+
+		add_meta_box(
+			'bnb_service_settings',
+			__( 'Service Settings', 'wp-bnb' ),
+			array( self::class, 'render_settings_meta_box' ),
+			self::POST_TYPE,
+			'side',
+			'default'
+		);
+	}
+
+	/**
+	 * Render pricing meta box.
+	 *
+	 * @param \WP_Post $post Current post object.
+	 * @return void
+	 */
+	public static function render_pricing_meta_box( \WP_Post $post ): void {
+		wp_nonce_field( 'bnb_service_meta', 'bnb_service_meta_nonce' );
+
+		$pricing_type = get_post_meta( $post->ID, self::META_PREFIX . 'pricing_type', true ) ?: 'per_booking';
+		$price        = get_post_meta( $post->ID, self::META_PREFIX . 'price', true );
+		$currency     = get_option( 'wp_bnb_currency', 'CHF' );
+		?>
+		<table class="form-table">
+			<tr>
+				<th scope="row">
+					<label for="bnb_service_pricing_type"><?php esc_html_e( 'Pricing Type', 'wp-bnb' ); ?></label>
+				</th>
+				<td>
+					<fieldset>
+						<label>
+							<input type="radio" name="bnb_service_pricing_type" value="included"
+								<?php checked( $pricing_type, 'included' ); ?>>
+							<?php esc_html_e( 'Included (Free)', 'wp-bnb' ); ?>
+							<p class="description"><?php esc_html_e( 'Service is included at no extra cost.', 'wp-bnb' ); ?></p>
+						</label>
+						<br><br>
+						<label>
+							<input type="radio" name="bnb_service_pricing_type" value="per_booking"
+								<?php checked( $pricing_type, 'per_booking' ); ?>>
+							<?php esc_html_e( 'Per Booking (One-time)', 'wp-bnb' ); ?>
+							<p class="description"><?php esc_html_e( 'Fixed price charged once per booking.', 'wp-bnb' ); ?></p>
+						</label>
+						<br><br>
+						<label>
+							<input type="radio" name="bnb_service_pricing_type" value="per_night"
+								<?php checked( $pricing_type, 'per_night' ); ?>>
+							<?php esc_html_e( 'Per Night', 'wp-bnb' ); ?>
+							<p class="description"><?php esc_html_e( 'Price multiplied by the number of nights.', 'wp-bnb' ); ?></p>
+						</label>
+					</fieldset>
+				</td>
+			</tr>
+			<tr id="bnb-service-price-row" <?php echo 'included' === $pricing_type ? 'style="display:none;"' : ''; ?>>
+				<th scope="row">
+					<label for="bnb_service_price"><?php esc_html_e( 'Price', 'wp-bnb' ); ?></label>
+				</th>
+				<td>
+					<div class="bnb-price-input-wrapper">
+						<input type="number" id="bnb_service_price" name="bnb_service_price"
+							   value="<?php echo esc_attr( $price ); ?>" class="small-text"
+							   min="0" step="0.01">
+						<span class="bnb-price-unit"><?php echo esc_html( $currency ); ?></span>
+						<span id="bnb-service-price-suffix"></span>
+					</div>
+					<p class="description" id="bnb-service-price-description">
+						<?php
+						if ( 'per_night' === $pricing_type ) {
+							esc_html_e( 'This price will be charged per night of the stay.', 'wp-bnb' );
+						} else {
+							esc_html_e( 'This price will be charged once for the booking.', 'wp-bnb' );
+						}
+						?>
+					</p>
+				</td>
+			</tr>
+		</table>
+		<?php
+	}
+
+	/**
+	 * Render settings meta box.
+	 *
+	 * @param \WP_Post $post Current post object.
+	 * @return void
+	 */
+	public static function render_settings_meta_box( \WP_Post $post ): void {
+		$status     = get_post_meta( $post->ID, self::META_PREFIX . 'status', true ) ?: 'active';
+		$sort_order = get_post_meta( $post->ID, self::META_PREFIX . 'sort_order', true ) ?: 0;
+		$max_qty    = get_post_meta( $post->ID, self::META_PREFIX . 'max_quantity', true ) ?: 1;
+		?>
+		<p>
+			<label for="bnb_service_status"><strong><?php esc_html_e( 'Status', 'wp-bnb' ); ?></strong></label>
+		</p>
+		<select id="bnb_service_status" name="bnb_service_status" class="widefat">
+			<option value="active" <?php selected( $status, 'active' ); ?>><?php esc_html_e( 'Active', 'wp-bnb' ); ?></option>
+			<option value="inactive" <?php selected( $status, 'inactive' ); ?>><?php esc_html_e( 'Inactive', 'wp-bnb' ); ?></option>
+		</select>
+		<p class="description"><?php esc_html_e( 'Inactive services cannot be added to bookings.', 'wp-bnb' ); ?></p>
+
+		<hr>
+
+		<p>
+			<label for="bnb_service_sort_order"><strong><?php esc_html_e( 'Sort Order', 'wp-bnb' ); ?></strong></label>
+		</p>
+		<input type="number" id="bnb_service_sort_order" name="bnb_service_sort_order"
+			   value="<?php echo esc_attr( $sort_order ); ?>" class="small-text" min="0">
+		<p class="description"><?php esc_html_e( 'Lower numbers appear first.', 'wp-bnb' ); ?></p>
+
+		<hr>
+
+		<p>
+			<label for="bnb_service_max_quantity"><strong><?php esc_html_e( 'Maximum Quantity', 'wp-bnb' ); ?></strong></label>
+		</p>
+		<input type="number" id="bnb_service_max_quantity" name="bnb_service_max_quantity"
+			   value="<?php echo esc_attr( $max_qty ); ?>" class="small-text" min="1" max="99">
+		<p class="description"><?php esc_html_e( 'Maximum times this service can be added to a booking.', 'wp-bnb' ); ?></p>
+		<?php
+	}
+
+	/**
+	 * Save post meta.
+	 *
+	 * @param int      $post_id Post ID.
+	 * @param \WP_Post $post    Post object.
+	 * @return void
+	 */
+	public static function save_meta( int $post_id, \WP_Post $post ): void {
+		// Verify nonce.
+		if ( ! isset( $_POST['bnb_service_meta_nonce'] ) ||
+			 ! wp_verify_nonce( sanitize_key( $_POST['bnb_service_meta_nonce'] ), 'bnb_service_meta' ) ) {
+			return;
+		}
+
+		// Check autosave.
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+			return;
+		}
+
+		// Check permissions.
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			return;
+		}
+
+		// Pricing type.
+		$valid_pricing_types = array( 'included', 'per_booking', 'per_night' );
+		$pricing_type        = isset( $_POST['bnb_service_pricing_type'] )
+			? sanitize_text_field( wp_unslash( $_POST['bnb_service_pricing_type'] ) )
+			: 'per_booking';
+		if ( in_array( $pricing_type, $valid_pricing_types, true ) ) {
+			update_post_meta( $post_id, self::META_PREFIX . 'pricing_type', $pricing_type );
+		}
+
+		// Price (not required for 'included').
+		if ( 'included' === $pricing_type ) {
+			update_post_meta( $post_id, self::META_PREFIX . 'price', 0 );
+		} elseif ( isset( $_POST['bnb_service_price'] ) ) {
+			update_post_meta( $post_id, self::META_PREFIX . 'price', floatval( $_POST['bnb_service_price'] ) );
+		}
+
+		// Status.
+		$valid_statuses = array( 'active', 'inactive' );
+		$status         = isset( $_POST['bnb_service_status'] )
+			? sanitize_text_field( wp_unslash( $_POST['bnb_service_status'] ) )
+			: 'active';
+		if ( in_array( $status, $valid_statuses, true ) ) {
+			update_post_meta( $post_id, self::META_PREFIX . 'status', $status );
+		}
+
+		// Sort order.
+		if ( isset( $_POST['bnb_service_sort_order'] ) ) {
+			update_post_meta( $post_id, self::META_PREFIX . 'sort_order', absint( $_POST['bnb_service_sort_order'] ) );
+		}
+
+		// Max quantity.
+		if ( isset( $_POST['bnb_service_max_quantity'] ) ) {
+			$max_qty = absint( $_POST['bnb_service_max_quantity'] );
+			$max_qty = max( 1, min( 99, $max_qty ) );
+			update_post_meta( $post_id, self::META_PREFIX . 'max_quantity', $max_qty );
+		}
+	}
+
+	/**
+	 * Add custom columns to the post list.
+	 *
+	 * @param array $columns Existing columns.
+	 * @return array
+	 */
+	public static function add_columns( array $columns ): array {
+		$new_columns = array();
+		foreach ( $columns as $key => $value ) {
+			$new_columns[ $key ] = $value;
+			if ( 'title' === $key ) {
+				$new_columns['pricing_type'] = __( 'Pricing Type', 'wp-bnb' );
+				$new_columns['price']        = __( 'Price', 'wp-bnb' );
+				$new_columns['service_status'] = __( 'Status', 'wp-bnb' );
+			}
+		}
+		// Remove date column.
+		unset( $new_columns['date'] );
+		return $new_columns;
+	}
+
+	/**
+	 * Render custom column content.
+	 *
+	 * @param string $column  Column name.
+	 * @param int    $post_id Post ID.
+	 * @return void
+	 */
+	public static function render_column( string $column, int $post_id ): void {
+		switch ( $column ) {
+			case 'pricing_type':
+				$pricing_type = get_post_meta( $post_id, self::META_PREFIX . 'pricing_type', true ) ?: 'per_booking';
+				$labels       = self::get_pricing_type_labels();
+				$icons        = array(
+					'included'    => 'yes-alt',
+					'per_booking' => 'tag',
+					'per_night'   => 'calendar-alt',
+				);
+				$colors       = array(
+					'included'    => '#00a32a',
+					'per_booking' => '#135e96',
+					'per_night'   => '#dba617',
+				);
+				echo '<span class="dashicons dashicons-' . esc_attr( $icons[ $pricing_type ] ?? 'admin-generic' ) . '" style="color: ' . esc_attr( $colors[ $pricing_type ] ?? '#646970' ) . '; vertical-align: middle; margin-right: 3px;"></span>';
+				echo esc_html( $labels[ $pricing_type ] ?? $pricing_type );
+				break;
+
+			case 'price':
+				$pricing_type = get_post_meta( $post_id, self::META_PREFIX . 'pricing_type', true ) ?: 'per_booking';
+				if ( 'included' === $pricing_type ) {
+					echo '<span class="bnb-service-included">' . esc_html__( 'Included', 'wp-bnb' ) . '</span>';
+				} else {
+					$price = get_post_meta( $post_id, self::META_PREFIX . 'price', true );
+					if ( $price ) {
+						echo esc_html( Calculator::formatPrice( (float) $price ) );
+						if ( 'per_night' === $pricing_type ) {
+							echo ' <small style="color: #646970;">' . esc_html__( '/ night', 'wp-bnb' ) . '</small>';
+						}
+					} else {
+						echo '<span class="bnb-no-price">' . esc_html__( 'Not set', 'wp-bnb' ) . '</span>';
+					}
+				}
+				break;
+
+			case 'service_status':
+				$status  = get_post_meta( $post_id, self::META_PREFIX . 'status', true ) ?: 'active';
+				$classes = array(
+					'active'   => 'bnb-service-status-active',
+					'inactive' => 'bnb-service-status-inactive',
+				);
+				$labels  = array(
+					'active'   => __( 'Active', 'wp-bnb' ),
+					'inactive' => __( 'Inactive', 'wp-bnb' ),
+				);
+				echo '<span class="bnb-service-status ' . esc_attr( $classes[ $status ] ?? '' ) . '">';
+				echo esc_html( $labels[ $status ] ?? $status );
+				echo '</span>';
+				break;
+		}
+	}
+
+	/**
+	 * Add sortable columns.
+	 *
+	 * @param array $columns Existing sortable columns.
+	 * @return array
+	 */
+	public static function sortable_columns( array $columns ): array {
+		$columns['price']          = 'price';
+		$columns['service_status'] = 'status';
+		return $columns;
+	}
+
+	/**
+	 * Add filter dropdowns to admin list.
+	 *
+	 * @param string $post_type Current post type.
+	 * @return void
+	 */
+	public static function add_filters( string $post_type ): void {
+		if ( self::POST_TYPE !== $post_type ) {
+			return;
+		}
+
+		// Status filter.
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Filter display only.
+		$selected_status = isset( $_GET['service_status'] ) ? sanitize_text_field( wp_unslash( $_GET['service_status'] ) ) : '';
+		?>
+		<select name="service_status">
+			<option value=""><?php esc_html_e( 'All Statuses', 'wp-bnb' ); ?></option>
+			<option value="active" <?php selected( $selected_status, 'active' ); ?>><?php esc_html_e( 'Active', 'wp-bnb' ); ?></option>
+			<option value="inactive" <?php selected( $selected_status, 'inactive' ); ?>><?php esc_html_e( 'Inactive', 'wp-bnb' ); ?></option>
+		</select>
+		<?php
+
+		// Pricing type filter.
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Filter display only.
+		$selected_pricing = isset( $_GET['pricing_type'] ) ? sanitize_text_field( wp_unslash( $_GET['pricing_type'] ) ) : '';
+		$labels           = self::get_pricing_type_labels();
+		?>
+		<select name="pricing_type">
+			<option value=""><?php esc_html_e( 'All Pricing Types', 'wp-bnb' ); ?></option>
+			<?php foreach ( $labels as $value => $label ) : ?>
+				<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $selected_pricing, $value ); ?>>
+					<?php echo esc_html( $label ); ?>
+				</option>
+			<?php endforeach; ?>
+		</select>
+		<?php
+	}
+
+	/**
+	 * Filter services by status and pricing type in admin list.
+	 *
+	 * @param \WP_Query $query Current query.
+	 * @return void
+	 */
+	public static function filter_query( \WP_Query $query ): void {
+		if ( ! is_admin() || ! $query->is_main_query() ) {
+			return;
+		}
+
+		if ( self::POST_TYPE !== $query->get( 'post_type' ) ) {
+			return;
+		}
+
+		$meta_query = array();
+
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Filter query only.
+		if ( ! empty( $_GET['service_status'] ) ) {
+			$meta_query[] = array(
+				'key'   => self::META_PREFIX . 'status',
+				'value' => sanitize_text_field( wp_unslash( $_GET['service_status'] ) ),
+			);
+		}
+
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Filter query only.
+		if ( ! empty( $_GET['pricing_type'] ) ) {
+			$meta_query[] = array(
+				'key'   => self::META_PREFIX . 'pricing_type',
+				'value' => sanitize_text_field( wp_unslash( $_GET['pricing_type'] ) ),
+			);
+		}
+
+		if ( ! empty( $meta_query ) ) {
+			$meta_query['relation'] = 'AND';
+			$query->set( 'meta_query', $meta_query );
+		}
+
+		// Handle sorting.
+		$orderby = $query->get( 'orderby' );
+		if ( 'price' === $orderby ) {
+			$query->set( 'meta_key', self::META_PREFIX . 'price' );
+			$query->set( 'orderby', 'meta_value_num' );
+		} elseif ( 'status' === $orderby ) {
+			$query->set( 'meta_key', self::META_PREFIX . 'status' );
+			$query->set( 'orderby', 'meta_value' );
+		}
+	}
+
+	/**
+	 * Change title placeholder.
+	 *
+	 * @param string   $placeholder Default placeholder.
+	 * @param \WP_Post $post        Current post.
+	 * @return string
+	 */
+	public static function change_title_placeholder( string $placeholder, \WP_Post $post ): string {
+		if ( self::POST_TYPE === $post->post_type ) {
+			return __( 'Service name', 'wp-bnb' );
+		}
+		return $placeholder;
+	}
+
+	/**
+	 * Get pricing type labels.
+	 *
+	 * @return array<string, string>
+	 */
+	public static function get_pricing_type_labels(): array {
+		return array(
+			'included'    => __( 'Included (Free)', 'wp-bnb' ),
+			'per_booking' => __( 'Per Booking', 'wp-bnb' ),
+			'per_night'   => __( 'Per Night', 'wp-bnb' ),
+		);
+	}
+
+	/**
+	 * Get all active services.
+	 *
+	 * @param array $args Additional query args.
+	 * @return array<\WP_Post>
+	 */
+	public static function get_active_services( array $args = array() ): array {
+		$defaults = array(
+			'post_type'      => self::POST_TYPE,
+			'post_status'    => 'publish',
+			'posts_per_page' => -1,
+			'meta_query'     => array(
+				array(
+					'key'   => self::META_PREFIX . 'status',
+					'value' => 'active',
+				),
+			),
+			'meta_key'       => self::META_PREFIX . 'sort_order',
+			'orderby'        => 'meta_value_num',
+			'order'          => 'ASC',
+		);
+
+		return get_posts( array_merge( $defaults, $args ) );
+	}
+
+	/**
+	 * Get service data for a service.
+	 *
+	 * @param int $service_id Service post ID.
+	 * @return array|null Service data or null if not found.
+	 */
+	public static function get_service_data( int $service_id ): ?array {
+		$service = get_post( $service_id );
+		if ( ! $service || self::POST_TYPE !== $service->post_type ) {
+			return null;
+		}
+
+		return array(
+			'id'           => $service_id,
+			'name'         => $service->post_title,
+			'description'  => $service->post_content,
+			'pricing_type' => get_post_meta( $service_id, self::META_PREFIX . 'pricing_type', true ) ?: 'per_booking',
+			'price'        => (float) get_post_meta( $service_id, self::META_PREFIX . 'price', true ),
+			'status'       => get_post_meta( $service_id, self::META_PREFIX . 'status', true ) ?: 'active',
+			'sort_order'   => (int) get_post_meta( $service_id, self::META_PREFIX . 'sort_order', true ),
+			'max_quantity' => (int) get_post_meta( $service_id, self::META_PREFIX . 'max_quantity', true ) ?: 1,
+		);
+	}
+
+	/**
+	 * Calculate service price for a booking.
+	 *
+	 * @param int $service_id Service post ID.
+	 * @param int $quantity   Quantity of the service.
+	 * @param int $nights     Number of nights (for per-night pricing).
+	 * @return float Calculated price.
+	 */
+	public static function calculate_service_price( int $service_id, int $quantity = 1, int $nights = 1 ): float {
+		$data = self::get_service_data( $service_id );
+		if ( ! $data ) {
+			return 0.0;
+		}
+
+		if ( 'included' === $data['pricing_type'] ) {
+			return 0.0;
+		}
+
+		$base_price = $data['price'];
+
+		if ( 'per_night' === $data['pricing_type'] ) {
+			return $base_price * $quantity * max( 1, $nights );
+		}
+
+		// per_booking.
+		return $base_price * $quantity;
+	}
+
+	/**
+	 * Get services for booking display/selection.
+	 *
+	 * @return array Array of services with their data.
+	 */
+	public static function get_services_for_booking(): array {
+		$services = self::get_active_services();
+		$result   = array();
+
+		foreach ( $services as $service ) {
+			$data = self::get_service_data( $service->ID );
+			if ( $data ) {
+				$data['formatted_price'] = self::format_service_price( $data );
+				$result[]                = $data;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Format service price for display.
+	 *
+	 * @param array $service_data Service data array.
+	 * @return string Formatted price string.
+	 */
+	public static function format_service_price( array $service_data ): string {
+		if ( 'included' === $service_data['pricing_type'] ) {
+			return __( 'Included', 'wp-bnb' );
+		}
+
+		$formatted = Calculator::formatPrice( $service_data['price'] );
+
+		if ( 'per_night' === $service_data['pricing_type'] ) {
+			/* translators: %s: Formatted price */
+			return sprintf( __( '%s / night', 'wp-bnb' ), $formatted );
+		}
+
+		return $formatted;
+	}
+}
--- a/src/Privacy/Manager.php
+++ b/src/Privacy/Manager.php
@@ -0,0 +1,800 @@
+<?php
+/**
+ * Privacy Manager for GDPR compliance.
+ *
+ * Handles personal data export and erasure for WordPress privacy tools.
+ *
+ * @package Magdev\WpBnb\Privacy
+ */
+
+declare( strict_types=1 );
+
+namespace Magdev\WpBnb\Privacy;
+
+use Magdev\WpBnb\PostTypes\Booking;
+use Magdev\WpBnb\PostTypes\Guest;
+
+/**
+ * Privacy Manager class for GDPR compliance.
+ */
+final class Manager {
+
+	/**
+	 * Manager instance.
+	 *
+	 * @var Manager|null
+	 */
+	private static ?Manager $instance = null;
+
+	/**
+	 * Get manager instance.
+	 *
+	 * @return Manager
+	 */
+	public static function get_instance(): Manager {
+		if ( null === self::$instance ) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
+
+	/**
+	 * Private constructor to enforce singleton.
+	 */
+	private function __construct() {
+		$this->init_hooks();
+	}
+
+	/**
+	 * Initialize hooks.
+	 *
+	 * @return void
+	 */
+	public static function init(): void {
+		self::get_instance();
+	}
+
+	/**
+	 * Initialize WordPress hooks.
+	 *
+	 * @return void
+	 */
+	private function init_hooks(): void {
+		// Register personal data exporters.
+		add_filter( 'wp_privacy_personal_data_exporters', array( $this, 'register_exporters' ) );
+
+		// Register personal data erasers.
+		add_filter( 'wp_privacy_personal_data_erasers', array( $this, 'register_erasers' ) );
+
+		// Add privacy policy content suggestion.
+		add_action( 'admin_init', array( $this, 'add_privacy_policy_content' ) );
+	}
+
+	/**
+	 * Register personal data exporters.
+	 *
+	 * @param array $exporters Existing exporters.
+	 * @return array
+	 */
+	public function register_exporters( array $exporters ): array {
+		$exporters['wp-bnb-guest'] = array(
+			'exporter_friendly_name' => __( 'WP BnB Guest Profile', 'wp-bnb' ),
+			'callback'               => array( $this, 'export_guest_data' ),
+		);
+
+		$exporters['wp-bnb-bookings'] = array(
+			'exporter_friendly_name' => __( 'WP BnB Booking History', 'wp-bnb' ),
+			'callback'               => array( $this, 'export_booking_data' ),
+		);
+
+		return $exporters;
+	}
+
+	/**
+	 * Register personal data erasers.
+	 *
+	 * @param array $erasers Existing erasers.
+	 * @return array
+	 */
+	public function register_erasers( array $erasers ): array {
+		$erasers['wp-bnb-guest'] = array(
+			'eraser_friendly_name' => __( 'WP BnB Guest Profile', 'wp-bnb' ),
+			'callback'             => array( $this, 'erase_guest_data' ),
+		);
+
+		$erasers['wp-bnb-bookings'] = array(
+			'eraser_friendly_name' => __( 'WP BnB Booking History', 'wp-bnb' ),
+			'callback'             => array( $this, 'erase_booking_data' ),
+		);
+
+		return $erasers;
+	}
+
+	/**
+	 * Export guest profile data.
+	 *
+	 * @param string $email Email address to export data for.
+	 * @param int    $page  Page number for pagination.
+	 * @return array Export data array.
+	 */
+	public function export_guest_data( string $email, int $page = 1 ): array {
+		$export_items = array();
+
+		// Find guest by email.
+		$guest = Guest::get_by_email( $email );
+
+		if ( $guest ) {
+			$data = array();
+
+			// Basic information.
+			$first_name = get_post_meta( $guest->ID, '_bnb_guest_first_name', true );
+			$last_name  = get_post_meta( $guest->ID, '_bnb_guest_last_name', true );
+
+			if ( $first_name ) {
+				$data[] = array(
+					'name'  => __( 'First Name', 'wp-bnb' ),
+					'value' => $first_name,
+				);
+			}
+
+			if ( $last_name ) {
+				$data[] = array(
+					'name'  => __( 'Last Name', 'wp-bnb' ),
+					'value' => $last_name,
+				);
+			}
+
+			$data[] = array(
+				'name'  => __( 'Email', 'wp-bnb' ),
+				'value' => get_post_meta( $guest->ID, '_bnb_guest_email', true ),
+			);
+
+			$phone = get_post_meta( $guest->ID, '_bnb_guest_phone', true );
+			if ( $phone ) {
+				$data[] = array(
+					'name'  => __( 'Phone', 'wp-bnb' ),
+					'value' => $phone,
+				);
+			}
+
+			// Address.
+			$street = get_post_meta( $guest->ID, '_bnb_guest_street', true );
+			if ( $street ) {
+				$data[] = array(
+					'name'  => __( 'Street Address', 'wp-bnb' ),
+					'value' => $street,
+				);
+			}
+
+			$city = get_post_meta( $guest->ID, '_bnb_guest_city', true );
+			if ( $city ) {
+				$data[] = array(
+					'name'  => __( 'City', 'wp-bnb' ),
+					'value' => $city,
+				);
+			}
+
+			$postal_code = get_post_meta( $guest->ID, '_bnb_guest_postal_code', true );
+			if ( $postal_code ) {
+				$data[] = array(
+					'name'  => __( 'Postal Code', 'wp-bnb' ),
+					'value' => $postal_code,
+				);
+			}
+
+			$country = get_post_meta( $guest->ID, '_bnb_guest_country', true );
+			if ( $country ) {
+				$data[] = array(
+					'name'  => __( 'Country', 'wp-bnb' ),
+					'value' => $country,
+				);
+			}
+
+			// Personal details.
+			$nationality = get_post_meta( $guest->ID, '_bnb_guest_nationality', true );
+			if ( $nationality ) {
+				$data[] = array(
+					'name'  => __( 'Nationality', 'wp-bnb' ),
+					'value' => $nationality,
+				);
+			}
+
+			$date_of_birth = get_post_meta( $guest->ID, '_bnb_guest_date_of_birth', true );
+			if ( $date_of_birth ) {
+				$data[] = array(
+					'name'  => __( 'Date of Birth', 'wp-bnb' ),
+					'value' => $date_of_birth,
+				);
+			}
+
+			// ID information (sensitive).
+			$id_type = get_post_meta( $guest->ID, '_bnb_guest_id_type', true );
+			if ( $id_type ) {
+				$data[] = array(
+					'name'  => __( 'ID Type', 'wp-bnb' ),
+					'value' => $id_type,
+				);
+			}
+
+			$id_number = get_post_meta( $guest->ID, '_bnb_guest_id_number', true );
+			if ( $id_number ) {
+				$data[] = array(
+					'name'  => __( 'ID Number', 'wp-bnb' ),
+					'value' => $id_number,
+				);
+			}
+
+			$id_expiry = get_post_meta( $guest->ID, '_bnb_guest_id_expiry', true );
+			if ( $id_expiry ) {
+				$data[] = array(
+					'name'  => __( 'ID Expiry Date', 'wp-bnb' ),
+					'value' => $id_expiry,
+				);
+			}
+
+			// Consent information.
+			$consent_data = get_post_meta( $guest->ID, '_bnb_guest_consent_data', true );
+			$data[]       = array(
+				'name'  => __( 'Data Processing Consent', 'wp-bnb' ),
+				'value' => $consent_data ? __( 'Yes', 'wp-bnb' ) : __( 'No', 'wp-bnb' ),
+			);
+
+			$consent_marketing = get_post_meta( $guest->ID, '_bnb_guest_consent_marketing', true );
+			$data[]            = array(
+				'name'  => __( 'Marketing Consent', 'wp-bnb' ),
+				'value' => $consent_marketing ? __( 'Yes', 'wp-bnb' ) : __( 'No', 'wp-bnb' ),
+			);
+
+			$consent_date = get_post_meta( $guest->ID, '_bnb_guest_consent_date', true );
+			if ( $consent_date ) {
+				$data[] = array(
+					'name'  => __( 'Consent Date', 'wp-bnb' ),
+					'value' => $consent_date,
+				);
+			}
+
+			// Notes and preferences.
+			$preferences = get_post_meta( $guest->ID, '_bnb_guest_preferences', true );
+			if ( $preferences ) {
+				$data[] = array(
+					'name'  => __( 'Guest Preferences', 'wp-bnb' ),
+					'value' => $preferences,
+				);
+			}
+
+			if ( ! empty( $data ) ) {
+				$export_items[] = array(
+					'group_id'          => 'wp-bnb-guest',
+					'group_label'       => __( 'Guest Profile', 'wp-bnb' ),
+					'group_description' => __( 'Your guest profile information stored by WP BnB.', 'wp-bnb' ),
+					'item_id'           => 'guest-' . $guest->ID,
+					'data'              => $data,
+				);
+			}
+		}
+
+		return array(
+			'data' => $export_items,
+			'done' => true,
+		);
+	}
+
+	/**
+	 * Export booking history data.
+	 *
+	 * @param string $email Email address to export data for.
+	 * @param int    $page  Page number for pagination.
+	 * @return array Export data array.
+	 */
+	public function export_booking_data( string $email, int $page = 1 ): array {
+		$export_items = array();
+		$per_page     = 20;
+		$offset       = ( $page - 1 ) * $per_page;
+
+		// Find bookings by email (both direct and through guest_id).
+		$bookings = get_posts(
+			array(
+				'post_type'      => Booking::POST_TYPE,
+				'post_status'    => 'any',
+				'posts_per_page' => $per_page,
+				'offset'         => $offset,
+				'meta_query'     => array(
+					'relation' => 'OR',
+					array(
+						'key'   => '_bnb_booking_guest_email',
+						'value' => $email,
+					),
+				),
+			)
+		);
+
+		// Also check via guest_id.
+		$guest = Guest::get_by_email( $email );
+		if ( $guest ) {
+			$bookings_by_id = get_posts(
+				array(
+					'post_type'      => Booking::POST_TYPE,
+					'post_status'    => 'any',
+					'posts_per_page' => $per_page,
+					'meta_query'     => array(
+						array(
+							'key'   => '_bnb_booking_guest_id',
+							'value' => $guest->ID,
+						),
+					),
+				)
+			);
+
+			// Merge and dedupe.
+			$existing_ids = wp_list_pluck( $bookings, 'ID' );
+			foreach ( $bookings_by_id as $booking ) {
+				if ( ! in_array( $booking->ID, $existing_ids, true ) ) {
+					$bookings[] = $booking;
+				}
+			}
+		}
+
+		foreach ( $bookings as $booking ) {
+			$data = array();
+
+			$reference = get_post_meta( $booking->ID, '_bnb_booking_reference', true );
+			if ( ! $reference ) {
+				$reference = 'BNB-' . $booking->ID;
+			}
+			$data[] = array(
+				'name'  => __( 'Booking Reference', 'wp-bnb' ),
+				'value' => $reference,
+			);
+
+			$room_id = get_post_meta( $booking->ID, '_bnb_booking_room_id', true );
+			if ( $room_id ) {
+				$room = get_post( $room_id );
+				if ( $room ) {
+					$data[] = array(
+						'name'  => __( 'Room', 'wp-bnb' ),
+						'value' => $room->post_title,
+					);
+				}
+			}
+
+			$check_in = get_post_meta( $booking->ID, '_bnb_booking_check_in', true );
+			if ( $check_in ) {
+				$data[] = array(
+					'name'  => __( 'Check-in Date', 'wp-bnb' ),
+					'value' => $check_in,
+				);
+			}
+
+			$check_out = get_post_meta( $booking->ID, '_bnb_booking_check_out', true );
+			if ( $check_out ) {
+				$data[] = array(
+					'name'  => __( 'Check-out Date', 'wp-bnb' ),
+					'value' => $check_out,
+				);
+			}
+
+			$status = get_post_meta( $booking->ID, '_bnb_booking_status', true );
+			if ( $status ) {
+				$statuses = Booking::get_booking_statuses();
+				$data[]   = array(
+					'name'  => __( 'Status', 'wp-bnb' ),
+					'value' => $statuses[ $status ] ?? $status,
+				);
+			}
+
+			$adults = get_post_meta( $booking->ID, '_bnb_booking_adults', true );
+			if ( $adults ) {
+				$data[] = array(
+					'name'  => __( 'Adults', 'wp-bnb' ),
+					'value' => $adults,
+				);
+			}
+
+			$children = get_post_meta( $booking->ID, '_bnb_booking_children', true );
+			if ( $children ) {
+				$data[] = array(
+					'name'  => __( 'Children', 'wp-bnb' ),
+					'value' => $children,
+				);
+			}
+
+			$price = get_post_meta( $booking->ID, '_bnb_booking_calculated_price', true );
+			if ( $price ) {
+				$currency = get_option( 'wp_bnb_currency', 'CHF' );
+				$data[]   = array(
+					'name'  => __( 'Total Price', 'wp-bnb' ),
+					'value' => number_format( (float) $price, 2 ) . ' ' . $currency,
+				);
+			}
+
+			$guest_notes = get_post_meta( $booking->ID, '_bnb_booking_guest_notes', true );
+			if ( $guest_notes ) {
+				$data[] = array(
+					'name'  => __( 'Guest Notes', 'wp-bnb' ),
+					'value' => $guest_notes,
+				);
+			}
+
+			if ( ! empty( $data ) ) {
+				$export_items[] = array(
+					'group_id'          => 'wp-bnb-bookings',
+					'group_label'       => __( 'Booking History', 'wp-bnb' ),
+					'group_description' => __( 'Your booking history with WP BnB.', 'wp-bnb' ),
+					'item_id'           => 'booking-' . $booking->ID,
+					'data'              => $data,
+				);
+			}
+		}
+
+		// Check if there are more bookings.
+		$total_bookings = $this->count_bookings_by_email( $email );
+		$done           = ( $offset + $per_page ) >= $total_bookings;
+
+		return array(
+			'data' => $export_items,
+			'done' => $done,
+		);
+	}
+
+	/**
+	 * Erase guest profile data.
+	 *
+	 * @param string $email Email address to erase data for.
+	 * @param int    $page  Page number for pagination.
+	 * @return array Erasure result array.
+	 */
+	public function erase_guest_data( string $email, int $page = 1 ): array {
+		$items_removed  = 0;
+		$items_retained = 0;
+		$messages       = array();
+
+		// Find guest by email.
+		$guest = Guest::get_by_email( $email );
+
+		if ( $guest ) {
+			// Check if guest has active bookings.
+			$active_bookings = get_posts(
+				array(
+					'post_type'      => Booking::POST_TYPE,
+					'post_status'    => 'publish',
+					'posts_per_page' => 1,
+					'meta_query'     => array(
+						'relation' => 'AND',
+						array(
+							'relation' => 'OR',
+							array(
+								'key'   => '_bnb_booking_guest_id',
+								'value' => $guest->ID,
+							),
+							array(
+								'key'   => '_bnb_booking_guest_email',
+								'value' => $email,
+							),
+						),
+						array(
+							'key'     => '_bnb_booking_status',
+							'value'   => array( 'pending', 'confirmed', 'checked_in' ),
+							'compare' => 'IN',
+						),
+					),
+				)
+			);
+
+			if ( ! empty( $active_bookings ) ) {
+				// Cannot delete - has active bookings.
+				$messages[]     = __( 'Guest profile retained due to active bookings.', 'wp-bnb' );
+				$items_retained = 1;
+			} else {
+				// Anonymize the guest profile instead of deleting.
+				$this->anonymize_guest( $guest->ID );
+				$items_removed = 1;
+				$messages[]    = __( 'Guest profile anonymized.', 'wp-bnb' );
+			}
+		}
+
+		return array(
+			'items_removed'  => $items_removed,
+			'items_retained' => $items_retained,
+			'messages'       => $messages,
+			'done'           => true,
+		);
+	}
+
+	/**
+	 * Erase booking data.
+	 *
+	 * @param string $email Email address to erase data for.
+	 * @param int    $page  Page number for pagination.
+	 * @return array Erasure result array.
+	 */
+	public function erase_booking_data( string $email, int $page = 1 ): array {
+		$items_removed  = 0;
+		$items_retained = 0;
+		$messages       = array();
+		$per_page       = 20;
+
+		// Find completed bookings (can be anonymized).
+		$bookings = get_posts(
+			array(
+				'post_type'      => Booking::POST_TYPE,
+				'post_status'    => 'any',
+				'posts_per_page' => $per_page,
+				'meta_query'     => array(
+					'relation' => 'AND',
+					array(
+						'key'   => '_bnb_booking_guest_email',
+						'value' => $email,
+					),
+					array(
+						'key'     => '_bnb_booking_status',
+						'value'   => array( 'checked_out', 'cancelled' ),
+						'compare' => 'IN',
+					),
+				),
+			)
+		);
+
+		// Also find by guest_id.
+		$guest = Guest::get_by_email( $email );
+		if ( $guest ) {
+			$more_bookings = get_posts(
+				array(
+					'post_type'      => Booking::POST_TYPE,
+					'post_status'    => 'any',
+					'posts_per_page' => $per_page,
+					'meta_query'     => array(
+						'relation' => 'AND',
+						array(
+							'key'   => '_bnb_booking_guest_id',
+							'value' => $guest->ID,
+						),
+						array(
+							'key'     => '_bnb_booking_status',
+							'value'   => array( 'checked_out', 'cancelled' ),
+							'compare' => 'IN',
+						),
+					),
+				)
+			);
+
+			$existing_ids = wp_list_pluck( $bookings, 'ID' );
+			foreach ( $more_bookings as $booking ) {
+				if ( ! in_array( $booking->ID, $existing_ids, true ) ) {
+					$bookings[] = $booking;
+				}
+			}
+		}
+
+		foreach ( $bookings as $booking ) {
+			$this->anonymize_booking( $booking->ID );
+			++$items_removed;
+		}
+
+		// Check for active bookings that can't be erased.
+		$active_bookings = get_posts(
+			array(
+				'post_type'      => Booking::POST_TYPE,
+				'post_status'    => 'publish',
+				'posts_per_page' => -1,
+				'fields'         => 'ids',
+				'meta_query'     => array(
+					'relation' => 'AND',
+					array(
+						'key'   => '_bnb_booking_guest_email',
+						'value' => $email,
+					),
+					array(
+						'key'     => '_bnb_booking_status',
+						'value'   => array( 'pending', 'confirmed', 'checked_in' ),
+						'compare' => 'IN',
+					),
+				),
+			)
+		);
+
+		$items_retained = count( $active_bookings );
+
+		if ( $items_retained > 0 ) {
+			$messages[] = sprintf(
+				/* translators: %d: Number of bookings */
+				_n(
+					'%d booking retained due to active status.',
+					'%d bookings retained due to active status.',
+					$items_retained,
+					'wp-bnb'
+				),
+				$items_retained
+			);
+		}
+
+		if ( $items_removed > 0 ) {
+			$messages[] = sprintf(
+				/* translators: %d: Number of bookings */
+				_n(
+					'%d booking anonymized.',
+					'%d bookings anonymized.',
+					$items_removed,
+					'wp-bnb'
+				),
+				$items_removed
+			);
+		}
+
+		return array(
+			'items_removed'  => $items_removed,
+			'items_retained' => $items_retained,
+			'messages'       => $messages,
+			'done'           => true,
+		);
+	}
+
+	/**
+	 * Anonymize a guest record.
+	 *
+	 * @param int $guest_id Guest post ID.
+	 * @return bool True on success.
+	 */
+	public function anonymize_guest( int $guest_id ): bool {
+		$anonymized = __( '[Deleted]', 'wp-bnb' );
+
+		// Update post title.
+		wp_update_post(
+			array(
+				'ID'         => $guest_id,
+				'post_title' => $anonymized,
+			)
+		);
+
+		// Anonymize personal data.
+		update_post_meta( $guest_id, '_bnb_guest_first_name', $anonymized );
+		update_post_meta( $guest_id, '_bnb_guest_last_name', '' );
+		update_post_meta( $guest_id, '_bnb_guest_email', 'deleted-' . $guest_id . '@anonymized.local' );
+		update_post_meta( $guest_id, '_bnb_guest_phone', '' );
+		update_post_meta( $guest_id, '_bnb_guest_street', '' );
+		update_post_meta( $guest_id, '_bnb_guest_city', '' );
+		update_post_meta( $guest_id, '_bnb_guest_postal_code', '' );
+		update_post_meta( $guest_id, '_bnb_guest_country', '' );
+		update_post_meta( $guest_id, '_bnb_guest_nationality', '' );
+		update_post_meta( $guest_id, '_bnb_guest_date_of_birth', '' );
+		update_post_meta( $guest_id, '_bnb_guest_id_type', '' );
+		update_post_meta( $guest_id, '_bnb_guest_id_number', '' );
+		update_post_meta( $guest_id, '_bnb_guest_id_expiry', '' );
+		update_post_meta( $guest_id, '_bnb_guest_preferences', '' );
+		update_post_meta( $guest_id, '_bnb_guest_notes', '' );
+		update_post_meta( $guest_id, '_bnb_guest_status', 'inactive' );
+
+		return true;
+	}
+
+	/**
+	 * Anonymize a booking record.
+	 *
+	 * @param int $booking_id Booking post ID.
+	 * @return bool True on success.
+	 */
+	public function anonymize_booking( int $booking_id ): bool {
+		$anonymized = __( '[Deleted]', 'wp-bnb' );
+
+		// Remove guest reference.
+		delete_post_meta( $booking_id, '_bnb_booking_guest_id' );
+
+		// Anonymize guest data stored in booking.
+		update_post_meta( $booking_id, '_bnb_booking_guest_name', $anonymized );
+		update_post_meta( $booking_id, '_bnb_booking_guest_email', '' );
+		update_post_meta( $booking_id, '_bnb_booking_guest_phone', '' );
+		update_post_meta( $booking_id, '_bnb_booking_guest_notes', '' );
+
+		return true;
+	}
+
+	/**
+	 * Count bookings by email.
+	 *
+	 * @param string $email Email address.
+	 * @return int Count of bookings.
+	 */
+	private function count_bookings_by_email( string $email ): int {
+		$count = 0;
+
+		// Direct email match.
+		$direct = get_posts(
+			array(
+				'post_type'      => Booking::POST_TYPE,
+				'post_status'    => 'any',
+				'posts_per_page' => -1,
+				'fields'         => 'ids',
+				'meta_query'     => array(
+					array(
+						'key'   => '_bnb_booking_guest_email',
+						'value' => $email,
+					),
+				),
+			)
+		);
+
+		$count += count( $direct );
+
+		// Guest ID match.
+		$guest = Guest::get_by_email( $email );
+		if ( $guest ) {
+			$by_guest_id = get_posts(
+				array(
+					'post_type'      => Booking::POST_TYPE,
+					'post_status'    => 'any',
+					'posts_per_page' => -1,
+					'fields'         => 'ids',
+					'post__not_in'   => $direct,
+					'meta_query'     => array(
+						array(
+							'key'   => '_bnb_booking_guest_id',
+							'value' => $guest->ID,
+						),
+					),
+				)
+			);
+			$count += count( $by_guest_id );
+		}
+
+		return $count;
+	}
+
+	/**
+	 * Add privacy policy content suggestion.
+	 *
+	 * @return void
+	 */
+	public function add_privacy_policy_content(): void {
+		if ( ! function_exists( 'wp_add_privacy_policy_content' ) ) {
+			return;
+		}
+
+		$content = sprintf(
+			'<h2>%s</h2>
+<p>%s</p>
+
+<h3>%s</h3>
+<p>%s</p>
+<ul>
+<li>%s</li>
+<li>%s</li>
+<li>%s</li>
+<li>%s</li>
+<li>%s</li>
+</ul>
+
+<h3>%s</h3>
+<p>%s</p>
+<ul>
+<li>%s</li>
+<li>%s</li>
+<li>%s</li>
+</ul>
+
+<h3>%s</h3>
+<p>%s</p>
+
+<h3>%s</h3>
+<p>%s</p>',
+			__( 'Accommodation Booking', 'wp-bnb' ),
+			__( 'When you make a booking with us, we collect and process the following personal data to fulfill your reservation and comply with legal requirements.', 'wp-bnb' ),
+			__( 'What personal data we collect', 'wp-bnb' ),
+			__( 'We collect the following information when you make a booking:', 'wp-bnb' ),
+			__( 'Name and contact information (email, phone)', 'wp-bnb' ),
+			__( 'Address for billing and guest registration', 'wp-bnb' ),
+			__( 'Identity document information (as required by local regulations)', 'wp-bnb' ),
+			__( 'Booking details (dates, room preferences, special requests)', 'wp-bnb' ),
+			__( 'Payment information (processed securely by payment providers)', 'wp-bnb' ),
+			__( 'Why we collect this data', 'wp-bnb' ),
+			__( 'We use your personal data for the following purposes:', 'wp-bnb' ),
+			__( 'Processing and managing your booking', 'wp-bnb' ),
+			__( 'Communicating with you about your reservation', 'wp-bnb' ),
+			__( 'Complying with legal guest registration requirements', 'wp-bnb' ),
+			__( 'How long we retain your data', 'wp-bnb' ),
+			__( 'We retain your booking data for the period required by law for guest registration and accounting purposes, typically 10 years. After this period, your data will be anonymized or deleted.', 'wp-bnb' ),
+			__( 'Your rights', 'wp-bnb' ),
+			__( 'You have the right to access, correct, or request deletion of your personal data. To exercise these rights, please contact us using the information provided on this website. Note that some data may need to be retained for legal compliance purposes.', 'wp-bnb' )
+		);
+
+		wp_add_privacy_policy_content( 'WP BnB', wp_kses_post( $content ) );
+	}
+}
--- a/src/Taxonomies/ServiceCategory.php
+++ b/src/Taxonomies/ServiceCategory.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * Service Category taxonomy.
+ *
+ * Non-hierarchical taxonomy for categorizing additional services.
+ *
+ * @package Magdev\WpBnb\Taxonomies
+ */
+
+declare( strict_types=1 );
+
+namespace Magdev\WpBnb\Taxonomies;
+
+/**
+ * Service Category taxonomy class.
+ */
+final class ServiceCategory {
+
+	/**
+	 * Taxonomy slug.
+	 *
+	 * @var string
+	 */
+	public const TAXONOMY = 'bnb_service_category';
+
+	/**
+	 * Initialize the taxonomy.
+	 *
+	 * @return void
+	 */
+	public static function init(): void {
+		add_action( 'init', array( self::class, 'register' ) );
+		add_action( 'bnb_service_category_add_form_fields', array( self::class, 'add_form_fields' ) );
+		add_action( 'bnb_service_category_edit_form_fields', array( self::class, 'edit_form_fields' ), 10, 2 );
+		add_action( 'created_bnb_service_category', array( self::class, 'save_term_meta' ), 10, 2 );
+		add_action( 'edited_bnb_service_category', array( self::class, 'save_term_meta' ), 10, 2 );
+		add_filter( 'manage_edit-bnb_service_category_columns', array( self::class, 'add_columns' ) );
+		add_filter( 'manage_bnb_service_category_custom_column', array( self::class, 'render_column' ), 10, 3 );
+	}
+
+	/**
+	 * Register the taxonomy.
+	 *
+	 * @return void
+	 */
+	public static function register(): void {
+		$labels = array(
+			'name'                       => _x( 'Service Categories', 'taxonomy general name', 'wp-bnb' ),
+			'singular_name'              => _x( 'Service Category', 'taxonomy singular name', 'wp-bnb' ),
+			'search_items'               => __( 'Search Service Categories', 'wp-bnb' ),
+			'popular_items'              => __( 'Popular Service Categories', 'wp-bnb' ),
+			'all_items'                  => __( 'All Service Categories', 'wp-bnb' ),
+			'parent_item'                => null,
+			'parent_item_colon'          => null,
+			'edit_item'                  => __( 'Edit Service Category', 'wp-bnb' ),
+			'update_item'                => __( 'Update Service Category', 'wp-bnb' ),
+			'add_new_item'               => __( 'Add New Service Category', 'wp-bnb' ),
+			'new_item_name'              => __( 'New Service Category Name', 'wp-bnb' ),
+			'separate_items_with_commas' => __( 'Separate categories with commas', 'wp-bnb' ),
+			'add_or_remove_items'        => __( 'Add or remove categories', 'wp-bnb' ),
+			'choose_from_most_used'      => __( 'Choose from the most used categories', 'wp-bnb' ),
+			'not_found'                  => __( 'No service categories found.', 'wp-bnb' ),
+			'menu_name'                  => __( 'Categories', 'wp-bnb' ),
+			'back_to_items'              => __( '&larr; Back to Categories', 'wp-bnb' ),
+		);
+
+		$args = array(
+			'labels'                => $labels,
+			'hierarchical'          => false, // Non-hierarchical (like tags).
+			'public'                => true,
+			'publicly_queryable'    => true,
+			'show_ui'               => true,
+			'show_in_menu'          => true,
+			'show_in_nav_menus'     => true,
+			'show_in_rest'          => true,
+			'show_tagcloud'         => false,
+			'show_in_quick_edit'    => true,
+			'show_admin_column'     => true,
+			'rewrite'               => array(
+				'slug'       => 'service-category',
+				'with_front' => false,
+			),
+			'query_var'             => true,
+			'capabilities'          => array(
+				'manage_terms' => 'manage_options',
+				'edit_terms'   => 'manage_options',
+				'delete_terms' => 'manage_options',
+				'assign_terms' => 'edit_posts',
+			),
+		);
+
+		register_taxonomy( self::TAXONOMY, array( 'bnb_service' ), $args );
+	}
+
+	/**
+	 * Add custom fields to the add term form.
+	 *
+	 * @return void
+	 */
+	public static function add_form_fields(): void {
+		?>
+		<div class="form-field term-icon-wrap">
+			<label for="service-category-icon"><?php esc_html_e( 'Icon', 'wp-bnb' ); ?></label>
+			<select name="service_category_icon" id="service-category-icon">
+				<?php foreach ( self::get_icon_options() as $value => $label ) : ?>
+					<option value="<?php echo esc_attr( $value ); ?>"><?php echo esc_html( $label ); ?></option>
+				<?php endforeach; ?>
+			</select>
+			<p><?php esc_html_e( 'Select an icon to represent this category.', 'wp-bnb' ); ?></p>
+		</div>
+		<div class="form-field term-sort-order-wrap">
+			<label for="service-category-sort-order"><?php esc_html_e( 'Sort Order', 'wp-bnb' ); ?></label>
+			<input type="number" name="service_category_sort_order" id="service-category-sort-order" value="0" min="0">
+			<p><?php esc_html_e( 'Lower numbers appear first.', 'wp-bnb' ); ?></p>
+		</div>
+		<?php
+	}
+
+	/**
+	 * Add custom fields to the edit term form.
+	 *
+	 * @param \WP_Term $term     Current term object.
+	 * @param string   $taxonomy Current taxonomy slug.
+	 * @return void
+	 */
+	public static function edit_form_fields( \WP_Term $term, string $taxonomy ): void {
+		$icon       = get_term_meta( $term->term_id, 'service_category_icon', true );
+		$sort_order = get_term_meta( $term->term_id, 'service_category_sort_order', true );
+		?>
+		<tr class="form-field term-icon-wrap">
+			<th scope="row">
+				<label for="service-category-icon"><?php esc_html_e( 'Icon', 'wp-bnb' ); ?></label>
+			</th>
+			<td>
+				<select name="service_category_icon" id="service-category-icon">
+					<?php foreach ( self::get_icon_options() as $value => $label ) : ?>
+						<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $icon, $value ); ?>>
+							<?php echo esc_html( $label ); ?>
+						</option>
+					<?php endforeach; ?>
+				</select>
+				<p class="description"><?php esc_html_e( 'Select an icon to represent this category.', 'wp-bnb' ); ?></p>
+			</td>
+		</tr>
+		<tr class="form-field term-sort-order-wrap">
+			<th scope="row">
+				<label for="service-category-sort-order"><?php esc_html_e( 'Sort Order', 'wp-bnb' ); ?></label>
+			</th>
+			<td>
+				<input type="number" name="service_category_sort_order" id="service-category-sort-order"
+					   value="<?php echo esc_attr( $sort_order ?: '0' ); ?>" min="0">
+				<p class="description"><?php esc_html_e( 'Lower numbers appear first.', 'wp-bnb' ); ?></p>
+			</td>
+		</tr>
+		<?php
+	}
+
+	/**
+	 * Save term meta data.
+	 *
+	 * @param int $term_id Term ID.
+	 * @param int $tt_id   Term taxonomy ID.
+	 * @return void
+	 */
+	public static function save_term_meta( int $term_id, int $tt_id ): void {
+		if ( isset( $_POST['service_category_icon'] ) ) {
+			update_term_meta(
+				$term_id,
+				'service_category_icon',
+				sanitize_text_field( wp_unslash( $_POST['service_category_icon'] ) )
+			);
+		}
+		if ( isset( $_POST['service_category_sort_order'] ) ) {
+			update_term_meta(
+				$term_id,
+				'service_category_sort_order',
+				absint( $_POST['service_category_sort_order'] )
+			);
+		}
+	}
+
+	/**
+	 * Add custom columns to the taxonomy list.
+	 *
+	 * @param array $columns Existing columns.
+	 * @return array
+	 */
+	public static function add_columns( array $columns ): array {
+		$new_columns = array();
+		foreach ( $columns as $key => $value ) {
+			$new_columns[ $key ] = $value;
+			if ( 'name' === $key ) {
+				$new_columns['icon']       = __( 'Icon', 'wp-bnb' );
+				$new_columns['sort_order'] = __( 'Sort Order', 'wp-bnb' );
+			}
+		}
+		return $new_columns;
+	}
+
+	/**
+	 * Render custom column content.
+	 *
+	 * @param string $content     Column content.
+	 * @param string $column_name Column name.
+	 * @param int    $term_id     Term ID.
+	 * @return string
+	 */
+	public static function render_column( string $content, string $column_name, int $term_id ): string {
+		if ( 'icon' === $column_name ) {
+			$icon = get_term_meta( $term_id, 'service_category_icon', true );
+			if ( $icon ) {
+				return '<span class="dashicons dashicons-' . esc_attr( $icon ) . '"></span>';
+			}
+			return '—';
+		}
+		if ( 'sort_order' === $column_name ) {
+			$sort_order = get_term_meta( $term_id, 'service_category_sort_order', true );
+			return esc_html( $sort_order ?: '0' );
+		}
+		return $content;
+	}
+
+	/**
+	 * Get available icon options.
+	 *
+	 * @return array<string, string>
+	 */
+	public static function get_icon_options(): array {
+		return array(
+			''                   => __( '— Select Icon —', 'wp-bnb' ),
+			'food'               => __( 'Food & Dining', 'wp-bnb' ),
+			'car'                => __( 'Transportation', 'wp-bnb' ),
+			'heart'              => __( 'Wellness & Spa', 'wp-bnb' ),
+			'tickets-alt'        => __( 'Activities', 'wp-bnb' ),
+			'admin-home'         => __( 'Housekeeping', 'wp-bnb' ),
+			'admin-appearance'   => __( 'Room Service', 'wp-bnb' ),
+			'store'              => __( 'Shopping', 'wp-bnb' ),
+			'groups'             => __( 'Childcare', 'wp-bnb' ),
+			'pets'               => __( 'Pet Services', 'wp-bnb' ),
+			'businessman'        => __( 'Business', 'wp-bnb' ),
+			'calendar'           => __( 'Events', 'wp-bnb' ),
+			'camera'             => __( 'Photography', 'wp-bnb' ),
+			'admin-generic'      => __( 'Other', 'wp-bnb' ),
+		);
+	}
+
+	/**
+	 * Get default service categories to seed on activation.
+	 *
+	 * @return array<string, array{icon: string, sort_order: int}>
+	 */
+	public static function get_default_terms(): array {
+		return array(
+			__( 'Food & Dining', 'wp-bnb' )    => array(
+				'icon'       => 'food',
+				'sort_order' => 10,
+			),
+			__( 'Transportation', 'wp-bnb' )   => array(
+				'icon'       => 'car',
+				'sort_order' => 20,
+			),
+			__( 'Wellness & Spa', 'wp-bnb' )   => array(
+				'icon'       => 'heart',
+				'sort_order' => 30,
+			),
+			__( 'Activities', 'wp-bnb' )       => array(
+				'icon'       => 'tickets-alt',
+				'sort_order' => 40,
+			),
+			__( 'Housekeeping', 'wp-bnb' )     => array(
+				'icon'       => 'admin-home',
+				'sort_order' => 50,
+			),
+		);
+	}
+}
--- a/wp-bnb.php
+++ b/wp-bnb.php
@@ -3,7 +3,7 @@
 * Plugin Name: WP BnB Management
 * Plugin URI: https://src.bundespruefstelle.ch/magdev/wp-bnb
 * Description: A comprehensive Bed & Breakfast management system for WordPress. Manage buildings, rooms, bookings, and guests.
- * Version: 0.3.0
+ * Version: 0.5.0
 * Requires at least: 6.0
 * Requires PHP: 8.3
 * Author: Marco Graetsch
@@ -24,7 +24,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }

 // Plugin version constant - MUST match Version in header above.
-define( 'WP_BNB_VERSION', '0.3.0' );
+define( 'WP_BNB_VERSION', '0.5.0' );

 // Plugin path constants.
 define( 'WP_BNB_PATH', plugin_dir_path( __FILE__ ) );
@@ -165,6 +165,8 @@ function wp_bnb_activate(): void {
 		\Magdev\WpBnb\Taxonomies\RoomType::register();
 		\Magdev\WpBnb\PostTypes\Building::register();
 		\Magdev\WpBnb\PostTypes\Room::register();
+		\Magdev\WpBnb\PostTypes\Booking::register();
+		\Magdev\WpBnb\PostTypes\Guest::register();
 	}

 	// Set default options.