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/registrar/config/Integration.php | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/inc/registrar/config/Integration.php b/inc/registrar/config/Integration.php
index 8723e71..cab3a4c 100644
--- a/inc/registrar/config/Integration.php
+++ b/inc/registrar/config/Integration.php
@@ -2,7 +2,7 @@
namespace JVBase\registrar\config;
use JVBase\registrar\Registrar;
-use JVBase\utility\Features;
+use JVBase\base\Site;
if (!defined('ABSPATH')) {
exit;
@@ -13,7 +13,7 @@
* @var string Must match as defined in the JVBase\integrations namespace
*/
protected string $service_name;
- protected string $content_type;
+ protected ?string $content_type = null;
/**
* @var bool Whether to send to the integration on publish
*/
@@ -31,25 +31,35 @@
public function __construct(string $service) {
- if (!Features::hasIntegration($service)) {
+ if (!Site::hasIntegration($service)) {
error_log('Could not link with integration, as it is not enabled: '.$service);
return;
}
$this->service_name = $service;
}
+
public function getService_name():string
{
return $this->service_name;
}
/**
- * @param string $content must match what integration expects
+ * @param ?string $content must match what integration expects
* @return self
*/
- public function setContent_type(string $content):self
+ public function setContentType(?string $content):self
{
- $allowed = JVB()->connect($this->service_name)->allowedContent();
+ if (is_null($content)) {
+ return $this;
+ }
+ $connection = JVB()->connect($this->service_name);
+ if (!$connection){
+ error_log('[Integration]::setContentType Service is not setup. '.$this->service_name);
+ return $this;
+ }
+
+ $allowed = $connection->getAllowedContent();
if (!in_array($content, $allowed)) {
error_log($this->service_name.' Connection does not support this content: '.$content);
return $this;
@@ -58,7 +68,7 @@
return $this;
}
- public function getContentType():string
+ public function getContentType():?string
{
return $this->content_type;
}
@@ -86,6 +96,8 @@
public function setCustomer(bool $set):self
{
$this->isCustomer = $set;
+// JVB()->connect($this->service_name)->addCustomerFields();
+
return $this;
}
public function isCustomer():bool
--
Gitblit v1.10.0