Express Checkout - Shipping Address Problem, ref #1014

angelleye · Mar 13, 2018 · b58c2fd · b58c2fd
1 parent 019a2d7
commit b58c2fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/angelleye-includes/angelleye-utility.php b/angelleye-includes/angelleye-utility.php
@@ -1865,7 +1865,7 @@ public function call_paypal_pro_payflow_do_doreauthorization($order) {
 
     public static function angelleye_express_checkout_validate_shipping_address($paypal_request) {
         if( !empty($paypal_request['SECFields']['addroverride']) && $paypal_request['SECFields']['addroverride'] == 1 ) {
-            $address_required_field = array('shiptoname', 'shiptostreet', 'shiptostreet2', 'shiptocity', 'shiptostate', 'shiptozip', 'shiptocountrycode');
+            $address_required_field = array('shiptoname', 'shiptostreet', 'shiptocity', 'shiptostate', 'shiptozip', 'shiptocountrycode');
             foreach ($address_required_field as $key => $value) {
                 if( empty($paypal_request['Payments'][0][$value]) ) {
                     unset($paypal_request['SECFields']['addroverride']);

diff --git a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php
@@ -577,7 +577,7 @@ public function angelleye_set_express_checkout_request() {
 
                 $post_data = WC()->session->get('post_data');
                 if (!empty($post_data)) {
-                    $SECFields['addroverride'] = WC()->cart->needs_shipping() ? 1 : 0;
+                    $SECFields['addroverride'] = 1;
                     if (!empty($post_data['ship_to_different_address'])) {
                         $shiptoname = '';
                         if (!empty($post_data['shipping_first_name']) && !empty($post_data['shipping_last_name'])) {