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.
---
base/Site.php | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/base/Site.php b/base/Site.php
index e082012..49df15e 100644
--- a/base/Site.php
+++ b/base/Site.php
@@ -1,8 +1,6 @@
<?php
namespace JVBase\base;
-use JVBase\base\Login;
-
if (!defined('ABSPATH')) {
exit;
}
@@ -46,6 +44,7 @@
* @var bool $magic_link Whether users can login without a password
*/
protected static bool $magic_link = true;
+ protected static string $defaultRole = 'subscriber';
/**
* @var bool $support Whether to implement the support ticket system
*/
@@ -64,6 +63,10 @@
*/
protected static bool $limit_hours = false;
/**
+ * @var bool $has_hours Whether this site has business hours
+ */
+ protected static bool $has_hours = false;
+ /**
* @var bool $enthusiast Whether to scaffold enthusiasts (users that can interact with and save favourites)
*/
protected static bool $enthusiast = false;
@@ -92,7 +95,7 @@
public static function getInstance():Site {
if (!isset(self::$instance)) {
self::$instance = new self();
- do_action('jvbLoadDefinitions');
+ do_action('jvb_define_site');
}
return self::$instance;
}
@@ -240,12 +243,20 @@
return self::$directory_plural ?? false;
}
- public static function setDefaultReferralRole(string $role):void
+ public static function setReferralRole(string $role):void
{
- self::$defaultReferralRole = $role;
+ self::$defaultReferralRole = jvbCheckBase($role);
}
- public static function getDefaultReferralRole():string
+ public static function getReferralRole():string
{
return self::$defaultReferralRole;
}
+ public static function setDefaultRole(string $role):void
+ {
+ self::$defaultRole = jvbCheckBase($role);
+ }
+ public static function getDefaultRole():string
+ {
+ return self::$defaultRole;
+ }
}
--
Gitblit v1.10.0