Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3401525

Timestamp:

11/24/2025 04:13:25 AM (4 months ago)

Author:

easypayment

Message:

tags/9.0.51

Location:

woo-paypal-gateway

Files:

: 1060 added
: 5 edited

Legend:

: Unmodified
: Added
: Removed

woo-paypal-gateway/trunk/ppcp/includes/class-ppcp-paypal-checkout-for-woocommerce-request.php

-                      r3396892
+                      r3401525
             // Check if we have the necessary session data
             $reference_id = ppcp_get_session('ppcp_reference_id');
+            $reference_id    = ppcp_get_session('ppcp_reference_id');
             $paypal_order_id = ppcp_get_session('ppcp_paypal_order_id');
 …
+            }
             $patch_request = array();
+            $patch_request         = array();
             $update_amount_request = array();
 …
             // Shipping or Billing Address from customer
             $shipping_address_request = array();
             $customer = WC()->customer;
+            $customer                 = WC()->customer;
             if ($customer && is_a($customer, 'WC_Customer')) {
 …
                     $shipping_address_1 = $customer->get_shipping_address();
                     $shipping_address_2 = $customer->get_shipping_address_2();
                     $shipping_city = $customer->get_shipping_city();
                     $shipping_state = $customer->get_shipping_state();
                     $shipping_postcode = $customer->get_shipping_postcode();
                     $shipping_country = $customer->get_shipping_country();
+                    $shipping_city      = $customer->get_shipping_city();
+                    $shipping_state     = $customer->get_shipping_state();
+                    $shipping_postcode  = $customer->get_shipping_postcode();
+                    $shipping_country   = $customer->get_shipping_country();
                 } else {
                     $shipping_address_1 = $customer->get_billing_address_1();
                     $shipping_address_2 = $customer->get_billing_address_2();
                     $shipping_city = $customer->get_billing_city();
                     $shipping_state = $customer->get_billing_state();
                     $shipping_postcode = $customer->get_billing_postcode();
                     $shipping_country = $customer->get_billing_country();
+                    $shipping_city      = $customer->get_billing_city();
+                    $shipping_state     = $customer->get_billing_state();
+                    $shipping_postcode  = $customer->get_billing_postcode();
+                    $shipping_country   = $customer->get_billing_country();
+                }
 …
                         'address_line_1' => $shipping_address_1 ?: '',
                         'address_line_2' => $shipping_address_2 ?: '',
                         'admin_area_2' => $shipping_city ?: '',
                         'admin_area_1' => $shipping_state ?: '',
                         'postal_code' => $shipping_postcode ?: '',
                         'country_code' => $shipping_country ?: '',
+                        'admin_area_2'   => $shipping_city ?: '',
+                        'admin_area_1'   => $shipping_state ?: '',
+                        'postal_code'    => $shipping_postcode ?: '',
+                        'country_code'   => $shipping_country ?: '',
                     );
+                }
 …
                 $update_amount_request['item_total'] = array(
                     'currency_code' => get_woocommerce_currency(),
                     'value' => ppcp_round($cart['total_item_amount'], $this->decimals)
+                    'value'         => ppcp_round($cart['total_item_amount'], $this->decimals)
                 );
+            }
 …
                     $update_amount_request['discount'] = array(
                         'currency_code' => get_woocommerce_currency(),
                         'value' => ppcp_round($cart['discount'], $this->decimals)
+                        'value'         => ppcp_round($cart['discount'], $this->decimals)
                     );
+                }
 …
                     $update_amount_request['shipping'] = array(
                         'currency_code' => get_woocommerce_currency(),
                         'value' => ppcp_round($cart['shipping'], $this->decimals)
+                        'value'         => ppcp_round($cart['shipping'], $this->decimals)
                     );
+                }
 …
                     $update_amount_request['shipping_discount'] = array(
                         'currency_code' => get_woocommerce_currency(),
                         'value' => ppcp_round($cart['ship_discount_amount'], $this->decimals),
+                        'value'         => ppcp_round($cart['ship_discount_amount'], $this->decimals),
                     );
+                }
 …
                     $update_amount_request['tax_total'] = array(
                         'currency_code' => get_woocommerce_currency(),
                         'value' => ppcp_round($cart['order_tax'], $this->decimals)
+                        'value'         => ppcp_round($cart['order_tax'], $this->decimals)
                     );
+                }
 …
             // Patch request for updating the order amount
             $patch_request[] = array(
                 'op' => 'add',
+                'op'   => 'add',
                 'path' => "/purchase_units/@reference_id=='$reference_id'/amount",
                 'value' => array(
                     'currency_code' => get_woocommerce_currency(),
                     'value' => ppcp_round($cart['order_total'], $this->decimals),
                     'breakdown' => $update_amount_request
+                    'value'         => ppcp_round($cart['order_total'], $this->decimals),
+                    'breakdown'     => $update_amount_request
                 ),
             );
