From fff721dd185f5b97f7ae7a6e64189e55887ff590 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 05 Jul 2026 18:36:57 +0000
Subject: [PATCH] =Cleaning up the Square integration (still a bit more to do yet). Also majorly overhauled /rest/ files to ignore a rest request 'user' paramater, and rely on get_current_user_id() instead.
---
inc/integrations/Square.php | 489 +++++++++++++++++++++++++++---------------------------
1 files changed, 246 insertions(+), 243 deletions(-)
diff --git a/inc/integrations/Square.php b/inc/integrations/Square.php
index 85032f3..5e1a831 100644
--- a/inc/integrations/Square.php
+++ b/inc/integrations/Square.php
@@ -4,12 +4,15 @@
use JVBase\meta\Form;
use JVBase\meta\Meta;
use Exception;
+use JVBase\registrar\Fields;
+use JVBase\registrar\Posts;
use JVBase\registrar\Registrar;
-use JVBase\registry\PostTypeRegistrar;
+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;
@@ -25,6 +28,14 @@
*/
class Square extends Integrations
{
+ protected array $allowedContent = [
+ 'REGULAR',
+ 'FOOD_AND_BEV',
+ 'APPOINTMENTS_SERVICE',
+ 'DIGITAL',
+ 'EVENT',
+ 'DONATION'
+ ];
/**
* Square API Configuration
*/
@@ -44,6 +55,9 @@
* OAuth Configuration
*/
protected bool $isOAuthService = true;
+
+ protected string $orderPostType = '_square_order';
+ protected array $newOrder = [];
protected array $oauth = [
'authorize' => '',
'token' => '',
@@ -71,7 +85,18 @@
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 static($userID);
+ }
+ return self::$instances[$key];
+ }
+
+ protected function __construct(?int $userID = null)
{
// Display properties
$this->title = 'Square';
@@ -79,6 +104,11 @@
$this->refresh_interval = 7 * DAY_IN_SECONDS;
+ $this->newOrder = [
+ 'post_type' => $this->orderPostType,
+ 'post_status' => 'PROPOSED',
+ ];
+
// Define credential fields
$this->fields = [
'environment' => [
@@ -180,7 +210,9 @@
]
);
- add_action('init', [$this, 'registerSquarePostTypes']);
+ add_action('init', [$this, 'registerSquarePostTypes'], 5);
+ add_action('init', [$this, 'addDashboardPages'], 10);
+ add_action(BASE.'dashboard_page_orders', [$this, 'renderDashPage']);
}
/**
@@ -217,14 +249,9 @@
}
- public function getSquarePostConfig(string $post = 'all'):array
+ public function getOrderFields():array
{
- $posts = [
- '_sq_orders' => [
- 'singular' => 'Square Order',
- 'plural' => 'Square Orders',
- 'public' => false,
- 'fields' => [
+ return [
'post_title' => [
'type' => 'text',
'label' => 'Order Number'
@@ -232,24 +259,20 @@
'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' => [
+ 'square_payment_status' => [
'type' => 'select',
'label' => 'Order Status',
'options' => [
@@ -259,7 +282,6 @@
'COMPLETED' => 'Completed',
'CANCELED' => 'Canceled'
],
- 'readonly' => true
],
'fulfillment_status' => [
'type' => 'select',
@@ -272,7 +294,6 @@
'CANCELED' => 'Canceled',
'FAILED' => 'Failed'
],
- 'readonly' => true
],
'pickup_time' => [
'type' => 'datetime',
@@ -281,27 +302,23 @@
'customer_email' => [
'type' => 'email',
'label' => 'Customer Email',
- 'readonly' => true
],
'customer_name' => [
'type' => 'text',
'label' => 'Customer Name',
- 'readonly' => true
],
'customer_phone' => [
- 'type' => 'tel',
+ 'type' => 'phone',
'label' => 'Customer Phone',
- 'readonly' => true
+ 'section'=> 'your-account'
],
'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'],
@@ -312,36 +329,29 @@
'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();
+ $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);
}
}
@@ -776,7 +786,7 @@
'name' => $variation['name'],
'pricing_type' => 'FIXED_PRICING',
'price_money' => [
- 'amount' => intval($variation['price'] * 100), // Convert to cents
+ 'amount' => intval($variation['_square_price'] * 100), // Convert to cents
'currency' => 'USD'
]
]
@@ -791,7 +801,7 @@
'name' => 'Regular',
'pricing_type' => 'FIXED_PRICING',
'price_money' => [
- 'amount' => intval(($itemData['price'] ?? 0) * 100),
+ 'amount' => intval(($itemData['_square_price'] ?? 0) * 100),
'currency' => 'USD'
]
]
@@ -849,12 +859,10 @@
}
add_action('wp_login', [$this, 'trackUserLogin'], 10, 2);
- add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
+ add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
- // Shared checkout UI (replaces outputCheckout)
add_filter('jvbAdditionalActions', [Checkout::class, 'render']);
- // Square-specific checkout description
add_filter('jvb_checkout_description', function (string $desc, string $provider) {
if ($provider === 'square') {
return 'Securely checkout with your name, email, and payments processed by Square.';
@@ -872,9 +880,8 @@
add_filter('jvb_checkout_browse_text', function () {
return 'browse our menu';
});
-
// Register queue executor types
- $this->registerQueueTypes();
+ add_action('init', [$this, 'registerQueueTypes'], 10);
}
/**
@@ -903,36 +910,36 @@
]);
}
- protected function registerQueueTypes(): void
+ public function registerQueueTypes(): void
{
$queue = JVB()->queue();
$executor = new IntegrationExecutor();
- $queue->registry()->register('square_sync_to', new TypeConfig(
+ $queue->registry()->register(self::$syncTo, new TypeConfig(
executor: $executor,
chunkKey: 'items',
chunkSize: 50,
maxRetries: 3
));
- $queue->registry()->register('square_delete_from', new TypeConfig(
+ $queue->registry()->register(self::$deleteFrom, new TypeConfig(
executor: $executor,
chunkKey: 'external_ids',
chunkSize: 200,
maxRetries: 2
));
- $queue->registry()->register('square_sync_from', new TypeConfig(
+ $queue->registry()->register(self::$syncFrom, new TypeConfig(
executor: $executor,
maxRetries: 3
));
- $queue->registry()->register('square_sync_customer', new TypeConfig(
+ $queue->registry()->register(self::$syncCustomer, new TypeConfig(
executor: $executor,
maxRetries: 2
));
- $queue->registry()->register('square_import', new TypeConfig(
+ $queue->registry()->register(self::$import, new TypeConfig(
executor: $executor,
maxRetries: 3
));
@@ -947,7 +954,7 @@
*/
protected function handleTheSavePost(int $postID, \WP_Post $post, bool $update, array $settings): void
{
- $this->queueOperation('sync_to', [
+ $this->queueOperation(self::$syncTo, [
'items' => [$postID],
'user_id' => $this->userID,
], [
@@ -966,7 +973,7 @@
$square_id = get_post_meta($postID, BASE . '_square_catalog_id', true);
if ($square_id) {
- $this->queueOperation('delete_from', [
+ $this->queueOperation(self::$deleteFrom, [
'external_ids' => [$square_id],
'post_id' => $postID,
], [
@@ -976,26 +983,6 @@
}
/**
- * @deprecated IntegrationExecutor handles new operations via registerQueueTypes().
- * Kept for legacy-typed operations ('square_sync_to_square') already queued.
- * Safe to remove once all legacy operations have been processed.
- */
- public function processOperation(WP_Error|array $result, object $operation, array $data): WP_Error|array
- {
- $base = strtolower($this->service_name) . '_';
- $square = array_key_exists('user', $data) ? new self((int) $data['user']) : $this;
-
- return match ($operation->type) {
- $base . 'sync_to_square' => $square->processSyncToSquare($data),
- $base . 'delete_from_square' => $square->processDeleteFromSquare($data),
- $base . 'sync_from_square' => $square->processSyncFromSquare($data),
- $base . 'sync_customer' => $square->processSyncCustomer($data),
- default => $result,
- };
- }
-
-
- /**
* Process sync to Square
*/
private function processSyncToSquare(array $data): array
@@ -1046,19 +1033,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';
@@ -1175,6 +1149,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);
@@ -1302,7 +1277,7 @@
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'])) {
+ if (empty($variation_data['name']) && empty($variation_data['_square_sku'])) {
continue;
}
@@ -1334,7 +1309,7 @@
break;
case 'sku':
- $variation['item_variation_data']['sku'] = $variation_data[$wp_field];
+ $variation['item_variation_data']['_square_sku'] = $variation_data[$wp_field];
break;
case 'track_inventory':
@@ -1385,7 +1360,7 @@
*/
protected function getVariationMapping(string $post_type): array
{
- $registrar = Registrar::getInstance($post_type));
+ $registrar = Registrar::getInstance($post_type);
if (!$registrar) {
return [];
}
@@ -1395,15 +1370,15 @@
$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(
@@ -1459,7 +1434,7 @@
*/
protected function getFieldMapping(string $post_type): array
{
- $registrar = Registrar::getInstance($post_type));
+ $registrar = Registrar::getInstance($post_type);
if (!$registrar) {
return [];
}
@@ -1472,15 +1447,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
@@ -1504,6 +1479,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'];
@@ -1547,6 +1523,7 @@
/**
* Handle customer authentication during checkout
*/
+ //TODO: Is this necessary?
public function handleCustomerAuth($data):WP_Error|array
{
$email = sanitize_email($data['email'] ?? '');
@@ -1597,7 +1574,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' => [
@@ -1620,7 +1598,6 @@
'message' => 'New customer'
];
}
- }
}
private function createCustomerAccount(string $email):WP_Error|array
@@ -1660,7 +1637,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'); // Or whatever role
// Generate password reset key
$reset_key = get_password_reset_key($user);
@@ -1861,9 +1838,6 @@
/**
* Handle order status webhook
*/
- /**
- * Handle order status webhook - NOW UPDATES POST TYPE
- */
private function handleOrderWebhook(array $data): bool
{
$order_id = $data['object']['order']['id'] ?? '';
@@ -1875,7 +1849,7 @@
}
// Find the WP post for this order
- $wp_order_id = get_option(BASE . 'square_order_map_' . $order_id);
+ $wp_order_id = $this->getOrderPost($order_id);
if ($wp_order_id) {
// Update the post meta
@@ -1896,17 +1870,12 @@
}
$meta->setAll($updates);
- $meta->save();
// 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
do_action(BASE . 'square_order_updated', $order_id, $state, $data);
@@ -1972,6 +1941,7 @@
*/
public function enqueueScripts(): void
{
+ jvbInlineStyles('forms');
$this->loadCredentials();
$sdk_url = $this->environment === 'production'
? 'https://web.squarecdn.com/v1/square.js'
@@ -1989,8 +1959,8 @@
wp_register_script(
'jvb-checkout',
JVB_URL . 'assets/js/min/checkout.min.js',
- ['jvb-utility', 'jvb-queue', 'jvb-a11y', 'jvb-cache', 'jvb-tabs', 'jvb-popup'],
- '1.1.31',
+ ['jvb-utility', 'jvb-queue', 'jvb-a11y', 'jvb-cache', 'jvb-tabs', 'jvb-popup', 'jvb-login'],
+ '1.1.32',
['strategy' => 'defer', 'in_footer' => true]
);
@@ -1999,20 +1969,18 @@
'jvb-square-checkout',
JVB_URL . 'assets/js/min/square.min.js',
['jvb-checkout', 'square-payments-sdk'],
- '1.1.31',
+ '1.1.32',
['strategy' => 'defer', 'in_footer' => true]
);
wp_enqueue_script('jvb-square-checkout');
wp_localize_script('jvb-square-checkout', 'squareConfig', [
- 'isOpen' => jvbIsOpen(),
+ 'isOpen' => jvbIsOpen()?'1':'0',
'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'),
+ 'currency' => $this->getCurrency(),
'is_logged_in' => is_user_logged_in(),
'user_email' => is_user_logged_in() ? wp_get_current_user()->user_email : '',
]);
@@ -2025,7 +1993,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;
@@ -2058,92 +2026,6 @@
return null;
}
- /**
- * 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
- {
- $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 (for customer feedback)
- */
- 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');
- }
-
- // Fetch from Square
- $response = $this->getRequest('v2/orders/' . $order_id);
-
- if (is_wp_error($response)) {
- return new WP_Error('error', 'Could not fetch order status');
- }
-
- $order = $response['order'] ?? [];
- $status_data = [
- 'state' => $order['state'] ?? 'UNKNOWN',
- 'fulfillment_eta' => $order['fulfillments'][0]['pickup_details']['pickup_at'] ?? null
- ];
-
- return [
- 'success' => true,
- 'status' => $status_data['state'],
- 'eta' => $status_data['fulfillment_eta']
- ];
- }
/**
* Process delete from Square
@@ -2319,7 +2201,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
@@ -2353,7 +2235,6 @@
// Save all values at once
$meta->setAll($values_to_save);
- $meta->save();
}
/**
@@ -2459,8 +2340,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);
@@ -2761,10 +2646,13 @@
];
}
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) => 'sq_' . $k, array_keys($array)),
+ array_map(fn($k) => '_square_' . $k, array_keys($array)),
$array
);
} else if ($content_type && !array_key_exists($content_type, $this->contentTypes)) {
@@ -2772,17 +2660,68 @@
return [];
}
$array = $this->setBaseFields();
- return array_combine(
- array_map(fn($k) => 'sq_' . $k, array_keys($array)),
- $array
- );
+ 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,
@@ -2827,6 +2766,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',
@@ -2834,18 +2778,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
@@ -2886,7 +2829,10 @@
];
break;
}
- return $fields;
+ return array_combine(
+ array_map(fn($k) => '_square_' . $k, array_keys($fields)),
+ $fields
+ );
}
protected function setFoodAndBevFields():array
{
@@ -3353,7 +3299,7 @@
}
}
- private function createSquareOrder(array $items, ?string $customer_id, array $data): array|WP_Error
+ public function createSquareOrder(array $items, ?string $customer_id, array $data): array|WP_Error
{
// Build line items for Square
$line_items = [];
@@ -3370,7 +3316,7 @@
// Ad-hoc line item (not recommended - no tax/inventory automation)
$line_item['name'] = $item['name'];
$line_item['base_price_money'] = [
- 'amount' => (int)$item['price'],
+ 'amount' => (int)$item['_square_price'],
'currency' => $this->getCurrency()
];
}
@@ -3410,7 +3356,7 @@
return $this->postRequest('orders', $order_data);
}
- private function createSquarePayment(
+ public function createSquarePayment(
string $source_id,
string $idempotency_key,
int $amount_cents,
@@ -3441,7 +3387,7 @@
return $this->postRequest('payments', $payment_data);
}
- private function saveOrderToWordPress(array $order_data): int
+ public function saveOrderToWordPress(array $order_data): int
{
// Extract customer info
$customer_email = $order_data['customer']['email'] ?? '';
@@ -3462,7 +3408,7 @@
// Create order post
$order_post_id = wp_insert_post([
- 'post_type' => BASE . '_sq_orders',
+ '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
@@ -3475,7 +3421,7 @@
// Save all order meta
$meta = Meta::forPost($order_post_id);
- $fields = $this->getSquarePostConfig('_sq_orders')['fields'];
+ $fields = $this->getOrderFields();
unset($fields['post_title']);
$meta->setAll([
@@ -3495,10 +3441,6 @@
'created_at' => current_time('mysql'),
'updated_at' => current_time('mysql')
]);
- $meta->save();
-
- // 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;
}
@@ -3554,17 +3496,10 @@
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;
}
@@ -3640,4 +3575,72 @@
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);
+
+ }
}
--
Gitblit v1.10.0