← All changes | includes/Controllers/QuoteController.php +961 -566 2.1.1 → 2.4.4 View file →

		@@ -25,9 +25,9 @@
25	25	*
26	26	* @since 1.0.0
27	27	*/
28	28	class QuoteController {
29		-
	29	+
30	30	/**
31	31	* Quote repository
32	32	*
33	33	* @var QuoteRepository
		@@ -32,9 +32,9 @@
32	32	*
33	33	* @var QuoteRepository
34	34	*/
35	35	private $quote_repository;
36		-
	36	+
37	37	/**
38	38	* Client repository
39	39	*
40	40	* @var ClientRepository
		@@ -39,9 +39,9 @@
39	39	*
40	40	* @var ClientRepository
41	41	*/
42	42	private $client_repository;
43		-
	43	+
44	44	/**
45	45	* Form processor
46	46	*
47	47	* @var FormProcessor
		@@ -46,9 +46,9 @@
46	46	*
47	47	* @var FormProcessor
48	48	*/
49	49	private $form_processor;
50		-
	50	+
51	51	/**
52	52	* Quote log service
53	53	*
54	54	* @var QuoteLogService
		@@ -53,9 +53,9 @@
53	53	*
54	54	* @var QuoteLogService
55	55	*/
56	56	private $quote_log_service;
57		-
	57	+
58	58	/**
59	59	* Constructor
60	60	*
61	61	* @since 1.0.0
		@@ -65,9 +65,9 @@
65	65	$this->client_repository = new ClientRepository();
66	66	$this->form_processor = new FormProcessor();
67	67	$this->quote_log_service = new QuoteLogService();
68	68	}
69		-
	69	+
70	70	/**
71	71	* Initialize the controller
72	72	*
73	73	* @since 1.0.0
		@@ -74,43 +74,50 @@
74	74	*/
75	75	public function init(): void {
76	76	// Allow plugins to extend the controller initialization
77	77	do_action('easy_invoice_quote_controller_before_init', $this);
78		-
	78	+
79	79	// Add AJAX handlers
80	80	add_action('wp_ajax_easy_invoice_delete_quote', [$this, 'handleDeleteQuote']);
81	81	add_action('wp_ajax_easy_invoice_get_quote', [$this, 'handleGetQuote']);
82	82	add_action('wp_ajax_easy_invoice_load_quote_template', [$this, 'handleLoadQuoteTemplate']);
	83	+ add_action('wp_ajax_easy_invoice_convert_quote', [$this, 'handleConvertQuote']);
	84	+ add_filter('easy_invoice_quote_row_actions', [$this, 'addConvertRowAction'], 5, 2);
83	85	add_action('wp_ajax_easy_invoice_create_new_quote', [$this, 'handleCreateNewQuote']);
84		- add_action('wp_ajax_easy_invoice_search_clients', [$this, 'handleSearchClients']);
	86	+ // The `easy_invoice_search_clients` AJAX is owned by EasyInvoiceAjax.
	87	+ // The duplicate registration that used to live here raced with
	88	+ // EasyInvoiceAjax::searchClients() — only the first-registered
	89	+ // handler ran, and which one won depended on bootstrap order. That
	90	+ // intermittently broke the client-search dropdown in the quote
	91	+ // builder. Keep this comment as a tombstone so it doesn't get
	92	+ // added back.
85	93	add_action('wp_ajax_easy_invoice_load_quote_form', [$this, 'handleLoadQuoteForm']);
86	94	add_action('wp_ajax_easy_invoice_accept_quote', [$this, 'handleAcceptQuote']);
87	95	add_action('wp_ajax_easy_invoice_decline_quote', [$this, 'handleDeclineQuote']);
88	96	add_action('wp_ajax_nopriv_easy_invoice_accept_quote', [$this, 'handleAcceptQuote']);
89	97	add_action('wp_ajax_nopriv_easy_invoice_decline_quote', [$this, 'handleDeclineQuote']);
90		- add_action('wp_ajax_easy_invoice_update_existing_quotes', [$this, 'handleUpdateExistingQuotes']);
91		-
	98	+
92	99	// Add missing AJAX handlers for quote listing actions
93	100	add_action('wp_ajax_easy_invoice_bulk_quote_action', [$this, 'handleBulkQuoteAction']);
94	101	add_action('wp_ajax_easy_invoice_trash_quote', [$this, 'handleTrashQuote']);
95	102	add_action('wp_ajax_easy_invoice_draft_quote', [$this, 'handleDraftQuote']);
96		-
	103	+
97	104	// Add regular POST form handlers for quote actions
98	105	add_action('init', [$this, 'handleQuoteFormActions']);
99		-
	106	+
100	107	// Add new AJAX handler for restoring a trashed quote
101	108	add_action('wp_ajax_easy_invoice_restore_quote', [ $this, 'handleRestoreQuote' ]);
102		-
	109	+
103	110	// Add new AJAX handler for emptying trash
104	111	add_action('wp_ajax_easy_invoice_empty_trash', [ $this, 'handleEmptyTrash' ]);
105		-
	112	+
106	113	// Add new AJAX handler for getting quote logs
107	114	add_action('wp_ajax_easy_invoice_get_quote_logs', [ $this, 'handleGetQuoteLogs' ]);
108		-
	115	+
109	116	// Allow plugins to extend the controller initialization
110	117	do_action('easy_invoice_quote_controller_after_init', $this);
111	118	}
112		-
	119	+
113	120	/**
114	121	* Display quote pages
115	122	*
116	123	* @since 1.0.0
		@@ -118,36 +125,36 @@
118	125	*/
119	126	public function display(array $args = []): void {
120	127	// Allow plugins to modify display arguments
121	128	$args = apply_filters('easy_invoice_quote_controller_display_args', $args);
122		-
	129	+
123	130	$page = $args['page'] ?? '';
124		-
	131	+
125	132	// Allow plugins to modify the page before processing
126	133	$page = apply_filters('easy_invoice_quote_controller_display_page', $page, $args);
127		-
	134	+
128	135	switch ($page) {
129	136	case PagesSlugs::ALL_QUOTES:
130	137	$this->displayListing();
131	138	break;
132		-
	139	+
133	140	case PagesSlugs::QUOTE_NEW:
134	141	$this->displayBuilder();
135	142	break;
136		-
	143	+
137	144	case PagesSlugs::QUOTE_PREVIEW:
138	145	$this->displayPreview($args);
139	146	break;
140		-
	147	+
141	148	default:
142	149	$this->displayListing();
143	150	break;
144	151	}
145		-
	152	+
146	153	// Allow plugins to perform actions after display
147	154	do_action('easy_invoice_quote_controller_after_display', $page, $args);
148	155	}
149		-
	156	+
150	157	/**
151	158	* Display quote listing page
152	159	*
153	160	* @since 1.0.0
		@@ -157,19 +164,19 @@
157	164	global $wpdb;
158	165
159	166	// Get trash count first (based on post_status)
160	167	$trash_count = (int)$wpdb->get_var($wpdb->prepare(
161		- "SELECT COUNT(*) FROM {$wpdb->posts}
	168	+ "SELECT COUNT(*) FROM {$wpdb->posts}
162	169	WHERE post_type = %s AND post_status = 'trash'",
163	170	PostTypes::EASY_INVOICE_QUOTE_POST_TYPE
164	171	));
165		-
	172	+
166	173	// Get counts for each meta status (excluding trashed posts)
167	174	$status_counts = $wpdb->get_results($wpdb->prepare(
168		- "SELECT COALESCE(pm.meta_value, 'draft') as status, COUNT(*) as count
169		- FROM {$wpdb->posts} p
	175	+ "SELECT COALESCE(pm.meta_value, 'draft') as status, COUNT(*) as count
	176	+ FROM {$wpdb->posts} p
170	177	LEFT JOIN {$wpdb->postmeta} pm ON p.ID = pm.post_id AND pm.meta_key = '_easy_invoice_quote_status'
171		- WHERE p.post_type = %s
	178	+ WHERE p.post_type = %s
172	179	AND p.post_status != 'trash'
173	180	GROUP BY COALESCE(pm.meta_value, 'draft')",
174	181	PostTypes::EASY_INVOICE_QUOTE_POST_TYPE
175	182	));
		@@ -187,9 +194,9 @@
187	194	// Process status counts
188	195	foreach ($status_counts as $status) {
189	196	$count = (int)$status->count;
190	197	$all_count += $count; // Add to total (excluding trash)
191		-
	198	+
192	199	switch ($status->status) {
193	200	case 'draft':
194	201	$draft_count = $count;
195	202	break;
		@@ -216,11 +223,12 @@
216	223
217	224	// Now handle the display filtering
218	225	// Allow plugins to perform actions before displaying listing
219	226	do_action('easy_invoice_quote_controller_before_display_listing');
220		-
	227	+
221	228	// Get filter parameters
222	229	$status_filter = isset($_GET['status']) ? sanitize_text_field($_GET['status']) : '';
	230	+ $client_filter = isset($_GET['client_id']) ? absint($_GET['client_id']) : 0;
223	231	$search_query = isset($_GET['search']) ? sanitize_text_field(wp_unslash($_GET['search'])) : '';
224	232	$current_view = isset($_GET['view']) ? sanitize_text_field($_GET['view']) : 'all';
225	233	$current_page = isset($_GET['paged']) ? max(1, intval($_GET['paged'])) : 1;
226	234	$per_page = 20;
		@@ -240,9 +248,9 @@
240	248	// Handle view filtering
241	249	if ($current_view === 'trash' || $current_view === 'cancelled') {
242	250	// For trash and cancelled views, look at post_status = 'trash'
243	251	$query_args['post_status'] = 'trash';
244		-
	252	+
245	253	// For cancelled view, also filter by meta status
246	254	if ($current_view === 'cancelled') {
247	255	$query_args['meta_query'] = [
248	256	[
		@@ -254,9 +262,9 @@
254	262	}
255	263	} else {
256	264	// For all other views, exclude trashed posts
257	265	$query_args['post_status'] = ['publish', 'draft', 'private', 'pending'];
258		-
	266	+
259	267	if ($current_view !== 'all') {
260	268	// For specific status views, add meta query
261	269	$query_args['meta_query'] = [
262	270	[
		@@ -267,12 +275,59 @@
267	275	];
268	276	}
269	277	}
270	278
	279	+ // Add client filter if provided (merges with any existing meta_query).
	280	+ //
	281	+ // Quote model uses the `_easy_invoice_quote_*` meta-key namespace
	282	+ // (see Models/Quote.php :: saveMetaData → meta_key = `_easy_invoice_quote_` . $field_name).
	283	+ // We match on either:
	284	+ // • `_easy_invoice_quote_client_id` (when picked from the client dropdown), OR
	285	+ // • `_easy_invoice_quote_customer_email` (when entered ad-hoc inline).
	286	+ if (!empty($client_filter)) {
	287	+ $client_email = '';
	288	+ try {
	289	+ $client_repo = new \EasyInvoice\Repositories\ClientRepository();
	290	+ $client_obj = $client_repo->find($client_filter);
	291	+ if ($client_obj) {
	292	+ $client_email = (string) $client_obj->getEmail();
	293	+ }
	294	+ } catch (\Throwable $e) {
	295	+ $client_email = '';
	296	+ }
	297	+
	298	+ $client_clauses = [
	299	+ 'relation' => 'OR',
	300	+ [
	301	+ 'key' => '_easy_invoice_quote_client_id',
	302	+ 'value' => (string) $client_filter,
	303	+ 'compare' => '=',
	304	+ ],
	305	+ ];
	306	+ if ($client_email !== '') {
	307	+ $client_clauses[] = [
	308	+ 'key' => '_easy_invoice_quote_customer_email',
	309	+ 'value' => $client_email,
	310	+ 'compare' => '=',
	311	+ ];
	312	+ }
	313	+
	314	+ if (!empty($query_args['meta_query'])) {
	315	+ $existing = $query_args['meta_query'];
	316	+ if (!isset($existing['relation'])) {
	317	+ $existing = ['relation' => 'AND'] + $existing;
	318	+ }
	319	+ $existing[] = $client_clauses;
	320	+ $query_args['meta_query'] = $existing;
	321	+ } else {
	322	+ $query_args['meta_query'] = [$client_clauses];
	323	+ }
	324	+ }
	325	+
271	326	// Add search if provided
272	327	if (!empty($search_query)) {
273	328	$search_ids = [];
274		-
	329	+
275	330	// Build base query args for search
276	331	$search_query_args = [
277	332	'post_type' => PostTypes::EASY_INVOICE_QUOTE_POST_TYPE,
278	333	'post_status' => $query_args['post_status'],
		@@ -308,15 +363,16 @@
308	363	]
309	364	]
310	365	]);
311	366	$meta_search = new \WP_Query($meta_search_args);
312		-
313		- if ($meta_search->have_posts()) {
314		- $search_ids = array_merge($search_ids, wp_list_pluck($meta_search->posts, 'ID'));
315		- }
316		-
	367	+
	368	+ // 'fields' => 'ids' above: $posts already holds ids. Plucking 'ID' off
	369	+ // integers produced nulls, so a search by quote number, client name or
	370	+ // email matched nothing.
	371	+ $search_ids = array_map('intval', array_merge($search_ids, (array) $meta_search->posts));
	372	+
317	373	$search_ids = array_unique($search_ids);
318		-
	374	+
319	375	if (!empty($search_ids)) {
320	376	$query_args['post__in'] = $search_ids;
321	377	} else {
322	378	$query_args['post__in'] = [0];
		@@ -327,9 +383,9 @@
327	383	$query_args = apply_filters('easy_invoice_quote_controller_final_query_args', $query_args);
328	384	// Get filtered quotes for display
329	385	$wp_query = new \WP_Query($query_args);
330	386	$quotes = [];
331		-
	387	+
332	388	if ($wp_query->have_posts()) {
333	389	foreach ($wp_query->posts as $post) {
334	390	$quote = $this->quote_repository->find($post->ID);
335	391	if ($quote) {
		@@ -339,9 +395,9 @@
339	395	}
340	396
341	397	// Allow plugins to modify the quotes array
342	398	$quotes = apply_filters('easy_invoice_quote_controller_quotes_list', $quotes, $wp_query);
343		-
	399	+
344	400	// Get pagination info from WordPress query
345	401	$total_quotes = $wp_query->found_posts;
346	402	$total_pages = $wp_query->max_num_pages;
347	403
		@@ -379,14 +435,37 @@
379	435	$cancelled_count = $status->count;
380	436	break;
381	437	}
382	438	}
383		-
	439	+
	440	+ // Build clients list for the listing filter dropdown
	441	+ $clients_list = [];
	442	+ try {
	443	+ $client_repository = new \EasyInvoice\Repositories\ClientRepository();
	444	+ foreach ($client_repository->all() as $client) {
	445	+ $name = $client->getBusinessClientName() ?: trim($client->getFirstName() . ' ' . $client->getLastName());
	446	+ if ($name === '') {
	447	+ continue;
	448	+ }
	449	+ $clients_list[] = [
	450	+ 'id' => $client->getId(),
	451	+ 'name' => $name,
	452	+ ];
	453	+ }
	454	+ usort($clients_list, function ($a, $b) {
	455	+ return strcasecmp($a['name'], $b['name']);
	456	+ });
	457	+ } catch (\Throwable $e) {
	458	+ $clients_list = [];
	459	+ }
	460	+
384	461	// Prepare template data
385	462	$template_data = [
386	463	'quotes' => $quotes,
387	464	'current_view' => $current_view,
388	465	'status_filter' => $status_filter,
	466	+ 'client_filter' => $client_filter,
	467	+ 'clients_list' => $clients_list,
389	468	'search_query' => $search_query,
390	469	'all_count' => (int)$all_count,
391	470	'trash_count' => (int)$trash_count,
392	471	'draft_count' => (int)$draft_count,
		@@ -402,19 +481,19 @@
402	481	'total_quotes' => $total_quotes,
403	482	'total_pages' => $total_pages,
404	483	'wp_query' => $wp_query
405	484	];
406		-
	485	+
407	486	// Allow plugins to modify template data
408	487	$template_data = apply_filters('easy_invoice_quote_controller_template_data', $template_data);
409		-
	488	+
410	489	// Display the template
411	490	include EASY_INVOICE_PLUGIN_DIR . 'templates/quotes/listing.php';
412		-
	491	+
413	492	// Allow plugins to perform actions after displaying listing
414	493	do_action('easy_invoice_quote_controller_after_display_listing', $template_data);
415	494	}
416		-
	495	+
417	496	/**
418	497	* Display quote builder page
419	498	*
420	499	* @since 1.0.0
		@@ -421,18 +500,21 @@
421	500	*/
422	501	private function displayBuilder(): void {
423	502	// Allow plugins to perform actions before displaying builder
424	503	do_action('easy_invoice_quote_controller_before_display_builder');
425		-
	504	+
426	505	$quote_id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
427	506	$quote = null;
428		-
	507	+
429	508	if ($quote_id > 0) {
430	509	$quote = $this->quote_repository->find($quote_id);
431	510	}
432		-
433		- $clients = $this->client_repository->all();
434		-
	511	+
	512	+ // The builder's picker searches over AJAX; the hidden mirror select only needs
	513	+ // the quote's own client (rendered by the form). Loading every client here
	514	+ // built a model per user on each open.
	515	+ $clients = [];
	516	+
435	517	// Allow plugins to modify the data
436	518	$quote = apply_filters('easy_invoice_quote_controller_builder_quote', $quote, $quote_id);
437	519	$clients = apply_filters('easy_invoice_quote_controller_builder_clients', $clients);
438	520
		@@ -437,13 +519,13 @@
437	519	$clients = apply_filters('easy_invoice_quote_controller_builder_clients', $clients);
438	520
439	521	// Include the builder template
440	522	include EASY_INVOICE_PLUGIN_DIR . 'templates/quotes/builder.php';
441		-
	523	+
442	524	// Allow plugins to perform actions after displaying builder
443	525	do_action('easy_invoice_quote_controller_after_display_builder', $quote, $clients);
444	526	}
445		-
	527	+
446	528	/**
447	529	* Display quote preview page
448	530	*
449	531	* @since 1.0.0
		@@ -451,30 +533,30 @@
451	533	*/
452	534	private function displayPreview(array $args): void {
453	535	// Allow plugins to perform actions before displaying preview
454	536	do_action('easy_invoice_quote_controller_before_display_preview', $args);
455		-
	537	+
456	538	$quote_id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
457		-
	539	+
458	540	if ($quote_id <= 0) {
459		- wp_die(__('Quote not found.', 'easy-invoice'));
	541	+ wp_die(esc_html__('Quote not found.', 'easy-invoice'));
460	542	}
461		-
	543	+
462	544	$quote = $this->quote_repository->find($quote_id);
463	545	if (!$quote) {
464		- wp_die(__('Quote not found.', 'easy-invoice'));
	546	+ wp_die(esc_html__('Quote not found.', 'easy-invoice'));
465	547	}
466		-
	548	+
467	549	// Allow plugins to modify the quote
468	550	$quote = apply_filters('easy_invoice_quote_controller_preview_quote', $quote, $quote_id);
469		-
	551	+
470	552	// Include the preview template
471	553	include EASY_INVOICE_PLUGIN_DIR . 'templates/quotes/preview.php';
472		-
	554	+
473	555	// Allow plugins to perform actions after displaying preview
474	556	do_action('easy_invoice_quote_controller_after_display_preview', $quote, $args);
475	557	}
476		-
	558	+
477	559	/**
478	560	* Handle delete quote AJAX request
479	561	*
480	562	* @since 1.0.0
		@@ -483,24 +565,24 @@
483	565	// Verify nonce
484	566	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
485	567	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
486	568	}
487		-
	569	+
488	570	// Check permissions
489		- if (!current_user_can('manage_options')) {
	571	+ if (!easy_invoice_user_can('ei_delete_quote')) {
490	572	wp_send_json_error(['message' => __('Insufficient permissions.', 'easy-invoice')]);
491	573	}
492		-
	574	+
493	575	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
494		-
	576	+
495	577	if ($quote_id <= 0) {
496	578	wp_send_json_error(['message' => __('Invalid quote ID.', 'easy-invoice')]);
497	579	}
498		-
	580	+
499	581	if ($this->quote_repository->delete($quote_id)) {
500	582	// Log the quote deletion
501	583	$this->quote_log_service->logDeletion($quote_id);
502		-
	584	+
503	585	wp_send_json_success([
504	586	'message' => __('Quote deleted successfully.', 'easy-invoice'),
505	587	'toast' => [
506	588	'type' => 'success',
		@@ -510,9 +592,9 @@
510	592	} else {
511	593	wp_send_json_error(['message' => __('Failed to delete quote.', 'easy-invoice')]);
512	594	}
513	595	}
514		-
	596	+
515	597	/**
516	598	* Handle get quote AJAX request
517	599	*
518	600	* @since 1.0.0
		@@ -521,29 +603,29 @@
521	603	// Verify nonce
522	604	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_get_quote')) {
523	605	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
524	606	}
525		-
	607	+
526	608	// Check permissions
527		- if (!current_user_can('manage_options')) {
	609	+ if (!easy_invoice_user_can('ei_view_quotes')) {
528	610	wp_send_json_error(['message' => __('Insufficient permissions.', 'easy-invoice')]);
529	611	}
530		-
	612	+
531	613	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
532		-
	614	+
533	615	if ($quote_id <= 0) {
534	616	wp_send_json_error(['message' => __('Invalid quote ID.', 'easy-invoice')]);
535	617	}
536		-
	618	+
537	619	$quote = $this->quote_repository->find($quote_id);
538		-
	620	+
539	621	if (!$quote) {
540	622	wp_send_json_error(['message' => __('Quote not found.', 'easy-invoice')]);
541	623	}
542		-
	624	+
543	625	wp_send_json_success(['quote' => $quote->toArray()]);
544	626	}
545		-
	627	+
546	628	/**
547	629	* Handle AJAX request to load quote template
548	630	*
549	631	* @since 1.0.0
		@@ -552,47 +634,161 @@
552	634	// Verify nonce
553	635	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_nonce')) {
554	636	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
555	637	}
556		-
	638	+
557	639	// Check permissions
558		- if (!current_user_can('manage_options')) {
	640	+ if (!easy_invoice_user_can('ei_create_quote')) {
559	641	wp_send_json_error(['message' => __('Insufficient permissions.', 'easy-invoice')]);
560	642	}
561		-
	643	+
562	644	$template_id = sanitize_text_field($_POST['template'] ?? '');
563	645	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
564		-
	646	+
565	647	if (empty($template_id)) {
566	648	wp_send_json_error(['message' => __('Template ID is required.', 'easy-invoice')]);
567	649	}
568		-
569		- // Load quote if provided
570		- $quote = null;
	650	+
	651	+ // Validate template name securely
	652	+ $template_id = $this->validateTemplateName($template_id, 'quote');
	653	+
	654	+ // Get secure template file path
	655	+ $template_file = $this->getSecureTemplatePath($template_id, 'quote');
	656	+
	657	+ if (!$template_file) {
	658	+ wp_send_json_error(['message' => __('Template not found.', 'easy-invoice')]);
	659	+ }
	660	+
	661	+ // Load quote if provided.
	662	+ //
	663	+ // For an unsaved quote there is no id, and the quote design templates call
	664	+ // $quote->getTitle() / getNumber() / etc. unguarded — passing null made
	665	+ // previewing or switching a template on a new quote fatal, the same way it
	666	+ // did on the invoice side (see InvoiceController::handleLoadTemplate). The
	667	+ // model's constructor accepts null and fills itself from the field defaults,
	668	+ // so an empty instance renders a blank preview instead.
	669	+ $quote = new \EasyInvoice\Models\Quote();
571	670	if ($quote_id > 0) {
572		- $quote = $this->quote_repository->find($quote_id);
	671	+ $loaded = $this->quote_repository->find($quote_id);
	672	+ if ($loaded) {
	673	+ $quote = $loaded;
	674	+ }
573	675	}
574		-
575		- // Check if template file exists
576		- $template_file = EASY_INVOICE_PLUGIN_DIR . 'templates/quote-templates/' . $template_id . '.php';
577		-
578		- if (!file_exists($template_file)) {
579		- wp_send_json_error(['message' => __('Template not found.', 'easy-invoice')]);
580		- }
581		-
	676	+ // Unsaved edits from the builder take precedence over the stored values.
	677	+ $quote = \EasyInvoice\Helpers\PreviewOverlay::apply($quote, isset($_POST['form_data']) ? (string) wp_unslash($_POST['form_data']) : '', 'quote');
	678	+
582	679	// Start output buffering to capture template HTML
583	680	ob_start();
584		-
	681	+
585	682	// Include the template file
586	683	include $template_file;
587		-
	684	+
588	685	// Get the captured HTML
589	686	$html = ob_get_clean();
590		-
	687	+
591	688	wp_send_json_success(['html' => $html]);
592	689	}
593		-
	690	+
594	691	/**
	692	+ * Validate and sanitize template name to prevent directory traversal attacks
	693	+ *
	694	+ * @param string $template The template name to validate
	695	+ * @param string $type Either 'invoice' or 'quote'
	696	+ * @return string Validated template name or 'standard' as fallback
	697	+ */
	698	+ private function validateTemplateName($template, $type = 'quote') {
	699	+ // Whitelist of allowed template names
	700	+ $allowed_templates = array(
	701	+ 'invoice' => array('classic', 'corporate', 'creative', 'elegant', 'legacy', 'minimal', 'modern', 'professional', 'standard'),
	702	+ 'quote' => array('legacy', 'minimal', 'minimalist', 'modern', 'standard')
	703	+ );
	704	+
	705	+ // Strip any directory components using basename
	706	+ $template = basename($template);
	707	+
	708	+ // Remove any file extension
	709	+ $template = preg_replace('/\.(php|html|htm)$/i', '', $template);
	710	+
	711	+ // Remove any non-alphanumeric characters except hyphens and underscores
	712	+ $template = preg_replace('/[^a-z0-9_-]/i', '', $template);
	713	+
	714	+ // Check if template is in whitelist
	715	+ if (isset($allowed_templates[$type]) && in_array($template, $allowed_templates[$type], true)) {
	716	+ return $template;
	717	+ }
	718	+
	719	+ // Return default template if not in whitelist
	720	+ return 'standard';
	721	+ }
	722	+
	723	+ /**
	724	+ * Get secure template file path with directory traversal protection
	725	+ *
	726	+ * @param string $template The validated template name
	727	+ * @param string $type Either 'invoice' or 'quote'
	728	+ * @return string|false The secure template file path or false if invalid
	729	+ */
	730	+ private function getSecureTemplatePath($template, $type = 'quote') {
	731	+ // Define template directories
	732	+ $template_dirs = array(
	733	+ 'invoice' => EASY_INVOICE_PLUGIN_DIR . 'templates/invoice-templates/',
	734	+ 'quote' => EASY_INVOICE_PLUGIN_DIR . 'templates/quote-templates/'
	735	+ );
	736	+
	737	+ if (!isset($template_dirs[$type])) {
	738	+ return false;
	739	+ }
	740	+
	741	+ $template_dir = $template_dirs[$type];
	742	+
	743	+ // Ensure template directory exists and is a directory
	744	+ if (!is_dir($template_dir)) {
	745	+ return false;
	746	+ }
	747	+
	748	+ // Get the real path of the template directory (resolves any symlinks)
	749	+ $real_template_dir = realpath($template_dir);
	750	+ if ($real_template_dir === false) {
	751	+ return false;
	752	+ }
	753	+
	754	+ // Construct the template file path
	755	+ $template_file = $real_template_dir . DIRECTORY_SEPARATOR . $template . '.php';
	756	+
	757	+ // Get the real path of the template file (resolves any .. or . components)
	758	+ $real_template_file = realpath($template_file);
	759	+
	760	+ // Verify that the resolved path is within the template directory
	761	+ // This prevents directory traversal attacks
	762	+ if ($real_template_file === false || strpos($real_template_file, $real_template_dir) !== 0) {
	763	+ // If template doesn't exist or is outside the directory, use default
	764	+ $default_file = $real_template_dir . DIRECTORY_SEPARATOR . 'standard.php';
	765	+ $real_default_file = realpath($default_file);
	766	+
	767	+ if ($real_default_file !== false && strpos($real_default_file, $real_template_dir) === 0) {
	768	+ return $real_default_file;
	769	+ }
	770	+
	771	+ return false;
	772	+ }
	773	+
	774	+ // Verify the file exists and is readable
	775	+ if (!is_file($real_template_file) || !is_readable($real_template_file)) {
	776	+ // Fallback to standard template
	777	+ $default_file = $real_template_dir . DIRECTORY_SEPARATOR . 'standard.php';
	778	+ $real_default_file = realpath($default_file);
	779	+
	780	+ if ($real_default_file !== false && strpos($real_default_file, $real_template_dir) === 0 && is_file($real_default_file) && is_readable($real_default_file)) {
	781	+ return $real_default_file;
	782	+ }
	783	+
	784	+ return false;
	785	+ }
	786	+
	787	+ return $real_template_file;
	788	+ }
	789	+
	790	+ /**
595	791	* Handle AJAX request to create a new quote with just the title
596	792	*
597	793	* @since 1.0.0
598	794	*/
		@@ -601,9 +797,9 @@
601	797	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
602	798	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
603	799	}
604	800	// Check permissions
605		- if (!current_user_can('manage_options')) {
	801	+ if (!easy_invoice_user_can('ei_create_quote')) {
606	802	wp_send_json_error(['message' => __('Insufficient permissions.', 'easy-invoice')]);
607	803	}
608	804	$title = isset($_POST['title']) ? sanitize_text_field($_POST['title']) : '';
609	805	if (empty($title)) {
		@@ -608,9 +804,9 @@
608	804	$title = isset($_POST['title']) ? sanitize_text_field($_POST['title']) : '';
609	805	if (empty($title)) {
610	806	wp_send_json_error(['message' => __('Quote title is required.', 'easy-invoice')]);
611	807	}
612		-
	808	+
613	809	// Generate a unique quote number
614	810	$quote_number = '';
615	811	if (class_exists('\\EasyInvoice\\Services\\QuoteNumberService')) {
616	812	$quote_number_service = new \EasyInvoice\Services\QuoteNumberService();
		@@ -618,9 +814,9 @@
618	814	} else {
619	815	// Fallback if service doesn't exist
620	816	$quote_number = 'QT-' . str_pad(time(), 6, '0', STR_PAD_LEFT);
621	817	}
622		-
	818	+
623	819	// Get global quote settings
624	820	$settings_controller = new \EasyInvoice\Controllers\SettingsController();
625	821	$quote_terms = $settings_controller::getQuoteTermsConditions();
626	822	$quote_footer = $settings_controller::getQuoteFooterText();
		@@ -628,16 +824,16 @@
628	824	$quote_accept_action = get_option('easy_invoice_quote_accept_action', 'email');
629	825	$quote_accept_text = get_option('easy_invoice_quote_accept_text', __('Accept Quote', 'easy-invoice'));
630	826	$quote_accepted_message = get_option('easy_invoice_quote_accepted_message', __('Thank you for accepting our quote!', 'easy-invoice'));
631	827	$quote_declined_message = get_option('easy_invoice_quote_declined_message', __('Thank you for your consideration.', 'easy-invoice'));
632		-
	828	+
633	829	// Create the quote with just the title and default values
634	830	$data = [
635	831	'title' => $title,
636	832	'status' => 'draft',
637	833	'number' => $quote_number, // Use the generated unique number
638		- 'issue_date' => date('Y-m-d'),
639		- 'expiry_date' => date('Y-m-d', strtotime('+30 days')),
	834	+ 'issue_date' => current_time('Y-m-d'),
	835	+ 'expiry_date' => wp_date('Y-m-d', strtotime('+30 days')),
640	836	'items' => [],
641	837	'notes' => '', // Ensure notes is never null
642	838	'terms' => $quote_terms, // Use global terms setting
643	839	'footer_text' => $quote_footer, // Use global footer setting
		@@ -645,9 +841,12 @@
645	841	'accept_action' => $quote_accept_action, // Use global accept action setting
646	842	'accept_text' => $quote_accept_text, // Use global accept text setting
647	843	'accepted_message' => $quote_accepted_message, // Use global accepted message setting
648	844	'declined_message' => $quote_declined_message, // Use global declined message setting
	845	+ 'template' => get_option('easy_invoice_last_quote_template', 'standard')
649	846	];
	847	+
	848	+
650	849	$quote = $this->quote_repository->create($data);
651	850	if (!$quote) {
652	851	wp_send_json_error(['message' => __('Failed to create quote.', 'easy-invoice')]);
653	852	}
		@@ -652,9 +851,9 @@
652	851	wp_send_json_error(['message' => __('Failed to create quote.', 'easy-invoice')]);
653	852	}
654	853	wp_send_json_success(['quote_id' => $quote->getId()]);
655	854	}
656		-
	855	+