+            // =========================
+            // NEW: shipping options block
+            // =========================
+            $shipping_options = array();
+            $packages       = WC()->shipping()->get_packages();
+            $chosen_methods = WC()->session->get('chosen_shipping_methods', array());
+            if (!empty($packages)) {
+                foreach ($packages as $package_index => $package) {
+                    if (empty($package['rates']) || !is_array($package['rates'])) {
+                        continue;
+                    }
+                    $chosen_for_package = isset($chosen_methods[$package_index]) ? $chosen_methods[$package_index] : '';
+                    foreach ($package['rates'] as $rate_id => $rate) {
+                        // Base cost
+                        $rate_cost = (float) $rate->get_cost();
+                        // Include taxes if present
+                        $taxes = $rate->get_taxes();
+                        if (!empty($taxes) && is_array($taxes)) {
+                            $rate_cost += array_sum($taxes);
+                        }
+                        $shipping_options[] = array(
+                            'id'       => $rate_id, // e.g. flat_rate:1
+                            'label'    => $rate->get_label(),
+                            'type'     => 'SHIPPING',
+                            'selected' => ($rate_id === $chosen_for_package),
+                            'amount'   => array(
+                                'currency_code' => get_woocommerce_currency(),
+                                'value'         => ppcp_round($rate_cost, $this->decimals),
+                            ),
+                        );
+                    }
+                    // Typically only one package is sent to PayPal
+                    break;
+                }
+            }
+            $this->ppcp_log('Shipping options sent to PayPal: ' . wc_print_r($shipping_options, true));
+            if (!empty($shipping_options)) {
+                $patch_request[] = array(
+                    'op'   => 'add',
+                    'path' => "/purchase_units/@reference_id=='$reference_id'/shipping/options",
+                    'value' => $shipping_options,
+                );
+            }
+            // =========================
+            // END shipping options block
+            // =========================
             // Update shipping address if available
             if (!empty($shipping_address_request) && !empty(array_filter($shipping_address_request))) {
                 $patch_request[] = array(
                     'op' => 'add',
+                    'op'   => 'add',
                     'path' => "/purchase_units/@reference_id=='$reference_id'/shipping/address",
                     'value' => $shipping_address_request
 …
             // Update invoice ID for cart (using reference ID since no order number exists yet)
             $patch_request[] = array(
                 'op' => 'add',
+                'op'   => 'add',
                 'path' => "/purchase_units/@reference_id=='$reference_id'/invoice_id",
                 'value' => $reference_id
 …
             $update_custom_id = wp_json_encode(
                 array(
                     'order_id' => $reference_id,
+                    'order_id'  => $reference_id,
                     'order_key' => $reference_id,
+                )
             );
             $patch_request[] = array(
                 'op' => 'add',
+                'op'   => 'add',
                 'path' => "/purchase_units/@reference_id=='$reference_id'/custom_id",
                 'value' => $update_custom_id
 …
             // Send the request to PayPal
             $response = wp_remote_request($this->paypal_order_api . $paypal_order_id, array(
                 'timeout' => 60,
                 'method' => 'PATCH',
+                'timeout'     => 60,
+                'method'      => 'PATCH',
                 'redirection' => 5,
                 'httpversion' => '1.1',
                 'blocking' => true,
                 'headers' => array(
                     'Content-Type' => 'application/json',
                     'Authorization' => "Bearer " . $this->access_token,
                     "prefer" => "return=representation",
+                'blocking'    => true,
+                'headers'     => array(
+                    'Content-Type'                  => 'application/json',
+                    'Authorization'                 => "Bearer " . $this->access_token,
+                    "prefer"                        => "return=representation",
                     'PayPal-Partner-Attribution-Id' => 'MBJTechnolabs_SI_SPB',
                     'PayPal-Request-Id' => $this->generate_request_id()
+                    'PayPal-Request-Id'             => $this->generate_request_id()
                 ),
                 'body' => $patch_request_json,
+                'body'    => $patch_request_json,
                 'cookies' => array()
             ));
 …
                 return false;
             } else {
                 $response_code = wp_remote_retrieve_response_code($response);
+                $response_code    = wp_remote_retrieve_response_code($response);
                 $response_message = wp_remote_retrieve_response_message($response);
                 $api_response = json_decode(wp_remote_retrieve_body($response), true);
+                $api_response     = json_decode(wp_remote_retrieve_body($response), true);
                 $this->ppcp_log('Response Code: ' . $response_code);

woo-paypal-gateway/trunk/ppcp/public/class-ppcp-paypal-checkout-for-woocommerce-button-manager.php

-                      r3396892
+                      r3401525
                                     $address[$key] = $address_value;
+                                }
+                                $address['ship_to_different_address'] = json_encode(array_map('strtolower', $billing_address)) !== json_encode(array_map('strtolower', $shipping_address)) ? '1' : '0';
                                 $_POST = $address;
                                 ppcp_set_session('wpg_ppcp_block_checkout_post', $address);
 …
                             if ($order_id) {
                                 $details = $request_obj->ppcp_get_details_from_order($order_id);
                                 $order = wc_get_order($order_id);
+                                $order   = wc_get_order($order_id);
                             } else {
                                 $details = $request_obj->ppcp_get_details_from_cart();
                                 $order = null;
+                                $order   = null;
+                            }
                             $order_total = isset($details['order_total']) ? (float) $details['order_total'] : (float) WC()->cart->total;
                             $tax_total = isset($details['order_tax']) ? (float) $details['order_tax'] : (float) WC()->cart->get_total_tax();
                             $shipping = isset($details['shipping']) ? (float) $details['shipping'] : (float) WC()->cart->get_shipping_total();
                             $discounts = (float) ($details['discount'] ?? 0);
                             $ship_disc = (float) ($details['ship_discount_amount'] ?? 0);
+                            $tax_total   = isset($details['order_tax'])   ? (float) $details['order_tax']   : (float) WC()->cart->get_total_tax();
+                            $shipping    = isset($details['shipping'])    ? (float) $details['shipping']    : (float) WC()->cart->get_shipping_total();
+                            $discounts      = (float) ($details['discount'] ?? 0);
+                            $ship_disc      = (float) ($details['ship_discount_amount'] ?? 0);
                             $discount_total = $discounts + $ship_disc;
                             if ($order) {
 …
                                 $needs_shipping = WC()->cart->needs_shipping() ? '1' : '0';
+                            }
                             $items = array();
+                            $items     = array();
                             $sub_items = (isset($details['items']) && is_array($details['items'])) ? $details['items'] : array();
                             if (!empty($sub_items)) {
                                 foreach ($sub_items as $li) {
                                     $name = isset($li['name']) ? $li['name'] : __('Item', 'ppcp');
                                     $amount = isset($li['amount']) ? (float) $li['amount'] : 0.0;
+                                    $name     = isset($li['name']) ? $li['name'] : __('Item', 'ppcp');
+                                    $amount   = isset($li['amount']) ? (float) $li['amount'] : 0.0;
                                     $quantity = isset($li['quantity']) ? (int) $li['quantity'] : 1;
                                     $items[] = array(
                                         'name' => $name,
                                         'price' => wc_format_decimal($amount, 2, false),
+                                        'name'     => $name,
+                                        'price'    => wc_format_decimal($amount, 2, false),
                                         'quantity' => max(1, $quantity),
                                         'subtotal' => wc_format_decimal($amount * max(1, $quantity), 2, false),
 …
                                 if ($total_item_amount > 0) {
                                     $items[] = array(
                                         'name' => __('Items', 'ppcp'),
                                         'price' => wc_format_decimal($total_item_amount, 2, false),
+                                        'name'     => __('Items', 'ppcp'),
+                                        'price'    => wc_format_decimal($total_item_amount, 2, false),
                                         'quantity' => 1,
                                         'subtotal' => wc_format_decimal($total_item_amount, 2, false),
 …
+                                }
+                            }
+                            $shipping_methods = array();
+                            if ('1' === $needs_shipping && WC()->cart) {
+                                if (null === WC()->cart || !WC()->cart->get_cart_contents_count()) {
+                                    wc_load_cart();
+                                }
+                                WC()->cart->calculate_shipping();
+                                $packages       = WC()->shipping()->get_packages();
+                                $chosen_methods = WC()->session->get('chosen_shipping_methods', array());
+                                if (!empty($packages)) {
+                                    foreach ($packages as $pkg_index => $pkg) {
+                                        if (empty($pkg['rates'])) {
+                                            continue;
+                                        }
+                                        if (empty($chosen_methods[$pkg_index])) {
+                                            $first_rate_id              = key($pkg['rates']);
+                                            $chosen_methods[$pkg_index] = $first_rate_id;
+                                        }
+                                        foreach ($pkg['rates'] as $rate_id => $rate) {
+                                            $shipping_methods[] = array(
+                                                'id'          => $rate_id,
+                                                'label'       => $rate->label,
+                                                'amount'      => wc_format_decimal($rate->cost, 2, false),
+                                                'is_selected' => (
+                                                    isset($chosen_methods[$pkg_index]) &&
+                                                    $chosen_methods[$pkg_index] === $rate_id
+                                                ),
+                                            );
+                                        }
+                                    }
+                                    WC()->session->set('chosen_shipping_methods', $chosen_methods);
+                                }
+                            }
                             return array(
+                                'currency' => get_woocommerce_currency(),
+                                'cart_total' => wc_format_decimal($order_total, 2, false),
+                                'needs_shipping' => $needs_shipping,
+                                'shipping_total' => wc_format_decimal($shipping, 2, false),
+                                'tax_total' => wc_format_decimal($tax_total, 2, false),
+                                'discount_total' => wc_format_decimal(max(0, $discount_total), 2, false),
+                                'cart_items' => $items,
+                                'currency'        => get_woocommerce_currency(),
+                                'cart_total'      => wc_format_decimal($order_total, 2, false),
+                                'needs_shipping'  => $needs_shipping,
+                                'shipping_total'  => wc_format_decimal($shipping, 2, false),
+                                'tax_total'       => wc_format_decimal($tax_total, 2, false),
+                                'discount_total'  => wc_format_decimal(max(0, $discount_total), 2, false),
+                                'cart_items'      => $items,
+                                'shipping_methods'=> $shipping_methods,
                             );
+                        }
 …
                         if (!empty($_POST)) {
                             if (isset($_POST['radio-control-wc-payment-method-options'])) {
                                 $address = array();
                                 $address['radio-control-wc-payment-method-options'] = wc_clean(wp_unslash($_POST['radio-control-wc-payment-method-options']));
                                 $address['payment_method'] = $address['radio-control-wc-payment-method-options'];
                                 $billing_address = json_decode(stripslashes($_POST['billing_address'] ?? ''), true);
+                                $address                                               = array();
+                                $address['radio-control-wc-payment-method-options']    = wc_clean(wp_unslash($_POST['radio-control-wc-payment-method-options']));
+                                $address['payment_method']                             = $address['radio-control-wc-payment-method-options'];
+                                $billing_address                                       = json_decode(stripslashes($_POST['billing_address'] ?? ''), true);
                                 if (is_array($billing_address)) {
                                     foreach ($billing_address as $key => $val) {
 …
                                 WC()->session->set('reload_checkout', true);
                                 $error_messages_data = wc_get_notices('error');
                                 $error_messages = array();
+                                $error_messages      = array();
                                 foreach ($error_messages_data as $value) {
                                     $error_messages[] = $value['notice'];
 …
+    }
+    function set_customer_data($data) {
+    public function set_customer_data($data) {
         try {
             $customer = WC()->customer;
             $billing_first_name = empty($data['billing_first_name']) ? '' : wc_clean($data['billing_first_name']);
+            $billing_last_name = empty($data['billing_last_name']) ? '' : wc_clean($data['billing_last_name']);
+            $billing_country = empty($data['billing_country']) ? '' : wc_clean($data['billing_country']);
+            $billing_address_1 = empty($data['billing_address_1']) ? '' : wc_clean($data['billing_address_1']);
+            $billing_address_2 = empty($data['billing_address_2']) ? '' : wc_clean($data['billing_address_2']);
+            $billing_city = empty($data['billing_city']) ? '' : wc_clean($data['billing_city']);
+            $billing_state = empty($data['billing_state']) ? '' : wc_clean($data['billing_state']);
+            $billing_postcode = empty($data['billing_postcode']) ? '' : wc_clean($data['billing_postcode']);
+            $billing_phone = empty($data['billing_phone']) ? '' : wc_clean($data['billing_phone']);
+            $billing_email = empty($data['billing_email']) ? '' : wc_clean($data['billing_email']);
+            if (isset($data['ship_to_different_address'])) {
+            $billing_last_name  = empty($data['billing_last_name']) ? '' : wc_clean($data['billing_last_name']);
+            $billing_country    = empty($data['billing_country']) ? '' : wc_clean($data['billing_country']);
+            $billing_address_1  = empty($data['billing_address_1']) ? '' : wc_clean($data['billing_address_1']);
+            $billing_address_2  = empty($data['billing_address_2']) ? '' : wc_clean($data['billing_address_2']);
+            $billing_city       = empty($data['billing_city']) ? '' : wc_clean($data['billing_city']);
+            $billing_state      = empty($data['billing_state']) ? '' : wc_clean($data['billing_state']);
+            $billing_postcode   = empty($data['billing_postcode']) ? '' : wc_clean($data['billing_postcode']);
+            $billing_phone      = empty($data['billing_phone']) ? '' : wc_clean($data['billing_phone']);
+            $billing_email      = empty($data['billing_email']) ? '' : wc_clean($data['billing_email']);
+            $has_valid_shipping = (
+                !empty($data['shipping_first_name']) ||
+                !empty($data['shipping_last_name']) ||
+                !empty($data['shipping_country']) ||
+                !empty($data['shipping_address_1']) ||
+                !empty($data['shipping_city']) ||
+                !empty($data['shipping_postcode'])
+            );
+            if ( isset($data['ship_to_different_address']) || $has_valid_shipping ) {
                 $shipping_first_name = empty($data['shipping_first_name']) ? '' : wc_clean($data['shipping_first_name']);
                 $shipping_last_name = empty($data['shipping_last_name']) ? '' : wc_clean($data['shipping_last_name']);
                 $shipping_country = empty($data['shipping_country']) ? '' : wc_clean($data['shipping_country']);
                 $shipping_address_1 = empty($data['shipping_address_1']) ? '' : wc_clean($data['shipping_address_1']);
                 $shipping_address_2 = empty($data['shipping_address_2']) ? '' : wc_clean($data['shipping_address_2']);
                 $shipping_city = empty($data['shipping_city']) ? '' : wc_clean($data['shipping_city']);
                 $shipping_state = empty($data['shipping_state']) ? '' : wc_clean($data['shipping_state']);
                 $shipping_postcode = empty($data['shipping_postcode']) ? '' : wc_clean($data['shipping_postcode']);
+                $shipping_last_name  = empty($data['shipping_last_name']) ? '' : wc_clean($data['shipping_last_name']);
+                $shipping_country    = empty($data['shipping_country']) ? '' : wc_clean($data['shipping_country']);
+                $shipping_address_1  = empty($data['shipping_address_1']) ? '' : wc_clean($data['shipping_address_1']);
+                $shipping_address_2  = empty($data['shipping_address_2']) ? '' : wc_clean($data['shipping_address_2']);
+                $shipping_city       = empty($data['shipping_city']) ? '' : wc_clean($data['shipping_city']);
+                $shipping_state      = empty($data['shipping_state']) ? '' : wc_clean($data['shipping_state']);
+                $shipping_postcode   = empty($data['shipping_postcode']) ? '' : wc_clean($data['shipping_postcode']);
             } else {
                 $shipping_first_name = $billing_first_name;
+                $shipping_last_name = $billing_last_name;
+                $shipping_country = $billing_country;
+                $shipping_address_1 = $billing_address_1;
+                $shipping_address_2 = $billing_address_2;
+                $shipping_city = $billing_city;
+                $shipping_state = $billing_state;
+                $shipping_postcode = $billing_postcode;
+            }
+            $customer->set_shipping_country($shipping_country);
+            $customer->set_shipping_address($shipping_address_1);
+            $customer->set_shipping_address_2($shipping_address_2);
+            $customer->set_shipping_city($shipping_city);
+            $customer->set_shipping_state($shipping_state);
+            $customer->set_shipping_postcode($shipping_postcode);
+            $customer->set_shipping_first_name($shipping_first_name);
+            $customer->set_shipping_last_name($shipping_last_name);
+            $customer->set_billing_first_name($billing_first_name);
+            $customer->set_billing_last_name($billing_last_name);
+            $customer->set_billing_country($billing_country);
+            $customer->set_billing_address_1($billing_address_1);
+            $customer->set_billing_address_2($billing_address_2);
+            $customer->set_billing_city($billing_city);
+            $customer->set_billing_state($billing_state);
+            $customer->set_billing_postcode($billing_postcode);
+            $customer->set_billing_phone($billing_phone);
+            $customer->set_billing_email($billing_email);
+        } catch (Exception $ex) {
+                $shipping_last_name  = $billing_last_name;
+                $shipping_country    = $billing_country;
+                $shipping_address_1  = $billing_address_1;
+                $shipping_address_2  = $billing_address_2;
+                $shipping_city       = $billing_city;
+                $shipping_state      = $billing_state;
+                $shipping_postcode   = $billing_postcode;
+            }
+            $customer->set_shipping_country( $shipping_country );
+            $customer->set_shipping_address( $shipping_address_1 );
+            $customer->set_shipping_address_2( $shipping_address_2 );
+            $customer->set_shipping_city( $shipping_city );
+            $customer->set_shipping_state( $shipping_state );
+            $customer->set_shipping_postcode( $shipping_postcode );
+            $customer->set_shipping_first_name( $shipping_first_name );
+            $customer->set_shipping_last_name( $shipping_last_name );
+            $customer->set_billing_first_name( $billing_first_name );
+            $customer->set_billing_last_name( $billing_last_name );
+            $customer->set_billing_country( $billing_country );
+            $customer->set_billing_address_1( $billing_address_1 );
+            $customer->set_billing_address_2( $billing_address_2 );
+            $customer->set_billing_city( $billing_city );
+            $customer->set_billing_state( $billing_state );
+            $customer->set_billing_postcode( $billing_postcode );
+            $customer->set_billing_phone( $billing_phone );
+            $customer->set_billing_email( $billing_email );
+            $customer->save();
+        } catch ( Exception $ex ) {
+        }
+    }
 …
     public function validate_checkout($country, $state, $sec) {
+        $state_value = '';
+        $valid_states = WC()->countries->get_states(isset($country) ? $country : ( 'billing' === $sec ? WC()->customer->get_country() : WC()->customer->get_shipping_country() ));
+        $state_value  = '';
+        $valid_states = WC()->countries->get_states(
+            isset($country)
+                ? $country
+                : ( 'billing' === $sec ? WC()->customer->get_country() : WC()->customer->get_shipping_country() )
+        );
         if (!empty($valid_states) && is_array($valid_states)) {
             $valid_state_values = array_flip(array_map('strtolower', $valid_states));
 …
             return $state;
+        }
+        if (!empty($valid_states) && is_array($valid_states) && sizeof($valid_states) > 0) {
+            if (!in_array($state, array_keys($valid_states))) {
+        if (!empty($valid_states) && is_array($valid_states) && count($valid_states) > 0) {
+            if (!in_array($state, array_keys($valid_states), true)) {
+                $fuzzy = $this->fuzzy_match_state_label($state, $valid_states);
+                if ($fuzzy) {
+                    return $fuzzy;
+                }
                 return false;
             } else {
 …
         return $state_value;
+    }
+    protected function fuzzy_match_state_label($state, $valid_states) {
+        $state    = trim((string) $state);
+        $state_lc = strtolower($state);
+        if ($state_lc === '') {
+            return false;
+        }
+        foreach ($valid_states as $code => $label) {
+            if (strtolower($label) === $state_lc) {
+                return $code;
+            }
+        }
+        foreach ($valid_states as $code => $label) {
+            $label_lc = strtolower($label);
+            if (strpos($label_lc, $state_lc) !== false || strpos($state_lc, $label_lc) !== false) {
+                return $code;
+            }
+        }
+        $state_soundex = soundex($state_lc);
+        foreach ($valid_states as $code => $label) {
+            if (soundex(strtolower($label)) === $state_soundex) {
+                return $code;
+            }
+        }
+        $closest_code      = false;
+        $shortest_distance = null;
+        foreach ($valid_states as $code => $label) {
+            $label_lc = strtolower($label);
+            $distance = levenshtein($state_lc, $label_lc);
+            if ($shortest_distance === null || $distance < $shortest_distance) {
+                $shortest_distance = $distance;
+                $closest_code      = $code;
+            }
+        }
+        if ($shortest_distance !== null && $shortest_distance <= 3) {
+            return $closest_code;
+        }
+        return false;
+    }
     public function ppcp_update_checkout_field_details() {
 …
+    }
+    protected function normalize_state_code( $country, $state ) {
+        $country = strtoupper( (string) $country );
+        $state   = trim( (string) $state );
+        $state_lc = strtolower( $state );
+        if ( $country === '' || $state === '' ) {
+            return $state;
+        }
+        $valid_states = WC()->countries->get_states( $country );
+        if ( empty( $valid_states ) || ! is_array( $valid_states ) ) {
+            return $state;
+        }
+        foreach ( $valid_states as $code => $label ) {
+            if ( strtolower( $code ) === $state_lc ) {
+                return $code;
+            }
+        }
+        foreach ( $valid_states as $code => $label ) {
+            if ( strtolower( $label ) === $state_lc ) {
+                return $code;
+            }
+        }
+        foreach ( $valid_states as $code => $label ) {
+            if ( strpos( strtolower( $label ), $state_lc ) !== false ||
+                 strpos( $state_lc, strtolower( $label ) ) !== false ) {
+                return $code;
+            }
+        }
+        foreach ( $valid_states as $code => $label ) {
+            if ( soundex( $state_lc ) === soundex( strtolower( $label ) ) ) {
+                return $code;
+            }
+        }
+        $closest_code = $state;
+        $shortest_distance = 5; // max allowed edits
+        foreach ( $valid_states as $code => $label ) {
+            $distance = levenshtein( $state_lc, strtolower( $label ) );
+            if ( $distance < $shortest_distance ) {
+                $shortest_distance = $distance;
+                $closest_code      = $code;
+            }
+        }
+        if ( $closest_code !== $state ) {
+            return $closest_code;
+        }
+        return $state;
+    }
     public function ppcp_prepare_order_data() {
+        // Use generic session key names
+        $session_billing = WC()->session->get('ppcp_billing_address');
+        $session_billing  = WC()->session->get('ppcp_billing_address');
         $session_shipping = WC()->session->get('ppcp_shipping_address');
-        // Load fallback checkout details if session is empty
         if (empty($this->checkout_details)) {
             $this->checkout_details = ppcp_get_session('ppcp_paypal_transaction_details', false);
             if (empty($this->checkout_details)) {
                 $ppcp_order_id = ppcp_get_session('ppcp_paypal_order_id');
 …
+                }
+            }
             if (!empty($this->checkout_details)) {
                 ppcp_set_session('ppcp_paypal_transaction_details', $this->checkout_details);
+            }
+        }
+        // Final source: priority → session > checkout_details
+        $billing_address = is_array($session_billing) && !empty($session_billing) ? $session_billing : $this->get_mapped_billing_address($this->checkout_details ?? [], !$this->set_billing_address);
+        $shipping_address = is_array($session_shipping) && !empty($session_shipping) ? $session_shipping : $this->get_mapped_shipping_address($this->checkout_details ?? []);
+        // Build order data
+        $billing_address = is_array($session_billing) && !empty($session_billing)
+            ? $session_billing
+            : $this->get_mapped_billing_address($this->checkout_details ?? [], !$this->set_billing_address);
+        $shipping_address = is_array($session_shipping) && !empty($session_shipping)
+            ? $session_shipping
+            : $this->get_mapped_shipping_address($this->checkout_details ?? []);
+        if (!empty($billing_address['state']) && !empty($billing_address['country'])) {
+            $billing_address['state'] = $this->normalize_state_code(
+                $billing_address['country'],
+                $billing_address['state']
+            );
+            $validated = $this->validate_checkout(
+                $billing_address['country'],
+                $billing_address['state'],
+                'billing'
+            );
+            if ($validated !== false && $validated !== '') {
+                $billing_address['state'] = $validated;
+            }
+        }
+        if (!empty($shipping_address['state']) && !empty($shipping_address['country'])) {
+            $shipping_address['state'] = $this->normalize_state_code(
+                $shipping_address['country'],
+                $shipping_address['state']
+            );
+            $validated = $this->validate_checkout(
+                $shipping_address['country'],
+                $shipping_address['state'],
+                'shipping'
+            );
+            if ($validated !== false && $validated !== '') {
+                $shipping_address['state'] = $validated;
+            }
+        }
         $order_data = [
             'terms' => 1,
             'createaccount' => 0,
             'payment_method' => 'wpg_paypal_checkout',
+            'terms'                     => 1,
+            'createaccount'             => 0,
+            'payment_method'            => 'wpg_paypal_checkout',
             'ship_to_different_address' => false,
+            'order_comments' => '',
+            'shipping_method' => '',
+            // Billing from selected source
+            'order_comments'            => '',
+            'shipping_method'           => '',
             'billing_first_name' => $billing_address['first_name'] ?? '',
+            'billing_last_name' => $billing_address['last_name'] ?? '',
+            'billing_email' => $billing_address['email'] ?? '',
+            'billing_company' => $billing_address['company'] ?? '',
+            'billing_address_1' => $billing_address['address_1'] ?? '',
+            'billing_address_2' => $billing_address['address_2'] ?? '',
+            'billing_city' => $billing_address['city'] ?? '',
+            'billing_state' => $billing_address['state'] ?? '',
+            'billing_postcode' => $billing_address['postcode'] ?? '',
+            'billing_country' => $billing_address['country'] ?? '',
+            'billing_phone' => $billing_address['phone'] ?? '',
+            // Shipping from selected source
+            'billing_last_name'  => $billing_address['last_name'] ?? '',
+            'billing_email'      => $billing_address['email'] ?? '',
+            'billing_company'    => $billing_address['company'] ?? '',
+            'billing_address_1'  => $billing_address['address_1'] ?? '',
+            'billing_address_2'  => $billing_address['address_2'] ?? '',
+            'billing_city'       => $billing_address['city'] ?? '',
+            'billing_state'      => $billing_address['state'] ?? '',
+            'billing_postcode'   => $billing_address['postcode'] ?? '',
+            'billing_country'    => $billing_address['country'] ?? '',
+            'billing_phone'      => $billing_address['phone'] ?? '',
             'shipping_first_name' => $shipping_address['first_name'] ?? '',
             'shipping_last_name' => $shipping_address['last_name'] ?? '',
             'shipping_company' => $shipping_address['company'] ?? '',
             'shipping_address_1' => $shipping_address['address_1'] ?? '',
             'shipping_address_2' => $shipping_address['address_2'] ?? '',
             'shipping_city' => $shipping_address['city'] ?? '',
             'shipping_state' => $shipping_address['state'] ?? '',
             'shipping_postcode' => $shipping_address['postcode'] ?? '',
             'shipping_country' => $shipping_address['country'] ?? '',
             'shipping_phone' => $shipping_address['phone'] ?? '',
+            'shipping_last_name'  => $shipping_address['last_name'] ?? '',
+            'shipping_company'    => $shipping_address['company'] ?? '',
+            'shipping_address_1'  => $shipping_address['address_1'] ?? '',
+            'shipping_address_2'  => $shipping_address['address_2'] ?? '',
+            'shipping_city'       => $shipping_address['city'] ?? '',
+            'shipping_state'      => $shipping_address['state'] ?? '',
+            'shipping_postcode'   => $shipping_address['postcode'] ?? '',
+            'shipping_country'    => $shipping_address['country'] ?? '',
+            'shipping_phone'      => $shipping_address['phone'] ?? '',
         ];
-        // Clean up sessions after use
         WC()->session->__unset('ppcp_billing_address');
         WC()->session->__unset('ppcp_shipping_address');
         return $order_data;
+    }
 …
     public function ppcp_get_updated_total() {
+    // Ensure cart is loaded
+    if ( null === WC()->cart || ! WC()->cart->get_cart_contents_count() ) {
+        wc_load_cart();
+    }
+    // Parse input
+    $shipping_address = ! empty( $_POST['shipping_address'] )
+        ? json_decode( stripslashes( sanitize_textarea_field( wp_unslash( $_POST['shipping_address'] ) ) ), true )
+        : [];
+    $billing_address  = ! empty( $_POST['billing_address'] )
+        ? json_decode( stripslashes( sanitize_textarea_field( wp_unslash( $_POST['billing_address'] ) ) ), true )
+        : [];
+    // Helper
+    $split_name = function ( $full_name ) {
+        if ( ! is_string( $full_name ) || trim( $full_name ) === '' ) {
+            return [ '', '' ];
+        }
+        $parts = preg_split( '/\s+/', trim( $full_name ) );
+        $first = $parts[0] ?? '';
+        $last  = isset( $parts[1] ) ? implode( ' ', array_slice( $parts, 1 ) ) : '';
+        return [ $first, $last ];
+    };
+    // Clear any previously stored session addresses so WC recalculates cleanly
+    WC()->session->__unset( 'ppcp_billing_address' );
+    WC()->session->__unset( 'ppcp_shipping_address' );
+    // ---- Apply SHIPPING address (if provided) ----
+    if ( ! empty( $shipping_address ) ) {
+        [ $s_first, $s_last ] = $split_name( $shipping_address['name'] ?? '' );
+        if ( empty( $s_last ) ) {
+            $s_last = $shipping_address['surname'] ?? '';
+        }
+        // Set on WC customer
+        WC()->customer->set_shipping_first_name( $s_first );
+        WC()->customer->set_shipping_last_name( $s_last );
+        WC()->customer->set_shipping_address_1( $shipping_address['address1'] ?? '' );
+        WC()->customer->set_shipping_address_2( $shipping_address['address2'] ?? '' );
+        WC()->customer->set_shipping_city( $shipping_address['city'] ?? '' );
+        WC()->customer->set_shipping_postcode( $shipping_address['postcode'] ?? '' );
+        WC()->customer->set_shipping_state( $shipping_address['state'] ?? '' );
+        WC()->customer->set_shipping_country( $shipping_address['country'] ?? '' );
+        // Also mirror to session so WC shipping zones trigger correctly
+        WC()->session->set( 'customer_shipping_country',  $shipping_address['country'] ?? '' );
+        WC()->session->set( 'customer_shipping_state',    $shipping_address['state'] ?? '' );
+        WC()->session->set( 'customer_shipping_postcode', $shipping_address['postcode'] ?? '' );
+        WC()->session->set( 'customer_shipping_city',     $shipping_address['city'] ?? '' );
+        WC()->session->set( 'customer_shipping_address',  $shipping_address['address1'] ?? '' );
+        WC()->session->set( 'customer_shipping_address_1', $shipping_address['address1'] ?? '' );
+        WC()->session->set( 'customer_shipping_address_2', $shipping_address['address2'] ?? '' );
+        // Save a copy (optional)
+        WC()->session->set( 'ppcp_shipping_address', [
+            'first_name' => $s_first,
+            'last_name'  => $s_last,
+            'address_1'  => $shipping_address['address1'] ?? '',
+            'address_2'  => $shipping_address['address2'] ?? '',
+            'city'       => $shipping_address['city'] ?? '',
+            'postcode'   => $shipping_address['postcode'] ?? '',
+            'state'      => $shipping_address['state'] ?? '',
+            'country'    => $shipping_address['country'] ?? '',
+            'phone'      => $shipping_address['phoneNumber'] ?? '',
+        ] );
+    }
+    // ---- Apply BILLING address (if provided) ----
+    if ( ! empty( $billing_address ) ) {
+        [ $b_first, $b_last ] = $split_name( $billing_address['name'] ?? '' );
+        if ( empty( $b_last ) ) {
+            $b_last = $billing_address['surname'] ?? '';
+        }
+        WC()->customer->set_billing_first_name( $b_first );
+        WC()->customer->set_billing_last_name( $b_last );
+        WC()->customer->set_billing_address_1( $billing_address['address1'] ?? '' );
+        WC()->customer->set_billing_address_2( $billing_address['address2'] ?? '' );
+        WC()->customer->set_billing_city( $billing_address['city'] ?? '' );
+        WC()->customer->set_billing_postcode( $billing_address['postcode'] ?? '' );
+        WC()->customer->set_billing_state( $billing_address['state'] ?? '' );
+        WC()->customer->set_billing_country( $billing_address['country'] ?? '' );
+        WC()->customer->set_billing_email( $billing_address['emailAddress'] ?? '' );
+        WC()->customer->set_billing_phone( $billing_address['phoneNumber'] ?? '' );
+        WC()->session->set( 'customer_billing_country',  $billing_address['country'] ?? '' );
+        WC()->session->set( 'customer_billing_state',    $billing_address['state'] ?? '' );
+        WC()->session->set( 'customer_billing_postcode', $billing_address['postcode'] ?? '' );
+        WC()->session->set( 'customer_billing_city',     $billing_address['city'] ?? '' );
+        WC()->session->set( 'customer_billing_address',  $billing_address['address1'] ?? '' );
+        WC()->session->set( 'customer_billing_address_1', $billing_address['address1'] ?? '' );
+        WC()->session->set( 'customer_billing_address_2', $billing_address['address2'] ?? '' );
+        WC()->session->set( 'ppcp_billing_address', [
+            'first_name' => $b_first,
+            'last_name'  => $b_last,
+            'email'      => $billing_address['emailAddress'] ?? '',
+            'address_1'  => $billing_address['address1'] ?? '',
+            'address_2'  => $billing_address['address2'] ?? '',
+            'city'       => $billing_address['city'] ?? '',
+            'postcode'   => $billing_address['postcode'] ?? '',
+            'state'      => $billing_address['state'] ?? '',
+            'country'    => $billing_address['country'] ?? '',
+            'phone'      => $billing_address['phoneNumber'] ?? '',
+        ] );
+    }
+    try {
+        // When address changes, nuke cached shipping rates so WC recomputes packages
+        $packages = WC()->cart->get_shipping_packages();
+        foreach ( $packages as $i => $pkg ) {
+            WC()->session->__unset( "shipping_for_package_{$i}" );
+        }
+        // Force recalculation
+        WC()->customer->set_calculated_shipping( false );
+        WC()->customer->save();
+        WC()->cart->calculate_shipping();
+        WC()->cart->calculate_totals();
+        // Build items for Google Pay sheet (subtotal per line, excl. shipping; taxes reported separately)
+        $cart_items = [];
+        foreach ( WC()->cart->get_cart() as $cart_item ) {
+            /** @var WC_Product $product */
+            $product   = $cart_item['data'];
+            $qty       = (int) $cart_item['quantity'];
+            $line_subtotal = isset( $cart_item['line_subtotal'] ) ? (float) $cart_item['line_subtotal'] : 0.0; // excl. tax
+            $unit_price    = $qty > 0 ? $line_subtotal / $qty : $line_subtotal;
+            $cart_items[] = [
+                'name'     => html_entity_decode( $product->get_name(), ENT_QUOTES ),
+                'quantity' => $qty,
+                // Either provide unit 'price' OR full line 'subtotal'; your JS handles both.
+                'price'    => wc_format_decimal( $unit_price, 2 ),
+                'subtotal' => wc_format_decimal( $line_subtotal, 2 ),
+            ];
+        }
+        // Pull numeric totals from cart
+        $currency        = get_woocommerce_currency();
+        $total           = wc_format_decimal( (float) WC()->cart->get_total( 'edit' ), 2 );         // grand total (incl tax)
+        $shipping_total  = wc_format_decimal( (float) WC()->cart->get_shipping_total(), 2 );        // shipping excl tax
+        $tax_total       = wc_format_decimal( (float) WC()->cart->get_total_tax(), 2 );             // all taxes (items + shipping)
+        $discount_total  = wc_format_decimal( (float) WC()->cart->get_discount_total(), 2 );        // coupons etc.
+        // Return a full breakdown so your JS can fill displayItems and totals (no "Placeholder text")
+        wp_send_json_success( [
+            'currency'       => $currency,
+            'cart_items'     => $cart_items,
+            'shipping_total' => (string) $shipping_total,  // excl. tax
+            'tax_total'      => (string) $tax_total,
+            'discount_total' => (string) $discount_total,
+            'total'          => (string) $total,           // grand total incl. tax
+        ] );
+    } catch ( Exception $e ) {
+        wp_send_json_error( [
+            'message' => 'Failed to update cart totals.',
+            'error'   => $e->getMessage(),
+        ] );
+    }
+}
+        // Ensure cart is loaded
+        if ( null === WC()->cart || ! WC()->cart->get_cart_contents_count() ) {
+            wc_load_cart();
+        }
+        // Parse input
+        $shipping_address = ! empty( $_POST['shipping_address'] )
+            ? json_decode( stripslashes( sanitize_textarea_field( wp_unslash( $_POST['shipping_address'] ) ) ), true )
+            : [];
+        $billing_address  = ! empty( $_POST['billing_address'] )
+            ? json_decode( stripslashes( sanitize_textarea_field( wp_unslash( $_POST['billing_address'] ) ) ), true )
+            : [];
+        $selected_shipping_id = ! empty( $_POST['selected_shipping_id'] ) ? sanitize_text_field( wp_unslash( $_POST['selected_shipping_id'] ) ) : '';
+        // Helper
+        $split_name = function ( $full_name ) {
+            if ( ! is_string( $full_name ) || trim( $full_name ) === '' ) {
+                return [ '', '' ];
+            }
+            $parts = preg_split( '/\s+/', trim( $full_name ) );
+            $first = $parts[0] ?? '';
+            $last  = isset( $parts[1] ) ? implode( ' ', array_slice( $parts, 1 ) ) : '';
+            return [ $first, $last ];
+        };
+        // Clear any previously stored session addresses so WC recalculates cleanly
+        WC()->session->__unset( 'ppcp_billing_address' );
+        WC()->session->__unset( 'ppcp_shipping_address' );
+        // ---- Apply SHIPPING address (if provided) ----
+        if ( ! empty( $shipping_address ) ) {
+            [ $s_first, $s_last ] = $split_name( $shipping_address['name'] ?? '' );
+            if ( empty( $s_last ) ) {
+                $s_last = $shipping_address['surname'] ?? '';
+            }
+            // Set on WC customer
+            WC()->customer->set_shipping_first_name( $s_first );
+            WC()->customer->set_shipping_last_name( $s_last );
+            WC()->customer->set_shipping_address_1( $shipping_address['address1'] ?? '' );
+            WC()->customer->set_shipping_address_2( $shipping_address['address2'] ?? '' );
+            WC()->customer->set_shipping_city( $shipping_address['city'] ?? '' );
+            WC()->customer->set_shipping_postcode( $shipping_address['postcode'] ?? '' );
+            WC()->customer->set_shipping_state( $shipping_address['state'] ?? '' );
+            WC()->customer->set_shipping_country( $shipping_address['country'] ?? '' );
+            // Also mirror to session so WC shipping zones trigger correctly
+            WC()->session->set( 'customer_shipping_country',   $shipping_address['country'] ?? '' );
+            WC()->session->set( 'customer_shipping_state',     $shipping_address['state'] ?? '' );
+            WC()->session->set( 'customer_shipping_postcode',  $shipping_address['postcode'] ?? '' );
+            WC()->session->set( 'customer_shipping_city',      $shipping_address['city'] ?? '' );
+            WC()->session->set( 'customer_shipping_address',   $shipping_address['address1'] ?? '' );
+            WC()->session->set( 'customer_shipping_address_1', $shipping_address['address1'] ?? '' );
+            WC()->session->set( 'customer_shipping_address_2', $shipping_address['address2'] ?? '' );
+            // Save a copy (optional)
+            WC()->session->set( 'ppcp_shipping_address', [
+                'first_name' => $s_first,
+                'last_name'  => $s_last,
+                'address_1'  => $shipping_address['address1'] ?? '',
+                'address_2'  => $shipping_address['address2'] ?? '',
+                'city'       => $shipping_address['city'] ?? '',
+                'postcode'   => $shipping_address['postcode'] ?? '',
+                'state'      => $shipping_address['state'] ?? '',
+                'country'    => $shipping_address['country'] ?? '',
+                'phone'      => $shipping_address['phoneNumber'] ?? '',
+            ] );
+        }
+        // ---- Apply BILLING address (if provided) ----
+        if ( ! empty( $billing_address ) ) {
+            [ $b_first, $b_last ] = $split_name( $billing_address['name'] ?? '' );
+            if ( empty( $b_last ) ) {
+                $b_last = $billing_address['surname'] ?? '';
+            }
+            WC()->customer->set_billing_first_name( $b_first );
+            WC()->customer->set_billing_last_name( $b_last );
+            WC()->customer->set_billing_address_1( $billing_address['address1'] ?? '' );
+            WC()->customer->set_billing_address_2( $billing_address['address2'] ?? '' );
+            WC()->customer->set_billing_city( $billing_address['city'] ?? '' );
+            WC()->customer->set_billing_postcode( $billing_address['postcode'] ?? '' );
+            WC()->customer->set_billing_state( $billing_address['state'] ?? '' );
+            WC()->customer->set_billing_country( $billing_address['country'] ?? '' );
+            WC()->customer->set_billing_email( $billing_address['emailAddress'] ?? '' );
+            WC()->customer->set_billing_phone( $billing_address['phoneNumber'] ?? '' );
+            WC()->session->set( 'customer_billing_country',   $billing_address['country'] ?? '' );
+            WC()->session->set( 'customer_billing_state',     $billing_address['state'] ?? '' );
+            WC()->session->set( 'customer_billing_postcode',  $billing_address['postcode'] ?? '' );
+            WC()->session->set( 'customer_billing_city',      $billing_address['city'] ?? '' );
+            WC()->session->set( 'customer_billing_address',   $billing_address['address1'] ?? '' );
+            WC()->session->set( 'customer_billing_address_1', $billing_address['address1'] ?? '' );
+            WC()->session->set( 'customer_billing_address_2', $billing_address['address2'] ?? '' );
+            WC()->session->set( 'ppcp_billing_address', [
+                'first_name' => $b_first,
+                'last_name'  => $b_last,
+                'email'      => $billing_address['emailAddress'] ?? '',
+                'address_1'  => $billing_address['address1'] ?? '',
+                'address_2'  => $billing_address['address2'] ?? '',
+                'city'       => $billing_address['city'] ?? '',
+                'postcode'   => $billing_address['postcode'] ?? '',
+                'state'      => $billing_address['state'] ?? '',
+                'country'    => $billing_address['country'] ?? '',
+                'phone'      => $billing_address['phoneNumber'] ?? '',
+            ] );
+        }
+        try {
+            // 🔹 If Google Pay passed a selected shipping method, apply it to Woo session
+            if ( ! empty( $selected_shipping_id ) && WC()->cart ) {
+                $chosen_methods = WC()->session->get( 'chosen_shipping_methods', [] );
+                // Typical stores have 1 package; apply to all packages just in case
+                $packages = WC()->shipping()->get_packages();
+                if ( empty( $packages ) ) {
+                    // make sure packages exist before using chosen method
+                    WC()->cart->calculate_shipping();
+                    $packages = WC()->shipping()->get_packages();
+                }
+                if ( ! empty( $packages ) ) {
+                    foreach ( $packages as $index => $pkg ) {
+                        $chosen_methods[ $index ] = $selected_shipping_id;
+                    }
+                    WC()->session->set( 'chosen_shipping_methods', $chosen_methods );
+                }
+            }
+            // When address / shipping changes, nuke cached shipping rates so WC recomputes packages
+            $packages = WC()->cart->get_shipping_packages();
+            foreach ( $packages as $i => $pkg ) {
+                WC()->session->__unset( "shipping_for_package_{$i}" );
+            }
+            // Force recalculation
+            WC()->customer->set_calculated_shipping( false );
+            WC()->customer->save();
+            WC()->cart->calculate_shipping();
+            WC()->cart->calculate_totals();
+            // Re-fetch packages after calculation
+            $packages       = WC()->shipping()->get_packages();
+            $chosen_methods = WC()->session->get( 'chosen_shipping_methods', [] );
+            // Build items for Google Pay sheet (subtotal per line, excl. shipping; taxes reported separately)
+            $cart_items = [];
+            foreach ( WC()->cart->get_cart() as $cart_item ) {
+                /** @var WC_Product $product */
+                $product   = $cart_item['data'];
+                $qty       = (int) $cart_item['quantity'];
+                $line_subtotal = isset( $cart_item['line_subtotal'] ) ? (float) $cart_item['line_subtotal'] : 0.0; // excl. tax
+                $unit_price    = $qty > 0 ? $line_subtotal / $qty : $line_subtotal;
+                $cart_items[] = [
+                    'name'     => html_entity_decode( $product->get_name(), ENT_QUOTES ),
+                    'quantity' => $qty,
+                    // Either provide unit 'price' OR full line 'subtotal'; your JS handles both.
+                    'price'    => wc_format_decimal( $unit_price, 2 ),
+                    'subtotal' => wc_format_decimal( $line_subtotal, 2 ),
+                ];
+            }
+            // Pull numeric totals from cart
+            $currency        = get_woocommerce_currency();
+            $total           = wc_format_decimal( (float) WC()->cart->get_total( 'edit' ), 2 );         // grand total (incl tax)
+            $shipping_total  = wc_format_decimal( (float) WC()->cart->get_shipping_total(), 2 );        // shipping excl tax
+            $tax_total       = wc_format_decimal( (float) WC()->cart->get_total_tax(), 2 );             // all taxes (items + shipping)
+            $discount_total  = wc_format_decimal( (float) WC()->cart->get_discount_total(), 2 );        // coupons etc.
+            $needs_shipping  = WC()->cart->needs_shipping() ? '1' : '0';
+            // 🔹 Build shipping_methods list (same structure you saw in get_transaction_info)
+            $shipping_methods = [];
+            if ( '1' === $needs_shipping && ! empty( $packages ) ) {
+                foreach ( $packages as $pkg_index => $pkg ) {
+                    if ( empty( $pkg['rates'] ) ) {
+                        continue;
+                    }
+                    // Ensure there is a chosen method for this package
+                    if ( empty( $chosen_methods[ $pkg_index ] ) ) {
+                        $first_rate_id              = key( $pkg['rates'] );
+                        $chosen_methods[ $pkg_index ] = $first_rate_id;
+                    }
+                    foreach ( $pkg['rates'] as $rate_id => $rate ) {
+                        $shipping_methods[] = [
+                            'id'          => $rate_id,
+                            'label'       => $rate->label,
+                            'amount'      => wc_format_decimal( $rate->cost, 2, false ),
+                            'is_selected' => (
+                                isset( $chosen_methods[ $pkg_index ] ) &&
+                                $chosen_methods[ $pkg_index ] === $rate_id
+                            ),
+                        ];
+                    }
+                }
+                // Persist chosen methods so Woo uses them consistently
+                WC()->session->set( 'chosen_shipping_methods', $chosen_methods );
+            }
+            // Return a full breakdown so your JS can fill displayItems and totals
+            wp_send_json_success( [
+                'currency'        => $currency,
+                'cart_items'      => $cart_items,
+                'shipping_total'  => (string) $shipping_total,  // excl. tax
+                'tax_total'       => (string) $tax_total,
+                'discount_total'  => (string) $discount_total,
+                'total'           => (string) $total,           // grand total incl. tax
+                'cart_total'      => (string) $total,           // for your JS convenience
+                'needs_shipping'  => $needs_shipping,
+                'shipping_methods'=> $shipping_methods,
+            ] );
+        } catch ( Exception $e ) {
+            wp_send_json_error( [
+                'message' => 'Failed to update cart totals.',
+                'error'   => $e->getMessage(),
+            ] );
+        }
+    }
 …
     public function ppcp_validate_shipping_address() {
         try {
+            if (!wp_verify_nonce($_POST['security'], 'ppcp_ajax_nonce')) {
+                wp_send_json_error('Security verification failed');
+            // Security check (slightly hardened)
+            if ( ! isset( $_POST['security'] ) || ! wp_verify_nonce( $_POST['security'], 'ppcp_ajax_nonce' ) ) {
+                wp_send_json_error( 'Security verification failed' );
                 return;
+            }
+            if (!isset($_POST['shipping_address'])) {
+                wp_send_json_error('No shipping address data received');
+            if ( ! isset( $_POST['shipping_address'] ) ) {
+                wp_send_json_error( 'No shipping address data received' );
                 return;
+            }
+            $shipping_address = json_decode(wp_unslash($_POST['shipping_address']), true);
+            if (!$shipping_address || empty($shipping_address['countryCode'])) {
+                wp_send_json_error('Invalid shipping address');
+            $shipping_address = json_decode( wp_unslash( $_POST['shipping_address'] ), true );
+            if ( ! $shipping_address || empty( $shipping_address['countryCode'] ) ) {
+                wp_send_json_error( 'Invalid shipping address' );
                 return;
+            }
             $countries = WC()->countries->get_shipping_countries();
             if (!isset($countries[$shipping_address['countryCode']])) {
                 wp_send_json_error('We do not ship to this country');
+            if ( ! isset( $countries[ $shipping_address['countryCode'] ] ) ) {
+                wp_send_json_error( 'We do not ship to this country' );
                 return;
+            }
+            if (empty($shipping_address['postalCode']) || empty($shipping_address['city'])) {
+                wp_send_json_error('Please complete all required fields');
+            if ( empty( $shipping_address['postalCode'] ) || empty( $shipping_address['city'] ) ) {
+                wp_send_json_error( 'Please complete all required fields' );
                 return;
+            }
+            // NEW: read selected shipping from PayPal (if provided)
+            $selected_shipping_id = isset( $_POST['selected_shipping_id'] )
+                ? wc_clean( wp_unslash( $_POST['selected_shipping_id'] ) )
+                : '';
             $customer = WC()->customer;
             if ($customer && is_a($customer, 'WC_Customer')) {
+            if ( $customer && is_a( $customer, 'WC_Customer' ) ) {
                 try {
+                    $customer->set_shipping_country($shipping_address['countryCode'] ?? '');
+                    $customer->set_shipping_state($shipping_address['state'] ?? '');
+                    $customer->set_shipping_postcode($shipping_address['postalCode'] ?? '');
+                    $customer->set_shipping_city($shipping_address['city'] ?? '');
+                    if (isset($shipping_address['address_line_1'])) {
+                        $customer->set_shipping_address_1($shipping_address['address_line_1']);
+                    $country_code = $shipping_address['countryCode'] ?? '';
+                    $customer->set_shipping_country( $country_code );
+                    $customer->set_shipping_postcode( $shipping_address['postalCode'] ?? '' );
+                    $customer->set_shipping_city( $shipping_address['city'] ?? '' );
+                    // -----------------------------
+                    // State normalization + validate
+                    // -----------------------------
+                    $raw_state = $shipping_address['state'] ?? '';
+                    if ( $raw_state !== '' && $country_code !== '' ) {
+                        // 1. Normalize state from any format (name/code, any case) → WC code
+                        $normalized_state = $this->normalize_state_code( $country_code, $raw_state );
+                        // 2. Let existing system-wide validation run (unchanged logic)
+                        $validated_state = $this->validate_checkout(
+                            $country_code,
+                            $normalized_state,
+                            'shipping'
+                        );
+                        if ( $validated_state !== false && $validated_state !== '' ) {
+                            $customer->set_shipping_state( $validated_state );
+                        } else {
+                            // Fall back to normalized value if validate_checkout can't resolve
+                            $customer->set_shipping_state( $normalized_state );
+                        }
+                    } else {
+                        // Some countries don't use states
+                        $customer->set_shipping_state( '' );
+                    }
+                    if (isset($shipping_address['address_line_2'])) {
+                        $customer->set_shipping_address_2($shipping_address['address_line_2']);
+                    if ( isset( $shipping_address['address_line_1'] ) ) {
+                        $customer->set_shipping_address_1( $shipping_address['address_line_1'] );
+                    }
+                    if (isset($shipping_address['name']['full_name'])) {
+                        $name_parts = explode(' ', $shipping_address['name']['full_name'], 2);
+                        $customer->set_shipping_first_name($name_parts[0] ?? '');
+                        $customer->set_shipping_last_name($name_parts[1] ?? '');
+                    if ( isset( $shipping_address['address_line_2'] ) ) {
+                        $customer->set_shipping_address_2( $shipping_address['address_line_2'] );
+                    }
+                    if ( isset( $shipping_address['name']['full_name'] ) ) {
+                        $name_parts = explode( ' ', $shipping_address['name']['full_name'], 2 );
+                        $customer->set_shipping_first_name( $name_parts[0] ?? '' );
+                        $customer->set_shipping_last_name( $name_parts[1] ?? '' );
+                    }
                     $customer->save();
+                    if (WC()->cart && !WC()->cart->is_empty()) {
+                        WC()->cart->calculate_shipping();
+                        WC()->cart->calculate_totals();
+                } catch ( Exception $e ) {
+                    error_log( 'Error updating customer shipping address: ' . $e->getMessage() );
+                }
+            }
+            // Build & calculate shipping packages + set chosen_shipping_methods
+            if ( WC()->cart && ! WC()->cart->is_empty() ) {
+                $packages = WC()->cart->get_shipping_packages();
+                WC()->shipping()->calculate_shipping( $packages );
+                // Now WC()->shipping()->get_packages() has the rates
+                $packages = WC()->shipping()->get_packages();
+                if ( ! empty( $selected_shipping_id ) && ! empty( $packages ) ) {
+                    $chosen_methods = WC()->session->get( 'chosen_shipping_methods', array() );
+                    foreach ( $packages as $package_index => $package ) {
+                        if ( ! empty( $package['rates'] ) && isset( $package['rates'][ $selected_shipping_id ] ) ) {
+                            $chosen_methods[ $package_index ] = $selected_shipping_id;
+                            break; // found matching rate; no need to continue
+                        }
+                    }
+                } catch (Exception $e) {
+                    error_log('Error updating customer shipping address: ' . $e->getMessage());
+                }
+            }
+                    WC()->session->set( 'chosen_shipping_methods', $chosen_methods );
+                }
+                // Recalculate totals using new address + chosen method
+                WC()->cart->calculate_totals();
+            }
+            // Keep original behavior: update PayPal order from cart
             $this->request->ppcp_update_order_from_cart();
+            wp_send_json_success('Address is valid');
+        } catch (Exception $e) {
+            wp_send_json_error('Unable to validate address');
+            wp_send_json_success( 'Address is valid' );
+        } catch ( Exception $e ) {
+            wp_send_json_error( 'Unable to validate address' );
+        }
+    }

woo-paypal-gateway/trunk/ppcp/public/js/ppcp-paypal-checkout-for-woocommerce-public.js

-                      r3396892
+                      r3401525
             this.pageContext = 'unknown';
             this.ppcp_used_payment_method = null;
+            this.googleSelectedShippingId = '';
+            this.googleShippingIdMap = {};
+            this.appleSelectedShippingId = '';
+            this.appleShippingIdMap = {};
             this.init();
             this.ppcp_cart_css();
 …
+            }
             // Simple address mapping
+            // Simple address mapping (same as before)
             const shippingAddress = {
                 city: data.shipping_address.city || '',
 …
             };
+            // Validate address via AJAX (this will call ppcp_update_order)
+            // NEW: detect which shipping method was selected in the PayPal UI
+            const selectedOption =
+                data.selected_shipping_option ||
+                data.selectedShippingOption ||
+                null;
+            const selectedShippingId =
+                selectedOption && selectedOption.id ? selectedOption.id : '';
+            // Validate address via AJAX (this will also update PayPal order)
             return fetch(this.ppcp_manager.ajax_url, {
                 method: 'POST',
 …
                     action: 'ppcp_validate_shipping_address',
                     security: this.ppcp_manager.ajax_nonce,
+                    shipping_address: JSON.stringify(shippingAddress)
+                    shipping_address: JSON.stringify(shippingAddress),
+                    // NEW: send selected shipping method id to PHP
+                    selected_shipping_id: selectedShippingId
                 })
             })
+                    .then(res => res.json())
+                    .then(result => {
+                        if (result.success) {
+                            return actions.resolve();
+                        } else {
+                            return actions.reject();
+                        }
+                    })
+                    .catch(() => {
+                .then(res => res.json())
+                .then(result => {
+                    if (result && result.success) {
+                        return actions.resolve();
+                    } else {
                         return actions.reject();
+                    });
+        }
+                    }
+                })
+                .catch(() => {
+                    return actions.reject();
+                });
+        }
         renderSmartButton() {
 …
                     $("#wpg_paypal_checkout_cc-card-cvc").empty();
                     numberField.render("#wpg_paypal_checkout_cc-card-number");
                     numberField.setAttribute("placeholder", "4111 1111 1111 1111");
+                    numberField.setAttribute("placeholder", "1234 1234 1234 1234");
                     cardFields.ExpiryField().render("#wpg_paypal_checkout_cc-card-expiry");
                     cardFields.CVVField().render("#wpg_paypal_checkout_cc-card-cvc");
 …
         async onPaymentDataChanged(intermediatePaymentData) {
             try {
                 const {callbackTrigger, shippingAddress} = intermediatePaymentData || {};
+                const {callbackTrigger, shippingAddress, shippingOptionData} = intermediatePaymentData || {};
                 const mapAddr = (addr = {}) => ({
                         address1: addr.address1 || '',
                         address2: addr.address2 || '',
                         city: addr.locality || '',
                         state: addr.administrativeArea || '',
                         postcode: addr.postalCode || '',
                         country: addr.countryCode || ''
                     });
+                    address1: addr.address1 || '',
+                    address2: addr.address2 || '',
+                    city: addr.locality || '',
+                    state: addr.administrativeArea || '',
+                    postcode: addr.postalCode || '',
+                    country: addr.countryCode || ''
+                });
                 if (callbackTrigger === 'INITIALIZE') {
                     if (shippingAddress) {
 …
                     const tx = this.getGoogleTransactionInfo();
                     tx.totalPriceStatus = 'ESTIMATED';
+                    return {newTransactionInfo: tx};
+                    const shippingOptionParameters = this.getGoogleShippingOptionParameters();
+                    const result = {newTransactionInfo: tx};
+                    if (shippingOptionParameters) {
+                        result.newShippingOptionParameters = shippingOptionParameters;
+                    }
+                    return result;
+                }
                 if (callbackTrigger === 'SHIPPING_ADDRESS' && shippingAddress) {
 …
                     const tx = this.getGoogleTransactionInfo();
                     tx.totalPriceStatus = 'ESTIMATED';
+                    return {newTransactionInfo: tx};
+                    const shippingOptionParameters = this.getGoogleShippingOptionParameters();
+                    const result = {newTransactionInfo: tx};
+                    if (shippingOptionParameters) {
+                        result.newShippingOptionParameters = shippingOptionParameters;
+                    }
+                    return result;
+                }
+                if (callbackTrigger === 'SHIPPING_OPTION' && shippingOptionData && shippingOptionData.id) {
+                    const safeId = shippingOptionData.id;
+                    const internalId = (this.googleShippingIdMap && this.googleShippingIdMap[safeId]) ? this.googleShippingIdMap[safeId] : safeId; // fallback
+                    this.googleSelectedShippingId = internalId;
+                    const addr = shippingAddress ? mapAddr(shippingAddress) : {};
+                    await this.fetchUpdatedTotalFromBackend(addr, null, internalId);
+                    const tx = this.getGoogleTransactionInfo();
+                    tx.totalPriceStatus = 'ESTIMATED';
+                    const shippingOptionParameters = this.getGoogleShippingOptionParameters();
+                    const result = { newTransactionInfo: tx };
+                    if (shippingOptionParameters) {
+                        result.newShippingOptionParameters = shippingOptionParameters;
+                    }
+                    return result;
+                }
                 return {};
 …
                     throw new Error("");
+                }
+                if (transactionInfo?.success) {
+                    const d = transactionInfo.data || {};
+                    this.ppcp_manager.cart_total = d.cart_total     ?? this.ppcp_manager.cart_total;
+                    this.ppcp_manager.cart_items = Array.isArray(d.cart_items) ? d.cart_items : [];
+                    this.ppcp_manager.shipping_total = d.shipping_total ?? "0.00";
+                    this.ppcp_manager.tax_total = d.tax_total      ?? "0.00";
+                    this.ppcp_manager.discount_total = d.discount_total ?? "0.00";
+                    this.ppcp_manager.currency = d.currency       ?? this.ppcp_manager.currency;
+                    this.ppcp_manager.needs_shipping = d.needs_shipping ?? this.ppcp_manager.needs_shipping ?? "0";
+                }
+                // Build client that matches callbackIntents we’re about to request
+                if (transactionInfo?.success && transactionInfo.data) {
+                    if (typeof this.setTotalsFromResponse === 'function') {
+                        this.setTotalsFromResponse(transactionInfo.data);
+                    }
+                }
                 const shippingRequired = this.ppcp_manager.needs_shipping === "1";
                 const paymentsClient = this.getGooglePaymentsClient({requireOnPaymentDataChanged: shippingRequired});
                 const paymentDataRequest = await this.getGooglePaymentDataRequest();
+                console.log('GPay PaymentDataRequest:', paymentDataRequest); // 👈 debug
                 await paymentsClient.loadPaymentData(paymentDataRequest);
             } catch (error) {
+                console.error('[GPay] loadPaymentData error:', error);
                 this.hideSpinner();
                 if (error?.statusCode === "CANCELED") {
 …
+        }
+        getGoogleShippingOptionParameters() {
+            const methods = Array.isArray(this.ppcp_manager.shipping_methods) ? this.ppcp_manager.shipping_methods : [];
+            if (!methods.length) {
+                return null;
+            }
+            this.googleShippingIdMap = {};
+            const formatPrice = (amount) => {
+                const n = parseFloat(String(amount || "0").replace(/,/g, "")) || 0;
+                const currency = this.ppcp_manager.currency || "USD";
+                const locale   = this.ppcp_manager.locale   || "en-US";
+                return new Intl.NumberFormat(locale, {
+                    style: "currency",
+                    currency
+                }).format(n);
+            };
+            let defaultInternalId = this.googleSelectedShippingId;
+            if (!defaultInternalId) {
+                const selected = methods.find(m => m.is_selected);
+                defaultInternalId = selected?.id || methods[0].id;
+            }
+            const options = methods.map(method => {
+                const internalId = method.id;
+                const safeId = internalId.replace(/[^a-zA-Z0-9 _-]/g, "_");
+                this.googleShippingIdMap[safeId] = internalId;
+                const formattedAmount = formatPrice(method.amount);
+                return {
+                    id: safeId,
+                    label: method.label || internalId,
+                    description: formattedAmount
+                };
+            });
+            let defaultSafeId = options[0].id;
+            const found = options.find(opt => this.googleShippingIdMap[opt.id] === defaultInternalId);
+            if (found) defaultSafeId = found.id;
+            return {
+                defaultSelectedOptionId: defaultSafeId,
+                shippingOptions: options
+            };
+        }
         async getGooglePaymentDataRequest() {
             const {allowedPaymentMethods, merchantInfo} = await this.getGooglePayConfig();
             const shippingRequired = this.ppcp_manager.needs_shipping === "1";
+            const callbackIntents = ['PAYMENT_AUTHORIZATION'];
+            if (shippingRequired) {
+                callbackIntents.push('SHIPPING_ADDRESS', 'SHIPPING_OPTION');
+            }
             const paymentDataRequest = {
                 apiVersion: 2,
 …
                 merchantInfo,
                 emailRequired: true,
+                callbackIntents: ['PAYMENT_AUTHORIZATION', ...(shippingRequired ? ['SHIPPING_ADDRESS'] : [])]
+            };
+                callbackIntents
+            };
             if (shippingRequired) {
                 paymentDataRequest.shippingAddressRequired = true;
 …
                     phoneNumberRequired: true
                 };
+            }
+                const shippingOptionParameters = this.getGoogleShippingOptionParameters();
+                if (shippingOptionParameters && Array.isArray(shippingOptionParameters.shippingOptions) && shippingOptionParameters.shippingOptions.length > 0) {
+                    paymentDataRequest.shippingOptionRequired   = true;
+                    paymentDataRequest.shippingOptionParameters = shippingOptionParameters;
+                }
+            }
             return paymentDataRequest;
+        }
 …
                     method: 'POST',
                     headers: {'Content-Type': 'application/x-www-form-urlencoded'},
                     body: data,
+                    body: data
                 });
                 return await response.json();
 …
         getGoogleTransactionInfo() {
             const currency = this.ppcp_manager?.currency || "USD";
+            const country  = this.ppcp_manager?.country  || "US";
             const toNum = (v) => {
                 const f = parseFloat((v ?? "").toString().replace(/,/g, ""));
 …
             };
             const toStr = (v) => toNum(v).toFixed(2);
             const displayItems = [];
             const items = Array.isArray(this.ppcp_manager?.cart_items) ? this.ppcp_manager.cart_items : [];
             for (const it of items) {
                 const name = it?.name ?? "Item";
                 const qty = Math.max(1, parseInt(it?.quantity, 10) || 1);
+                const qty  = Math.max(1, parseInt(it?.quantity, 10) || 1);
                 const lineTotal = ("subtotal" in it) ? toNum(it.subtotal) : toNum(it.price) * qty;
                 displayItems.push({
                     label: `${name}${qty > 1 ? ` × ${qty}` : ""}`,
                     type: "LINE_ITEM",
                     price: toStr(lineTotal),
+                    price: toStr(lineTotal)
                 });
+            }
             const needsShipping = String(this.ppcp_manager?.needs_shipping ?? "0") === "1";
             const shippingTotal = toNum(this.ppcp_manager?.shipping_total);
 …
                     label: "Shipping",
                     type: "SHIPPING_OPTION",
                     price: toStr(shippingTotal),
+                    price: toStr(shippingTotal)
                 });
+            }
             const taxTotal = toNum(this.ppcp_manager?.tax_total);
             if (taxTotal > 0) {
 …
                     label: "Tax",
                     type: "TAX",
                     price: toStr(taxTotal),
+                    price: toStr(taxTotal)
                 });
+            }
             const discountTotal = toNum(this.ppcp_manager?.discount_total);
             if (discountTotal > 0) {
 …
                     label: "Discount",
                     type: "DISCOUNT",
                     price: toStr(-discountTotal),
+                    price: toStr(-discountTotal)
                 });
+            }
             const total = toNum(this.ppcp_manager?.cart_total);
             return {
                 displayItems,
                 currencyCode: currency,
+                countryCode: country,
                 totalPriceStatus: "ESTIMATED",
                 totalPrice: toStr(total),
                 totalPriceLabel: "Total",
+                checkoutOption: "DEFAULT"
             };
+        }
 …
             try {
                 if (this.pageContext !== 'checkout') {
                     const billingRaw = paymentData?.paymentMethodData?.info?.billingAddress || {};
+                    const billingRaw  = paymentData?.paymentMethodData?.info?.billingAddress || {};
                     const shippingRaw = paymentData?.shippingAddress || {};
                     const email = paymentData?.email || '';
+                    const email       = paymentData?.email || '';
                     const billingAddress = {
                         name: billingRaw.name || '',
                         surname: '',
                         address1: billingRaw.address1 || '',
                         address2: billingRaw.address2 || '',
                         city: billingRaw.locality || '',
                         state: billingRaw.administrativeArea || '',
                         postcode: billingRaw.postalCode || '',
                         country: billingRaw.countryCode || '',
                         phoneNumber: billingRaw.phoneNumber || '',
+                        name:         billingRaw.name || '',
+                        surname:      '',
+                        address1:     billingRaw.address1 || '',
+                        address2:     billingRaw.address2 || '',
+                        city:         billingRaw.locality || '',
+                        state:        billingRaw.administrativeArea || '',
+                        postcode:     billingRaw.postalCode || '',
+                        country:      billingRaw.countryCode || '',
+                        phoneNumber:  billingRaw.phoneNumber || '',
                         emailAddress: email || ''
                     };
                     const shippingAddress = {
                         name: shippingRaw.name || '',
                         surname: '',
                         address1: shippingRaw.address1 || '',
                         address2: shippingRaw.address2 || '',
                         city: shippingRaw.locality || '',
                         state: shippingRaw.administrativeArea || '',
                         postcode: shippingRaw.postalCode || '',
                         country: shippingRaw.countryCode || '',
+                        name:        shippingRaw.name || '',
+                        surname:     '',
+                        address1:    shippingRaw.address1 || '',
+                        address2:    shippingRaw.address2 || '',
+                        city:        shippingRaw.locality || '',
+                        state:       shippingRaw.administrativeArea || '',
+                        postcode:    shippingRaw.postalCode || '',
+                        country:     shippingRaw.countryCode || '',
                         phoneNumber: shippingRaw.phoneNumber || ''
                     };
-                    const updatedTotal = await this.fetchUpdatedTotalFromBackend({
-                        shipping_address: {
-                            address1: shippingAddress.address1 || '',
-                            address2: shippingAddress.address2 || '',
-                            city: shippingAddress.city || '',
-                            state: shippingAddress.state || '',
-                            postcode: shippingAddress.postcode || '',
-                            country: shippingAddress.country || '',
-                            name: shippingAddress.name || '',
-                            phoneNumber: shippingAddress.phoneNumber || ''
-                        },
-                        billing_address: {
-                            address1: billingAddress.address1 || '',
-                            address2: billingAddress.address2 || '',
-                            city: billingAddress.city || '',
-                            state: billingAddress.state || '',
-                            postcode: billingAddress.postcode || '',
-                            country: billingAddress.country || '',
-                            name: billingAddress.name || '',
-                            phoneNumber: billingAddress.phoneNumber || '',
-                            emailAddress: billingAddress.emailAddress || ''
+                        }
-                    });
                     await this.fetchUpdatedTotalFromBackend(shippingAddress, billingAddress);
+                }
 …
                 const result = await wpg_paypal_sdk.Googlepay().confirmOrder({
                     orderId,
+                    paymentMethodData: paymentData.paymentMethodData,
+                    paymentMethodData: paymentData.paymentMethodData
+                }).catch(err => {
+                    console.error('[Google Pay] confirmOrder error:', err);
+                    throw err;
                 });
                 if (result.status === "PAYER_ACTION_REQUIRED") {
                     await wpg_paypal_sdk.Googlepay().initiatePayerAction({orderId});
+                }
                 this.onApproveHandler({orderID: orderId}, 'google_pay');
                 return {transactionState: "SUCCESS"};
+                if (result && result.status === "PAYER_ACTION_REQUIRED") {
+                    await wpg_paypal_sdk.Googlepay().initiatePayerAction({ orderId });
+                }
+                this.onApproveHandler({ orderID: orderId }, 'google_pay');
+                return { transactionState: "SUCCESS" };
             } catch (error) {
                 this.showError(error.message || "Google Pay failed.");
 …
         setTotalsFromResponse(d = {}) {
             if (!d)
+            if (!d) {
                 return;
+            this.ppcp_manager.cart_total = d.total          ?? d.cart_total ?? this.ppcp_manager.cart_total;
+            this.ppcp_manager.cart_items = Array.isArray(d.cart_items) ? d.cart_items : (this.ppcp_manager.cart_items || []);
+            this.ppcp_manager.shipping_total = d.shipping_total ?? this.ppcp_manager.shipping_total ?? "0.00";
+            this.ppcp_manager.tax_total = d.tax_total      ?? this.ppcp_manager.tax_total      ?? "0.00";
+            this.ppcp_manager.discount_total = d.discount_total ?? this.ppcp_manager.discount_total ?? "0.00";
+            this.ppcp_manager.currency = d.currency       ?? this.ppcp_manager.currency;
+            this.ppcp_manager.needs_shipping = d.needs_shipping ?? this.ppcp_manager.needs_shipping ?? "0";
+        }
+        async fetchUpdatedTotalFromBackend(shippingAddress, billingAddress = null) {
+            }
+            this.ppcp_manager.cart_total       = d.total          ?? d.cart_total ?? this.ppcp_manager.cart_total;
+            this.ppcp_manager.cart_items       = Array.isArray(d.cart_items) ? d.cart_items : (this.ppcp_manager.cart_items || []);
+            this.ppcp_manager.shipping_total   = d.shipping_total ?? this.ppcp_manager.shipping_total ?? "0.00";
+            this.ppcp_manager.tax_total        = d.tax_total      ?? this.ppcp_manager.tax_total      ?? "0.00";
+            this.ppcp_manager.discount_total   = d.discount_total ?? this.ppcp_manager.discount_total ?? "0.00";
+            this.ppcp_manager.currency         = d.currency       ?? this.ppcp_manager.currency;
+            this.ppcp_manager.needs_shipping   = d.needs_shipping ?? this.ppcp_manager.needs_shipping ?? "0";
+            this.ppcp_manager.shipping_methods = Array.isArray(d.shipping_methods)
+                ? d.shipping_methods
+                : (this.ppcp_manager.shipping_methods || []);
+            const selected = (this.ppcp_manager.shipping_methods || []).find(m => m.is_selected);
+            if (selected && selected.id) {
+                this.googleSelectedShippingId = selected.id;
+                this.appleSelectedShippingId  = selected.id;
+            }
+        }
+        async fetchUpdatedTotalFromBackend(shippingAddress, billingAddress = null, selectedShippingId = '') {
             try {
+                const params = new URLSearchParams({
+                    action: 'ppcp_get_updated_total',
+                    security: this.ppcp_manager.ajax_nonce,
+                    shipping_address: JSON.stringify(shippingAddress || {}),
+                    billing_address: billingAddress ? JSON.stringify(billingAddress) : '',
+                    context: this.pageContext
+                });
+                if (selectedShippingId) {
+                    params.append('selected_shipping_id', selectedShippingId);
+                }
                 const res = await fetch(this.ppcp_manager.ajax_url, {
                     method: 'POST',
                     headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+                    body: new URLSearchParams({
+                        action: 'ppcp_get_updated_total',
+                        security: this.ppcp_manager.ajax_nonce,
+                        shipping_address: JSON.stringify(shippingAddress || {}),
+                        billing_address: billingAddress ? JSON.stringify(billingAddress) : '',
+                        context: this.pageContext
+                    })
+                    body: params
                 });
                 const result = await res.json();
 …
             const isApplePayEnabled = this.ppcp_manager?.enabled_apple_pay === 'yes';
             const isProductPage = document.querySelector('.apple-pay-container[data-context="product"]');
             if (!isApplePayEnabled || !isProductPage)
+            if (!isApplePayEnabled || !isProductPage) {
                 return;
+            }
             const baseProductId = parseInt(this.ppcp_manager?.product_id || 0);
             const defaultQty = parseFloat(document.querySelector('input.qty')?.value || '1');
             this.fetchProductTotal(baseProductId, defaultQty);
             jQuery('form.variations_form').on('found_variation', (event, variation) => {
                 const variationId = variation.variation_id;
 …
                 headers: {'Content-Type': 'application/x-www-form-urlencoded'},
                 body: data.toString()
+            })
+                    .then(res => res.json())
+                    .then(response => {
+                        if (response.success && response.data?.combined_total) {
+                            this.ppcp_manager.cart_total = response.data.combined_total;
+                        }
+                    });
+            }).then(res => res.json())
+            .then(response => {
+                if (response.success && response.data?.combined_total) {
+                    this.ppcp_manager.cart_total = response.data.combined_total;
+                }
+            });
+        }
 …
             });
+        }
+        getAppleShippingMethods() {
+            const methods = Array.isArray(this.ppcp_manager.shipping_methods) ? this.ppcp_manager.shipping_methods : [];
+            if (!methods.length) {
+                return [];
+            }
+            this.appleShippingIdMap = {};
+            let defaultInternalId = this.appleSelectedShippingId;
+            if (!defaultInternalId) {
+                const selected = methods.find(m => m.is_selected);
+                defaultInternalId = (selected && selected.id) ? selected.id : methods[0].id;
+            }
+            this.appleSelectedShippingId = defaultInternalId;
+            const appleMethods = methods.map(method => {
+                const internalId = method.id;
+                const safeId = internalId.replace(/[^a-zA-Z0-9 _-]/g, "_");
+                this.appleShippingIdMap[safeId] = internalId;
+                return {
+                    label: method.label || internalId,
+                    amount: this.formatAmount(method.amount),
+                    identifier: safeId,
+                    detail: method.description || ''
+                };
+            });
+            // Debug logs - you can remove these later
+            console.log('Apple Pay - Shipping methods processed:', appleMethods);
+            console.log('Apple Pay - Default selected shipping ID:', defaultInternalId);
+            console.log('Apple Pay - Shipping ID map:', this.appleShippingIdMap);
+            return appleMethods;
+        }
         onApplePayButtonClicked(container) {
 …
+                    }
                 };
+                // ✅ UPDATED: Enhanced shipping method handling
                 if (needsShipping) {
                     paymentRequest.requiredShippingContactFields = ["postalAddress", "name", "phone", "email"];
+                    const methods = this.getAppleShippingMethods();
+                    if (methods.length) {
+                        paymentRequest.shippingMethods = methods;
+                        // Debug logs for shipping methods
+                        console.log('Apple Pay - Available shipping methods:', methods);
+                        if (this.appleSelectedShippingId) {
+                            console.log('Apple Pay - Default selected shipping ID:', this.appleSelectedShippingId);
+                        }
+                    }
                 } else {
                     paymentRequest.requiredShippingContactFields = ["name", "phone", "email"];
+                }
                 const session = new ApplePaySession(4, paymentRequest);
                 session.onvalidatemerchant = async (event) => {
 …
                 if (needsShipping) {
-                    let newTotal = {
-                        label: this.ppcp_manager.store_label || "Store",
-                        amount: "0.00",
-                        type: "final"
-                    };
                     session.onshippingcontactselected = async (event) => {
                         try {
                             if (this.pageContext === 'product') {
                                 const transactionInfo = await this.ppcpGettransactionInfo();
                                 if (transactionInfo.success === false) {
+                                if (transactionInfo?.success === false) {
                                     const messages = transactionInfo.data?.messages ?? transactionInfo.data ?? ['Unknown error'];
                                     this.showError(messages);
                                     throw new Error(messages);
+                                }
                                 if (transactionInfo?.success) {
                                     this.ppcp_manager.cart_total = transactionInfo.data?.cart_total || this.ppcp_manager.cart_total;
+                                if (transactionInfo?.success && transactionInfo.data && typeof this.setTotalsFromResponse === 'function') {
+                                    this.setTotalsFromResponse(transactionInfo.data);
+                                }
+                            }
                             const shipping = event.shippingContact;
                             if (!shipping || !shipping.countryCode || !shipping.postalCode) {
                                 throw new Error("Shipping address is incomplete");
+                            }
                             const updatedTotal = await this.fetchUpdatedTotalFromBackend({
                                 city: shipping.locality || '',
                                 state: shipping.administrativeArea || '',
+                                city:    shipping.locality || '',
+                                state:   shipping.administrativeArea || '',
                                 postcode: shipping.postalCode || '',
                                 country: shipping.countryCode || ''
                             });
+                            newTotal.amount = updatedTotal;
+                            const methods = this.getAppleShippingMethods();
                             const update = {
+                                newTotal: newTotal
+                                newTotal: {
+                                    label: this.ppcp_manager.store_label || "Store",
+                                    amount: updatedTotal,
+                                    type: "final"
+                                }
                             };
+                            if (methods.length) {
+                                update.newShippingMethods = methods;
+                            }
                             session.completeShippingContactSelection(update);
                         } catch (error) {
+                            session.completeShippingContactSelection({});
+                            console.error('[ApplePay] onshippingcontactselected error:', error);
+                            session.completeShippingContactSelection({
+                                newTotal: {
+                                    label: this.ppcp_manager.store_label || "Store",
+                                    amount: this.formatAmount(this.ppcp_manager.cart_total),
+                                    type: "final"
+                                },
+                                newShippingMethods: this.getAppleShippingMethods()
+                            });
+                        }
+                    };
+                    session.onshippingmethodselected = async (event) => {
+                        try {
+                            const method = event.shippingMethod;
+                            if (!method || !method.identifier) {
+                                throw new Error('Invalid shipping method.');
+                            }
+                            // Map Apple safe ID back to Woo internal ID
+                            const internalId = this.appleShippingIdMap[method.identifier] || method.identifier;
+                            this.appleSelectedShippingId = internalId;
+                            const updatedTotal = await this.fetchUpdatedTotalFromBackend(
+                                {}, // shipping address unchanged
+                                null, // billing not needed here
+                                internalId
+                            );
+                            const update = {
+                                newTotal: {
+                                    label: this.ppcp_manager.store_label || "Store",
+                                    amount: updatedTotal,
+                                    type: "final"
+                                }
+                            };
+                            session.completeShippingMethodSelection(update);
+                        } catch (error) {
+                            console.error('[ApplePay] onshippingmethodselected error:', error);
+                            session.completeShippingMethodSelection({
+                                newTotal: {
+                                    label: this.ppcp_manager.store_label || "Store",
+                                    amount: this.formatAmount(this.ppcp_manager.cart_total),
+                                    type: "final"
+                                }
+                            });
+                        }
                     };
 …
+                            }
+                        }
                         const billingRaw = event.payment?.billingContact || {};
                         const shippingRaw = event.payment?.shippingContact || {};
                         if (this.pageContext !== 'checkout') {
                             const emailAddress = billingRaw.emailAddress || shippingRaw.emailAddress || billingRaw.email || shippingRaw.email || '';
 …
                                 phoneNumber: shippingRaw.phoneNumber || ''
                             };
+                            await this.fetchUpdatedTotalFromBackend(shippingAddress, billingAddress);
+                            await this.fetchUpdatedTotalFromBackend(
+                                shippingAddress,
+                                billingAddress,
+                                this.appleSelectedShippingId || ''
+                            );
+                        }
                         const orderId = await this.googleapplecreateOrder();
                         if (!orderId) {
                             throw new Error("Order creation failed.");
+                        }
                         const result = await applepay.confirmOrder({
                             orderId: orderId,
 …
                             billingContact: event.payment.billingContact
                         });
                         const status = result?.approveApplePayPayment?.status;
                         if (status === "APPROVED") {
                             this.showSpinner();
                             const order_id = orderId;
+                            const payer_id = '';
+                            if (!order_id) {
+                                console.error('[ApplePay] Missing order ID after approval.');
+                                return;
+                            }
                             if (this.isCheckoutPage()) {
                                 const url = `${this.ppcp_manager.cc_capture}&paypal_order_id=${encodeURIComponent(order_id)}&woocommerce-process-checkout-nonce=${this.ppcp_manager.woocommerce_process_checkout}`;
 …
                                             this.showError(messages);
                                             this.hideSpinner();
-                                            return null;
+                                        }
+                                    }
                                 });
