Changeset 3368696

Timestamp:

09/26/2025 08:31:47 PM (5 months ago)

Author:

loystarapp

Message:

Update to version 3.2.6: Fix duplicate transaction prevention and amount precision formatting

Location:

loystar-woocommerce-loyalty-program/trunk

Files:

• changelog.txt (modified) (1 diff)
• includes/api/class-wc-ls-api.php (modified) (8 diffs)
• loystar.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

loystar-woocommerce-loyalty-program/trunk/changelog.txt

@@ -1 +1 @@
 == Changelog ==
+
+= 3.2.6 =
+* Fixed: Amount precision issue - order totals now preserve exact decimal values instead of rounding
+* Fixed: Sales transaction duplicate prevention - prevents duplicate transaction posts
+* Enhanced: GraphQL order totals and line item amounts maintain decimal precision (e.g., $694.95 stays $694.95, not $695)
+* Enhanced: Sales transaction API duplicate prevention with success-only marking
+* Improved: Consistent decimal handling across both GraphQL and REST API endpoints
+
+= 3.2.3 =
+* MAJOR: Added GraphQL MTier integration for real-time order synchronization
+* NEW: Orders now automatically sent to Loystar when placed (processing/on-hold status)
+* NEW: Order status updates sent via GraphQL when completed (prevents duplicates)  
+* NEW: GraphQL configuration settings in admin panel with JWT token support
+* Enhanced: Smart duplicate prevention - orders sent via GraphQL are updated, not recreated
+* Enhanced: Comprehensive order data including delivery addresses and order notes
+* Enhanced: Fallback to REST API for orders not initially sent via GraphQL
+* Improved: Real-time order integration replaces delayed completion-only sync
 
 = 3.2.2 =

loystar-woocommerce-loyalty-program/trunk/includes/api/class-wc-ls-api.php

@@ -12 +12 @@
      * @var string
      */
