← All changes | backend/src/Controllers/Settings/GetAllSettingsController.php +44 -8 1.1.1 → 1.5.1 View file →

		@@ -9,10 +9,12 @@
9	9
10	10	use IvyForms\Common\Exceptions\ForbiddenException;
11	11	use IvyForms\Common\Sanitizer\Sanitizer;
12	12	use IvyForms\Controllers\Controller;
	13	+use IvyForms\Infrastructure\WP\MCP\McpFeatureGate;
13	14	use IvyForms\Services\Settings\SettingsService;
14	15	use IvyForms\Services\Translations\BackendStrings;
	16	+use IvyForms\Services\Usage\UsageTrackingService;
15	17	use WP_REST_Request;
16	18	use WP_REST_Response;
17	19
18	20	/**
		@@ -22,13 +24,16 @@
22	24	*/
23	25	class GetAllSettingsController extends Controller
24	26	{
25	27	private SettingsService $settingsService;
	28	+ private UsageTrackingService $usageTrackingService;
26	29
27	30	public function __construct(
28		- SettingsService $settingsService
	31	+ SettingsService $settingsService,
	32	+ UsageTrackingService $usageTrackingService
29	33	) {
30	34	$this->settingsService = $settingsService;
	35	+ $this->usageTrackingService = $usageTrackingService;
31	36	}
32	37
33	38	/**
34	39	* Get all settings organized by category
		@@ -61,17 +66,14 @@
61	66	// ]
62	67	],
63	68	'general' => [
64	69	'wcagBackend' => $allSettings['general']['wcagBackend'] ?? false,
65		- 'mcp_enabled' => filter_var(
66		- $allSettings['general']['mcp_enabled'] ?? false,
67		- FILTER_VALIDATE_BOOLEAN
	70	+ 'mcp_enabled' => McpFeatureGate::coerceStoredEnabled(
	71	+ $allSettings['general']['mcp_enabled'] ?? true
68	72	),
69	73	'favoriteTemplates' => $allSettings['general']['favoriteTemplates'] ?? [],
70	74	'delete_on_uninstall' => $allSettings['general']['delete_on_uninstall'] ?? false,
71		- // Future general settings can be added here:
72		- // 'site_settings' => $allSettings['general']['site_settings'] ?? null,
73		- // 'form_defaults' => $allSettings['general']['form_defaults'] ?? null,
	75	+ 'usageTrackingEnabled' => $this->usageTrackingService->isSettingEnabled(),
74	76	],
75	77	'integrations' => [
76	78	'wpdatatables' => array_merge(
77	79	$allSettings['integrations']['wpdatatables'] ?? ['enabled' => false],
		@@ -84,10 +86,22 @@
84	86	[
85	87	'connected' => class_exists('AmeliaBooking\Plugin') || defined('AMELIA_PATH')
86	88	]
87	89	),
88		- // Future categories can be added here
	90	+ 'square' => array_merge(
	91	+ $allSettings['integrations']['square'] ?? ['enabled' => false],
	92	+ [
	93	+ 'connected' => ! empty($allSettings['payment']['square']['connected']),
	94	+ ]
	95	+ ),
89	96	],
	97	+ 'payment' => [
	98	+ 'square' => self::sanitizeSquareSettingsForFrontend(
	99	+ is_array($allSettings['payment']['square'] ?? null)
	100	+ ? $allSettings['payment']['square']
	101	+ : []
	102	+ ),
	103	+ ],
90	104	];
91	105
92	106	/**
93	107	* Filter to allow Pro plugin to add additional settings data
		@@ -102,6 +116,28 @@
102	116	return new WP_REST_Response([
103	117	'message' => BackendStrings::getSettingsStrings()['all_settings_retrieved'],
104	118	'data' => $organizedSettings
105	119	], 200);
	120	+ }
	121	+
	122	+ /**
	123	+ * @param array<string, mixed> $squareSettings
	124	+ * @return array<string, mixed>
	125	+ */
	126	+ private static function sanitizeSquareSettingsForFrontend(array $squareSettings): array
	127	+ {
	128	+ $defaults = [
	129	+ 'connected' => false,
	130	+ 'merchantId' => '',
	131	+ 'merchantName' => '',
	132	+ 'locationId' => '',
	133	+ 'locationName' => '',
	134	+ 'currency' => '',
	135	+ 'disconnectedByWebhook' => false,
	136	+ ];
	137	+
	138	+ $merged = array_merge($defaults, $squareSettings);
	139	+ unset($merged['accessToken'], $merged['refreshToken']);
	140	+
	141	+ return $merged;
106	142	}
107	143	}