=Cleaning up the Square integration (still a bit more to do yet). Also majo...

Jake Vanderwerf

2026-07-05 fff721dd185f5b97f7ae7a6e64189e55887ff590

 JVBase.php

@@ -11,7 +11,7 @@
use JVBase\managers\LoginManager;
use JVBase\managers\MagicLinkManager;
use JVBase\managers\queue\Queue;
use JVBase\managers\DashboardManager;
use JVBase\managers\Dashboard\DashboardManager;
use JVBase\managers\DirectoryManager;
use JVBase\managers\ReferralManager;
use JVBase\managers\RoleManager;
@@ -47,6 +47,7 @@
use JVBase\rest\routes\AdminRoutes;
use JVBase\rest\routes\IntegrationsRoutes;
use JVBase\base\SchemaHelper;
use UserRoutes;

if (!defined('ABSPATH')) {
   exit;
@@ -120,10 +121,11 @@
         'queue' => new QueueRoutes(),
         'settings' => new SettingsRoutes(),
         'upload' => new UploadRoutes(),
         'forms' => new FormRoutes()
         'forms' => new FormRoutes(),
         'user'   => new UserRoutes()
      ];

      if (Site::has('magicLink')) {
      if (Site::has('magic_link')) {
//       $this->routes['magicLink'] = new MagicLinkRoutes();
         $this->managers['magicLink'] = new MagicLinkManager();
      }
@@ -132,9 +134,6 @@
         $this->routes['referral'] = new ReferralRoutes();
      }

      if (Site::has('dashboard')) {
         $this->managers['dash'] = new DashboardManager();
      }

      if (Site::hasIntegration('square')) {
         $this->routes['square'] = new IntegrationsSquareRoutes();
@@ -151,7 +150,7 @@
         $this->managers['notifications'] = new NotificationManager();
         $this->routes['notifications'] = new NotificationsRoutes();
      }
      if (!empty(Registrar::getFeatured('approve_new'))) {
      if (!empty(Registrar::withFeature('approve_new'))) {
         $this->managers['approvals'] = new ApprovalManager();
      }
      if (Site::has('feed_block') || Site::has('dashboard')) {
@@ -183,13 +182,13 @@
      if ($membership && $membership->has('invitable')) {
         $this->managers['invitations'] = new InvitationsManager();
      }
      if (!empty(Registrar::getFeatured('has_responses'))) {
      if (!empty(Registrar::withFeature('has_responses'))) {
         $this->routes['comments'] = new ResponseRoutes();
      }
      if (!empty(Registrar::getFeatured('karma'))) {
      if (!empty(Registrar::withFeature('karma'))) {
         $this->routes['vote'] = new VoteRoutes();
      }
      if (!empty(Registrar::getFeatured('karma'))
      if (!empty(Registrar::withFeature('karma'))
         || ($membership && $membership->has('member_verified')) ||
            ($membership && $membership->has('term_approval'))) {
         $this->routes['approvals'] = new ApprovalRoutes();
@@ -198,6 +197,11 @@
         $this->routes['invites'] = new Invitations();
      }


      if (Site::has('dashboard')) {
         $this->managers['dash'] = new DashboardManager();
      }

      $this->setupIntegrations();

      add_action('wp_footer', [$this, 'additionalActions']);
@@ -210,7 +214,7 @@
   protected function setupIntegrations(): void
   {
        foreach(array_keys(Site::getIntegrations()) as $integration) {
            $this->integrations[$integration] = new $this->serviceMap[$integration]();
            $this->integrations[$integration] = $this->serviceMap[$integration]::getInstance();
        }
   }

@@ -219,6 +223,11 @@
      return array_merge(array_keys($this->content), array_keys($this->taxonomies));
   }

   public function favourites(): FavouritesManager|false
   {
      return $this->managers['favourites'] ?? false;
   }

   public function dashboard(): DashboardManager|false
   {
      return $this->managers['dash'] ?? false;
@@ -295,7 +304,7 @@
         if (!array_key_exists($service, $this->integrations)) {
            return null;
         }
         return new $this->serviceMap[$service]($userID);
         return $this->serviceMap[$service]::getInstance($userID);
      }
      return (array_key_exists($service, $this->integrations)) ? $this->integrations[$service] : null;
   }
@@ -367,10 +376,10 @@
         ?>
         <section class="main-actions">
            <div class="buttons col">
               <?= implode($buttons); ?>
               <?= implode('', $buttons); ?>
            </div>
            <div class="actions">
               <?= implode($contents); ?>
               <?= implode('', $contents); ?>
            </div>
         </section>
         <?php