+                                return;
+                            } else {
+                                session.completePayment({
+                                    status: ApplePaySession.STATUS_SUCCESS
+                                });
+                                let redirectUrl = `${this.ppcp_manager.checkout_url}?paypal_order_id=${encodeURIComponent(order_id)}&from=${this.ppcp_manager.page}`;
+                                window.location.href = redirectUrl;
+                                this.hideSpinner();
+                            }
-                            session.completePayment({
-                                status: ApplePaySession.STATUS_SUCCESS
-                            });
-                            let redirectUrl = `${this.ppcp_manager.checkout_url}?paypal_order_id=${encodeURIComponent(order_id)}&from=${this.ppcp_manager.page}`;
-                            if (payer_id) {
-                                redirectUrl += `&paypal_payer_id=${encodeURIComponent(payer_id)}`;
+                            }
-                            window.location.href = redirectUrl;
-                            this.hideSpinner();
                         } else {
                             throw new Error("Apple Pay confirmation returned non-APPROVED status.");
 …
+        }
+    }
     $(function () {
         $('.woocommerce #payment #place_order, .woocommerce-page #payment #place_order').hide();

woo-paypal-gateway/trunk/readme.txt

-                      r3396892
+                      r3401525
 Requires at least: 3.3
 Tested up to: 6.8.3
 Stable tag: 9.0.50
+Stable tag: 9.0.51
 Requires PHP: 7.4
 License: GPLv3
 …
 == Changelog ==
+= 9.0.51 - 2025-11-24 =
+* Added - Support for selecting shipping methods directly within PayPal, Google Pay, and Apple Pay pop-ups.
 = 9.0.50 - 2025-11-17 =
 * Added – Compatibility with YayCurrency Multi-Currency Switcher plugin for Express Checkout.

woo-paypal-gateway/trunk/woo-paypal-gateway.php

-                      r3396892
+                      r3401525
  * Plugin URI:        https://profiles.wordpress.org/easypayment
  * Description:       PayPal, Credit/Debit Cards, Google Pay, Apple Pay, Pay Later, Venmo, SEPA, iDEAL, Mercado Pago, Sofort, Bancontact & more - by an official PayPal Partner
  * Version:           9.0.50
+ * Version:           9.0.51
  * Author:            easypayment
  * Author URI:        https://profiles.wordpress.org/easypayment/
 …
 if (!defined('WPG_PLUGIN_VERSION')) {
     define('WPG_PLUGIN_VERSION', '9.0.50');
+    define('WPG_PLUGIN_VERSION', '9.0.51');
+}
 if (!defined('WPG_PLUGIN_PATH')) {

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory

Context Navigation

Changeset 3401525

Legend:

woo-paypal-gateway/trunk/ppcp/includes/class-ppcp-paypal-checkout-for-woocommerce-request.php

woo-paypal-gateway/trunk/ppcp/public/class-ppcp-paypal-checkout-for-woocommerce-button-manager.php

woo-paypal-gateway/trunk/ppcp/public/js/ppcp-paypal-checkout-for-woocommerce-public.js

woo-paypal-gateway/trunk/readme.txt

woo-paypal-gateway/trunk/woo-paypal-gateway.php

Download in other formats: