woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-01 07:02:48 +08:00
Code Issues Projects Packages Wiki Activity Actions

Merge pull request #179 from woocommerce/PCP-156-remove-merchant-id-from-jssdk-lo

Browse source 
Remove `merchant-id` query parameter in JSSDK
This commit is contained in:
Emili Castells 2021-07-01 09:42:17 +02:00 • committed by GitHub
commit 60b03f5aae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ppcp-button/services.php
View file

@ -59,7 +59,6 @@ return array(
if ( $paypal_disabled ) {
return new DisabledSmartButton();
}
$payee_repository = $container->get( 'api.repository.payee' );
$payer_factory = $container->get( 'api.factory.payer' );
$request_data = $container->get( 'button.request-data' );
@ -74,7 +73,6 @@ return array(
$container->get( 'button.url' ),
$container->get( 'session.handler' ),
$settings,
$payee_repository,
$payer_factory,
$client_id,
$request_data,

15
modules/ppcp-button/src/Assets/class-smartbutton.php
View file

@ -11,7 +11,6 @@ namespace WooCommerce\PayPalCommerce\Button\Assets;
use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies;
use WooCommerce\PayPalCommerce\ApiClient\Repository\PayeeRepository;
use WooCommerce\PayPalCommerce\Button\Endpoint\ApproveOrderEndpoint;
use WooCommerce\PayPalCommerce\Button\Endpoint\ChangeCartEndpoint;
use WooCommerce\PayPalCommerce\Button\Endpoint\CreateOrderEndpoint;
@ -59,13 +58,6 @@ class SmartButton implements SmartButtonInterface {
*/
private $settings;
/**
* The Payee Repository.
*
* @var PayeeRepository
*/
private $payee_repository;
/**
* The Payer Factory.
*
@ -128,7 +120,6 @@ class SmartButton implements SmartButtonInterface {
* @param string $module_url The URL to the module.
* @param SessionHandler $session_handler The Session Handler.
* @param Settings $settings The Settings.
* @param PayeeRepository $payee_repository The Payee Repository.
* @param PayerFactory $payer_factory The Payer factory.
* @param string $client_id The client ID.
* @param RequestData $request_data The Request Data helper.
@ -143,7 +134,6 @@ class SmartButton implements SmartButtonInterface {
string $module_url,
SessionHandler $session_handler,
Settings $settings,
PayeeRepository $payee_repository,
PayerFactory $payer_factory,
string $client_id,
RequestData $request_data,
@ -158,7 +148,6 @@ class SmartButton implements SmartButtonInterface {
$this->module_url = $module_url;
$this->session_handler = $session_handler;
$this->settings = $settings;
$this->payee_repository = $payee_repository;
$this->payer_factory = $payer_factory;
$this->client_id = $client_id;
$this->request_data = $request_data;
@ -751,10 +740,6 @@ class SmartButton implements SmartButtonInterface {
) {
$params['buyer-country'] = WC()->customer->get_billing_country();
}
$payee = $this->payee_repository->payee();
if ( $payee->merchant_id() ) {
$params['merchant-id'] = $payee->merchant_id();
}
$disable_funding = $this->settings->has( 'disable_funding' ) ?
$this->settings->get( 'disable_funding' ) : array();
if ( ! is_checkout() ) {