Changeset 3454574

Timestamp:

02/05/2026 11:42:21 AM (2 weeks ago)

Author:

shift8

Message:

Contact, business partner match logic, new tests

Location:

shift8-integration-for-gravity-forms-and-sap-business-one/trunk

Files:

• cli-test-submission.php (modified) (1 diff)
• includes/class-shift8-gravitysap-sap-service.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)
• shift8-gravitysap.php (modified) (17 diffs)

shift8-integration-for-gravity-forms-and-sap-business-one/trunk/cli-test-submission.php

@@ -1322 +1322 @@
 
 WP_CLI::add_command('shift8-gravitysap-masterdata', 'Shift8_GravitySAP_MasterData_Command');
+
+/**
+ * Test Business Partner lookup for duplicate detection
+ * 
+ * This command tests the performance and accuracy of looking up existing
+ * Business Partners in SAP B1 based on name, country, and postal code.
+ */
+class Shift8_GravitySAP_BP_Lookup_Command {
+    
+    /**
+     * Search for existing Business Partners matching criteria
+     *
+     * ## OPTIONS
+     *
+     * --name=<name>
+     * : Business Partner name to search for (case-insensitive)
+     *
+     * --country=<country>
+     * : 2-letter country code (e.g., US, CA, GB)
+     *
+     * --postal=<postal>
+     * : Postal/ZIP code
+     *
+     * [--verbose]
+     * : Show detailed timing and query information
+     *
+     * ## EXAMPLES
+     *
+     *     wp shift8-gravitysap-bp-lookup search --name="Test Company" --country=US --postal=12345
+     *     wp shift8-gravitysap-bp-lookup search --name="Acme Corp" --country=CA --postal="M5V 1A1" --verbose
+     *
+     * @param array $args
+     * @param array $assoc_args
+     */
+    public function search($args, $assoc_args) {
+        $name = isset($assoc_args['name']) ? sanitize_text_field($assoc_args['name']) : '';
+        $country = isset($assoc_args['country']) ? strtoupper(sanitize_text_field($assoc_args['country'])) : '';
+        $postal = isset($assoc_args['postal']) ? sanitize_text_field($assoc_args['postal']) : '';
+        $verbose = isset($assoc_args['verbose']);
+        
+        if (empty($name)) {
+            WP_CLI::error('Please specify a Business Partner name: --name="Company Name"');
+            return;
+        }
+        
+        if (empty($country)) {
+            WP_CLI::error('Please specify a country code: --country=US');
+            return;
+        }
+        
+        if (empty($postal)) {
+            WP_CLI::error('Please specify a postal code: --postal=12345');
+            return;
+        }
+        
+        WP_CLI::line('');
+        WP_CLI::line('=== Business Partner Lookup Test ===');
+        WP_CLI::line('');
+        WP_CLI::line('Search Criteria:');
+        WP_CLI::line("  Name:    {$name} (case-insensitive)");
+        WP_CLI::line("  Country: {$country}");
+        WP_CLI::line("  Postal:  {$postal}");
+        WP_CLI::line('');
+        
+        try {
+            // Get SAP settings
+            $sap_settings = get_option('shift8_gravitysap_settings', array());
+            
+            if (empty($sap_settings['sap_endpoint']) || empty($sap_settings['sap_username']) || empty($sap_settings['sap_password'])) {
+                WP_CLI::error('SAP connection settings not configured.');
+                return;
+            }
+            
+            // Decrypt password
+            $sap_settings['sap_password'] = shift8_gravitysap_decrypt_password($sap_settings['sap_password']);
+            
+            // Create SAP service
+            require_once plugin_dir_path(__FILE__) . 'includes/class-shift8-gravitysap-sap-service.php';
+            $sap_service = new Shift8_GravitySAP_SAP_Service($sap_settings);
+            
+            // Authenticate
+            $reflection = new ReflectionClass($sap_service);
+            $auth_method = $reflection->getMethod('ensure_authenticated');
+            $auth_method->setAccessible(true);
+            
+            $auth_start = microtime(true);
+            if (!$auth_method->invoke($sap_service)) {
+                WP_CLI::error('Failed to authenticate with SAP B1');
+                return;
+            }
+            $auth_time = round((microtime(true) - $auth_start) * 1000, 2);
+            
+            if ($verbose) {
+                WP_CLI::line("Authentication time: {$auth_time}ms");
+            }
+            
+            // Perform the lookup using centralized method
+            $lookup_start = microtime(true);
+            $result = $sap_service->find_existing_business_partner($name, $country, $postal);
+            $lookup_time = round((microtime(true) - $lookup_start) * 1000, 2);
+            
+            WP_CLI::line('');
+            WP_CLI::line(str_repeat('-', 60));
+            WP_CLI::line('');
+            
+            if ($result['found']) {
+                WP_CLI::success("Found matching Business Partner!");
+                WP_CLI::line('');
+                WP_CLI::line("  CardCode: {$result['card_code']}");
+                WP_CLI::line("  CardName: {$result['card_name']}");
+                if (!empty($result['address_country'])) {
+                    WP_CLI::line("  Country:  {$result['address_country']}");
+                }
+                if (!empty($result['address_postal'])) {
+                    WP_CLI::line("  Postal:   {$result['address_postal']}");
+                }
+            } else {
+                WP_CLI::warning("No matching Business Partner found.");
+                WP_CLI::line("  A new Business Partner would be created for this submission.");
+            }
+            
+            WP_CLI::line('');
+            WP_CLI::line('Performance Metrics:');
+            WP_CLI::line("  Authentication: {$auth_time}ms");
+            WP_CLI::line("  Lookup Query:   {$lookup_time}ms");
+            WP_CLI::line("  Total Time:     " . round($auth_time + $lookup_time, 2) . "ms");
+            
+            if (isset($result['records_scanned'])) {
+                WP_CLI::line("  Records Scanned: {$result['records_scanned']}");
+            }
+            
+            WP_CLI::line('');
+            
+            // Performance recommendation
+            $total_time = $auth_time + $lookup_time;
+            if ($total_time > 3000) {
+                WP_CLI::warning("Lookup time exceeds 3 seconds. Consider moving SAP processing to a background cron job.");
+            } elseif ($total_time > 1000) {
+                WP_CLI::line("Note: Lookup time is moderate. For high-traffic forms, consider async processing.");
+            } else {
+                WP_CLI::success("Lookup time is acceptable for synchronous processing.");
+            }
+            
+            WP_CLI::line('');
+            
+        } catch (Exception $e) {
+            WP_CLI::error('Error: ' . $e->getMessage());
+        }
+    }
+    
+    /**
+     * Find an existing Business Partner matching the criteria
+     *
+     * SAP B1 Service Layer has limited OData support - it doesn't support:
+     * - tolower() for case-insensitive comparisons
+     * - any() for filtering on collections
+     * 
+     * Strategy: Query BPs with CardName containing the search term, then filter
+     * client-side for exact match (case-insensitive) and address criteria.
+     *
+     * @param ReflectionMethod $request_method The SAP make_request method
+     * @param object $sap_service The SAP service instance
+     * @param string $name Business Partner name (case-insensitive)
+     * @param string $country 2-letter country code
+    /**
+     * Benchmark the lookup performance with multiple queries
+     *
+     * ## OPTIONS
+     *
+     * [--iterations=<num>]
+     * : Number of test iterations (default: 5)
+     *
+     * ## EXAMPLES
+     *
+     *     wp shift8-gravitysap-bp-lookup benchmark
+     *     wp shift8-gravitysap-bp-lookup benchmark --iterations=10
+     *
+     * @param array $args
+     * @param array $assoc_args
+     */
+    public function benchmark($args, $assoc_args) {
+        $iterations = isset($assoc_args['iterations']) ? absint($assoc_args['iterations']) : 5;
+        
+        if ($iterations < 1 || $iterations > 20) {
+            WP_CLI::error('Iterations must be between 1 and 20');
+            return;
+        }
+        
+        WP_CLI::line('');
+        WP_CLI::line('=== Business Partner Lookup Benchmark ===');
+        WP_CLI::line('');
+        WP_CLI::line("Running {$iterations} iterations with sample queries...");
+        WP_CLI::line('');
+        
+        try {
+            // Get SAP settings
+            $sap_settings = get_option('shift8_gravitysap_settings', array());
+            
+            if (empty($sap_settings['sap_endpoint'])) {
+                WP_CLI::error('SAP connection settings not configured.');
+                return;
+            }
+            
+            // Decrypt password
+            $sap_settings['sap_password'] = shift8_gravitysap_decrypt_password($sap_settings['sap_password']);
+            
+            // Create SAP service
+            require_once plugin_dir_path(__FILE__) . 'includes/class-shift8-gravitysap-sap-service.php';
+            $sap_service = new Shift8_GravitySAP_SAP_Service($sap_settings);
+            
+            // Authenticate once
+            $reflection = new ReflectionClass($sap_service);
+            $auth_method = $reflection->getMethod('ensure_authenticated');
+            $auth_method->setAccessible(true);
+            
+            if (!$auth_method->invoke($sap_service)) {
+                WP_CLI::error('Failed to authenticate with SAP B1');
+                return;
+            }
+            
+            $request_method = $reflection->getMethod('make_request');
+            $request_method->setAccessible(true);
+            
+            // Run benchmark queries (simple count query, no filtering)
+            $times = array();
+            
+            for ($i = 1; $i <= $iterations; $i++) {
+                $start = microtime(true);
+                
+                // Simple query to measure baseline latency
+                $response = $request_method->invoke(
+                    $sap_service, 
+                    'GET', 
+                    '/BusinessPartners?$top=1&$select=CardCode,CardName'
+                );
+                
+                $elapsed = round((microtime(true) - $start) * 1000, 2);
+                $times[] = $elapsed;
+                
+                $status = is_wp_error($response) ? 'ERROR' : 'OK';
+                WP_CLI::line("  Iteration {$i}: {$elapsed}ms ({$status})");
+            }
+            
+            // Calculate statistics
+            $avg = round(array_sum($times) / count($times), 2);
+            $min = round(min($times), 2);
+            $max = round(max($times), 2);
+            
+            WP_CLI::line('');
+            WP_CLI::line(str_repeat('-', 40));
+            WP_CLI::line('');
+            WP_CLI::line('Results:');
+            WP_CLI::line("  Average: {$avg}ms");
+            WP_CLI::line("  Min:     {$min}ms");
+            WP_CLI::line("  Max:     {$max}ms");
+            WP_CLI::line('');
+            
+            // Recommendations
+            if ($avg > 2000) {
+                WP_CLI::warning("Average response time > 2s. Strongly recommend async processing via cron.");
+            } elseif ($avg > 500) {
+                WP_CLI::line("Average response time is moderate. Consider async processing for better UX.");
+            } else {
+                WP_CLI::success("Response times are good for synchronous processing.");
+            }
+            
+            WP_CLI::line('');
+            
+        } catch (Exception $e) {
+            WP_CLI::error('Error: ' . $e->getMessage());
+        }
+    }
+}
+
+WP_CLI::add_command('shift8-gravitysap-bp-lookup', 'Shift8_GravitySAP_BP_Lookup_Command');

