Changeset 3705113 for retainful/trunk/App/Controllers/Webhook.php

Timestamp:

09/21/2026 08:05:18 AM (4 weeks ago)

Author:

retainful

Message:

v1.0.10 release

File:

• retainful/trunk/App/Controllers/Webhook.php (modified) (1 diff)

retainful/trunk/App/Controllers/Webhook.php

@@ -916 +916 @@
                                         Customer::setCustomerEmail( $email );
                                 }
-                                
+                        }
+
+                        // Sync billing/shipping address fields (country, state, etc.)
+                        // into WC()->customer, the session object every
+                        // Customer::getCartCountry()/getCartState() read relies on.
+                        // Runs on every tracking request (not nested inside the
+                        // empty($email) block above) — WC()->checkout->get_value()
+                        // resolves $email from $_POST on every request after the
+                        // first one, which would otherwise skip this entirely, and
+                        // address changes, from the second sync onward.
+                        if ( $ajax_action === 'rnoc_track_user_data' ) {
+                                $address_synced = false;
+
+                                // If no real shipping text was posted (Block Checkout, or
+                                // Classic with "ship to a different address" unchecked),
+                                // overwrite shipping with the current billing value —
+                                // mirrors wc_ship_to_billing_address_only(), which the
+                                // Store API has no equivalent for. Must actively
+                                // overwrite, not just fall back when empty: <select>
+                                // fields (country, state) never read as empty even when
+                                // unused, so a stale value would otherwise stick.
+                                $shipping_text_posted = Input::get( 'shipping_first_name', '' ) !== '' || Input::get( 'shipping_address_1', '' ) !== '';
+
+                                foreach ( Customer::getAddressFields() as $field ) {
+                                        $billing_value = Input::get( 'billing_' . $field, '' );
+                                        if ( $billing_value !== '' && Customer::setCustomerData( 'billing_' . $field, $billing_value ) ) {
+                                                $address_synced = true;
+                                        }
+
+                                        $shipping_value = $shipping_text_posted
+                                                ? Input::get( 'shipping_' . $field, '' )
+                                                : Customer::getCustomerData( 'billing_' . $field );
+                                        if ( $shipping_value !== '' && Customer::setCustomerData( 'shipping_' . $field, $shipping_value ) ) {
+                                                $address_synced = true;
+                                        }
+                                }
+                                if ( $address_synced && Util::isMethodExists( WC()->customer, 'save' ) ) {
+                                        WC()->customer->save();
+                                }
+
                         }