From 38842f85f7a1a35390d64abc04ad721927248786 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@gmail.com>
Date: Wed, 31 Oct 2018 14:02:49 +0530
Subject: [PATCH 1/2] PayFlow - Address Verification Order Notes Adjustment,
 PFW-293

---
 ...c-gateway-paypal-pro-payflow-angelleye.php | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/classes/wc-gateway-paypal-pro-payflow-angelleye.php b/classes/wc-gateway-paypal-pro-payflow-angelleye.php
index 1af9641b9..5044960ef 100644
--- a/classes/wc-gateway-paypal-pro-payflow-angelleye.php
+++ b/classes/wc-gateway-paypal-pro-payflow-angelleye.php
@@ -1425,11 +1425,25 @@ public function process_subscription_payment($order, $amount, $payment_token = n
                  */
                 $avs_address_response_code = isset($PayPalResult['AVSADDR']) ? $PayPalResult['AVSADDR'] : '';
                 $avs_zip_response_code = isset($PayPalResult['AVSZIP']) ? $PayPalResult['AVSZIP'] : '';
+                $proc_avs_response_code = isset($PayPalResult['PROCAVS']) ? $PayPalResult['PROCAVS'] : '';
                 $avs_response_order_note = __('Address Verification Result', 'paypal-for-woocommerce');
-                $avs_response_order_note .= "\n";
-                $avs_response_order_note .= sprintf(__('Address Match: %s', 'paypal-for-woocommerce'), $avs_address_response_code);
-                $avs_response_order_note .= "\n";
-                $avs_response_order_note .= sprintf(__('Postal Match: %s', 'paypal-for-woocommerce'), $avs_zip_response_code);
+                $avs_response_order_note .= '<ul class="angelleye_avs_result">';
+                $avs_response_order_note .= '<li>' . sprintf(__('AVS: %s', 'paypal-for-woocommerce'), $proc_avs_response_code) . '</li>';
+                $avs_response_order_note .= '<ul class="angelleye_avs_result_inner">';
+                $avs_response_order_note .= '<li>' . sprintf(__('Address Match: %s', 'paypal-for-woocommerce'), $avs_address_response_code) . '</li>';
+                $avs_response_order_note .= '<li>' . sprintf(__('Postal Match: %s', 'paypal-for-woocommerce'), $avs_zip_response_code) . '</li>';
+                $avs_response_order_note .= "<ul>";
+                $avs_response_order_note .= '</ul>';
+                $old_wc = version_compare(WC_VERSION, '3.0', '<');
+                if ($old_wc) {
+                    update_post_meta($order_id, '_AVSADDR', $avs_address_response_code);
+                    update_post_meta($order_id, '_AVSZIP', $avs_zip_response_code);
+                    update_post_meta($order_id, '_PROCAVS', $avs_zip_response_code);
+                } else {
+                    update_post_meta($order->get_id(), '_AVSADDR', $avs_address_response_code);
+                    update_post_meta($order->get_id(), '_AVSZIP', $avs_zip_response_code);
+                    update_post_meta($order->get_id(), '_PROCAVS', $avs_zip_response_code);
+                }
                 $order->add_order_note($avs_response_order_note);
                 /**
                  * Add order notes for CVV2 result

From 09a4c7cb728bb1bfa67232c57db5956fb0437e1b Mon Sep 17 00:00:00 2001
From: angelleye <andrew@angelleye.com>
Date: Fri, 2 Nov 2018 21:44:39 -0500
Subject: [PATCH 2/2] Updates changelog, PFW-293

---
 readme.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 71318c8bf..6b4f3368b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -132,7 +132,8 @@ Automatic updates should work great for you.  As always, though, we recommend ba
 * Feature - PayFlow - Adds product-level option for Authorization or Sale. ([PFW-273](https://github.com/angelleye/paypal-woocommerce/pull/1223))
 * Feature - PayFlow - Adds additional data for Address Verification to Woo order notes. ([PFW-276](https://github.com/angelleye/paypal-woocommerce/pull/1221))
 * Tweak - REST CC - Adjustments to error display on failed payments. ([PFW-284](https://github.com/angelleye/paypal-woocommerce/pull/1225))
-* Tweak - CSS tweaks to resolve mobile checkout form field issues. ([PWF-268](https://github.com/angelleye/paypal-woocommerce/pull/1227))
+* Tweak - CSS tweaks to resolve mobile checkout form field issues. ([PFW-268](https://github.com/angelleye/paypal-woocommerce/pull/1227))
+* Tweak - PayFlow - Formatting adjustment for auth/capture AVS notes. ([PFW-293](https://github.com/angelleye/paypal-woocommerce/pull/1230))
 * Fix - Express Checkout - Resolves a conflict with some themes where PayPal Smart Buttons would get cut off. ([PFW-266](https://github.com/angelleye/paypal-woocommerce/pull/1228))
 * Fix - Braintree - Resolves a problem where failed data validation would break the Drop In UI in some cases.  ([PFW-280](https://github.com/angelleye/paypal-woocommerce/pull/1219)[PFW-283](https://github.com/angelleye/paypal-woocommerce/pull/1224))
 * Fix - PayFlow - Resolves an issue with handling of duplicate order ID errors.  ([PFW-281](https://github.com/angelleye/paypal-woocommerce/pull/1220))