shift8-integration-for-gravity-forms-and-sap-business-one/trunk/includes/class-shift8-gravitysap-sap-service.php

@@ -247 +247 @@
             throw new Exception('SAP Business Partner creation failed: ' . esc_html($error_message));
         }
+    }
+
+    /**
+     * Find an existing Contact Person on a Business Partner by name and/or email
+     *
+     * Searches the Business Partner's ContactEmployees for a match using case-insensitive
+     * comparison on Name AND Email (both must match if both are provided).
+     *
+     * @since 1.4.4
+     * @param string $card_code     The Business Partner CardCode
+     * @param string $contact_name  The contact person's full name to match
+     * @param string $contact_email The contact person's email to match (optional but recommended)
+     * @return array|null The matching contact data with InternalCode, or null if not found
+     */
+    public function find_existing_contact($card_code, $contact_name, $contact_email = '') {
+        shift8_gravitysap_debug_log('=== SEARCHING FOR EXISTING CONTACT PERSON ===', array(
+            'CardCode' => $card_code,
+            'SearchName' => $contact_name,
+            'SearchEmail' => $contact_email
+        ));
+
+        if (empty($card_code) || empty($contact_name)) {
+            shift8_gravitysap_debug_log('Find Contact: Missing CardCode or contact name');
+            return null;
+        }
+
+        // Fetch the Business Partner with its contacts
+        $bp_data = $this->get_business_partner($card_code);
+        
+        if (!$bp_data || empty($bp_data['ContactEmployees'])) {
+            shift8_gravitysap_debug_log('Find Contact: No existing contacts found on BP', array(
+                'CardCode' => $card_code
+            ));
+            return null;
+        }
+
+        // Normalize search values for case-insensitive comparison
+        $search_name = strtolower(trim($contact_name));
+        $search_email = !empty($contact_email) ? strtolower(trim($contact_email)) : '';
+
+        shift8_gravitysap_debug_log('Find Contact: Searching through contacts', array(
+            'ContactCount' => count($bp_data['ContactEmployees']),
+            'NormalizedName' => $search_name,
+            'NormalizedEmail' => $search_email
+        ));
+
+        foreach ($bp_data['ContactEmployees'] as $contact) {
+            $existing_name = isset($contact['Name']) ? strtolower(trim($contact['Name'])) : '';
+            $existing_email = isset($contact['E_Mail']) ? strtolower(trim($contact['E_Mail'])) : '';
+
+            // Match logic: Name must match, and if email is provided, email must also match
+            $name_matches = ($existing_name === $search_name);
+            $email_matches = empty($search_email) || ($existing_email === $search_email);
+
+            if ($name_matches && $email_matches) {
+                shift8_gravitysap_debug_log('✅ Found matching contact', array(
+                    'MatchedName' => $contact['Name'] ?? 'N/A',
+                    'MatchedEmail' => $contact['E_Mail'] ?? 'N/A',
+                    'InternalCode' => $contact['InternalCode'] ?? 'N/A'
+                ));
+                return $contact;
+            }
+        }
+
+        shift8_gravitysap_debug_log('Find Contact: No matching contact found', array(
+            'CardCode' => $card_code,
+            'SearchedName' => $contact_name,
+            'SearchedEmail' => $contact_email
+        ));
+
+        return null;
+    }
+
+    /**
+     * Add a Contact Person to an existing Business Partner
+     *
+     * Uses PATCH to update the Business Partner with a new ContactEmployees entry.
+     * SAP B1 will append the new contact to existing contacts.
+     *
+     * @since 1.4.2
+     * @param string $card_code    The Business Partner CardCode
+     * @param array  $contact_data Contact person data (FirstName, LastName, Phone1, E_Mail, Address)
+     * @return array|null The contact person data with InternalCode if successful, null on failure
+     */
+    public function add_contact_to_business_partner($card_code, $contact_data) {
+        shift8_gravitysap_debug_log('=== ADDING CONTACT TO EXISTING BUSINESS PARTNER ===', array(
+            'CardCode' => $card_code,
+            'ContactData' => $contact_data
+        ));
+
+        // Validate inputs
+        if (empty($card_code)) {
+            shift8_gravitysap_debug_log('Add Contact: Missing CardCode');
+            return null;
+        }
+
+        if (empty($contact_data) || !is_array($contact_data)) {
+            shift8_gravitysap_debug_log('Add Contact: No contact data provided');
+            return null;
+        }
+
+        // Ensure authenticated
+        if (!$this->ensure_authenticated()) {
+            shift8_gravitysap_debug_log('Add Contact: Authentication failed');
+            return null;
+        }
+
+        // Build the contact person object
+        $contact_person = array();
+
+        // Check if Name is already provided in contact_data (from map_form_data_to_sap_fields)
+        $first_name = isset($contact_data['FirstName']) ? trim($contact_data['FirstName']) : '';
+        $last_name = isset($contact_data['LastName']) ? trim($contact_data['LastName']) : '';
+        $existing_name = isset($contact_data['Name']) ? trim($contact_data['Name']) : '';
+        
+        if (!empty($first_name) && !empty($last_name)) {
+            $contact_person['Name'] = $first_name . ' ' . $last_name;
+            $contact_person['FirstName'] = $first_name;
+            $contact_person['LastName'] = $last_name;
+        } elseif (!empty($first_name)) {
+            $contact_person['Name'] = $first_name;
+            $contact_person['FirstName'] = $first_name;
+        } elseif (!empty($last_name)) {
+            $contact_person['Name'] = $last_name;
+            $contact_person['LastName'] = $last_name;
+        } elseif (!empty($existing_name)) {
+            // Use the pre-constructed Name if FirstName/LastName not available
+            $contact_person['Name'] = $existing_name;
+        } else {
+            // No name provided - use a default or skip
+            shift8_gravitysap_debug_log('Add Contact: No name provided, skipping contact creation');
+            return null;
+        }
+
+        // Add optional contact fields
+        if (!empty($contact_data['Phone1'])) {
+            $contact_person['Phone1'] = $contact_data['Phone1'];
+        }
+        if (!empty($contact_data['E_Mail'])) {
+            $contact_person['E_Mail'] = $contact_data['E_Mail'];
+        }
+        if (!empty($contact_data['Address'])) {
+            $contact_person['Address'] = $contact_data['Address'];
+        }
+
+        // Build PATCH payload - SAP B1 appends to existing ContactEmployees
+        $patch_data = array(
+            'ContactEmployees' => array($contact_person)
+        );
+
+        shift8_gravitysap_debug_log('Add Contact: Sending PATCH request', array(
+            'CardCode' => $card_code,
+            'PatchData' => $patch_data
+        ));
+
+        // Send PATCH request to update the Business Partner
+        $endpoint = "/BusinessPartners('" . rawurlencode($card_code) . "')";
+        $response = $this->make_request('PATCH', $endpoint, $patch_data);
+
+        if (is_wp_error($response)) {
+            shift8_gravitysap_debug_log('Add Contact: PATCH request failed', array(
+                'error' => $response->get_error_message()
+            ));
+            return null;
+        }
+
+        $response_code = wp_remote_retrieve_response_code($response);
+
+        // 204 No Content is success for PATCH
+        if ($response_code === 204) {
+            shift8_gravitysap_debug_log('✅ Contact Person added successfully to ' . $card_code);
+            
+            // Return the contact person data (SAP doesn't return the created contact in PATCH response)
+            // We need to fetch the BP to get the InternalCode of the newly added contact
+            $contact_person['CardCode'] = $card_code;
+            
+            // Try to get the newly created contact's InternalCode by fetching the BP
+            $bp_response = $this->get_business_partner($card_code);
+            if ($bp_response && isset($bp_response['ContactEmployees'])) {
+                // Find the contact we just added (last one in the array, or match by name)
+                $contacts = $bp_response['ContactEmployees'];
+                foreach (array_reverse($contacts) as $contact) {
+                    if (isset($contact['Name']) && $contact['Name'] === $contact_person['Name']) {
+                        $contact_person['InternalCode'] = $contact['InternalCode'] ?? null;
+                        break;
+                    }
+                }
+            }
+            
+            return $contact_person;
+        } else {
+            // Handle error response
+            $body = wp_remote_retrieve_body($response);
+            $error_data = json_decode($body, true);
+            
+            $error_message = 'Unknown error';
+            if (!empty($error_data['error']['message']['value'])) {
+                $error_message = $error_data['error']['message']['value'];
+            }
+            
+            shift8_gravitysap_debug_log('Add Contact: PATCH failed', array(
+                'status_code' => $response_code,
+                'error' => $error_message
+            ));
+            
+            return null;
+        }
+    }
+
+    /**
+     * Get a Business Partner by CardCode
+     *
+     * @since 1.4.2
+     * @param string $card_code The Business Partner CardCode
+     * @return array|null The Business Partner data or null on failure
+     */
+    public function get_business_partner($card_code) {
+        if (empty($card_code)) {
+            return null;
+        }
+
+        if (!$this->ensure_authenticated()) {
+            return null;
+        }
+
+        $endpoint = "/BusinessPartners('" . rawurlencode($card_code) . "')";
+        $response = $this->make_request('GET', $endpoint);
+
+        if (is_wp_error($response)) {
+            return null;
+        }
+
+        $response_code = wp_remote_retrieve_response_code($response);
+        if ($response_code === 200) {
+            $body = wp_remote_retrieve_body($response);
+            return json_decode($body, true);
+        }
+
+        return null;
     }
 
