Merge pull request #121 from angelleye/PFWMA-311

PFWMA-311, Shipping Address issue with DE country
angelleye · Jun 28, 2024 · 83fe6f1 · 83fe6f1
2 parents 76fc848 + c4f92f2
commit 83fe6f1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin-ppcp.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin-ppcp.php
@@ -1098,7 +1098,7 @@ public function angelleye_modified_ppcp_parallel_parameter($request, $action, $o
                         } else {
                             $Payment['payee'] = array('merchant_id' => $sellerpaypalaccountid);
                         }
-                        if (!empty($old_purchase_units['shipping']['address']['admin_area_1']) && !empty($old_purchase_units['shipping']['address']['admin_area_2'])) {
+                        if (!empty($old_purchase_units['shipping']['address']['address_line_1']) && !empty($old_purchase_units['shipping']['address']['country_code'])) {
                             $Payment['shipping'] = array(
                                 'name' => array(
                                     'full_name' => isset($old_purchase_units['shipping']['name']['full_name']) ? $old_purchase_units['shipping']['name']['full_name'] : ''
@@ -1370,7 +1370,7 @@ public function angelleye_modified_ppcp_parallel_parameter($request, $action, $o
                         } else {
                             $Payment['payee'] = array('merchant_id' => $sellerpaypalaccountid);
                         }
-                        if (!empty($old_purchase_units['shipping']['address']['admin_area_1']) && !empty($old_purchase_units['shipping']['address']['admin_area_2'])) {
+                        if (!empty($old_purchase_units['shipping']['address']['address_line_1']) && !empty($old_purchase_units['shipping']['address']['country_code'])) {
                             $Payment['shipping'] = array(
                                 'name' => array(
                                     'full_name' => isset($old_purchase_units['shipping']['name']['full_name']) ? $old_purchase_units['shipping']['name']['full_name'] : ''
@@ -1520,7 +1520,7 @@ public function angelleye_modified_ppcp_parallel_parameter($request, $action, $o
             } else {
                 $new_default_payment['payee'] = array('merchant_id' => $default_pal_id);
             }
-            if (!empty($old_purchase_units['shipping']['address']['admin_area_1']) && !empty($old_purchase_units['shipping']['address']['admin_area_2'])) {
+            if (!empty($old_purchase_units['shipping']['address']['address_line_1']) && !empty($old_purchase_units['shipping']['address']['country_code'])) {
                 $new_default_payment['shipping'] = array(
                     'name' => array(
                         'full_name' => isset($old_purchase_units['shipping']['name']['full_name']) ? $old_purchase_units['shipping']['name']['full_name'] : ''
@@ -2441,7 +2441,7 @@ public function angelleye_add_commission_payment_data($old_purchase_units, $acco
         } else {
             $Payment['payee'] = array('merchant_id' => $merchant_id);
         }
-        if (!empty($old_purchase_units['shipping']['address']['admin_area_1']) && !empty($old_purchase_units['shipping']['address']['admin_area_2'])) {
+        if (!empty($old_purchase_units['shipping']['address']['address_line_1']) && !empty($old_purchase_units['shipping']['address']['country_code'])) {
             $Payment['shipping'] = array(
                 'name' => array(
                     'full_name' => isset($old_purchase_units['shipping']['name']['full_name']) ? $old_purchase_units['shipping']['name']['full_name'] : ''
@@ -2494,7 +2494,7 @@ public function angelleye_after_commition_remain_part_to_web_admin($old_purchase
         } else {
             $Payment['payee'] = array('merchant_id' => $merchant_id);
         }
-        if (!empty($old_purchase_units['shipping']['address']['admin_area_1']) && !empty($old_purchase_units['shipping']['address']['admin_area_2'])) {
+        if (!empty($old_purchase_units['shipping']['address']['address_line_1']) && !empty($old_purchase_units['shipping']['address']['country_code'])) {
             $Payment['shipping'] = array(
                 'name' => array(
                     'full_name' => isset($old_purchase_units['shipping']['name']['full_name']) ? $old_purchase_units['shipping']['name']['full_name'] : ''