← All changes | app/Services/InstallerService.php +257 -76 3.0.4 → 3.0.16 View file →

		@@ -47,15 +47,31 @@
47	47	* @return void
48	48	*/
49	49	private static function setDefaultOptions(): void
50	50	{
	51	+ // Whether this is a brand-new install vs. a reactivation/upgrade.
	52	+ // Captured before version/date are stamped below so it reflects the
	53	+ // pre-activation state.
	54	+ $isFreshInstall = self::isFreshInstallation();
	55	+
	56	+ // Seed a default only when the option is absent. add_option() is a
	57	+ // no-op when the option already exists (existence is keyed on the
	58	+ // option NAME, so values legitimately stored as false/0/'' are still
	59	+ // preserved). This makes activation idempotent: a deactivate ->
	60	+ // reactivate, or a plugin update, can never overwrite an operator's
	61	+ // saved settings, while a fresh install (and any newly-introduced
	62	+ // default on upgrade) is still seeded.
	63	+ $seed = static function (string $name, $value): void {
	64	+ add_option($name, $value);
	65	+ };
	66	+
51	67	// Payment Gateway Settings - Only enable Pay Later by default
52	68	// These match SettingsService defaults exactly
53		- update_option('yatra_payment_gateways', ['pay_later']);
54		- update_option('yatra_payment_methods', []);
55		- update_option('yatra_payment_test_mode', true);
56		- update_option('yatra_auto_confirm_pay_later', true);
57		- update_option('yatra_partial_payment', false);
	69	+ $seed('yatra_payment_gateways', ['pay_later']);
	70	+ $seed('yatra_payment_methods', []);
	71	+ $seed('yatra_payment_test_mode', true);
	72	+ $seed('yatra_auto_confirm_pay_later', true);
	73	+ $seed('yatra_partial_payment', false);
58	74	// Set gateway configs with proper structure - only enable pay_later by default
59	75	$gateway_configs = [
60	76	'pay_later' => [
61	77	'enabled' => true,
		@@ -106,100 +122,108 @@
106	122	'api_key' => '',
107	123	'api_secret' => '',
108	124	]
109	125	];
110		- update_option('yatra_gateway_configs', $gateway_configs);
111		- update_option('yatra_gateway_order', []);
	126	+ $seed('yatra_gateway_configs', $gateway_configs);
	127	+ $seed('yatra_gateway_order', []);
112	128
113	129	// Currency Settings - Match SettingsService defaults
114		- update_option('yatra_currency', 'USD');
115		- update_option('yatra_currency_position', 'before');
116		- update_option('yatra_thousand_separator', ',');
117		- update_option('yatra_decimal_separator', '.');
118		- update_option('yatra_decimal_places', 2);
	130	+ $seed('yatra_currency', 'USD');
	131	+ $seed('yatra_currency_position', 'before');
	132	+ $seed('yatra_thousand_separator', ',');
	133	+ $seed('yatra_decimal_separator', '.');
	134	+ $seed('yatra_decimal_places', 2);
119	135
120	136	// Flexible Payment Settings - Match SettingsService defaults
121		- update_option('yatra_enable_deposit', false);
122		- update_option('yatra_deposit_type', 'percentage');
123		- update_option('yatra_deposit_amount', 20);
124		- update_option('yatra_deposit_required', false);
125		- update_option('yatra_deposit_percentage', 20);
126		- update_option('yatra_partial_payment_percentage', 30);
	137	+ $seed('yatra_enable_deposit', false);
	138	+ $seed('yatra_deposit_type', 'percentage');
	139	+ $seed('yatra_deposit_amount', 20);
	140	+ $seed('yatra_deposit_required', false);
	141	+ $seed('yatra_deposit_percentage', 20);
	142	+ $seed('yatra_partial_payment_percentage', 30);
127	143
128		- update_option('yatra_allow_save_payment_methods', false);
	144	+ $seed('yatra_allow_save_payment_methods', false);
129	145
130	146	// Trip Settings - Match SettingsService defaults
131		- update_option('yatra_trip_base', 'trip');
132		- update_option('yatra_trips_per_page', 12);
133		- update_option('yatra_enable_wishlist', false);
134		- update_option('yatra_enable_comparison', false);
135		- update_option('yatra_show_sold_out', true);
	147	+ $seed('yatra_trip_base', 'trip');
	148	+ $seed('yatra_trips_per_page', 12);
	149	+ $seed('yatra_enable_wishlist', false);
	150	+ $seed('yatra_enable_comparison', false);
	151	+ $seed('yatra_show_sold_out', true);
136	152
137	153	// Customer Settings - Match SettingsService defaults
138		- update_option('yatra_enable_customer_accounts', true);
139		- update_option('yatra_enable_customer_registration', true);
	154	+ $seed('yatra_enable_customer_accounts', true);
	155	+ $seed('yatra_enable_customer_registration', true);
140	156
141	157	// Booking Settings - Match SettingsService defaults
142		- update_option('yatra_booking_base', 'book');
143		- update_option('yatra_use_booking_page', false);
144		- update_option('yatra_booking_page_id', 0);
145		- update_option('yatra_enable_guest_booking', true);
146		- update_option('yatra_booking_confirmation', true);
147		- update_option('yatra_auto_confirm_bookings', false);
148		- update_option('yatra_require_login', false);
149		- update_option('yatra_allow_guest_checkout', true);
150		- update_option('yatra_cancellation_policy', 'full_refund');
151		- update_option('yatra_cancellation_days', 7);
152		- update_option('yatra_refund_policy', '');
153		- update_option('yatra_booking_expiry_hours', 24);
154		- update_option('yatra_booking_reminder_days', 3);
155		- update_option('yatra_allow_waitlist', true);
	158	+ $seed('yatra_booking_base', 'book');
	159	+ $seed('yatra_use_booking_page', false);
	160	+ $seed('yatra_booking_page_id', 0);
	161	+ $seed('yatra_enable_guest_booking', true);
	162	+ $seed('yatra_booking_confirmation', true);
	163	+ $seed('yatra_auto_confirm_bookings', false);
	164	+ $seed('yatra_require_login', false);
	165	+ $seed('yatra_allow_guest_checkout', true);
	166	+ // cancellation_policy / cancellation_days / refund_policy
	167	+ // intentionally not seeded — these are removed settings (see
	168	+ // SettingsController::$default_settings comment). Existing
	169	+ // sites that already have orphan values stored will keep
	170	+ // them in wp_options; new sites won't acquire them.
	171	+ $seed('yatra_booking_expiry_hours', 24);
	172	+ $seed('yatra_booking_reminder_days', 3);
	173	+ $seed('yatra_allow_waitlist', true);
156	174
157	175	// Email identity: canonical keys (REST / EmailService) + legacy keys for older code paths
158	176	$wpAdminEmail = (string) get_option('admin_email', '');
159	177	$blogName = (string) get_bloginfo('name');
160		- update_option('yatra_from_email', $wpAdminEmail);
161		- update_option('yatra_from_name', $blogName);
162		- update_option('yatra_admin_email', $wpAdminEmail);
163		- update_option('yatra_email_from_name', $blogName);
164		- update_option('yatra_email_from_address', $wpAdminEmail);
165		- update_option('yatra_enable_admin_notifications', true);
166		- update_option('yatra_enable_customer_notifications', true);
	178	+ $seed('yatra_from_email', $wpAdminEmail);
	179	+ $seed('yatra_from_name', $blogName);
	180	+ $seed('yatra_admin_email', $wpAdminEmail);
	181	+ $seed('yatra_email_from_name', $blogName);
	182	+ $seed('yatra_email_from_address', $wpAdminEmail);
	183	+ $seed('yatra_enable_admin_notifications', true);
	184	+ $seed('yatra_enable_customer_notifications', true);
167	185
168	186	// Default transactional template HTML + subjects (Email → Templates / settings API)
169	187	foreach (EmailTemplateDefaults::settingsOptionDefaults() as $optionKey => $value) {
170		- update_option('yatra_' . $optionKey, $value);
	188	+ $seed('yatra_' . $optionKey, $value);
171	189	}
172		- update_option('yatra_email_template_booking', true);
173		- update_option('yatra_email_template_confirmation', true);
174		- update_option('yatra_email_template_cancellation', true);
175		- update_option('yatra_email_template_reminder', true);
176		- update_option('yatra_email_template_admin_new_booking', true);
177		- update_option('yatra_email_template_admin_payment', true);
178		- update_option('yatra_email_template_admin_cancellation', true);
179		- update_option('yatra_email_template_trip_consent', true);
180		- update_option('yatra_email_template_customer_verification', true);
181		- update_option('yatra_email_template_booking_completed', true);
182		- update_option('yatra_email_template_booking_expired_customer', true);
183		- update_option('yatra_email_template_admin_booking_expired', true);
184		- update_option('yatra_email_template_scheduled_payment_reminder', true);
185		- update_option('yatra_email_template_scheduled_payment_succeeded', true);
186		- update_option('yatra_email_template_scheduled_payment_failed', true);
187		- update_option('yatra_email_template_admin_scheduled_payment_failed', true);
188		- update_option('yatra_email_template_enquiry_received', true);
189		- update_option('yatra_email_template_enquiry_admin', true);
190		- update_option('yatra_email_template_enquiry_response', true);
191		- update_option('yatra_email_template_review_request', true);
192		- update_option('yatra_email_template_abandoned_booking_recovery_first', true);
193		- update_option('yatra_email_template_abandoned_booking_recovery_second', true);
194		- update_option('yatra_email_template_abandoned_booking_recovery_final', true);
	190	+ $seed('yatra_email_template_booking', true);
	191	+ $seed('yatra_email_template_confirmation', true);
	192	+ $seed('yatra_email_template_cancellation', true);
	193	+ $seed('yatra_email_template_reminder', true);
	194	+ $seed('yatra_email_template_admin_new_booking', true);
	195	+ $seed('yatra_email_template_admin_payment', true);
	196	+ $seed('yatra_email_template_admin_cancellation', true);
	197	+ $seed('yatra_email_template_trip_consent', true);
	198	+ $seed('yatra_email_template_customer_verification', true);
	199	+ $seed('yatra_email_template_guest_verification', true);
	200	+ $seed('yatra_email_template_booking_completed', true);
	201	+ $seed('yatra_email_template_booking_expired_customer', true);
	202	+ $seed('yatra_email_template_admin_booking_expired', true);
	203	+ $seed('yatra_email_template_scheduled_payment_reminder', true);
	204	+ $seed('yatra_email_template_scheduled_payment_succeeded', true);
	205	+ $seed('yatra_email_template_scheduled_payment_failed', true);
	206	+ $seed('yatra_email_template_admin_scheduled_payment_failed', true);
	207	+ $seed('yatra_email_template_enquiry_received', true);
	208	+ $seed('yatra_email_template_enquiry_admin', true);
	209	+ $seed('yatra_email_template_enquiry_response', true);
	210	+ $seed('yatra_email_template_review_request', true);
	211	+ $seed('yatra_email_template_abandoned_booking_recovery_first', true);
	212	+ $seed('yatra_email_template_abandoned_booking_recovery_second', true);
	213	+ $seed('yatra_email_template_abandoned_booking_recovery_final', true);
195	214
196		- // Clear any existing Stripe/PayPal settings that might exist
197		- delete_option('yatra_stripe_settings');
198		- delete_option('yatra_paypal_settings');
	215	+ // Clear pre-existing legacy Stripe/PayPal settings, but only on a
	216	+ // brand-new install. On a reactivation these may hold the operator's
	217	+ // configured gateway data, so deleting them would be destructive.
	218	+ if ($isFreshInstall) {
	219	+ delete_option('yatra_stripe_settings');
	220	+ delete_option('yatra_paypal_settings');
	221	+ }
199	222
200		- // Set installation tracking (not in SettingsService but needed for tracking)
201		- update_option('yatra_installation_date', current_time('mysql'));
	223	+ // Installation tracking: stamp the date once (seed); keep the
	224	+ // version current so upgrade routines can detect version changes.
	225	+ $seed('yatra_installation_date', current_time('mysql'));
202	226	update_option('yatra_version', defined('YATRA_VERSION') ? YATRA_VERSION : '3.0.3');
203	227
204	228
205	229	}
		@@ -402,8 +426,164 @@