@@ -1061 +1300 @@
         return false;
     }
+
+    /**
+     * Find an existing Business Partner matching name, country, and postal code
+     *
+     * This method searches SAP B1 for an existing Business Partner that matches:
+     * - CardName (case-insensitive)
+     * - Country (from BPAddresses)
+     * - ZipCode/Postal (from BPAddresses)
+     *
+     * @since 1.3.9
+     * @param string $name Business Partner name (case-insensitive comparison)
+     * @param string $country 2-letter country code
+     * @param string $postal Postal/ZIP code
+     * @return array Result with 'found', 'card_code', 'card_name', etc.
+     */
+    public function find_existing_business_partner($name, $country, $postal) {
+        $result = array(
+            'found' => false,
+            'card_code' => null,
+            'card_name' => null,
+            'address_country' => null,
+            'address_postal' => null,
+            'records_scanned' => 0,
+            'error' => null
+        );
+
+        // Validate inputs
+        if (empty($name) || empty($country) || empty($postal)) {
+            $result['error'] = 'Name, country, and postal code are all required for lookup';
+            shift8_gravitysap_debug_log('BP Lookup: Missing required parameters', array(
+                'name' => !empty($name),
+                'country' => !empty($country),
+                'postal' => !empty($postal)
+            ));
+            return $result;
+        }
+
+        // Ensure authenticated
+        if (!$this->ensure_authenticated()) {
+            $result['error'] = 'Failed to authenticate with SAP';
+            return $result;
+        }
+
+        shift8_gravitysap_debug_log('=== STARTING BUSINESS PARTNER LOOKUP ===', array(
+            'name' => $name,
+            'country' => $country,
+            'postal' => $postal
+        ));
+
+        // Normalize search name for case-insensitive comparison
+        $search_name_normalized = strtolower(trim($name));
+
+        // Escape single quotes for OData query
+        $escaped_name = str_replace("'", "''", $name);
+
+        // Select fields including BPAddresses
+        $select = 'CardCode,CardName,BPAddresses';
+
+        // Strategy 1: Try exact CardName match first (most efficient)
+        $filter = "CardName eq '{$escaped_name}'";
+        $query = "/BusinessPartners?\$filter=" . rawurlencode($filter) . "&\$select={$select}";
+
+        shift8_gravitysap_debug_log('BP Lookup Strategy 1: Exact match', array('filter' => $filter));
+
+        $response = $this->make_request('GET', $query);
+        $exact_matches = $this->parse_bp_lookup_response($response);
+
+        foreach ($exact_matches as $bp) {
+            if ($this->bp_has_matching_address($bp, $country, $postal)) {
+                $result['found'] = true;
+                $result['card_code'] = $bp['CardCode'];
+                $result['card_name'] = $bp['CardName'];
+                $result['address_country'] = $country;
+                $result['address_postal'] = $postal;
+                $result['records_scanned'] = count($exact_matches);
+
+                shift8_gravitysap_debug_log('BP Lookup: MATCH FOUND (exact)', array(
+                    'card_code' => $bp['CardCode'],
+                    'card_name' => $bp['CardName']
+                ));
+                return $result;
+            }
+        }
+
+        // Strategy 2: Broader search with 'startswith' for case variations
+        $first_word = explode(' ', trim($name))[0];
+        $escaped_first_word = str_replace("'", "''", $first_word);
+
+        if (strlen($first_word) >= 3) {
+            $filter = "startswith(CardName, '{$escaped_first_word}')";
+            $query = "/BusinessPartners?\$filter=" . rawurlencode($filter) . "&\$select={$select}&\$top=100";
+
+            shift8_gravitysap_debug_log('BP Lookup Strategy 2: Startswith', array('filter' => $filter));
+
+            $response = $this->make_request('GET', $query);
+            $startswith_matches = $this->parse_bp_lookup_response($response);
+
+            $result['records_scanned'] += count($startswith_matches);
+
+            foreach ($startswith_matches as $bp) {
+                $bp_name_normalized = strtolower(trim($bp['CardName'] ?? ''));
+
+                // Case-insensitive name match AND address match
+                if ($bp_name_normalized === $search_name_normalized && 
+                    $this->bp_has_matching_address($bp, $country, $postal)) {
+                    
+                    $result['found'] = true;
+                    $result['card_code'] = $bp['CardCode'];
+                    $result['card_name'] = $bp['CardName'];
+                    $result['address_country'] = $country;
+                    $result['address_postal'] = $postal;
+
+                    shift8_gravitysap_debug_log('BP Lookup: MATCH FOUND (case-insensitive)', array(
+                        'card_code' => $bp['CardCode'],
+                        'card_name' => $bp['CardName']
+                    ));
+                    return $result;
+                }
+            }
+        }
+
+        shift8_gravitysap_debug_log('BP Lookup: No match found', array(
+            'records_scanned' => $result['records_scanned']
+        ));
+
+        return $result;
+    }
+
+    /**
+     * Parse Business Partner lookup response
+     *
+     * @since 1.3.9
+     * @param mixed $response HTTP response
+     * @return array Array of Business Partners
+     */
+    private function parse_bp_lookup_response($response) {
+        if (is_wp_error($response)) {
+            shift8_gravitysap_debug_log('BP Lookup query failed', array(
+                'error' => $response->get_error_message()
+            ));
+            return array();
+        }
+
+        $code = wp_remote_retrieve_response_code($response);
+        if ($code !== 200) {
+            $body = wp_remote_retrieve_body($response);
+            $error_data = json_decode($body, true);
+            shift8_gravitysap_debug_log('BP Lookup query error', array(
+                'http_code' => $code,
+                'error' => $error_data['error']['message']['value'] ?? 'Unknown error'
+            ));
+            return array();
+        }
+
+        $body = wp_remote_retrieve_body($response);
+        $data = json_decode($body, true);
+
+        if (!isset($data['value'])) {
+            return array();
+        }
+
+        shift8_gravitysap_debug_log('BP Lookup query result', array(
+            'count' => count($data['value'])
+        ));
+
+        return $data['value'];
+    }
+
+    /**
+     * Check if Business Partner has matching address
+     *
+     * @since 1.3.9
+     * @param array $bp Business Partner data
+     * @param string $country Country code
+     * @param string $postal Postal code
+     * @return bool True if address matches
+     */
+    private function bp_has_matching_address($bp, $country, $postal) {
+        if (!isset($bp['BPAddresses']) || !is_array($bp['BPAddresses'])) {
+            return false;
+        }
+
+        foreach ($bp['BPAddresses'] as $addr) {
+            $addr_country = $addr['Country'] ?? '';
+            $addr_postal = $addr['ZipCode'] ?? '';
+
+            if ($addr_country === $country && $addr_postal === $postal) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 } 

shift8-integration-for-gravity-forms-and-sap-business-one/trunk/readme.txt

@@ -5 +5 @@
 * Requires at least: 5.0
 * Tested up to: 6.8
-* Stable tag: 1.3.8
+* Stable tag: 1.4.4
 * Requires PHP: 7.4
 * License: GPLv3
@@ -96 +96 @@
 This is ideal for sample request forms, multi-product orders, and service selection forms.
 
+= How do I prevent duplicate Business Partners? =
+
+Enable **Check for existing Business Partner** in your form's SAP Integration settings. The plugin will search SAP B1 for existing Business Partners matching:
+
+* Business Partner Name (case-insensitive)
+* Country (from address)
+* Postal/ZIP Code (from address)
+
+If a match is found, the plugin uses the existing Business Partner instead of creating a duplicate. You can test this with WP-CLI:
+
+`wp shift8-gravitysap-bp-lookup search --name="Test Company" --country="CA" --postal="M5V 1A1"`
+
+= How are Contact Persons linked to Sales Quotations? =
+
+When a Business Partner match is found (or a new one is created), the plugin automatically:
+
+1. Adds a Contact Person to the Business Partner using the form's contact data
+2. Retrieves the Contact Person's InternalCode from SAP
+3. Links the Contact Person to the Sales Quotation via SAP's ContactPersonCode field
+
+**Result in SAP B1:**
+* Contact Person appears in the Business Partner's "Contact Persons" tab
+* Sales Quotation dropdown shows the correct Contact Person selected
+* Contact Person is properly linked for subsequent documents
+
+**Technical Note:** SAP B1's ContactPersonCode field requires the numeric InternalCode, not the text Name. The plugin handles this automatically.
+
 == Screenshots ==
 
@@ -104 +131 @@
 
 == Changelog ==
+
+= 1.4.4 =
+* **NEW**: Duplicate contact detection - checks if contact already exists before adding
+* **NEW**: `find_existing_contact()` method for case-insensitive name + email matching
+* **IMPROVED**: Reuses existing contacts instead of creating duplicates on repeat submissions
+* **TESTING**: Added 10 new tests for contact duplicate detection (edge cases included)
+* **TESTING**: Now 138 tests with 306 assertions - All passing
+
+= 1.4.3 =
+* **FIX**: Contact Person now correctly linked to Sales Quotation using SAP's InternalCode (numeric) instead of Name (string)
+* **IMPROVED**: After adding Contact Person to existing BP, plugin now fetches BP to retrieve the contact's InternalCode
+* **IMPROVED**: Sales Quotation ContactPersonCode field now uses correct integer value for proper SAP B1 linking
+* **TESTING**: Added 3 additional Contact Person tests (InternalCode retrieval, existing Name field, first name only)
+* **TESTING**: Now 128 tests with 291 assertions - All passing
+* **DOCUMENTATION**: Added comprehensive contactPersonLinking section to .cursorrules
+
+= 1.4.2 =
+* **NEW**: Contact Person now added to existing Business Partner when match is found
+* **NEW**: Contact Person linked to Sales Quotation via ContactPersonCode field
+* **IMPROVED**: SAP Service class now includes `add_contact_to_business_partner()` and `get_business_partner()` methods
+* **TESTING**: Added 6 new unit tests for Contact Person functionality
+* **TESTING**: Now 125 tests with 283 assertions - All passing
+
+= 1.4.1 =
+* **TESTING**: Added comprehensive test coverage for async processing (9 new tests)
+* **TESTING**: Added comprehensive test coverage for Business Partner lookup (10 new tests)
+* **TESTING**: Now 119 tests with 272 assertions - All passing
+* **DOCUMENTATION**: Updated .cursorrules with async processing, BP lookup, and testing patterns
+
+= 1.4.0 =
+* **NEW**: Async processing for form submissions - SAP integration now runs in a non-blocking background request
+* **NEW**: "Check for Existing Business Partner" now integrated into form submission flow
+* **NEW**: Test Integration button now supports existing BP lookup when enabled
+* **IMPROVED**: Form submissions no longer block on SAP API response time (1-2 seconds faster)
+* **IMPROVED**: Centralized Business Partner lookup logic for code reuse across WP-CLI, form processing, and test integration
+
+= 1.3.9 =
+* **NEW**: Added "Check for Existing Business Partner" toggle setting
+* **NEW**: Added WP-CLI command `wp shift8-gravitysap-bp-lookup search` to test duplicate detection
+* **NEW**: Added WP-CLI command `wp shift8-gravitysap-bp-lookup benchmark` to measure SAP query performance
+* **ENHANCEMENT**: Duplicate detection matches on Business Partner Name (case-insensitive), Country, and Postal Code
 
 = 1.3.8 =

shift8-integration-for-gravity-forms-and-sap-business-one/trunk/shift8-gravitysap.php

@@ -4 +4 @@
  * Plugin URI: https://github.com/stardothosting/shift8-gravitysap
  * Description: Integrates Gravity Forms with SAP Business One, automatically creating Business Partners from form submissions.
- * Version: 1.3.8
+ * Version: 1.4.4
  * Author: Shift8 Web
  * Author URI: https://shift8web.ca
@@ -28 +28 @@
 
 // Plugin constants
-define('SHIFT8_GRAVITYSAP_VERSION', '1.3.8');
+define('SHIFT8_GRAVITYSAP_VERSION', '1.4.4');
 define('SHIFT8_GRAVITYSAP_PLUGIN_FILE', __FILE__);
 define('SHIFT8_GRAVITYSAP_PLUGIN_DIR', plugin_dir_path(__FILE__));
@@ -230 +230 @@
         add_action('wp_ajax_load_itemcodes', array($this, 'ajax_load_itemcodes'));
         add_action('admin_footer', array($this, 'add_retry_button_script'));
+        
+        // Async SAP processing endpoint (accessible without login for loopback requests)
+        add_action('wp_ajax_shift8_gravitysap_async_process', array($this, 'ajax_async_sap_process'));
+        add_action('wp_ajax_nopriv_shift8_gravitysap_async_process', array($this, 'ajax_async_sap_process'));
         
         
@@ -525 +529 @@
                         <p class="description">
                             <?php esc_html_e('When enabled, a Sales Quotation will be created and linked to the newly created Business Partner. Configure quotation field mapping below.', 'shift8-gravity-forms-sap-b1-integration'); ?>
+                        </p>
+                    </td>
+                </tr>
+                
+                <tr>
+                    <th scope="row">
+                        <label for="sap_check_existing_bp"><?php esc_html_e('Check for Existing Business Partner', 'shift8-gravity-forms-sap-b1-integration'); ?></label>
+                    </th>
+                    <td>
+                        <input type="checkbox" id="sap_check_existing_bp" name="sap_check_existing_bp" value="1" <?php checked(rgar($settings, 'check_existing_bp'), '1'); ?> />
+                        <label for="sap_check_existing_bp"><?php esc_html_e('Check if a Business Partner already exists before creating a new one', 'shift8-gravity-forms-sap-b1-integration'); ?></label>
+                        <p class="description">
+                            <?php esc_html_e('When enabled, the system will search SAP for an existing Business Partner matching:', 'shift8-gravity-forms-sap-b1-integration'); ?>
+                            <br>
+                            <strong>&bull;</strong> <?php esc_html_e('Business Partner Name (case-insensitive)', 'shift8-gravity-forms-sap-b1-integration'); ?>
+                            <br>
+                            <strong>&bull;</strong> <?php esc_html_e('Country', 'shift8-gravity-forms-sap-b1-integration'); ?>
+                            <br>
+                            <strong>&bull;</strong> <?php esc_html_e('Postal/ZIP Code', 'shift8-gravity-forms-sap-b1-integration'); ?>
+                            <br><br>
+                            <?php esc_html_e('If a match is found, a Sales Quotation will be added to the existing Business Partner instead of creating a new one.', 'shift8-gravity-forms-sap-b1-integration'); ?>
                         </p>
                     </td>
@@ -1496 +1521 @@
             'card_code_prefix' => sanitize_text_field(rgpost('sap_card_code_prefix')),
             'create_quotation' => rgpost('sap_create_quotation') === '1' ? '1' : '0',
+            'check_existing_bp' => rgpost('sap_check_existing_bp') === '1' ? '1' : '0',
             'field_mapping' => array(),
             'quotation_field_mapping' => array(),
@@ -1600 +1626 @@
         $settings = rgar($form, 'sap_integration_settings');
         
-        // Initialize status tracking
-        if (!empty($entry['id'])) {
-            $this->update_entry_sap_status($entry['id'], 'processing', '', '');
-        }
-        
         if (empty($settings['enabled']) || $settings['enabled'] !== '1') {
             if (!empty($entry['id'])) {
@@ -1611 +1632 @@
             return;
         }
+        
+        // Get plugin settings (SAP connection details)
+        $plugin_settings = get_option('shift8_gravitysap_settings', array());
+        
+        // Check if connection settings are configured
+        if (empty($plugin_settings['sap_endpoint']) || empty($plugin_settings['sap_username']) || empty($plugin_settings['sap_password'])) {
+            $this->update_entry_sap_status($entry['id'], 'failed', '', 'SAP connection settings incomplete');
+            shift8_gravitysap_debug_log('SAP connection settings INCOMPLETE');
+            return;
+        }
+        
+        // Set initial status to pending (will be processed async)
+        $this->update_entry_sap_status($entry['id'], 'pending', '', '');
+        
+        // Generate a secure token for async processing
+        $async_token = wp_generate_password(32, false);
+        gform_update_meta($entry['id'], 'sap_async_token', wp_hash($async_token));
+        
+        // Fire non-blocking loopback request to process SAP integration asynchronously
+        $this->fire_async_sap_process($entry['id'], $form['id'], $async_token);
+        
+        shift8_gravitysap_debug_log('🚀 SAP async processing initiated', array(
+            'entry_id' => $entry['id'],
+            'form_id' => $form['id']
+        ));
+    }
+    
+    /**
+     * Fire non-blocking loopback request for async SAP processing
+     *
+     * @since 1.4.0
+     * @param int    $entry_id    Entry ID
+     * @param int    $form_id     Form ID
+     * @param string $async_token Security token for verification
+     */
+    private function fire_async_sap_process($entry_id, $form_id, $async_token) {
+        $ajax_url = admin_url('admin-ajax.php');
+        
+        $args = array(
+            'timeout'   => 0.01, // Essentially non-blocking
+            'blocking'  => false, // Don't wait for response
+            'sslverify' => apply_filters('https_local_ssl_verify', false),
+            'body'      => array(
+                'action'      => 'shift8_gravitysap_async_process',
+                'entry_id'    => $entry_id,
+                'form_id'     => $form_id,
+                'async_token' => $async_token,
+            ),
+        );
+        
+        wp_remote_post($ajax_url, $args);
+    }
+    
+    /**
+     * AJAX handler for async SAP processing
+     *
+     * Processes the SAP integration asynchronously via loopback request.
+     * This is called by fire_async_sap_process() and runs in a separate PHP process.
+     *
+     * @since 1.4.0
+     */
+    public function ajax_async_sap_process() {
+        // Verify request parameters
+        $entry_id = isset($_POST['entry_id']) ? absint(wp_unslash($_POST['entry_id'])) : 0;
+        $form_id = isset($_POST['form_id']) ? absint(wp_unslash($_POST['form_id'])) : 0;
+        $async_token = isset($_POST['async_token']) ? sanitize_text_field(wp_unslash($_POST['async_token'])) : '';
+        
+        if (empty($entry_id) || empty($form_id) || empty($async_token)) {
+            shift8_gravitysap_debug_log('❌ Async SAP process: Missing required parameters');
+            wp_die();
+        }
+        
+        // Verify the async token
+        $stored_token_hash = gform_get_meta($entry_id, 'sap_async_token');
+        if (empty($stored_token_hash) || !hash_equals($stored_token_hash, wp_hash($async_token))) {
+            shift8_gravitysap_debug_log('❌ Async SAP process: Invalid token', array(
+                'entry_id' => $entry_id
+            ));
+            wp_die();
+        }
+        
+        // Clear the token (single use)
+        gform_delete_meta($entry_id, 'sap_async_token');
+        
+        shift8_gravitysap_debug_log('=== ASYNC SAP PROCESSING STARTED ===', array(
+            'entry_id' => $entry_id,
+            'form_id' => $form_id
+        ));
+        
+        // Get entry and form data
+        $entry = GFAPI::get_entry($entry_id);
+        $form = GFAPI::get_form($form_id);
+        
+        if (is_wp_error($entry) || !$form) {
+            shift8_gravitysap_debug_log('❌ Async SAP process: Failed to load entry or form', array(
+                'entry_id' => $entry_id,
+                'form_id' => $form_id
+            ));
+            wp_die();
+        }
+        
+        // Process the SAP integration synchronously (we're now in async context)
+        $this->process_sap_integration_sync($entry, $form);
+        
+        wp_die();
+    }
+    
+    /**
+     * Synchronous SAP integration processing
+     *
+     * This is the actual SAP processing logic, called either by async handler
+     * or directly for retry/testing purposes.
+     *
+     * @since 1.4.0
+     * @param array $entry Entry data
+     * @param array $form  Form data
+     */
+    public function process_sap_integration_sync($entry, $form) {
+        $settings = rgar($form, 'sap_integration_settings');
         
         try {
@@ -1618 +1758 @@
                 throw new Exception('SAP connection settings are incomplete - check plugin settings');
             }
+            
+            // Set status to processing
+            $this->update_entry_sap_status($entry['id'], 'processing', '', '');
             
             // STEP 2: Validate required fields BEFORE attempting SAP connection
@@ -1653 +1796 @@
             $sap_service = new Shift8_GravitySAP_SAP_Service($plugin_settings);
             
-            // STEP 6: Create Business Partner in SAP
-            $result = $sap_service->create_business_partner($business_partner_data);
-            
-            // STEP 7: Handle success
-            if ($result && isset($result['CardCode'])) {
-                $this->update_entry_sap_status($entry['id'], 'success', $result['CardCode'], '');
-                
-                // Add success note to entry
+            // STEP 6: Check for existing Business Partner if enabled
+            $existing_card_code = null;
+            if (rgar($settings, 'check_existing_bp') === '1') {
+                $existing_card_code = $this->check_for_existing_business_partner($sap_service, $business_partner_data);
+            }
+            
+            // STEP 7: Use existing CardCode or create new Business Partner
+            // Initialize contact person info for use in Sales Quotation
+            // SAP B1 uses InternalCode (numeric) for ContactPersonCode on documents
+            $contact_person_code = null;
+            $contact_person_name = null;
+            
+            if ($existing_card_code) {
+                // Use existing Business Partner
+                $card_code = $existing_card_code;
+                
+                // Handle Contact Person for existing Business Partner
+                if (!empty($business_partner_data['ContactEmployees']) && is_array($business_partner_data['ContactEmployees'])) {
+                    $contact_data = $business_partner_data['ContactEmployees'][0];
+                    
+                    // Build contact name for matching
+                    $search_name = '';
+                    if (!empty($contact_data['Name'])) {
+                        $search_name = $contact_data['Name'];
+                    } elseif (!empty($contact_data['FirstName']) || !empty($contact_data['LastName'])) {
+                        $search_name = trim(($contact_data['FirstName'] ?? '') . ' ' . ($contact_data['LastName'] ?? ''));
+                    }
+                    $search_email = $contact_data['E_Mail'] ?? '';
+                    
+                    shift8_gravitysap_debug_log('Checking for existing Contact Person', array(
+                        'CardCode' => $card_code,
+                        'SearchName' => $search_name,
+                        'SearchEmail' => $search_email
+                    ));
+                    
+                    // First, check if contact already exists (case-insensitive name + email match)
+                    $existing_contact = null;
+                    if (!empty($search_name)) {
+                        $existing_contact = $sap_service->find_existing_contact($card_code, $search_name, $search_email);
+                    }
+                    
+                    if ($existing_contact) {
+                        // Use existing contact
+                        $contact_person_name = $existing_contact['Name'] ?? null;
+                        $contact_person_code = $existing_contact['InternalCode'] ?? null;
+                        
+                        GFFormsModel::add_note(
+                            $entry['id'], 
+                            0, 
+                            'Shift8 SAP Integration', 
+                            sprintf(
+                                /* translators: 1: Contact name, 2: CardCode, 3: InternalCode */
+                                esc_html__('👤 Found existing Contact Person "%1$s" (Code: %3$s) on Business Partner %2$s', 'shift8-gravity-forms-sap-b1-integration'), 
+                                esc_html($contact_person_name ?? 'Unknown'),
+                                esc_html($card_code),
+                                esc_html($contact_person_code ?? 'N/A')
+                            )
+                        );
+                        
+                        shift8_gravitysap_debug_log('✅ Using existing Contact Person', array(
+                            'ContactName' => $contact_person_name,
+                            'ContactPersonCode' => $contact_person_code,
+                            'CardCode' => $card_code
+                        ));
+                    } else {
+                        // No existing contact found - add new one
+                        shift8_gravitysap_debug_log('No existing contact found, adding new Contact Person', array(
+                            'CardCode' => $card_code,
+                            'ContactData' => $contact_data
+                        ));
+                        
+                        $contact_result = $sap_service->add_contact_to_business_partner($card_code, $contact_data);
+                        
+                        if ($contact_result) {
+                            $contact_person_name = $contact_result['Name'] ?? null;
+                            // SAP B1 uses InternalCode (numeric) for ContactPersonCode on documents
+                            $contact_person_code = $contact_result['InternalCode'] ?? null;
+                            
+                            GFFormsModel::add_note(
+                                $entry['id'], 
+                                0, 
+                                'Shift8 SAP Integration', 
+                                sprintf(
+                                    /* translators: 1: Contact name, 2: CardCode, 3: InternalCode */
+                                    esc_html__('👤 Contact Person "%1$s" (Code: %3$s) added to existing Business Partner %2$s', 'shift8-gravity-forms-sap-b1-integration'), 
+                                    esc_html($contact_person_name ?? 'Unknown'),
+                                    esc_html($card_code),
+                                    esc_html($contact_person_code ?? 'N/A')
+                                )
+                            );
+                            
+                            shift8_gravitysap_debug_log('✅ Contact Person added successfully', array(
+                                'ContactName' => $contact_person_name,
+                                'ContactPersonCode' => $contact_person_code,
+                                'CardCode' => $card_code,
+                                'InternalCode' => $contact_result['InternalCode'] ?? 'N/A'
+                            ));
+                        } else {
+                            // Log warning but don't fail - contact is optional
+                            shift8_gravitysap_debug_log('⚠️ Could not add Contact Person to existing BP (non-fatal)', array(
+                                'CardCode' => $card_code,
+                                'ContactData' => $contact_data
+                            ));
+                            
+                            GFFormsModel::add_note(
+                                $entry['id'], 
+                                0, 
+                                'Shift8 SAP Integration', 
+                                sprintf(
+                                    /* translators: %s: CardCode */
+                                    esc_html__('⚠️ Could not add Contact Person to existing Business Partner %s (Sales Quotation will proceed without contact)', 'shift8-gravity-forms-sap-b1-integration'), 
+                                    esc_html($card_code)
+                                )
+                            );
+                        }
+                    }
+                }
+                
+                $this->update_entry_sap_status($entry['id'], 'success', $card_code, '');
+                
+                GFFormsModel::add_note(
+                    $entry['id'], 
+                    0, 
+                    'Shift8 SAP Integration', 
+                    sprintf(
+                        /* translators: %s: SAP CardCode */
+                        esc_html__('🔗 MATCHED: Found existing Business Partner in SAP with CardCode: %s', 'shift8-gravity-forms-sap-b1-integration'), 
+                        esc_html($card_code)
+                    )
+                );
+                
+                shift8_gravitysap_debug_log('🔗 MATCHED EXISTING BUSINESS PARTNER', array(
+                    'entry_id' => $entry['id'],
+                    'CardCode' => $card_code
+                ));
+            } else {
+                // Create new Business Partner in SAP
+                $result = $sap_service->create_business_partner($business_partner_data);
+                
+                if (!$result || !isset($result['CardCode'])) {
+                    throw new Exception('SAP returned success but no CardCode - check SAP logs');
+                }
+                
+                $card_code = $result['CardCode'];
+                
+                // Extract contact person info from the created BP
+                // The contact person is included in the BP creation - check if SAP returned the InternalCode
+                if (!empty($result['ContactEmployees']) && is_array($result['ContactEmployees'])) {
+                    // SAP returned the ContactEmployees with InternalCodes
+                    $contact_person_name = $result['ContactEmployees'][0]['Name'] ?? null;
+                    $contact_person_code = $result['ContactEmployees'][0]['InternalCode'] ?? null;
+                } elseif (!empty($business_partner_data['ContactEmployees']) && is_array($business_partner_data['ContactEmployees'])) {
+                    // Fallback: get name from input data, but we need to fetch BP to get InternalCode
+                    $contact_person_name = $business_partner_data['ContactEmployees'][0]['Name'] ?? null;
+                    
+                    // Fetch the created BP to get the contact's InternalCode
+                    $created_bp = $sap_service->get_business_partner($card_code);
+                    if ($created_bp && !empty($created_bp['ContactEmployees'])) {
+                        foreach ($created_bp['ContactEmployees'] as $contact) {
+                            if (isset($contact['Name']) && $contact['Name'] === $contact_person_name) {
+                                $contact_person_code = $contact['InternalCode'] ?? null;
+                                break;
+                            }
+                        }
+                    }
+                }
+                
+                $this->update_entry_sap_status($entry['id'], 'success', $card_code, '');
+                
                 GFFormsModel::add_note(
                     $entry['id'], 
@@ -1668 +1972 @@
                         /* translators: %s: SAP Business Partner Card Code */
                         esc_html__('✅ SUCCESS: Business Partner created in SAP B1. Card Code: %s', 'shift8-gravity-forms-sap-b1-integration'), 
-                        esc_html($result['CardCode'])
+                        esc_html($card_code)
                     )
                 );
                 
                 shift8_gravitysap_debug_log('✅ SAP CONFIRMATION: Business Partner created successfully', array(
-                    'CardCode' => $result['CardCode'],
+                    'CardCode' => $card_code,
                     'CardName' => $result['CardName'] ?? 'N/A',
                     'CardType' => $result['CardType'] ?? 'N/A',
                     'Series' => $result['Series'] ?? 'N/A',
                     'EntryID' => $entry['id'],
-                    'FormID' => $form['id']
+                    'FormID' => $form['id'],
+                    'ContactPersonName' => $contact_person_name ?? 'N/A',
+                    'ContactPersonCode' => $contact_person_code ?? 'N/A'
                 ));
-                
-                // STEP 8: Create Sales Quotation if enabled
-                if (!empty($settings['create_quotation']) && $settings['create_quotation'] === '1') {
-                    try {
-                        $quotation_result = $this->create_sales_quotation_from_entry($entry, $form, $settings, $result['CardCode'], $sap_service);
+            }
+            
+            // STEP 8: Create Sales Quotation if enabled
+            if (!empty($settings['create_quotation']) && $settings['create_quotation'] === '1') {
+                try {
+                    // Pass the InternalCode for ContactPersonCode (SAP expects numeric code, not name)
+                    $quotation_result = $this->create_sales_quotation_from_entry($entry, $form, $settings, $card_code, $sap_service, $contact_person_code);
+                    
+                    if ($quotation_result && isset($quotation_result['DocEntry'])) {
+                        // Update entry with quotation info
+                        gform_update_meta($entry['id'], 'sap_b1_quotation_docentry', $quotation_result['DocEntry']);
+                        gform_update_meta($entry['id'], 'sap_b1_quotation_docnum', $quotation_result['DocNum'] ?? '');
                         
-                        if ($quotation_result && isset($quotation_result['DocEntry'])) {
-                            // Update entry with quotation info
-                            gform_update_meta($entry['id'], 'sap_b1_quotation_docentry', $quotation_result['DocEntry']);
-                            gform_update_meta($entry['id'], 'sap_b1_quotation_docnum', $quotation_result['DocNum'] ?? '');
-                            
-                            // Add quotation note
-                            GFFormsModel::add_note(
-                                $entry['id'], 
-                                0, 
-                                'Shift8 SAP Integration', 
-                                sprintf(
-                                    /* translators: 1: DocNum, 2: DocEntry */
-                                    esc_html__('✅ SUCCESS: Sales Quotation created in SAP B1. Doc #%1$s (Entry: %2$s)', 'shift8-gravity-forms-sap-b1-integration'), 
-                                    esc_html($quotation_result['DocNum'] ?? 'N/A'),
-                                    esc_html($quotation_result['DocEntry'])
-                                )
-                            );
-                            
-                            shift8_gravitysap_debug_log('✅ SAP QUOTATION: Sales Quotation created successfully', array(
-                                'DocEntry' => $quotation_result['DocEntry'],
-                                'DocNum' => $quotation_result['DocNum'] ?? 'N/A',
-                                'CardCode' => $result['CardCode'],
-                                'EntryID' => $entry['id']
-                            ));
-                        }
-                    } catch (Exception $quotation_error) {
-                        // Log quotation error but don't fail the whole submission
-                        shift8_gravitysap_debug_log('⚠️ SAP QUOTATION FAILED (BP was created successfully)', array(
-                            'error' => $quotation_error->getMessage(),
-                            'CardCode' => $result['CardCode'],
-                            'EntryID' => $entry['id']
-                        ));
-                        
+                        // Add quotation note
                         GFFormsModel::add_note(
                             $entry['id'], 
@@ -1724 +2005 @@
                             'Shift8 SAP Integration', 
                             sprintf(
-                                /* translators: %s: Error message */
-                                esc_html__('⚠️ WARNING: Sales Quotation creation failed: %s (Business Partner was created successfully)', 'shift8-gravity-forms-sap-b1-integration'), 
-                                esc_html($quotation_error->getMessage())
+                                /* translators: 1: DocNum, 2: DocEntry */
+                                esc_html__('✅ SUCCESS: Sales Quotation created in SAP B1. Doc #%1$s (Entry: %2$s)', 'shift8-gravity-forms-sap-b1-integration'), 
+                                esc_html($quotation_result['DocNum'] ?? 'N/A'),
+                                esc_html($quotation_result['DocEntry'])
                             )
                         );
+                        
+                        shift8_gravitysap_debug_log('✅ SAP QUOTATION: Sales Quotation created successfully', array(
+                            'DocEntry' => $quotation_result['DocEntry'],
+                            'DocNum' => $quotation_result['DocNum'] ?? 'N/A',
+                            'CardCode' => $card_code,
+                            'EntryID' => $entry['id']
+                        ));
                     }
+                } catch (Exception $quotation_error) {
+                    // Log quotation error but don't fail the whole submission
+                    shift8_gravitysap_debug_log('⚠️ SAP QUOTATION FAILED (BP was created/matched successfully)', array(
+                        'error' => $quotation_error->getMessage(),
+                        'CardCode' => $card_code,
+                        'EntryID' => $entry['id']
+                    ));
+                    
+                    GFFormsModel::add_note(
+                        $entry['id'], 
+                        0, 
+                        'Shift8 SAP Integration', 
+                        sprintf(
+                            /* translators: %s: Error message */
+                            esc_html__('⚠️ WARNING: Sales Quotation creation failed: %s (Business Partner was created/matched successfully)', 'shift8-gravity-forms-sap-b1-integration'), 
+                            esc_html($quotation_error->getMessage())
+                        )
+                    );
                 }
-            } else {
-                throw new Exception('SAP returned success but no CardCode - check SAP logs');
             }
             
@@ -1758 +2063 @@
             ));
         }
+    }
+    
+    /**
+     * Check for existing Business Partner in SAP
+     *
+     * Uses the centralized lookup function in SAP Service to find matching BPs.
+     *
+     * @since 1.4.0
+     * @param Shift8_GravitySAP_SAP_Service $sap_service           SAP Service instance
+     * @param array                         $business_partner_data BP data with lookup fields
+     * @return string|null CardCode if found, null otherwise
+     */
+    private function check_for_existing_business_partner($sap_service, $business_partner_data) {
+        // Extract lookup fields from business partner data
+        $name = rgar($business_partner_data, 'CardName', '');
+        $country = '';
+        $postal = '';
+        
+        // Get country and postal from BPAddresses if present
+        $bp_addresses = rgar($business_partner_data, 'BPAddresses', array());
+        if (!empty($bp_addresses) && isset($bp_addresses[0])) {
+            $country = rgar($bp_addresses[0], 'Country', '');
+            $postal = rgar($bp_addresses[0], 'ZipCode', '');
+        }
+        
+        // If no address data in BPAddresses, check root level (for test data)
+        if (empty($country)) {
+            $country = rgar($business_partner_data, 'Country', '');
+        }
+        if (empty($postal)) {
+            $postal = rgar($business_partner_data, 'ZipCode', '');
+        }
+        
+        // Need at least name and country for lookup
+        if (empty($name) || empty($country)) {
+            shift8_gravitysap_debug_log('⚠️ Cannot check for existing BP: Missing required fields', array(
+                'name' => $name,
+                'country' => $country,
+                'postal' => $postal
+            ));
+            return null;
+        }
+        
+        shift8_gravitysap_debug_log('🔍 Checking for existing Business Partner', array(
+            'name' => $name,
+            'country' => $country,
+            'postal' => $postal
+        ));
+        
+        // Use centralized lookup function from SAP Service
+        $result = $sap_service->find_existing_business_partner($name, $country, $postal);
+        
+        if ($result['found'] && !empty($result['card_code'])) {
+            shift8_gravitysap_debug_log('✅ Found existing Business Partner', array(
+                'card_code' => $result['card_code'],
+                'card_name' => $result['card_name'],
+                'match_type' => $result['match_type']
+            ));
+            return $result['card_code'];
+        }
+        
+        shift8_gravitysap_debug_log('ℹ️ No existing Business Partner found');
+        return null;
     }
 