657	856	/**
658	857	* Handle AJAX request to load quote form for modal
659	858	*
660	859	* @since 1.0.0
		@@ -663,14 +862,14 @@
663	862	// Verify nonce
664	863	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
665	864	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
666	865	}
667		-
	866	+
668	867	// Check permissions
669		- if (!current_user_can('manage_options')) {
	868	+ if (!easy_invoice_user_can('ei_create_quote')) {
670	869	wp_send_json_error(['message' => __('Insufficient permissions.', 'easy-invoice')]);
671	870	}
672		-
	871	+
673	872	// Get global quote settings
674	873	$settings_controller = new \EasyInvoice\Controllers\SettingsController();
675	874	$quote_terms = $settings_controller::getQuoteTermsConditions();
676	875	$quote_footer = $settings_controller::getQuoteFooterText();
		@@ -678,15 +877,15 @@
678	877	$quote_accept_action = get_option('easy_invoice_quote_accept_action', 'email');
679	878	$quote_accept_text = get_option('easy_invoice_quote_accept_text', __('Accept Quote', 'easy-invoice'));
680	879	$quote_accepted_message = get_option('easy_invoice_quote_accepted_message', __('Thank you for accepting our quote!', 'easy-invoice'));
681	880	$quote_declined_message = get_option('easy_invoice_quote_declined_message', __('Thank you for your consideration.', 'easy-invoice'));
682		-
	881	+
683	882	// Create a new quote object for the form
684	883	$quote_number_service = function_exists('easy_invoice_get_quote_number_service') ? easy_invoice_get_quote_number_service() : null;
685	884	$quote_data = array(
686	885	'number' => $quote_number_service ? $quote_number_service->getNextNumber() : 'QT-1',
687		- 'date' => date('Y-m-d'),
688		- 'expiry_date' => date('Y-m-d', strtotime('+30 days')),
	886	+ 'date' => current_time('Y-m-d'),
	887	+ 'expiry_date' => wp_date('Y-m-d', strtotime('+30 days')),
689	888	'client_id' => 0,
690	889	'client_name' => '',
691	890	'client_email' => '',
692	891	'client_phone' => '',
		@@ -711,9 +910,9 @@
711	910	'accept_text' => $quote_accept_text, // Use global accept text setting
712	911	'accepted_message' => $quote_accepted_message, // Use global accepted message setting
713	912	'declined_message' => $quote_declined_message, // Use global declined message setting
714	913	);
715		-
	914	+
716	915	// Create a temporary WP_Post object for new quote
717	916	$empty_post = new \WP_Post((object) array(
718	917	'ID' => 0,
719	918	'post_author' => get_current_user_id(),
		@@ -733,11 +932,11 @@
733	932	'post_mime_type' => '',
734	933	'comment_count' => 0,
735	934	'filter' => 'raw',
736	935	));
737		-
	936	+
738	937	$quote = new \EasyInvoice\Models\Quote($empty_post);
739		-
	938	+
740	939	// Set default values on the quote object
741	940	foreach ($quote_data as $key => $value) {
742	941	$setter = 'set' . easy_invoice_str_replace('_', '', ucwords($key, '_'));
743	942	if (method_exists($quote, $setter)) {
		@@ -764,142 +963,298 @@
764	963	break;
765	964	}
766	965	}
767	966	}
768		-
	967	+
769	968	// Initialize empty items array
770	969	$quote->setItems([]);
771		-
	970	+
772	971	// Set variables needed by the form template
773	972	$quote_id = 0;
774		- $clients = \EasyInvoice\Providers\ClientServiceProvider::getClientRepository()->all();
	973	+ $clients = [];
775	974	$quote_form_manager = new \EasyInvoice\Forms\Quote\QuoteFormManager();
776	975	$quote_items_json = json_encode([]);
777	976	$admin_nonce = wp_create_nonce('easy_invoice_admin_nonce');
778	977	$quote_field_config = $quote_form_manager->getFieldConfigForJavaScript();
779		-
	978	+
780	979	// Start output buffering to capture form HTML
781	980	ob_start();
782		-
	981	+
783	982	// Include the quote form template
784	983	include EASY_INVOICE_PLUGIN_DIR . 'templates/quotes/form.php';
785		-
	984	+
786	985	// Get the captured HTML
787	986	$html = ob_get_clean();
788		-
	987	+
789	988	wp_send_json_success(['html' => $html]);
790	989	}
791		-
	990	+
	991	+
792	992	/**
793		- * Handle search clients AJAX request
	993	+ * Nonce action for quote accept/decline (includes quote ID to prevent cross-quote reuse).
	994	+ */
	995	+ private function quoteAcceptDeclineNonceAction(int $quote_id): string {
	996	+ return 'easy_invoice_quote_action_' . $quote_id;
	997	+ }
	998	+
	999	+ /**
	1000	+ * Get the per-quote access token. Lazily generated on first read.
794	1001	*
795		- * @since 1.0.0
	1002	+ * Previously the public quote page embedded an `easy_invoice_quote_action_{id}`
	1003	+ * nonce that, combined with the off-by-default `easy_invoice_pro_restrict_quote_to_client`
	1004	+ * option, let any visitor accept or decline any published quote
	1005	+ * (CVE-2026-9021). The token replaces that public-nonce-as-authorisation
	1006	+ * model: it's a cryptographically random per-quote secret that's only
	1007	+ * leaked to the legitimate quote recipient via the emailed link's
	1008	+ * `?qk=...` parameter, and is required server-side by the accept /
	1009	+ * decline handlers (alongside an unconditional ownership check on
	1010	+ * authenticated callers).
	1011	+ *
	1012	+ * The token is single-purpose (just accept/decline gating) and lives
	1013	+ * in private post meta. We generate 32 hex chars (128 bits of entropy)
	1014	+ * which is well above what's brute-forceable inside the lifetime of a
	1015	+ * published quote.
796	1016	*/
797		- public function handleSearchClients(): void {
798		- // Verify nonce
799		- if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_nonce')) {
800		- wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
	1017	+ public static function quoteAccessToken(int $quote_id): string {
	1018	+ if ($quote_id <= 0) {
	1019	+ return '';
801	1020	}
802		-
803		- // Check permissions
804		- if (!current_user_can('manage_options')) {
805		- wp_send_json_error(['message' => __('Insufficient permissions.', 'easy-invoice')]);
	1021	+ $token = (string) get_post_meta($quote_id, '_easy_invoice_quote_access_token', true);
	1022	+ if ($token === '' || strlen($token) < 32) {
	1023	+ try {
	1024	+ $token = bin2hex(random_bytes(16));
	1025	+ } catch (\Throwable $e) {
	1026	+ // Fallback for systems without CSPRNG. wp_generate_password uses
	1027	+ // random_bytes internally on modern PHP — same entropy source.
	1028	+ $token = wp_generate_password(32, false, false);
	1029	+ }
	1030	+ update_post_meta($quote_id, '_easy_invoice_quote_access_token', $token);
806	1031	}
807		-
808		- $query = sanitize_text_field($_POST['query'] ?? '');
809		-
810		- // If query is empty, get all clients
811		- if (empty($query)) {
812		- $clients = $this->client_repository->all();
813		- } else {
814		- // Search clients by name, email, or company
815		- $clients = $this->client_repository->search($query);
	1032	+ return $token;
	1033	+ }
	1034	+
	1035	+ /**
	1036	+ * Read-only sibling of quoteAccessToken(). Returns the persisted
	1037	+ * token if one already exists, or an empty string otherwise — never
	1038	+ * mints. Use this from user-controlled rendering contexts (e.g. the
	1039	+ * `[easy_quote_url]` shortcode) where allowing an arbitrary caller
	1040	+ * to MINT an Accept/Decline-authorising token for an attacker-chosen
	1041	+ * quote would be a privilege-escalation vector.
	1042	+ *
	1043	+ * Trusted server contexts (the EmailManager quote-send path) should
	1044	+ * keep calling quoteAccessToken() so first-send still works.
	1045	+ */
	1046	+ public static function quoteAccessTokenIfExists(int $quote_id): string {
	1047	+ if ($quote_id <= 0) {
	1048	+ return '';
816	1049	}
817		-
818		- $results = [];
819		- foreach ($clients as $client) {
820		- $results[] = [
821		- 'id' => $client->getId(),
822		- 'name' => $client->getBusinessClientName() ?: ($client->getFirstName() . ' ' . $client->getLastName()),
823		- 'email' => $client->getEmail(),
824		- 'company' => $client->getBusinessClientName(),
825		- 'phone' => $client->getExtraInfo(),
826		- 'website' => $client->getWebsite(),
827		- 'address' => $client->getAddress()
828		- ];
	1050	+ $token = (string) get_post_meta($quote_id, '_easy_invoice_quote_access_token', true);
	1051	+ return strlen($token) >= 32 ? $token : '';
	1052	+ }
	1053	+
	1054	+ /**
	1055	+ * Constant-time comparison helper for the access token.
	1056	+ */
	1057	+ private static function quoteTokenFromRequest(): string {
	1058	+ $token = '';
	1059	+ if (isset($_POST['access_token'])) {
	1060	+ $token = sanitize_text_field(wp_unslash($_POST['access_token']));
	1061	+ } elseif (isset($_GET['qk'])) {
	1062	+ $token = sanitize_text_field(wp_unslash($_GET['qk']));
829	1063	}
830		-
831		- wp_send_json_success($results);
	1064	+ /** This filter is documented in includes/Controllers/InvoiceController.php */
	1065	+ return (string) apply_filters('easy_invoice_presented_access_token', $token, 'quote');
832	1066	}
833		-
	1067	+
834	1068	/**
	1069	+ * Central authorisation check for quote accept/decline. Returns true
	1070	+ * when ANY of these is true:
	1071	+ *
	1072	+ * 1. The request carries a valid per-quote access token (the legitimate
	1073	+ * email-recipient flow). Constant-time compared with hash_equals.
	1074	+ * 2. The current user is logged in AND has admin-grade capability
	1075	+ * (manage_options) — admin-side accept/decline.
	1076	+ * 3. The current user is logged in AND is the quote's bound client
	1077	+ * (email match against the quote's client_id record). This was
	1078	+ * previously gated behind the off-by-default
	1079	+ * `easy_invoice_pro_restrict_quote_to_client` option — that gate
	1080	+ * is removed in 2.3.4 so the ownership check runs unconditionally.
	1081	+ *
	1082	+ * Returns false otherwise. Callers must reject the request when this
	1083	+ * returns false; we don't reject from in here so the caller can choose
	1084	+ * wp_send_json_error vs wp_die based on its transport.
	1085	+ */
	1086	+ /**
	1087	+ * Whether a quote can still be accepted or declined: it must be open
	1088	+ * (draft, available or sent) and not past its expiry date.
	1089	+ *
	1090	+ * @param object $quote Quote model.
	1091	+ * @return true|\WP_Error Error carrying the reason to show the client.
	1092	+ */
	1093	+ public static function openForDecision($quote) {
	1094	+ $status = is_callable([$quote, 'getStatus']) ? strtolower((string) $quote->getStatus()) : '';
	1095	+ if ('accepted' === $status) {
	1096	+ return new \WP_Error('easy_invoice_quote_closed', __('This quote has already been accepted.', 'easy-invoice'));
	1097	+ }
	1098	+ if ('declined' === $status) {
	1099	+ return new \WP_Error('easy_invoice_quote_closed', __('This quote has already been declined.', 'easy-invoice'));
	1100	+ }
	1101	+ if (!in_array($status, ['draft', 'available', 'sent', 'expired'], true)) {
	1102	+ return new \WP_Error('easy_invoice_quote_closed', __('This quote is no longer open.', 'easy-invoice'));
	1103	+ }
	1104	+ $expiry = is_callable([$quote, 'getExpiryDate']) ? (string) $quote->getExpiryDate() : '';
	1105	+ $expired = 'expired' === $status
	1106	+ || ('' !== $expiry && strtotime($expiry) && gmdate('Y-m-d', strtotime($expiry)) < gmdate('Y-m-d', current_time('timestamp')));
	1107	+ if ($expired) {
	1108	+ return new \WP_Error(
	1109	+ 'easy_invoice_quote_expired',
	1110	+ '' !== $expiry
	1111	+ /* translators: %s: expiry date. */
	1112	+ ? sprintf(__('This quote expired on %s. Please ask for a new one.', 'easy-invoice'), date_i18n(get_option('date_format'), strtotime($expiry)))
	1113	+ : __('This quote has expired. Please ask for a new one.', 'easy-invoice')
	1114	+ );
	1115	+ }
	1116	+ return true;
	1117	+ }
	1118	+
	1119	+ public static function canActOnQuote(int $quote_id, $quote = null): bool {
	1120	+ if ($quote_id <= 0) {
	1121	+ return false;
	1122	+ }
	1123	+
	1124	+ // Path 1: legitimate access-token flow (email link recipient).
	1125	+ $presented = self::quoteTokenFromRequest();
	1126	+ if ($presented !== '') {
	1127	+ $stored = (string) get_post_meta($quote_id, '_easy_invoice_quote_access_token', true);
	1128	+ if ($stored !== '' && hash_equals($stored, $presented)) {
	1129	+ return true;
	1130	+ }
	1131	+ }
	1132	+
	1133	+ // Path 2: admin override.
	1134	+ if (current_user_can('manage_options')) {
	1135	+ return true;
	1136	+ }
	1137	+
	1138	+ // Path 3: authenticated owner. ONLY when the current user is the
	1139	+ // quote's bound client (email match). Previously this was
	1140	+ // skipped entirely when the Pro option was 'no' (the default) —
	1141	+ // which is what made the CVE exploitable. Now it always runs.
	1142	+ //
	1143	+ // Note: Quote model resolves `getClientId()` via __call magic,
	1144	+ // so method_exists() returns FALSE for it (PHP's method_exists
	1145	+ // does not recognise __call-resolved methods). Use is_callable
	1146	+ // instead — it correctly returns TRUE when the receiver has a
	1147	+ // __call that can field the message, so this guard actually
	1148	+ // permits the bound-client path on real Quote objects.
	1149	+ if (is_user_logged_in() && $quote && is_callable([$quote, 'getClientId']) && $quote->getClientId()) {
	1150	+ $current_user = wp_get_current_user();
	1151	+ $client_repository = \EasyInvoice\Providers\ClientServiceProvider::getClientRepository();
	1152	+ $client = $client_repository->find($quote->getClientId());
	1153	+ if ($client && strcasecmp((string) $client->getEmail(), (string) $current_user->user_email) === 0) {
	1154	+ return true;
	1155	+ }
	1156	+ }
	1157	+
	1158	+ return false;
	1159	+ }
	1160	+
	1161	+ /**
835	1162	* Handle AJAX request to accept a quote
836	1163	*
837	1164	* @since 1.0.0
838	1165	*/
839	1166	public function handleAcceptQuote(): void {
840		- // Verify nonce
841		- if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_quote_action')) {
842		- wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
843		- }
844		-
845	1167	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
846		-
	1168	+
847	1169	if ($quote_id <= 0) {
848	1170	wp_send_json_error(['message' => __('Invalid quote ID.', 'easy-invoice')]);
849	1171	}
850		-
851		- // Get the quote
852		- $quote = $this->quote_repository->find($quote_id);
853		-
	1172	+
	1173	+ // Quote-scoped nonce prevents cross-quote IDOR with a leaked global nonce.
	1174	+ if (!wp_verify_nonce($_POST['nonce'] ?? '', $this->quoteAcceptDeclineNonceAction($quote_id))) {
	1175	+ wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
	1176	+ }
	1177	+
	1178	+ $is_admin = current_user_can('manage_options');
	1179	+ if ($is_admin) {
	1180	+ $quote = $this->quote_repository->find($quote_id);
	1181	+ } else {
	1182	+ $quote = $this->quote_repository->findPublished($quote_id);
	1183	+ }
	1184	+
854	1185	if (!$quote) {
855	1186	wp_send_json_error(['message' => __('Quote not found.', 'easy-invoice')]);
856	1187	}
857		-
858		- // Check if user has permission to accept this quote
	1188	+
	1189	+ // SECURITY (CVE-2026-9021): authorise unconditionally — admin, valid
	1190	+ // access token (email-link path), or authenticated client whose
	1191	+ // email matches the quote's bound client. The previous gating
	1192	+ // behind easy_invoice_pro_restrict_quote_to_client was OFF by
	1193	+ // default, letting any anonymous visitor who could read the public
	1194	+ // single-quote page harvest the nonce and accept arbitrary quotes.
	1195	+ if (!self::canActOnQuote($quote_id, $quote)) {
	1196	+ wp_send_json_error(['message' => __('You do not have permission to accept this quote.', 'easy-invoice')]);
	1197	+ }
	1198	+
	1199	+ $ei_open = self::openForDecision($quote);
	1200	+ if (is_wp_error($ei_open)) {
	1201	+ wp_send_json_error(['message' => $ei_open->get_error_message()]);
	1202	+ }
	1203	+
859	1204	$current_user = wp_get_current_user();
860		- $is_admin = current_user_can('manage_options');
861		-
862		- if (!$is_admin) {
863		- // For non-admins, check if they are the client
864		- if ($quote->getClientId()) {
865		- $client_repository = \EasyInvoice\Providers\ClientServiceProvider::getClientRepository();
866		- $client = $client_repository->find($quote->getClientId());
867		-
868		- if (!$client || $client->getEmail() !== $current_user->user_email) {
869		- wp_send_json_error(['message' => __('You do not have permission to accept this quote.', 'easy-invoice')]);
870		- }
871		- } else {
872		- wp_send_json_error(['message' => __('You do not have permission to accept this quote.', 'easy-invoice')]);
873		- }
874		- }
875		-
	1205	+
876	1206	// Get global accept action setting
877	1207	$settings_controller = new \EasyInvoice\Controllers\SettingsController();
878	1208	$accept_action = $settings_controller::getQuoteAcceptAction();
879		-
	1209	+
880	1210	// Update quote status to accepted
881	1211	$quote->setStatus('accepted');
882		- $quote->setAcceptedDate(date('Y-m-d H:i:s'));
	1212	+ $quote->setAcceptedDate(gmdate('Y-m-d H:i:s'));
883	1213	$quote->setAcceptedBy($current_user->ID);
884		-
	1214	+
885	1215	// Save the quote
886	1216	$saved = $quote->save();
887		-
	1217	+
888	1218	if (!$saved) {
889	1219	wp_send_json_error(['message' => __('Failed to accept quote.', 'easy-invoice')]);
890	1220	}
891		-
	1221	+
892	1222	// Log the quote acceptance
893	1223	$this->quote_log_service->logAcceptance($quote_id, [
894	1224	'accept_action' => $accept_action,
895	1225	'user_type' => $is_admin ? 'admin' : 'client'
896	1226	]);
897		-
	1227	+
	1228	+ // What the acceptance was made with. The signature is a data-URL PNG
	1229	+ // from the page's signature pad (only present when an addon asked for
	1230	+ // it); it is validated here and stored by whoever listens.
	1231	+ $signature = isset($_POST['signature']) ? (string) wp_unslash($_POST['signature']) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput -- validated below.
	1232	+ if ('' !== $signature && !preg_match('#^data:image/png;base64,[A-Za-z0-9+/=]+$#', $signature)) {
	1233	+ $signature = '';
	1234	+ }
	1235	+ /**
	1236	+ * Fires once a quote has been accepted and saved.
	1237	+ *
	1238	+ * @param int $quote_id Quote id.
	1239	+ * @param object $quote Quote model.
	1240	+ * @param array $context accept_action, user_type, signature (data URL or ''),
	1241	+ * signer_name, ip, user_agent, accepted_at.
	1242	+ */
	1243	+ do_action('easy_invoice_quote_accepted', $quote_id, $quote, [
	1244	+ 'accept_action' => $accept_action,
	1245	+ 'user_type' => $is_admin ? 'admin' : 'client',
	1246	+ 'signature' => $signature,
	1247	+ 'signer_name' => isset($_POST['signer_name']) ? sanitize_text_field(wp_unslash($_POST['signer_name'])) : '',
	1248	+ 'ip' => isset($_SERVER['REMOTE_ADDR']) ? sanitize_text_field(wp_unslash($_SERVER['REMOTE_ADDR'])) : '',
	1249	+ 'user_agent' => isset($_SERVER['HTTP_USER_AGENT']) ? sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT'])) : '',
	1250	+ 'accepted_at' => current_time('mysql'),
	1251	+ ]);
	1252	+
898	1253	// Perform the configured accept action
899	1254	$invoice_id = null;
900	1255	$action_message = '';
901		-
	1256	+
902	1257	switch ($accept_action) {
903	1258	case 'convert':
904	1259	// Convert quote to invoice (Draft status)
905	1260	$invoice_id = $this->convertQuoteToInvoice($quote, 'draft');
		@@ -907,9 +1262,9 @@
907	1262	$this->quote_log_service->logConversionToInvoice($quote_id, $invoice_id);
908	1263	}
909	1264	$action_message = __('Quote converted to invoice successfully.', 'easy-invoice');
910	1265	break;
911		-
	1266	+
912	1267	case 'convert_available':
913	1268	// Convert quote to invoice (Available status)
914	1269	$invoice_id = $this->convertQuoteToInvoice($quote, 'available');
915	1270	if ($invoice_id) {
		@@ -916,9 +1271,9 @@
916	1271	$this->quote_log_service->logConversionToInvoice($quote_id, $invoice_id);
917	1272	}
918	1273	$action_message = __('Quote converted to invoice successfully.', 'easy-invoice');
919	1274	break;
920		-
	1275	+
921	1276	case 'convert_send':
922	1277	// Convert quote to invoice and send to client (Available status)
923	1278	$invoice_id = $this->convertQuoteToInvoice($quote, 'available');
924	1279	if ($invoice_id) {
		@@ -925,9 +1280,9 @@
925	1280	$this->sendInvoiceToClient($invoice_id);
926	1281	}
927	1282	$action_message = __('Quote converted to invoice and sent to client successfully.', 'easy-invoice');
928	1283	break;
929		-
	1284	+
930	1285	case 'duplicate':
931	1286	// Create new invoice, keep quote as-is (Draft status)
932	1287	$invoice_id = $this->createInvoiceFromQuote($quote, 'draft');
933	1288	if ($invoice_id) {
		@@ -934,9 +1289,9 @@
934	1289	$this->quote_log_service->logDuplicationToInvoice($quote_id, $invoice_id);
935	1290	}
936	1291	$action_message = __('New invoice created from quote successfully.', 'easy-invoice');
937	1292	break;
938		-
	1293	+
939	1294	case 'duplicate_send':
940	1295	// Create new invoice and send to client, keep quote as-is (Available status)
941	1296	$invoice_id = $this->createInvoiceFromQuote($quote, 'available');
942	1297	if ($invoice_id) {
		@@ -943,9 +1298,9 @@
943	1298	$this->sendInvoiceToClient($invoice_id);
944	1299	}
945	1300	$action_message = __('New invoice created and sent to client successfully.', 'easy-invoice');
946	1301	break;
947		-
	1302	+
948	1303	case 'do_nothing':
949	1304	default:
950	1305	// Do nothing additional
951	1306	$action_message = __('Quote accepted successfully.', 'easy-invoice');
		@@ -950,30 +1305,37 @@
950	1305	// Do nothing additional
951	1306	$action_message = __('Quote accepted successfully.', 'easy-invoice');
952	1307	break;
953	1308	}
954		-
	1309	+
955	1310	// Send notification email to admin
956	1311	if (!$is_admin) {
957	1312	$this->sendQuoteAcceptanceNotification($quote);
958	1313	}
959		-
	1314	+
960	1315	// Get URLs for the new invoice
961	1316	$invoice_url = null;
962	1317	$secure_url = null;
963		-
	1318	+
964	1319	if ($invoice_id) {
965	1320	// Always use WordPress permalink
966	1321	$invoice_url = get_permalink($invoice_id);
967		- // If Pro and secure link available, use secure link
968		- if (class_exists('\EasyInvoicePro\Controllers\PermalinkController')) {
969		- $secure_url = \EasyInvoicePro\Controllers\PermalinkController::getInvoiceSecureLinkUrl($invoice_id);
	1322	+ // A signed URL only when the site asked for signed URLs. This
	1323	+ // used to test for the class alone, which is loadable whenever
	1324	+ // Pro is installed — so accepting a quote sent the client to
	1325	+ // /secure-invoice/<hash>/, and minted the hash on the way, on
	1326	+ // sites that had Secure Links switched off or never enabled.
	1327	+ // Every other caller (emails, shortcodes, reminders) reads the
	1328	+ // setting first; this one did not.
	1329	+ $secure_links_enabled = get_option('easy_invoice_pro_enable_secure_links', 'no') === 'yes';
	1330	+ if ($secure_links_enabled && class_exists('\EasyInvoicePro\Addons\SecureLinks\Controllers\PermalinkController')) {
	1331	+ $secure_url = \EasyInvoicePro\Addons\SecureLinks\Controllers\PermalinkController::getInvoiceSecureLinkUrl($invoice_id);
970	1332	if ($secure_url) {
971	1333	$invoice_url = $secure_url;
972	1334	}
973	1335	}
974	1336	}
975		-
	1337	+
976	1338	wp_send_json_success([
977	1339	'message' => $action_message,
978	1340	'invoice_id' => $invoice_id,
979	1341	'invoice_url' => $invoice_url,
		@@ -983,9 +1345,9 @@
983	1345	'message' => $action_message
984	1346	]
985	1347	]);
986	1348	}
987		-
	1349	+
988	1350	/**
989	1351	* Convert quote to invoice
990	1352	*
991	1353	* @param \EasyInvoice\Models\Quote $quote The quote to convert
		@@ -991,20 +1353,94 @@
991	1353	* @param \EasyInvoice\Models\Quote $quote The quote to convert
992	1354	* @param string $status The status for the new invoice ('draft' or 'available')
993	1355	* @return int|null The invoice ID if successful, null otherwise
994	1356	*/
	1357	+ /**
	1358	+ * "Convert to invoice" on the quote row — for the quote the client accepted
	1359	+ * by phone or in person, which the public Accept button never sees.
	1360	+ *
	1361	+ * @param array $actions Row actions.
	1362	+ * @param object $quote Quote model.
	1363	+ * @return array
	1364	+ */
	1365	+ public function addConvertRowAction($actions, $quote): array {
	1366	+ $actions = is_array($actions) ? $actions : [];
	1367	+ if (!easy_invoice_user_can('ei_create_invoice') || !is_callable([$quote, 'getId'])) {
	1368	+ return $actions;
	1369	+ }
	1370	+ $converted = (int) get_post_meta((int) $quote->getId(), '_easy_invoice_quote_converted_invoice_id', true);
	1371	+ if ($converted > 0 && get_post($converted)) {
	1372	+ $actions['convert'] = sprintf(
	1373	+ '<a href="%s" class="text-emerald-700 font-semibold" title="%s">%s</a>',
	1374	+ esc_url(admin_url('admin.php?page=easy-invoice-builder&invoice_id=' . $converted)),
	1375	+ esc_attr__('Open the invoice made from this quote', 'easy-invoice'),
	1376	+ esc_html__('Invoice', 'easy-invoice')
	1377	+ );
	1378	+ return $actions;
	1379	+ }
	1380	+ $actions['convert'] = sprintf(
	1381	+ '<a href="#" class="convert-quote text-indigo-600 font-semibold" data-quote-id="%d" data-quote-number="%s">%s</a>',
	1382	+ (int) $quote->getId(),
	1383	+ esc_attr((string) $quote->getNumber()),
	1384	+ esc_html__('Convert to invoice', 'easy-invoice')
	1385	+ );
	1386	+ return $actions;
	1387	+ }
	1388	+
	1389	+ /**
	1390	+ * AJAX: make a draft invoice from a quote and mark the quote accepted.
	1391	+ */
	1392	+ public function handleConvertQuote(): void {
	1393	+ if (!isset($_POST['nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['nonce'])), 'easy_invoice_admin_nonce')) {
	1394	+ wp_send_json_error(['message' => __('Security check failed. Please reload the page and try again.', 'easy-invoice')]);
	1395	+ }
	1396	+ if (!easy_invoice_user_can('ei_create_invoice')) {
	1397	+ wp_send_json_error(['message' => __('You do not have permission to create invoices.', 'easy-invoice')]);
	1398	+ }
	1399	+ $quote_id = isset($_POST['quote_id']) ? absint($_POST['quote_id']) : 0;
	1400	+ $quote = $quote_id > 0 ? $this->quote_repository->find($quote_id) : null;
	1401	+ if (!$quote) {
	1402	+ wp_send_json_error(['message' => __('Quote not found.', 'easy-invoice')]);
	1403	+ }
	1404	+ $existing = (int) get_post_meta($quote_id, '_easy_invoice_quote_converted_invoice_id', true);
	1405	+ if ($existing > 0 && get_post($existing)) {
	1406	+ wp_send_json_success(['invoice_id' => $existing, 'already' => true, 'message' => __('This quote already has an invoice.', 'easy-invoice')]);
	1407	+ }
	1408	+ $invoice_id = $this->convertQuoteToInvoice($quote, 'draft');
	1409	+ if (!$invoice_id) {
	1410	+ wp_send_json_error(['message' => __('The invoice could not be created.', 'easy-invoice')]);
	1411	+ }
	1412	+ update_post_meta($quote_id, '_easy_invoice_quote_converted_invoice_id', $invoice_id);
	1413	+ update_post_meta($invoice_id, '_easy_invoice_converted_from_quote', $quote_id);
	1414	+ if (!in_array((string) $quote->getStatus(), ['accepted', 'declined', 'cancelled'], true)) {
	1415	+ update_post_meta($quote_id, '_easy_invoice_quote_status', 'accepted');
	1416	+ }
	1417	+ /**
	1418	+ * Fires after an administrator converts a quote into an invoice by hand.
	1419	+ *
	1420	+ * @param int $quote_id Quote.
	1421	+ * @param int $invoice_id New draft invoice.
	1422	+ */
	1423	+ do_action('easy_invoice_quote_converted_manually', $quote_id, $invoice_id);
	1424	+ wp_send_json_success([
	1425	+ 'invoice_id' => $invoice_id,
	1426	+ 'message' => __('Draft invoice created from the quote.', 'easy-invoice'),
	1427	+ 'redirect' => admin_url('admin.php?page=easy-invoice-builder&invoice_id=' . $invoice_id),
	1428	+ ]);
	1429	+ }
	1430	+
995	1431	private function convertQuoteToInvoice($quote, $status = 'draft'): ?int {
996	1432	try {
997	1433	// Get invoice repository
998	1434	$invoice_repository = \EasyInvoice\Providers\InvoiceServiceProvider::getInvoiceRepository();
999		-
	1435	+
1000	1436	// Create invoice data from quote - convert ALL fields
1001	1437	$invoice_data = [
1002	1438	'title' => $quote->getTitle() ?: 'Invoice from Quote ' . $quote->getNumber(),
1003	1439	'number' => $this->generateInvoiceNumber(),
1004	1440	'status' => $status,
1005		- 'issue_date' => date('Y-m-d'),
1006		- 'due_date' => date('Y-m-d', strtotime('+30 days')),
	1441	+ 'issue_date' => current_time('Y-m-d'),
	1442	+ 'due_date' => wp_date('Y-m-d', strtotime('+30 days')),
1007	1443	'client_id' => $quote->getClientId(),
1008	1444	'customer_name' => $quote->getCustomerName(),
1009	1445	'customer_email' => $quote->getCustomerEmail(),
1010	1446	'customer_address' => $quote->getCustomerAddress(),
		@@ -1019,8 +1455,9 @@
1019	1455	'payment_gateways' => [], // Invoice-specific field, leave empty
1020	1456	'template' => $quote->getTemplate(),
1021	1457	'subtotal' => $quote->getSubtotal(),
1022	1458	'tax_rate' => $quote->getTaxRate(),
	1459	+ 'tax_enabled' => $quote->getTaxEnabled() ?: (get_option('easy_invoice_tax_enabled', 'no') === 'yes' ? 'yes' : 'no'),
1023	1460	'tax_amount' => $quote->getTaxAmount(),
1024	1461	'discount_type' => $quote->getDiscountType(),
1025	1462	'discount_value' => $quote->getDiscountValue(),
1026	1463	'discount_amount' => $quote->getDiscountAmount(),
		@@ -1031,29 +1468,51 @@
1031	1468	'calculation_method' => 'standard', // Default calculation method for invoices
1032	1469	'prices_include_tax' => $quote->getPricesIncludeTax(),
1033	1470	'custom_fields' => $quote->getCustomFields(), // Transfer custom fields
1034	1471	];
1035		-
	1472	+
	1473	+ /**
	1474	+ * Filter the data an invoice is created from when a quote is
	1475	+ * converted, so addons can carry their own quote fields across.
	1476	+ *
	1477	+ * @param array $invoice_data
	1478	+ * @param Quote $quote
	1479	+ */
	1480	+ $invoice_data = apply_filters('easy_invoice_quote_to_invoice_data', $invoice_data, $quote);
	1481	+
1036	1482	// Create the invoice
1037	1483	$invoice = $invoice_repository->create($invoice_data);
1038		-
	1484	+
1039	1485	if ($invoice) {
1040	1486	// Store the quote ID in the invoice's meta for tracking
1041	1487	update_post_meta($invoice->getId(), '_converted_from_quote', $quote->getId());
1042		-
1043		- // Update quote to reference the created invoice
	1488	+ update_post_meta($invoice->getId(), '_easy_invoice_converted_from_quote', $quote->getId());
	1489	+
	1490	+ // Update quote to reference the created invoice — the same key
	1491	+ // the quote list and "convert" guard read, whichever path
	1492	+ // (manual convert, accept-and-convert) produced the invoice.
	1493	+ update_post_meta($quote->getId(), '_easy_invoice_quote_converted_invoice_id', (int) $invoice->getId());
1044	1494	$quote->setCustomField('converted_invoice_id', $invoice->getId());
1045	1495	$quote->save();
1046		-
	1496	+
1047	1497	// Ensure secure link is generated for the new invoice (Pro version)
1048		- if (class_exists('\EasyInvoicePro\Controllers\PermalinkController')) {
1049		- // Trigger the save_post hook to generate secure link
1050		- do_action('save_post_easy_invoice', $invoice->getId(), get_post($invoice->getId()));
	1498	+ if (class_exists('\EasyInvoicePro\Addons\SecureLinks\Controllers\PermalinkController')) {
	1499	+ // Trigger the save_post hook to generate secure link.
	1500	+ //
	1501	+ // Core's save_post_{post_type} passes three arguments — $post_id,
	1502	+ // $post and $update — and callbacks are written against that
	1503	+ // signature. Firing it with two put a client-facing fatal on the
	1504	+ // quote-acceptance path: Team Roles' audit logger declares all three
	1505	+ // as required, so accepting a quote raised ArgumentCountError and
	1506	+ // the customer got "There has been a critical error on this website"
	1507	+ // after the invoice had already been created. Passing `true` for
	1508	+ // $update because the invoice row exists by this point.
	1509	+ do_action('save_post_easy_invoice', $invoice->getId(), get_post($invoice->getId()), true);
1051	1510	}
1052		-
	1511	+
1053	1512	return $invoice->getId();
1054	1513	}
1055		-
	1514	+
1056	1515	return null;
1057	1516	} catch (\Exception $e) {
1058	1517	// Error converting quote to invoice
1059	1518	return null;
		@@ -1058,9 +1517,9 @@
1058	1517	// Error converting quote to invoice
1059	1518	return null;
1060	1519	}
1061	1520	}
1062		-
	1521	+
1063	1522	/**
1064	1523	* Create new invoice from quote (duplicate)
1065	1524	*
1066	1525	* @param \EasyInvoice\Models\Quote $quote The quote to duplicate
		@@ -1070,16 +1529,16 @@
1070	1529	private function createInvoiceFromQuote($quote, $status = 'draft'): ?int {
1071	1530	try {
1072	1531	// Get invoice repository
1073	1532	$invoice_repository = \EasyInvoice\Providers\InvoiceServiceProvider::getInvoiceRepository();
1074		-
	1533	+
1075	1534	// Create invoice data from quote - convert ALL fields
1076	1535	$invoice_data = [
1077	1536	'title' => 'Invoice from Quote ' . $quote->getNumber(),
1078	1537	'number' => $this->generateInvoiceNumber(),
1079	1538	'status' => $status,
1080		- 'issue_date' => date('Y-m-d'),
1081		- 'due_date' => date('Y-m-d', strtotime('+30 days')),
	1539	+ 'issue_date' => current_time('Y-m-d'),
	1540	+ 'due_date' => wp_date('Y-m-d', strtotime('+30 days')),
1082	1541	'client_id' => $quote->getClientId(),
1083	1542	'customer_name' => $quote->getCustomerName(),
1084	1543	'customer_email' => $quote->getCustomerEmail(),
1085	1544	'customer_address' => $quote->getCustomerAddress(),
		@@ -1094,8 +1553,9 @@
1094	1553	'payment_gateways' => [], // Invoice-specific field, leave empty
1095	1554	'template' => $quote->getTemplate(),
1096	1555	'subtotal' => $quote->getSubtotal(),
1097	1556	'tax_rate' => $quote->getTaxRate(),
	1557	+ 'tax_enabled' => $quote->getTaxEnabled() ?: (get_option('easy_invoice_tax_enabled', 'no') === 'yes' ? 'yes' : 'no'),
1098	1558	'tax_amount' => $quote->getTaxAmount(),
1099	1559	'discount_type' => $quote->getDiscountType(),
1100	1560	'discount_value' => $quote->getDiscountValue(),
1101	1561	'discount_amount' => $quote->getDiscountAmount(),
		@@ -1106,26 +1566,44 @@
1106	1566	'calculation_method' => 'standard', // Default calculation method for invoices
1107	1567	'prices_include_tax' => $quote->getPricesIncludeTax(),
1108	1568	'custom_fields' => $quote->getCustomFields(), // Transfer custom fields
1109	1569	];
1110		-
	1570	+
	1571	+ /**
	1572	+ * Filter the data an invoice is created from when a quote is
	1573	+ * converted, so addons can carry their own quote fields across.
	1574	+ *
	1575	+ * @param array $invoice_data
	1576	+ * @param Quote $quote
	1577	+ */
	1578	+ $invoice_data = apply_filters('easy_invoice_quote_to_invoice_data', $invoice_data, $quote);
	1579	+
1111	1580	// Create the invoice
1112	1581	$invoice = $invoice_repository->create($invoice_data);
1113		-
	1582	+
1114	1583	if ($invoice) {
1115	1584	// Link the invoice to the quote
1116	1585	$quote->setCustomField('related_invoice_id', $invoice->getId());
1117	1586	$quote->save();
1118		-
	1587	+
1119	1588	// Ensure secure link is generated for the new invoice (Pro version)
1120		- if (class_exists('\EasyInvoicePro\Controllers\PermalinkController')) {
1121		- // Trigger the save_post hook to generate secure link
1122		- do_action('save_post_easy_invoice', $invoice->getId(), get_post($invoice->getId()));
	1589	+ if (class_exists('\EasyInvoicePro\Addons\SecureLinks\Controllers\PermalinkController')) {
	1590	+ // Trigger the save_post hook to generate secure link.
	1591	+ //
	1592	+ // Core's save_post_{post_type} passes three arguments — $post_id,
	1593	+ // $post and $update — and callbacks are written against that
	1594	+ // signature. Firing it with two put a client-facing fatal on the
	1595	+ // quote-acceptance path: Team Roles' audit logger declares all three
	1596	+ // as required, so accepting a quote raised ArgumentCountError and
	1597	+ // the customer got "There has been a critical error on this website"
	1598	+ // after the invoice had already been created. Passing `true` for
	1599	+ // $update because the invoice row exists by this point.
	1600	+ do_action('save_post_easy_invoice', $invoice->getId(), get_post($invoice->getId()), true);
1123	1601	}
1124		-
	1602	+
1125	1603	return $invoice->getId();
1126	1604	}
1127		-
	1605	+
1128	1606	return null;
1129	1607	} catch (\Exception $e) {
1130	1608	// Error creating invoice from quote
1131	1609	return null;
		@@ -1130,9 +1608,9 @@
1130	1608	// Error creating invoice from quote
1131	1609	return null;
1132	1610	}
1133	1611	}
1134		-
	1612	+
1135	1613	/**
1136	1614	* Send invoice to client
1137	1615	*
1138	1616	* @param int $invoice_id The invoice ID
		@@ -1142,19 +1620,19 @@
1142	1620	try {
1143	1621	// Get invoice
1144	1622	$invoice_repository = \EasyInvoice\Providers\InvoiceServiceProvider::getInvoiceRepository();
1145	1623	$invoice = $invoice_repository->find($invoice_id);
1146		-
	1624	+
1147	1625	if (!$invoice) {
1148	1626	return false;
1149	1627	}
1150		-
	1628	+
1151	1629	// Get email manager
1152	1630	$email_manager = \EasyInvoice\Services\EmailManager::getInstance();
1153		-
	1631	+
1154	1632	// Send invoice email
1155	1633	$result = $email_manager->sendInvoiceEmail($invoice, 'new');
1156		-
	1634	+
1157	1635	return $result['success'];
1158	1636	} catch (\Exception $e) {
1159	1637	// Error sending invoice to client
1160	1638	return false;
		@@ -1159,9 +1637,9 @@
1159	1637	// Error sending invoice to client
1160	1638	return false;
1161	1639	}
1162	1640	}
1163		-
	1641	+
1164	1642	/**
1165	1643	* Convert quote items to invoice items
1166	1644	*
1167	1645	* @param array $quote_items Array of quote items
		@@ -1168,19 +1646,29 @@
1168	1646	* @return array Array of invoice items
1169	1647	*/
1170	1648	private function convertQuoteItemsToInvoiceItems(array $quote_items): array {
1171	1649	$invoice_items = [];
1172		-
	1650	+
1173	1651	foreach ($quote_items as $quote_item) {
1174	1652	if (is_object($quote_item) && method_exists($quote_item, 'toArray')) {
1175		- // Convert QuoteItem object to InvoiceItem array
	1653	+ // A saved quote stores its lines as title/total, an invoice as
	1654	+ // name/amount; read through the model, which knows both, or
	1655	+ // the converted invoice has nameless lines that add up to 0.
1176	1656	$item_data = $quote_item->toArray();
	1657	+ $name = (string) (is_callable([$quote_item, 'getName']) ? $quote_item->getName() : '');
	1658	+ if ('' === $name) {
	1659	+ $name = (string) ($item_data['name'] ?? $item_data['title'] ?? '');
	1660	+ }
	1661	+ $amount = $item_data['amount'] ?? $item_data['total'] ?? null;
	1662	+ if (null === $amount || '' === $amount) {
	1663	+ $amount = is_callable([$quote_item, 'getAmount']) ? $quote_item->getAmount() : (float) ($item_data['quantity'] ?? 0) * (float) ($item_data['price'] ?? 0);
	1664	+ }
1177	1665	$invoice_items[] = [
1178		- 'name' => $item_data['name'] ?? '',
	1666	+ 'name' => $name,
1179	1667	'description' => $item_data['description'] ?? '',
1180		- 'quantity' => $item_data['quantity'] ?? 1,
	1668	+ 'quantity' => $item_data['quantity'] ?? 0,
1181	1669	'price' => $item_data['price'] ?? 0,
1182		- 'amount' => $item_data['amount'] ?? 0,
	1670	+ 'amount' => $amount,
1183	1671	'taxable' => $item_data['taxable'] ?? true,
1184	1672	// Map adjust_percentage to a similar field if needed
1185	1673	'adjust_percentage' => $item_data['adjust_percentage'] ?? 0,
1186	1674	];
		@@ -1188,9 +1676,9 @@
1188	1676	// Convert array item directly
1189	1677	$invoice_items[] = [
1190	1678	'name' => $quote_item['name'] ?? $quote_item['title'] ?? '',
1191	1679	'description' => $quote_item['description'] ?? '',
1192		- 'quantity' => $quote_item['quantity'] ?? 1,
	1680	+ 'quantity' => $quote_item['quantity'] ?? 0,
1193	1681	'price' => $quote_item['price'] ?? 0,
1194	1682	'amount' => $quote_item['amount'] ?? $quote_item['total'] ?? 0,
1195	1683	'taxable' => $quote_item['taxable'] ?? true,
1196	1684	'adjust_percentage' => $quote_item['adjust_percentage'] ?? 0,
		@@ -1196,12 +1684,12 @@
1196	1684	'adjust_percentage' => $quote_item['adjust_percentage'] ?? 0,
1197	1685	];
1198	1686	}
1199	1687	}
1200		-
	1688	+
1201	1689	return $invoice_items;
1202	1690	}
1203		-
	1691	+
1204	1692	/**
1205	1693	* Generate unique invoice number
1206	1694	*
1207	1695	* @return string The invoice number
		@@ -1211,13 +1699,13 @@
1211	1699	if (class_exists('\\EasyInvoice\\Services\\InvoiceNumberService')) {
1212	1700	$invoice_number_service = new \EasyInvoice\Services\InvoiceNumberService();
1213	1701	return $invoice_number_service->generateUniqueNumber();
1214	1702	}
1215		-
	1703	+
1216	1704	// Fallback to timestamp-based number
1217	1705	return 'INV-' . str_pad(time(), 6, '0', STR_PAD_LEFT);
1218	1706	}
1219		-
	1707	+
1220	1708	/**
1221	1709	* Get changes between two quote versions
1222	1710	*
1223	1711	* @param \EasyInvoice\Models\Quote $old_quote Old quote
		@@ -1225,9 +1713,9 @@
1225	1713	* @return array Array of changes
1226	1714	*/
1227	1715	private function getQuoteChanges($old_quote, $new_quote): array {
1228	1716	$changes = [];
1229		-
	1717	+
1230	1718	// Compare key fields
1231	1719	$fields_to_compare = [
1232	1720	'title' => 'Title',
1233	1721	'status' => 'Status',
		@@ -1239,25 +1727,25 @@
1239	1727	'total' => 'Total Amount',
1240	1728	'notes' => 'Notes',
1241	1729	'terms' => 'Terms',
1242	1730	];
1243		-
	1731	+
1244	1732	foreach ($fields_to_compare as $field => $label) {
1245	1733	$method_name = 'get' . easy_invoice_str_replace('_', '', ucwords($field, '_'));
1246		-
	1734	+
1247	1735	if (method_exists($old_quote, $method_name) && method_exists($new_quote, $method_name)) {
1248	1736	$old_value = $old_quote->$method_name();
1249	1737	$new_value = $new_quote->$method_name();
1250		-
	1738	+
1251	1739	if ($old_value !== $new_value) {
1252	1740	$changes[$field] = $new_value;
1253	1741	}
1254	1742	}
1255	1743	}
1256		-
	1744	+
1257	1745	return $changes;
1258	1746	}
1259		-
	1747	+
1260	1748	/**
1261	1749	* Handle AJAX request to decline a quote
1262	1750	*
1263	1751	* @since 1.0.0
		@@ -1262,78 +1750,77 @@
1262	1750	*
1263	1751	* @since 1.0.0
1264	1752	*/
1265	1753	public function handleDeclineQuote(): void {
1266		- // Verify nonce
1267		- if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_quote_action')) {
1268		- wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
1269		- }
1270		-
1271	1754	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
1272	1755	$decline_reason = isset($_POST['decline_reason']) ? sanitize_textarea_field($_POST['decline_reason']) : '';
1273		-
	1756	+
1274	1757	if ($quote_id <= 0) {
1275	1758	wp_send_json_error(['message' => __('Invalid quote ID.', 'easy-invoice')]);
1276	1759	}
1277		-
1278		- // Get the quote
1279		- $quote = $this->quote_repository->find($quote_id);
1280		-
	1760	+
	1761	+ if (!wp_verify_nonce($_POST['nonce'] ?? '', $this->quoteAcceptDeclineNonceAction($quote_id))) {
	1762	+ wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
	1763	+ }
	1764	+
	1765	+ $is_admin = current_user_can('manage_options');
	1766	+ if ($is_admin) {
	1767	+ $quote = $this->quote_repository->find($quote_id);
	1768	+ } else {
	1769	+ $quote = $this->quote_repository->findPublished($quote_id);
	1770	+ }
	1771	+
1281	1772	if (!$quote) {
1282	1773	wp_send_json_error(['message' => __('Quote not found.', 'easy-invoice')]);
1283	1774	}
1284		-
	1775	+
1285	1776	// Check if decline reason is required by global settings
1286	1777	$settings_controller = new \EasyInvoice\Controllers\SettingsController();
1287	1778	if ($settings_controller::isDeclineReasonRequired() && empty(trim($decline_reason))) {
1288	1779	wp_send_json_error(['message' => __('Reason for declining is required.', 'easy-invoice')]);
1289	1780	}
1290		-
1291		- // Check if user has permission to decline this quote
	1781	+
	1782	+ // SECURITY (CVE-2026-9021): unconditional authorisation — see
	1783	+ // handleAcceptQuote for the full rationale. Same three paths:
	1784	+ // admin / valid access token / authenticated bound client.
	1785	+ if (!self::canActOnQuote($quote_id, $quote)) {
	1786	+ wp_send_json_error(['message' => __('You do not have permission to decline this quote.', 'easy-invoice')]);
	1787	+ }
	1788	+
	1789	+ $ei_open = self::openForDecision($quote);
	1790	+ if (is_wp_error($ei_open)) {
	1791	+ wp_send_json_error(['message' => $ei_open->get_error_message()]);
	1792	+ }
	1793	+
1292	1794	$current_user = wp_get_current_user();
1293		- $is_admin = current_user_can('manage_options');
1294		-
1295		- if (!$is_admin) {
1296		- // For non-admins, check if they are the client
1297		- if ($quote->getClientId()) {
1298		- $client_repository = \EasyInvoice\Providers\ClientServiceProvider::getClientRepository();
1299		- $client = $client_repository->find($quote->getClientId());
1300		-
1301		- if (!$client || $client->getEmail() !== $current_user->user_email) {
1302		- wp_send_json_error(['message' => __('You do not have permission to decline this quote.', 'easy-invoice')]);
1303		- }
1304		- } else {
1305		- wp_send_json_error(['message' => __('You do not have permission to decline this quote.', 'easy-invoice')]);
1306		- }
1307		- }
1308		-
	1795	+
1309	1796	// Update quote status to declined
1310	1797	$quote->setStatus('declined');
1311		- $quote->setDeclinedDate(date('Y-m-d H:i:s'));
	1798	+ $quote->setDeclinedDate(gmdate('Y-m-d H:i:s'));
1312	1799	$quote->setDeclinedBy($current_user->ID);
1313		-
	1800	+
1314	1801	// Save decline reason if provided
1315	1802	if (!empty($decline_reason)) {
1316	1803	$quote->setDeclineReason($decline_reason);
1317	1804	}
1318		-
	1805	+
1319	1806	// Save the quote
1320	1807	$saved = $quote->save();
1321		-
	1808	+
1322	1809	if (!$saved) {
1323	1810	wp_send_json_error(['message' => __('Failed to decline quote.', 'easy-invoice')]);
1324	1811	}
1325		-
	1812	+
1326	1813	// Log the quote decline
1327	1814	$this->quote_log_service->logDecline($quote_id, $decline_reason, [
1328	1815	'user_type' => $is_admin ? 'admin' : 'client'
1329	1816	]);
1330		-
	1817	+
1331	1818	// Send notification email to admin
1332	1819	if (!$is_admin) {
1333	1820	$this->sendQuoteDeclineNotification($quote);
1334	1821	}
1335		-
	1822	+
1336	1823	wp_send_json_success([
1337	1824	'message' => __('Quote declined successfully.', 'easy-invoice'),
1338	1825	'toast' => [
1339	1826	'type' => 'success',
		@@ -1340,9 +1827,9 @@
1340	1827	'message' => __('Quote declined successfully.', 'easy-invoice')
1341	1828	]
1342	1829	]);
1343	1830	}
1344		-
	1831	+
1345	1832	/**
1346	1833	* Send quote acceptance notification to admin
1347	1834	*
1348	1835	* @param \EasyInvoice\Models\Quote $quote The quote that was accepted
		@@ -1347,41 +1834,13 @@
1347	1834	*
1348	1835	* @param \EasyInvoice\Models\Quote $quote The quote that was accepted
1349	1836	*/
1350	1837	private function sendQuoteAcceptanceNotification($quote): void {
1351		- $admin_email = get_option('admin_email');
1352		- $site_name = get_bloginfo('name');
1353		-
1354		- $subject = sprintf(__('Quote %s has been accepted', 'easy-invoice'), $quote->getNumber());
1355		-
1356		- $message = sprintf(
1357		- __('Hello,
	1838	+ // Use EmailManager to send admin notification
	1839	+ $email_manager = \EasyInvoice\Services\EmailManager::getInstance();
	1840	+ $email_manager->sendAdminQuoteNotification($quote, 'accepted');
	1841	+ }
1358	1842
1359		-The quote %s for %s has been accepted by the client.
1360		-
1361		-Quote Details:
1362		-- Quote Number: %s
1363		-- Client: %s
1364		-- Total Amount: %s
1365		-- Accepted Date: %s
1366		-
1367		-You can view the quote at: %s
1368		-
1369		-Best regards,
1370		-%s', 'easy-invoice'),
1371		- $quote->getNumber(),
1372		- $quote->getCustomerName(),
1373		- $quote->getNumber(),
1374		- $quote->getCustomerName(),
1375		- $this->formatCurrency($quote->getTotal(), $quote),
1376		- date_i18n(get_option('date_format') . ' ' . get_option('time_format')),
1377		- get_permalink($quote->getId()),
1378		- $site_name
1379		- );
1380		-
1381		- wp_mail($admin_email, $subject, $message);
1382		- }
1383		-
1384	1843	/**
1385	1844	* Send quote decline notification to admin
1386	1845	*
1387	1846	* @param \EasyInvoice\Models\Quote $quote The quote that was declined
		@@ -1386,91 +1845,15 @@
1386	1845	*
1387	1846	* @param \EasyInvoice\Models\Quote $quote The quote that was declined
1388	1847	*/
1389	1848	private function sendQuoteDeclineNotification($quote): void {
1390		- $admin_email = get_option('admin_email');
1391		- $site_name = get_bloginfo('name');
1392		-
1393		- $subject = sprintf(__('Quote %s has been declined', 'easy-invoice'), $quote->getNumber());
1394		-
1395		- $message = sprintf(
1396		- __('Hello,
	1849	+ // Use EmailManager to send admin notification
	1850	+ $email_manager = \EasyInvoice\Services\EmailManager::getInstance();
	1851	+ $email_manager->sendAdminQuoteNotification($quote, 'declined');
	1852	+ }
1397	1853
1398		-The quote %s for %s has been declined by the client.
1399	1854
1400		-Quote Details:
1401		-- Quote Number: %s
1402		-- Client: %s
1403		-- Total Amount: %s
1404		-- Declined Date: %s
1405		-
1406		-You can view the quote at: %s
1407		-
1408		-Best regards,
1409		-%s', 'easy-invoice'),
1410		- $quote->getNumber(),
1411		- $quote->getCustomerName(),
1412		- $quote->getNumber(),
1413		- $quote->getCustomerName(),
1414		- $this->formatCurrency($quote->getTotal(), $quote),
1415		- date_i18n(get_option('date_format') . ' ' . get_option('time_format')),
1416		- get_permalink($quote->getId()),
1417		- $site_name
1418		- );
1419		-
1420		- wp_mail($admin_email, $subject, $message);
1421		- }
1422		-
1423	1855	/**
1424		- * Handle AJAX request to update existing quotes with missing data
1425		- *
1426		- * @since 1.0.0
1427		- */
1428		- public function handleUpdateExistingQuotes(): void {
1429		- // Verify nonce - match the nonce being sent from JavaScript
1430		- if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
1431		- wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
1432		- }
1433		-
1434		- // Check permissions
1435		- if (!current_user_can('manage_options')) {
1436		- wp_send_json_error(['message' => __('You do not have permission to perform this action.', 'easy-invoice')]);
1437		- }
1438		-
1439		- $updated_count = 0;
1440		- $quotes = $this->quote_repository->findAll();
1441		-
1442		- foreach ($quotes as $quote) {
1443		- $post = get_post($quote->getId());
1444		- if ($post && empty($post->post_name)) {
1445		- // Generate a proper slug for this quote
1446		- $post_title = $quote->getTitle() ?: $quote->getNumber() ?: 'Untitled Quote';
1447		- $post_name = sanitize_title($post_title);
1448		-
1449		- // Ensure uniqueness
1450		- $original_slug = $post_name;
1451		- $counter = 1;
1452		- while (get_page_by_path($post_name, OBJECT, \EasyInvoice\Constants\PostTypes::EASY_INVOICE_QUOTE_POST_TYPE)) {
1453		- $post_name = $original_slug . '-' . $counter;
1454		- $counter++;
1455		- }
1456		-
1457		- // Update the post with the new slug
1458		- wp_update_post([
1459		- 'ID' => $quote->getId(),
1460		- 'post_name' => $post_name
1461		- ]);
1462		-
1463		- $updated_count++;
1464		- }
1465		- }
1466		-
1467		- wp_send_json_success([
1468		- 'message' => sprintf(__('Updated %d quotes with proper URLs.', 'easy-invoice'), $updated_count)
1469		- ]);
1470		- }
1471		-
1472		- /**
1473	1856	* Handle AJAX request to duplicate a quote
1474	1857	*
1475	1858	* @since 1.0.0
1476	1859	*/
		@@ -1478,26 +1861,26 @@
1478	1861	// Verify nonce
1479	1862	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
1480	1863	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
1481	1864	}
1482		-
	1865	+
1483	1866	// Check permissions
1484		- if (!current_user_can('manage_options')) {
	1867	+ if (!easy_invoice_user_can('ei_create_quote')) {
1485	1868	wp_send_json_error(['message' => __('You do not have permission to perform this action.', 'easy-invoice')]);
1486	1869	}
1487		-
	1870	+
1488	1871	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
1489		-
	1872	+
1490	1873	if ($quote_id <= 0) {
1491	1874	wp_send_json_error(['message' => __('Invalid quote ID.', 'easy-invoice')]);
1492	1875	}
1493		-
	1876	+
1494	1877	$quote = $this->quote_repository->find($quote_id);
1495		-
	1878	+
1496	1879	if (!$quote) {
1497	1880	wp_send_json_error(['message' => __('Quote not found.', 'easy-invoice')]);
1498	1881	}
1499		-
	1882	+
1500	1883	// Get global quote settings
1501	1884	$settings_controller = new \EasyInvoice\Controllers\SettingsController();
1502	1885	$quote_terms = $settings_controller::getQuoteTermsConditions();
1503	1886	$quote_footer = $settings_controller::getQuoteFooterText();
		@@ -1505,16 +1888,16 @@
1505	1888	$quote_accept_action = get_option('easy_invoice_quote_accept_action', 'email');
1506	1889	$quote_accept_text = get_option('easy_invoice_quote_accept_text', __('Accept Quote', 'easy-invoice'));
1507	1890	$quote_accepted_message = get_option('easy_invoice_quote_accepted_message', __('Thank you for accepting our quote!', 'easy-invoice'));
1508	1891	$quote_declined_message = get_option('easy_invoice_quote_declined_message', __('Thank you for your consideration.', 'easy-invoice'));
1509		-
	1892	+
1510	1893	// Create the duplicate quote
1511	1894	$duplicate_data = [
1512	1895	'title' => $quote->getTitle() . ' (Copy)',
1513	1896	'status' => 'draft',
1514	1897	'number' => $this->generateInvoiceNumber(), // Use invoice number service for consistency
1515		- 'issue_date' => date('Y-m-d'),
1516		- 'expiry_date' => date('Y-m-d', strtotime('+30 days')),
	1898	+ 'issue_date' => current_time('Y-m-d'),
	1899	+ 'expiry_date' => wp_date('Y-m-d', strtotime('+30 days')),
1517	1900	'items' => $this->convertQuoteItemsToInvoiceItems($quote->getItems()), // Use invoice item conversion
1518	1901	'notes' => $quote->getNotes(),
1519	1902	'description' => $quote->getDescription(),
1520	1903	'terms' => $quote_terms,
		@@ -1524,14 +1907,14 @@
1524	1907	'accept_text' => $quote_accept_text,
1525	1908	'accepted_message' => $quote_accepted_message,
1526	1909	'declined_message' => $quote_declined_message,
1527	1910	];
1528		-
	1911	+
1529	1912	// Set client ID to 0 for a new quote
1530	1913	$duplicate_data['client_id'] = 0;
1531		-
	1914	+
1532	1915	$duplicate_quote = $this->quote_repository->create($duplicate_data);
1533		-
	1916	+
1534	1917	if ($duplicate_quote) {
1535	1918	$this->quote_log_service->logActivity($quote_id, 'duplicate', 'Quote duplicated', ['duplicate_id' => $duplicate_quote->getId()]);
1536	1919	wp_send_json_success([
1537	1920	'message' => __('Quote duplicated successfully.', 'easy-invoice'),
		@@ -1544,9 +1927,9 @@
1544	1927	} else {
1545	1928	wp_send_json_error(['message' => __('Failed to duplicate quote.', 'easy-invoice')]);
1546	1929	}
1547	1930	}
1548		-
	1931	+
1549	1932	/**
1550	1933	* Handle regular POST form actions for quote accept/decline
1551	1934	*
1552	1935	* @since 1.0.0
		@@ -1555,20 +1938,20 @@
1555	1938	// Only process on POST requests
1556	1939	if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
1557	1940	return;
1558	1941	}
1559		-
	1942	+
1560	1943	// Handle accept quote
1561	1944	if (isset($_POST['accept_quote']) && isset($_POST['quote_id'])) {
1562	1945	$this->handleAcceptQuoteForm();
1563	1946	}
1564		-
	1947	+
1565	1948	// Handle decline quote
1566	1949	if (isset($_POST['decline_quote']) && isset($_POST['quote_id'])) {
1567	1950	$this->handleDeclineQuoteForm();
1568	1951	}
1569	1952	}
1570		-
	1953	+
1571	1954	/**
1572	1955	* Handle accept quote form submission
1573	1956	*
1574	1957	* @since 1.0.0
		@@ -1573,67 +1956,65 @@
1573	1956	*
1574	1957	* @since 1.0.0
1575	1958	*/
1576	1959	private function handleAcceptQuoteForm(): void {
1577		- // Verify nonce
1578		- if (!wp_verify_nonce($_POST['quote_nonce'] ?? '', 'easy_invoice_quote_action')) {
1579		- wp_die(__('Security check failed.', 'easy-invoice'));
1580		- }
1581		-
1582	1960	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
1583		-
	1961	+
1584	1962	if ($quote_id <= 0) {
1585		- wp_die(__('Invalid quote ID.', 'easy-invoice'));
	1963	+ wp_die(esc_html__('Invalid quote ID.', 'easy-invoice'));
1586	1964	}
1587		-
1588		- // Get the quote
1589		- $quote = $this->quote_repository->find($quote_id);
1590		-
1591		- if (!$quote) {
1592		- wp_die(__('Quote not found.', 'easy-invoice'));
	1965	+
	1966	+ if (!wp_verify_nonce($_POST['quote_nonce'] ?? '', $this->quoteAcceptDeclineNonceAction($quote_id))) {
	1967	+ wp_die(esc_html__('Security check failed.', 'easy-invoice'));
1593	1968	}
1594		-
1595		- // Check if user has permission to accept this quote
	1969	+
1596	1970	$current_user = wp_get_current_user();
1597	1971	$is_admin = current_user_can('manage_options');
1598		-
1599		- if (!$is_admin) {
1600		- // For non-admins, check if they are the client
1601		- if ($quote->getClientId()) {
1602		- $client_repository = \EasyInvoice\Providers\ClientServiceProvider::getClientRepository();
1603		- $client = $client_repository->find($quote->getClientId());
1604		-
1605		- if (!$client || $client->getEmail() !== $current_user->user_email) {
1606		- wp_die(__('You do not have permission to accept this quote.', 'easy-invoice'));
1607		- }
1608		- } else {
1609		- wp_die(__('You do not have permission to accept this quote.', 'easy-invoice'));
1610		- }
	1972	+
	1973	+ if ($is_admin) {
	1974	+ $quote = $this->quote_repository->find($quote_id);
	1975	+ } else {
	1976	+ $quote = $this->quote_repository->findPublished($quote_id);
1611	1977	}
1612		-
	1978	+
	1979	+ if (!$quote) {
	1980	+ wp_die(esc_html__('Quote not found.', 'easy-invoice'));
	1981	+ }
	1982	+
	1983	+ // SECURITY (CVE-2026-9021): unconditional authorisation. See
	1984	+ // handleAcceptQuote (AJAX path) for full rationale.
	1985	+ if (!self::canActOnQuote($quote_id, $quote)) {
	1986	+ wp_die(esc_html__('You do not have permission to accept this quote.', 'easy-invoice'));
	1987	+ }
	1988	+
	1989	+ $ei_open = self::openForDecision($quote);
	1990	+ if (is_wp_error($ei_open)) {
	1991	+ wp_die(esc_html($ei_open->get_error_message()));
	1992	+ }
	1993	+
1613	1994	// Update quote status to accepted
1614	1995	$quote->setStatus('accepted');
1615		- $quote->setAcceptedDate(date('Y-m-d H:i:s'));
	1996	+ $quote->setAcceptedDate(gmdate('Y-m-d H:i:s'));
1616	1997	$quote->setAcceptedBy($current_user->ID);
1617		-
	1998	+
1618	1999	// Save the quote
1619	2000	$saved = $quote->save();
1620		-
	2001	+
1621	2002	if (!$saved) {
1622		- wp_die(__('Failed to accept quote.', 'easy-invoice'));
	2003	+ wp_die(esc_html__('Failed to accept quote.', 'easy-invoice'));
1623	2004	}
1624		-
	2005	+
1625	2006	// Send notification email to admin
1626	2007	if (!$is_admin) {
1627	2008	$this->sendQuoteAcceptanceNotification($quote);
1628	2009	}
1629		-
	2010	+
1630	2011	// Redirect back to the quote page with success message
1631	2012	$redirect_url = add_query_arg('action', 'accepted', get_permalink($quote_id));
1632		- wp_redirect($redirect_url);
	2013	+ wp_safe_redirect($redirect_url);
1633	2014	exit;
1634	2015	}
1635		-
	2016	+
1636	2017	/**
1637	2018	* Handle decline quote form submission
1638	2019	*
1639	2020	* @since 1.0.0
		@@ -1638,67 +2019,65 @@
1638	2019	*
1639	2020	* @since 1.0.0
1640	2021	*/
1641	2022	private function handleDeclineQuoteForm(): void {
1642		- // Verify nonce
1643		- if (!wp_verify_nonce($_POST['quote_nonce'] ?? '', 'easy_invoice_quote_action')) {
1644		- wp_die(__('Security check failed.', 'easy-invoice'));
1645		- }
1646		-
1647	2023	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
1648		-
	2024	+
1649	2025	if ($quote_id <= 0) {
1650		- wp_die(__('Invalid quote ID.', 'easy-invoice'));
	2026	+ wp_die(esc_html__('Invalid quote ID.', 'easy-invoice'));
1651	2027	}
1652		-
1653		- // Get the quote
1654		- $quote = $this->quote_repository->find($quote_id);
1655		-
1656		- if (!$quote) {
1657		- wp_die(__('Quote not found.', 'easy-invoice'));
	2028	+
	2029	+ if (!wp_verify_nonce($_POST['quote_nonce'] ?? '', $this->quoteAcceptDeclineNonceAction($quote_id))) {
	2030	+ wp_die(esc_html__('Security check failed.', 'easy-invoice'));
1658	2031	}
1659		-
1660		- // Check if user has permission to decline this quote
	2032	+
1661	2033	$current_user = wp_get_current_user();
1662	2034	$is_admin = current_user_can('manage_options');
1663		-
1664		- if (!$is_admin) {
1665		- // For non-admins, check if they are the client
1666		- if ($quote->getClientId()) {
1667		- $client_repository = \EasyInvoice\Providers\ClientServiceProvider::getClientRepository();
1668		- $client = $client_repository->find($quote->getClientId());
1669		-
1670		- if (!$client || $client->getEmail() !== $current_user->user_email) {
1671		- wp_die(__('You do not have permission to decline this quote.', 'easy-invoice'));
1672		- }
1673		- } else {
1674		- wp_die(__('You do not have permission to decline this quote.', 'easy-invoice'));
1675		- }
	2035	+
	2036	+ if ($is_admin) {
	2037	+ $quote = $this->quote_repository->find($quote_id);
	2038	+ } else {
	2039	+ $quote = $this->quote_repository->findPublished($quote_id);
1676	2040	}
1677		-
	2041	+
	2042	+ if (!$quote) {
	2043	+ wp_die(esc_html__('Quote not found.', 'easy-invoice'));
	2044	+ }
	2045	+
	2046	+ // SECURITY (CVE-2026-9021): unconditional authorisation. See
	2047	+ // handleAcceptQuote (AJAX path) for full rationale.
	2048	+ if (!self::canActOnQuote($quote_id, $quote)) {
	2049	+ wp_die(esc_html__('You do not have permission to decline this quote.', 'easy-invoice'));
	2050	+ }
	2051	+
	2052	+ $ei_open = self::openForDecision($quote);
	2053	+ if (is_wp_error($ei_open)) {
	2054	+ wp_die(esc_html($ei_open->get_error_message()));
	2055	+ }
	2056	+
1678	2057	// Update quote status to declined
1679	2058	$quote->setStatus('declined');
1680		- $quote->setDeclinedDate(date('Y-m-d H:i:s'));
	2059	+ $quote->setDeclinedDate(gmdate('Y-m-d H:i:s'));
1681	2060	$quote->setDeclinedBy($current_user->ID);
1682		-
	2061	+
1683	2062	// Save the quote
1684	2063	$saved = $quote->save();
1685		-
	2064	+
1686	2065	if (!$saved) {
1687		- wp_die(__('Failed to decline quote.', 'easy-invoice'));
	2066	+ wp_die(esc_html__('Failed to decline quote.', 'easy-invoice'));
1688	2067	}
1689		-
	2068	+
1690	2069	// Send notification email to admin
1691	2070	if (!$is_admin) {
1692	2071	$this->sendQuoteDeclineNotification($quote);
1693	2072	}
1694		-
	2073	+
1695	2074	// Redirect back to the quote page with success message
1696	2075	$redirect_url = add_query_arg('action', 'declined', get_permalink($quote_id));
1697		- wp_redirect($redirect_url);
	2076	+ wp_safe_redirect($redirect_url);
1698	2077	exit;
1699	2078	}
1700		-
	2079	+
1701	2080	/**
1702	2081	* Handle AJAX request for bulk quote actions
1703	2082	*
1704	2083	* @since 1.0.0
		@@ -1707,36 +2086,44 @@
1707	2086	// Verify nonce
1708	2087	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
1709	2088	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
1710	2089	}
1711		-
1712		- // Check permissions
1713		- if (!current_user_can('manage_options')) {
	2090	+
	2091	+ // Check permissions — gate at ei_create_quote (state transitions like
	2092	+ // trash/draft/restore). Permanent-delete actions are additionally
	2093	+ // gated below by ei_delete_quote per action.
	2094	+ if (!easy_invoice_user_can('ei_create_quote')) {
1714	2095	wp_send_json_error(['message' => __('You do not have permission to perform this action.', 'easy-invoice')]);
1715	2096	}
1716		-
	2097	+
1717	2098	$quote_ids = isset($_POST['quote_ids']) ? array_map('intval', $_POST['quote_ids']) : [];
1718	2099	$bulk_action = sanitize_text_field($_POST['bulk_action'] ?? '');
1719		-
	2100	+
	2101	+ // Per-action gate: permanent delete requires the stricter delete cap.
	2102	+ if (in_array($bulk_action, ['delete', 'permanent-delete', 'empty-trash'], true)
	2103	+ && !easy_invoice_user_can('ei_delete_quote')) {
	2104	+ wp_send_json_error(['message' => __('You do not have permission to delete quotes.', 'easy-invoice')]);
	2105	+ }
	2106	+
1720	2107	if (empty($quote_ids)) {
1721	2108	wp_send_json_error(['message' => __('No quotes selected.', 'easy-invoice')]);
1722	2109	}
1723		-
	2110	+
1724	2111	if (empty($bulk_action)) {
1725	2112	wp_send_json_error(['message' => __('No action selected.', 'easy-invoice')]);
1726	2113	}
1727		-
	2114	+
1728	2115	$success_count = 0;
1729	2116	$error_count = 0;
1730		-
	2117	+
1731	2118	foreach ($quote_ids as $quote_id) {
1732	2119	$quote = $this->quote_repository->find($quote_id);
1733		-
	2120	+
1734	2121	if (!$quote) {
1735	2122	$error_count++;
1736	2123	continue;
1737	2124	}
1738		-
	2125	+
1739	2126	try {
1740	2127	switch ($bulk_action) {
1741	2128	case 'delete':
1742	2129	if ($this->quote_repository->delete($quote_id)) {
		@@ -1745,9 +2132,9 @@
1745	2132	} else {
1746	2133	$error_count++;
1747	2134	}
1748	2135	break;
1749		-
	2136	+
1750	2137	case 'trash':
1751	2138	$old_status = $quote->getStatus();
1752	2139	$quote->setStatus('cancelled'); // Using cancelled as trash status
1753	2140	if ($quote->save()) {
		@@ -1756,9 +2143,9 @@
1756	2143	} else {
1757	2144	$error_count++;
1758	2145	}
1759	2146	break;
1760		-
	2147	+
1761	2148	case 'draft':
1762	2149	$old_status = $quote->getStatus();
1763	2150	$quote->setStatus('draft');
1764	2151	if ($quote->save()) {
		@@ -1767,9 +2154,9 @@
1767	2154	} else {
1768	2155	$error_count++;
1769	2156	}
1770	2157	break;
1771		-
	2158	+
1772	2159	case 'restore':
1773	2160	$old_status = $quote->getStatus();
1774	2161	$quote->setStatus('draft');
1775	2162	if ($quote->save()) {
		@@ -1778,9 +2165,9 @@
1778	2165	} else {
1779	2166	$error_count++;
1780	2167	}
1781	2168	break;
1782		-
	2169	+
1783	2170	default:
1784	2171	$error_count++;
1785	2172	break;
1786	2173	}
		@@ -1788,28 +2175,32 @@
1788	2175	$error_count++;
1789	2176	// Error in bulk action
1790	2177	}
1791	2178	}
1792		-
	2179	+
1793	2180	if ($error_count > 0) {
1794	2181	wp_send_json_success([
1795		- 'message' => sprintf(__('Processed %d quotes successfully. %d failed.', 'easy-invoice'), $success_count, $error_count),
	2182	+ /* translators: %1$d: number processed; %2$d: number failed. */
	2183	+ 'message' => sprintf(__('Processed %1$d quotes successfully. %2$d failed.', 'easy-invoice'), $success_count, $error_count),
1796	2184	'toast' => [
1797	2185	'type' => 'warning',
1798		- 'message' => sprintf(__('Processed %d quotes successfully. %d failed.', 'easy-invoice'), $success_count, $error_count)
	2186	+ /* translators: %1$d: number processed; %2$d: number failed. */
	2187	+ 'message' => sprintf(__('Processed %1$d quotes successfully. %2$d failed.', 'easy-invoice'), $success_count, $error_count)
1799	2188	]
1800	2189	]);
1801	2190	} else {
1802	2191	wp_send_json_success([
	2192	+ /* translators: %d: number processed. */
1803	2193	'message' => sprintf(__('Successfully processed %d quotes.', 'easy-invoice'), $success_count),
1804	2194	'toast' => [
1805	2195	'type' => 'success',
	2196	+ /* translators: %d: number processed. */
1806	2197	'message' => sprintf(__('Successfully processed %d quotes.', 'easy-invoice'), $success_count)
1807	2198	]
1808	2199	]);
1809	2200	}
1810	2201	}
1811		-
	2202	+
1812	2203	/**
1813	2204	* Handle AJAX request to trash a quote
1814	2205	*
1815	2206	* @since 1.0.0
		@@ -1818,34 +2209,34 @@
1818	2209	// Verify nonce
1819	2210	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
1820	2211	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
1821	2212	}
1822		-
1823		- // Check permissions
1824		- if (!current_user_can('manage_options')) {
	2213	+
	2214	+ // Check permissions — trash is reversible, gated at the create-quote cap.
	2215	+ if (!easy_invoice_user_can('ei_create_quote')) {
1825	2216	wp_send_json_error(['message' => __('You do not have permission to perform this action.', 'easy-invoice')]);
1826	2217	}
1827		-
	2218	+
1828	2219	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
1829		-
	2220	+
1830	2221	if ($quote_id <= 0) {
1831	2222	wp_send_json_error(['message' => __('Invalid quote ID.', 'easy-invoice')]);
1832	2223	}
1833		-
	2224	+
1834	2225	$quote = $this->quote_repository->find($quote_id);
1835		-
	2226	+
1836	2227	if (!$quote) {
1837	2228	wp_send_json_error(['message' => __('Quote not found.', 'easy-invoice')]);
1838	2229	}
1839		-
	2230	+
1840	2231	// Set status to cancelled before moving to trash
1841	2232	$old_status = $quote->getStatus();
1842	2233	$quote->setStatus('cancelled');
1843	2234	$quote->save();
1844		-
	2235	+
1845	2236	// Move the post to trash status
1846	2237	$result = wp_trash_post($quote_id);
1847		-
	2238	+
1848	2239	if ($result) {
1849	2240	$this->quote_log_service->logStatusChange($quote_id, $old_status, 'cancelled');
1850	2241	wp_send_json_success([
1851	2242	'message' => __('Quote moved to trash successfully.', 'easy-invoice'),
		@@ -1857,9 +2248,9 @@
1857	2248	} else {
1858	2249	wp_send_json_error(['message' => __('Failed to move quote to trash.', 'easy-invoice')]);
1859	2250	}
1860	2251	}
1861		-
	2252	+
1862	2253	/**
1863	2254	* Handle AJAX request to move a quote to draft
1864	2255	*
1865	2256	* @since 1.0.0
		@@ -1868,30 +2259,30 @@
1868	2259	// Verify nonce
1869	2260	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
1870	2261	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
1871	2262	}
1872		-
1873		- // Check permissions
1874		- if (!current_user_can('manage_options')) {
	2263	+
	2264	+ // Check permissions — moving to draft is an edit, not a delete.
	2265	+ if (!easy_invoice_user_can('ei_create_quote')) {
1875	2266	wp_send_json_error(['message' => __('You do not have permission to perform this action.', 'easy-invoice')]);
1876	2267	}
1877		-
	2268	+
1878	2269	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
1879		-
	2270	+
1880	2271	if ($quote_id <= 0) {
1881	2272	wp_send_json_error(['message' => __('Invalid quote ID.', 'easy-invoice')]);
1882	2273	}
1883		-
	2274	+
1884	2275	$quote = $this->quote_repository->find($quote_id);
1885		-
	2276	+
1886	2277	if (!$quote) {
1887	2278	wp_send_json_error(['message' => __('Quote not found.', 'easy-invoice')]);
1888	2279	}
1889		-
	2280	+
1890	2281	// Set status to draft
1891	2282	$old_status = $quote->getStatus();
1892	2283	$quote->setStatus('draft');
1893		-
	2284	+
1894	2285	if ($quote->save()) {
1895	2286	$this->quote_log_service->logStatusChange($quote_id, $old_status, 'draft');
1896	2287	wp_send_json_success([
1897	2288	'message' => __('Quote moved to draft successfully.', 'easy-invoice'),
		@@ -1903,9 +2294,9 @@
1903	2294	} else {
1904	2295	wp_send_json_error(['message' => __('Failed to move quote to draft.', 'easy-invoice')]);
1905	2296	}
1906	2297	}
1907		-
	2298	+
1908	2299	/**
1909	2300	* Handle AJAX request to restore a trashed quote
1910	2301	*
1911	2302	* @since 1.0.0
		@@ -1914,34 +2305,34 @@
1914	2305	// Verify nonce
1915	2306	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
1916	2307	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
1917	2308	}
1918		-
1919		- // Check permissions
1920		- if (!current_user_can('manage_options')) {
	2309	+
	2310	+ // Check permissions — restoring from trash is an edit operation.
	2311	+ if (!easy_invoice_user_can('ei_create_quote')) {
1921	2312	wp_send_json_error(['message' => __('You do not have permission to perform this action.', 'easy-invoice')]);
1922	2313	}
1923		-
	2314	+
1924	2315	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
1925		-
	2316	+
1926	2317	if ($quote_id <= 0) {
1927	2318	wp_send_json_error(['message' => __('Invalid quote ID.', 'easy-invoice')]);
1928	2319	}
1929		-
	2320	+
1930	2321	$quote = $this->quote_repository->find($quote_id);
1931		-
	2322	+
1932	2323	if (!$quote) {
1933	2324	wp_send_json_error(['message' => __('Quote not found.', 'easy-invoice')]);
1934	2325	}
1935		-
	2326	+
1936	2327	// Restore the post from trash
1937	2328	$result = wp_untrash_post($quote_id);
1938		-
	2329	+
1939	2330	if ($result) {
1940	2331	// After restoring from trash, set the meta status to available
1941	2332	$quote->setStatus('available');
1942	2333	$quote->save();
1943		-
	2334	+
1944	2335	$this->quote_log_service->logRestoration($quote_id);
1945	2336	wp_send_json_success([
1946	2337	'message' => __('Quote restored successfully.', 'easy-invoice'),
1947	2338	'toast' => [
		@@ -1952,9 +2343,9 @@
1952	2343	} else {
1953	2344	wp_send_json_error(['message' => __('Failed to restore quote.', 'easy-invoice')]);
1954	2345	}
1955	2346	}
1956		-
	2347	+
1957	2348	/**
1958	2349	* Handle AJAX request to empty trash
1959	2350	*
1960	2351	* @since 1.0.0
		@@ -1964,30 +2355,30 @@
1964	2355	// Verify nonce
1965	2356	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_nonce')) {
1966	2357	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
1967	2358	}
1968		-
1969		- // Check permissions
1970		- if (!current_user_can('manage_options')) {
	2359	+
	2360	+ // Check permissions — emptying trash permanently deletes quotes.
	2361	+ if (!easy_invoice_user_can('ei_delete_quote')) {
1971	2362	wp_send_json_error(['message' => __('You do not have permission to perform this action.', 'easy-invoice')]);
1972	2363	}
1973		-
	2364	+
1974	2365	// Get all quotes in trash (post_status = 'trash')
1975	2366	global $wpdb;
1976	2367	$quote_ids = $wpdb->get_col($wpdb->prepare(
1977		- "SELECT ID FROM {$wpdb->posts}
1978		- WHERE post_type = %s
	2368	+ "SELECT ID FROM {$wpdb->posts}
	2369	+ WHERE post_type = %s
1979	2370	AND post_status = 'trash'",
1980	2371	PostTypes::EASY_INVOICE_QUOTE_POST_TYPE
1981	2372	));
1982		-
	2373	+
1983	2374	if (empty($quote_ids)) {
1984	2375	wp_send_json_error(['message' => __('No quotes found in trash.', 'easy-invoice')]);
1985	2376	}
1986		-
	2377	+
1987	2378	$success_count = 0;
1988	2379	$error_count = 0;
1989		-
	2380	+
1990	2381	foreach ($quote_ids as $quote_id) {
1991	2382	if (wp_delete_post($quote_id, true)) {
1992	2383	$this->quote_log_service->logDeletion($quote_id);
1993	2384	$success_count++;
		@@ -1994,31 +2385,35 @@
1994	2385	} else {
1995	2386	$error_count++;
1996	2387	}
1997	2388	}
1998		-
	2389	+
1999	2390	if ($error_count > 0) {
2000	2391	wp_send_json_success([
2001		- 'message' => sprintf(__('Emptied trash: %d quotes deleted successfully, %d failed.', 'easy-invoice'), $success_count, $error_count),
	2392	+ /* translators: %1$d: number processed; %2$d: number failed. */
	2393	+ 'message' => sprintf(__('Emptied trash: %1$d quotes deleted successfully, %2$d failed.', 'easy-invoice'), $success_count, $error_count),
2002	2394	'success_count' => $success_count,
2003	2395	'error_count' => $error_count,
2004	2396	'toast' => [
2005	2397	'type' => 'warning',
2006		- 'message' => sprintf(__('Emptied trash: %d quotes deleted successfully, %d failed.', 'easy-invoice'), $success_count, $error_count)
	2398	+ /* translators: %1$d: number processed; %2$d: number failed. */
	2399	+ 'message' => sprintf(__('Emptied trash: %1$d quotes deleted successfully, %2$d failed.', 'easy-invoice'), $success_count, $error_count)
2007	2400	]
2008	2401	]);
2009	2402	} else {
2010	2403	wp_send_json_success([
	2404	+ /* translators: %d: number processed. */
2011	2405	'message' => sprintf(__('Successfully emptied trash: %d quotes deleted.', 'easy-invoice'), $success_count),
2012	2406	'success_count' => $success_count,
2013	2407	'error_count' => 0,
2014	2408	'toast' => [
2015	2409	'type' => 'success',
	2410	+ /* translators: %d: number processed. */
2016	2411	'message' => sprintf(__('Successfully emptied trash: %d quotes deleted.', 'easy-invoice'), $success_count)
2017	2412	]
2018	2413	]);
2019	2414	}
2020		-
	2415	+
