From df6c00db050e188a6bd5707e72c4f1f331ced923 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 08 Feb 2026 20:46:43 +0000
Subject: [PATCH] =Port over to jakevan 2
---
inc/integrations/Square.php | 469 ++++++++++++++++++++++++----------------------------------
1 files changed, 196 insertions(+), 273 deletions(-)
diff --git a/inc/integrations/Square.php b/inc/integrations/Square.php
index e0c73c5..8c0f234 100644
--- a/inc/integrations/Square.php
+++ b/inc/integrations/Square.php
@@ -6,6 +6,9 @@
use Exception;
use JVBase\registry\PostTypeRegistrar;
use WP_Error;
+use JVBase\ui\Checkout;
+use JVBase\managers\queue\TypeConfig;
+use JVBase\managers\queue\executors\IntegrationExecutor;
if (!defined('ABSPATH')) {
exit;
@@ -843,229 +846,95 @@
if (!$this->isSetUp()) {
return;
}
- // User login tracking for security
- add_action('wp_login', [$this, 'trackUserLogin'], 10, 2);
- // Enqueue checkout scripts
+ add_action('wp_login', [$this, 'trackUserLogin'], 10, 2);
add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
- add_filter('jvbAdditionalActions', [$this, 'outputCheckout']);
- }
+ // Shared checkout UI (replaces outputCheckout)
+ add_filter('jvbAdditionalActions', [Checkout::class, 'render']);
-
- public function outputCheckout(array $actions):array {
- if (is_singular(BASE.'dash') || is_post_type_archive(BASE.'dash')) {
- return $actions;
- }
- $form = '<aside id="cart" class="right main">
- <form id="checkout" data-form-id="checkout" data-save="checkout">';
-
- $tabs = [
- 'cartItems' => [
- 'title' => 'Your Order',
- 'icon' => 'cart',
- 'description' => 'Here\'s your order. You can change quantities, remove items, or clear your cart.',
- 'content' => $this->cartContent()
- ],
- 'checkout' => [
- 'title' => 'Checkout',
- 'icon' => 'checkout',
- 'description' => 'Securely checkout with your name, email, and payments processed by Square.',
- 'content' => '<div class="checkout-section">
- <h3>Customer Information</h3>
- '.Form::render('cart_name', null, [
- 'type' => 'text',
- 'label' => 'Your Name',
- 'required' => true,
- 'autocomplete' => 'name'
- ]).
- Form::render('cart_email', null, [
- 'type' => 'email',
- 'label' => 'Your Email',
- 'required' => true,
- 'autocomplete'=> 'email',
- ]).
- Form::render('cart_phone', null, [
- 'type' => 'tel',
- 'label' => 'Your Phone',
- 'required' => true,
- 'autocomplete'=> 'phone'
- ]).'
- <h3>Pickup Details</h3>'.
- Form::render('pickup_time', null, [
- 'type' => 'datetime',
- 'label' => 'Pickup Type',
- 'min' => '11:00',
- 'max' => '20:00',
- 'required' => true,
- ]).
- Form::render('special_instructions', null, [
- 'type' => 'textarea',
- 'label' => 'Special Instructions',
- 'quill' => true,
- ]).'
- <textarea name="special_instructions" placeholder="Special instructions or dietary notes"></textarea>
- </div>
-
- <div class="checkout-section">
- <h3>Payment Information</h3>
- <div id="saved-cards"></div>
- <div id="square-card-container"></div>
- </div>'
- ],
- 'order' => [
- 'title' => 'Your Order',
- 'icon' => 'truck',
- 'hidden' => true,
- 'description' => '',
- 'content' => $this->renderOrderStatus()
- ]
- ];
- $form .= jvbRenderTabs($tabs, true);
-
- $form .= '<div class="cart-total row end"><p class="tax">Tax: <span></span></p><p class="total">GRAND TOTAL: <span></span></p></div>
- </form>
- </aside>
- <template class="restoredCart">
- <div class="restored">
- <h3>Looks like we left things hanging</h3>
- <p>We\'ve restored your cart from your last session below.</p>
- <p>If you\'d rather start over, click the button below.</p>
- <div class="row btw">
- <button type="button" onclick="window.squareCheckout.clearCart();this.closest(\'.restored\').remove()">'.jvbIcon('trash').'Clear Cart</button>
- <button type="button" onclick="this.closest(\'.restored\').remove()">'.jvbIcon('x').'Dismiss</button>
- </div>
- </div>
- </template>
- <template class="cartItem">
- <tr class="item">
- <td class="item">
- <label for="quantity"></label>
- <div class="quantity field" data-min="0" data-max="50" data-step="1" data-price="17" data-id="">
-
- <button type="button" class="decrease"aria-label="Decrease Add to Order">'.jvbIcon('minus-square').'</button>
-
- <input type="number" id="quantity" name="quantity" value="0" min="0" max="50" step="1" class="quantity-input">
-
- <button type="button" class="increase" aria-label="Increase Add to Order">'.jvbIcon('plus-square').'</button>
- </div>
- </td>
- <td class="price">
- <span class="price"></span>
- </td>
- <td class="total">
- <span class="total"></span>
- </td>
- <td>
- <button type="button" data-remove-from-cart>'.jvbIcon('trash').'</button>
- </td>
- </tr>
- </template>
- <template class="emptyCart">
- <div class="empty">
- <p><i><b>No items in cart.</b></i></p>
- <p>You can <a href="'.get_post_type_archive_link(BASE.'menu_item').'" title="Browse our menu">browse our menu</a> to order.</p>
- </div>
- </template>';
-
-
- $actions[] = [
- 'button' => '<button type="button" class="toggle-cart row" title="Your Cart" data-action="toggle-cart" aria-label="Open Cart" aria-controls="checkout" aria-expanded="false">
- '.jvbIcon('shopping-cart').'<span class="abs"></span><span class="abs count"></span>
- </button>',
- 'content' => $form
- ];
- return $actions;
- }
-
- private function cartContent():string
- {
- ob_start();
- ?>
- <div class="cart-items">
- <table>
- <thead>
- <tr>
- <th scope="col">Item</th>
- <th scope="col">Price</th>
- <th scope="col">Total</th>
- </tr>
- </thead>
- <tbody>
-
- </tbody>
- </table>
- </div>
-
- <details class="account">
- <summary>
- <?php
- if (is_user_logged_in()) {
- echo 'Your Favourites and Order History';
- } else {
- echo '<a href="'.wp_login_url(get_the_permalink()).'">Log in</a> to save your favourites and view order history.';
- }
- ?>
- </summary>
- <?php
- if (is_user_logged_in()) {
- $tabs = [
- 'history' => [
- 'title' => 'Order History',
- 'icon' => 'checkout',
- 'description' => 'View your past orders and quickly reorder',
- 'content' => $this->renderOrderHistory()
- ],
- 'favourites' => [
- 'title' => 'Favourites',
- 'icon' => 'heart',
- 'description' => 'View your favourites from our menu',
- 'content' => $this->renderFavourites()
- ]
- ];
- jvbRenderTabs($tabs);
+ // Square-specific checkout description
+ add_filter('jvb_checkout_description', function (string $desc, string $provider) {
+ if ($provider === 'square') {
+ return 'Securely checkout with your name, email, and payments processed by Square.';
}
+ return $desc;
+ }, 10, 2);
- ?>
- </details>
+ // Square-specific pickup fields (extracted from old outputCheckout)
+ add_filter('jvb_checkout_fields', [$this, 'addPickupFields'], 10, 2);
- <?php
- return ob_get_clean();
+ // Browse URL for this client (restaurant menu)
+ add_filter('jvb_checkout_browse_url', function () {
+ return get_post_type_archive_link(BASE . 'menu_item');
+ });
+ add_filter('jvb_checkout_browse_text', function () {
+ return 'browse our menu';
+ });
+
+ // Register queue executor types
+ $this->registerQueueTypes();
}
- private function renderOrderHistory():string
+ /**
+ * Pickup/ordering fields for the shared checkout form.
+ * Specific to this Square client's food ordering use case.
+ */
+ public function addPickupFields(string $html, string $provider): string
{
- ob_start();
- //TODO: getRequest, cache for 1 day
- return ob_get_clean();
- }
- private function renderFavourites():string
- {
- ob_start();
- //TODO: get user's favourites and list them
- return ob_get_clean();
+ if ($provider !== 'square') {
+ return $html;
+ }
+
+ return $html
+ . '<h3>Pickup Details</h3>'
+ . Form::render('pickup_time', null, [
+ 'type' => 'datetime',
+ 'label' => 'Pickup Time',
+ 'min' => '11:00',
+ 'max' => '20:00',
+ 'required' => true,
+ ])
+ . Form::render('special_instructions', null, [
+ 'type' => 'textarea',
+ 'label' => 'Special Instructions',
+ 'quill' => true,
+ ]);
}
- protected function renderOrderStatus():string
+ protected function registerQueueTypes(): void
{
- ob_start();
- ?>
- <div class="order-confirmation">
- <h2>Order Confirmed!</h2>
- <div id="order-status" data-order="">
- <p>Order #<span class="order-num"></span></p>
- <div class="status-timeline">
- <div class="status-item active" data-status="received">Order Received</div>
- <div class="status-item" data-status="preparing">Preparing</div>
- <div class="status-item" data-status="ready">Ready for Pickup</div>
- </div>
- <div class="pickup-time">
- Estimated pickup: <span id="eta">Calculating...</span>
- </div>
- </div>
- </div>
- <?php
- return ob_get_clean();
+ $queue = JVB()->queue();
+ $executor = new IntegrationExecutor();
+
+ $queue->registry()->register('square_sync_to', new TypeConfig(
+ executor: $executor,
+ chunkKey: 'items',
+ chunkSize: 50,
+ maxRetries: 3
+ ));
+
+ $queue->registry()->register('square_delete_from', new TypeConfig(
+ executor: $executor,
+ chunkKey: 'external_ids',
+ chunkSize: 200,
+ maxRetries: 2
+ ));
+
+ $queue->registry()->register('square_sync_from', new TypeConfig(
+ executor: $executor,
+ maxRetries: 3
+ ));
+
+ $queue->registry()->register('square_sync_customer', new TypeConfig(
+ executor: $executor,
+ maxRetries: 2
+ ));
+
+ $queue->registry()->register('square_import', new TypeConfig(
+ executor: $executor,
+ maxRetries: 3
+ ));
}
/******************************************************************
@@ -1077,13 +946,12 @@
*/
protected function handleTheSavePost(int $postID, \WP_Post $post, bool $update, array $settings): void
{
- // Queue the sync operation
- $this->queueOperation('sync_to_square', [
- 'items' => [$postID],
- 'user_id' => $this->userID
+ $this->queueOperation('sync_to', [
+ 'items' => [$postID],
+ 'user_id' => $this->userID,
], [
'priority' => 'high',
- 'delay' => 30, // Small delay to batch multiple saves
+ 'delay' => 30,
]);
update_post_meta($postID, BASE . '_square_sync_status', 'queued');
@@ -1097,40 +965,35 @@
$square_id = get_post_meta($postID, BASE . '_square_catalog_id', true);
if ($square_id) {
- $this->queueOperation('delete_from_square', [
- 'square_ids' => [$square_id],
- 'post_id' => $postID
+ $this->queueOperation('delete_from', [
+ 'external_ids' => [$square_id],
+ 'post_id' => $postID,
], [
- 'priority' => 'high'
+ 'priority' => 'high',
]);
}
}
/**
- * Process queued operations
+ * @deprecated IntegrationExecutor handles new operations via registerQueueTypes().
+ * Kept for legacy-typed operations ('square_sync_to_square') already queued.
+ * Safe to remove once all legacy operations have been processed.
*/
public function processOperation(WP_Error|array $result, object $operation, array $data): WP_Error|array
{
- $base = strtolower($this->service_name).'_';
- $square = (array_key_exists('user', $data)) ? new self((int)$data['user']) : $this;
- switch ($operation->type) {
- case $base.'sync_to_square':
- return $square->processSyncToSquare($data);
+ $base = strtolower($this->service_name) . '_';
+ $square = array_key_exists('user', $data) ? new self((int) $data['user']) : $this;
- case $base.'delete_from_square':
- return $square->processDeleteFromSquare($data);
-
- case $base.'sync_from_square':
- return $square->processSyncFromSquare($data);
-
- case $base.'sync_customer':
- return $square->processSyncCustomer($data);
-
- default:
- return $result;
- }
+ return match ($operation->type) {
+ $base . 'sync_to_square' => $square->processSyncToSquare($data),
+ $base . 'delete_from_square' => $square->processDeleteFromSquare($data),
+ $base . 'sync_from_square' => $square->processSyncFromSquare($data),
+ $base . 'sync_customer' => $square->processSyncCustomer($data),
+ default => $result,
+ };
}
+
/**
* Process sync to Square
*/
@@ -2097,7 +1960,7 @@
/**
* Enqueue checkout scripts with Square configuration
*/
- public function enqueueScripts():void
+ public function enqueueScripts(): void
{
$this->loadCredentials();
$sdk_url = $this->environment === 'production'
@@ -2109,50 +1972,40 @@
$sdk_url,
[],
null,
- [
- 'strategy' => 'defer',
- 'in_footer' => true
- ]
+ ['strategy' => 'defer', 'in_footer' => true]
);
- // Register your custom checkout script
+ // Shared cart checkout base class
+ wp_register_script(
+ 'jvb-checkout',
+ JVB_URL . 'assets/js/min/checkout.min.js',
+ ['jvb-utility', 'jvb-queue', 'jvb-a11y', 'jvb-cache', 'jvb-tabs', 'jvb-popup'],
+ '1.1.31',
+ ['strategy' => 'defer', 'in_footer' => true]
+ );
+
+ // Square checkout extends CartCheckout
wp_register_script(
'jvb-square-checkout',
JVB_URL . 'assets/js/min/square.min.js',
- [
-// 'square-payments-sdk',
- 'jvb-utility',
- 'jvb-queue',
- 'jvb-a11y',
- 'jvb-cache',
- 'jvb-tabs',
- 'jvb-popup'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true
- ]
+ ['jvb-checkout', 'square-payments-sdk'],
+ '1.1.31',
+ ['strategy' => 'defer', 'in_footer' => true]
);
wp_enqueue_script('jvb-square-checkout');
- // Localize the checkout script with Square config
- wp_localize_script(
- 'jvb-square-checkout',
- 'squareConfig',
- [
- 'isOpen' => jvbIsOpen(),
- 'application_id' => $this->credentials['client_id'] ?? '',
- 'location_id' => $this->locationId,
- 'environment' => $this->environment,
- 'api_url' => rest_url('jvb/v1/square/'),
- 'nonce' => wp_create_nonce('wp_rest'),
- 'currency' => get_option(BASE . 'currency', 'CAD'),
- 'is_logged_in' => is_user_logged_in(),
- 'user_email' => is_user_logged_in() ? wp_get_current_user()->user_email : '' // NEW
- ]
- );
+ wp_localize_script('jvb-square-checkout', 'squareConfig', [
+ 'isOpen' => jvbIsOpen(),
+ 'application_id' => $this->credentials['client_id'] ?? '',
+ 'location_id' => $this->locationId,
+ 'environment' => $this->environment,
+ 'api_url' => rest_url('jvb/v1/square/'),
+ 'nonce' => wp_create_nonce('wp_rest'),
+ 'currency' => get_option(BASE . 'currency', 'CAD'),
+ 'is_logged_in' => is_user_logged_in(),
+ 'user_email' => is_user_logged_in() ? wp_get_current_user()->user_email : '',
+ ]);
}
/******************************************************************
@@ -3683,4 +3536,74 @@
return null;
}
+
+ /**
+ * Single-item sync. Called by IntegrationExecutor::processSyncTo().
+ * Delegates to syncBatchToService since Square uses batch-upsert.
+ */
+ public function syncPostToService(int $postID): array|WP_Error
+ {
+ return $this->syncBatchToService(['items' => [$postID]]);
+ }
+
+ /**
+ * Batch sync — preferred by IntegrationExecutor when available.
+ * Wraps existing processSyncToSquare which already handles batches.
+ */
+ public function syncBatchToService(array $data): array|WP_Error
+ {
+ $result = $this->processSyncToSquare($data);
+
+ if (empty($result['success'])) {
+ $errors = implode(', ', $result['result']['errors'] ?? ['Sync failed']);
+ return new WP_Error('square_sync_failed', $errors);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Delete catalog object from Square.
+ * Called by IntegrationExecutor::processDeleteFrom().
+ */
+ public function deleteFromService(string $externalId): array|WP_Error
+ {
+ $result = $this->processDeleteFromSquare(['square_ids' => [$externalId]]);
+
+ if (empty($result['success'])) {
+ return new WP_Error('square_delete_failed', $result['result']['error'] ?? 'Delete failed');
+ }
+
+ return $result;
+ }
+
+ /**
+ * Import from Square catalog → WordPress.
+ * Called by IntegrationExecutor::processImport().
+ */
+ public function importFromService(array $data): array|WP_Error
+ {
+ $result = $this->processSyncFromSquare($data);
+
+ if (empty($result['success'])) {
+ return new WP_Error('square_import_failed', $result['result']['error'] ?? 'Import failed');
+ }
+
+ return $result;
+ }
+
+ /**
+ * Sync customer to Square.
+ * Called by IntegrationExecutor::processSyncCustomer().
+ */
+ public function syncCustomer(array $data): array|WP_Error
+ {
+ $result = $this->processSyncCustomer($data);
+
+ if (empty($result['success'])) {
+ return new WP_Error('square_customer_sync_failed', $result['result']['error'] ?? 'Customer sync failed');
+ }
+
+ return $result;
+ }
}
--
Gitblit v1.10.0