@@ -2040 +2408 @@
      *
      * @since 1.2.2
-     * @param array  $entry       Entry data
-     * @param array  $form        Form data
-     * @param array  $settings    Form settings
-     * @param string $card_code   Business Partner CardCode
-     * @param object $sap_service SAP Service instance
+     * @param array    $entry               Entry data
+     * @param array    $form                Form data
+     * @param array    $settings            Form settings
+     * @param string   $card_code           Business Partner CardCode
+     * @param object   $sap_service         SAP Service instance
+     * @param int|null $contact_person_code Contact Person InternalCode to link (optional)
      * @return array Created quotation data
      * @throws Exception If creation fails
      */
-    private function create_sales_quotation_from_entry($entry, $form, $settings, $card_code, $sap_service) {
+    private function create_sales_quotation_from_entry($entry, $form, $settings, $card_code, $sap_service, $contact_person_code = null) {
         shift8_gravitysap_debug_log('=== STARTING SALES QUOTATION CREATION ===');
         
@@ -2057 +2426 @@
             'quotation_field_mapping' => $quotation_mapping,
             'itemcode_mapping' => $itemcode_mapping,
-            'entry_id' => $entry['id']
+            'entry_id' => $entry['id'],
+            'contact_person_code' => $contact_person_code
         ));
         
