From 8c772588288f66ad6b8b33fcd6c3cc3524e2926b Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Mon, 18 Jul 2022 10:35:19 +0300
Subject: [PATCH] Add option for sending billing data

---
 .../modules/ActionHandler/CheckoutActionHandler.js | 13 ++++++++++---
 modules/ppcp-button/src/Assets/SmartButton.php     |  1 +
 .../src/Endpoint/CreateOrderEndpoint.php           |  5 ++++-
 modules/ppcp-wc-gateway/services.php               | 14 ++++++++++++++
 .../Button/Endpoint/CreateOrderEndpointTest.php    |  1 +
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
index 733b5e339..cc9c75ae7 100644
--- a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
+++ b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
@@ -13,7 +13,7 @@ class CheckoutActionHandler {
     configuration() {
         const spinner = this.spinner;
         const createOrder = (data, actions) => {
-            const payer = payerData();
+            let payer = payerData();
             const bnCode = typeof this.config.bn_codes[this.config.context] !== 'undefined' ?
                 this.config.bn_codes[this.config.context] : '';
 
@@ -26,6 +26,13 @@ class CheckoutActionHandler {
 
             const createaccount = jQuery('#createaccount').is(":checked") ? true : false;
 
+            const paymentMethod = getCurrentPaymentMethod();
+            const fundingSource = window.ppcpFundingSource;
+
+            if (fundingSource === 'card' && !PayPalCommerceGateway.use_form_billing_data_for_cards) {
+                payer = null;
+            }
+
             return fetch(this.config.ajax.create_order.endpoint, {
                 method: 'POST',
                 body: JSON.stringify({
@@ -34,8 +41,8 @@ class CheckoutActionHandler {
                     bn_code:bnCode,
                     context:this.config.context,
                     order_id:this.config.order_id,
-                    payment_method: getCurrentPaymentMethod(),
-                    funding_source: window.ppcpFundingSource,
+                    payment_method: paymentMethod,
+                    funding_source: fundingSource,
                     form: formJsonObj,
                     createaccount: createaccount
                 })
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 33a2eb1a4..8db4384c1 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -867,6 +867,7 @@ class SmartButton implements SmartButtonInterface {
 			'single_product_buttons_enabled'    => $this->settings->has( 'button_product_enabled' ) && $this->settings->get( 'button_product_enabled' ),
 			'mini_cart_buttons_enabled'         => $this->settings->has( 'button_mini-cart_enabled' ) && $this->settings->get( 'button_mini-cart_enabled' ),
 			'basic_checkout_validation_enabled' => $this->basic_checkout_validation_enabled,
+			'use_form_billing_data_for_cards'   => $this->settings->has( 'use_form_billing_data_for_cards' ) && $this->settings->get( 'use_form_billing_data_for_cards' ),
 		);
 
 		if ( $this->style_for_context( 'layout', 'mini-cart' ) !== 'horizontal' ) {
diff --git a/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
index c0045c8c4..6131c0e4a 100644
--- a/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
+++ b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
@@ -404,7 +404,10 @@ class CreateOrderEndpoint implements EndpointInterface {
 			$payer = $this->payer_factory->from_paypal_response( json_decode( wp_json_encode( $data['payer'] ) ) );
 		}
 
-		if ( ! $payer && isset( $data['form'] ) ) {
+		$use_form_billing_data_for_cards = $this->settings->has( 'use_form_billing_data_for_cards' ) &&
+			(bool) $this->settings->get( 'use_form_billing_data_for_cards' );
+
+		if ( ! $payer && isset( $data['form'] ) && $use_form_billing_data_for_cards ) {
 			$form_fields = $data['form'];
 
 			if ( is_array( $form_fields ) && isset( $form_fields['billing_email'] ) && '' !== $form_fields['billing_email'] ) {
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index b405ac99c..8e9a73003 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -854,6 +854,20 @@ return array(
 				'requirements'      => array(),
 				'gateway'           => 'paypal',
 			),
+			'use_form_billing_data_for_cards'    => array(
+				'title'        => __( 'Send billing data for cards', 'woocommerce-paypal-payments' ),
+				'type'         => 'checkbox',
+				'desc_tip'     => true,
+				'label'        => __( 'Send Checkout billing form data to PayPal smart card fields', 'woocommerce-paypal-payments' ),
+				'description'  => __( 'This increases convenience for the users, but can cause issues if card details do not match the billing data.', 'woocommerce-paypal-payments' ),
+				'default'      => false,
+				'screens'      => array(
+					State::STATE_START,
+					State::STATE_ONBOARDED,
+				),
+				'requirements' => array(),
+				'gateway'      => 'paypal',
+			),
 
 			// General button styles.
 			'button_style_heading'               => array(
diff --git a/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php b/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php
index 00d863a9e..08cd79c4d 100644
--- a/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php
+++ b/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php
@@ -152,6 +152,7 @@ class CreateOrderEndpointTest extends TestCase
         $session_handler = Mockery::mock(SessionHandler::class);
         $settings = Mockery::mock(Settings::class);
         $early_order_handler = Mockery::mock(EarlyOrderHandler::class);
+		$settings->shouldReceive('has')->andReturnFalse();
 
         $testee = new CreateOrderEndpoint(
             $request_data,