From f94860aacd6200fb24c9e7431eb379a368cb392d Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 10 Jul 2026 00:35:44 +0000
Subject: [PATCH] =Refactored CredentialsManager.php to utilize a CustomTable instance instead
---
inc/integrations/Square.php | 1704 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 854 insertions(+), 850 deletions(-)
diff --git a/inc/integrations/Square.php b/inc/integrations/Square.php
index d82ea73..c0191a3 100644
--- a/inc/integrations/Square.php
+++ b/inc/integrations/Square.php
@@ -1,9 +1,18 @@
<?php
namespace JVBase\integrations;
-use JVBase\meta\MetaManager;
+use JVBase\meta\Form;
+use JVBase\meta\Meta;
use Exception;
+use JVBase\registrar\Fields;
+use JVBase\registrar\Posts;
+use JVBase\registrar\Registrar;
+use JVBase\ui\CRUDSkeleton;
use WP_Error;
+use JVBase\ui\Checkout;
+use JVBase\managers\queue\TypeConfig;
+use JVBase\managers\queue\executors\IntegrationExecutor;
+use WP_Query;
if (!defined('ABSPATH')) {
exit;
@@ -19,6 +28,15 @@
*/
class Square extends Integrations
{
+ protected static string $syncCustomer = 'square_sync_customer';
+ protected array $allowedContent = [
+ 'REGULAR',
+ 'FOOD_AND_BEV',
+ 'APPOINTMENTS_SERVICE',
+ 'DIGITAL',
+ 'EVENT',
+ 'DONATION'
+ ];
/**
* Square API Configuration
*/
@@ -38,6 +56,9 @@
* OAuth Configuration
*/
protected bool $isOAuthService = true;
+
+ protected string $orderPostType = '_square_order';
+ protected array $newOrder = [];
protected array $oauth = [
'authorize' => '',
'token' => '',
@@ -65,12 +86,32 @@
protected string $locationId = '';
protected array $locations = [];
- public function __construct(?int $userID = null)
+ protected static array $instances = [];
+
+ public static function getInstance(?int $userID = null):self
{
+ $key = is_null($userID) ? 'base' : $userID;
+
+ if (!array_key_exists($key, self::$instances)) {
+ self::$instances[$key] = new self($userID);
+ }
+ return self::$instances[$key];
+ }
+
+ protected function __construct(?int $userID = null)
+ {
+
// Display properties
$this->title = 'Square';
$this->icon = 'square-logo';
+ $this->refresh_interval = 7 * DAY_IN_SECONDS;
+
+ $this->newOrder = [
+ 'post_type' => $this->orderPostType,
+ 'post_status' => 'PROPOSED',
+ ];
+
// Define credential fields
$this->fields = [
'environment' => [
@@ -171,6 +212,10 @@
'sync_to_square' => 'Sync Site to Square',
]
);
+
+ add_action('init', [$this, 'registerSquarePostTypes'], 5);
+ add_action('init', [$this, 'addDashboardPages'], 10);
+ add_action(BASE.'dashboard_page_orders', [$this, 'renderDashPage']);
}
/**
@@ -207,6 +252,112 @@
}
+ public function getOrderFields():array
+ {
+ return [
+ 'post_title' => [
+ 'type' => 'text',
+ 'label' => 'Order Number'
+ ],
+ 'square_order_id' => [
+ 'type' => 'text',
+ 'label' => 'Square Order ID',
+ ],
+ 'square_payment_id' => [
+ 'type' => 'text',
+ 'label' => 'Square Payment ID',
+ ],
+ 'square_customer_id' => [
+ 'type' => 'text',
+ 'label' => 'Square Customer ID',
+ ],
+ 'amount' => [
+ 'type' => 'number',
+ 'label' => 'Total Amount (cents)',
+ ],
+ 'square_payment_status' => [
+ 'type' => 'select',
+ 'label' => 'Order Status',
+ 'options' => [
+ 'PROPOSED' => 'Proposed',
+ 'RESERVED' => 'Reserved',
+ 'PREPARED' => 'Prepared (Ready for Pickup)',
+ 'COMPLETED' => 'Completed',
+ 'CANCELED' => 'Canceled'
+ ],
+ ],
+ 'fulfillment_status' => [
+ 'type' => 'select',
+ 'label' => 'Fulfillment Status',
+ 'options' => [
+ 'PROPOSED' => 'Proposed',
+ 'RESERVED' => 'Reserved',
+ 'PREPARED' => 'Prepared',
+ 'COMPLETED' => 'Completed',
+ 'CANCELED' => 'Canceled',
+ 'FAILED' => 'Failed'
+ ],
+ ],
+ 'pickup_time' => [
+ 'type' => 'datetime',
+ 'label' => 'Pickup Time'
+ ],
+ 'customer_email' => [
+ 'type' => 'email',
+ 'label' => 'Customer Email',
+ ],
+ 'customer_name' => [
+ 'type' => 'text',
+ 'label' => 'Customer Name',
+ ],
+ 'customer_phone' => [
+ 'type' => 'phone',
+ 'label' => 'Customer Phone',
+ 'section'=> 'your-account'
+ ],
+ 'special_instructions' => [
+ 'type' => 'textarea',
+ 'label' => 'Special Instructions',
+ ],
+ 'items' => [
+ 'type' => 'repeater',
+ 'label' => 'Order Items',
+ 'fields' => [
+ 'name' => ['type' => 'text', 'label' => 'Item Name'],
+ 'quantity' => ['type' => 'number', 'label' => 'Quantity'],
+ 'price' => ['type' => 'number', 'label' => 'Price'],
+ 'note' => ['type' => 'text', 'label' => 'Note']
+ ]
+ ],
+ 'receipt_url' => [
+ 'type' => 'url',
+ 'label' => 'Receipt URL',
+ ],
+ 'created_at' => [
+ 'type' => 'datetime',
+ 'label' => 'Created At',
+ ],
+ 'updated_at' => [
+ 'type' => 'datetime',
+ 'label' => 'Last Updated',
+ ]
+ ];
+ }
+
+ public function registerSquarePostTypes():void
+ {
+ $orders = Registrar::forPost($this->orderPostType, 'Square Order', 'Square Orders');
+ $orders->make([
+ 'public' => true
+ ]);
+ $orders->setAll(['system']);
+
+ $fields = $orders->fields();
+ foreach ($this->getOrderFields() as $fieldName => $config) {
+ $fields->addField($fieldName, $config);
+ }
+ }
+
/**
* Get request headers for API calls
*/
@@ -245,8 +396,6 @@
*/
protected function exchangeOAuthCode(string $code): ?array
{
- error_log('Exchanging tokens with credentials: '.print_r($this->credentials, true));
-
$this->ensureInitialized();
// Prepare the request body as an array
@@ -272,7 +421,6 @@
}
$data = json_decode(wp_remote_retrieve_body($response), true);
- error_log('OAuth Response: '.print_r($data, true));
if (isset($data['access_token'])) {
return [
'access_token' => $data['access_token'],
@@ -334,7 +482,6 @@
$data = json_decode(wp_remote_retrieve_body($response), true);
- error_log('RefreshAccessToken Response: '.print_r($data, true));
if (isset($data['access_token'])) {
$this->credentials['access_token'] = $data['access_token'];
$this->credentials['expires_at'] = time() + ($data['expires_in'] ?? 2592000); // 30 days
@@ -357,7 +504,6 @@
{
// Skip if we don't have credentials yet (during OAuth flow)
if (empty($this->credentials['access_token'])) {
- error_log('[Square] Skipping loadLocations - no access token yet');
return;
}
try {
@@ -643,8 +789,8 @@
'name' => $variation['name'],
'pricing_type' => 'FIXED_PRICING',
'price_money' => [
- 'amount' => intval($variation['price'] * 100), // Convert to cents
- 'currency' => 'USD'
+ 'amount' => $this->formatPrice($variation['_square_price']??0),
+ 'currency' => $this->getCurrency()
]
]
];
@@ -658,8 +804,8 @@
'name' => 'Regular',
'pricing_type' => 'FIXED_PRICING',
'price_money' => [
- 'amount' => intval(($itemData['price'] ?? 0) * 100),
- 'currency' => 'USD'
+ 'amount' => $this->formatPrice($itemData['_square_price'] ?? 0),
+ 'currency' => $this->getCurrency()
]
]
];
@@ -714,203 +860,69 @@
if (!$this->isSetUp()) {
return;
}
- // User login tracking for security
- add_action('wp_login', [$this, 'trackUserLogin'], 10, 2);
- add_action('wp_footer', [$this, 'outputCheckout']);
+ add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
- // Enqueue checkout scripts
- add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
- }
+ add_filter('jvbAdditionalActions', [Checkout::class, 'render']);
-
- public function outputCheckout():void {
- if (is_singular(BASE.'dash') || is_post_type_archive(BASE.'dash')) {
- return;
- }
- ?>
- <button type="button" class="toggle-cart row" title="Your Cart" data-action="toggle-cart" aria-label="Open Cart" aria-controls="checkout" aria-expanded="false" hidden>
- <?= jvbIcon('cart')?><span class="abs"></span><span class="abs count"></span>
- </button>
- <aside id="cart">
- <form id="checkout" data-form-id="checkout" data-save="checkout">
- <?php
- $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>
-
- <input type="text" name="name" placeholder="Full Name" required autocomplete="name">
- <input type="email" name="email" placeholder="Email" required autocomplete="email">
- <input type="tel" name="phone" placeholder="Phone" required autocomplete="tel"">
- <h3>Pickup Details</h3>
- <input type="time" name="pickup_time" min="11:00" max="20:00" required>
- <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()
- ]
- ];
- jvbRenderTabs($tabs);
- ?>
-
- <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">
- <i class="icon minus"><svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" viewBox="0 0 256 256"><path d="M208,36H48A12,12,0,0,0,36,48V208a12,12,0,0,0,12,12H208a12,12,0,0,0,12-12V48A12,12,0,0,0,208,36Zm4,172a4,4,0,0,1-4,4H48a4,4,0,0,1-4-4V48a4,4,0,0,1,4-4H208a4,4,0,0,1,4,4Zm-40-80a4,4,0,0,1-4,4H88a4,4,0,0,1,0-8h80A4,4,0,0,1,172,128Z"></path></svg></i> </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">
- <i class="icon add"><svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" viewBox="0 0 256 256"><path d="M208,36H48A12,12,0,0,0,36,48V208a12,12,0,0,0,12,12H208a12,12,0,0,0,12-12V48A12,12,0,0,0,208,36Zm4,172a4,4,0,0,1-4,4H48a4,4,0,0,1-4-4V48a4,4,0,0,1,4-4H208a4,4,0,0,1,4,4Zm-40-80a4,4,0,0,1-4,4H132v36a4,4,0,0,1-8,0V132H88a4,4,0,0,1,0-8h36V88a4,4,0,0,1,8,0v36h36A4,4,0,0,1,172,128Z"></path></svg></i> </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>
- <?php
- }
-
- 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);
+ 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';
+ });
}
- 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 registerAdditionalQueueTypes(IntegrationExecutor $executor): 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();
+
+ $queue->registry()->register(self::$syncCustomer, new TypeConfig(
+ executor: $executor,
+ maxRetries: 2
+ ));
+
+ $queue->registry()->register(self::$import, new TypeConfig(
+ executor: $executor,
+ maxRetries: 3
+ ));
}
/******************************************************************
@@ -922,17 +934,15 @@
*/
protected function handleTheSavePost(int $postID, \WP_Post $post, bool $update, array $settings): void
{
- error_log('Queuing Sync to Square');
- // Queue the sync operation
- $this->queueOperation('sync_to_square', [
- 'items' => [$postID],
- 'user_id' => $this->userID
+ error_log('==== [Square]::handleTheSavePost ====');
+ $this->queueOperation(self::$syncTo, [
+ 'items' => [$postID],
+ 'user' => user_can($post->post_author, 'manage_options') ? null : $post->post_author
], [
'priority' => 'high',
- 'delay' => 30, // Small delay to batch multiple saves
+ 'delay' => 30,
]);
-
- update_post_meta($postID, BASE . '_square_sync_status', 'queued');
+ Meta::forPost($postID)->set('_'.$this->service_name.'_sync_status', 'queued');
}
/**
@@ -940,41 +950,18 @@
*/
public function handleDeletePost(int $postID): void
{
- $square_id = get_post_meta($postID, BASE . '_square_catalog_id', true);
+ $item_id = $this->getServiceItemID($postID);
- if ($square_id) {
- $this->queueOperation('delete_from_square', [
- 'square_ids' => [$square_id],
- 'post_id' => $postID
- ], [
- 'priority' => 'high'
- ]);
+ if (empty($item_id)) {
+ return;
}
- }
+ $this->queueOperation(self::$deleteFrom, [
+ 'external_ids' => [$item_id],
+ 'post_id' => $postID,
+ ], [
+ 'priority' => 'high',
+ ]);
- /**
- * Process queued operations
- */
- 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);
-
- 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;
- }
}
/**
@@ -1028,19 +1015,6 @@
if (!is_wp_error($response)) {
$this->processBatchSyncResponse($response, $map, $success, $errors);
- $square_id = $response['objects'][0]['id'];
- update_post_meta($postID, BASE . '_square_catalog_id', $square_id);
- update_post_meta($postID, BASE . '_square_sync_status', 'synced');
- update_post_meta($postID, BASE . '_square_last_sync', current_time('mysql'));
-
- // Save variation IDs
- if (!empty($response['objects'][0]['item_data']['variations'])) {
- foreach ($response['objects'][0]['item_data']['variations'] as $index => $variation) {
- update_post_meta($postID, BASE . '_square_variation_' . $index . '_id', $variation['id']);
- }
- }
-
- $success[] = $postID;
} else {
// Handle batch request failure
$error_message = 'Batch sync failed';
@@ -1071,6 +1045,9 @@
private function processBatchSyncResponse(array $response, array $map, array &$success, array &$errors):void
{
+ error_log('==== SQUARE::processBatchSyncResponse =====');
+ error_log('Full response: '.print_r($response, true));
+
// Handle successful objects
if (!empty($response['objects'])) {
foreach ($response['objects'] as $object) {
@@ -1157,6 +1134,7 @@
* @param string|null $square_image_id Previously uploaded Square image ID
* @return array|WP_Error Catalog object or error
*/
+ //TODO: Get to work with Registrar settings
protected function buildCatalogObject(int $postID, ?string $square_image_id = null): array|WP_Error
{
$post = get_post($postID);
@@ -1164,11 +1142,19 @@
return new WP_Error('post_not_found', "Post $postID not found");
}
- $meta = new MetaManager($postID, 'post');
+ $meta = Meta::forPost($postID);
$post_type = get_post_type($postID);
// Get existing Square catalog ID if it exists
$existing_square_id = get_post_meta($postID, BASE . '_square_catalog_id', true);
+ $registrar = Registrar::getInstance($post_type);
+ $product_type = 'FOOD_AND_BEV';
+ if ($registrar) {
+ $conf = $registrar->getIntegration($this->service_name);
+ if ($conf) {
+ $product_type = $conf->getContentType();
+ }
+ }
// Build the base catalog object
$catalog_object = [
@@ -1177,7 +1163,7 @@
'item_data' => [
'name' => $post->post_title,
'description' => wp_strip_all_tags($post->post_content),
- 'product_type' => 'FOOD_AND_BEV',
+ 'product_type' => $product_type,
'variations' => [],
'is_taxable' => true,
]
@@ -1189,44 +1175,52 @@
}
// Add variations
- $variations = $meta->getValue('product_variations');
+ $variations = $meta->get('_square_product_variations');
if (empty($variations)) {
// Create default variation if none exist
- $price = floatval($meta->getValue('price') ?: 0);
$catalog_object['item_data']['variations'][] = [
'type' => 'ITEM_VARIATION',
- 'id' => $existing_square_id ? null : '#neb_menu_item_' . $postID . '_var_default',
+ 'id' => $existing_square_id ? null : '#'.BASE.'menu_item_' . $postID . '_var_default',
'item_variation_data' => [
'name' => 'Regular',
'ordinal' => 0,
'pricing_type' => 'FIXED_PRICING',
'price_money' => [
- 'amount' => intval($price * 100), // Convert dollars to cents
- 'currency' => 'CAD'
+ 'amount' => $this->formatPrice($meta->get('_square_price')),
+ 'currency' => $this->getCurrency()
],
'sellable' => true,
'stockable' => true
]
];
} else {
+ $resetVariations = false;
foreach ($variations as $index => $variation) {
- $existing_var_id = get_post_meta($postID, BASE . '_square_variation_' . $index . '_id', true);
+ $id = '#'.BASE.'menu_item_' . $postID . '_var_' . $index;
+ if (empty($variation['item_id'])) {
+ $resetVariations = true;
+ $variations[$index]['item_id'] = $id;
+ $variation['item_id'] = $id;
+ }
$catalog_object['item_data']['variations'][] = [
'type' => 'ITEM_VARIATION',
- 'id' => $existing_var_id ?: '#neb_menu_item_' . $postID . '_var_' . $index,
+ 'id' => $variation['item_id'],
'item_variation_data' => [
'name' => $variation['name'] ?? 'Variation ' . ($index + 1),
'ordinal' => $index,
'pricing_type' => 'FIXED_PRICING',
'price_money' => [
- 'amount' => intval(floatval($variation['price'] ?? 0) * 100),
- 'currency' => 'CAD'
+ 'amount' =>$this->formatPrice($variation['price'] ?? 0),
+ 'currency' => $this->getCurrency()
],
'sellable' => true,
'stockable' => true
]
];
}
+ if ($resetVariations) {
+ $meta->set('_square_product_variations', $variations);
+ }
}
// Add categories if they exist
@@ -1245,7 +1239,7 @@
}
// Add modifiers if they exist
- $modifiers = $meta->getValue('modifiers');
+ $modifiers = $meta->get('modifiers');
if (!empty($modifiers)) {
$modifier_ids = [];
foreach ($modifiers as $modifier) {
@@ -1261,7 +1255,7 @@
}
// Add tax settings
- $tax_ids = $meta->getValue('tax_ids');
+ $tax_ids = $meta->get('tax_ids');
if (!empty($tax_ids)) {
$catalog_object['item_data']['tax_ids'] = $tax_ids;
}
@@ -1269,118 +1263,32 @@
return $catalog_object;
}
- /**
- * Build variations from repeater field
- */
- private function buildVariations(int $postID, array $values, string $post_type): array
- {
- $variations = [];
- $product_variations = $values['product_variations'] ?? [];
- // Get variation field mapping
- $variation_map = $this->getVariationMapping($post_type);
-
- // If we have repeater variations
- if (!empty($product_variations) && is_array($product_variations)) {
- foreach ($product_variations as $index => $variation_data) {
- // Skip empty variations
- if (empty($variation_data['name']) && empty($variation_data['sku'])) {
- continue;
- }
-
- $variation = [
- 'type' => 'ITEM_VARIATION',
- 'id' => '#' . $post_type . '_' . $postID . '_var_' . $index,
- 'item_variation_data' => [
- 'name' => $variation_data['name'] ?? 'Variation ' . ($index + 1),
- 'ordinal' => $index,
- 'pricing_type' => 'FIXED_PRICING'
- ]
- ];
-
- // Check for existing Square variation ID
- $square_var_id = get_post_meta($postID, BASE . '_square_variation_' . $index . '_id', true);
- if ($square_var_id) {
- $variation['id'] = $square_var_id;
- }
-
- // Map variation fields
- foreach ($variation_map as $square_field => $wp_field) {
- if (isset($variation_data[$wp_field])) {
- switch ($square_field) {
- case 'price':
- $variation['item_variation_data']['price_money'] = [
- 'amount' => intval($variation_data[$wp_field] * 100), // Convert to cents
- 'currency' => 'CAD'
- ];
- break;
-
- case 'sku':
- $variation['item_variation_data']['sku'] = $variation_data[$wp_field];
- break;
-
- case 'track_inventory':
- $variation['item_variation_data']['track_inventory'] = (bool)$variation_data[$wp_field];
- break;
-
- case 'service_duration':
- if (!empty($variation_data[$wp_field])) {
- $variation['item_variation_data']['service_data'] = [
- 'duration_minutes' => intval($variation_data[$wp_field])
- ];
- }
- break;
-
- default:
- $variation['item_variation_data'][$square_field] = $variation_data[$wp_field];
- break;
- }
- }
- }
-
- $variations[] = $variation;
- }
- }
-
- // If no variations exist, create a default one from base price
- if (empty($variations) && !empty($values['price'])) {
- $variations[] = [
- 'type' => 'ITEM_VARIATION',
- 'id' => '#' . $post_type . '_' . $postID . '_var_default',
- 'item_variation_data' => [
- 'name' => 'Regular',
- 'ordinal' => 0,
- 'pricing_type' => 'FIXED_PRICING',
- 'price_money' => [
- 'amount' => intval($values['price'] * 100),
- 'currency' => 'CAD'
- ]
- ]
- ];
- }
-
- return $variations;
- }
/**
* Get variation mapping for post type
*/
protected function getVariationMapping(string $post_type): array
{
- $product_type = JVB_CONTENT[jvbNoBase($post_type)]['integrations']['square']['content_type'] ?? 'REGULAR';
+ $registrar = Registrar::getInstance($post_type);
+ if (!$registrar) {
+ return [];
+ }
+ $config = $registrar->getIntegrationConfig($this->service_name);
+ $product_type = $config['content_type']??'REGULAR';
$valid_fields = $this->getValidFieldsForProductType($product_type);
$defaults = [
'name' => 'name',
- 'id' => '_square_catalog_id',
- 'sku' => 'sku',
- 'price' => 'price',
- 'track_inventory' => 'track_inventory',
- 'service_duration' => 'service_duration',
- 'available_for_booking' => 'available_for_booking',
- 'gift_card_type' => 'gift_card_type',
- 'ingredients' => 'ingredients',
- 'preparation_time_duration' => 'preparation_time_duration'
+ 'id' => '_square_item_id',
+ 'sku' => '_square_sku',
+ 'price' => '_square_price',
+ 'track_inventory' => '_square_track_inventory',
+ 'service_duration' => '_square_service_duration',
+ 'available_for_booking' => '_square_available_for_booking',
+ 'gift_card_type' => '_square_gift_card_type',
+ 'ingredients' => '_square_ingredients',
+ 'preparation_time_duration' => '_square_preparation_time_duration'
];
$extended = apply_filters(
@@ -1436,7 +1344,12 @@
*/
protected function getFieldMapping(string $post_type): array
{
- $product_type = JVB_CONTENT[jvbNoBase($post_type)]['integrations']['square']['content_type'] ?? 'REGULAR';
+ $registrar = Registrar::getInstance($post_type);
+ if (!$registrar) {
+ return [];
+ }
+ $config = $registrar->getIntegrationConfig($this->service_name);
+ $product_type = $config['content_type']??'REGULAR';
$valid_fields = $this->getValidFieldsForProductType($product_type);
$defaults = [
@@ -1444,15 +1357,15 @@
'description_html' => 'post_content',
'abbreviation' => 'abbreviation',
'id' => '_square_catalog_id',
- 'sku' => 'sku',
+ 'sku' => '_square_sku',
'category_id' => 'category',
'image_ids' => 'post_thumbnail',
- 'price' => 'price',
+ 'price' => '_square_price',
'tax_ids' => 'tax_ids',
// Availability
- 'available_online' => 'available_online',
- 'available_for_pickup' => 'available_for_pickup',
- 'available_electronically' => 'available_electronically',
+ 'available_online' => '_square_available_online',
+ 'available_for_pickup' => '_square_available_for_pickup',
+ 'available_electronically' => '_square_available_electronically',
// Modifiers
'modifier_list_info' => 'modifiers',
// Item options
@@ -1476,6 +1389,7 @@
/**
* Get valid fields for Square product type
*/
+ //TODO: This feels redundant now, with how we've defined fields in getAdditionalFields
private function getValidFieldsForProductType(string $product_type): array
{
$fields = ['name', 'description_html', 'sku', 'price', 'image_ids', 'category_id'];
@@ -1519,6 +1433,7 @@
/**
* Handle customer authentication during checkout
*/
+ //TODO: Is this necessary?
public function handleCustomerAuth($data):WP_Error|array
{
$email = sanitize_email($data['email'] ?? '');
@@ -1569,7 +1484,8 @@
'message' => 'Email found. Would you like to create an account to save your order history?'
];
}
- } else {
+ }
+
// Check Square for customer
$response = $this->postRequest('customers/search', [
'filter' => [
@@ -1592,7 +1508,6 @@
'message' => 'New customer'
];
}
- }
}
private function createCustomerAccount(string $email):WP_Error|array
@@ -1611,13 +1526,9 @@
];
}
- // Generate username from email
- $username = sanitize_user(current(explode('@', $email)));
- $username = $this->generateUniqueUsername($username);
-
// Create user account without password (they'll set it via email)
$user_id = wp_create_user(
- $username,
+ $email,
wp_generate_password(20, true, true), // Temporary random password
$email
);
@@ -1632,7 +1543,7 @@
// Set user role (assuming you have a customer role defined)
$user = new \WP_User($user_id);
- $user->set_role(BASE.'foodie'); // Or whatever role from JVB_USER
+ $user->set_role(BASE.'foodie');
// Generate password reset key
$reset_key = get_password_reset_key($user);
@@ -1648,7 +1559,7 @@
// Link to Square customer if exists
$square_customer_id = $this->getOrCreateSquareCustomer([
'email' => $email,
- 'name' => $username
+ 'name' => $email
]);
if ($square_customer_id) {
@@ -1663,263 +1574,37 @@
}
/**
- * Generate unique username
- */
- private function generateUniqueUsername(string $base): string
- {
- $username = $base;
- $counter = 1;
-
- while (username_exists($username)) {
- $username = $base . $counter;
- $counter++;
- }
-
- return $username;
- }
-
- /**
* Send welcome email with password setup
*/
private function sendWelcomeEmail(\WP_User $user, string $reset_key): void
{
$site_name = get_bloginfo('name');
- $reset_url = get_home_url(2, "wp-login.php?action=rp&key=$reset_key&login=" . rawurlencode($user->user_login), 'login');
+ $reset_url = get_home_url(null, "wp-login.php?action=rp&key=$reset_key&login=" . rawurlencode($user->user_login), 'login');
$message = sprintf(
"Welcome to %s!\n\n" .
- "Your account has been created. Please click the link below to set your password:\n\n" .
+ "Your account has been created. Please click the button below to set your password:\n\n" .
"%s\n\n" .
- "Once you've set your password, you can log in to:\n" .
+ "Or, copy and paste the link below:\n\n".
+ "%s\n\n" .
+ "Once you've set your password, you can:\n" .
"- View your order history\n" .
- "- Save your favorite items\n" .
+// "- Save your favorite items\n" .
"- Speed up checkout with saved payment methods\n\n" .
"If you didn't create this account, please ignore this email.\n\n" .
- "Thanks,\n%s",
+ "Thanks,\n",
$site_name,
- $reset_url,
- $site_name
+ JVB()->email()->button('Reset Password', $reset_url),
+ JVB()->email()->link($reset_url),
);
- jvbMail(
+ JVB()->email()->sendEmail(
$user->user_email,
sprintf('[%s] Welcome! Set Your Password', $site_name),
$message
);
}
- /**
- * Track user login for security
- */
- public function trackUserLogin(string $user_login, \WP_User $user): void
- {
- // Check if user has Square integration
- $roles = array_keys(JVB_USER);
- $user_roles = $user->roles;
-
- foreach ($user_roles as $role) {
- if (isset(JVB_USER[$role]['integrations']['square']['is_customer'])) {
- $login_count = (int)get_user_meta($user->ID, BASE . '_square_login_count', true);
- $login_count++;
-
- update_user_meta($user->ID, BASE . '_square_login_count', $login_count);
- update_user_meta($user->ID, BASE . '_square_last_login', current_time('mysql'));
-
- // Check if password reset is needed
- if ($login_count % self::PASSWORD_RESET_INTERVAL === 0) {
- $this->schedulePasswordReset($user->ID);
- }
-
- break;
- }
- }
- }
-
- /**
- * Schedule password reset for security
- */
- private function schedulePasswordReset(int $user_id): void
- {
- update_user_meta($user_id, BASE . '_square_password_reset_required', true);
-
- // Send notification
- $user = get_user_by('ID', $user_id);
- if ($user) {
- wp_mail(
- $user->user_email,
- '['.get_bloginfo('name').'] Security Code',
- 'For your security, enter this code to continue accessing your account and saved payment methods.',
- ['Content-Type: text/html; charset=UTF-8']
- );
- }
- }
-
- /******************************************************************
- * ORDER PROCESSING
- ******************************************************************/
-
- /**
- * Process checkout order
- */
- public function processOrder($data):WP_Error|array
- {
- check_ajax_referer('square_checkout_nonce', 'nonce');
-
- $cart_items = json_decode(stripslashes($data['cart'] ?? '[]'), true);
- $customer_info = [
- 'name' => sanitize_text_field($data['name'] ?? ''),
- 'email' => sanitize_email($data['email'] ?? ''),
- 'phone' => sanitize_text_field($data['phone'] ?? ''),
- ];
- $payment_token = sanitize_text_field($data['payment_token'] ?? '');
-
- if (empty($cart_items) || empty($payment_token)) {
- return new WP_Error('error', 'Invalid order data');
- }
-
- // Calculate order total
- $order_total = $this->calculateOrderTotal($cart_items);
-
- // Create Square order
- $order_response = $this->createSquareOrder($cart_items, $customer_info, $order_total);
-
- if (is_wp_error($order_response)) {
- return new WP_Error('error', $order_response->get_error_message());
- }
-
- // Process payment
- $payment_response = $this->processSquarePayment($payment_token, $order_response['order']['id'], $order_total);
-
- if (is_wp_error($payment_response)) {
- return new WP_Error('error', $order_response->get_error_message());
- }
-
- // Save order to user if logged in
- if (is_user_logged_in()) {
- $this->saveOrderToUser(get_current_user_id(), $order_response['order']['id']);
- }
-
- return [
- 'success' => true,
- 'order_id' => $order_response['order']['id'],
- 'receipt_url' => $payment_response['payment']['receipt_url'] ?? '',
- 'message' => 'Order placed successfully!'
- ];
- }
-
- /**
- * Calculate order total from cart items
- */
- private function calculateOrderTotal(array $cart_items): int
- {
- $total = 0;
-
- foreach ($cart_items as $item) {
- $post_id = intval($item['id'] ?? 0);
- if (!$post_id) continue;
-
- $meta = new MetaManager($post_id, 'post');
- $price = floatval($meta->getValue('price'));
- $quantity = intval($item['quantity'] ?? 1);
-
- $total += ($price * $quantity * 100); // Convert to cents
- }
-
- // Add tax (simplified - you'd want more complex tax calculation)
- $tax_rate = floatval(get_option(BASE . 'square_tax_rate', 0.05));
- $tax = intval($total * $tax_rate);
-
- return $total + $tax;
- }
-
- /**
- * Create Square order
- */
- private function createSquareOrder(array $cart_items, array $customer_info, int $total): array|WP_Error
- {
- $line_items = [];
-
- foreach ($cart_items as $item) {
- $post_id = intval($item['id'] ?? 0);
- $variation_index = $item['variation'] ?? null;
-
- if (!$post_id) continue;
-
- $post = get_post($post_id);
- $square_catalog_id = get_post_meta($post_id, BASE . '_square_catalog_id', true);
-
- $line_item = [
- 'quantity' => strval($item['quantity'] ?? 1),
- 'name' => $post->post_title
- ];
-
- // If variation specified, get variation ID
- if ($variation_index !== null && $square_catalog_id) {
- $variation_id = get_post_meta($post_id, BASE . '_square_variation_' . $variation_index . '_id', true);
- if ($variation_id) {
- $line_item['catalog_object_id'] = $variation_id;
-
- // Add variation name to line item
- $meta = new MetaManager($post_id, 'post');
- $variations = $meta->getValue('product_variations');
- if (!empty($variations[$variation_index]['name'])) {
- $line_item['name'] .= ' - ' . $variations[$variation_index]['name'];
- }
- }
- } elseif ($square_catalog_id) {
- // Use default variation if no specific variation
- $default_variation_id = get_post_meta($post_id, BASE . '_square_variation_0_id', true);
- if ($default_variation_id) {
- $line_item['catalog_object_id'] = $default_variation_id;
- }
- }
-
- // If no catalog ID, create ad-hoc line item
- if (empty($line_item['catalog_object_id'])) {
- $meta = new MetaManager($post_id, 'post');
- $variations = $meta->getValue('product_variations');
-
- if ($variation_index !== null && !empty($variations[$variation_index]['price'])) {
- $price = floatval($variations[$variation_index]['price']);
- } else {
- $price = floatval($meta->getValue('price'));
- }
-
- $line_item['base_price_money'] = [
- 'amount' => intval($price * 100),
- 'currency' => 'CAD'
- ];
- }
-
- $line_items[] = $line_item;
- }
-
- return $this->postRequest('orders', [
- 'order' => [
- 'location_id' => $this->locationId,
- 'line_items' => $line_items,
- 'customer_id' => $this->getOrCreateSquareCustomer($customer_info)
- ]
- ]);
- }
-
- /**
- * Process Square payment
- */
- private function processSquarePayment(string $payment_token, string $order_id, int $amount): array|WP_Error
- {
- return $this->postRequest('payments', [
- 'source_id' => $payment_token,
- 'idempotency_key' => wp_generate_uuid4(),
- 'amount_money' => [
- 'amount' => $amount,
- 'currency' => 'CAD'
- ],
- 'order_id' => $order_id,
- 'location_id' => $this->locationId
- ]);
- }
-
/******************************************************************
* WEBHOOK HANDLING
******************************************************************/
@@ -2004,14 +1689,40 @@
{
$order_id = $data['object']['order']['id'] ?? '';
$state = $data['object']['order']['state'] ?? '';
+ $fulfillments = $data['object']['order']['fulfillments'] ?? [];
if (!$order_id) {
return false;
}
- // Update cached order status
- set_transient(BASE . 'square_order_' . $order_id, $state, HOUR_IN_SECONDS);
+ // Find the WP post for this order
+ $wp_order_id = $this->getOrderPost($order_id);
+ if ($wp_order_id) {
+ // Update the post meta
+ $meta = Meta::forPost($wp_order_id);
+ $updates = [
+ 'status' => $state,
+ 'updated_at' => current_time('mysql')
+ ];
+
+ // Extract fulfillment status and pickup time
+ if (!empty($fulfillments[0])) {
+ $fulfillment = $fulfillments[0];
+ $updates['fulfillment_status'] = $fulfillment['state'] ?? $state;
+
+ if (!empty($fulfillment['pickup_details']['pickup_at'])) {
+ $updates['pickup_time'] = $fulfillment['pickup_details']['pickup_at'];
+ }
+ }
+
+ $meta->setAll($updates);
+
+ // Trigger notification to customer if order is ready
+ if ($state === 'PREPARED') {
+ do_action(BASE . 'square_order_ready', $wp_order_id, $order_id);
+ }
+ }
// Trigger action for other integrations
do_action(BASE . 'square_order_updated', $order_id, $state, $data);
@@ -2075,8 +1786,9 @@
/**
* Enqueue checkout scripts with Square configuration
*/
- public function enqueueScripts():void
+ public function enqueueScripts(): void
{
+ jvbInlineStyles('forms');
$this->loadCredentials();
$sdk_url = $this->environment === 'production'
? 'https://web.squarecdn.com/v1/square.js'
@@ -2087,43 +1799,38 @@
$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', 'jvb-login'],
+ '1.1.32',
+ ['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-modal',
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true
- ]
+ ['jvb-checkout', 'square-payments-sdk'],
+ '1.1.32',
+ ['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(),
-// 'currency' => get_option('jvb_currency', 'CAD')
- ]
- );
+ wp_localize_script('jvb-square-checkout', 'squareConfig', [
+ 'isOpen' => jvbIsOpen()?'1':'0',
+ 'application_id' => $this->credentials['client_id'] ?? '',
+ 'location_id' => $this->locationId,
+ 'environment' => $this->environment,
+ 'currency' => $this->getCurrency(),
+ 'is_logged_in' => is_user_logged_in(),
+ 'user_email' => is_user_logged_in() ? wp_get_current_user()->user_email : '',
+ ]);
}
/******************************************************************
@@ -2133,7 +1840,7 @@
/**
* Get or create Square customer
*/
- private function getOrCreateSquareCustomer(array $customer_info): ?string
+ public function getOrCreateSquareCustomer(array $customer_info): ?string
{
if (empty($customer_info['email'])) {
return null;
@@ -2166,57 +1873,6 @@
return null;
}
- /**
- * Save order to user meta
- */
- private function saveOrderToUser(int $user_id, string $order_id): void
- {
- $orders = get_user_meta($user_id, BASE . '_square_orders', true) ?: [];
- $orders[] = [
- 'order_id' => $order_id,
- 'date' => current_time('mysql')
- ];
-
- // Keep only last 50 orders
- if (count($orders) > 50) {
- $orders = array_slice($orders, -50);
- }
-
- update_user_meta($user_id, BASE . '_square_orders', $orders);
- }
-
- /**
- * Get order status
- */
- public function getOrderStatus($data):WP_Error|array
- {
- $order_id = sanitize_text_field($data['order_id'] ?? '');
-
- if (!$order_id) {
- return new WP_Error('error', 'Order ID required');
- }
-
- // Check cache first
- $cached_status = get_transient(BASE . 'square_order_' . $order_id);
-
- if ($cached_status !== false) {
- return $cached_status;
- }
-
- // Fetch from Square
- $response = $this->getRequest('orders/' . $order_id);
-
- if (is_wp_error($response)) {
- return new WP_Error('error', 'Could not fetch order status');
- }
-
- $status = $response['order']['state'] ?? 'UNKNOWN';
- set_transient(BASE . 'square_order_' . $order_id, $status, 5 * MINUTE_IN_SECONDS);
-
- return array_merge([
- 'success' => true,
- ], $status);
- }
/**
* Process delete from Square
@@ -2318,16 +1974,21 @@
*/
private function importSquareItem(array $item): bool|int
{
+ //TODO: We need to add the post type to custom meta for Square, this is not good if we have multiple post types with the same product type
// Find matching content type
$product_type = $item['item_data']['product_type'] ?? 'REGULAR';
$post_type = null;
- foreach (JVB_CONTENT as $key => $config) {
- if (isset($config['integrations']['square']['content_type']) &&
- $config['integrations']['square']['content_type'] === $product_type) {
- $post_type = jvbCheckBase($key);
+ foreach (Registrar::getRegistered() as $registrar) {
+ if (!$registrar->hasIntegration($this->service_name)) {
+ continue;
+ }
+ $config = $registrar->getIntegration($this->service_name);
+ if ($config->getContent_type() && $config->getContent_type() === $product_type) {
+ $post_type = jvbCheckBase($registrar->getSlug());
break;
}
+
}
if (!$post_type) {
@@ -2371,7 +2032,7 @@
*/
private function mapSquareFieldsToWordPress(int $post_id, array $item): void
{
- $meta = new MetaManager($post_id, 'post');
+ $meta = Meta::forPost($post_id);
$field_map = $this->getFieldMapping(get_post_type($post_id));
$values_to_save = [];
@@ -2387,7 +2048,7 @@
foreach ($item['item_data']['variations'] as $index => $variation) {
$var_data = [
'name' => $variation['item_variation_data']['name'] ?? '',
- 'sku' => $variation['item_variation_data']['sku'] ?? '',
+ 'sku' => $variation['item_variation_data']['_square_sku'] ?? '',
];
// Extract price
@@ -2507,7 +2168,7 @@
update_user_meta($user->ID, BASE . '_square_customer_updated', current_time('mysql'));
// Clear cached customer data
- $this->cache->delete('square_customer_' . $user->ID);
+ $this->cache->forget('square_customer_' . $user->ID);
}
return true;
@@ -2526,8 +2187,12 @@
return false;
}
- // Update cached payment status
- set_transient(BASE . 'square_payment_' . $payment_id, $status, HOUR_IN_SECONDS);
+ if ($order_id) {
+ $order = $this->getOrderPost($order_id);
+ if ($order) {
+ Meta::forPost($order)->set('square_payment_status', $status);
+ }
+ }
// Trigger action for other integrations
do_action(BASE . 'square_payment_updated', $payment_id, $status, $order_id, $data);
@@ -2738,7 +2403,6 @@
// Validate environment setting
if (isset($credentials['environment'])) {
- error_log('Environment: '.print_r($credentials['environment'], true));
$validEnvironments = ['sandbox', 'production'];
if (!in_array($credentials['environment'], $validEnvironments)) {
$this->logError('Invalid environment setting', [
@@ -2828,12 +2492,83 @@
'GIFT_CARD' => array_merge($this->setGiftCardFields())
];
}
+ public function getAdditionalFields(?string $content_type = null):array {
+ if ($content_type === 'customer') {
+ return $this->getCustomerFields();
+ }
+ if ($content_type && array_key_exists($content_type, $this->contentTypes)){
+ $array = $this->contentTypes[$content_type];
+ return array_combine(
+ array_map(fn($k) => '_square_' . $k, array_keys($array)),
+ $array
+ );
+ } else if ($content_type && !array_key_exists($content_type, $this->contentTypes)) {
+ error_log('Could not get default fields for '.$this->service_name.' content type: '.$content_type);
+ return [];
+ }
+ $array = $this->setBaseFields();
+ return array_combine(
+ array_map(fn($k) => '_square_' . $k, array_keys($array)),
+ $array
+ );
+ }
+
+ protected function getCustomerFields():array
+ {
+ return [
+ 'customer_id' => [
+ 'type' => 'text',
+ 'label' => 'Square Customer ID',
+ 'hidden'=> true,
+ 'section'=> 'your-account'
+ ],
+ 'address_line_1' => [
+ 'type' => 'text',
+ 'label' => 'Address Line 1',
+ 'hint' => 'ex: 6551 111 St NW',
+ 'required' => true,
+ 'section' => 'address'
+ ],
+ 'address_line_2' => [
+ 'type' => 'text',
+ 'label' => 'Address Line 2',
+ 'hint' => 'ex: Unit 2',
+ 'section' => 'address'
+ ],
+ 'city' => [
+ 'type' => 'text',
+ 'label'=> 'City',
+ 'section' => 'address',
+ 'required' => true,
+ ],
+ 'state' => [
+ 'type' => 'text',
+ 'label' => 'Province',
+ 'hint' => 'The two-character code, example: AB',
+ 'default'=> 'AB',
+ 'section' => 'address',
+ 'required' => true,
+ ],
+ 'zip_code' => [
+ 'type' => 'text',
+ 'label' => 'Postal Code',
+ 'section'=> 'address'
+ ],
+ 'countryCode' => [
+ 'type' => 'text',
+ 'label' => 'Country Code',
+ 'hint' => 'The tw-character country code, example: CA',
+ 'default' => 'CA',
+ 'section' => 'address',
+ 'required' => true,
+ ]
+ ];
+ }
protected function setBaseFields():array
{
return [
'price' => [
'type' => 'number',
- 'bulkEdit' => true,
'label' => 'Price',
'step' => 0.01,
'max' => 99999,
@@ -2878,6 +2613,11 @@
'label' => 'Variation Name',
'description' => 'e.g., "Small", "Large", "Red", etc.'
],
+ 'sku' => [
+ 'type' => 'text',
+ 'label' => 'SKU',
+ 'description' => 'Stock keeping unit'
+ ],
'price' => [
'type' => 'number',
'label' => 'Price',
@@ -2885,18 +2625,17 @@
'max' => 99999,
'description' => 'Price for this variation'
],
-
'track_inventory' => [
'type' => 'true_false',
'label' => 'Track Inventory',
],
- '_square_item_id' => [
+ 'item_id' => [
'type' => 'text',
'label' => 'Square Variation ID',
'description' => 'Square catalog ID for this variation',
'hidden' => true
],
- '_square_last_sync' => [
+ 'last_sync' => [
'type' => 'datetime',
'label' => 'Last Sync',
'hidden' => true
@@ -2937,7 +2676,10 @@
];
break;
}
- return $fields;
+ return array_combine(
+ array_map(fn($k) => '_square_' . $k, array_keys($fields)),
+ $fields
+ );
}
protected function setFoodAndBevFields():array
{
@@ -3026,137 +2768,61 @@
IMAGE PROCESSING
*********************************************************/
/**
- * Upload featured image to Square catalog
- *
- * @param int $postID WordPress post ID
- * @return array|WP_Error Result of the upload operation
- */
- public function uploadImageToSquare(int $imgID): array|WP_Error
- {
-
- if ($imgID === 0) {
- return new WP_Error('no_image', 'No image found for post');
- }
-
- try {
- // Get the supported image (converts WebP if needed)
- $supported_image_id = $this->getSupportedImage($imgID);
-
- // Check if we've already uploaded this image
- $existing_square_image_id = $this->getSquareImageId($supported_image_id);
- if ($existing_square_image_id) {
- return [
- 'success' => true,
- 'image_id' => $existing_square_image_id,
- 'message' => 'Image already exists in Square catalog'
- ];
- }
-
- // Step 1: Create image object in catalog
- $image_object = $this->createSquareImageObject($supported_image_id);
- if (is_wp_error($image_object)) {
- return $image_object;
- }
-
- // Step 2: Upload the actual image file
- $upload_result = $this->uploadImageFileToSquare(
- $supported_image_id,
- $image_object['id']
- );
-
- if (is_wp_error($upload_result)) {
- return $upload_result;
- }
-
- // Store the Square image ID for future reference
- $this->setSquareImageId($supported_image_id, $image_object['id']);
-
- return [
- 'success' => true,
- 'image_id' => $image_object['id'],
- 'message' => 'Image successfully uploaded to Square'
- ];
-
- } catch (\Exception $e) {
- $this->logError('Failed to upload image to Square', [
- 'method' => 'uploadImageToSquare',
- 'error' => $e->getMessage()
- ]);
-
- return new WP_Error('upload_failed', $e->getMessage());
- }
- }
-
- /**
- * Create image object in Square catalog
- *
- * @param int $attachment_id WordPress attachment ID
- * @return array|WP_Error Square image object or error
- */
- protected function createSquareImageObject(int $attachment_id): array|WP_Error
- {
- $image_title = get_the_title($attachment_id);
- $alt_text = get_post_meta($attachment_id, '_wp_attachment_image_alt', true);
-
- $image_object = [
- 'type' => 'IMAGE',
- 'id' => '#IMAGE_' . $attachment_id . '_' . time(),
- 'image_data' => [
- 'name' => $image_title ?: 'Image',
- 'caption' => $alt_text ?: ''
- ]
- ];
-
- $response = $this->postRequest('catalog/batch-upsert', [
- 'idempotency_key' => wp_generate_uuid4(),
- 'batches' => [[
- 'objects' => [$image_object]
- ]]
- ]);
-
- if (is_wp_error($response)) {
- return $response;
- }
-
- if (!empty($response['objects'][0])) {
- return $response['objects'][0];
- }
-
- return new WP_Error('creation_failed', 'Failed to create image object in Square');
- }
-
- /**
* Upload image file to Square
*
- * @param int $attachment_id WordPress attachment ID
- * @param string $square_image_id Square catalog image ID
+ * @param int $imgID WordPress attachment ID
* @return array|WP_Error Upload result or error
*/
- protected function uploadImageFileToSquare(int $attachment_id, string $square_image_id): array|WP_Error
+ protected function uploadImageToSquare(int $imgID): array|WP_Error
{
- $file_path = get_attached_file($attachment_id);
+ $supported_image_id = $this->getSupportedImage($imgID);
+ // Check if already uploaded
+ $existing_square_image_id = $this->getSquareImageId($supported_image_id);
+ if ($existing_square_image_id) {
+ return [
+ 'success' => true,
+ 'image_id' => $existing_square_image_id
+ ];
+ }
+
+ $file_path = get_attached_file($supported_image_id);
if (!file_exists($file_path)) {
return new WP_Error('file_not_found', 'Image file not found');
}
// Verify file type
- $mime_type = get_post_mime_type($attachment_id);
- $allowed_types = ['image/jpeg', 'image/png', 'image/gif'];
-
- if (!in_array($mime_type, $allowed_types)) {
+ $mime_type = get_post_mime_type($supported_image_id);
+ if (!in_array($mime_type, ['image/jpeg', 'image/png', 'image/gif'])) {
return new WP_Error('invalid_type', 'Square only supports JPEG, PNG, and GIF images');
}
- // Prepare the multipart form data
+ $image_title = get_the_title($supported_image_id);
+ $alt_text = get_post_meta($supported_image_id, '_wp_attachment_image_alt', true);
+
+ // Build multipart request - SINGLE STEP
$boundary = wp_generate_password(24);
$headers = $this->getRequestHeaders();
$headers['Content-Type'] = 'multipart/form-data; boundary=' . $boundary;
- $body = $this->buildMultipartBody($file_path, $square_image_id, $boundary);
+ // Request JSON part
+ $request_json = [
+ 'idempotency_key' => wp_generate_uuid4(),
+ 'image' => [
+ 'type' => 'IMAGE',
+ 'id' => '#IMAGE_' . $supported_image_id . '_' . time(),
+ 'image_data' => [
+ 'name' => $image_title ?: 'Image',
+ 'caption' => $alt_text ?: ''
+ ]
+ ],
+ 'object_id' => $supported_image_id
+ ];
+
+ $body = $this->buildMultipartBody($file_path, $request_json, $boundary);
$response = wp_remote_post(
- $this->getApiUrl('catalog/images'),
+ $this->getApiUrl('v2/catalog/images'),
[
'headers' => $headers,
'body' => $body,
@@ -3168,56 +2834,43 @@
return $response;
}
- $body = wp_remote_retrieve_body($response);
- $data = json_decode($body, true);
+ $data = json_decode(wp_remote_retrieve_body($response), true);
if (!empty($data['errors'])) {
- $error_message = $data['errors'][0]['detail'] ?? 'Unknown error';
- return new WP_Error('upload_error', $error_message);
+ return new WP_Error('upload_error', $data['errors'][0]['detail'] ?? 'Unknown error');
}
- if (!empty($data['image'])) {
- return $data;
+ if (!empty($data['image']['id'])) {
+ $this->setSquareImageId($supported_image_id, $data['image']['id']);
+ return [
+ 'success' => true,
+ 'image_id' => $data['image']['id']
+ ];
}
- return new WP_Error('upload_failed', 'Failed to upload image to Square');
+ return new WP_Error('upload_failed', 'Failed to upload image');
}
- /**
- * Build multipart form data for image upload
- *
- * @param string $file_path Path to image file
- * @param string $square_image_id Square catalog image ID
- * @param string $boundary Multipart boundary
- * @return string Multipart body
- */
- protected function buildMultipartBody(string $file_path, string $square_image_id, string $boundary): string
+ protected function buildMultipartBody(string $file_path, array $request_json, string $boundary): string
{
$eol = "\r\n";
$body = '';
- // Add request JSON
- $request_data = [
- 'idempotency_key' => wp_generate_uuid4(),
- 'object_id' => $square_image_id
- ];
-
+ // Add request JSON part
$body .= '--' . $boundary . $eol;
$body .= 'Content-Disposition: form-data; name="request"' . $eol;
$body .= 'Content-Type: application/json' . $eol . $eol;
- $body .= json_encode($request_data) . $eol;
+ $body .= json_encode($request_json) . $eol;
- // Add image file
+ // Add image file part
$filename = basename($file_path);
$file_contents = file_get_contents($file_path);
$mime_type = mime_content_type($file_path);
$body .= '--' . $boundary . $eol;
- $body .= 'Content-Disposition: form-data; name="image"; filename="' . $filename . '"' . $eol;
+ $body .= 'Content-Disposition: form-data; name="file"; filename="' . $filename . '"' . $eol;
$body .= 'Content-Type: ' . $mime_type . $eol . $eol;
$body .= $file_contents . $eol;
-
- // End boundary
$body .= '--' . $boundary . '--' . $eol;
return $body;
@@ -3492,4 +3145,355 @@
$this->deleteCredentials();
}
}
+
+ public function createSquareOrder(array $items, ?string $customer_id, array $data): array|WP_Error
+ {
+ // Build line items for Square
+ $line_items = [];
+ foreach ($items as $item) {
+ $line_item = [
+ 'quantity' => (string)$item['quantity'], // MUST be string!
+ ];
+
+ // Use catalog_object_id if available (recommended)
+ if (!empty($item['catalog_object_id'])) {
+ $line_item['catalog_object_id'] = $item['catalog_object_id'];
+ $line_item['catalog_version'] = $item['catalog_version'] ?? null;
+ } else {
+ // Ad-hoc line item (not recommended - no tax/inventory automation)
+ $line_item['name'] = $item['name'];
+ $line_item['base_price_money'] = [
+ 'amount' => (int)$item['_square_price'],
+ 'currency' => $this->getCurrency()
+ ];
+ }
+
+ if (!empty($item['note'])) {
+ $line_item['note'] = $item['note'];
+ }
+
+ $line_items[] = $line_item;
+ }
+
+ $order_data = [
+ 'idempotency_key' => wp_generate_uuid4(), // Different from payment idempotency key
+ 'order' => [
+ 'location_id' => $this->locationId,
+ 'line_items' => $line_items,
+ 'state' => 'OPEN'
+ ]
+ ];
+
+ // Add customer if available
+ if ($customer_id) {
+ $order_data['order']['customer_id'] = $customer_id;
+ }
+
+ // Add metadata
+ if (!empty($data['note'])) {
+ $order_data['order']['metadata'] = [
+ 'special_instructions' => $data['note']
+ ];
+ }
+
+ if (!empty($data['pickup_time'])) {
+ $order_data['order']['metadata']['pickup_time'] = $data['pickup_time'];
+ }
+
+ return $this->postRequest('orders', $order_data);
+ }
+
+ public function createSquarePayment(
+ string $source_id,
+ string $idempotency_key,
+ int $amount_cents,
+ string $order_id,
+ ?string $customer_id
+ ): array|WP_Error
+ {
+ $payment_data = [
+ 'idempotency_key' => $idempotency_key,
+ 'source_id' => $source_id,
+ 'amount_money' => [
+ 'amount' => $amount_cents, // Already in cents!
+ 'currency' => $this->getCurrency()
+ ],
+ 'order_id' => $order_id,
+ 'location_id' => $this->locationId,
+ 'autocomplete' => true, // Capture immediately
+ ];
+
+ // Add customer if available
+ if ($customer_id) {
+ $payment_data['customer_id'] = $customer_id;
+ }
+
+ // Add reference ID for tracking
+ $payment_data['reference_id'] = 'WP_' . time();
+
+ return $this->postRequest('payments', $payment_data);
+ }
+
+ public function saveOrderToWordPress(array $order_data): int
+ {
+ // Extract customer info
+ $customer_email = $order_data['customer']['email'] ?? '';
+ $customer_name = $order_data['customer']['name'] ?? '';
+
+ // Find or create WP user for logged-in association
+ $user_id = 0;
+ if ($customer_email) {
+ $user = get_user_by('email', $customer_email);
+ if ($user) {
+ $user_id = $user->ID;
+ // Store Square customer ID on user
+ if (!empty($order_data['square_customer_id'])) {
+ update_user_meta($user_id, BASE . '_square_customer_id', $order_data['square_customer_id']);
+ }
+ }
+ }
+
+ // Create order post
+ $order_post_id = wp_insert_post([
+ 'post_type' => BASE.$this->orderPostType,
+ 'post_title' => 'Order #' . $order_data['square_order_id'],
+ 'post_status' => 'publish',
+ 'post_author' => $user_id // Associate with user if logged in
+ ]);
+
+ if (!$order_post_id || is_wp_error($order_post_id)) {
+ $this->logError('Failed to create order post', ['order_data' => $order_data]);
+ return 0;
+ }
+
+ // Save all order meta
+ $meta = Meta::forPost($order_post_id);
+ $fields = $this->getOrderFields();
+ unset($fields['post_title']);
+
+ $meta->setAll([
+ 'square_order_id' => $order_data['square_order_id'],
+ 'square_payment_id' => $order_data['square_payment_id'] ?? '',
+ 'square_customer_id' => $order_data['square_customer_id'] ?? '',
+ 'amount' => $order_data['amount'],
+ 'status' => $order_data['status'],
+ 'fulfillment_status' => $order_data['fulfillment_status'] ?? 'PROPOSED',
+ 'pickup_time' => $order_data['pickup_time'] ?? '',
+ 'customer_email' => $customer_email,
+ 'customer_name' => $customer_name,
+ 'customer_phone' => $order_data['customer']['phone'] ?? '',
+ 'special_instructions' => $order_data['note'] ?? '',
+ 'items' => $order_data['items'],
+ 'receipt_url' => $order_data['receipt_url'] ?? '',
+ 'created_at' => current_time('mysql'),
+ 'updated_at' => current_time('mysql')
+ ]);
+
+ return $order_post_id;
+ }
+
+ /**
+ * Get currency code
+ */
+ private function getCurrency(): string
+ {
+ return get_option(BASE . 'currency', 'CAD');
+ }
+
+ /**
+ * Get customer with saved cards (2025-compliant)
+ */
+ public function getUserCards(string $customer_id): array
+ {
+ $response = $this->getRequest('cards?customer_id=' . $customer_id);
+ return $response['cards'] ?? [];
+ }
+
+
+ public function getUserOrders(string $customer_email): array
+ {
+ // First get Square customer ID
+ $customer_response = $this->postRequest('customers/search', [
+ 'filter' => [
+ 'email_address' => ['exact' => $customer_email]
+ ]
+ ]);
+
+ $customer_id = $customer_response['customers'][0]['id'] ?? null;
+ if (!$customer_id) {
+ return [];
+ }
+
+ // Get their orders
+ $orders_response = $this->postRequest('orders/search', [
+ 'filter' => [
+ 'customer_filter' => [
+ 'customer_ids' => [$customer_id]
+ ]
+ ],
+ 'sort' => [
+ 'sort_field' => 'CREATED_AT',
+ 'sort_order' => 'DESC'
+ ],
+ 'limit' => 50
+ ]);
+
+ return $orders_response['orders'] ?? [];
+ }
+
+ public function checkOrderStatus(string $order_id): ?string
+ {
+ // Fetch from Square
+ $response = $this->getRequest('orders/' . $order_id);
+ if (!is_wp_error($response)) {
+ $state = $response['order']['state'] ?? null;
+ return $state;
+ }
+
+ 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;
+ }
+
+ public function addDashboardPages():void
+ {
+ $page = JVB()->dashboard()->addPage('Your Orders', 'orders', 'receipt');
+ $page->setScripts(['jvb-crud']);
+ }
+ public function renderDashPage():void
+ {
+ $instance = $this->determineInstance();
+
+ $crud = new CRUDSkeleton();
+ $crud->icon('receipt');
+ $crud->title('Your Orders','Here you can see your past orders, and reorder from there if you\'d like');
+ $crud->content($this->orderPostType, 'Order', 'Orders');
+ $crud->addSearch();
+ $crud->addCapabilities(['view']);
+ $crud->setEmptyState(sprintf(
+ '<div class="empty-state">
+ <h3>%sNothing here%s</h3>
+ <p>It doesn\'t look like you have any orders yet.</p>
+ <p>Head on over to <a href="%s">our menu</a> and make your first order!</p>
+ </div>',
+ jvbDashIcon($crud->getIcon()),
+ jvbDashIcon($crud->getIcon()),
+ get_post_type_archive_link(BASE.'menu_item')
+ ));
+
+
+ $crud->render();
+ }
+ protected function determineInstance():self
+ {
+ if (current_user_can('manage_options')) {
+ return self::$instances['base'];
+ }
+ return self::getInstance(get_current_user_id());
+ }
+
+ public function getOrderPost(string $order_id):int|false
+ {
+ $posts = new WP_Query([
+ 'post_type' => BASE.$this->orderPostType,
+ 'posts_per_page' => 1,
+ 'meta_key' => BASE.'square_order_id',
+ 'meta_value' => $order_id,
+ 'fields' => 'ids',
+ ]);
+ wp_reset_postdata();
+ return $posts->have_posts() ? $posts[0] : false;
+ }
+ public function getOrderHistory(int $user_id):array
+ {
+ $posts = new WP_Query([
+ 'post_type' => BASE.$this->orderPostType,
+ 'posts_per_page' => 25,
+ 'author' => $user_id,
+ 'orderby' => 'date',
+ 'order' => 'desc',
+ 'fields' => 'ids',
+ ]);
+ wp_reset_postdata();
+ return array_map(function ($post) {
+ $fields = Meta::forPost($post);
+ $fields['wp_order_id'] = $post;
+ return $fields;
+ }, $posts->posts);
+
+ }
+
+ public function formatPrice(string|float|int $priceValue):int
+ {
+ //Convert dollars to cents
+ return intval(floatval($priceValue) * 100);
+ }
}
--
Gitblit v1.10.0