-    protected $base_url = 'https://api.loystar.co/api/v2/';
+    protected $base_url = 'https://api0.loystar.co/api/v2/';
 
     /**
@@ -99 +99 @@
         // Force production environment
         $this->_env = 'production';
-        $this->base_url = 'https://api.loystar.co/api/v2/';
+        $this->base_url = 'https://api0.loystar.co/api/v2/';
 
         // Initialize access token property
@@ -231 +231 @@
         // Return original if too short or invalid
         return $phone;
+    }
+
+    /**
+     * Send order to Loystar MTier GraphQL endpoint
+     * 
+     * @param WC_Order|int $order
+     * @param string $status Order status for Loystar
+     * @param bool $force_resend Force re-sending even if already sent
+     * @return bool|array Returns order data on success, false on failure
+     */
+    public function send_order_to_loystar_graphql($order, $status = 'pending', $force_resend = false) {
+        $this->clear_transaction_error();
+        
+        if (is_int($order)) {
+            try {
+                $order = new WC_Order($order);
+            } catch (Exception $ex) {
+                $this->set_transaction_error_prop('Invalid order ID', 1);
+                return false;
+            }
+        }
+        
+        $order_id = $order->get_id();
+        
+        // Check if order is already sent (duplicate prevention)
+        $loystar_order_sent = get_post_meta($order_id, '_loystar_order_sent', true);
+        if ($loystar_order_sent === 'yes' && !$force_resend) {
+            error_log("Loystar GraphQL: Order {$order_id} already sent, skipping duplicate send");
+            $this->set_transaction_error_prop('Order already sent to Loystar', 1);
+            return false;
+        }
+        
+        if ($force_resend) {
+            error_log("Loystar GraphQL: Force re-sending order {$order_id} with status: {$status}");
+        }
+        
+        error_log("Loystar GraphQL: Starting order {$order_id} sync with status: {$status}");
+        
+        // Get GraphQL endpoint and credentials
+        global $wc_ls_option_meta;
+        $graphql_url = 'https://mtier0.loystar.co/graphql'; // Constant URL for all merchants
+        $jwt_token = get_option($wc_ls_option_meta['mtier_jwt_token']);
+        $merchant_id = (int)get_option($wc_ls_option_meta['m_id']);
+        
+        // Fallback: Use access token if JWT token not available
+        if (empty($jwt_token)) {
+            $jwt_token = get_option($wc_ls_option_meta['access_token']);
+            error_log('Loystar GraphQL: Using access token as JWT fallback');
+        }
+        
+        if (empty($jwt_token) || empty($merchant_id)) {
+            $this->set_transaction_error_prop('Missing authentication token or merchant ID', 1);
+            return false;
+        }
+        
+        // Prepare order data for GraphQL
+        $order_data = $this->prepare_loystar_order_data($order, $merchant_id, $status);
+        if (!$order_data) {
+            return false;
+        }
+        
+        // Store the UUID we're sending to Loystar (needed for payOneOrder later)
+        $loystar_uuid = $order_data['orderID'];
+        update_post_meta($order_id, '_loystar_order_uuid', $loystar_uuid);
+        
+        // GraphQL mutation - MUST match working example exactly
+        $mutation = 'mutation AddOrders($data: order!) {
+  addOrders(data: $data) {
+    order_id
+    customer {
+      user_id
+      __typename
+    }
+    status
+    __typename
+  }
+}';
+        
+        $payload = [
+            'operationName' => 'AddOrders',  // CRITICAL: Must include operationName
+            'query' => $mutation,
+            'variables' => [
+                'data' => $order_data
+            ]
+        ];
+        
+        // COMPREHENSIVE LOGGING: Log the complete request payload for debugging
+        error_log("=== LOYSTAR GRAPHQL REQUEST DEBUG - ORDER {$order_id} ===");
+        error_log("Endpoint: " . $graphql_url);
+        error_log("JWT Token (first 20 chars): " . substr($jwt_token, 0, 20) . "...");
+        error_log("Complete Request Payload:");
+        error_log(json_encode($payload, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        error_log("Order Data Structure:");
+        error_log(json_encode($order_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        error_log("Order Items Count: " . count($order_data['order_items']));
+        foreach ($order_data['order_items'] as $index => $item) {
+            error_log("Item " . ($index + 1) . ": " . $item['name'] . " - total_quantity: " . $item['total_quantity'] . ", bundle_quantity: " . $item['bundle_quantity'] . ", track_inventory: " . ($item['track_inventory'] ? 'true' : 'false'));
+        }
+        error_log("=== END REQUEST DEBUG ===");
+        
+        // Make GraphQL request
+        $response = wp_remote_post($graphql_url, [
+            'headers' => [
+                'Content-Type' => 'application/json',
+                'Authorization' => 'Bearer ' . $jwt_token
+            ],
+            'body' => json_encode($payload),
+            'timeout' => 30
+        ]);
+        
+        if (is_wp_error($response)) {
+            $this->set_transaction_error_prop('GraphQL request failed: ' . $response->get_error_message(), -1);
+            $this->add_log($order_id, 'graphql_request_error', $response->get_error_message());
+            return false;
+        }
+        
+        $response_body = wp_remote_retrieve_body($response);
+        $response_data = json_decode($response_body, true);
+        $http_status = wp_remote_retrieve_response_code($response);
+        
+        // COMPREHENSIVE LOGGING: Log the complete response for debugging
+        error_log("=== LOYSTAR GRAPHQL RESPONSE DEBUG - ORDER {$order_id} ===");
+        error_log("HTTP Status: " . $http_status);
+        error_log("Raw Response Body:");
+        error_log($response_body);
+        error_log("Parsed Response Data:");
+        error_log(json_encode($response_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        error_log("=== END RESPONSE DEBUG ===");
+        
+        if (isset($response_data['errors'])) {
+            error_log("LOYSTAR ERROR DETECTED - ORDER {$order_id}: " . json_encode($response_data['errors']));
+            $error_message = $response_data['errors'][0]['message'] ?? 'Unknown GraphQL error';
+            $this->set_transaction_error_prop('GraphQL error: ' . $error_message, 1);
+            $this->add_log($order_id, 'graphql_error', $error_message);
+            return false;
+        }
+        
+        if (isset($response_data['data']['addOrders'])) {
+            $loystar_order = $response_data['data']['addOrders'];
+            
+            // Store Loystar order ID in meta for future updates
+            // The working GraphQL response returns order_id instead of id
+            $loystar_order_id = $loystar_order['order_id'] ?? $loystar_order['id'] ?? null;
+            
+            if ($loystar_order_id) {
+                update_post_meta($order_id, '_loystar_order_id', $loystar_order_id);
+                update_post_meta($order_id, '_loystar_order_sent', 'yes');
+                update_post_meta($order_id, '_loystar_order_status', $status);
+                
+                $this->add_log($order_id, 'graphql_order_success', 'Order sent to Loystar successfully: ' . $loystar_order_id);
+                return $loystar_order;
+            } else {
+                $this->set_transaction_error_prop('No order ID in GraphQL response', -1);
+                return false;
+            }
+        }
+        
+        $this->set_transaction_error_prop('Unexpected GraphQL response format', -1);
+        return false;
+    }
+
+    /**
+     * Mark order as paid in Loystar using payOneOrder mutation
+     * 
+     * @param int $order_id
+     * @return bool
+     */
+    public function mark_loystar_order_as_paid($order_id) {
+        // Use the UUID we generated and sent to Loystar, not the numeric ID they returned
+        $loystar_order_uuid = get_post_meta($order_id, '_loystar_order_uuid', true);
+        
+        if (empty($loystar_order_uuid)) {
+            $this->set_transaction_error_prop('No Loystar order UUID found for update', 1);
+            return false;
+        }
+        
+        // Get GraphQL endpoint and credentials
+        global $wc_ls_option_meta;
+        $graphql_url = 'https://mtier0.loystar.co/graphql'; // Constant URL for all merchants
+        $jwt_token = get_option($wc_ls_option_meta['mtier_jwt_token']);
+        
+        // Fallback: Use access token if JWT token not available
+        if (empty($jwt_token)) {
+            $jwt_token = get_option($wc_ls_option_meta['access_token']);
+            error_log('Loystar GraphQL Update: Using access token as JWT fallback');
+        }
+        
+        if (empty($jwt_token)) {
+            $this->set_transaction_error_prop('Missing authentication token', 1);
+            return false;
+        }
+        
+        // Use the correct payOneOrder query to mark order as paid
+        $query = 'query payOneOrder($id: String!) {
+            payOneOrder(id: $id) {
+                id
+                order_id
+                merchant_id
+                customer {
+                    first_name
+                    last_name
+                    user_id
+                    phone_number
+                    email
+                    delivery_address
+                    __typename
+                }
+                orderNotes
+                total
+                order_type
+                processed_by
+                reference_code
+                created_at
+                status
+                paid_at
+                paid_time
+                updated_at
+                expiry_date
+                __typename
+            }
+        }';
+        
+        $payload = [
+            'operationName' => 'payOneOrder',
+            'query' => $query,
+            'variables' => [
+                'id' => $loystar_order_uuid
+            ]
+        ];
+        
+        // Make GraphQL request
+        $response = wp_remote_post($graphql_url, [
+            'headers' => [
+                'Content-Type' => 'application/json',
+                'Authorization' => 'Bearer ' . $jwt_token
+            ],
+            'body' => json_encode($payload),
+            'timeout' => 30
+        ]);
+        
+        if (is_wp_error($response)) {
+            $this->set_transaction_error_prop('GraphQL update request failed: ' . $response->get_error_message(), -1);
+            $this->add_log($order_id, 'graphql_update_error', $response->get_error_message());
+            return false;
+        }
+        
+        $response_body = wp_remote_retrieve_body($response);
+        $response_data = json_decode($response_body, true);
+        
+        // Debug: Log the response
+        error_log("=== LOYSTAR payOneOrder QUERY DEBUG - ORDER {$order_id} ===");
+        error_log("UUID used: " . $loystar_order_uuid);
+        error_log("Response: " . $response_body);
+        error_log("Parsed Data: " . print_r($response_data, true));
+        error_log("=== END payOneOrder DEBUG ===");
+        
+        if (isset($response_data['errors'])) {
+            $error_message = $response_data['errors'][0]['message'] ?? 'Unknown GraphQL payment error';
+            $this->set_transaction_error_prop('GraphQL payment error: ' . $error_message, 1);
+            $this->add_log($order_id, 'graphql_payment_error', $error_message);
+            return false;
+        }
+        
+        if (isset($response_data['data']['payOneOrder'])) {
+            $order_data = $response_data['data']['payOneOrder'];
+            // Update local meta with paid status
+            update_post_meta($order_id, '_loystar_order_status', 'paid');
+            $this->add_log($order_id, 'graphql_payment_success', 'Order payment processed in Loystar: ' . $loystar_order_uuid);
+            return true;
+        }
+        
+        $this->set_transaction_error_prop('Unexpected GraphQL payment response format: ' . $response_body, -1);
+        return false;
+    }
+
+    /**
+     * Prepare order data for Loystar GraphQL mutation
+     * 
+     * @param WC_Order $order
+     * @param int $merchant_id
+     * @param string $status
+     * @return array|false
+     */
+    private function prepare_loystar_order_data($order, $merchant_id, $status = 'pending') {
+        $order_id = $order->get_id();
+        
+        // Get customer data using proper methods
+        $fname = $order->get_billing_first_name();
+        $lname = $order->get_billing_last_name();
+        $email = $order->get_billing_email();
+        $phone = $order->get_billing_phone();
+        
+        // Get custom fields
+        global $wc_ls_woo_custom_field_meta;
+        $dob = trim(wc_loystar()->get_woo_order_meta($order_id, '_'.$wc_ls_woo_custom_field_meta['billing_dob'], true));
+        $sex = strtoupper(trim(wc_loystar()->get_woo_order_meta($order_id, '_'.$wc_ls_woo_custom_field_meta['billing_gender'], true)));
+        
+        // Normalize phone and set defaults
+        if (empty($phone)) {
+            $phone = '+234080' . rand(1000000, 9999999);
+        } else {
+            $phone = $this->normalize_phone_number($phone);
+        }
+        
+        if (empty($sex) || !in_array($sex, ['M', 'F'])) {
+            $sex = '';  // Leave empty for GraphQL
+        }
+        
+        // Get delivery address
+        $use_shipping = !empty($order->get_shipping_address_1()) || !empty($order->get_shipping_address_2());
+        
+        if ($use_shipping) {
+            $delivery_address = trim(implode(', ', array_filter([
+                $order->get_shipping_address_1(),
+                $order->get_shipping_address_2(),
+                $order->get_shipping_city(),
+                $order->get_shipping_state(),
+                $order->get_shipping_postcode(),
+                $order->get_shipping_country()
+            ])));
+        } else {
+            $delivery_address = trim(implode(', ', array_filter([
+                $order->get_billing_address_1(),
+                $order->get_billing_address_2(),
+                $order->get_billing_city(),
+                $order->get_billing_state(),
+                $order->get_billing_postcode(),
+                $order->get_billing_country()
+            ])));
+        }
+        
+        // Prepare customer data - MUST match working example structure
+        $customer_data = [
+            'user_id' => $order->get_customer_id() ?: 0,
+            'first_name' => $fname,
+            'last_name' => $lname,
+            'phone_number' => $phone,
+            'email' => $email,
+            'sex' => !empty($sex) ? $sex : '-',  // Use '-' as default like working example
+            'address' => '',  // Required field in working example
+            'delivery_address' => $delivery_address
+        ];
+        // Allow integrators to adjust any customer fields (avoid hardcoding assumptions)
+        $customer_data = apply_filters('wc_ls_loystar_customer_data', $customer_data, $order);
+        
+        // Prepare order items
+        $order_items = [];
+        $order_number = (string) $order->get_order_number(); // Get the order number for item association
+        
+        foreach ($order->get_items() as $item_id => $item) {
+            $product = $item->get_product();
+            
+            if (!$product) {
+                continue;
+            }
+            
+            // Get Loystar equivalent product ID
+            $wc_product_id = $product->get_id();
+            $loystar_product_id = wc_loystar()->get_equiv_loystar_product($wc_product_id);
+            
+            // Skip items that don't have a Loystar product mapping
+            if (empty($loystar_product_id)) {
+                $this->add_log($order->get_id(), 'product_sync_warning', 
+                    "Product {$wc_product_id} ({$item->get_name()}) not synced with Loystar - skipping from order");
+                continue;
+            }
+            
+            // Calculate unit price and total amount correctly
+            $unit_price = (float) ($item->get_subtotal() / $item->get_quantity());
+            $total_amount = (float) $item->get_total();
+            
+            // Get product variants if applicable
+            $variants = [];
+            if ($product->is_type('variation')) {
+                $variation_attributes = $product->get_variation_attributes();
+                foreach ($variation_attributes as $attribute_name => $attribute_value) {
+                    $variants[] = [
+                        'name' => wc_attribute_label($attribute_name),
+                        'value' => $attribute_value,
+                        'price' => '0.00'
+                    ];
+                }
+            }
+            
+            // Derive optional category mapping (avoid hard-coded values)
+            $merchant_product_category_id = null;
+            $mapped_cat = get_post_meta($wc_product_id, '_loystar_product_category_id', true);
+            if (!empty($mapped_cat)) {
+                $merchant_product_category_id = (int) $mapped_cat;
+            }
+            // Allow override via filter if your store maps Woo -> Loystar categories elsewhere
+            $merchant_product_category_id = apply_filters(
+                'wc_ls_loystar_product_category_id',
+                $merchant_product_category_id,
+                $product,
+                $order
+            );
+
+            // Structure must match working example exactly
+            $track_inventory = apply_filters('wc_ls_loystar_track_inventory', true, $product, $order);
+            $product_type = apply_filters('wc_ls_loystar_product_type', 'product', $product, $order);
+
+            $item_data = [
+                // IMPORTANT: Use the actual merchant ID for this tenant
+                'merchant_id' => (int) $merchant_id,
+                'name' => $item->get_name(),
+                'picture' => wp_get_attachment_image_url($product->get_image_id(), 'full') ?: null,
+                'quantity' => $item->get_quantity(),
+                'price' => (string) number_format($unit_price, 1, '.', ''), // Format like "44.0"
+                'id' => (int) $loystar_product_id, // This is the internal Loystar ID
+                'service_id' => null,
+                'service_name' => null,
+                'description' => $product->get_short_description() ?: null,
+                'product_type' => $product_type,
+                'product_id' => (int) $loystar_product_id, // Product association field
+                'amount' => $total_amount, // Preserve decimal precision for accurate amounts
+                'total_quantity' => (int) $item->get_quantity(), // CRITICAL FIX: Should be QUANTITY not amount!
+                'tax' => null,
+                'tax_rate' => null,
+                'tax_type' => null,
+                'track_inventory' => (bool) $track_inventory, // true by default, but filterable
+                'merchant_loyalty_program_id' => null,
+                'merchant_product_category_id' => $merchant_product_category_id !== null ? (int) $merchant_product_category_id : null,
+                'variants' => [],
+                'custom_quantities' => [],
+                'bundle_quantity' => (string) number_format($item->get_quantity(), 1, '.', ''), // CRITICAL FIX: Should be QUANTITY not amount!
+                'bundle_id' => null,
+                'weight' => null
+            ];
+            // Allow integrators to adjust any item fields (avoid hardcoding assumptions)
+            $item_data = apply_filters('wc_ls_loystar_order_item_data', $item_data, $item, $product, $order);
+            $order_items[] = $item_data;
+        }
+        
+        // Get merchant settings
+        global $wc_ls_option_meta;
+        $merchant_phone = get_option($wc_ls_option_meta['merchant_phone'], '');
+        $merchant_name = get_option('blogname', '');
+        $merchant_email = get_option('admin_email', '');
+        
+        // Prepare complete order data - MUST match working example structure
+        $created_date = $order->get_date_created();
+        $expiry_date = clone $created_date;
+        $expiry_date->modify('+3 days'); // Add 3 days like working example
+        
+        // Allow integrators to override order_type; default to 'in-store' to match working example
+        $order_type = apply_filters('wc_ls_loystar_order_type', 'in-store', $order);
+        // Allow integrators to override processed_by; default to 'woocommerce' as requested
+        $processed_by = apply_filters('wc_ls_loystar_processed_by', 'woocommerce', $order);
+
+        $order_data = [
+            'orderID' => wp_generate_uuid4(),
+            'order_id' => (string) $order->get_order_number(),
+            'merchant_id' => $merchant_id,
+            'merchant_phone_number' => $merchant_phone,
+            'merchant_email' => $merchant_email,
+            'merchant_name' => $merchant_name,
+            'orderNotes' => $order->get_customer_note() ?: '',
+            'customer' => $customer_data,
+            'order_items' => $order_items,
+            'created_at' => $created_date->format('c'), // ISO format with timezone like working example
+            'status' => $status,
+            'processed_by' => $processed_by,
+            'reference_code' => $order->get_transaction_id() ?: '',
+            'order_type' => $order_type,
+            'paid_at' => $order->get_date_paid() ? $order->get_date_paid()->format('c') : null,
+            'paid_time' => $order->get_date_paid() ? $order->get_date_paid()->format('c') : null,
+            'expiry_date' => $expiry_date->format('c'), // Ensure this is not overwritten later
+            // Total should preserve decimal precision to match exact order amount
+            'total' => (float) $order->get_total()
+        ];
+        // Allow integrators to adjust any order-level fields (avoid hardcoding assumptions)
+        $order_data = apply_filters('wc_ls_loystar_order_data', $order_data, $order);
+        
+        // Critical validation: Ensure proper order data
+        if (empty($order_data['orderID']) || empty($order_data['order_id'])) {
+            $this->add_log($order->get_id(), 'order_validation_error', 'Order ID is required for GraphQL submission');
+            return false;
+        }
+        
+        // Validate that all order items have required fields
+        foreach ($order_items as $item) {
+            if (empty($item['product_id']) || empty($item['name'])) {
+                $this->add_log($order->get_id(), 'item_validation_error', 
+                    "Order item validation failed - missing product_id or name for item: " . ($item['name'] ?? 'unknown'));
+                return false;
+            }
+        }
+        
+        // Log the order structure for debugging
+        error_log("Loystar Order Data: Order ID = {$order_data['order_id']}, Items = " . count($order_items) . ", Total = {$order_data['total']}");
+        
+        return $order_data;
+    }
+
+    /**
+     * Map WooCommerce status to Loystar status
+     * 
+     * @param string $woo_status
+     * @param WC_Order $order (optional) - Used to check payment status
+     * @return string
+     */
+    public function map_woo_status_to_loystar($woo_status, $order = null) {
+        $status_map = [
+            'pending' => 'pending',
+            'processing' => 'processing',
+            'on-hold' => 'pending',
+            'completed' => 'paid',
+            'cancelled' => 'cancelled',
+            'refunded' => 'cancelled',
+            'failed' => 'cancelled'
+        ];
+        
+        $mapped_status = $status_map[$woo_status] ?? 'pending';
+        
+        // If order is provided and has been paid electronically, always use "paid" status
+        if ($order && $this->is_order_paid_electronically($order)) {
+            $mapped_status = 'paid';
+            error_log("Loystar Status Mapping: Order {$order->get_id()} paid electronically - status overridden to 'paid'");
+        }
+        
+        return $mapped_status;
+    }
+    
+    /**
+     * Check if order was paid electronically (not cash/manual)
+     * 
+     * @param WC_Order $order
+     * @return bool
+     */
+    public function is_order_paid_electronically($order) {
+        // Check if order has a paid date (indicates electronic payment)
+        $date_paid = $order->get_date_paid();
+        if (!$date_paid) {
+            return false;
+        }
+        
+        // Check payment method - electronic payment methods
+        $payment_method = $order->get_payment_method();
+        $electronic_payment_methods = [
+            'stripe', 'paypal', 'square', 'authorize_net', 'braintree',
+            'razorpay', 'paystack', 'flutterwave', 'bacs', 'cheque',
+            'cod' // Exclude cash on delivery
+        ];
+        
+        // If it's COD (cash on delivery), it's not electronic
+        if ($payment_method === 'cod') {
+            return false;
+        }
+        
+        // If order is marked as paid and has a transaction ID, consider it electronic
+        if ($order->get_transaction_id() && $date_paid) {
+            return true;
+        }
+        
+        // If payment method is in electronic list and order is paid
+        if (in_array($payment_method, $electronic_payment_methods) && $date_paid) {
+            return true;
+        }
+        
+        // Default: if has paid date and not COD, likely electronic
+        return $date_paid !== null && $payment_method !== 'cod';
     }
 
@@ -478 +1040 @@
         $m_id = update_option($wc_ls_option_meta['m_id'],$r_data['data']['id'],false);
         $expire = update_option($wc_ls_option_meta['expiring'],$headers['expiry'],false);
+        
+        // Extract phone from login response if available (JWT will come from MTier)
+        $phone = null;
+        if (isset($r_data['data']['phone'])) {
+            $phone = $r_data['data']['phone'];
+        } elseif (isset($r_data['data']['mobile'])) {
+            $phone = $r_data['data']['mobile'];
+        } elseif (isset($r_data['data']['phone_number'])) {
+            $phone = $r_data['data']['phone_number'];
+        } elseif (isset($r_data['data']['mobile_number'])) {
+            $phone = $r_data['data']['mobile_number'];
+        }
+        
+        if ($phone) {
+            update_option($wc_ls_option_meta['merchant_phone'], $phone, false);
+            error_log('Loystar: Merchant phone stored from login: ' . $phone);
+        }
+        
+        // Get JWT token from MTier authentication
+        $this->authenticate_with_mtier(trim($email), $password);
+        
         $sub = $this->get_merchant_subscription();
         $sub_expire = update_option($wc_ls_option_meta['sub_expires'],$sub['expires_on'],false);
@@ -505 +1088 @@
         }*/
        return true;
+    }
+
+    /**
+     * Authenticate with MTier GraphQL service to get JWT token
+     * 
+     * @param string $email
+     * @param string $password
+     * @return bool
+     */
+    private function authenticate_with_mtier($email, $password) {
+        global $wc_ls_option_meta;
+        
+        $mtier_login_url = 'https://mtier0.loystar.co/auth/login';
+        
+        $args = array(
+            'method' => 'POST',
+            'headers' => array(
+                'Content-Type' => 'application/json',
+                'Accept' => 'application/json'
+            ),
+            'body' => json_encode(array(
+                'email' => trim($email),
+                'password' => $password
+            )),
+            'timeout' => 30
+        );
+        
+        error_log('Loystar MTier: Attempting authentication with ' . $mtier_login_url . ' for email: ' . $email);
+        
+        $response = wp_remote_post($mtier_login_url, $args);
+        
+        if (is_wp_error($response)) {
+            error_log('Loystar MTier: Authentication failed - ' . $response->get_error_message());
+            return false;
+        }
+        
+        $response_code = wp_remote_retrieve_response_code($response);
+        $response_body = wp_remote_retrieve_body($response);
+        $response_headers = wp_remote_retrieve_headers($response);
+        $response_data = json_decode($response_body, true);
+        
+        error_log('Loystar MTier: Response code: ' . $response_code);
+        error_log('Loystar MTier: Response headers: ' . print_r($response_headers, true));
+        error_log('Loystar MTier: Response body: ' . $response_body);
+        
+        if ($response_code === 200) {
+            // Try different possible token locations, starting with the correct one
+            $jwt_token = null;
+            if (isset($response_data['data']['mtierToken'])) {
+                $jwt_token = $response_data['data']['mtierToken'];
+                error_log('Loystar MTier: Found token in response[data][mtierToken]');
+            } elseif (isset($response_data['token'])) {
+                $jwt_token = $response_data['token'];
+                error_log('Loystar MTier: Found token in response[token]');
+            } elseif (isset($response_data['access_token'])) {
+                $jwt_token = $response_data['access_token'];
+                error_log('Loystar MTier: Found token in response[access_token]');
+            } elseif (isset($response_data['data']['token'])) {
+                $jwt_token = $response_data['data']['token'];
+                error_log('Loystar MTier: Found token in response[data][token]');
+            } elseif (isset($response_headers['Authorization'])) {
+                $jwt_token = str_replace('Bearer ', '', $response_headers['Authorization']);
+                error_log('Loystar MTier: Found token in Authorization header');
+            }
+            
+            if ($jwt_token) {
+                $token_update = update_option($wc_ls_option_meta['mtier_jwt_token'], $jwt_token, false);
+                error_log('Loystar MTier: JWT Token obtained and stored: ' . substr($jwt_token, 0, 20) . '... (Update result: ' . ($token_update ? 'success' : 'failed') . ')');
+                
+                // Verify token was stored
+                $stored_token = get_option($wc_ls_option_meta['mtier_jwt_token']);
+                error_log('Loystar MTier: Verification - stored token: ' . (!empty($stored_token) ? 'Found' : 'Not found'));
+                
+                // Also extract phone if available in MTier response
+                if (isset($response_data['user']['phone'])) {
+                    update_option($wc_ls_option_meta['merchant_phone'], $response_data['user']['phone'], false);
+                    error_log('Loystar MTier: Phone number stored: ' . $response_data['user']['phone']);
+                } elseif (isset($response_data['phone'])) {
+                    update_option($wc_ls_option_meta['merchant_phone'], $response_data['phone'], false);
+                    error_log('Loystar MTier: Phone number stored: ' . $response_data['phone']);
+                }
+                
+                return true;
+            } else {
+                error_log('Loystar MTier: No token found in any expected location');
+                error_log('Loystar MTier: Full response structure: ' . print_r($response_data, true));
+            }
+        } else {
+            error_log('Loystar MTier: Authentication failed - Response code: ' . $response_code);
+            if (isset($response_data['message'])) {
+                error_log('Loystar MTier: Error message: ' . $response_data['message']);
+            }
+            if (isset($response_data['error'])) {
+                error_log('Loystar MTier: Error details: ' . print_r($response_data['error'], true));
+            }
+        }
+        
+        return false;
     }
 
@@ -883 +1564 @@
         }
         $order_id = $order->ID;
-        //the transaction was attempted to be sent, so update the meta
-        wc_loystar()->update_woo_order_meta($order_id,WC_LS_ORDER_TRANS_SEND_KEY,'1');
+        
+        // DUPLICATE PREVENTION: Check if transaction was already sent successfully
+        $already_sent = wc_loystar()->get_woo_order_meta($order_id, WC_LS_ORDER_TRANS_SEND_KEY);
+        if ($already_sent == '1') {
+            error_log("Loystar Sales Transaction: Order {$order_id} transaction already sent - preventing duplicate");
+            return true; // Return true as transaction was already successful
+        }
+        
+        error_log("Loystar Sales Transaction: Sending order {$order_id} to sales endpoint");
         //continue :)
         $branch = wc_loystar()->get_site_branch();
@@ -1116 +1804 @@
             //quantity of item 
             $transaction_data_array['quantity'] = $item_data->get_quantity();
-            //timestamp
-            $transaction_data_array['created_at'] = time();
+            //timestamp - use actual order creation date, not current time
+            $transaction_data_array['created_at'] = $order->get_date_created()->format('Y-m-d H:i:s');
             //product type
             $transaction_data_array['product_type'] = "product";
@@ -1167 +1855 @@
         //all went through
         $this->add_log($order_id,'transaction_sent','true');
+        
+        // Mark transaction as successfully sent to prevent duplicates
+        wc_loystar()->update_woo_order_meta($order_id,WC_LS_ORDER_TRANS_SEND_KEY,'1');
+        error_log("Loystar Sales Transaction: Order {$order_id} transaction sent successfully - marked to prevent duplicates");
+        
         //add others, this isn't necessary, just to keep record
         foreach($r_data as $key=>$value){

loystar-woocommerce-loyalty-program/trunk/loystar.php

@@ -6 +6 @@
  * Author: Loystar Solutions
  * Author URI: http://loystar.co
- * Version: 3.2.2
+ * Version: 3.2.6
  * Requires at least: 5.0.0
  * Tested up to: 6.8.0
@@ -22 +22 @@
 define( 'WC_LS_PLUGIN_FILE', __FILE__ );
 define( 'WC_LS_TEXT_DOMAIN', 'loystar-woocommerce-loyalty-program' );
-define( 'WC_LS_PLUGIN_VERSION', '3.2.2' );
+define( 'WC_LS_PLUGIN_VERSION', '3.2.6' );
 define( 'WC_LS_CLASS_FILE_PREFIX', 'class-wc-ls-' );
 
@@ -49 +49 @@
     'extra_meta'                => 'wc_loystar_extra_meta', // Incase we need some extras.
     'global_notices'            => 'wc_loystar_notices',
+    // GraphQL MTier settings (automatically obtained from login)
+    'mtier_jwt_token'           => 'wc_loystar_mtier_jwt_token', // JWT token from login response
+    'merchant_phone'            => 'wc_loystar_merchant_phone', // Merchant phone from login response
 );
 

loystar-woocommerce-loyalty-program/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.8.0
 Requires PHP: 7.4
-Stable tag: 3.2.2
+Stable tag: 3.2.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -114 +114 @@
 == Changelog ==
 
+= 3.2.6 =
+* Fixed: Amount precision issue - order totals now preserve exact decimal values instead of rounding
+* Fixed: Sales transaction duplicate prevention - prevents duplicate transaction posts
+* Enhanced: GraphQL order totals and line item amounts maintain decimal precision (e.g., $694.95 stays $694.95, not $695)
+* Enhanced: Sales transaction API duplicate prevention with success-only marking
+* Improved: Consistent decimal handling across both GraphQL and REST API endpoints
+
+= 3.2.3 =
+* MAJOR: Added GraphQL MTier integration for real-time order synchronization
+* NEW: Orders now automatically sent to Loystar when placed (processing/on-hold status)
+* NEW: Order status updates sent via GraphQL when completed (prevents duplicates)  
+* NEW: GraphQL configuration settings in admin panel with JWT token support
+* Enhanced: Smart duplicate prevention - orders sent via GraphQL are updated, not recreated
+* Enhanced: Comprehensive order data including delivery addresses and order notes
+* Enhanced: Fallback to REST API for orders not initially sent via GraphQL
+* Improved: Real-time order integration replaces delayed completion-only sync
+
 = 3.2.2 =
 * Patch: Minor enhancements and optimizations