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/mergers/DefaultMerger.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/inc/managers/queue/mergers/DefaultMerger.php b/inc/managers/queue/mergers/DefaultMerger.php
index 9eaf6ae..7cae0b2 100644
--- a/inc/managers/queue/mergers/DefaultMerger.php
+++ b/inc/managers/queue/mergers/DefaultMerger.php
@@ -26,7 +26,7 @@
public function merge(Operation $existing, Operation $incoming): Operation
{
foreach ((array) $this->chunkKey as $key) {
- $existing->requestData[$key] = array_merge(
+ $existing->requestData[$key] = array_replace(
$existing->requestData[$key] ?? [],
$incoming->requestData[$key] ?? []
);
@@ -35,4 +35,8 @@
$existing->totalItems += $incoming->totalItems;
return $existing;
}
+ public function matchCriteria(Operation $incoming): array
+ {
+ return [];
+ }
}
--
Gitblit v1.10.0