2021	2416	} catch (\Exception $e) {
2022	2417	error_log('Error emptying quote trash: ' . $e->getMessage());
2023	2418	wp_send_json_error([
2024	2419	'message' => __('Failed to empty trash.', 'easy-invoice'),
		@@ -2025,9 +2420,9 @@
2025	2420	'debug' => $e->getMessage()
2026	2421	]);
2027	2422	}
2028	2423	}
2029		-
	2424	+
2030	2425	/**
2031	2426	* Handle AJAX request to get quote logs
2032	2427	*
2033	2428	* @since 1.0.0
		@@ -2036,23 +2431,23 @@
2036	2431	// Verify nonce
2037	2432	if (!wp_verify_nonce($_POST['nonce'] ?? '', 'easy_invoice_admin_nonce')) {
2038	2433	wp_send_json_error(['message' => __('Security check failed.', 'easy-invoice')]);
2039	2434	}
2040		-
2041		- // Check permissions
2042		- if (!current_user_can('manage_options')) {
	2435	+
	2436	+ // Check permissions — viewing quote activity log.
	2437	+ if (!easy_invoice_user_can('ei_view_quotes')) {
2043	2438	wp_send_json_error(['message' => __('You do not have permission to perform this action.', 'easy-invoice')]);
2044	2439	}
2045		-
	2440	+
2046	2441	$quote_id = isset($_POST['quote_id']) ? (int) $_POST['quote_id'] : 0;
2047		-
	2442	+
2048	2443	if ($quote_id <= 0) {
2049	2444	wp_send_json_error(['message' => __('Invalid quote ID.', 'easy-invoice')]);
2050	2445	}
2051		-
	2446	+
2052	2447	try {
2053	2448	$logs = $this->quote_log_service->getLogs($quote_id);
2054		-
	2449	+
2055	2450	// Convert QuoteLog objects to arrays for JSON response
2056	2451	$logs_data = [];
2057	2452	foreach ($logs as $log) {
2058	2453	$logs_data[] = [
		@@ -2065,14 +2460,14 @@
2065	2460	'additional_data' => $log->getAdditionalData(),
2066	2461	'created_date' => $log->getCreatedDate(),
2067	2462	];
2068	2463	}
2069		-
	2464	+
2070	2465	wp_send_json_success([
2071	2466	'logs' => $logs_data,
2072	2467	'count' => count($logs_data)
2073	2468	]);
2074		-
	2469	+
2075	2470	} catch (\Exception $e) {
2076	2471	wp_send_json_error([
2077	2472	'message' => __('Error retrieving quote logs.', 'easy-invoice'),
2078	2473	'debug' => $e->getMessage()
		@@ -2078,9 +2473,9 @@
2078	2473	'debug' => $e->getMessage()
2079	2474	]);
2080	2475	}
2081	2476	}
2082		-
	2477	+
2083	2478	/**
2084	2479	* Format currency amount using QuoteFormatter
2085	2480	*
2086	2481	* @param float $amount The amount to format
		@@ -2090,5 +2485,5 @@
2090	2485	private function formatCurrency(float $amount, $quote = null): string {
2091	2486	$formatter = new \EasyInvoice\Helpers\QuoteFormatter($quote);
2092	2487	return $formatter->format($amount);
2093	2488	}
2094		-}
	2489	+}