diff --git a/src/RestApi/Client/PayPalClientFactory.php b/src/RestApi/Client/PayPalClientFactory.php
index 5beff5201..c205c7ce7 100644
--- a/src/RestApi/Client/PayPalClientFactory.php
+++ b/src/RestApi/Client/PayPalClientFactory.php
@@ -38,7 +38,7 @@ public function getPayPalClient(
string $partnerAttributionId = PartnerAttributionId::PAYPAL_CLASSIC,
bool $isFirstParty = false,
): PayPalClientInterface {
- if ($partnerAttributionId !== PartnerAttributionId::PAYPAL_PLUS && $this->credentialsUtil->getMerchantPayerId($salesChannelId)) {
+ if ($this->credentialsUtil->getMerchantPayerId($salesChannelId)) {
$partnerAttributionId = PartnerAttributionId::PAYPAL_PPCP;
}
diff --git a/src/RestApi/PartnerAttributionId.php b/src/RestApi/PartnerAttributionId.php
index ce4e42d24..916ab0315 100644
--- a/src/RestApi/PartnerAttributionId.php
+++ b/src/RestApi/PartnerAttributionId.php
@@ -17,13 +17,6 @@ final class PartnerAttributionId
*/
public const PAYPAL_CLASSIC = 'Shopware_Cart_EC_6native';
- /**
- * Shopware Partner Id for PayPal Plus
- *
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
- public const PAYPAL_PLUS = 'Shopware_Cart_Plus_6native';
-
/**
* Shopware Partner Id for Smart Payment Buttons
*/
diff --git a/src/RestApi/V1/Resource/AuthorizationResource.php b/src/RestApi/V1/Resource/AuthorizationResource.php
index 26eaa3c3b..5b4924316 100644
--- a/src/RestApi/V1/Resource/AuthorizationResource.php
+++ b/src/RestApi/V1/Resource/AuthorizationResource.php
@@ -9,8 +9,6 @@
use Shopware\Core\Framework\Log\Package;
use Swag\PayPal\RestApi\Client\PayPalClientFactoryInterface;
-use Swag\PayPal\RestApi\V1\Api\Capture;
-use Swag\PayPal\RestApi\V1\Api\DoVoid;
use Swag\PayPal\RestApi\V1\Api\Payment\Transaction\RelatedResource\Authorization;
use Swag\PayPal\RestApi\V1\RequestUriV1;
@@ -35,35 +33,4 @@ public function get(string $authorizationId, string $salesChannelId): Authorizat
return (new Authorization())->assign($response);
}
-
- /**
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
- public function capture(string $authorizationId, Capture $capture, string $salesChannelId): Capture
- {
- $response = $this->payPalClientFactory->getPayPalClient($salesChannelId)->sendPostRequest(
- \sprintf('%s/%s/capture', RequestUriV1::AUTHORIZATION_RESOURCE, $authorizationId),
- $capture
- );
-
- $capture->assign($response);
-
- return $capture;
- }
-
- /**
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
- public function void(string $authorizationId, string $salesChannelId): DoVoid
- {
- $doVoid = new DoVoid();
- $response = $this->payPalClientFactory->getPayPalClient($salesChannelId)->sendPostRequest(
- \sprintf('%s/%s/void', RequestUriV1::AUTHORIZATION_RESOURCE, $authorizationId),
- $doVoid
- );
-
- $doVoid->assign($response);
-
- return $doVoid;
- }
}
diff --git a/src/RestApi/V1/Resource/CaptureResource.php b/src/RestApi/V1/Resource/CaptureResource.php
index efda2198d..98c299556 100644
--- a/src/RestApi/V1/Resource/CaptureResource.php
+++ b/src/RestApi/V1/Resource/CaptureResource.php
@@ -10,7 +10,6 @@
use Shopware\Core\Framework\Log\Package;
use Swag\PayPal\RestApi\Client\PayPalClientFactoryInterface;
use Swag\PayPal\RestApi\V1\Api\Capture;
-use Swag\PayPal\RestApi\V1\Api\Refund;
use Swag\PayPal\RestApi\V1\RequestUriV1;
#[Package('checkout')]
@@ -34,19 +33,4 @@ public function get(string $captureId, string $salesChannelId): Capture
return (new Capture())->assign($response);
}
-
- /**
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
- public function refund(string $captureId, Refund $refund, string $salesChannelId): Refund
- {
- $response = $this->payPalClientFactory->getPayPalClient($salesChannelId)->sendPostRequest(
- \sprintf('%s/%s/refund', RequestUriV1::CAPTURE_RESOURCE, $captureId),
- $refund
- );
-
- $refund->assign($response);
-
- return $refund;
- }
}
diff --git a/src/RestApi/V1/Resource/OrdersResource.php b/src/RestApi/V1/Resource/OrdersResource.php
index 97eaea6a2..228356e70 100644
--- a/src/RestApi/V1/Resource/OrdersResource.php
+++ b/src/RestApi/V1/Resource/OrdersResource.php
@@ -9,8 +9,6 @@
use Shopware\Core\Framework\Log\Package;
use Swag\PayPal\RestApi\Client\PayPalClientFactoryInterface;
-use Swag\PayPal\RestApi\V1\Api\Capture;
-use Swag\PayPal\RestApi\V1\Api\DoVoid;
use Swag\PayPal\RestApi\V1\Api\Payment\Transaction\RelatedResource\Order;
use Swag\PayPal\RestApi\V1\RequestUriV1;
@@ -35,35 +33,4 @@ public function get(string $orderId, string $salesChannelId): Order
return (new Order())->assign($response);
}
-
- /**
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
- public function capture(string $orderId, Capture $capture, string $salesChannelId): Capture
- {
- $response = $this->payPalClientFactory->getPayPalClient($salesChannelId)->sendPostRequest(
- \sprintf('%s/%s/capture', RequestUriV1::ORDERS_RESOURCE, $orderId),
- $capture
- );
-
- $capture->assign($response);
-
- return $capture;
- }
-
- /**
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
- public function void(string $orderId, string $salesChannelId): DoVoid
- {
- $doVoid = new DoVoid();
- $response = $this->payPalClientFactory->getPayPalClient($salesChannelId)->sendPostRequest(
- \sprintf('%s/%s/do-void', RequestUriV1::ORDERS_RESOURCE, $orderId),
- $doVoid
- );
-
- $doVoid->assign($response);
-
- return $doVoid;
- }
}
diff --git a/src/RestApi/V1/Resource/PaymentResource.php b/src/RestApi/V1/Resource/PaymentResource.php
index aa2d4233e..2acd3b219 100644
--- a/src/RestApi/V1/Resource/PaymentResource.php
+++ b/src/RestApi/V1/Resource/PaymentResource.php
@@ -9,10 +9,7 @@
use Shopware\Core\Framework\Log\Package;
use Swag\PayPal\RestApi\Client\PayPalClientFactoryInterface;
-use Swag\PayPal\RestApi\PartnerAttributionId;
-use Swag\PayPal\RestApi\V1\Api\Patch;
use Swag\PayPal\RestApi\V1\Api\Payment;
-use Swag\PayPal\RestApi\V1\Api\Payment\Payer\ExecutePayerInfo;
use Swag\PayPal\RestApi\V1\RequestUriV1;
#[Package('checkout')]
@@ -28,36 +25,6 @@ public function __construct(PayPalClientFactoryInterface $payPalClientFactory)
$this->payPalClientFactory = $payPalClientFactory;
}
- public function create(Payment $payment, string $salesChannelId, string $partnerAttributionId): Payment
- {
- $paypalClient = $this->payPalClientFactory->getPayPalClient($salesChannelId, $partnerAttributionId);
- $response = $paypalClient->sendPostRequest(RequestUriV1::PAYMENT_RESOURCE, $payment);
-
- $payment->assign($response);
-
- return $payment;
- }
-
- public function execute(
- string $payerId,
- string $paymentId,
- string $salesChannelId,
- string $partnerAttributionId = PartnerAttributionId::PAYPAL_CLASSIC,
- ): Payment {
- $payerInfo = new ExecutePayerInfo();
- $payerInfo->setPayerId($payerId);
- $paypalClient = $this->payPalClientFactory->getPayPalClient($salesChannelId, $partnerAttributionId);
- $response = $paypalClient->sendPostRequest(
- \sprintf('%s/%s/execute', RequestUriV1::PAYMENT_RESOURCE, $paymentId),
- $payerInfo
- );
-
- return (new Payment())->assign($response);
- }
-
- /**
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
public function get(string $paymentId, string $salesChannelId): Payment
{
$response = $this->payPalClientFactory->getPayPalClient($salesChannelId)->sendGetRequest(
@@ -66,19 +33,4 @@ public function get(string $paymentId, string $salesChannelId): Payment
return (new Payment())->assign($response);
}
-
- /**
- * @param Patch[] $patches
- *
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
- public function patch(array $patches, string $paymentId, string $salesChannelId): Payment
- {
- $response = $this->payPalClientFactory->getPayPalClient($salesChannelId)->sendPatchRequest(
- \sprintf('%s/%s', RequestUriV1::PAYMENT_RESOURCE, $paymentId),
- $patches
- );
-
- return (new Payment())->assign($response);
- }
}
diff --git a/src/RestApi/V1/Resource/SaleResource.php b/src/RestApi/V1/Resource/SaleResource.php
index 7de728f10..e9ce3e30a 100644
--- a/src/RestApi/V1/Resource/SaleResource.php
+++ b/src/RestApi/V1/Resource/SaleResource.php
@@ -10,7 +10,6 @@
use Shopware\Core\Framework\Log\Package;
use Swag\PayPal\RestApi\Client\PayPalClientFactoryInterface;
use Swag\PayPal\RestApi\V1\Api\Payment\Transaction\RelatedResource\Sale;
-use Swag\PayPal\RestApi\V1\Api\Refund;
use Swag\PayPal\RestApi\V1\RequestUriV1;
#[Package('checkout')]
@@ -34,19 +33,4 @@ public function get(string $saleId, string $salesChannelId): Sale
return (new Sale())->assign($response);
}
-
- /**
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
- public function refund(string $saleId, Refund $refund, string $salesChannelId): Refund
- {
- $response = $this->payPalClientFactory->getPayPalClient($salesChannelId)->sendPostRequest(
- \sprintf('%s/%s/refund', RequestUriV1::SALE_RESOURCE, $saleId),
- $refund
- );
-
- $refund->assign($response);
-
- return $refund;
- }
}
diff --git a/src/Setting/Settings.php b/src/Setting/Settings.php
index 398178244..90ca64f3d 100644
--- a/src/Setting/Settings.php
+++ b/src/Setting/Settings.php
@@ -40,7 +40,6 @@ final class Settings
public const ECS_BUTTON_COLOR = self::SYSTEM_CONFIG_DOMAIN . 'ecsButtonColor';
public const ECS_BUTTON_SHAPE = self::SYSTEM_CONFIG_DOMAIN . 'ecsButtonShape';
public const ECS_BUTTON_LANGUAGE_ISO = self::SYSTEM_CONFIG_DOMAIN . 'ecsButtonLanguageIso';
-
public const ECS_SHOW_PAY_LATER = self::SYSTEM_CONFIG_DOMAIN . 'ecsShowPayLater';
public const SPB_BUTTON_COLOR = self::SYSTEM_CONFIG_DOMAIN . 'spbButtonColor';
public const SPB_BUTTON_SHAPE = self::SYSTEM_CONFIG_DOMAIN . 'spbButtonShape';
@@ -59,21 +58,8 @@ final class Settings
public const SPB_ALTERNATIVE_PAYMENT_METHODS_ENABLED = self::SYSTEM_CONFIG_DOMAIN . 'spbAlternativePaymentMethodsEnabled';
public const CROSS_BORDER_MESSAGING_ENABLED = self::SYSTEM_CONFIG_DOMAIN . 'crossBorderMessagingEnabled';
public const CROSS_BORDER_BUYER_COUNTRY = self::SYSTEM_CONFIG_DOMAIN . 'crossBorderBuyerCountry';
-
- /**
- * @deprecated tag:v10.0.0 - Will be removed without replacement.
- */
- public const MERCHANT_LOCATION = self::SYSTEM_CONFIG_DOMAIN . 'merchantLocation';
-
- /**
- * @deprecated tag:v10.0.0 - Will be removed without replacement.
- */
- public const PLUS_CHECKOUT_ENABLED = self::SYSTEM_CONFIG_DOMAIN . 'plusCheckoutEnabled';
-
public const VAULTING_ENABLED_WALLET = self::SYSTEM_CONFIG_DOMAIN . 'vaultingEnabledWallet';
-
public const VAULTING_ENABLED_ACDC = self::SYSTEM_CONFIG_DOMAIN . 'vaultingEnabledACDC';
-
public const VAULTING_ENABLED_VENMO = self::SYSTEM_CONFIG_DOMAIN . 'vaultingEnabledVenmo';
/**
@@ -85,7 +71,6 @@ final class Settings
self::SUBMIT_CART => true,
self::LANDING_PAGE => ApplicationContext::LANDING_PAGE_TYPE_NO_PREFERENCE,
self::SEND_ORDER_NUMBER => true,
- self::MERCHANT_LOCATION => self::MERCHANT_LOCATION_OTHER,
self::ECS_DETAIL_ENABLED => true,
self::ECS_CART_ENABLED => true,
self::ECS_OFF_CANVAS_ENABLED => true,
@@ -99,7 +84,6 @@ final class Settings
self::SPB_BUTTON_COLOR => 'gold',
self::SPB_BUTTON_SHAPE => 'sharp',
self::SPB_SHOW_PAY_LATER => false,
- self::PLUS_CHECKOUT_ENABLED => false,
self::INSTALLMENT_BANNER_DETAIL_PAGE_ENABLED => true,
self::INSTALLMENT_BANNER_CART_ENABLED => true,
self::INSTALLMENT_BANNER_OFF_CANVAS_CART_ENABLED => true,
@@ -116,24 +100,6 @@ final class Settings
self::CROSS_BORDER_BUYER_COUNTRY => null,
];
- /**
- * @deprecated tag:v10.0.0 - Will be removed without replacement.
- */
- public const MERCHANT_LOCATION_GERMANY = 'germany';
-
- /**
- * @deprecated tag:v10.0.0 - Will be removed without replacement.
- */
- public const MERCHANT_LOCATION_OTHER = 'other';
-
- /**
- * @deprecated tag:v10.0.0 - Will be removed without replacement.
- */
- public const VALID_MERCHANT_LOCATIONS = [
- self::MERCHANT_LOCATION_GERMANY,
- self::MERCHANT_LOCATION_OTHER,
- ];
-
private function __construct()
{
}
diff --git a/src/Storefront/Data/Service/SPBCheckoutDataService.php b/src/Storefront/Data/Service/SPBCheckoutDataService.php
index bc9725f10..2a0011504 100644
--- a/src/Storefront/Data/Service/SPBCheckoutDataService.php
+++ b/src/Storefront/Data/Service/SPBCheckoutDataService.php
@@ -54,9 +54,7 @@ public function buildCheckoutData(
return null;
}
- if ($this->systemConfigService->getString(Settings::MERCHANT_LOCATION, $salesChannelId) === Settings::MERCHANT_LOCATION_GERMANY
- || !$this->systemConfigService->getBool(Settings::SPB_CHECKOUT_ENABLED, $salesChannelId)
- ) {
+ if (!$this->systemConfigService->getBool(Settings::SPB_CHECKOUT_ENABLED, $salesChannelId)) {
return null;
}
diff --git a/src/Storefront/RequestSubscriber.php b/src/Storefront/RequestSubscriber.php
index 169954df4..77c385692 100644
--- a/src/Storefront/RequestSubscriber.php
+++ b/src/Storefront/RequestSubscriber.php
@@ -11,10 +11,8 @@
use Shopware\Core\Framework\Log\Package;
use Shopware\Storefront\Event\RouteRequest\HandlePaymentMethodRouteRequestEvent;
use Shopware\Storefront\Event\RouteRequest\PaymentMethodRouteRequestEvent;
-use Swag\PayPal\Checkout\Payment\Handler\PlusPuiHandler;
use Swag\PayPal\Checkout\Payment\Method\AbstractPaymentMethodHandler;
use Swag\PayPal\Checkout\Payment\Method\PUIHandler;
-use Swag\PayPal\Checkout\Payment\PayPalPaymentHandler;
use Swag\PayPal\Checkout\PUI\Service\PUICustomerDataService;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\InputBag;
@@ -30,9 +28,6 @@ class RequestSubscriber implements EventSubscriberInterface
PUIHandler::PUI_FRAUD_NET_SESSION_ID,
PUICustomerDataService::PUI_CUSTOMER_DATA_BIRTHDAY,
PUICustomerDataService::PUI_CUSTOMER_DATA_PHONE_NUMBER,
- PlusPuiHandler::PAYPAL_PAYMENT_ID_INPUT_NAME,
- PlusPuiHandler::PAYPAL_PAYMENT_TOKEN_INPUT_NAME,
- PayPalPaymentHandler::PAYPAL_PLUS_CHECKOUT_ID,
];
private LoggerInterface $logger;
diff --git a/src/Util/PaymentTokenExtractor.php b/src/Util/PaymentTokenExtractor.php
deleted file mode 100644
index e761f14d6..000000000
--- a/src/Util/PaymentTokenExtractor.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Util;
-
-use Shopware\Core\Framework\Log\Package;
-use Swag\PayPal\RestApi\V1\Api\Payment;
-
-/**
- * @deprecated tag:v10.0.0 - will be removed without replacement
- */
-#[Package('checkout')]
-class PaymentTokenExtractor
-{
- public static function extract(Payment $payment): string
- {
- $token = '';
-
- foreach ($payment->getLinks() as $link) {
- if (!($link->getRel() === 'approval_url')) {
- continue;
- }
-
- \preg_match('/EC-\w+/', $link->getHref(), $matches);
-
- if (!empty($matches)) {
- $token = $matches[0];
- }
- }
-
- return $token;
- }
-}
diff --git a/tests/Checkout/Payment/PayPalPaymentHandlerTest.php b/tests/Checkout/Payment/PayPalPaymentHandlerTest.php
index 5de921fa5..808081394 100644
--- a/tests/Checkout/Payment/PayPalPaymentHandlerTest.php
+++ b/tests/Checkout/Payment/PayPalPaymentHandlerTest.php
@@ -28,7 +28,6 @@
use Shopware\Core\System\StateMachine\StateMachineRegistry;
use Shopware\Core\Test\Generator;
use Swag\PayPal\Checkout\Payment\Handler\PayPalHandler;
-use Swag\PayPal\Checkout\Payment\Handler\PlusPuiHandler;
use Swag\PayPal\Checkout\Payment\Method\AbstractPaymentMethodHandler;
use Swag\PayPal\Checkout\Payment\PayPalPaymentHandler;
use Swag\PayPal\Checkout\Payment\Service\OrderExecuteService;
@@ -41,13 +40,7 @@
use Swag\PayPal\OrdersApi\Builder\Util\PurchaseUnitProvider;
use Swag\PayPal\OrdersApi\Patch\OrderNumberPatchBuilder as OrderNumberPatchBuilderV2;
use Swag\PayPal\OrdersApi\Patch\PurchaseUnitPatchBuilder;
-use Swag\PayPal\PaymentsApi\Patch\OrderNumberPatchBuilder;
-use Swag\PayPal\PaymentsApi\Patch\PayerInfoPatchBuilder;
-use Swag\PayPal\PaymentsApi\Patch\ShippingAddressPatchBuilder;
-use Swag\PayPal\PaymentsApi\Patch\TransactionPatchBuilder;
use Swag\PayPal\RestApi\PartnerAttributionId;
-use Swag\PayPal\RestApi\V1\Api\Patch;
-use Swag\PayPal\RestApi\V1\Resource\PaymentResource;
use Swag\PayPal\RestApi\V2\Api\Patch as PatchV2;
use Swag\PayPal\RestApi\V2\Resource\OrderResource;
use Swag\PayPal\Setting\Service\CredentialsUtil;
@@ -60,10 +53,6 @@
use Swag\PayPal\Test\Helper\SalesChannelContextTrait;
use Swag\PayPal\Test\Helper\ServicesTrait;
use Swag\PayPal\Test\Mock\CustomIdProviderMock;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\CreateResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\ExecutePaymentAuthorizeResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\ExecutePaymentOrderResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\ExecutePaymentSaleResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V2\CaptureOrderCapture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V2\CreateOrderCapture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V2\GetAuthorization;
@@ -141,84 +130,6 @@ public function testPay(): void
$this->assertOrderTransactionState(OrderTransactionStates::STATE_UNCONFIRMED, $transactionId, $salesChannelContext->getContext());
}
- public function testPayWithPlus(): void
- {
- $settings = $this->getDefaultConfigData();
- $handler = $this->createPayPalPaymentHandler($settings);
-
- $transactionId = $this->getTransactionId(Context::createDefaultContext(), $this->getContainer());
- $salesChannelContext = $this->createSalesChannelContext(
- $this->getContainer(),
- new PaymentMethodCollection()
- );
- $paymentTransaction = $this->createPaymentTransactionStruct('some-order-id', $transactionId);
- $dataBag = new RequestDataBag();
- $dataBag->set(PayPalPaymentHandler::PAYPAL_PLUS_CHECKOUT_ID, true);
- $dataBag->set(PlusPuiHandler::PAYPAL_PAYMENT_ID_INPUT_NAME, CreateResponseFixture::CREATE_PAYMENT_ID);
- $response = $handler->pay($paymentTransaction, $dataBag, $salesChannelContext);
-
- static::assertSame('plusPatched', $response->getTargetUrl());
-
- /** @var OrderTransactionRepoMock $orderTransactionRepo */
- $orderTransactionRepo = $this->orderTransactionRepo;
- $updatedData = $orderTransactionRepo->getData();
- static::assertSame(
- CreateResponseFixture::CREATE_PAYMENT_ID,
- $updatedData['customFields'][SwagPayPal::ORDER_TRANSACTION_CUSTOM_FIELDS_PAYPAL_TRANSACTION_ID]
- );
-
- $patchData = $this->clientFactory->getClient()->getData();
- static::assertCount(5, $patchData);
- foreach ($patchData as $patch) {
- static::assertInstanceOf(Patch::class, $patch);
- if ($patch->getPath() === '/transactions/0/item_list/shipping_address') {
- $patchValue = $patch->getValue();
- static::assertIsArray($patchValue);
- static::assertSame(self::TEST_CUSTOMER_STREET, $patchValue['line1']);
- }
-
- if ($patch->getPath() === '/payer/payer_info') {
- $patchValue = $patch->getValue();
- static::assertIsArray($patchValue);
- static::assertSame('Some', $patchValue['first_name']);
- static::assertSame(self::TEST_CUSTOMER_STREET, $patchValue['billing_address']['line1']);
- }
-
- if ($patch->getPath() === '/transactions/0/custom') {
- static::assertSame($transactionId, $patch->getValue());
- }
-
- if ($patch->getPath() === '/transactions/0/amount') {
- $patchValue = $patch->getValue();
- static::assertIsArray($patchValue);
- static::assertSame(self::TEST_AMOUNT, $patchValue['total']);
- }
- }
-
- $this->assertOrderTransactionState(OrderTransactionStates::STATE_UNCONFIRMED, $transactionId, $salesChannelContext->getContext());
- }
-
- public function testPayWithPlusThrowsException(): void
- {
- $settings = $this->getDefaultConfigData();
- $handler = $this->createPayPalPaymentHandler($settings);
-
- $transactionId = $this->getTransactionId(Context::createDefaultContext(), $this->getContainer());
- $salesChannelContext = $this->createSalesChannelContext(
- $this->getContainer(),
- new PaymentMethodCollection()
- );
- $paymentTransaction = $this->createPaymentTransactionStruct('some-order-id', $transactionId);
- $dataBag = new RequestDataBag();
- $dataBag->set(PayPalPaymentHandler::PAYPAL_PLUS_CHECKOUT_ID, true);
- $dataBag->set(PlusPuiHandler::PAYPAL_PAYMENT_ID_INPUT_NAME, self::PAYPAL_PATCH_THROWS_EXCEPTION);
- $this->expectException(PaymentException::class);
- $this->expectExceptionMessage('The asynchronous payment process was interrupted due to the following error:
-An error occurred during the communication with PayPal
-The error "TEST" occurred with the following message: generalClientExceptionMessage');
- $handler->pay($paymentTransaction, $dataBag, $salesChannelContext);
- }
-
public function testPayWithEcs(): void
{
$settings = $this->getDefaultConfigData();
@@ -425,85 +336,6 @@ public function testPayWithoutApprovalURL(): void
$handler->pay($paymentTransaction, new RequestDataBag(), $salesChannelContext);
}
- public function testFinalizeSale(): void
- {
- $this->assertFinalizeRequest($this->createPaymentV1Request());
- $this->assertCustomFields(ExecutePaymentSaleResponseFixture::SALE_ID);
- }
-
- public function testFinalizeEcs(): void
- {
- $request = $this->createPaymentV1Request();
- $request->query->set(PayPalPaymentHandler::PAYPAL_EXPRESS_CHECKOUT_ID, 'true');
- $this->assertFinalizeRequest($request);
- $this->assertCustomFields(ExecutePaymentSaleResponseFixture::SALE_ID);
- }
-
- public function testFinalizeEcsWithDuplicateTransaction(): void
- {
- ExecutePaymentSaleResponseFixture::setDuplicateTransaction(true);
- $request = $this->createPaymentV1Request(self::PAYER_ID_DUPLICATE_TRANSACTION);
- $request->query->set(PayPalPaymentHandler::PAYPAL_EXPRESS_CHECKOUT_ID, 'true');
- $this->assertFinalizeRequest($request);
- $this->assertCustomFields(ExecutePaymentSaleResponseFixture::SALE_ID);
- }
-
- public function testFinalizeSpb(): void
- {
- $request = $this->createPaymentV1Request();
- $request->query->set(PayPalPaymentHandler::PAYPAL_SMART_PAYMENT_BUTTONS_ID, 'true');
- $this->assertFinalizeRequest($request);
- $this->assertCustomFields(ExecutePaymentSaleResponseFixture::SALE_ID);
- }
-
- public function testFinalizeSpbWithDuplicateTransaction(): void
- {
- ExecutePaymentSaleResponseFixture::setDuplicateTransaction(true);
- $request = $this->createPaymentV1Request(self::PAYER_ID_DUPLICATE_TRANSACTION);
- $request->query->set(PayPalPaymentHandler::PAYPAL_SMART_PAYMENT_BUTTONS_ID, 'true');
- $this->assertFinalizeRequest($request);
- $this->assertCustomFields(ExecutePaymentSaleResponseFixture::SALE_ID);
- }
-
- public function testFinalizePlus(): void
- {
- $request = $this->createPaymentV1Request();
- $request->query->set(PayPalPaymentHandler::PAYPAL_PLUS_CHECKOUT_REQUEST_PARAMETER, 'true');
- $this->assertFinalizeRequest($request);
- $this->assertCustomFields(ExecutePaymentSaleResponseFixture::SALE_ID);
- }
-
- public function testFinalizePlusWithDuplicateTransaction(): void
- {
- ExecutePaymentSaleResponseFixture::setDuplicateTransaction(true);
- $request = $this->createPaymentV1Request(self::PAYER_ID_DUPLICATE_TRANSACTION);
- $request->query->set(PayPalPaymentHandler::PAYPAL_PLUS_CHECKOUT_REQUEST_PARAMETER, 'true');
- $this->assertFinalizeRequest($request);
- $this->assertCustomFields(ExecutePaymentSaleResponseFixture::SALE_ID);
- }
-
- public function testFinalizeAuthorization(): void
- {
- $request = $this->createPaymentV1Request();
- $request->query->set(
- PayPalPaymentHandler::PAYPAL_REQUEST_PARAMETER_PAYER_ID,
- ConstantsForTesting::PAYER_ID_PAYMENT_AUTHORIZE
- );
- $this->assertFinalizeRequest($request, OrderTransactionStates::STATE_OPEN);
- $this->assertCustomFields(ExecutePaymentAuthorizeResponseFixture::AUTHORIZATION_ID);
- }
-
- public function testFinalizeOrder(): void
- {
- $request = $this->createPaymentV1Request();
- $request->query->set(
- PayPalPaymentHandler::PAYPAL_REQUEST_PARAMETER_PAYER_ID,
- ConstantsForTesting::PAYER_ID_PAYMENT_ORDER
- );
- $this->assertFinalizeRequest($request, OrderTransactionStates::STATE_OPEN);
- $this->assertCustomFields(ExecutePaymentOrderResponseFixture::ORDER_ID);
- }
-
public function testFinalizeWithCancel(): void
{
$this->expectException(PaymentException::class);
@@ -521,40 +353,6 @@ public function testFinalizeWithCancel(): void
);
}
- public function testFinalizePaymentNotCompleted(): void
- {
- $request = $this->createPaymentV1Request();
- $request->query->set(PayPalPaymentHandler::PAYPAL_REQUEST_PARAMETER_PAYER_ID, self::PAYER_ID_PAYMENT_INCOMPLETE);
- $this->assertFinalizeRequest($request, OrderTransactionStates::STATE_FAILED);
- $this->assertCustomFields(ExecutePaymentSaleResponseFixture::SALE_ID);
- }
-
- public function testFinalizeWithException(): void
- {
- $settings = $this->getDefaultConfigData();
-
- $request = $this->createPaymentV1Request();
- $request->query->set(
- PayPalPaymentHandler::PAYPAL_REQUEST_PARAMETER_PAYER_ID,
- ConstantsForTesting::PAYPAL_RESOURCE_THROWS_EXCEPTION
- );
-
- $this->expectException(PaymentException::class);
- $this->expectExceptionMessage('The asynchronous payment finalize was interrupted due to the following error:
-An error occurred during the communication with PayPal');
- $this->createPayPalPaymentHandler($settings)->finalize(
- $this->createPaymentTransactionStruct(
- ConstantsForTesting::VALID_ORDER_ID,
- 'testTransactionId',
- null,
- $this->getContainer(),
- Context::createDefaultContext()
- ),
- $request,
- Generator::createSalesChannelContext()
- );
- }
-
public function testFinalizePayPalOrderCapture(): void
{
$request = new Request([
@@ -685,16 +483,6 @@ private function createPayPalPaymentHandler(
$this->createMock(VaultTokenService::class),
$logger
),
- new PlusPuiHandler(
- new PaymentResource($this->clientFactory),
- $this->orderTransactionRepo,
- new PayerInfoPatchBuilder(),
- new OrderNumberPatchBuilder(),
- new TransactionPatchBuilder($paymentBuilder),
- new ShippingAddressPatchBuilder(),
- $orderTransactionStateHandler,
- $logger
- ),
$orderTransactionRepository ?? $orderTransactionRepositoryMock,
$logger,
new SettingsValidationService($systemConfig, new NullLogger()),
@@ -703,14 +491,6 @@ private function createPayPalPaymentHandler(
);
}
- private function createPaymentV1Request(?string $payerId = null): Request
- {
- return new Request([
- PayPalPaymentHandler::PAYPAL_REQUEST_PARAMETER_PAYER_ID => $payerId ?? 'testPayerId',
- PayPalPaymentHandler::PAYPAL_REQUEST_PARAMETER_PAYMENT_ID => 'testPaymentId',
- ]);
- }
-
private function assertFinalizeRequest(
Request $request,
string $state = OrderTransactionStates::STATE_PAID,
diff --git a/tests/Checkout/Plus/PlusPaymentFinalizeControllerTest.php b/tests/Checkout/Plus/PlusPaymentFinalizeControllerTest.php
deleted file mode 100644
index bf94398c5..000000000
--- a/tests/Checkout/Plus/PlusPaymentFinalizeControllerTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Checkout\Plus;
-
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use Psr\Log\NullLogger;
-use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler;
-use Shopware\Core\Checkout\Payment\PaymentException;
-use Shopware\Core\Framework\Log\Package;
-use Shopware\Core\Framework\Struct\ArrayStruct;
-use Shopware\Core\Framework\Test\TestCaseBase\IntegrationTestBehaviour;
-use Shopware\Core\Test\Generator;
-use Swag\PayPal\Checkout\Payment\PayPalPaymentHandler;
-use Swag\PayPal\Checkout\Plus\PlusPaymentFinalizeController;
-use Swag\PayPal\Test\Helper\ConstantsForTesting;
-use Swag\PayPal\Test\Mock\Payment\AsyncPaymentHandlerMock;
-use Swag\PayPal\Test\Mock\Repositories\OrderTransactionRepoMock;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\RouterInterface;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class PlusPaymentFinalizeControllerTest extends TestCase
-{
- use IntegrationTestBehaviour;
-
- private MockObject $orderTransactionStateHandler;
-
- public function testFinalizeTransaction(): void
- {
- $response = $this->createController()->finalizeTransaction(
- new Request(),
- Generator::createSalesChannelContext()
- );
-
- static::assertSame(Response::HTTP_FOUND, $response->getStatusCode());
- static::assertSame('/checkout/finish?orderId=testOrderId&isPayPalPlusCheckout=1&changedPayment=0', $response->getTargetUrl());
- }
-
- public function testFinalizeTransactionWithChangedPayment(): void
- {
- $response = $this->createController()->finalizeTransaction(
- new Request(['changedPayment' => true]),
- Generator::createSalesChannelContext()
- );
-
- static::assertSame(Response::HTTP_FOUND, $response->getStatusCode());
- static::assertSame('/checkout/finish?orderId=testOrderId&isPayPalPlusCheckout=1&changedPayment=1', $response->getTargetUrl());
- }
-
- public function testFinalizeTransactionWithoutTransaction(): void
- {
- $salesChannelContext = Generator::createSalesChannelContext();
- $salesChannelContext->getContext()->addExtension(ConstantsForTesting::WITHOUT_TRANSACTION, new ArrayStruct());
- $this->expectException(PaymentException::class);
- $this->expectExceptionMessage('The transaction with id is invalid or could not be found.');
- $this->createController()->finalizeTransaction(new Request(), $salesChannelContext);
- }
-
- public function testFinalizeTransactionWithoutOrder(): void
- {
- $salesChannelContext = Generator::createSalesChannelContext();
- $salesChannelContext->getContext()->addExtension(ConstantsForTesting::WITHOUT_ORDER, new ArrayStruct());
- $this->expectException(PaymentException::class);
- $this->expectExceptionMessage(
- \sprintf(
- 'The transaction with id %s is invalid or could not be found.',
- OrderTransactionRepoMock::ORDER_TRANSACTION_ID
- )
- );
- $this->createController()->finalizeTransaction(new Request(), $salesChannelContext);
- }
-
- public function testFinalizeTransactionCustomerCancel(): void
- {
- $salesChannelContext = Generator::createSalesChannelContext();
- $request = new Request([PayPalPaymentHandler::PAYPAL_REQUEST_PARAMETER_CANCEL => true]);
- $controller = $this->createController();
-
- $this->orderTransactionStateHandler->expects(static::once())->method('cancel');
- $expectedTargetUrl = '/account/order/edit/testOrderId?error-code=CHECKOUT__CUSTOMER_CANCELED_EXTERNAL_PAYMENT';
-
- $targetUrl = $controller->finalizeTransaction($request, $salesChannelContext)->getTargetUrl();
- static::assertStringContainsString($expectedTargetUrl, $targetUrl);
- }
-
- public function testFinalizeTransactionError(): void
- {
- $salesChannelContext = Generator::createSalesChannelContext();
- $request = new Request([AsyncPaymentHandlerMock::REQUEST_PARAM_SHOULD_THROW_EXCEPTION => true]);
- $controller = $this->createController();
-
- $this->orderTransactionStateHandler->expects(static::once())->method('fail');
- $expectedTargetUrl = '/account/order/edit/testOrderId?error-code=CHECKOUT__ASYNC_PAYMENT_FINALIZE_INTERRUPTED';
-
- $targetUrl = $controller->finalizeTransaction($request, $salesChannelContext)->getTargetUrl();
- static::assertStringContainsString($expectedTargetUrl, $targetUrl);
- }
-
- private function createController(): PlusPaymentFinalizeController
- {
- /** @var RouterInterface $router */
- $router = $this->getContainer()->get('router');
-
- $this->orderTransactionStateHandler = $this->createMock(OrderTransactionStateHandler::class);
-
- return new PlusPaymentFinalizeController(
- new OrderTransactionRepoMock(),
- new AsyncPaymentHandlerMock(),
- $this->orderTransactionStateHandler,
- $router,
- new NullLogger()
- );
- }
-}
diff --git a/tests/Checkout/Plus/PlusSubscriberTest.php b/tests/Checkout/Plus/PlusSubscriberTest.php
deleted file mode 100644
index 7403f5fcd..000000000
--- a/tests/Checkout/Plus/PlusSubscriberTest.php
+++ /dev/null
@@ -1,625 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Checkout\Plus;
-
-use PHPUnit\Framework\TestCase;
-use Psr\Log\NullLogger;
-use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionCollection;
-use Shopware\Core\Checkout\Payment\PaymentException;
-use Shopware\Core\Checkout\Payment\PaymentMethodCollection;
-use Shopware\Core\Checkout\Payment\PaymentMethodEntity;
-use Shopware\Core\Checkout\Shipping\ShippingMethodCollection;
-use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
-use Shopware\Core\Framework\Log\Package;
-use Shopware\Core\Framework\Test\TestCaseBase\IntegrationTestBehaviour;
-use Shopware\Core\Framework\Uuid\Uuid;
-use Shopware\Core\SalesChannelRequest;
-use Shopware\Core\System\SalesChannel\Context\SalesChannelContextFactory;
-use Shopware\Core\System\SalesChannel\Context\SalesChannelContextService;
-use Shopware\Core\Test\TestDefaults;
-use Shopware\Storefront\Page\Account\Order\AccountEditOrderPage;
-use Shopware\Storefront\Page\Account\Order\AccountEditOrderPageLoadedEvent;
-use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPage;
-use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent;
-use Shopware\Storefront\Page\Checkout\Finish\CheckoutFinishPage;
-use Shopware\Storefront\Page\Checkout\Finish\CheckoutFinishPageLoadedEvent;
-use Shopware\Storefront\Page\PageLoadedEvent;
-use Swag\PayPal\Checkout\Payment\PayPalPaymentHandler;
-use Swag\PayPal\Checkout\Plus\PlusData;
-use Swag\PayPal\Checkout\Plus\PlusSubscriber;
-use Swag\PayPal\Checkout\Plus\Service\PlusDataService;
-use Swag\PayPal\PaymentsApi\Builder\CartPaymentBuilder;
-use Swag\PayPal\PaymentsApi\Builder\OrderPaymentBuilder;
-use Swag\PayPal\RestApi\V1\Resource\PaymentResource;
-use Swag\PayPal\Setting\Service\SettingsValidationService;
-use Swag\PayPal\Setting\Settings;
-use Swag\PayPal\Test\Helper\CartTrait;
-use Swag\PayPal\Test\Helper\ConstantsForTesting;
-use Swag\PayPal\Test\Helper\PaymentMethodTrait;
-use Swag\PayPal\Test\Helper\PaymentTransactionTrait;
-use Swag\PayPal\Test\Helper\SalesChannelContextTrait;
-use Swag\PayPal\Test\Helper\ServicesTrait;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\CreateResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\PayPalClientFactoryMock;
-use Swag\PayPal\Util\LocaleCodeProvider;
-use Swag\PayPal\Util\PaymentMethodUtil;
-use Swag\PayPal\Util\PriceFormatter;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class PlusSubscriberTest extends TestCase
-{
- use CartTrait;
- use IntegrationTestBehaviour;
- use PaymentMethodTrait;
- use PaymentTransactionTrait;
- use SalesChannelContextTrait;
- use ServicesTrait;
-
- private const NEW_PAYMENT_NAME = 'PayPal, Lastschrift oder Kreditkarte';
- private const PAYMENT_DESCRIPTION_EXTENSION = 'Zahlung per Lastschrift oder Kreditkarte ist auch ohne ein PayPal-Konto möglich.';
- private const NEW_PAYMENT_DESCRIPTION = 'Bezahlung per PayPal - einfach, schnell und sicher. ' . self::PAYMENT_DESCRIPTION_EXTENSION;
-
- private PaymentMethodUtil $paymentMethodUtil;
-
- private string $paypalPaymentMethodId;
-
- protected function setUp(): void
- {
- $this->paymentMethodUtil = $this->getContainer()->get(PaymentMethodUtil::class);
- $this->paypalPaymentMethodId = (string) $this->paymentMethodUtil->getPayPalPaymentMethodId(Context::createDefaultContext());
- }
-
- protected function tearDown(): void
- {
- $this->removePaymentMethodFromDefaultsSalesChannel($this->paypalPaymentMethodId);
- }
-
- public function testGetSubscribedEvents(): void
- {
- $events = PlusSubscriber::getSubscribedEvents();
-
- static::assertCount(3, $events);
- static::assertSame('onAccountEditOrderLoaded', $events[AccountEditOrderPageLoadedEvent::class]);
- static::assertSame('onCheckoutConfirmLoaded', $events[CheckoutConfirmPageLoadedEvent::class]);
- static::assertSame('onCheckoutFinishLoaded', $events[CheckoutFinishPageLoadedEvent::class]);
- }
-
- public function testOnAccountEditOrderLoadedPlusEnabled(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createAccountEditOrderEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onAccountEditOrderLoaded($event);
- $plusExtension = $this->assertPlusExtension($event);
-
- static::assertSame(ConstantsForTesting::VALID_ORDER_ID, $plusExtension->getOrderId());
- }
-
- public function testOnAccountEditOrderLoadedPlusNoSettings(): void
- {
- $subscriber = $this->createSubscriber(false);
- $event = $this->createAccountEditOrderEvent();
- $subscriber->onAccountEditOrderLoaded($event);
-
- static::assertNull($event->getPage()->getExtension(PlusSubscriber::PAYPAL_PLUS_DATA_EXTENSION_ID));
- }
-
- public function testOnAccountEditOrderLoadedNoCustomer(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createAccountEditOrderEvent(false);
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onAccountEditOrderLoaded($event);
-
- static::assertNull($event->getPage()->getExtension(PlusSubscriber::PAYPAL_PLUS_DATA_EXTENSION_ID));
- }
-
- public function testOnAccountEditOrderLoadedNoOrderTransactions(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createAccountEditOrderEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $event->getPage()->getOrder()->assign(['transactions' => null]);
-
- $this->expectException(PaymentException::class);
- $this->expectExceptionMessage(
- \sprintf('The order with id %s is invalid or could not be found.', ConstantsForTesting::VALID_ORDER_ID)
- );
- $subscriber->onAccountEditOrderLoaded($event);
- }
-
- public function testOnAccountEditOrderLoadedNoFirstOrderTransaction(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createAccountEditOrderEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $event->getPage()->getOrder()->setTransactions(new OrderTransactionCollection());
-
- $this->expectException(PaymentException::class);
- $this->expectExceptionMessage(
- \sprintf('The order with id %s is invalid or could not be found.', ConstantsForTesting::VALID_ORDER_ID)
- );
- $subscriber->onAccountEditOrderLoaded($event);
- }
-
- public function testOnAccountEditOrderLoadedCreatePaymentThrowsException(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createAccountEditOrderEvent(true, ConstantsForTesting::PAYPAL_RESOURCE_THROWS_EXCEPTION_WITH_PREFIX);
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onAccountEditOrderLoaded($event);
-
- static::assertNull($event->getPage()->getExtension(PlusSubscriber::PAYPAL_PLUS_DATA_EXTENSION_ID));
- }
-
- public function testOnCheckoutConfirmLoadedIsExpressCheckout(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createConfirmEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $event->getRequest()->query->set(PayPalPaymentHandler::PAYPAL_EXPRESS_CHECKOUT_ID, 'true');
-
- $subscriber->onCheckoutConfirmLoaded($event);
-
- static::assertNull($event->getPage()->getExtension(PlusSubscriber::PAYPAL_PLUS_DATA_EXTENSION_ID));
- }
-
- public function testOnCheckoutConfirmLoadedPlusNoSettings(): void
- {
- $subscriber = $this->createSubscriber(false);
- $event = $this->createConfirmEvent();
- $subscriber->onCheckoutConfirmLoaded($event);
-
- static::assertNull($event->getPage()->getExtension(PlusSubscriber::PAYPAL_PLUS_DATA_EXTENSION_ID));
- }
-
- public function testOnCheckoutConfirmLoadedPlusNotEnabled(): void
- {
- $subscriber = $this->createSubscriber(true, false);
- $event = $this->createConfirmEvent();
- $subscriber->onCheckoutConfirmLoaded($event);
-
- static::assertNull($event->getPage()->getExtension(PlusSubscriber::PAYPAL_PLUS_DATA_EXTENSION_ID));
- }
-
- public function testOnCheckoutConfirmLoadedNoCustomer(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createConfirmEvent(false);
- $subscriber->onCheckoutConfirmLoaded($event);
-
- static::assertNull($event->getPage()->getExtension(PlusSubscriber::PAYPAL_PLUS_DATA_EXTENSION_ID));
- }
-
- public function testOnCheckoutConfirmLoadedPlusEnabled(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createConfirmEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutConfirmLoaded($event);
-
- $this->assertPlusExtension($event);
- }
-
- public function testOnCheckoutConfirmLoadedPlusEnabledWithPaymentOverwrite(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createConfirmEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutConfirmLoaded($event);
-
- $this->assertPlusExtension($event);
-
- $selectedPaymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertSame(self::NEW_PAYMENT_NAME, $selectedPaymentMethod->getTranslated()['name']);
- static::assertSame(self::NEW_PAYMENT_DESCRIPTION, $selectedPaymentMethod->getTranslated()['description']);
-
- $paymentMethod = $event->getPage()->getPaymentMethods()->get($this->paypalPaymentMethodId);
- static::assertNotNull($paymentMethod);
- static::assertSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- static::assertSame(self::NEW_PAYMENT_DESCRIPTION, $paymentMethod->getTranslated()['description']);
- }
-
- public function testOnCheckoutConfirmLoadedPayPalPaymentMethodNotSelected(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createConfirmEvent(true, true);
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutConfirmLoaded($event);
-
- /** @var PlusData|null $plusExtension */
- $plusExtension = $event->getPage()->getExtension(PlusSubscriber::PAYPAL_PLUS_DATA_EXTENSION_ID);
-
- static::assertNull($plusExtension);
-
- $paymentMethod = $event->getPage()->getPaymentMethods()->get($this->paypalPaymentMethodId);
- static::assertNotNull($paymentMethod);
- static::assertSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- static::assertSame(self::NEW_PAYMENT_DESCRIPTION, $paymentMethod->getTranslated()['description']);
- }
-
- public function testOnCheckoutFinishLoadedIsNotPayPalPlus(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createFinishEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $event->getRequest()->query->set(PayPalPaymentHandler::PAYPAL_PLUS_CHECKOUT_ID, 'false');
-
- $subscriber->onCheckoutFinishLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutFinishLoadedPlusNoSettings(): void
- {
- $subscriber = $this->createSubscriber(false);
- $event = $this->createFinishEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutFinishLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutFinishLoadedPlusEnabledWithPaymentOverwrite(): void
- {
- $event = $this->createFinishEvent();
- $translated = $this->assertFinishPage($event)->getTranslated();
- static::assertSame(self::NEW_PAYMENT_NAME, $translated['name']);
- static::assertSame(self::NEW_PAYMENT_DESCRIPTION, $translated['description']);
- }
-
- public function testOnCheckoutFinishLoadedNotPayPalSelected(): void
- {
- $event = $this->createFinishEvent(true, true, false, true);
- $paymentMethod = $this->assertFinishPage($event);
- $translated = $paymentMethod->getTranslated();
- static::assertArrayNotHasKey('name', $translated);
- static::assertArrayNotHasKey('description', $translated);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutFinishLoadedPlusNotEnabled(): void
- {
- $subscriber = $this->createSubscriber(true, false);
- $event = $this->createFinishEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutFinishLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutFinishLoadedWithoutTransactions(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createFinishEvent(false);
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutFinishLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutFinishLoadedWithoutTransaction(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createFinishEvent(true, false);
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutFinishLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutFinishLoadedWithoutPaymentMethod(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createFinishEvent(true, true, false);
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutFinishLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutConfirmLoadedWithoutPayPalInSalesChannel(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createConfirmEvent(false, false, false);
- $subscriber->onCheckoutConfirmLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutConfirmLoadedWithoutSettings(): void
- {
- $subscriber = $this->createSubscriber(false);
- $event = $this->createConfirmEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutConfirmLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutConfirmLoadedWithSettingsButPlusDisabled(): void
- {
- $subscriber = $this->createSubscriber(true, false);
- $event = $this->createConfirmEvent();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutConfirmLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- public function testOnCheckoutConfirmLoadedWithoutCustomer(): void
- {
- $subscriber = $this->createSubscriber();
- $event = $this->createConfirmEvent();
- $event->getSalesChannelContext()->assign([
- 'customer' => null,
- ]);
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutConfirmLoaded($event);
-
- $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
- static::assertNotSame(self::NEW_PAYMENT_NAME, $paymentMethod->getTranslated()['name']);
- }
-
- private function createConfirmEvent(
- bool $withCustomer = true,
- bool $withOtherDefaultPayment = false,
- bool $withPayPalPaymentMethod = true,
- ): CheckoutConfirmPageLoadedEvent {
- $paymentCollection = new PaymentMethodCollection();
- if ($withPayPalPaymentMethod) {
- $paymentCollection->add($this->createPayPalPaymentMethod());
- }
-
- $salesChannelContext = $this->createSalesChannelContext(
- $this->getContainer(),
- $paymentCollection,
- $this->paypalPaymentMethodId,
- $withCustomer,
- $withOtherDefaultPayment
- );
-
- $page = new CheckoutConfirmPage();
- $page->setPaymentMethods($paymentCollection);
- $page->setShippingMethods(new ShippingMethodCollection([]));
-
- $page->setCart($this->createCart($this->paypalPaymentMethodId));
-
- $request = $this->createRequest($salesChannelContext->getContext());
-
- return new CheckoutConfirmPageLoadedEvent($page, $salesChannelContext, $request);
- }
-
- private function createSubscriber(
- bool $withSettings = true,
- bool $plusEnabled = true,
- ): PlusSubscriber {
- $settings = $this->createSystemConfigServiceMock($withSettings ? [
- Settings::CLIENT_ID => 'testClientId',
- Settings::CLIENT_SECRET => 'testClientSecret',
- Settings::PLUS_CHECKOUT_ENABLED => $plusEnabled,
- Settings::MERCHANT_LOCATION => Settings::MERCHANT_LOCATION_GERMANY,
- ] : []);
-
- /** @var RouterInterface $router */
- $router = $this->getContainer()->get('router');
- $translator = $this->createMock(TranslatorInterface::class);
- $translator->method('trans')->willReturnCallback(function (string $key): string {
- if ($key === 'paypal.plus.paymentNameOverwrite') {
- return self::NEW_PAYMENT_NAME;
- }
-
- if ($key === 'paypal.plus.paymentDescriptionExtension') {
- return self::PAYMENT_DESCRIPTION_EXTENSION;
- }
-
- static::fail(\sprintf('Unexpected translation key "%s"', $key));
- });
-
- /** @var EntityRepository $currencyRepo */
- $currencyRepo = $this->getContainer()->get('currency.repository');
- $priceFormatter = new PriceFormatter();
- $eventDispatcher = $this->createMock(EventDispatcherInterface::class);
- $logger = new NullLogger();
-
- $plusDataService = new PlusDataService(
- new CartPaymentBuilder(
- $this->getContainer()->get(LocaleCodeProvider::class),
- $priceFormatter,
- $eventDispatcher,
- $logger,
- $settings
- ),
- new OrderPaymentBuilder(
- $this->getContainer()->get(LocaleCodeProvider::class),
- $priceFormatter,
- $eventDispatcher,
- $logger,
- $settings,
- $currencyRepo
- ),
- new PaymentResource(new PayPalClientFactoryMock(new NullLogger())),
- $router,
- $this->paymentMethodUtil,
- $this->getContainer()->get(LocaleCodeProvider::class),
- $settings
- );
-
- return new PlusSubscriber(
- new SettingsValidationService($settings, new NullLogger()),
- $settings,
- $plusDataService,
- $this->paymentMethodUtil,
- $translator,
- new NullLogger()
- );
- }
-
- private function createFinishEvent(
- bool $withTransactions = true,
- bool $withTransaction = true,
- bool $withPaymentMethod = true,
- bool $withDefaultPaymentMethod = false,
- ): CheckoutFinishPageLoadedEvent {
- $salesChannelContext = $this->getContainer()->get(SalesChannelContextFactory::class)->create(
- Uuid::randomHex(),
- TestDefaults::SALES_CHANNEL,
- [
- SalesChannelContextService::PAYMENT_METHOD_ID => $this->paypalPaymentMethodId,
- ]
- );
-
- $order = $this->createOrderEntity('test-id');
- if ($withTransactions) {
- if ($withTransaction) {
- $orderTransaction = $this->createOrderTransaction();
- $orderTransaction->setPaymentMethodId('test-payment-method-id');
-
- if ($withPaymentMethod) {
- $payPalPaymentMethod = $this->createPayPalPaymentMethod();
- $orderTransaction->setPaymentMethod($payPalPaymentMethod);
- $orderTransaction->setPaymentMethodId($payPalPaymentMethod->getId());
- } elseif ($withDefaultPaymentMethod) {
- $paymentMethod = new PaymentMethodEntity();
- $paymentMethod->setId('test-id');
- $orderTransaction->setPaymentMethod($paymentMethod);
- $orderTransaction->setPaymentMethodId($paymentMethod->getId());
- }
-
- $orderTransactionCollection = new OrderTransactionCollection([$orderTransaction]);
- } else {
- $orderTransactionCollection = new OrderTransactionCollection();
- }
-
- $order->setTransactions($orderTransactionCollection);
- }
-
- $page = new CheckoutFinishPage();
- $page->setOrder($order);
-
- $request = $this->createRequest($salesChannelContext->getContext());
-
- return new CheckoutFinishPageLoadedEvent($page, $salesChannelContext, $request);
- }
-
- private function createPayPalPaymentMethod(): PaymentMethodEntity
- {
- $payPalPaymentMethod = new PaymentMethodEntity();
- $payPalPaymentMethod->setId($this->paypalPaymentMethodId);
- $payPalPaymentMethod->setDescription('Bezahlung per PayPal - einfach, schnell und sicher.');
-
- return $payPalPaymentMethod;
- }
-
- private function createRequest(Context $context): Request
- {
- $criteria = new Criteria();
- $criteria->addFilter(new EqualsFilter('iso', 'de-DE'));
-
- /** @var EntityRepository $snippetSetRepository */
- $snippetSetRepository = $this->getContainer()->get('snippet_set.repository');
- $snippetSetId = $snippetSetRepository->searchIds($criteria, $context)->firstId();
-
- $request = new Request();
- $request->attributes->add([SalesChannelRequest::ATTRIBUTE_DOMAIN_SNIPPET_SET_ID => $snippetSetId]);
- $request->query->set(PayPalPaymentHandler::PAYPAL_PLUS_CHECKOUT_ID, 'true');
-
- /** @var RequestStack $requestStack */
- $requestStack = $this->getContainer()->get('request_stack');
- $requestStack->push($request);
-
- return $request;
- }
-
- private function createAccountEditOrderEvent(bool $withCustomer = true, ?string $orderNumber = null): AccountEditOrderPageLoadedEvent
- {
- $order = $this->createOrderEntity(ConstantsForTesting::VALID_ORDER_ID, $orderNumber);
- $orderTransaction = $this->createOrderTransaction();
- $orderTransaction->setOrderId($order->getId());
- $order->setTransactions(new OrderTransactionCollection([$orderTransaction]));
-
- $payPalPaymentMethod = $this->createPayPalPaymentMethod();
- $paymentCollection = new PaymentMethodCollection([$payPalPaymentMethod]);
-
- $accountOrderEditPage = new AccountEditOrderPage();
- $accountOrderEditPage->setOrder($order);
- $accountOrderEditPage->setPaymentMethods($paymentCollection);
-
- return new AccountEditOrderPageLoadedEvent(
- $accountOrderEditPage,
- $this->createSalesChannelContext(
- $this->getContainer(),
- $paymentCollection,
- $this->paypalPaymentMethodId,
- $withCustomer
- ),
- new Request()
- );
- }
-
- /**
- * @param AccountEditOrderPageLoadedEvent|CheckoutConfirmPageLoadedEvent $event
- */
- private function assertPlusExtension(PageLoadedEvent $event): PlusData
- {
- /** @var PlusData|null $plusExtension */
- $plusExtension = $event->getPage()->getExtension(PlusSubscriber::PAYPAL_PLUS_DATA_EXTENSION_ID);
-
- static::assertNotNull($plusExtension);
- static::assertSame(CreateResponseFixture::CREATE_PAYMENT_APPROVAL_URL, $plusExtension->getApprovalUrl());
- static::assertSame(2, \mb_strlen($plusExtension->getCustomerCountryIso()));
- static::assertSame('live', $plusExtension->getMode());
- static::assertSame('de_DE', $plusExtension->getCustomerSelectedLanguage());
- static::assertSame($this->paypalPaymentMethodId, $plusExtension->getPaymentMethodId());
- static::assertSame(CreateResponseFixture::CREATE_PAYMENT_ID, $plusExtension->getPaypalPaymentId());
- static::assertSame(CreateResponseFixture::CREATE_PAYMENT_APPROVAL_TOKEN, $plusExtension->getPaypalToken());
- static::assertSame('/paypal/plus/payment/handle', $plusExtension->getHandlePaymentUrl());
- static::assertSame(PayPalPaymentHandler::PAYPAL_PLUS_CHECKOUT_ID, $plusExtension->getIsEnabledParameterName());
- static::assertSame($event->getContext()->getLanguageId(), $plusExtension->getLanguageId());
-
- return $plusExtension;
- }
-
- private function assertFinishPage(CheckoutFinishPageLoadedEvent $event): PaymentMethodEntity
- {
- $subscriber = $this->createSubscriber();
- $this->addPaymentMethodToDefaultsSalesChannel($this->paypalPaymentMethodId);
- $subscriber->onCheckoutFinishLoaded($event);
-
- $transactions = $event->getPage()->getOrder()->getTransactions();
- static::assertNotNull($transactions);
- $transaction = $transactions->first();
- static::assertNotNull($transaction);
- $paymentMethod = $transaction->getPaymentMethod();
- static::assertNotNull($paymentMethod);
-
- return $paymentMethod;
- }
-}
diff --git a/tests/Helper/ConstantsForTesting.php b/tests/Helper/ConstantsForTesting.php
index 1b7ef28c6..ff8f2f8d9 100644
--- a/tests/Helper/ConstantsForTesting.php
+++ b/tests/Helper/ConstantsForTesting.php
@@ -32,14 +32,7 @@ final class ConstantsForTesting
public const ORDER_ID_MISSING_LINE_ITEMS = 'order-id-missing-line-items';
- public const PAYER_ID_PAYMENT_AUTHORIZE = 'testPayerIdAuthorize';
-
- public const PAYER_ID_PAYMENT_ORDER = 'testPayerIdOrder';
-
- public const PAYER_ID_PAYMENT_PUI = 'testPayerIdPui';
-
public const PAYPAL_RESOURCE_THROWS_EXCEPTION = 'createRequestThrowsException';
- public const PAYPAL_RESOURCE_THROWS_EXCEPTION_WITH_PREFIX = 'TEST_createRequestThrowsException';
public const PAYPAL_RESPONSE_HAS_NO_APPROVAL_URL = 'noApprovalUrl';
public const WITHOUT_TRANSACTION = 'noTransactionFound';
diff --git a/tests/Mock/PayPal/Client/GuzzleClientMock.php b/tests/Mock/PayPal/Client/GuzzleClientMock.php
index 20b1b8502..28ef442b9 100644
--- a/tests/Mock/PayPal/Client/GuzzleClientMock.php
+++ b/tests/Mock/PayPal/Client/GuzzleClientMock.php
@@ -20,7 +20,6 @@
use Shopware\Core\Framework\Log\Package;
use Swag\PayPal\RestApi\PayPalApiStruct;
use Swag\PayPal\RestApi\V1\Api\OAuthCredentials;
-use Swag\PayPal\RestApi\V1\Api\Payment\Payer\ExecutePayerInfo;
use Swag\PayPal\RestApi\V1\RequestUriV1;
use Swag\PayPal\RestApi\V2\Api\Order;
use Swag\PayPal\RestApi\V2\Api\Order\PurchaseUnit\Payments\Refund;
@@ -30,14 +29,8 @@
use Swag\PayPal\Test\Checkout\Payment\PayPalPaymentHandlerTest;
use Swag\PayPal\Test\Helper\ConstantsForTesting;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\CaptureAuthorizationResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\CaptureOrdersResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\ClientTokenResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\CreateResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\CreateTokenResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\ExecutePaymentAuthorizeResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\ExecutePaymentOrderResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\ExecutePaymentSaleResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\ExecutePuiResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetDispute;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetDisputesList;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetPaymentAuthorizeResponseFixture;
@@ -49,10 +42,6 @@
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetResourceMerchantIntegrations;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetResourceOrderResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetResourceSaleResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\RefundCaptureResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\RefundSaleResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\VoidAuthorizationResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\VoidOrderResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V2\AuthorizeOrderAuthorization;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V2\AuthorizeOrderDenied;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V2\CaptureAuthorization;
@@ -420,27 +409,6 @@ private function handleApiV1PostRequests(string $resourceUri, ?PayPalApiStruct $
return CreateTokenResponseFixture::get();
}
- if (\mb_strpos($resourceUri, RequestUriV1::PAYMENT_RESOURCE) !== false) {
- $dataJson = $this->ensureValidJson($data);
- $dataArray = \json_decode($dataJson, true);
- if (isset($dataArray['transactions'][0]['invoice_number']) && $dataArray['transactions'][0]['invoice_number'] === ConstantsForTesting::PAYPAL_RESOURCE_THROWS_EXCEPTION_WITH_PREFIX) {
- throw new \RuntimeException('A PayPal test error occurred.');
- }
-
- if (\mb_substr($resourceUri, -8) === '/execute') {
- if (($data instanceof ExecutePayerInfo) && $data->getPayerId() === ConstantsForTesting::PAYPAL_RESOURCE_THROWS_EXCEPTION) {
- throw new \RuntimeException('A PayPal test error occurred.');
- }
- if ($data === null) {
- throw new \RuntimeException('Execute requests needs valid ExecutePayerInfo struct');
- }
-
- return $this->handlePaymentExecuteRequests($data);
- }
-
- return CreateResponseFixture::get();
- }
-
if (\mb_strpos($resourceUri, RequestUriV1::WEBHOOK_RESOURCE) !== false) {
if ($data === null) {
throw new \RuntimeException('Create webhook request needs valid Webhook struct');
@@ -449,30 +417,6 @@ private function handleApiV1PostRequests(string $resourceUri, ?PayPalApiStruct $
return $this->handleWebhookCreateRequests($data);
}
- if (\mb_strpos($resourceUri, RequestUriV1::SALE_RESOURCE) !== false && \mb_substr($resourceUri, -7) === '/refund') {
- return RefundSaleResponseFixture::get();
- }
-
- if (\mb_strpos($resourceUri, RequestUriV1::CAPTURE_RESOURCE) !== false && \mb_substr($resourceUri, -7) === '/refund') {
- return RefundCaptureResponseFixture::get();
- }
-
- if (\mb_strpos($resourceUri, RequestUriV1::AUTHORIZATION_RESOURCE) !== false && \mb_substr($resourceUri, -8) === '/capture') {
- return CaptureAuthorizationResponseFixture::get();
- }
-
- if (\mb_strpos($resourceUri, RequestUriV1::AUTHORIZATION_RESOURCE) !== false && \mb_substr($resourceUri, -5) === '/void') {
- return VoidAuthorizationResponseFixture::get();
- }
-
- if (\mb_strpos($resourceUri, RequestUriV1::ORDERS_RESOURCE) !== false && \mb_substr($resourceUri, -8) === '/capture') {
- return CaptureOrdersResponseFixture::get();
- }
-
- if (\mb_strpos($resourceUri, RequestUriV1::ORDERS_RESOURCE) !== false && \mb_substr($resourceUri, -8) === '/do-void') {
- return VoidOrderResponseFixture::get();
- }
-
if (\mb_strpos($resourceUri, RequestUriV1::CLIENT_TOKEN_RESOURCE) !== false) {
return ClientTokenResponseFixture::get();
}
@@ -586,38 +530,6 @@ private function handleApiV2PostRequests(string $resourceUri, ?PayPalApiStruct $
throw new \RuntimeException('No fixture defined for POST ' . $resourceUri);
}
- private function handlePaymentExecuteRequests(PayPalApiStruct $data): array
- {
- /** @var ExecutePayerInfo $payerInfo */
- $payerInfo = $data;
- if ($payerInfo->getPayerId() === ConstantsForTesting::PAYER_ID_PAYMENT_AUTHORIZE) {
- return ExecutePaymentAuthorizeResponseFixture::get();
- }
-
- if ($payerInfo->getPayerId() === ConstantsForTesting::PAYER_ID_PAYMENT_ORDER) {
- return ExecutePaymentOrderResponseFixture::get();
- }
-
- if ($payerInfo->getPayerId() === ConstantsForTesting::PAYER_ID_PAYMENT_PUI) {
- return ExecutePuiResponseFixture::get();
- }
-
- if (ExecutePaymentSaleResponseFixture::isDuplicateTransaction()) {
- ExecutePaymentSaleResponseFixture::setDuplicateTransaction(false);
-
- throw $this->createClientExceptionDuplicateTransaction();
- }
-
- $response = ExecutePaymentSaleResponseFixture::get();
- if ($payerInfo->getPayerId() !== PayPalPaymentHandlerTest::PAYER_ID_PAYMENT_INCOMPLETE) {
- return $response;
- }
-
- $response['transactions'][0]['related_resources'][0]['sale']['state'] = 'denied';
-
- return $response;
- }
-
/**
* @throws ClientException
*/
@@ -694,16 +606,6 @@ private function createClientExceptionWithResponse(int $errorCode = SymfonyRespo
return $this->createClientExceptionFromResponseString($jsonString, $errorCode);
}
- private function createClientExceptionDuplicateTransaction(): ClientException
- {
- $jsonString = $this->ensureValidJson([
- 'name' => 'DUPLICATE_TRANSACTION',
- 'message' => 'Duplicate invoice Id detected.',
- ]);
-
- return $this->createClientExceptionFromResponseString($jsonString, SymfonyResponse::HTTP_BAD_REQUEST);
- }
-
private function createClientExceptionDuplicateOrderNumber(): ClientException
{
$jsonString = $this->ensureValidJson([
diff --git a/tests/Mock/PayPal/Client/_fixtures/V1/CreateResponseFixture.php b/tests/Mock/PayPal/Client/_fixtures/V1/CreateResponseFixture.php
deleted file mode 100644
index 38972caa2..000000000
--- a/tests/Mock/PayPal/Client/_fixtures/V1/CreateResponseFixture.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1;
-
-use Shopware\Core\Framework\Log\Package;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class CreateResponseFixture
-{
- public const CREATE_PAYMENT_ID = 'PAYID-L4Z5SZA5FJ16145VJ547490N';
- public const CREATE_PAYMENT_APPROVAL_TOKEN = 'EC-44X706219E3526258';
- public const CREATE_PAYMENT_APPROVAL_URL = 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=' . self::CREATE_PAYMENT_APPROVAL_TOKEN;
-
- public static function get(): array
- {
- return [
- 'id' => self::CREATE_PAYMENT_ID,
- 'intent' => 'sale',
- 'state' => 'created',
- 'payer' => [
- 'payment_method' => 'paypal',
- ],
- 'application_context' => [
- 'locale' => 'en-GB',
- 'landing_page' => 'Login',
- 'brand_name' => 'Storefront',
- 'shipping_preference' => 'SET_PROVIDED_ADDRESS',
- 'user_action' => 'commit',
- ],
- 'transactions' => [
- 0 => [
- 'amount' => [
- 'total' => '970.00',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '815.13',
- 'tax' => '154.87',
- 'shipping' => '0.00',
- ],
- ],
- 'item_list' => [
- 'items' => [
- 0 => [
- 'name' => 'Test',
- 'sku' => 'SW10000',
- 'price' => '970.00',
- 'currency' => 'EUR',
- 'tax' => '0.00',
- 'quantity' => 1,
- ],
- ],
- ],
- 'related_resources' => [],
- ],
- ],
- 'create_time' => '2020-08-12T11:58:27Z',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAYID-L4Z5SZA5FJ16145VJ547490N',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- 1 => [
- 'href' => self::CREATE_PAYMENT_APPROVAL_URL,
- 'rel' => 'approval_url',
- 'method' => 'REDIRECT',
- ],
- 2 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAYID-L4Z5SZA5FJ16145VJ547490N/execute',
- 'rel' => 'execute',
- 'method' => 'POST',
- ],
- ],
- ];
- }
-}
diff --git a/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePaymentAuthorizeResponseFixture.php b/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePaymentAuthorizeResponseFixture.php
deleted file mode 100644
index ddd02adb0..000000000
--- a/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePaymentAuthorizeResponseFixture.php
+++ /dev/null
@@ -1,139 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1;
-
-use Shopware\Core\Framework\Log\Package;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class ExecutePaymentAuthorizeResponseFixture
-{
- public const AUTHORIZATION_ID = '3TG33581TT5577908';
-
- public static function get(): array
- {
- return [
- 'id' => 'PAY-2G272278LH1357142LQDIU4Q',
- 'intent' => 'authorize',
- 'state' => 'approved',
- 'cart' => '1SU34407K73133347',
- 'payer' => [
- 'payment_method' => 'paypal',
- 'status' => 'VERIFIED',
- 'payer_info' => [
- 'email' => 'test@shopware.com',
- 'first_name' => 'Test',
- 'last_name' => 'Test',
- 'payer_id' => 'BNJDKJVFBCXPJ',
- 'shipping_address' => [
- 'recipient_name' => 'Test Test',
- 'line1' => 'Ebbinghoff 10',
- 'line2' => 'Addresszusatz',
- 'city' => 'Schöppingen',
- 'state' => '',
- 'phone' => '4084217591',
- 'postal_code' => '4862',
- 'country_code' => 'AT',
- ],
- 'country_code' => 'DE',
- ],
- ],
- 'transactions' => [
- 0 => [
- 'amount' => [
- 'total' => '375.00',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '315.13',
- 'tax' => '59.87',
- 'shipping' => '0.00',
- ],
- ],
- 'payee' => [
- 'merchant_id' => 'HCKBUJL8YWQZS',
- 'email' => 'test@shopware.de',
- ],
- 'item_list' => [
- 'shipping_address' => [
- 'recipient_name' => 'Test Test',
- 'line1' => 'Ebbinghoff 10',
- 'line2' => 'Addresszusatz',
- 'city' => 'Schöppingen',
- 'state' => '',
- 'phone' => '4084217591',
- 'postal_code' => '4862',
- 'country_code' => 'AT',
- ],
- ],
- 'related_resources' => [
- 0 => [
- 'authorization' => [
- 'id' => self::AUTHORIZATION_ID,
- 'state' => 'authorized',
- 'amount' => [
- 'total' => '375.00',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '315.13',
- 'tax' => '59.87',
- 'shipping' => '0.00',
- ],
- ],
- 'payment_mode' => 'INSTANT_TRANSFER',
- 'reason_code' => 'AUTHORIZATION',
- 'protection_eligibility' => 'ELIGIBLE',
- 'protection_eligibility_type' => 'ITEM_NOT_RECEIVED_ELIGIBLE,UNAUTHORIZED_PAYMENT_ELIGIBLE',
- 'parent_payment' => 'PAY-2G272278LH1357142LQDIU4Q',
- 'valid_until' => '2019-01-02T14:09:02Z',
- 'create_time' => '2018-12-04T14:09:02Z',
- 'update_time' => '2018-12-04T14:09:02Z',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/authorization/3TG33581TT5577908',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- 1 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/authorization/3TG33581TT5577908/capture',
- 'rel' => 'capture',
- 'method' => 'POST',
- ],
- 2 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/authorization/3TG33581TT5577908/void',
- 'rel' => 'void',
- 'method' => 'POST',
- ],
- 3 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/authorization/3TG33581TT5577908/reauthorize',
- 'rel' => 'reauthorize',
- 'method' => 'POST',
- ],
- 4 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-2G272278LH1357142LQDIU4Q',
- 'rel' => 'parent_payment',
- 'method' => 'GET',
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- 'create_time' => '2018-12-04T14:09:03Z',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-2G272278LH1357142LQDIU4Q',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- ],
- ];
- }
-}
diff --git a/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePaymentOrderResponseFixture.php b/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePaymentOrderResponseFixture.php
deleted file mode 100644
index 904733403..000000000
--- a/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePaymentOrderResponseFixture.php
+++ /dev/null
@@ -1,134 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1;
-
-use Shopware\Core\Framework\Log\Package;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class ExecutePaymentOrderResponseFixture
-{
- public const ORDER_ID = 'O-7PS41727C2382141U';
-
- public static function get(): array
- {
- return [
- 'id' => 'PAY-35B10430TC590490WLQDJXTI',
- 'intent' => 'order',
- 'state' => 'approved',
- 'cart' => '1KU5881047858235H',
- 'payer' => [
- 'payment_method' => 'paypal',
- 'status' => 'VERIFIED',
- 'payer_info' => [
- 'email' => 'test@shopware.com',
- 'first_name' => 'Test',
- 'last_name' => 'Test',
- 'payer_id' => 'BNJDKJVFBCXPJ',
- 'shipping_address' => [
- 'recipient_name' => 'Test Test',
- 'line1' => 'Ebbinghoff 10',
- 'line2' => 'Addresszusatz',
- 'city' => 'Schöppingen',
- 'state' => '',
- 'phone' => '4084217591',
- 'postal_code' => '4862',
- 'country_code' => 'AT',
- ],
- 'country_code' => 'DE',
- ],
- ],
- 'transactions' => [
- 0 => [
- 'amount' => [
- 'total' => '375.00',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '315.13',
- 'tax' => '59.87',
- 'shipping' => '0.00',
- ],
- ],
- 'payee' => [
- 'merchant_id' => 'HCKBUJL8YWQZS',
- ],
- 'item_list' => [
- 'shipping_address' => [
- 'recipient_name' => 'Test Test',
- 'line1' => 'Ebbinghoff 10',
- 'line2' => 'Addresszusatz',
- 'city' => 'Schöppingen',
- 'state' => '',
- 'phone' => '4084217591',
- 'postal_code' => '4862',
- 'country_code' => 'AT',
- ],
- ],
- 'related_resources' => [
- 0 => [
- 'order' => [
- 'id' => self::ORDER_ID,
- 'create_time' => '2018-12-04T15:23:24Z',
- 'update_time' => '2018-12-04T15:23:24Z',
- 'amount' => [
- 'total' => '375.00',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '315.13',
- 'tax' => '59.87',
- 'shipping' => '0.00',
- ],
- ],
- 'state' => 'PENDING',
- 'reason_code' => 'ORDER',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/orders/O-7PS41727C2382141U',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- 1 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-35B10430TC590490WLQDJXTI',
- 'rel' => 'parent_payment',
- 'method' => 'GET',
- ],
- 2 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/orders/O-7PS41727C2382141U/do-void',
- 'rel' => 'void',
- 'method' => 'POST',
- ],
- 3 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/orders/O-7PS41727C2382141U/authorize',
- 'rel' => 'authorization',
- 'method' => 'POST',
- ],
- 4 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/orders/O-7PS41727C2382141U/capture',
- 'rel' => 'capture',
- 'method' => 'POST',
- ],
- ],
- 'parent_payment' => 'PAY-35B10430TC590490WLQDJXTI',
- ],
- ],
- ],
- ],
- ],
- 'create_time' => '2018-12-04T15:23:25Z',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-35B10430TC590490WLQDJXTI',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- ],
- ];
- }
-}
diff --git a/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePaymentSaleResponseFixture.php b/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePaymentSaleResponseFixture.php
deleted file mode 100644
index 2807b992c..000000000
--- a/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePaymentSaleResponseFixture.php
+++ /dev/null
@@ -1,145 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1;
-
-use Shopware\Core\Framework\Log\Package;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class ExecutePaymentSaleResponseFixture
-{
- public const SALE_ID = '5GB9720606957970A';
-
- private static bool $duplicateTransaction = false;
-
- public static function isDuplicateTransaction(): bool
- {
- return self::$duplicateTransaction;
- }
-
- public static function setDuplicateTransaction(bool $duplicateTransaction): void
- {
- self::$duplicateTransaction = $duplicateTransaction;
- }
-
- public static function get(): array
- {
- return [
- 'id' => 'PAY-46D69568SY211161GLP6CHGA',
- 'intent' => 'sale',
- 'state' => 'approved',
- 'cart' => '1X136001V5949163B',
- 'payer' => [
- 'payment_method' => 'paypal',
- 'status' => 'VERIFIED',
- 'payer_info' => [
- 'email' => 'test@shopware.com',
- 'first_name' => 'Test',
- 'last_name' => 'Test',
- 'payer_id' => 'BNJDKJVFBCXPJ',
- 'phone' => '605-521-1234',
- 'shipping_address' => [
- 'recipient_name' => 'Test Test',
- 'line1' => 'Ebbinghoff 10',
- 'line2' => 'Addresszusatz',
- 'city' => 'Schöppingen',
- 'state' => '',
- 'phone' => '4084217591',
- 'postal_code' => '4862',
- 'country_code' => 'AT',
- ],
- 'country_code' => 'DE',
- ],
- ],
- 'transactions' => [
- 0 => [
- 'amount' => [
- 'total' => '727.00',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '727.00',
- 'tax' => '0.00',
- 'shipping' => '0.00',
- ],
- ],
- 'payee' => [
- 'merchant_id' => 'HCKBUJL8YWQZS',
- 'email' => 'test@shopware.de',
- ],
- 'item_list' => [
- 'shipping_address' => [
- 'recipient_name' => 'Test Test',
- 'line1' => 'Ebbinghoff 10',
- 'line2' => 'Addresszusatz',
- 'city' => 'Schöppingen',
- 'state' => '',
- 'phone' => '4084217591',
- 'postal_code' => '4862',
- 'country_code' => 'AT',
- ],
- 'shipping_options' => [
- 0 => null,
- ],
- ],
- 'related_resources' => [
- 0 => [
- 'sale' => [
- 'id' => self::SALE_ID,
- 'state' => 'completed',
- 'amount' => [
- 'total' => '727.00',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '727.00',
- ],
- ],
- 'payment_mode' => 'INSTANT_TRANSFER',
- 'protection_eligibility' => 'ELIGIBLE',
- 'protection_eligibility_type' => 'ITEM_NOT_RECEIVED_ELIGIBLE,UNAUTHORIZED_PAYMENT_ELIGIBLE',
- 'transaction_fee' => [
- 'value' => '14.16',
- 'currency' => 'EUR',
- ],
- 'parent_payment' => 'PAY-46D69568SY211161GLP6CHGA',
- 'create_time' => '2018-11-26T16:47:46Z',
- 'update_time' => '2018-11-26T16:47:46Z',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/sale/5GB9720606957970A',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- 1 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/sale/5GB9720606957970A/refund',
- 'rel' => 'refund',
- 'method' => 'POST',
- ],
- 2 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-46D69568SY211161GLP6CHGA',
- 'rel' => 'parent_payment',
- 'method' => 'GET',
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- 'create_time' => '2018-11-26T16:47:47Z',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-46D69568SY211161GLP6CHGA',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- ],
- ];
- }
-}
diff --git a/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePuiResponseFixture.php b/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePuiResponseFixture.php
deleted file mode 100644
index 1ed9b03ed..000000000
--- a/tests/Mock/PayPal/Client/_fixtures/V1/ExecutePuiResponseFixture.php
+++ /dev/null
@@ -1,164 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1;
-
-use Shopware\Core\Framework\Log\Package;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class ExecutePuiResponseFixture
-{
- public static function get(): array
- {
- return [
- 'id' => 'PAYID-LUTTIRY1BG54683YB519540K',
- 'intent' => 'sale',
- 'state' => 'approved',
- 'cart' => '88817812AG3102042',
- 'payer' => [
- 'payment_method' => 'paypal',
- 'status' => 'UNVERIFIED',
- 'payer_info' => [
- 'email' => 'te@shopware.com',
- 'first_name' => 'Paul',
- 'last_name' => 'Positiv',
- 'payer_id' => 'XAA3AF5Q567EU',
- 'shipping_address' => [
- 'recipient_name' => 'Paul Positiv',
- 'line1' => 'Märchenstraße 15a',
- 'city' => 'Osnabrück',
- 'state' => '',
- 'postal_code' => '49084',
- 'country_code' => 'DE',
- ],
- 'country_code' => 'DE',
- 'billing_address' => [
- 'line1' => 'Märchenstraße 15a',
- 'line2' => '',
- 'city' => 'Osnabrück',
- 'state' => '',
- 'postal_code' => '49084',
- 'country_code' => 'DE',
- ],
- ],
- 'external_selected_funding_instrument_type' => 'PAY_UPON_INVOICE',
- ],
- 'transactions' => [
- 0 => [
- 'amount' => [
- 'total' => '936.00',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '936.00',
- 'tax' => '0.00',
- 'shipping' => '0.00',
- ],
- ],
- 'payee' => [
- 'merchant_id' => 'HCKBUJL8YWQZS',
- 'email' => 'info@shopware.de',
- ],
- 'item_list' => [
- 'shipping_address' => [
- 'recipient_name' => 'Paul Positiv',
- 'line1' => 'Märchenstraße 15a',
- 'city' => 'Osnabrück',
- 'state' => '',
- 'postal_code' => '49084',
- 'country_code' => 'DE',
- ],
- 'shipping_options' => [
- 0 => null,
- ],
- 'shipping_phone_number' => '+497888411531',
- ],
- 'related_resources' => [
- 0 => [
- 'sale' => [
- 'id' => '5W715903K9293994R',
- 'state' => 'completed',
- 'amount' => [
- 'total' => '936.00',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '936.00',
- ],
- ],
- 'payment_mode' => 'INSTANT_TRANSFER',
- 'protection_eligibility' => 'ELIGIBLE',
- 'protection_eligibility_type' => 'ITEM_NOT_RECEIVED_ELIGIBLE,UNAUTHORIZED_PAYMENT_ELIGIBLE',
- 'transaction_fee' => [
- 'value' => '18.13',
- 'currency' => 'EUR',
- ],
- 'receipt_id' => '3316134136001203',
- 'parent_payment' => 'PAYID-LUTTIRY1BG54683YB519540K',
- 'create_time' => '2019-07-11T13:07:12Z',
- 'update_time' => '2019-07-11T13:07:12Z',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/sale/5W715903K9293994R',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- 1 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/sale/5W715903K9293994R/refund',
- 'rel' => 'refund',
- 'method' => 'POST',
- ],
- 2 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAYID-LUTTIRY1BG54683YB519540K',
- 'rel' => 'parent_payment',
- 'method' => 'GET',
- ],
- 3 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAYID-LUTTIRY1BG54683YB519540K/payment-instruction',
- 'rel' => 'payment_instruction',
- 'method' => 'GET',
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- 'create_time' => '2019-07-11T13:08:10Z',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAYID-LUTTIRY1BG54683YB519540K',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- ],
- 'payment_instruction' => [
- 'reference_number' => '5W715903K9293994R',
- 'instruction_type' => 'PAY_UPON_INVOICE',
- 'recipient_banking_instruction' => [
- 'bank_name' => 'Deutsche Bank',
- 'account_holder_name' => 'PayPal Europe',
- 'international_bank_account_number' => 'DE29120700888000172131',
- 'bank_identifier_code' => 'DEUTDEDBPAL',
- ],
- 'amount' => [
- 'value' => '936.00',
- 'currency' => 'EUR',
- ],
- 'payment_due_date' => '2019-08-10',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAYID-LUTTIRY1BG54683YB519540K/payment-instruction',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- ],
- ],
- ];
- }
-}
diff --git a/tests/Mock/PayPal/Client/_fixtures/V1/RefundCaptureResponseFixture.php b/tests/Mock/PayPal/Client/_fixtures/V1/RefundCaptureResponseFixture.php
deleted file mode 100644
index 7add626cb..000000000
--- a/tests/Mock/PayPal/Client/_fixtures/V1/RefundCaptureResponseFixture.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1;
-
-use Shopware\Core\Framework\Log\Package;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class RefundCaptureResponseFixture
-{
- public const REFUND_AMOUNT = '1.00';
-
- public static function get(): array
- {
- return [
- 'id' => '53Y31239X18368210',
- 'create_time' => '2019-03-07T15:59:33Z',
- 'update_time' => '2019-03-08T09:05:23Z',
- 'state' => 'completed',
- 'amount' => [
- 'total' => self::REFUND_AMOUNT,
- 'currency' => 'EUR',
- ],
- 'refund_from_transaction_fee' => [
- 'currency' => 'EUR',
- 'value' => '0.01',
- ],
- 'total_refunded_amount' => [
- 'currency' => 'EUR',
- 'value' => '1.00',
- ],
- 'refund_from_received_amount' => [
- 'currency' => 'EUR',
- 'value' => '0.99',
- ],
- 'capture_id' => '73V284073V954772P',
- 'parent_payment' => 'PAYID-LSAT63Q0NM35123M7232615L',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/refund/53Y31239X18368210',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- 1 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAYID-LSAT63Q0NM35123M7232615L',
- 'rel' => 'parent_payment',
- 'method' => 'GET',
- ],
- 2 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/capture/73V284073V954772P',
- 'rel' => 'capture',
- 'method' => 'GET',
- ],
- ],
- ];
- }
-}
diff --git a/tests/Mock/PayPal/Client/_fixtures/V1/RefundSaleResponseFixture.php b/tests/Mock/PayPal/Client/_fixtures/V1/RefundSaleResponseFixture.php
deleted file mode 100644
index 8943549df..000000000
--- a/tests/Mock/PayPal/Client/_fixtures/V1/RefundSaleResponseFixture.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1;
-
-use Shopware\Core\Framework\Log\Package;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class RefundSaleResponseFixture
-{
- public const REFUND_AMOUNT = '12.35';
- public const TEST_REFUND_INVOICE_NUMBER = 'testRefundInvoiceNumber';
-
- public static function get(): array
- {
- return [
- 'id' => '9UJ167316W283554V',
- 'create_time' => '2018-12-06T14:16:35Z',
- 'update_time' => '2018-12-06T14:16:35Z',
- 'state' => 'completed',
- 'amount' => [
- 'total' => self::REFUND_AMOUNT,
- 'currency' => 'EUR',
- ],
- 'refund_from_transaction_fee' => [
- 'currency' => 'EUR',
- 'value' => '0.24',
- ],
- 'total_refunded_amount' => [
- 'currency' => 'EUR',
- 'value' => '24.70',
- ],
- 'refund_from_received_amount' => [
- 'currency' => 'EUR',
- 'value' => '12.11',
- ],
- 'sale_id' => '98N85671E85717541',
- 'parent_payment' => 'PAY-0MX009757T271510FLQES2MA',
- 'invoice_number' => self::TEST_REFUND_INVOICE_NUMBER,
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/refund/9UJ167316W283554V',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- 1 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-0MX009757T271510FLQES2MA',
- 'rel' => 'parent_payment',
- 'method' => 'GET',
- ],
- 2 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/sale/98N85671E85717541',
- 'rel' => 'sale',
- 'method' => 'GET',
- ],
- ],
- ];
- }
-}
diff --git a/tests/Mock/PayPal/Client/_fixtures/V1/VoidAuthorizationResponseFixture.php b/tests/Mock/PayPal/Client/_fixtures/V1/VoidAuthorizationResponseFixture.php
deleted file mode 100644
index 56f654e63..000000000
--- a/tests/Mock/PayPal/Client/_fixtures/V1/VoidAuthorizationResponseFixture.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1;
-
-use Shopware\Core\Framework\Log\Package;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class VoidAuthorizationResponseFixture
-{
- public const VOID_ID = '8JH509685U6626604';
-
- public static function get(): array
- {
- return [
- 'id' => self::VOID_ID,
- 'create_time' => '2019-03-13T09:44:34Z',
- 'update_time' => '2019-03-13T09:45:52Z',
- 'amount' => [
- 'total' => '41.85',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '37.95',
- 'shipping' => '3.90',
- ],
- ],
- 'state' => 'voided',
- 'parent_payment' => 'PAYID-LSENBSA4V0732384Y371935U',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/authorization/8JH509685U6626604',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- 1 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAYID-LSENBSA4V0732384Y371935U',
- 'rel' => 'parent_payment',
- 'method' => 'GET',
- ],
- ],
- ];
- }
-}
diff --git a/tests/Mock/PayPal/Client/_fixtures/V1/VoidOrderResponseFixture.php b/tests/Mock/PayPal/Client/_fixtures/V1/VoidOrderResponseFixture.php
deleted file mode 100644
index b19f5504f..000000000
--- a/tests/Mock/PayPal/Client/_fixtures/V1/VoidOrderResponseFixture.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1;
-
-use Shopware\Core\Framework\Log\Package;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class VoidOrderResponseFixture
-{
- public const VOID_ID = 'O-5G515550L5450231X';
-
- public static function get(): array
- {
- return [
- 'id' => self::VOID_ID,
- 'create_time' => '2019-03-12T14:29:34Z',
- 'update_time' => '2019-03-12T14:29:34Z',
- 'state' => 'voided',
- 'amount' => [
- 'total' => '21.85',
- 'currency' => 'EUR',
- 'details' => [
- 'subtotal' => '17.95',
- 'shipping' => '3.90',
- ],
- ],
- 'parent_payment' => 'PAY-5AU30554LV4708354LSD4ELY',
- 'links' => [
- 0 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/orders/O-5G515550L5450231X',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- 1 => [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-5AU30554LV4708354LSD4ELY',
- 'rel' => 'parent_payment',
- 'method' => 'GET',
- ],
- ],
- ];
- }
-}
diff --git a/tests/OpenAPISchemaTest.php b/tests/OpenAPISchemaTest.php
index 498364abd..3f45f4249 100644
--- a/tests/OpenAPISchemaTest.php
+++ b/tests/OpenAPISchemaTest.php
@@ -16,8 +16,6 @@
use OpenApi\Generator;
use PHPUnit\Framework\TestCase;
use Shopware\Core\Framework\Log\Package;
-use Swag\PayPal\Checkout\Plus\PlusPaymentFinalizeController;
-use Swag\PayPal\Checkout\Plus\PlusPaymentHandleController;
use Swag\PayPal\Checkout\SalesChannel\FilteredPaymentMethodRoute;
use Swag\PayPal\Storefront\Controller\PayPalController;
use Swag\PayPal\Webhook\Registration\WebhookSystemConfigController;
@@ -42,8 +40,6 @@ class OpenAPISchemaTest extends TestCase
'\\' . PayPalController::class . '::clearVault',
'\\' . FilteredPaymentMethodRoute::class . '::load',
- '\\' . PlusPaymentHandleController::class . '::handlePlusPayment',
- '\\' . PlusPaymentFinalizeController::class . '::finalizeTransaction',
// we don't control the routes of the system config controller
'\\' . WebhookSystemConfigController::class . '::checkConfiguration',
diff --git a/tests/PaymentsApi/Administration/PayPalPaymentControllerTest.php b/tests/PaymentsApi/Administration/PayPalPaymentControllerTest.php
index 2007adacc..3131a0652 100644
--- a/tests/PaymentsApi/Administration/PayPalPaymentControllerTest.php
+++ b/tests/PaymentsApi/Administration/PayPalPaymentControllerTest.php
@@ -28,15 +28,8 @@
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetResourceAuthorizeResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetResourceOrderResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetResourceSaleResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\RefundCaptureResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\RefundSaleResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\VoidAuthorizationResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\VoidOrderResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\PayPalClientFactoryMock;
use Swag\PayPal\Test\Mock\Repositories\OrderRepositoryMock;
-use Swag\PayPal\Util\PaymentStatusUtil;
-use Swag\PayPal\Util\PriceFormatter;
-use Symfony\Component\HttpFoundation\Request;
/**
* @internal
@@ -46,9 +39,6 @@ class PayPalPaymentControllerTest extends TestCase
{
use ServicesTrait;
- private const TEST_REFUND_CURRENCY = 'EUR';
- private const TEST_REFUND_DESCRIPTION = 'testDescription';
- private const TEST_REFUND_REASON = 'testReason';
private const KEY_TO_TEST = 'keyToTest';
private const VALUE_TO_TEST = 'valueToTest';
@@ -136,187 +126,6 @@ public function testResourceDetailsWithInvalidResourceType(): void
$this->createPaymentController()->resourceDetails($context, 'unknown', 'testResourceId', 'testOrderId')->getContent();
}
- public function testRefundPayment(): void
- {
- $request = new Request();
- $context = Context::createDefaultContext();
- $responseContent = $this->createPaymentController()->refundPayment(
- $request,
- $context,
- RelatedResource::SALE,
- 'testPaymentId',
- 'testOrderId'
- )->getContent();
- static::assertNotFalse($responseContent);
-
- $refund = \json_decode($responseContent, true);
-
- static::assertSame(RefundSaleResponseFixture::REFUND_AMOUNT, $refund['amount']['total']);
- }
-
- public function testRefundCapture(): void
- {
- $responseContent = $this->createPaymentController()->refundPayment(
- new Request(),
- Context::createDefaultContext(),
- RelatedResource::CAPTURE,
- 'testPaymentId',
- 'testOrderId'
- )->getContent();
- static::assertNotFalse($responseContent);
-
- $refund = \json_decode($responseContent, true);
-
- static::assertSame(RefundCaptureResponseFixture::REFUND_AMOUNT, $refund['amount']['total']);
- }
-
- public function testRefundPaymentWithInvoiceAndAmount(): void
- {
- $request = new Request([], [
- PayPalPaymentController::REQUEST_PARAMETER_REFUND_INVOICE_NUMBER => RefundSaleResponseFixture::TEST_REFUND_INVOICE_NUMBER,
- PayPalPaymentController::REQUEST_PARAMETER_REFUND_AMOUNT => RefundSaleResponseFixture::REFUND_AMOUNT,
- PayPalPaymentController::REQUEST_PARAMETER_CURRENCY => self::TEST_REFUND_CURRENCY,
- ]);
- $refund = $this->refundPayment($request);
-
- static::assertSame(RefundSaleResponseFixture::REFUND_AMOUNT, $refund['amount']['total']);
- static::assertSame(self::TEST_REFUND_CURRENCY, $refund['amount']['currency']);
- static::assertSame(RefundSaleResponseFixture::TEST_REFUND_INVOICE_NUMBER, $refund['invoice_number']);
- }
-
- public function testRefundPaymentWithReasonAndDescription(): void
- {
- $request = new Request([], [
- PayPalPaymentController::REQUEST_PARAMETER_REFUND_INVOICE_NUMBER => RefundSaleResponseFixture::TEST_REFUND_INVOICE_NUMBER,
- PayPalPaymentController::REQUEST_PARAMETER_REFUND_AMOUNT => RefundSaleResponseFixture::REFUND_AMOUNT,
- PayPalPaymentController::REQUEST_PARAMETER_CURRENCY => self::TEST_REFUND_CURRENCY,
- PayPalPaymentController::REQUEST_PARAMETER_DESCRIPTION => self::TEST_REFUND_DESCRIPTION,
- PayPalPaymentController::REQUEST_PARAMETER_REASON => self::TEST_REFUND_REASON,
- ]);
- $refund = $this->refundPayment($request);
-
- static::assertSame(RefundSaleResponseFixture::REFUND_AMOUNT, $refund['amount']['total']);
- static::assertSame(self::TEST_REFUND_CURRENCY, $refund['amount']['currency']);
- static::assertSame(RefundSaleResponseFixture::TEST_REFUND_INVOICE_NUMBER, $refund['invoice_number']);
- static::assertSame(self::TEST_REFUND_REASON, $refund['reason']);
- static::assertSame(self::TEST_REFUND_DESCRIPTION, $refund['description']);
- }
-
- public function testRefundPaymentWithInvalidResourceType(): void
- {
- $request = new Request();
- $context = Context::createDefaultContext();
-
- $this->expectException(RequiredParameterInvalidException::class);
- $this->expectExceptionMessage('Required parameter "resourceType" is missing or invalid');
- $this->createPaymentControllerWithSaleResourceMock()->refundPayment(
- $request,
- $context,
- 'foo',
- 'testPaymentId',
- 'testOrderId'
- );
- }
-
- public function testCapturePaymentAuthorization(): void
- {
- $request = new Request();
- $context = Context::createDefaultContext();
-
- $responseContent = $this->createPaymentController()->capturePayment(
- $request,
- $context,
- RelatedResource::AUTHORIZE,
- 'testPaymentId',
- 'testOrderId'
- )->getContent();
- static::assertNotFalse($responseContent);
-
- $capture = \json_decode($responseContent, true);
-
- static::assertTrue($capture['is_final_capture']);
- }
-
- public function testCapturePaymentOrders(): void
- {
- $request = new Request();
- $context = Context::createDefaultContext();
-
- $responseContent = $this->createPaymentController()->capturePayment(
- $request,
- $context,
- RelatedResource::ORDER,
- 'testPaymentId',
- 'testOrderId'
- )->getContent();
- static::assertNotFalse($responseContent);
-
- $capture = \json_decode($responseContent, true);
-
- static::assertTrue($capture['is_final_capture']);
- }
-
- public function testCapturePaymentWithInvalidResourceType(): void
- {
- $request = new Request();
- $context = Context::createDefaultContext();
-
- $this->expectException(RequiredParameterInvalidException::class);
- $this->expectExceptionMessage('Required parameter "resourceType" is missing or invalid');
- $this->createPaymentController()->capturePayment(
- $request,
- $context,
- RelatedResource::SALE,
- 'testPaymentId',
- 'testOrderId'
- );
- }
-
- public function testVoidPaymentOrders(): void
- {
- $context = Context::createDefaultContext();
- $responseContent = $this->createPaymentController()->voidPayment(
- $context,
- RelatedResource::ORDER,
- 'testResourceId',
- 'testOrderId'
- )->getContent();
- static::assertNotFalse($responseContent);
-
- $void = \json_decode($responseContent, true);
-
- static::assertSame(VoidOrderResponseFixture::VOID_ID, $void['id']);
- }
-
- public function testVoidPaymentAuthorize(): void
- {
- $context = Context::createDefaultContext();
- $responseContent = $this->createPaymentController()->voidPayment(
- $context,
- RelatedResource::AUTHORIZE,
- 'testResourceId',
- 'testOrderId'
- )->getContent();
- static::assertNotFalse($responseContent);
-
- $void = \json_decode($responseContent, true);
-
- static::assertSame(VoidAuthorizationResponseFixture::VOID_ID, $void['id']);
- }
-
- public function testVoidPaymentInvalidResourceType(): void
- {
- $context = Context::createDefaultContext();
- $this->expectException(RequiredParameterInvalidException::class);
- $this->expectExceptionMessage('Required parameter "resourceType" is missing or invalid');
- $this->createPaymentController()->voidPayment(
- $context,
- RelatedResource::SALE,
- 'testResourceId',
- 'testOrderId'
- );
- }
-
private function createPaymentController(): PayPalPaymentController
{
$clientFactory = new PayPalClientFactoryMock(new NullLogger());
@@ -327,40 +136,7 @@ private function createPaymentController(): PayPalPaymentController
new AuthorizationResource($clientFactory),
new OrdersResource($clientFactory),
new CaptureResource($clientFactory),
- $this->createMock(PaymentStatusUtil::class),
- new OrderRepositoryMock(),
- new PriceFormatter()
- );
- }
-
- private function refundPayment(Request $request): array
- {
- $context = Context::createDefaultContext();
- $responseContent = $this->createPaymentControllerWithSaleResourceMock()->refundPayment(
- $request,
- $context,
- RelatedResource::SALE,
- 'testPaymentId',
- 'testOrderId'
- )->getContent();
- static::assertNotFalse($responseContent);
-
- return \json_decode($responseContent, true);
- }
-
- private function createPaymentControllerWithSaleResourceMock(): PayPalPaymentController
- {
- $clientFactory = new PayPalClientFactoryMock(new NullLogger());
-
- return new PayPalPaymentController(
- new PaymentResource($clientFactory),
- new SaleResource($clientFactory),
- new AuthorizationResource($clientFactory),
- new OrdersResource($clientFactory),
- new CaptureResource($clientFactory),
- $this->createMock(PaymentStatusUtil::class),
new OrderRepositoryMock(),
- new PriceFormatter()
);
}
}
diff --git a/tests/RestApi/V1/Resource/AuthorizationResourceTest.php b/tests/RestApi/V1/Resource/AuthorizationResourceTest.php
index 8951d89c5..0bb60bb8b 100644
--- a/tests/RestApi/V1/Resource/AuthorizationResourceTest.php
+++ b/tests/RestApi/V1/Resource/AuthorizationResourceTest.php
@@ -11,10 +11,8 @@
use Psr\Log\NullLogger;
use Shopware\Core\Framework\Log\Package;
use Shopware\Core\Test\TestDefaults;
-use Swag\PayPal\RestApi\V1\Api\Capture;
use Swag\PayPal\RestApi\V1\Resource\AuthorizationResource;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetResourceAuthorizeResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\VoidAuthorizationResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\PayPalClientFactoryMock;
/**
@@ -38,35 +36,6 @@ public function testGet(): void
static::assertSame(GetResourceAuthorizeResponseFixture::ID, $authorizationArray['id']);
}
- public function testCapture(): void
- {
- $capture = new Capture();
- $captureResponse = $this->createAuthorizationResource()->capture(
- 'captureId',
- $capture,
- TestDefaults::SALES_CHANNEL
- );
-
- $capture = \json_encode($captureResponse);
- static::assertNotFalse($capture);
-
- $captureArray = \json_decode($capture, true);
-
- static::assertTrue($captureArray['is_final_capture']);
- }
-
- public function testVoid(): void
- {
- $voidResponse = $this->createAuthorizationResource()->void('voidId', TestDefaults::SALES_CHANNEL);
-
- $void = \json_encode($voidResponse);
- static::assertNotFalse($void);
-
- $voidArray = \json_decode($void, true);
-
- static::assertSame(VoidAuthorizationResponseFixture::VOID_ID, $voidArray['id']);
- }
-
private function createAuthorizationResource(): AuthorizationResource
{
return new AuthorizationResource(new PayPalClientFactoryMock(new NullLogger()));
diff --git a/tests/RestApi/V1/Resource/CaptureResourceTest.php b/tests/RestApi/V1/Resource/CaptureResourceTest.php
index d67b3a0eb..4ae5922f0 100644
--- a/tests/RestApi/V1/Resource/CaptureResourceTest.php
+++ b/tests/RestApi/V1/Resource/CaptureResourceTest.php
@@ -11,8 +11,6 @@
use Psr\Log\NullLogger;
use Shopware\Core\Framework\Log\Package;
use Shopware\Core\Test\TestDefaults;
-use Swag\PayPal\RestApi\V1\Api\Refund;
-use Swag\PayPal\RestApi\V1\PaymentStatusV1;
use Swag\PayPal\RestApi\V1\Resource\CaptureResource;
use Swag\PayPal\Test\Mock\PayPal\Client\PayPalClientFactoryMock;
@@ -37,14 +35,6 @@ public function testGet(): void
static::assertTrue($captureArray['is_final_capture']);
}
- public function testRefund(): void
- {
- $refund = new Refund();
- $refundResponse = $this->createCaptureResource()->refund('refundId', $refund, TestDefaults::SALES_CHANNEL);
-
- static::assertSame(PaymentStatusV1::PAYMENT_COMPLETED, $refundResponse->getState());
- }
-
private function createCaptureResource(): CaptureResource
{
return new CaptureResource(new PayPalClientFactoryMock(new NullLogger()));
diff --git a/tests/RestApi/V1/Resource/OrdersResourceTest.php b/tests/RestApi/V1/Resource/OrdersResourceTest.php
index d00042eb2..a25a8fcfb 100644
--- a/tests/RestApi/V1/Resource/OrdersResourceTest.php
+++ b/tests/RestApi/V1/Resource/OrdersResourceTest.php
@@ -11,10 +11,8 @@
use Psr\Log\NullLogger;
use Shopware\Core\Framework\Log\Package;
use Shopware\Core\Test\TestDefaults;
-use Swag\PayPal\RestApi\V1\Api\Capture;
use Swag\PayPal\RestApi\V1\Resource\OrdersResource;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetResourceOrderResponseFixture;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\VoidOrderResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\PayPalClientFactoryMock;
/**
@@ -38,31 +36,6 @@ public function testGet(): void
static::assertSame(GetResourceOrderResponseFixture::ID, $ordersArray['id']);
}
- public function testCapture(): void
- {
- $capture = new Capture();
- $captureResponse = $this->createOrdersResource()->capture('captureId', $capture, TestDefaults::SALES_CHANNEL);
-
- $capture = \json_encode($captureResponse);
- static::assertNotFalse($capture);
-
- $captureArray = \json_decode($capture, true);
-
- static::assertTrue($captureArray['is_final_capture']);
- }
-
- public function testVoid(): void
- {
- $voidResponse = $this->createOrdersResource()->void('voidId', TestDefaults::SALES_CHANNEL);
-
- $void = \json_encode($voidResponse);
- static::assertNotFalse($void);
-
- $voidArray = \json_decode($void, true);
-
- static::assertSame(VoidOrderResponseFixture::VOID_ID, $voidArray['id']);
- }
-
private function createOrdersResource(): OrdersResource
{
return new OrdersResource(new PayPalClientFactoryMock(new NullLogger()));
diff --git a/tests/RestApi/V1/Resource/PaymentResourceTest.php b/tests/RestApi/V1/Resource/PaymentResourceTest.php
index ba30d81ea..d66ba2ae8 100644
--- a/tests/RestApi/V1/Resource/PaymentResourceTest.php
+++ b/tests/RestApi/V1/Resource/PaymentResourceTest.php
@@ -10,15 +10,11 @@
use PHPUnit\Framework\TestCase;
use Psr\Log\NullLogger;
use Shopware\Core\Framework\Log\Package;
-use Shopware\Core\Test\Generator;
use Shopware\Core\Test\TestDefaults;
-use Swag\PayPal\RestApi\PartnerAttributionId;
use Swag\PayPal\RestApi\V1\PaymentStatusV1;
use Swag\PayPal\RestApi\V1\Resource\PaymentResource;
-use Swag\PayPal\Test\Helper\ConstantsForTesting;
use Swag\PayPal\Test\Helper\PaymentTransactionTrait;
use Swag\PayPal\Test\Helper\ServicesTrait;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\CreateResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\PayPalClientFactoryMock;
/**
@@ -38,70 +34,6 @@ class PaymentResourceTest extends TestCase
public const SALE_WITH_REFUND_PAYMENT_ID = 'testSaleWithRefundPaymentId';
private const TEST_PAYMENT_ID = 'testPaymentId';
- public function testCreate(): void
- {
- $salesChannelContext = Generator::createSalesChannelContext();
- $paymentTransaction = $this->createPaymentTransactionStruct();
- $payment = $this->createPaymentBuilder($this->createDefaultSystemConfig())->getPayment($paymentTransaction, $salesChannelContext);
- $createdPayment = $this->createPaymentResource()->create(
- $payment,
- $salesChannelContext->getSalesChannel()->getId(),
- PartnerAttributionId::PAYPAL_CLASSIC
- );
-
- static::assertSame(CreateResponseFixture::CREATE_PAYMENT_ID, $createdPayment->getId());
- $link = $createdPayment->getLinks()->getAt(1);
- static::assertSame(CreateResponseFixture::CREATE_PAYMENT_APPROVAL_URL, $link?->getHref());
- }
-
- public function testExecuteSale(): void
- {
- $executedPayment = $this->createPaymentResource()->execute(
- 'testPayerId',
- self::TEST_PAYMENT_ID,
- TestDefaults::SALES_CHANNEL
- );
-
- $transaction = $executedPayment->getTransactions()->first();
- static::assertNotNull($executedPayment->getLinks()->first());
-
- $sale = $transaction?->getRelatedResources()->first()?->getSale();
- static::assertNotNull($sale);
- static::assertSame(PaymentStatusV1::PAYMENT_COMPLETED, $sale->getState());
- }
-
- public function testExecuteAuthorize(): void
- {
- $executedPayment = $this->createPaymentResource()->execute(
- ConstantsForTesting::PAYER_ID_PAYMENT_AUTHORIZE,
- self::TEST_PAYMENT_ID,
- TestDefaults::SALES_CHANNEL
- );
-
- $transaction = $executedPayment->getTransactions()->first();
- static::assertNotNull($executedPayment->getLinks()->first());
-
- $authorization = $transaction?->getRelatedResources()->first()?->getAuthorization();
- static::assertNotNull($authorization);
- static::assertSame(PaymentStatusV1::PAYMENT_AUTHORIZED, $authorization->getState());
- }
-
- public function testExecuteOrder(): void
- {
- $executedPayment = $this->createPaymentResource()->execute(
- ConstantsForTesting::PAYER_ID_PAYMENT_ORDER,
- self::TEST_PAYMENT_ID,
- TestDefaults::SALES_CHANNEL
- );
-
- $transaction = $executedPayment->getTransactions()->first();
- static::assertNotNull($executedPayment->getLinks()->first());
-
- $order = $transaction?->getRelatedResources()->first()?->getOrder();
- static::assertNotNull($order);
- static::assertSame(PaymentStatusV1::PAYMENT_PENDING, $order->getState());
- }
-
public function testGetSale(): void
{
$payment = $this->createPaymentResource()->get(self::TEST_PAYMENT_ID, TestDefaults::SALES_CHANNEL);
diff --git a/tests/RestApi/V1/Resource/SaleResourceTest.php b/tests/RestApi/V1/Resource/SaleResourceTest.php
index 8b96663fb..a8717c68e 100644
--- a/tests/RestApi/V1/Resource/SaleResourceTest.php
+++ b/tests/RestApi/V1/Resource/SaleResourceTest.php
@@ -11,9 +11,6 @@
use Psr\Log\NullLogger;
use Shopware\Core\Framework\Log\Package;
use Shopware\Core\Test\TestDefaults;
-use Swag\PayPal\Checkout\Payment\PayPalPaymentHandler;
-use Swag\PayPal\RestApi\V1\Api\Refund;
-use Swag\PayPal\RestApi\V1\PaymentStatusV1;
use Swag\PayPal\RestApi\V1\Resource\SaleResource;
use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\GetResourceSaleResponseFixture;
use Swag\PayPal\Test\Mock\PayPal\Client\PayPalClientFactoryMock;
@@ -39,18 +36,6 @@ public function testGet(): void
static::assertSame(GetResourceSaleResponseFixture::ID, $saleArray['id']);
}
- public function testRefund(): void
- {
- $refund = new Refund();
- $refundResponse = $this->createSaleResource()->refund(
- PayPalPaymentHandler::PAYPAL_REQUEST_PARAMETER_PAYMENT_ID,
- $refund,
- TestDefaults::SALES_CHANNEL
- );
-
- static::assertSame(PaymentStatusV1::PAYMENT_COMPLETED, $refundResponse->getState());
- }
-
private function createSaleResource(): SaleResource
{
return new SaleResource(new PayPalClientFactoryMock(new NullLogger()));
diff --git a/tests/Storefront/Data/CheckoutSubscriberTest.php b/tests/Storefront/Data/CheckoutSubscriberTest.php
index 6129eca0f..ec9cf4cf1 100644
--- a/tests/Storefront/Data/CheckoutSubscriberTest.php
+++ b/tests/Storefront/Data/CheckoutSubscriberTest.php
@@ -291,7 +291,6 @@ private function createSubscriber(array $settingsOverride = []): CheckoutDataSub
Settings::CLIENT_ID => self::TEST_CLIENT_ID,
Settings::CLIENT_SECRET => 'testClientSecret',
Settings::SPB_CHECKOUT_ENABLED => true,
- Settings::MERCHANT_LOCATION => Settings::MERCHANT_LOCATION_OTHER,
Settings::SPB_SHOW_PAY_LATER => true,
], $settingsOverride));
$credentialsUtil = new CredentialsUtil($settings);
diff --git a/tests/Util/PaymentTokenExtractorTest.php b/tests/Util/PaymentTokenExtractorTest.php
deleted file mode 100644
index 4717a1f9e..000000000
--- a/tests/Util/PaymentTokenExtractorTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Swag\PayPal\Test\Util;
-
-use PHPUnit\Framework\TestCase;
-use Shopware\Core\Framework\Log\Package;
-use Swag\PayPal\RestApi\V1\Api\Payment;
-use Swag\PayPal\Test\Mock\PayPal\Client\_fixtures\V1\CreateResponseFixture;
-use Swag\PayPal\Util\PaymentTokenExtractor;
-
-/**
- * @internal
- */
-#[Package('checkout')]
-class PaymentTokenExtractorTest extends TestCase
-{
- public function testExtract(): void
- {
- $payment = new Payment();
- $payment->assign([
- 'links' => [
- [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-3A3234483P2338009KTTFX7Q',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- [
- 'href' => 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=' . CreateResponseFixture::CREATE_PAYMENT_APPROVAL_TOKEN,
- 'rel' => 'approval_url',
- 'method' => 'REDIRECT',
- ],
- [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-3A3234483P2338009KTTFX7Q/execute',
- 'rel' => 'execute',
- 'method' => 'POST',
- ],
- ],
- ]);
-
- $token = PaymentTokenExtractor::extract($payment);
- static::assertSame(CreateResponseFixture::CREATE_PAYMENT_APPROVAL_TOKEN, $token);
- }
-
- public function testExtractWithoutApprovalUrl(): void
- {
- $payment = new Payment();
- $payment->assign([
- 'links' => [
- [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-3A3234483P2338009KTTFX7Q',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-3A3234483P2338009KTTFX7Q/execute',
- 'rel' => 'execute',
- 'method' => 'POST',
- ],
- ],
- ]);
-
- $token = PaymentTokenExtractor::extract($payment);
- static::assertSame('', $token);
- }
-
- public function testExtractWithInvalidApprovalUrl(): void
- {
- $payment = new Payment();
- $payment->assign([
- 'links' => [
- [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-3A3234483P2338009KTTFX7Q',
- 'rel' => 'self',
- 'method' => 'GET',
- ],
- [
- 'href' => 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout',
- 'rel' => 'approval_url',
- 'method' => 'REDIRECT',
- ],
- [
- 'href' => 'https://api.sandbox.paypal.com/v1/payments/payment/PAY-3A3234483P2338009KTTFX7Q/execute',
- 'rel' => 'execute',
- 'method' => 'POST',
- ],
- ],
- ]);
-
- $token = PaymentTokenExtractor::extract($payment);
- static::assertSame('', $token);
- }
-}