@@ -2069 +2439 @@
             'DocumentLines' => array()
         );
+        
+        // Link Contact Person to the quotation if provided
+        // SAP B1 uses ContactPersonCode which is the InternalCode (numeric) of the contact
+        if (!empty($contact_person_code)) {
+            $quotation_data['ContactPersonCode'] = intval($contact_person_code);
+            
+            shift8_gravitysap_debug_log('Linking Contact Person to Sales Quotation', array(
+                'ContactPersonCode' => $contact_person_code,
+                'CardCode' => $card_code
+            ));
+        }
         
         // Add Comments if mapped
@@ -2881 +3262 @@
             $sap_service = new Shift8_GravitySAP_SAP_Service($plugin_settings);
             
-            // Create Business Partner in SAP
+            // Check for existing Business Partner if enabled
+            if (rgar($settings, 'check_existing_bp') === '1') {
+                $existing_card_code = $this->check_for_existing_business_partner($sap_service, $business_partner_data);
+                
+                if ($existing_card_code) {
+                    return array(
+                        'success' => true,
+                        'message' => '🔗 MATCHED: Found existing Business Partner with Card Code: ' . esc_html($existing_card_code)
+                    );
+                }
+            }
+            
+            // Create Business Partner in SAP (no match found or check disabled)
             $result = $sap_service->create_business_partner($business_partner_data);
             
@@ -2887 +3280 @@
                 return array(
                     'success' => true,
-                    'message' => 'Card Code: ' . esc_html($result['CardCode'])
+                    'message' => '✅ CREATED: New Business Partner with Card Code: ' . esc_html($result['CardCode'])
                 );
             } else {