From d7dbe7fee362d587dfc334135d9581b6216a4295 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 23 Nov 2025 04:13:56 +0000
Subject: [PATCH] =Timeline block, and feed block updated. DataStore.js refactored to not block rendering
---
inc/integrations/Square.php | 939 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 569 insertions(+), 370 deletions(-)
diff --git a/inc/integrations/Square.php b/inc/integrations/Square.php
index d82ea73..62bbeb4 100644
--- a/inc/integrations/Square.php
+++ b/inc/integrations/Square.php
@@ -1,8 +1,10 @@
<?php
namespace JVBase\integrations;
+use JVBase\meta\MetaForm;
use JVBase\meta\MetaManager;
use Exception;
+use JVBase\registry\PostTypeRegistrar;
use WP_Error;
if (!defined('ABSPATH')) {
@@ -71,6 +73,8 @@
$this->title = 'Square';
$this->icon = 'square-logo';
+ $this->refresh_interval = 7 * DAY_IN_SECONDS;
+
// Define credential fields
$this->fields = [
'environment' => [
@@ -171,6 +175,8 @@
'sync_to_square' => 'Sync Site to Square',
]
);
+
+ add_action('init', [$this, 'registerSquarePostTypes']);
}
/**
@@ -207,6 +213,134 @@
}
+ public function getSquarePostConfig(string $post = 'all'):array
+ {
+ $posts = [
+ '_sq_orders' => [
+ 'singular' => 'Square Order',
+ 'plural' => 'Square Orders',
+ 'public' => false,
+ 'fields' => [
+ 'post_title' => [
+ 'type' => 'text',
+ 'label' => 'Order Number'
+ ],
+ 'square_order_id' => [
+ 'type' => 'text',
+ 'label' => 'Square Order ID',
+ 'readonly' => true
+ ],
+ 'square_payment_id' => [
+ 'type' => 'text',
+ 'label' => 'Square Payment ID',
+ 'readonly' => true
+ ],
+ 'square_customer_id' => [
+ 'type' => 'text',
+ 'label' => 'Square Customer ID',
+ 'readonly' => true
+ ],
+ 'amount' => [
+ 'type' => 'number',
+ 'label' => 'Total Amount (cents)',
+ 'readonly' => true
+ ],
+ 'status' => [
+ 'type' => 'select',
+ 'label' => 'Order Status',
+ 'options' => [
+ 'PROPOSED' => 'Proposed',
+ 'RESERVED' => 'Reserved',
+ 'PREPARED' => 'Prepared (Ready for Pickup)',
+ 'COMPLETED' => 'Completed',
+ 'CANCELED' => 'Canceled'
+ ],
+ 'readonly' => true
+ ],
+ 'fulfillment_status' => [
+ 'type' => 'select',
+ 'label' => 'Fulfillment Status',
+ 'options' => [
+ 'PROPOSED' => 'Proposed',
+ 'RESERVED' => 'Reserved',
+ 'PREPARED' => 'Prepared',
+ 'COMPLETED' => 'Completed',
+ 'CANCELED' => 'Canceled',
+ 'FAILED' => 'Failed'
+ ],
+ 'readonly' => true
+ ],
+ 'pickup_time' => [
+ 'type' => 'datetime',
+ 'label' => 'Pickup Time'
+ ],
+ 'customer_email' => [
+ 'type' => 'email',
+ 'label' => 'Customer Email',
+ 'readonly' => true
+ ],
+ 'customer_name' => [
+ 'type' => 'text',
+ 'label' => 'Customer Name',
+ 'readonly' => true
+ ],
+ 'customer_phone' => [
+ 'type' => 'tel',
+ 'label' => 'Customer Phone',
+ 'readonly' => true
+ ],
+ 'special_instructions' => [
+ 'type' => 'textarea',
+ 'label' => 'Special Instructions',
+ 'readonly' => true
+ ],
+ 'items' => [
+ 'type' => 'repeater',
+ 'label' => 'Order Items',
+ 'readonly' => true,
+ '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',
+ 'readonly' => true
+ ],
+ 'created_at' => [
+ 'type' => 'datetime',
+ 'label' => 'Created At',
+ 'readonly' => true
+ ],
+ 'updated_at' => [
+ 'type' => 'datetime',
+ 'label' => 'Last Updated',
+ 'readonly' => true
+ ]
+ ]
+ ]
+ ];
+
+ if ($post === 'all'){
+ return $posts;
+ }elseif(array_key_exists($post, $posts)) {
+ return $posts[$post];
+ }
+ return [];
+ }
+
+ public function registerSquarePostTypes():void
+ {
+ $squarePostTypes = $this->getSquarePostConfig();
+ foreach ($squarePostTypes as $slug => $config) {
+ $registrar = new PostTypeRegistrar($slug, $config);
+ $registrar->register();
+ }
+ }
+
/**
* Get request headers for API calls
*/
@@ -717,24 +851,21 @@
// User login tracking for security
add_action('wp_login', [$this, 'trackUserLogin'], 10, 2);
- add_action('wp_footer', [$this, 'outputCheckout']);
-
// Enqueue checkout scripts
add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
+
+ add_filter('jvbAdditionalActions', [$this, 'outputCheckout']);
}
- public function outputCheckout():void {
+ public function outputCheckout(array $actions):array {
if (is_singular(BASE.'dash') || is_post_type_archive(BASE.'dash')) {
- return;
+ return $actions;
}
- ?>
- <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
+ $meta = new MetaForm();
+ $form = '<aside id="cart" class="right">
+ <form id="checkout" data-form-id="checkout" data-save="checkout">';
+
$tabs = [
'cartItems' => [
'title' => 'Your Order',
@@ -743,17 +874,42 @@
'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">
+ '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>
+ '.$meta->return('cart_name', null, [
+ 'type' => 'text',
+ 'label' => 'Your Name',
+ 'required' => true,
+ 'autocomplete' => 'name'
+ ]).
+ $meta->return('cart_email', null, [
+ 'type' => 'email',
+ 'label' => 'Your Email',
+ 'required' => true,
+ 'autocomplete'=> 'email',
+ ]).
+ $meta->return('cart_phone', null, [
+ 'type' => 'tel',
+ 'label' => 'Your Phone',
+ 'required' => true,
+ 'autocomplete'=> 'phone'
+ ]).'
+ <h3>Pickup Details</h3>'.
+ $meta->return('pickup_time', null, [
+ 'type' => 'datetime',
+ 'label' => 'Pickup Type',
+ 'min' => '11:00',
+ 'max' => '20:00',
+ 'required' => true,
+ ]).
+ $meta->return('special_instructions', null, [
+ 'type' => 'textarea',
+ 'label' => 'Special Instructions',
+ 'quill' => true,
+ ]).'
<textarea name="special_instructions" placeholder="Special instructions or dietary notes"></textarea>
</div>
@@ -762,29 +918,28 @@
<div id="saved-cards"></div>
<div id="square-card-container"></div>
</div>'
- ],
+ ],
'order' => [
- 'title' => 'Your Order',
- 'icon' => 'truck',
- 'hidden' => true,
- 'description' => '',
- 'content' => $this->renderOrderStatus()
- ]
+ 'title' => 'Your Order',
+ 'icon' => 'truck',
+ 'hidden' => true,
+ 'description' => '',
+ 'content' => $this->renderOrderStatus()
+ ]
];
- jvbRenderTabs($tabs);
- ?>
+ $form .= jvbRenderTabs($tabs, true);
- <div class="cart-total row end"><p class="tax">Tax: <span></span></p><p class="total">GRAND TOTAL: <span></span></p></div>
- </form>
+ $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>
+ <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>
+ <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>
@@ -794,13 +949,11 @@
<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>
+ <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">
- <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>
+ <button type="button" class="increase" aria-label="Increase Add to Order">'.jvbIcon('plus-square').'</button>
</div>
</td>
<td class="price">
@@ -810,17 +963,25 @@
<span class="total"></span>
</td>
<td>
- <button type="button" data-remove-from-cart><?= jvbIcon('trash')?></button>
+ <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>
+ <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
+ </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
@@ -1195,7 +1356,7 @@
$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,
@@ -1213,7 +1374,7 @@
$existing_var_id = get_post_meta($postID, BASE . '_square_variation_' . $index . '_id', true);
$catalog_object['item_data']['variations'][] = [
'type' => 'ITEM_VARIATION',
- 'id' => $existing_var_id ?: '#neb_menu_item_' . $postID . '_var_' . $index,
+ 'id' => $existing_var_id ?: '#'.BASE.'menu_item_' . $postID . '_var_' . $index,
'item_variation_data' => [
'name' => $variation['name'] ?? 'Variation ' . ($index + 1),
'ordinal' => $index,
@@ -1684,7 +1845,7 @@
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" .
@@ -1755,172 +1916,6 @@
}
/******************************************************************
- * 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
******************************************************************/
@@ -2000,16 +1995,49 @@
/**
* Handle order status webhook
*/
+ /**
+ * Handle order status webhook - NOW UPDATES POST TYPE
+ */
private function handleOrderWebhook(array $data): bool
{
$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
+ // Find the WP post for this order
+ $wp_order_id = get_option(BASE . 'square_order_map_' . $order_id);
+
+ if ($wp_order_id) {
+ // Update the post meta
+ $meta = new MetaManager($wp_order_id, 'post');
+ $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);
+ }
+ }
+
+ // Also update transient cache for quick status checks
set_transient(BASE . 'square_order_' . $order_id, $state, HOUR_IN_SECONDS);
// Trigger action for other integrations
@@ -2104,7 +2132,7 @@
'jvb-a11y',
'jvb-cache',
'jvb-tabs',
- 'jvb-modal',
+ 'jvb-popup'
],
'1.0.0',
[
@@ -2120,8 +2148,15 @@
'jvb-square-checkout',
'squareConfig',
[
- 'isOpen' => jvbIsOpen(),
-// 'currency' => get_option('jvb_currency', 'CAD')
+ '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
]
);
}
@@ -2167,6 +2202,43 @@
}
/**
+ * Save order reference for status tracking
+ */
+ public function saveOrderReference($data): array
+ {
+ $order_id = sanitize_text_field($data['order_id'] ?? '');
+ $payment_id = sanitize_text_field($data['payment_id'] ?? '');
+
+ if (!$order_id) {
+ return ['success' => false, 'message' => 'Invalid order data'];
+ }
+
+ // Save to user if logged in
+ if (is_user_logged_in()) {
+ $user_id = get_current_user_id();
+ $orders = get_user_meta($user_id, BASE . '_square_orders', true) ?: [];
+ $orders[] = [
+ 'order_id' => $order_id,
+ 'payment_id' => $payment_id,
+ 'date' => current_time('mysql'),
+ 'customer' => $data['customer'] ?? []
+ ];
+
+ // Keep last 50 orders
+ if (count($orders) > 50) {
+ $orders = array_slice($orders, -50);
+ }
+
+ update_user_meta($user_id, BASE . '_square_orders', $orders);
+ }
+
+ return [
+ 'success' => true,
+ 'order_id' => $order_id,
+ 'message' => 'Order saved'
+ ];
+ }
+ /**
* Save order to user meta
*/
private function saveOrderToUser(int $user_id, string $order_id): void
@@ -2186,9 +2258,9 @@
}
/**
- * Get order status
+ * Get order status (for customer feedback)
*/
- public function getOrderStatus($data):WP_Error|array
+ public function getOrderStatus($data): WP_Error|array
{
$order_id = sanitize_text_field($data['order_id'] ?? '');
@@ -2196,26 +2268,24 @@
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);
+ $response = $this->getRequest('v2/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);
+ $order = $response['order'] ?? [];
+ $status_data = [
+ 'state' => $order['state'] ?? 'UNKNOWN',
+ 'fulfillment_eta' => $order['fulfillments'][0]['pickup_details']['pickup_at'] ?? null
+ ];
- return array_merge([
- 'success' => true,
- ], $status);
+ return [
+ 'success' => true,
+ 'status' => $status_data['state'],
+ 'eta' => $status_data['fulfillment_eta']
+ ];
}
/**
@@ -3026,137 +3096,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 +3162,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 +3473,222 @@
$this->deleteCredentials();
}
}
+
+ private 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['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);
+ }
+
+ private 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);
+ }
+
+ private 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 . '_sq_orders',
+ '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 = new MetaManager($order_post_id, 'post');
+ $fields = $this->getSquarePostConfig('_sq_orders')['fields'];
+ unset($fields['post_title']);
+ $meta->setFieldConfig($fields);
+
+ $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')
+ ]);
+
+ // Index by Square order ID for quick webhook lookups
+ update_option(BASE . 'square_order_map_' . $order_data['square_order_id'], $order_post_id);
+
+ 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
+ {
+ // Check transient cache first
+ $cached = get_transient(BASE . 'square_order_' . $order_id);
+ if ($cached) {
+ return $cached;
+ }
+
+ // Fetch from Square
+ $response = $this->getRequest('orders/' . $order_id);
+ if (!is_wp_error($response)) {
+ $state = $response['order']['state'] ?? null;
+ set_transient(BASE . 'square_order_' . $order_id, $state, HOUR_IN_SECONDS);
+ return $state;
+ }
+
+ return null;
+ }
}
--
Gitblit v1.10.0