402	426	update_option('yatra_availability_rules_legacy_normalized_v1', '1', false);
403	427	}
404	428
405	429	/**
	430	+ * Ensure `wp_yatra_bookings.status` accepts `pending_verification`.
	431	+ *
	432	+ * The 3.0.5 guest email-verification feature introduced a new holding
	433	+ * status (`pending_verification`) but the production ENUM only listed
	434	+ * the legacy values. Until the column is widened, MySQL non-strict
	435	+ * mode silently coerces the value to `''` on insert — which makes
	436	+ * every booking placed with verification enabled appear broken:
	437	+ *
	438	+ * 1. The admin booking list renders an empty status badge (the
	439	+ * React status map has no entry for `''` so the row falls into
	440	+ * the default branch with an empty label).
	441	+ * 2. `BookingService::createBooking` sees the in-memory
	442	+ * `$data['status'] === 'pending_verification'` and defers
	443	+ * firing `yatra_booking_created`, so the customer never gets
	444	+ * the booking-confirmation email.
	445	+ * 3. `verify_email` reads the persisted status (now `''`),
	446	+ * decides the booking is "already verified", skips the deferred
	447	+ * fan-out — so neither the status flip nor the booking email
	448	+ * ever fires.
	449	+ *
	450	+ * Doing the widening here (runIdempotentMaintenance — every admin
	451	+ * pageview) instead of a pure version-gated upgrade step means it
	452	+ * heals installs whose stored yatra_version was already bumped to
	453	+ * 3.0.5 by an earlier failed upgrade attempt. Cheap: one
	454	+ * INFORMATION_SCHEMA query gated by a one-shot option flag, ALTER
	455	+ * runs at most once per install.
	456	+ *
	457	+ * Also backfills any rows whose status was silently coerced to `''`
	458	+ * by the pre-widening insert path: those bookings *should* have
	459	+ * landed in `pending_verification`, so we restore them there. The
	460	+ * original verify-email magic link still works because the HMAC
	461	+ * token is bound to booking_id + email, not status.
	462	+ */
	463	+ public static function maybeAddPendingVerificationBookingStatus(): void
	464	+ {
	465	+ if (get_option('yatra_booking_status_pending_verification_v1')) {
	466	+ return;
	467	+ }
	468	+
	469	+ if (!class_exists('Yatra\\Database\\Tables\\BookingsTable')) {
	470	+ return;
	471	+ }
	472	+
	473	+ $table = \Yatra\Database\Tables\BookingsTable::getTableName();
	474	+ if (!self::databaseTableExists($table)) {
	475	+ return;
	476	+ }
	477	+
	478	+ global $wpdb;
	479	+
	480	+ $columnInfo = $wpdb->get_row(
	481	+ $wpdb->prepare(
	482	+ "SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS
	483	+ WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s AND COLUMN_NAME = %s",
	484	+ DB_NAME,
	485	+ $table,
	486	+ 'status'
	487	+ )
	488	+ );
	489	+
	490	+ $columnType = is_object($columnInfo) ? (string) ($columnInfo->COLUMN_TYPE ?? '') : '';
	491	+ $needsAlter = $columnType !== '' && strpos($columnType, 'pending_verification') === false;
	492	+
	493	+ if ($needsAlter) {
	494	+ // Match the original column shape exactly minus the new enum
	495	+ // value — nullable, default 'pending', no NOT NULL.
	496	+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- table name escaped, enum literal is static.
	497	+ $wpdb->query(
	498	+ 'ALTER TABLE `' . esc_sql($table) . "` "
	499	+ . "MODIFY COLUMN `status` "
	500	+ . "enum('pending','pending_verification','confirmed','processing','completed','cancelled','refunded','failed','on_hold','waitlist') "
	501	+ . "DEFAULT 'pending'"
	502	+ );
	503	+ }
	504	+
	505	+ // Backfill: bookings whose insert hit the old ENUM during a
	506	+ // verification flow ended up with status='' (silent coerce).
	507	+ // Now that the enum accepts pending_verification, restore them.
	508	+ // Filtered to a narrow signal (status='' AND payment_status='pending')
	509	+ // so we don't accidentally re-stamp unrelated edge cases.
	510	+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- table name from schema helper, literal values only.
	511	+ $wpdb->query(
	512	+ "UPDATE `{$table}` SET `status` = 'pending_verification' "
	513	+ . "WHERE `status` = '' AND `payment_status` = 'pending'"
	514	+ );
	515	+
	516	+ update_option('yatra_booking_status_pending_verification_v1', '1', false);
	517	+ }
	518	+
	519	+ /**
	520	+ * Add the `duration_hours` column to the trips table for hour-based
	521	+ * (single-day) tours. Purely additive and nullable — existing trips get
	522	+ * NULL and behave exactly as before (day-based via `duration_days`). Only
	523	+ * tours that later set a positive `duration_hours` change behaviour.
	524	+ *
	525	+ * Idempotent: guarded by a one-shot option AND an INFORMATION_SCHEMA check,
	526	+ * so it runs its ALTER at most once and is a no-op when the column already
	527	+ * exists (fresh installs get it from TripsTable::getSchema()).
	528	+ */
	529	+ public static function maybeAddTripDurationHoursColumn(): void
	530	+ {
	531	+ if (get_option('yatra_trip_duration_hours_v1')) {
	532	+ return;
	533	+ }
	534	+
	535	+ if (!class_exists('Yatra\\Database\\Tables\\TripsTable')) {
	536	+ return;
	537	+ }
	538	+
	539	+ $table = \Yatra\Database\Tables\TripsTable::getTableName();
	540	+ if (!self::databaseTableExists($table)) {
	541	+ return;
	542	+ }
	543	+
	544	+ global $wpdb;
	545	+
	546	+ $columnExists = $wpdb->get_var(
	547	+ $wpdb->prepare(
	548	+ "SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
	549	+ WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s AND COLUMN_NAME = %s",
	550	+ DB_NAME,
	551	+ $table,
	552	+ 'duration_hours'
	553	+ )
	554	+ );
	555	+
	556	+ if (!$columnExists) {
	557	+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- table name escaped, static column definition.
	558	+ $wpdb->query(
	559	+ 'ALTER TABLE `' . esc_sql($table) . '` '
	560	+ . "ADD COLUMN `duration_hours` smallint(5) UNSIGNED DEFAULT NULL "
	561	+ . "COMMENT 'Duration in hours for hour-based single-day tours, NULL means day-based' "
	562	+ . 'AFTER `duration_nights`'
	563	+ );
	564	+
	565	+ // Re-check so we only mark this done when the column really exists.
	566	+ // If the ALTER failed (e.g. a restrictive host), leave the one-shot
	567	+ // flag unset so it retries on the next admin load rather than
	568	+ // disabling the feature permanently.
	569	+ $columnExists = $wpdb->get_var(
	570	+ $wpdb->prepare(
	571	+ "SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
	572	+ WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s AND COLUMN_NAME = %s",
	573	+ DB_NAME,
	574	+ $table,
	575	+ 'duration_hours'
	576	+ )
	577	+ );
	578	+ }
	579	+
	580	+ if ($columnExists) {
	581	+ update_option('yatra_trip_duration_hours_v1', '1', false);
	582	+ }
	583	+ }
	584	+
	585	+ /**
406	586	* Fill canonical + legacy email identity options when empty (upgrades, partial installs, or empty strings in DB).
407	587	* Idempotent; safe to run on each admin load via maybeBackfillEmailTemplateDefaults().
408	588	*/
409	589	public static function maybeBackfillEmailDeliveryIdentity(): void
		@@ -483,8 +663,9 @@
483	663	return;
484	664	}
485	665
486	666	add_option('yatra_email_template_customer_verification', true);
	667	+ add_option('yatra_email_template_guest_verification', true);
487	668
488	669	$defaults = EmailTemplateDefaults::settingsOptionDefaults();
489	670	foreach (['email_tpl_customer_verification_subject', 'email_tpl_customer_verification_body'] as $key) {
490	671	if (!isset($defaults[$key])) {