From fff721dd185f5b97f7ae7a6e64189e55887ff590 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 05 Jul 2026 18:36:57 +0000
Subject: [PATCH] =Cleaning up the Square integration (still a bit more to do yet). Also majorly overhauled /rest/ files to ignore a rest request 'user' paramater, and rely on get_current_user_id() instead.

---
 inc/managers/queue/Operation.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/inc/managers/queue/Operation.php b/inc/managers/queue/Operation.php
index 0ba6e23..ac6a3fc 100644
--- a/inc/managers/queue/Operation.php
+++ b/inc/managers/queue/Operation.php
@@ -21,7 +21,7 @@
 	public string $priority = 'normal';
 
 	public string $state = 'pending';
-	public ?string $outcome = null;
+	public ?string $outcome = 'pending';
 
 	public int $retries = 0;
 	public ?string $lastErrorHash = null;
@@ -32,5 +32,6 @@
 	public ?string $completedAt = null;
 
 	public ?array $result = null;
+	public ?string $merged_into = null;
 	public bool $userDismissed = false;
 }

--
Gitblit v1.10.0