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

Fix merge conflict

Browse source
This commit is contained in:
Emili Castells Guasch 2023-10-10 09:31:56 +02:00
commit 460df5829f
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/ppcp-wc-gateway/services.php
View file

@ -200,12 +200,12 @@ return array(
return $ppcp_tab ? $ppcp_tab : $section; return $ppcp_tab ? $ppcp_tab : $section;
}, },
'wcgateway.settings' => static function ( ContainerInterface $container ): Settings { 'wcgateway.settings' => SingletonDecorator::make(
return new Settings( static function ( ContainerInterface $container ): Settings {
$container->get( 'wcgateway.button.default-locations' ), $default_button_locations = $container->get( 'wcgateway.button.default-locations' );
$container->get( 'wcgateway.settings.dcc-gateway-title.default' ) return new Settings( $default_button_locations );
); }
}, ),
'wcgateway.notice.connect' => static function ( ContainerInterface $container ): ConnectAdminNotice { 'wcgateway.notice.connect' => static function ( ContainerInterface $container ): ConnectAdminNotice {
$state = $container->get( 'onboarding.state' ); $state = $container->get( 'onboarding.state' );
$settings = $container->get( 'wcgateway.settings' ); $settings = $container->get( 'wcgateway.settings' );

4
tests/PHPUnit/ModularTestCase.php
View file

@ -40,8 +40,8 @@ class ModularTestCase extends TestCase
$wpdb->posts = ''; $wpdb->posts = '';
$wpdb->postmeta = ''; $wpdb->postmeta = '';
!defined('PAYPAL_API_URL') && define('PAYPAL_API_URL', 'https://api.paypal.com'); !defined('PAYPAL_API_URL') && define('PAYPAL_API_URL', 'https://api-m.paypal.com');
!defined('PAYPAL_SANDBOX_API_URL') && define('PAYPAL_SANDBOX_API_URL', 'https://api.sandbox.paypal.com'); !defined('PAYPAL_SANDBOX_API_URL') && define('PAYPAL_SANDBOX_API_URL', 'https://api-m.sandbox.paypal.com');
!defined('PAYPAL_INTEGRATION_DATE') && define('PAYPAL_INTEGRATION_DATE', '2020-10-15'); !defined('PAYPAL_INTEGRATION_DATE') && define('PAYPAL_INTEGRATION_DATE', '2020-10-15');
!defined('PPCP_FLAG_SUBSCRIPTION') && define('PPCP_FLAG_SUBSCRIPTION', true); !defined('PPCP_FLAG_SUBSCRIPTION') && define('PPCP_FLAG_SUBSCRIPTION', true);

22
tests/Playwright/tests/subscriptions-api.spec.js
View file

@ -57,7 +57,7 @@ test.describe.serial('Subscriptions Merchant', () => {
const message = await page.locator('.notice-success'); const message = await page.locator('.notice-success');
await expect(message).toContainText('Product published.'); await expect(message).toContainText('Product published.');
const products = await request.get('https://api.sandbox.paypal.com/v1/catalogs/products?page_size=100&page=1&total_required=true', { const products = await request.get('https://api-m.sandbox.paypal.com/v1/catalogs/products?page_size=100&page=1&total_required=true', {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -73,7 +73,7 @@ test.describe.serial('Subscriptions Merchant', () => {
product_id = product.id; product_id = product.id;
const plans = await request.get(`https://api.sandbox.paypal.com/v1/billing/plans?product_id=${product_id}&page_size=10&page=1&total_required=true`, { const plans = await request.get(`https://api-m.sandbox.paypal.com/v1/billing/plans?product_id=${product_id}&page_size=10&page=1&total_required=true`, {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -107,7 +107,7 @@ test.describe.serial('Subscriptions Merchant', () => {
const message = await page.locator('.notice-success'); const message = await page.locator('.notice-success');
await expect(message).toContainText('Product updated.'); await expect(message).toContainText('Product updated.');
const products = await request.get('https://api.sandbox.paypal.com/v1/catalogs/products?page_size=100&page=1&total_required=true', { const products = await request.get('https://api-m.sandbox.paypal.com/v1/catalogs/products?page_size=100&page=1&total_required=true', {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -121,7 +121,7 @@ test.describe.serial('Subscriptions Merchant', () => {
}); });
await expect(product.id).toBeTruthy; await expect(product.id).toBeTruthy;
const plan = await request.get(`https://api.sandbox.paypal.com/v1/billing/plans/${plan_id}`, { const plan = await request.get(`https://api-m.sandbox.paypal.com/v1/billing/plans/${plan_id}`, {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -156,7 +156,7 @@ test('Create new free trial subscription product', async ({page, request}) => {
const message = await page.locator('.notice-success'); const message = await page.locator('.notice-success');
await expect(message).toContainText('Product published.'); await expect(message).toContainText('Product published.');
const products = await request.get('https://api.sandbox.paypal.com/v1/catalogs/products?page_size=100&page=1&total_required=true', { const products = await request.get('https://api-m.sandbox.paypal.com/v1/catalogs/products?page_size=100&page=1&total_required=true', {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -170,7 +170,7 @@ test('Create new free trial subscription product', async ({page, request}) => {
}); });
await expect(product.id).toBeTruthy; await expect(product.id).toBeTruthy;
const plans = await request.get(`https://api.sandbox.paypal.com/v1/billing/plans?product_id=${product.id}&page_size=10&page=1&total_required=true`, { const plans = await request.get(`https://api-m.sandbox.paypal.com/v1/billing/plans?product_id=${product.id}&page_size=10&page=1&total_required=true`, {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -184,7 +184,7 @@ test('Create new free trial subscription product', async ({page, request}) => {
}); });
await expect(plan.id).toBeTruthy; await expect(plan.id).toBeTruthy;
const planDetail = await request.get(`https://api.sandbox.paypal.com/v1/billing/plans/${plan.id}`, { const planDetail = await request.get(`https://api-m.sandbox.paypal.com/v1/billing/plans/${plan.id}`, {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -253,7 +253,7 @@ test.describe('Subscriber my account actions', () => {
await page.locator('text=View').first().click(); await page.locator('text=View').first().click();
const subscriptionId = await page.locator('#ppcp-subscription-id').textContent(); const subscriptionId = await page.locator('#ppcp-subscription-id').textContent();
let subscription = await request.get(`https://api.sandbox.paypal.com/v1/billing/subscriptions/${subscriptionId}`, { let subscription = await request.get(`https://api-m.sandbox.paypal.com/v1/billing/subscriptions/${subscriptionId}`, {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -267,7 +267,7 @@ test.describe('Subscriber my account actions', () => {
const title = page.locator('.woocommerce-message'); const title = page.locator('.woocommerce-message');
await expect(title).toHaveText('Your subscription has been cancelled.'); await expect(title).toHaveText('Your subscription has been cancelled.');
subscription = await request.get(`https://api.sandbox.paypal.com/v1/billing/subscriptions/${subscriptionId}`, { subscription = await request.get(`https://api-m.sandbox.paypal.com/v1/billing/subscriptions/${subscriptionId}`, {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -285,7 +285,7 @@ test.describe('Subscriber my account actions', () => {
await page.locator('text=View').first().click(); await page.locator('text=View').first().click();
const subscriptionId = await page.locator('#ppcp-subscription-id').textContent(); const subscriptionId = await page.locator('#ppcp-subscription-id').textContent();
let subscription = await request.get(`https://api.sandbox.paypal.com/v1/billing/subscriptions/${subscriptionId}`, { let subscription = await request.get(`https://api-m.sandbox.paypal.com/v1/billing/subscriptions/${subscriptionId}`, {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -299,7 +299,7 @@ test.describe('Subscriber my account actions', () => {
const title = page.locator('.woocommerce-message'); const title = page.locator('.woocommerce-message');
await expect(title).toHaveText('Your subscription has been cancelled.'); await expect(title).toHaveText('Your subscription has been cancelled.');
subscription = await request.get(`https://api.sandbox.paypal.com/v1/billing/subscriptions/${subscriptionId}`, { subscription = await request.get(`https://api-m.sandbox.paypal.com/v1/billing/subscriptions/${subscriptionId}`, {
headers: { headers: {
'Authorization': AUTHORIZATION, 'Authorization': AUTHORIZATION,
'Content-Type': 'application/json' 'Content-Type': 'application/json'

4
woocommerce-paypal-payments.php
View file

@ -21,8 +21,8 @@ namespace WooCommerce\PayPalCommerce;
use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
define( 'PAYPAL_API_URL', 'https://api.paypal.com' ); define( 'PAYPAL_API_URL', 'https://api-m.paypal.com' );
define( 'PAYPAL_SANDBOX_API_URL', 'https://api.sandbox.paypal.com' ); define( 'PAYPAL_SANDBOX_API_URL', 'https://api-m.sandbox.paypal.com' );
define( 'PAYPAL_INTEGRATION_DATE', '2023-09-26' ); define( 'PAYPAL_INTEGRATION_DATE', '2023-09-26' );
! defined( 'CONNECT_WOO_CLIENT_ID' ) && define( 'CONNECT_WOO_CLIENT_ID', 'AcCAsWta_JTL__OfpjspNyH7c1GGHH332fLwonA5CwX4Y10mhybRZmHLA0GdRbwKwjQIhpDQy0pluX_P' ); ! defined( 'CONNECT_WOO_CLIENT_ID' ) && define( 'CONNECT_WOO_CLIENT_ID', 'AcCAsWta_JTL__OfpjspNyH7c1GGHH332fLwonA5CwX4Y10mhybRZmHLA0GdRbwKwjQIhpDQy0pluX_P' );