From fbd244b15158d98bc9dad3a2bbc8eebeb1fb7743 Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Fri, 22 Jul 2016 18:47:24 +0300 Subject: [PATCH 01/21] MAGETWO-55671: Order status should be changed related to Kount Status - Updated Risk Data handler to triggering Fraud order status - Fixed incorrect payment statuses processing in authorization and sale commands --- .../Gateway/Response/RiskDataHandler.php | 9 + .../Gateway/Response/RiskDataHandlerTest.php | 118 +++++----- app/code/Magento/Braintree/etc/config.xml | 2 + app/code/Magento/Braintree/etc/di.xml | 1 + .../Order/Payment/State/AuthorizeCommand.php | 24 +- .../Order/Payment/State/CaptureCommand.php | 22 +- .../Payment/State/AuthorizeCommandTest.php | 213 ++++++++++++++++++ .../Payment/State/CaptureCommandTest.php | 211 +++++++++++++++++ app/code/Magento/Sales/i18n/en_US.csv | 8 +- .../Adminhtml/Order/PaymentReviewTest.php | 119 ++++++++++ .../Magento/Braintree/_files/fraud_order.php | 38 ++++ 11 files changed, 679 insertions(+), 86 deletions(-) create mode 100644 app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php create mode 100644 app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php diff --git a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php index 46d415c97b7c6..9f4d1cd455e3a 100644 --- a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php +++ b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php @@ -24,6 +24,11 @@ class RiskDataHandler implements HandlerInterface */ const RISK_DATA_DECISION = 'riskDataDecision'; + /** + * Risk data Review status + */ + private static $statusReview = 'Review'; + /** * @var SubjectReader */ @@ -62,5 +67,9 @@ public function handle(array $handlingSubject, array $response) $payment->setAdditionalInformation(self::RISK_DATA_ID, $transaction->riskData->id); $payment->setAdditionalInformation(self::RISK_DATA_DECISION, $transaction->riskData->decision); + + if ($transaction->riskData->decision === self::$statusReview) { + $payment->setIsFraudDetected(true); + } } } diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php index 239524e04c0e0..2baf3356a0008 100644 --- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php @@ -5,12 +5,12 @@ */ namespace Magento\Braintree\Test\Unit\Gateway\Response; -use Braintree\RiskData; use Braintree\Transaction; -use Magento\Sales\Model\Order\Payment; use Magento\Braintree\Gateway\Helper\SubjectReader; use Magento\Braintree\Gateway\Response\RiskDataHandler; use Magento\Payment\Gateway\Data\PaymentDataObjectInterface; +use Magento\Sales\Model\Order\Payment; +use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * Class RiskDataHandlerTest @@ -25,99 +25,95 @@ class RiskDataHandlerTest extends \PHPUnit_Framework_TestCase private $riskDataHandler; /** - * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject + * @var SubjectReader|MockObject */ - private $subjectReaderMock; + private $subjectReader; /** * Set up */ protected function setUp() { - $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class) + $this->subjectReader = $this->getMockBuilder(SubjectReader::class) ->disableOriginalConstructor() + ->setMethods(['readPayment', 'readTransaction']) ->getMock(); - $this->riskDataHandler = new RiskDataHandler($this->subjectReaderMock); + $this->riskDataHandler = new RiskDataHandler($this->subjectReader); } /** - * Run test for handle method + * Test for handle method + * @covers \Magento\Braintree\Gateway\Response\RiskDataHandler::handle + * @param string $riskDecision + * @param boolean $isFraud + * @dataProvider riskDataProvider */ - public function testHandle() + public function testHandle($riskDecision, $isFraud) { - $paymentData = $this->getPaymentDataObjectMock(); - $transaction = $this->getBraintreeTransactionMock(); + /** @var Payment|MockObject $payment */ + $payment = $this->getMockBuilder(Payment::class) + ->disableOriginalConstructor() + ->setMethods(['setAdditionalInformation', 'setIsFraudDetected']) + ->getMock(); + /** @var PaymentDataObjectInterface|MockObject $paymentDO */ + $paymentDO = $this->getMock(PaymentDataObjectInterface::class); + $paymentDO->expects(self::once()) + ->method('getPayment') + ->willReturn($payment); + + $transaction = Transaction::factory([ + 'riskData' => [ + 'id' => 'test-id', + 'decision' => $riskDecision + ] + ]); $response = [ 'object' => $transaction ]; $handlingSubject = [ - 'payment' =>$paymentData, + 'payment' => $paymentDO, ]; - $this->subjectReaderMock->expects(self::once()) + $this->subjectReader->expects(static::once()) ->method('readPayment') ->with($handlingSubject) - ->willReturn($paymentData); - $this->subjectReaderMock->expects(self::once()) + ->willReturn($paymentDO); + $this->subjectReader->expects(static::once()) ->method('readTransaction') ->with($response) ->willReturn($transaction); - $this->riskDataHandler->handle($handlingSubject, $response); - } - - /** - * @return \PHPUnit_Framework_MockObject_MockObject - */ - private function getBraintreeTransactionMock() - { - $transaction = \Braintree\Transaction::factory([]); - $transaction->_set( - 'riskData', - RiskData::factory( - [ - 'id' => 'test-id', - 'decision' => 'test-decision', - ] - ) - ); - - return $transaction; - } - - /** - * @return \PHPUnit_Framework_MockObject_MockObject - */ - private function getPaymentDataObjectMock() - { - $mock = $this->getMockBuilder(PaymentDataObjectInterface::class) - ->getMockForAbstractClass(); + $payment->expects(static::at(0)) + ->method('setAdditionalInformation') + ->with(RiskDataHandler::RISK_DATA_ID, 'test-id'); + $payment->expects(static::at(1)) + ->method('setAdditionalInformation') + ->with(RiskDataHandler::RISK_DATA_DECISION, $riskDecision); - $mock->expects(static::once()) - ->method('getPayment') - ->willReturn($this->getPaymentMock()); + if (!$isFraud) { + $payment->expects(static::never()) + ->method('setIsFraudDetected'); + } else { + $payment->expects(static::once()) + ->method('setIsFraudDetected') + ->with(true); + } - return $mock; + $this->riskDataHandler->handle($handlingSubject, $response); } /** - * @return \PHPUnit_Framework_MockObject_MockObject + * Get list of variations to test fraud + * @return array */ - private function getPaymentMock() + public function riskDataProvider() { - $paymentMock = $this->getMockBuilder(Payment::class) - ->disableOriginalConstructor() - ->getMock(); - - $paymentMock->expects(self::at(0)) - ->method('setAdditionalInformation') - ->with(RiskDataHandler::RISK_DATA_ID, 'test-id'); - $paymentMock->expects(self::at(1)) - ->method('setAdditionalInformation') - ->with(RiskDataHandler::RISK_DATA_DECISION, 'test-decision'); - - return $paymentMock; + return [ + ['decision' => 'Not Evaluated', 'isFraud' => false], + ['decision' => 'Approve', 'isFraud' => false], + ['decision' => 'Review', 'isFraud' => true], + ]; } } diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml index abe2eda5b4819..095a8419c8529 100644 --- a/app/code/Magento/Braintree/etc/config.xml +++ b/app/code/Magento/Braintree/etc/config.xml @@ -26,6 +26,8 @@ 1 1 1 + 1 + 1 AE,VI,MC,DI,JCB,CUP,DN,MI 1 diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml index 141ae258b2ca7..849a3039fc361 100644 --- a/app/code/Magento/Braintree/etc/di.xml +++ b/app/code/Magento/Braintree/etc/di.xml @@ -133,6 +133,7 @@ BraintreeVoidCommand BraintreeRefundCommand BraintreeVoidCommand + BraintreeVoidCommand diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php index 67291b9372421..5bef05e6f28e0 100644 --- a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php +++ b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php @@ -10,6 +10,9 @@ use Magento\Sales\Model\Order; use Magento\Sales\Model\Order\Payment; +/** + * Class AuthorizeCommand + */ class AuthorizeCommand implements CommandInterface { /** @@ -23,29 +26,22 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface $state = Order::STATE_PROCESSING; $status = false; $formattedAmount = $order->getBaseCurrency()->formatTxt($amount); + if ($payment->getIsTransactionPending()) { $state = Order::STATE_PAYMENT_REVIEW; - $message = __( - 'We will authorize %1 after the payment is approved at the payment gateway.', - $formattedAmount - ); + $message = 'We will authorize %1 after the payment is approved at the payment gateway.'; } else { - if ($payment->getIsFraudDetected()) { - $state = Order::STATE_PROCESSING; - $message = __( - 'Order is suspended as its authorizing amount %1 is suspected to be fraudulent.', - $formattedAmount - ); - } else { - $message = __('Authorized amount of %1', $formattedAmount); - } + $message = 'Authorized amount of %1.'; } + if ($payment->getIsFraudDetected()) { + $state = Order::STATE_PAYMENT_REVIEW; $status = Order::STATUS_FRAUD; + $message .= ' Order is suspended as its authorizing amount %1 is suspected to be fraudulent.'; } $this->setOrderStateAndStatus($order, $status, $state); - return $message; + return __($message, $formattedAmount); } /** diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php index 5639de4433f93..d2c7e2a7e71b3 100644 --- a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php +++ b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php @@ -9,6 +9,9 @@ use Magento\Sales\Api\Data\OrderPaymentInterface; use Magento\Sales\Model\Order as SalesOrder; +/** + * Class CaptureCommand + */ class CaptureCommand implements CommandInterface { /** @@ -24,22 +27,23 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface $state = SalesOrder::STATE_PROCESSING; $status = false; $formattedAmount = $order->getBaseCurrency()->formatTxt($amount); + if ($payment->getIsTransactionPending()) { - $message = __( - 'An amount of %1 will be captured after being approved at the payment gateway.', - $formattedAmount - ); $state = SalesOrder::STATE_PAYMENT_REVIEW; - if ($payment->getIsFraudDetected()) { - $status = SalesOrder::STATUS_FRAUD; - } + $message = 'An amount of %1 will be captured after being approved at the payment gateway.'; } else { // normal online capture: invoice is marked as "paid" - $message = __('Captured amount of %1 online', $formattedAmount); + $message = 'Captured amount of %1 online.'; + } + + if ($payment->getIsFraudDetected()) { + $state = SalesOrder::STATE_PAYMENT_REVIEW; + $status = SalesOrder::STATUS_FRAUD; + $message .= ' Order is suspended as its capturing amount %1 is suspected to be fraudulent.'; } $this->setOrderStateAndStatus($order, $status, $state); - return $message; + return __($message, $formattedAmount); } /** diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php new file mode 100644 index 0000000000000..a02b3498d2cc7 --- /dev/null +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php @@ -0,0 +1,213 @@ +currency = $this->getMockBuilder(Currency::class) + ->disableOriginalConstructor() + ->setMethods(['formatTxt']) + ->getMock(); + + $this->config = $this->getMockBuilder(Config::class) + ->disableOriginalConstructor() + ->setMethods(['getStateDefaultStatus']) + ->getMock(); + + $this->payment = $this->getMockBuilder(Payment::class) + ->disableOriginalConstructor() + ->setMethods(['getIsTransactionPending', 'getIsFraudDetected']) + ->getMock(); + $this->order = $this->getMockBuilder(Order::class) + ->disableOriginalConstructor() + ->setMethods(['getBaseCurrency', 'getConfig', 'setState', 'setStatus', '__wakeup']) + ->getMock(); + + $this->order->expects(static::once()) + ->method('getBaseCurrency') + ->willReturn($this->currency); + $this->currency->expects(static::once()) + ->method('formatTxt') + ->with($this->amount) + ->willReturn($this->amount); + + $this->command = new AuthorizeCommand(); + } + + /** + * @covers \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand::execute + */ + public function testExecute() + { + $message = __('Authorized amount of %1.', $this->amount); + + $this->payment->expects(static::once()) + ->method('getIsTransactionPending') + ->willReturn(false); + $this->payment->expects(static::once()) + ->method('getIsFraudDetected') + ->willReturn(false); + + $this->order->expects(static::once()) + ->method('getConfig') + ->willReturn($this->config); + $this->config->expects(static::once()) + ->method('getStateDefaultStatus') + ->with(Order::STATE_PROCESSING) + ->willReturn(Order::STATE_PROCESSING); + + $this->order->expects(static::once()) + ->method('setState') + ->with(Order::STATE_PROCESSING) + ->willReturnSelf(); + $this->order->expects(static::once()) + ->method('setStatus') + ->with(Order::STATE_PROCESSING); + + $actual = $this->command->execute($this->payment, $this->amount, $this->order); + static::assertEquals($message, $actual); + } + + /** + * @covers \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand::execute + */ + public function testExecutePendingTransaction() + { + $message = __('We will authorize %1 after the payment is approved at the payment gateway.', $this->amount); + + $this->payment->expects(static::once()) + ->method('getIsTransactionPending') + ->willReturn(true); + $this->payment->expects(static::once()) + ->method('getIsFraudDetected') + ->willReturn(false); + + $this->order->expects(static::once()) + ->method('getConfig') + ->willReturn($this->config); + $this->config->expects(static::once()) + ->method('getStateDefaultStatus') + ->with(Order::STATE_PAYMENT_REVIEW) + ->willReturn(Order::STATE_PAYMENT_REVIEW); + + $this->order->expects(static::once()) + ->method('setState') + ->with(Order::STATE_PAYMENT_REVIEW) + ->willReturnSelf(); + $this->order->expects(static::once()) + ->method('setStatus') + ->with(Order::STATE_PAYMENT_REVIEW); + + $actual = $this->command->execute($this->payment, $this->amount, $this->order); + static::assertEquals($message, $actual); + } + + /** + * @covers \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand::execute + */ + public function testExecutePendingTransactionFraud() + { + $expectedMessage = 'We will authorize %1 after the payment is approved at the payment gateway. '; + $expectedMessage .= 'Order is suspended as its authorizing amount %1 is suspected to be fraudulent.'; + $message = __($expectedMessage, $this->amount); + + $this->payment->expects(static::once()) + ->method('getIsTransactionPending') + ->willReturn(true); + $this->payment->expects(static::once()) + ->method('getIsFraudDetected') + ->willReturn(true); + + $this->order->expects(static::never()) + ->method('getConfig'); + + $this->order->expects(static::once()) + ->method('setState') + ->with(Order::STATE_PAYMENT_REVIEW) + ->willReturnSelf(); + $this->order->expects(static::once()) + ->method('setStatus') + ->with(Order::STATUS_FRAUD); + + $actual = $this->command->execute($this->payment, $this->amount, $this->order); + static::assertEquals($message, $actual); + } + + /** + * @covers \Magento\Sales\Model\Order\Payment\State\AuthorizeCommand::execute + */ + public function testExecuteFraud() + { + $message = __( + 'Authorized amount of %1. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.', + $this->amount + ); + + $this->payment->expects(static::once()) + ->method('getIsTransactionPending') + ->willReturn(false); + $this->payment->expects(static::once()) + ->method('getIsFraudDetected') + ->willReturn(true); + + $this->order->expects(static::never()) + ->method('getConfig'); + + $this->order->expects(static::once()) + ->method('setState') + ->with(Order::STATE_PAYMENT_REVIEW) + ->willReturnSelf(); + $this->order->expects(static::once()) + ->method('setStatus') + ->with(Order::STATUS_FRAUD); + + $actual = $this->command->execute($this->payment, $this->amount, $this->order); + static::assertEquals($message, $actual); + } +} diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php new file mode 100644 index 0000000000000..9982eeab27a14 --- /dev/null +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php @@ -0,0 +1,211 @@ +currency = $this->getMockBuilder(Currency::class) + ->disableOriginalConstructor() + ->setMethods(['formatTxt']) + ->getMock(); + + $this->config = $this->getMockBuilder(Config::class) + ->disableOriginalConstructor() + ->setMethods(['getStateDefaultStatus']) + ->getMock(); + + $this->payment = $this->getMockBuilder(Payment::class) + ->disableOriginalConstructor() + ->setMethods(['getIsTransactionPending', 'getIsFraudDetected']) + ->getMock(); + $this->order = $this->getMockBuilder(Order::class) + ->disableOriginalConstructor() + ->setMethods(['getBaseCurrency', 'getConfig', 'setState', 'setStatus', '__wakeup']) + ->getMock(); + + $this->order->expects(static::once()) + ->method('getBaseCurrency') + ->willReturn($this->currency); + $this->currency->expects(static::once()) + ->method('formatTxt') + ->with($this->amount) + ->willReturn($this->amount); + + $this->command = new CaptureCommand(); + } + + /** + * @covers \Magento\Sales\Model\Order\Payment\State\CaptureCommand::execute + */ + public function testExecute() + { + $message = __('Captured amount of %1 online.', $this->amount); + + $this->payment->expects(static::once()) + ->method('getIsTransactionPending') + ->willReturn(false); + $this->payment->expects(static::once()) + ->method('getIsFraudDetected') + ->willReturn(false); + + $this->order->expects(static::once()) + ->method('getConfig') + ->willReturn($this->config); + $this->config->expects(static::once()) + ->method('getStateDefaultStatus') + ->with(Order::STATE_PROCESSING) + ->willReturn(Order::STATE_PROCESSING); + + $this->order->expects(static::once()) + ->method('setState') + ->with(Order::STATE_PROCESSING) + ->willReturnSelf(); + $this->order->expects(static::once()) + ->method('setStatus') + ->with(Order::STATE_PROCESSING); + + $actual = $this->command->execute($this->payment, $this->amount, $this->order); + static::assertEquals($message, $actual); + } + + /** + * @covers \Magento\Sales\Model\Order\Payment\State\CaptureCommand::execute + */ + public function testExecutePendingTransaction() + { + $message = __('An amount of %1 will be captured after being approved at the payment gateway.', $this->amount); + + $this->payment->expects(static::once()) + ->method('getIsTransactionPending') + ->willReturn(true); + $this->payment->expects(static::once()) + ->method('getIsFraudDetected') + ->willReturn(false); + + $this->order->expects(static::once()) + ->method('getConfig') + ->willReturn($this->config); + $this->config->expects(static::once()) + ->method('getStateDefaultStatus') + ->with(Order::STATE_PAYMENT_REVIEW) + ->willReturn(Order::STATE_PAYMENT_REVIEW); + + $this->order->expects(static::once()) + ->method('setState') + ->with(Order::STATE_PAYMENT_REVIEW) + ->willReturnSelf(); + $this->order->expects(static::once()) + ->method('setStatus') + ->with(Order::STATE_PAYMENT_REVIEW); + + $actual = $this->command->execute($this->payment, $this->amount, $this->order); + static::assertEquals($message, $actual); + } + + /** + * @covers \Magento\Sales\Model\Order\Payment\State\CaptureCommand::execute + */ + public function testExecutePendingTransactionFraud() + { + $expectedMessage = 'An amount of %1 will be captured after being approved at the payment gateway. '; + $expectedMessage .= 'Order is suspended as its capturing amount %1 is suspected to be fraudulent.'; + $message = __($expectedMessage, $this->amount); + + $this->payment->expects(static::once()) + ->method('getIsTransactionPending') + ->willReturn(true); + $this->payment->expects(static::once()) + ->method('getIsFraudDetected') + ->willReturn(true); + + $this->order->expects(static::never()) + ->method('getConfig'); + + $this->order->expects(static::once()) + ->method('setState') + ->with(Order::STATE_PAYMENT_REVIEW) + ->willReturnSelf(); + $this->order->expects(static::once()) + ->method('setStatus') + ->with(Order::STATUS_FRAUD); + + $actual = $this->command->execute($this->payment, $this->amount, $this->order); + static::assertEquals($message, $actual); + } + + /** + * @covers \Magento\Sales\Model\Order\Payment\State\CaptureCommand::execute + */ + public function testExecuteFraud() + { + $expectedMessage = 'Captured amount of %1 online. '; + $expectedMessage .= 'Order is suspended as its capturing amount %1 is suspected to be fraudulent.'; + $message = __($expectedMessage, $this->amount); + + $this->payment->expects(static::once()) + ->method('getIsTransactionPending') + ->willReturn(false); + $this->payment->expects(static::once()) + ->method('getIsFraudDetected') + ->willReturn(true); + + $this->order->expects(static::never()) + ->method('getConfig'); + + $this->order->expects(static::once()) + ->method('setState') + ->with(Order::STATE_PAYMENT_REVIEW) + ->willReturnSelf(); + $this->order->expects(static::once()) + ->method('setStatus') + ->with(Order::STATUS_FRAUD); + + $actual = $this->command->execute($this->payment, $this->amount, $this->order); + static::assertEquals($message, $actual); + } +} diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv index 9eb38b8488025..b285a2fa33202 100644 --- a/app/code/Magento/Sales/i18n/en_US.csv +++ b/app/code/Magento/Sales/i18n/en_US.csv @@ -352,10 +352,14 @@ Mixed,Mixed "The payment disallows storing objects.","The payment disallows storing objects." "The transaction ""%1"" cannot be captured yet.","The transaction ""%1"" cannot be captured yet." "We will authorize %1 after the payment is approved at the payment gateway.","We will authorize %1 after the payment is approved at the payment gateway." +"We will authorize %1 after the payment is approved at the payment gateway. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","We will authorize %1 after the payment is approved at the payment gateway. Order is suspended as its authorizing amount %1 is suspected to be fraudulent." "Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","Order is suspended as its authorizing amount %1 is suspected to be fraudulent." -"Authorized amount of %1","Authorized amount of %1" +"Authorized amount of %1.","Authorized amount of %1." +"Authorized amount of %1. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","Authorized amount of %1. Order is suspended as its authorizing amount %1 is suspected to be fraudulent." "An amount of %1 will be captured after being approved at the payment gateway.","An amount of %1 will be captured after being approved at the payment gateway." -"Captured amount of %1 online","Captured amount of %1 online" +"An amount of %1 will be captured after being approved at the payment gateway. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","An amount of %1 will be captured after being approved at the payment gateway. Order is suspended as its authorizing amount %1 is suspected to be fraudulent." +"Captured amount of %1 online.","Captured amount of %1 online." +"Captured amount of %1 online. Order is suspended as its authorizing amount %1 is suspected to be fraudulent.","Captured amount of %1 online. Order is suspended as its authorizing amount %1 is suspected to be fraudulent." "The order amount of %1 is pending approval on the payment gateway.","The order amount of %1 is pending approval on the payment gateway." "Ordered amount of %1","Ordered amount of %1" "Registered notification about captured amount of %1.","Registered notification about captured amount of %1." diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php new file mode 100644 index 0000000000000..e361216bd1967 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php @@ -0,0 +1,119 @@ +resource = ReviewPayment::ADMIN_RESOURCE; + $this->uri = 'backend/sales/order/reviewpayment'; + $this->_getBootstrap()->loadArea(Area::AREA_ADMINHTML); + parent::setUp(); + + /** @var FilterBuilder $filterBuilder */ + $filterBuilder = $this->_objectManager->get(FilterBuilder::class); + $filters = [ + $filterBuilder->setField(OrderInterface::INCREMENT_ID) + ->setValue('100000002') + ->create() + ]; + + /** @var SearchCriteriaBuilder $searchCriteriaBuilder */ + $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class); + $searchCriteria = $searchCriteriaBuilder->addFilters($filters) + ->create(); + + $this->orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class); + $orders = $this->orderRepository->getList($searchCriteria) + ->getItems(); + /** @var OrderInterface $order */ + $this->order = array_pop($orders); + } + + /** + * @covers \Magento\Sales\Controller\Adminhtml\Order\ReviewPayment::execute + * @magentoDataFixture Magento/Braintree/_files/fraud_order.php + */ + public function testExecuteAccept() + { + $orderId = $this->order->getEntityId(); + $this->dispatch('admin/sales/order/reviewPayment/action/accept/order_id/' . $orderId); + + static::assertTrue($this->getResponse()->isRedirect()); + static::assertRedirect(static::stringContains('sales/order/view/order_id/' . $orderId)); + static::assertSessionMessages( + static::equalTo(['The payment has been accepted.']), + MessageInterface::TYPE_SUCCESS + ); + + $order = $this->orderRepository->get($orderId); + static::assertEquals(Order::STATE_PROCESSING, $order->getState()); + static::assertEquals(Order::STATE_PROCESSING, $order->getStatus()); + } + + /** + * @covers \Magento\Sales\Controller\Adminhtml\Order\ReviewPayment::execute + * @magentoDataFixture Magento/Braintree/_files/fraud_order.php + */ + public function testExecuteDeny() + { + $orderId = $this->order->getEntityId(); + $payment = $this->order->getPayment(); + + $adapter = $this->getMockBuilder(Adapter::class) + ->disableOriginalConstructor() + ->setMethods(['denyPayment']) + ->getMock(); + // uses the mock instead a real adapter to avoid api calls to Braintree gateway + $payment->setMethodInstance($adapter); + $this->orderRepository->save($this->order); + + $adapter->expects(static::once()) + ->method('denyPayment') + ->with($payment) + ->willReturn(true); + + $this->dispatch('admin/sales/order/reviewPayment/action/deny/order_id/' . $orderId); + + static::assertTrue($this->getResponse()->isRedirect()); + static::assertRedirect(static::stringContains('sales/order/view/order_id/' . $orderId)); + static::assertSessionMessages( + static::equalTo(['The payment has been denied.']), + MessageInterface::TYPE_SUCCESS + ); + + $order = $this->orderRepository->get($orderId); + static::assertEquals(Order::STATE_CANCELED, $order->getState()); + static::assertEquals(Order::STATE_CANCELED, $order->getStatus()); + } +} diff --git a/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php b/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php new file mode 100644 index 0000000000000..2e6cc3de6f9b7 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php @@ -0,0 +1,38 @@ +get(Config::class); +$config->setDataByPath('payment/' . ConfigProvider::CODE . '/active', 1); +$config->save(); + +/** @var Payment $payment */ +$payment = $objectManager->create(Payment::class); +$payment->setMethod(ConfigProvider::CODE) + ->setLastTransId('000001'); + +$amount = 100; + +/** @var Order $order */ +$order = $objectManager->create(Order::class); +$order->setIncrementId('100000002') + ->setState(Order::STATE_PAYMENT_REVIEW) + ->setStatus(Order::STATUS_FRAUD) + ->setBaseGrandTotal($amount) + ->setPayment($payment); + +/** @var OrderRepositoryInterface $orderRepository */ +$orderRepository = $objectManager->get(OrderRepositoryInterface::class); +$orderRepository->save($order); \ No newline at end of file From 3d58c50b37d6ee9b8a7dd633d4790f4d82a53850 Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Fri, 22 Jul 2016 19:55:00 +0300 Subject: [PATCH 02/21] MAGETWO-55671: Order status should be changed related to Kount Status - Fixed failed tests --- .../Controller/Adminhtml/Order/PaymentReviewTest.php | 8 ++------ .../testsuite/Magento/Braintree/_files/fraud_order.php | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php index e361216bd1967..22d42ce1d9aa3 100644 --- a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php +++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php @@ -8,15 +8,13 @@ use Magento\Framework\Api\FilterBuilder; use Magento\Framework\Api\SearchCriteriaBuilder; use Magento\Framework\App\Area; +use Magento\Framework\Message\MessageInterface; +use Magento\Payment\Model\Method\Adapter; use Magento\Sales\Api\Data\OrderInterface; use Magento\Sales\Api\OrderRepositoryInterface; use Magento\Sales\Controller\Adminhtml\Order\ReviewPayment; use Magento\Sales\Model\Order; use Magento\TestFramework\TestCase\AbstractBackendController; -use Magento\Framework\Message\MessageInterface; -use Braintree\Configuration; -use Magento\Payment\Model\Method\Adapter; -use Magento\Payment\Gateway\Command\CommandPoolInterface; /** * Class PaymentReviewTest @@ -69,7 +67,6 @@ public function testExecuteAccept() $orderId = $this->order->getEntityId(); $this->dispatch('admin/sales/order/reviewPayment/action/accept/order_id/' . $orderId); - static::assertTrue($this->getResponse()->isRedirect()); static::assertRedirect(static::stringContains('sales/order/view/order_id/' . $orderId)); static::assertSessionMessages( static::equalTo(['The payment has been accepted.']), @@ -105,7 +102,6 @@ public function testExecuteDeny() $this->dispatch('admin/sales/order/reviewPayment/action/deny/order_id/' . $orderId); - static::assertTrue($this->getResponse()->isRedirect()); static::assertRedirect(static::stringContains('sales/order/view/order_id/' . $orderId)); static::assertSessionMessages( static::equalTo(['The payment has been denied.']), diff --git a/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php b/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php index 2e6cc3de6f9b7..ebbce2682ce45 100644 --- a/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php +++ b/dev/tests/integration/testsuite/Magento/Braintree/_files/fraud_order.php @@ -35,4 +35,4 @@ /** @var OrderRepositoryInterface $orderRepository */ $orderRepository = $objectManager->get(OrderRepositoryInterface::class); -$orderRepository->save($order); \ No newline at end of file +$orderRepository->save($order); From 329813d3d780155a5360d112a0d6c664daa71267 Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Tue, 26 Jul 2016 18:12:41 +0300 Subject: [PATCH 03/21] MAGETWO-55671: Order status should be changed related to Kount Status - Fixed incorrect path for URLs --- .../Controller/Adminhtml/Order/PaymentReviewTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php index 22d42ce1d9aa3..d274784c1c8f7 100644 --- a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php +++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php @@ -65,7 +65,7 @@ protected function setUp() public function testExecuteAccept() { $orderId = $this->order->getEntityId(); - $this->dispatch('admin/sales/order/reviewPayment/action/accept/order_id/' . $orderId); + $this->dispatch('backend/sales/order/reviewPayment/action/accept/order_id/' . $orderId); static::assertRedirect(static::stringContains('sales/order/view/order_id/' . $orderId)); static::assertSessionMessages( @@ -100,7 +100,7 @@ public function testExecuteDeny() ->with($payment) ->willReturn(true); - $this->dispatch('admin/sales/order/reviewPayment/action/deny/order_id/' . $orderId); + $this->dispatch('backend/sales/order/reviewPayment/action/deny/order_id/' . $orderId); static::assertRedirect(static::stringContains('sales/order/view/order_id/' . $orderId)); static::assertSessionMessages( From e0893e74763223298b108346f7d6309b7e44f643 Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Wed, 27 Jul 2016 15:10:46 +0300 Subject: [PATCH 04/21] MAGETWO-55671: Order status should be changed related to Kount Status - Removed unnecessary __wakeup method --- app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php | 1 + .../Unit/Model/Order/Payment/State/AuthorizeCommandTest.php | 2 +- .../Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php index 9f4d1cd455e3a..6cadf252e7a3b 100644 --- a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php +++ b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php @@ -68,6 +68,7 @@ public function handle(array $handlingSubject, array $response) $payment->setAdditionalInformation(self::RISK_DATA_ID, $transaction->riskData->id); $payment->setAdditionalInformation(self::RISK_DATA_DECISION, $transaction->riskData->decision); + // mark payment as fraud if ($transaction->riskData->decision === self::$statusReview) { $payment->setIsFraudDetected(true); } diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php index a02b3498d2cc7..ae75fcb8ee2b0 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/AuthorizeCommandTest.php @@ -66,7 +66,7 @@ protected function setUp() ->getMock(); $this->order = $this->getMockBuilder(Order::class) ->disableOriginalConstructor() - ->setMethods(['getBaseCurrency', 'getConfig', 'setState', 'setStatus', '__wakeup']) + ->setMethods(['getBaseCurrency', 'getConfig', 'setState', 'setStatus']) ->getMock(); $this->order->expects(static::once()) diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php index 9982eeab27a14..50ddfe7132564 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/CaptureCommandTest.php @@ -65,7 +65,7 @@ protected function setUp() ->getMock(); $this->order = $this->getMockBuilder(Order::class) ->disableOriginalConstructor() - ->setMethods(['getBaseCurrency', 'getConfig', 'setState', 'setStatus', '__wakeup']) + ->setMethods(['getBaseCurrency', 'getConfig', 'setState', 'setStatus']) ->getMock(); $this->order->expects(static::once()) From 832e91d8a51f0026bfc527aff5a51d4ced2eaf72 Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Wed, 27 Jul 2016 17:01:51 +0300 Subject: [PATCH 05/21] MAGETWO-55674: Create functional tests for Review Kount status - Added functional tests to cover `Accept`/`Deny` actions for Braintree payment --- .../Braintree/Test/Repository/ConfigData.xml | 8 ++ .../OnePageCheckoutAcceptPaymentTest.php | 29 +++++++ .../OnePageCheckoutAcceptPaymentTest.xml | 28 +++++++ .../OnePageCheckoutDenyPaymentTest.php | 29 +++++++ .../OnePageCheckoutDenyPaymentTest.xml | 28 +++++++ .../Test/TestStep/AcceptPaymentStep.php | 49 +++++++++++ .../ChangeOrderStatusToPaymentReviewStep.php | 81 +++++++++++++++++++ .../CreateBraintreeCreditMemoStep.php | 4 +- .../Test/TestStep/DenyPaymentStep.php | 49 +++++++++++ .../Magento/Braintree/Test/etc/testcase.xml | 30 +++++++ .../Test/Block/Adminhtml/Order/Actions.php | 39 +++++++++ ...tAcceptPaymentMessageInCommentsHistory.php | 44 ++++++++++ ...sertAcceptPaymentSuccessMessagePresent.php | 42 ++++++++++ ...ertDenyPaymentMessageInCommentsHistory.php | 43 ++++++++++ ...AssertDenyPaymentSuccessMessagePresent.php | 42 ++++++++++ 15 files changed, 542 insertions(+), 3 deletions(-) create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/AcceptPaymentStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/DenyPaymentStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php create mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php create mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php create mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml index fc54b91cfeed8..49b33f796dea4 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml @@ -221,5 +221,13 @@ 0 + + + payment + 1 + Yes + 1 + + diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php new file mode 100644 index 0000000000000..8e1ca26a1f4ea --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php @@ -0,0 +1,29 @@ +executeScenario(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml new file mode 100644 index 0000000000000..87a00cd166e4e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml @@ -0,0 +1,28 @@ + + + + + + catalogProductSimple::product_10_dollar + default + US_address_1_without_email + login + Flat Rate + Fixed + braintree + credit_card_braintree + visa_braintree + braintree,braintree_fraudprotection + Processing + test_type:3rd_party_test + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php new file mode 100644 index 0000000000000..b32f12fb6ca55 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php @@ -0,0 +1,29 @@ +executeScenario(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml new file mode 100644 index 0000000000000..c35f7c1bfdf9f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml @@ -0,0 +1,28 @@ + + + + + + catalogProductSimple::product_10_dollar + default + US_address_1_without_email + login + Flat Rate + Fixed + braintree + credit_card_braintree + visa_braintree + braintree,braintree_fraudprotection + Canceled + test_type:3rd_party_test + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/AcceptPaymentStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/AcceptPaymentStep.php new file mode 100644 index 0000000000000..6565652f604cb --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/AcceptPaymentStep.php @@ -0,0 +1,49 @@ +orderIndex = $orderIndex; + $this->salesOrderView = $salesOrderView; + $this->order = $order; + } + + /** + * @inheritdoc + */ + public function run() + { + $this->orderIndex->open(); + $this->orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $this->order->getId()]); + $this->salesOrderView->getPageActions()->accept(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php new file mode 100644 index 0000000000000..c7d8d7ff37623 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php @@ -0,0 +1,81 @@ +orderId = $orderId; + $this->webApi = $webApi; + } + + /** + * @inheritdoc + */ + public function run() + { + $order = $this->getOrder($this->orderId); + $order['state'] = 'payment_review'; + $order['status'] = 'fraud'; + $this->saveOrder($order); + } + + /** + * Get order by increment id + * @param string $incrementId + * @return array + */ + private function getOrder($incrementId) + { + $url = $_ENV['app_frontend_url'] . 'rest/V1/orders/'; + $url .= '?searchCriteria[filterGroups][0][filters][0][field]=increment_id'; + $url .= '&searchCriteria[filterGroups][0][filters][0][value]=' . $incrementId; + $this->webApi->write($url, [], WebapiDecorator::GET); + $response = json_decode($this->webApi->read(), true); + $this->webApi->close(); + return $response['items'][0]; + } + + /** + * Update order entity + * @param array $order + * @throws \Exception + */ + private function saveOrder(array $order) + { + $url = $_ENV['app_frontend_url'] . 'rest/V1/orders'; + // web api doesn't allow to save payment additional information + unset($order['payment']['additional_information']); + $this->webApi->write($url, ['entity' => $order], WebapiDecorator::POST); + $response = json_decode($this->webApi->read(), true); + $this->webApi->close(); + if (empty($response['entity_id'])) { + throw new \Exception('Couldn\'t update order details'); + } + } +} diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php index 61455ceaac4fd..085fc142a3373 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CreateBraintreeCreditMemoStep.php @@ -6,15 +6,13 @@ namespace Magento\Braintree\Test\TestStep; -use Magento\Config\Test\Fixture\ConfigData; use Magento\Mtf\ObjectManager; +use Magento\Mtf\TestStep\TestStepInterface; use Magento\Sales\Test\Fixture\OrderInjectable; use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew; use Magento\Sales\Test\Page\Adminhtml\OrderIndex; use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceView; use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; -use Magento\Mtf\TestStep\TestStepInterface; -use Braintree\Gateway; /** * Create credit memo for order placed via Braintree credit card payment method. diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/DenyPaymentStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/DenyPaymentStep.php new file mode 100644 index 0000000000000..13dc942be95d3 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/DenyPaymentStep.php @@ -0,0 +1,49 @@ +orderIndex = $orderIndex; + $this->salesOrderView = $salesOrderView; + $this->order = $order; + } + + /** + * @inheritdoc + */ + public function run() + { + $this->orderIndex->open(); + $this->orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $this->order->getId()]); + $this->salesOrderView->getPageActions()->deny(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml index c74204270ee65..33be28b2630ac 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml @@ -130,4 +130,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php index e8a912080d5a5..d9640bffe24ae 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php @@ -8,6 +8,7 @@ use Magento\Mtf\Block\Block; use Magento\Mtf\Client\Locator; +use Magento\Ui\Test\Block\Adminhtml\Modal; /** * Order actions block. @@ -119,6 +120,18 @@ class Actions extends Block */ protected $confirmModal = '.confirm._show[data-role=modal]'; + /** + * 'Accept' payment button + * @var string + */ + private $acceptPayment = '#accept_payment'; + + /** + * 'Deny' payment button + * @var string + */ + private $denyPayment = '#deny_payment'; + /** * Ship order. * @@ -263,4 +276,30 @@ public function isActionButtonVisible($buttonName) { return $this->_rootElement->find(sprintf($this->button, $buttonName), Locator::SELECTOR_XPATH)->isVisible(); } + + /** + * Accept order + * @return void + */ + public function accept() + { + $this->_rootElement->find($this->acceptPayment)->click(); + $element = $this->browser->find($this->confirmModal); + /** @var Modal $modal */ + $modal = $this->blockFactory->create(Modal::class, ['element' => $element]); + $modal->acceptAlert(); + } + + /** + * Deny order + * @return void + */ + public function deny() + { + $this->_rootElement->find($this->denyPayment)->click(); + $element = $this->browser->find($this->confirmModal); + /** @var Modal $modal */ + $modal = $this->blockFactory->create(Modal::class, ['element' => $element]); + $modal->acceptAlert(); + } } diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php new file mode 100644 index 0000000000000..918764a242570 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php @@ -0,0 +1,44 @@ +open(); + $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]); + $history = $orderView->getOrderHistoryBlock()->getCommentsHistory(); + + \PHPUnit_Framework_Assert::assertContains(self::$message, $history); + } + + /** + * @inheritdoc + */ + public function toString() + { + return 'Message about approved payment is available in Comments History section.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php new file mode 100644 index 0000000000000..40f4e3051af0c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php @@ -0,0 +1,42 @@ +getMessagesBlock()->getSuccessMessage() + ); + } + + /** + * @inheritdoc + */ + public function toString() + { + return 'Success accept payment message is present.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php new file mode 100644 index 0000000000000..a4f724d17cb56 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php @@ -0,0 +1,43 @@ +open(); + $orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]); + $history = $orderView->getOrderHistoryBlock()->getCommentsHistory(); + + \PHPUnit_Framework_Assert::assertContains(self::$message, $history); + } + + /** + * @inheritdoc + */ + public function toString() + { + return 'Message about denied payment is available in Comments History section.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php new file mode 100644 index 0000000000000..4776970fd9d32 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php @@ -0,0 +1,42 @@ +getMessagesBlock()->getSuccessMessage() + ); + } + + /** + * @inheritdoc + */ + public function toString() + { + return 'Success deny payment message is present.'; + } +} From 0abe857067a0bcc4ea52639c335f3304008cea86 Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Wed, 27 Jul 2016 17:19:20 +0300 Subject: [PATCH 06/21] MAGETWO-55674: Create functional tests for Review Kount status - Reduced count of class properties --- .../Test/Block/Adminhtml/Order/Actions.php | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php index d9640bffe24ae..b1f4fb2220066 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php @@ -120,18 +120,6 @@ class Actions extends Block */ protected $confirmModal = '.confirm._show[data-role=modal]'; - /** - * 'Accept' payment button - * @var string - */ - private $acceptPayment = '#accept_payment'; - - /** - * 'Deny' payment button - * @var string - */ - private $denyPayment = '#deny_payment'; - /** * Ship order. * @@ -283,7 +271,8 @@ public function isActionButtonVisible($buttonName) */ public function accept() { - $this->_rootElement->find($this->acceptPayment)->click(); + $acceptPayment = '#accept_payment'; + $this->_rootElement->find($acceptPayment)->click(); $element = $this->browser->find($this->confirmModal); /** @var Modal $modal */ $modal = $this->blockFactory->create(Modal::class, ['element' => $element]); @@ -296,7 +285,8 @@ public function accept() */ public function deny() { - $this->_rootElement->find($this->denyPayment)->click(); + $denyPayment = '#deny_payment'; + $this->_rootElement->find($denyPayment)->click(); $element = $this->browser->find($this->confirmModal); /** @var Modal $modal */ $modal = $this->blockFactory->create(Modal::class, ['element' => $element]); From 29c962b8eadba476f1b80052cadc078deefe09b0 Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Thu, 28 Jul 2016 10:33:02 +0300 Subject: [PATCH 07/21] MAGETWO-55674: Create functional tests for Review Kount status - Added configuration rollback fixture --- .../app/Magento/Braintree/Test/Repository/ConfigData.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml index 49b33f796dea4..7f01e4f46106c 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml @@ -229,5 +229,13 @@ 1 + + + payment + 1 + No + 0 + + From 29860c467ca6df0003dac997e2c738588e60f30a Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Thu, 28 Jul 2016 14:37:10 +0300 Subject: [PATCH 08/21] MAGETWO-55674: Create functional tests for Review Kount status - Updated class descriptions - Updated variations config data --- .../Test/TestCase/OnePageCheckoutAcceptPaymentTest.php | 5 ++++- .../Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml | 4 ++-- .../Test/TestCase/OnePageCheckoutDenyPaymentTest.php | 4 +++- .../Test/TestCase/OnePageCheckoutDenyPaymentTest.xml | 4 ++-- .../Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php | 3 +++ .../AssertAcceptPaymentMessageInCommentsHistory.php | 2 ++ .../Constraint/AssertAcceptPaymentSuccessMessagePresent.php | 3 +++ .../Constraint/AssertDenyPaymentMessageInCommentsHistory.php | 2 ++ .../Constraint/AssertDenyPaymentSuccessMessagePresent.php | 3 +++ 9 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php index 8e1ca26a1f4ea..41f637d52941d 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php @@ -9,6 +9,10 @@ /** * Class OnePageCheckoutAcceptPaymentTest + * + * This scenario places order via Braintree payment with + * enabled Advanced Fraud protection and accept payment for placed order + * to future processing */ class OnePageCheckoutAcceptPaymentTest extends Scenario { @@ -19,7 +23,6 @@ class OnePageCheckoutAcceptPaymentTest extends Scenario /** * Runs one page checkout test. - * * @return void */ public function test() diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml index 87a00cd166e4e..9b3e1d318bce1 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml @@ -10,8 +10,8 @@ catalogProductSimple::product_10_dollar default - US_address_1_without_email - login + US_address_1 + guest Flat Rate Fixed braintree diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php index b32f12fb6ca55..69fd4a8323eca 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.php @@ -9,6 +9,9 @@ /** * Class OnePageCheckoutDenyPaymentTest + * + * This scenario places order via Braintree payment with + * enabled Advanced Fraud protection and deny payment for placed order */ class OnePageCheckoutDenyPaymentTest extends Scenario { @@ -19,7 +22,6 @@ class OnePageCheckoutDenyPaymentTest extends Scenario /** * Runs one page checkout test. - * * @return void */ public function test() diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml index c35f7c1bfdf9f..dd6b360cc604a 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml @@ -10,8 +10,8 @@ catalogProductSimple::product_10_dollar default - US_address_1_without_email - login + US_address_1 + guest Flat Rate Fixed braintree diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php index c7d8d7ff37623..346a7e8e7e4f4 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/ChangeOrderStatusToPaymentReviewStep.php @@ -10,6 +10,9 @@ /** * Class ChangeOrderStatusToPaymentReviewStep + * + * This step changes order status via WEB API to "Payment Review", because Kount service always + * return "Review" status for sandbox transactions. */ class ChangeOrderStatusToPaymentReviewStep implements TestStepInterface { diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php index 918764a242570..1871a12ee2ce4 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentMessageInCommentsHistory.php @@ -11,6 +11,8 @@ /** * Class AssertAcceptPaymentMessageInCommentsHistory + * + * Constraint checks accept payment message in order comments history */ class AssertAcceptPaymentMessageInCommentsHistory extends AbstractConstraint { diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php index 40f4e3051af0c..fefc148b8bd03 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAcceptPaymentSuccessMessagePresent.php @@ -10,6 +10,9 @@ /** * Class AssertAcceptPaymentSuccessMessagePresent + * + * Constraint checks success message on the order page + * after accepting order payment */ class AssertAcceptPaymentSuccessMessagePresent extends AbstractConstraint { diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php index a4f724d17cb56..87cac1c38232b 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentMessageInCommentsHistory.php @@ -11,6 +11,8 @@ /** * Class AssertDenyPaymentMessageInCommentsHistory + * + * Constraint checks deny payment message in order comments history */ class AssertDenyPaymentMessageInCommentsHistory extends AbstractConstraint { diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php index 4776970fd9d32..b6dbfdf1a6702 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertDenyPaymentSuccessMessagePresent.php @@ -10,6 +10,9 @@ /** * Class AssertDenyPaymentSuccessMessagePresent + * + * Constraint checks success message on the order page + * after denying order payment */ class AssertDenyPaymentSuccessMessagePresent extends AbstractConstraint { From 369ad85dd779f44f3a98f47da9e726d763a524ce Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Fri, 29 Jul 2016 13:20:20 +0300 Subject: [PATCH 09/21] MAGETWO-55674: Create functional tests for Review Kount status - Updated fixtures --- .../Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml | 2 +- .../Test/TestCase/OnePageCheckoutDenyPaymentTest.xml | 2 +- .../tests/app/Magento/Braintree/Test/etc/testcase.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml index 9b3e1d318bce1..a982dd7313120 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml @@ -8,7 +8,7 @@ - catalogProductSimple::product_10_dollar + catalogProductSimple::product_10_dollar default US_address_1 guest diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml index dd6b360cc604a..8f8706a447c82 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml @@ -8,7 +8,7 @@ - catalogProductSimple::product_10_dollar + catalogProductSimple::product_10_dollar default US_address_1 guest diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml index 33be28b2630ac..5b1283c1fda28 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml @@ -132,7 +132,7 @@ - + @@ -147,7 +147,7 @@ - + From 2333c368c49de6dfe788420826d580cc00f3f6a4 Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Fri, 29 Jul 2016 13:26:42 +0300 Subject: [PATCH 10/21] MAGETWO-55674: Create functional tests for Review Kount status - Updated steps --- .../tests/app/Magento/Braintree/Test/etc/testcase.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml index 5b1283c1fda28..36c763b77b3de 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml @@ -131,7 +131,7 @@ - + @@ -146,7 +146,7 @@ - + From e408d480fd21aea946b03ca19a47ac3897fabba8 Mon Sep 17 00:00:00 2001 From: Roman Liukshyn Date: Fri, 29 Jul 2016 18:55:36 +0300 Subject: [PATCH 11/21] MAGETWO-55674: Create functional tests for Review Kount status - Fixes for functional tests --- .../OnePageCheckoutAcceptPaymentTest.xml | 4 +- .../OnePageCheckoutDenyPaymentTest.xml | 4 +- .../Magento/Braintree/Test/etc/testcase.xml | 50 +++++++++---------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml index a982dd7313120..f42054b4a0732 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml @@ -8,7 +8,9 @@ - catalogProductSimple::product_10_dollar + + catalogProductSimple::product_10_dollar + default US_address_1 guest diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml index 8f8706a447c82..45476abfdfd12 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDenyPaymentTest.xml @@ -8,7 +8,9 @@ - catalogProductSimple::product_10_dollar + + catalogProductSimple::product_10_dollar + default US_address_1 guest diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml index 36c763b77b3de..34f4be6493838 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/etc/testcase.xml @@ -131,33 +131,31 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + From 14b0d3084cada9117ed03251818a49596c9e4a5d Mon Sep 17 00:00:00 2001 From: Dmytro Yushkin Date: Mon, 1 Aug 2016 18:21:06 +0300 Subject: [PATCH 12/21] MAGETWO-55676: PayPal Payments Configuration UX/links update --- .../Braintree/etc/adminhtml/system.xml | 21 +- .../Braintree/view/adminhtml/web/styles.css | 5 +- .../Adminhtml/System/Config/Fieldset/Hint.php | 36 ++- .../System/Config/Fieldset/Payment.php | 29 +++ .../Paypal/Model/Config/StructurePlugin.php | 92 +++++-- .../System/Config/Fieldset/HintTest.php | 74 ++++++ .../Unit/Model/Config/StructurePluginTest.php | 26 +- .../Magento/Paypal/etc/adminhtml/system.xml | 244 ++++++++++-------- .../etc/adminhtml/system/express_checkout.xml | 7 +- .../etc/adminhtml/system/payflow_advanced.xml | 11 +- .../etc/adminhtml/system/payflow_link.xml | 11 +- .../system/payments_pro_hosted_solution.xml | 8 +- ..._hosted_solution_with_express_checkout.xml | 4 +- .../adminhtml/system/paypal_payflowpro.xml | 9 +- ...aypal_payflowpro_with_express_checkout.xml | 2 +- app/code/Magento/Paypal/etc/system_file.xsd | 24 ++ .../system/config/fieldset/hint.phtml | 20 -- .../adminhtml/web/images/AM_mc_vs_dc_ae.jpg | Bin 0 -> 13435 bytes .../adminhtml/web/images/pp-logo-200px.png | Bin 0 -> 6454 bytes .../adminhtml/web/images/pp-payflow-mark.png | Bin 0 -> 26788 bytes .../Paypal/view/adminhtml/web/styles.css | 17 ++ .../Reader/_files/expected/config.xml | 52 ++-- 22 files changed, 482 insertions(+), 210 deletions(-) create mode 100644 app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php create mode 100644 app/code/Magento/Paypal/etc/system_file.xsd create mode 100644 app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg create mode 100644 app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png create mode 100644 app/code/Magento/Paypal/view/adminhtml/web/images/pp-payflow-mark.png diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml index 28f4455b0d28c..4c5d339df9629 100644 --- a/app/code/Magento/Braintree/etc/adminhtml/system.xml +++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml @@ -5,20 +5,16 @@ * See COPYING.txt for license details. */ --> - +
- - - - 1 - complex braintree-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - - + + + + No setup or monthly fees and your customers never leave your store to complete the purchase.]]> + complex braintree-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment payment/braintree/active - https://articles.braintreepayments.com/guides/magento/configuration Magento\Config\Model\Config\Source\Yesno @@ -43,8 +39,11 @@ + + http://docs.magento.com/m2/ce/user_guide/payment/braintree.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + - Click here to login to your existing Braintree account. Or to setup a new account and accept payments on your website, click here to signup for a Braintree account.

Powered by Braintree v.zero with Hosted Fields latest technology. Hosted Fields are small, transparent iframes that replace the sensitive credit card inputs in your checkout flow - helping you meet the latest data security requirements while ensuring your customization doesn't suffer. Find out more.]]> 1 Magento\Config\Block\System\Config\Form\Fieldset diff --git a/app/code/Magento/Braintree/view/adminhtml/web/styles.css b/app/code/Magento/Braintree/view/adminhtml/web/styles.css index c0d8822e779d4..31f48cd0b28df 100644 --- a/app/code/Magento/Braintree/view/adminhtml/web/styles.css +++ b/app/code/Magento/Braintree/view/adminhtml/web/styles.css @@ -3,5 +3,6 @@ * See COPYING.txt for license details. */ -.braintree-section .entry-edit-head > .config-heading .heading strong {padding-left:150px;background:url(images/braintree_logo.png) no-repeat 0 0 / 145px auto;line-height:36px;} -.braintree-section .entry-edit-head > .config-heading:before {background: url("images/braintree_allinone.png") no-repeat 0 0 / 100% auto;content: "";display: inline;float: right;height: 35px;width: 280px;} +.braintree-section .heading {display: inline-block; background: url("images/braintree_logo.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;} +.braintree-section .button-container {display: inline-block; float: right;} +.braintree-section .config-alt {background: url("images/braintree_allinone.png") no-repeat scroll 0 0 / 100% auto; height: 28px; margin: 0.5rem 0 0; width: 230px;} \ No newline at end of file diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php index 0a3de4115b24a..d1fb33e902f85 100644 --- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php +++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php @@ -3,34 +3,42 @@ * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ - -// @codingStandardsIgnoreFile - namespace Magento\Paypal\Block\Adminhtml\System\Config\Fieldset; +use Magento\Backend\Block\Template; +use Magento\Framework\Data\Form\Element\AbstractElement; +use Magento\Framework\Data\Form\Element\Renderer\RendererInterface; + /** - * Renderer for PayPal banner in System Configuration - * @author Magento Core Team + * Class Hint adds "Configuration Details" link to payment configuration. + * `` node must be defined in `` node and contain some link. */ -class Hint extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface +class Hint extends Template implements RendererInterface { /** * @var string + * @deprecated */ protected $_template = 'Magento_Paypal::system/config/fieldset/hint.phtml'; /** - * Render fieldset html - * - * @param \Magento\Framework\Data\Form\Element\AbstractElement $element + * @param AbstractElement $element * @return string */ - public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element) + public function render(AbstractElement $element) { - $elementOriginalData = $element->getOriginalData(); - if (isset($elementOriginalData['help_link'])) { - $this->setHelpLink($elementOriginalData['help_link']); + $html = ''; + + if ($element->getComment()) { + $html .= sprintf('', $element->getHtmlId()); + $html .= '

'; + $html .= sprintf( + 'Configuration Details', + $element->getComment() + ); + $html .= '

'; } - return $this->toHtml(); + + return $html; } } diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php index d49403f94ebe1..4c423dbae528e 100644 --- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php +++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php @@ -87,6 +87,7 @@ protected function _getHeaderTitleHtml($element) if ($element->getComment()) { $html .= '' . $element->getComment() . ''; } + $html .= '
'; $html .= ''; $disabledAttributeString = $this->_isPaymentEnabled($element) ? '' : ' disabled="disabled"'; @@ -149,4 +150,32 @@ protected function _isCollapseState($element) { return false; } + + /** + * @param \Magento\Framework\Data\Form\Element\AbstractElement $element + * @return string + */ + protected function _getExtraJs($element) + { + $script = "require(['jquery', 'prototype'], function(jQuery){ + window.paypalToggleSolution = function (id, url) { + var doScroll = false; + Fieldset.toggleCollapse(id, url); + if ($(this).hasClassName(\"open\")) { + $$(\".with-button button.button\").each(function(anotherButton) { + if (anotherButton != this && $(anotherButton).hasClassName(\"open\")) { + $(anotherButton).click(); + doScroll = true; + } + }.bind(this)); + } + if (doScroll) { + var pos = Element.cumulativeOffset($(this)); + window.scrollTo(pos[0], pos[1] - 45); + } + } + });"; + + return $this->_jsHelper->getScript($script); + } } diff --git a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php index 2767e438d50c0..ad451de7f9b95 100644 --- a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php +++ b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php @@ -5,6 +5,12 @@ */ namespace Magento\Paypal\Model\Config; +use Magento\Config\Model\Config\ScopeDefiner; +use Magento\Config\Model\Config\Structure; +use Magento\Config\Model\Config\Structure\Element\Section; +use Magento\Config\Model\Config\Structure\ElementInterface; +use Magento\Paypal\Helper\Backend as BackendHelper; + class StructurePlugin { /** @@ -13,12 +19,12 @@ class StructurePlugin const REQUEST_PARAM_COUNTRY = 'paypal_country'; /** - * @var \Magento\Paypal\Helper\Backend + * @var BackendHelper */ protected $_helper; /** - * @var \Magento\Config\Model\Config\ScopeDefiner + * @var ScopeDefiner */ protected $_scopeDefiner; @@ -40,12 +46,12 @@ class StructurePlugin ]; /** - * @param \Magento\Config\Model\Config\ScopeDefiner $scopeDefiner - * @param \Magento\Paypal\Helper\Backend $helper + * @param ScopeDefiner $scopeDefiner + * @param BackendHelper $helper */ public function __construct( - \Magento\Config\Model\Config\ScopeDefiner $scopeDefiner, - \Magento\Paypal\Helper\Backend $helper + ScopeDefiner $scopeDefiner, + BackendHelper $helper ) { $this->_scopeDefiner = $scopeDefiner; $this->_helper = $helper; @@ -69,14 +75,14 @@ public static function getPaypalConfigCountries($addOther = false) /** * Substitute payment section with PayPal configs * - * @param \Magento\Config\Model\Config\Structure $subject + * @param Structure $subject * @param \Closure $proceed * @param array $pathParts - * @return \Magento\Config\Model\Config\Structure\ElementInterface + * @return ElementInterface * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function aroundGetElementByPathParts( - \Magento\Config\Model\Config\Structure $subject, + Structure $subject, \Closure $proceed, array $pathParts ) { @@ -89,16 +95,72 @@ public function aroundGetElementByPathParts( $pathParts[0] = 'payment_other'; } } - /** @var \Magento\Config\Model\Config\Structure\ElementInterface $result */ + /** @var ElementInterface $result */ $result = $proceed($pathParts); if ($isSectionChanged && isset($result)) { - if ($result instanceof \Magento\Config\Model\Config\Structure\Element\Section) { - $result->setData(array_merge( - $result->getData(), - ['showInDefault' => true, 'showInWebsite' => true, 'showInStore' => true] - ), $this->_scopeDefiner->getScope()); + if ($result instanceof Section) { + $this->restructurePayments($result); + $result->setData( + array_merge( + $result->getData(), + ['showInDefault' => true, 'showInWebsite' => true, 'showInStore' => true] + ), $this->_scopeDefiner->getScope() + ); } } return $result; } + + /** + * @param Section $result + * @return void + */ + private function restructurePayments(Section $result) + { + $sectionMap = [ + 'account' => [], + 'recommended_solutions' => [], + 'other_paypal_payment_solutions' => [], + 'other_payment_methods' => [] + ]; + + $configuration = $result->getData(); + + foreach ($configuration['children'] as $section => $data) { + if (array_key_exists($section, $sectionMap)) { + $sectionMap[$section] = $data; + } elseif ($displayIn = $this->getDisplayInSection($section, $data)) { + $sectionMap[$displayIn['parent']]['children'][$displayIn['section']] = $displayIn['data']; + } else { + $sectionMap['other_payment_methods']['children'][$section] = $data; + } + } + + $configuration['children'] = $sectionMap; + $result->setData($configuration, $this->_scopeDefiner->getScope()); + } + + /** + * @param string $section + * @param array $data + * @return array|null + */ + private function getDisplayInSection($section, $data) + { + if (is_array($data) && array_key_exists('displayIn', $data)) { + return [ + 'parent' => $data['displayIn'], + 'section' => $section, + 'data' => $data + ]; + } + + if (array_key_exists('children', $data)) { + foreach ($data['children'] as $childSection => $childData) { + return $this->getDisplayInSection($childSection, $childData); + } + } + + return null; + } } diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php new file mode 100644 index 0000000000000..944a134f088e4 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php @@ -0,0 +1,74 @@ +element = $this->getMockBuilder(AbstractElement::class) + ->setMethods(['getComment', 'getHtmlId']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $this->block = $om->getObject(Hint::class); + } + + /** + * @covers Hint::render + */ + public function testRender() + { + $expected = '

'; + $expected .= 'Configuration Details'; + $expected .= '

'; + + $this->element->expects(static::exactly(2)) + ->method('getComment') + ->willReturn('http://test.com'); + + $this->element->expects(static::once()) + ->method('getHtmlId') + ->willReturn('payment'); + + static::assertSame($expected, $this->block->render($this->element)); + } + + /** + * @covers Hint::render + */ + public function testRenderEmptyComment() + { + $this->element->expects(static::once()) + ->method('getComment') + ->willReturn(''); + + $this->element->expects(static::never()) + ->method('getHtmlId'); + + static::assertSame('', $this->block->render($this->element)); + } +} diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php index 4e1c6c8955ba8..4479f0a123351 100644 --- a/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php @@ -136,15 +136,31 @@ public function testAroundGetSectionByPathParts($pathParts, $countryCode, $expec $getElementByPathParts = function ($pathParts) use ($self, $expectedPathParts, $result) { $self->assertEquals($expectedPathParts, $pathParts); $scope = 'any scope'; - $self->_scopeDefiner->expects($self->once()) + $sectionMap = [ + 'account' => [], + 'recommended_solutions' => [], + 'other_paypal_payment_solutions' => [], + 'other_payment_methods' => [] + ]; + $self->_scopeDefiner->expects($self->any()) ->method('getScope') ->will($self->returnValue($scope)); - $result->expects($self->once()) + $result->expects($self->at(0)) ->method('getData') - ->will($self->returnValue([])); - $result->expects($self->once()) + ->will($self->returnValue(['children' => []])); + $result->expects($self->at(2)) + ->method('getData') + ->will($self->returnValue(['children' => $sectionMap])); + $result->expects($self->at(1)) + ->method('setData') + ->with(['children' => $sectionMap], $scope) + ->will($self->returnSelf()); + $result->expects($self->at(3)) ->method('setData') - ->with(['showInDefault' => true, 'showInWebsite' => true, 'showInStore' => true], $scope) + ->with(['children' => $sectionMap, + 'showInDefault' => true, + 'showInWebsite' => true, + 'showInStore' => true], $scope) ->will($self->returnSelf()); return $result; }; diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml index 4fdee80a457bc..9b085ac2b0ca9 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml @@ -5,13 +5,9 @@ * See COPYING.txt for license details. */ --> - +
- - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded @@ -24,6 +20,21 @@ paypal/general/merchant_country + + + paypal-top-section paypal-recommended-header + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + + + + paypal-top-section paypal-other-header + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + + + + paypal-top-section payments-other-header + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded +
@@ -38,21 +49,31 @@
-
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group +
+ + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment + Add another payment method to your existing solution or as a stand-alone option. + https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + 0 + payment/paypal_express/active + payment/payflow_express/active + + + + + complex paypal-other-section paypal-all-in-one-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Choose a secure bundled payment solution for your business. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - + payment/paypal_payment_pro/active - https://www.paypal.com/us/webapps/mpp/paypal-payments-pro?partner_id=NB9WWHYEMVUMS + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html + 0 @@ -70,6 +91,9 @@ Accept credit card and PayPal payments securely. payment/wps_express/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html + @@ -88,42 +112,37 @@ - - - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Process payments using your own internet merchant account. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + + + complex paypal-other-section paypal-gateways-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Add another payment method to your existing solution or as a stand-alone option. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - - 0 - payment/paypal_express/active - payment/payflow_express/active - -
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group + + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment + Add another payment method to your existing solution or as a stand-alone option. + https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + + + + + + + + + complex paypal-other-section paypal-all-in-one-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Choose a secure bundled payment solution for your business. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup pp-general-uk - https://www.paypal-business.co.uk/process-online-payments-with-paypal/index.htm http://www.youtube.com/watch?v=LBe-TW87eGI&list=PLF18B1094ABCD7CE8&index=1&feature=plpp_video Accept payments with a completely customizable checkout page. @@ -137,6 +156,9 @@ Accept credit card and PayPal payments securely. payment/wps_express/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html + @@ -155,31 +177,15 @@ - - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Add another payment method to your existing solution or as a stand-alone option. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - - - - - - -
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Add another payment method to your existing solution or as a stand-alone option. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - + + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment + Add another payment method to your existing solution or as a stand-alone option. + https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup @@ -194,17 +200,33 @@
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Add another payment method to your existing solution or as a stand-alone option. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - + + + + + + + + complex paypal-other-section paypal-all-in-one-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + Choose a secure bundled payment solution for your business. + https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + + complex + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Accept credit card and PayPal payments securely. payment/wps_express/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html + @@ -222,21 +244,33 @@ - - - - - - + + + + complex paypal-other-section paypal-gateways-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + Process payments using your own internet merchant account. + https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content
- + + payment/paypal_express/active + payment/payflow_express/active + + - + + + complex paypal-other-section paypal-gateways-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + + payment/paypal_payment_pro/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html + @@ -254,76 +288,76 @@ - - + + - - payment/paypal_express/active - payment/payflow_express/active -
- - - + + + + + + -
- + + -
- + + -
- + + -
- + + -
- + + -
- - - - + + + + + +
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml index 8972bcbc5def5..c7da1959ec257 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml @@ -9,10 +9,13 @@ Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - pp-method-express + paypal-other-section Add PayPal as an additional payment method to your checkout page. payment/paypal_express/active - https://www.paypal.com/webapps/mpp/referral/paypal-express-checkout?partner_id=NB9WWHYEMVUMS + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml index fdb3d0e08df73..a99ce1df4521c 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml @@ -7,12 +7,15 @@ --> - - pp-method-general + + paypal-other-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - https://www.paypal.com/webapps/mpp/referral/paypal-payments-advanced?partner_id=NB9WWHYEMVUMS - Accept payments with a PCI-compliant checkout that keeps customers on your site. + Includes Express Checkout)]]> payment/payflow_advanced/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml index f6f2829b11424..45d7d1c488273 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml @@ -7,12 +7,15 @@ --> - + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - pp-method-payflow - Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. + paypal-other-section + Includes Express Checkout)]]> payment/payflow_link/active - https://www.paypal.com/webapps/mpp/referral/paypal-payflow-link?partner_id=NB9WWHYEMVUMS + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml index 2f92c17c142aa..b4768736e17c3 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml @@ -8,11 +8,15 @@ - pp-method-general + paypal-other-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment payment/hosted_pro/active - Accept payments with a PCI compliant checkout that keeps customers on your site. + Includes Express Checkout)]]> 1 + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml index 570d09201ff1e..d86212ed34e8c 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml @@ -7,9 +7,7 @@ --> - - pp-general-uk - https://cms.paypal.com/cms_content/GB/en_GB/files/developer/HostedSolution.pdf + 0 diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml index 2150d5dcb392b..85640d113cf70 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml @@ -9,11 +9,14 @@ Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - pp-method-payflow - Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. + paypal-other-section + Includes Express Checkout)]]> payment/payflowpro/active - https://www.paypal.com/webapps/mpp/payflow-payment-gateway?partner_id=NB9WWHYEMVUMS 1 + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml index d347ecd9c532a..3e8b6d0ef47ca 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml @@ -7,7 +7,7 @@ --> - + 0 diff --git a/app/code/Magento/Paypal/etc/system_file.xsd b/app/code/Magento/Paypal/etc/system_file.xsd new file mode 100644 index 0000000000000..f1eb8799b8fd0 --- /dev/null +++ b/app/code/Magento/Paypal/etc/system_file.xsd @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml index 0258bcc0f4e2d..148d8f8a4c3fc 100644 --- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml +++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml @@ -23,23 +23,3 @@ if ($helpLink): - diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg b/app/code/Magento/Paypal/view/adminhtml/web/images/AM_mc_vs_dc_ae.jpg new file mode 100644 index 0000000000000000000000000000000000000000..962e7d36b6c16ac8ccf0def20b0578baca8aa7cc GIT binary patch literal 13435 zcmeHscU03&_h;z62?)}wAT5MW0BHh((t8s^2!s+6Na%tfO+*2aCPf6Kg(AHdMT$yC zI?|hT1OY|L#_~Mx`~3E|=j@)d``5nnot(KdbLW=N+?&jNb1`u-51`f2)Yb&x;R67U zxCd~tK#723Feoq(=z$i4I3gWjVo)Rk=m$XoL1N-SfTFS=3IcV5VYnP%&MqEGJiAS8 zJX|i0N<8M$y5hPhbr{^`W`GyWI6%(?8sG+%cjQsN&ZX!F_Cuf$Fbsst58>{C2Ky=T z{1Ohv(LaZQJY2t6Fm6gbsz0@IS?C&YsUy8$T+(9FqEK;=1Q$pQBqc8+E+N7tf$IW6 z;e0_bzd?m$@Ud}*}yu3V6TmmQ| zA&TP=Mf-bTAbz4AXx_gh+<>8>UM?t%3(|w@r$mSY(i@}1gERD(2aeFcrJ}sO+<(b* zgaTpiFa*p4gT|o+`svhfUI^lE=AR}wLi~TB>IgynMD;H=1Bkx?#9fK!CkqPVkAk@W z;&OnXVL%@c50@hp?1c0}KyX&LARx{#peqXI{A(D2baZiYf#G%m2aS}dxV)&ilnF=@ zEF}e&ln|4Vl@S$}1&iYp;WUELE&(tl9+0?%xXkYX1Gqoh1qyNZb#cVNT|8Vopl}#k ziAVI8X+KxM{4ib+DCWPHFD@o4i&Ob;^5GB=ZhJv8a?%n`G7u?=H;RCz<(aUu5$MJ1j;Hfy@L!~XJJ$3R2t zkKtZOXD=8U?c#%T$RCFOr#o<%i!&VK;^ByL`RUB>NnLGS4U9hu$NvuqaZdha!mn|h z`+pXwxnR&Jm>0^$4~E+s390{H$N!Ake*yJxBYtl(7>$8oym4BLk=|ZVm?{e8h4g_r z@^Jk%{cBhc=?F7`VBktTKq%4!gNrNR&ye}ebHl~i1p{$cMWbQ3a6_XYUKoh>&#*uP zwcL>o5cfYFgd4^g=#F$o0#$YG5KucGw4Ec=4gwQ%Md5b_u{~+-H5d#0ZI>0<|CskkE#o%HaAYuSVVvuM!62&DcCJvBO)7B;A2mCCwBkYeR z;{cU}>mg*RTi?`zFSY=5H@u;4{s24xA&x;2cVF27T>W)l064zJjo=Xg7zqi8$*BMU za$f*|t_uKQEe8MuK3z-$!U4pDgoH$d#6(2IWW=}+1t~ExDFr1tIR!a6B`xKzLQ6?a zLrX(VNl(wfKu^!c%F4>d`FFu1At9lnq++I}WoBWdV`TYz;(wR8Xa~@d0zB}P3GnCu z_;h##ba)pXfNh*R_yl-(csK|C6nr8ALSj4;Qry@-Cvc2}ctpgsI8O-(@QDa<>wYcy zDS?iVi1rda7f762f`M4YfJe%nQI(gEpAN^1M?g$LL_|XLFJ5lYB~`<09tlEPh-c`N zH){72=p`$LjB+aXywuSQT;eJQ3%o@34(-FnmjD1lLSlS^zih*yOvg>jWdIUau~#*O zpzu8}@zCS+@TJOlsJ>|=?Lg>a!y|S zOXx338ph085&w@tn)m>}Z$CEA$d)(P5Ubq^gF}w>d7}?CS`kU(PSv>1amp%>Fl>;Wgv=;Jo`8{^fM(1$~y(^9KVWvIpO+?nczzN2P1fovuP7;Ej2jQ(h;$l z(yY~-qOkemZx&i5J{*mfc^f`tv-vUo`l&f|zqhv4;}sbDwbJ=|P3%VB6$~PmGTY7r zK>_b(ZKC8TZ4J5}0sutMU%iO~O;6(F9L=fs_WenLf|yqJ!D*nPA>$A9J||@1>?7kS zi|6=^X7ff#8$Ya}-0S?H=jc_HTRz%-oC`UWBfD0-$?ev^OxW)=ad5O>IpL5ZT@p7~ zVZDC=FqWNBRH~5c*<4e+02IxHS3?Q{ny0U1qiMibwvWr4KPwIt*_u6WI20*n%Y6l| z@Qq(dmipW{P_TCPnA3lKa&0Ju_}p$}e@)IL%j{8QE>C_8dTg%p z#LS+XTN+$M|4dUnBK#jFb!O$MyY9=rldXngTj@62V^7i6cB^7J?;Oy? zhh)6MXcyo3glk)s)M*Asj4;2=s32?W7U>tlCpN1h<@$bg;p#L*okxMZv9WKCXrZh9 zZ`e1pww1pE-TR8~Egw&44u6a;{y%<-wx)8v7C+L+z|LNNOHOGIgmTEGR!r2FB#(_$ z%XwA+04GI3pa2b>Y!jgf11zIjp((lR!0e|f>wEW7bo-rb+UolRoDM{F`&Vr&z4rwK zW=^9E*Q%&wCVO*tOqUa+4sK_9f)jQ=^WF=H)jV{#nrv+@^h?Swfw=~GUpv>4NPzEm z^Yu=SZL8rWXEx8rVp~h~uqw8m!=MdpKoWx)&DR0{1B;%(C`XaBP50L8%T}wNBDhWA&bj3w-D-$_3Du$YrZ^YBh{_oFnot=7vMOUWOEGn$WjgM}H1 z4yQc^clTd?tnR*Ut&JML4ey#`>VBLVVy(kJ4~Lenx*i>rJZ_`5v>_fp)1a2v=hcI? zP$0~>@H_(F`$G{awc$7TlQ*n=96jsAnQl0|f9s3z4j!9=?GvMYnK)%8a#{9f%WqIKaqs_-tV3n@P{CM3Ce4!D`S@A3O}9l$LzcknQx998xyu5xtA22 z0W2IQvt?aa_8jV`qJCE8IOaP_^d|fQ024YN4rse3oZxyeP^q_Z^c1`5%@1|_3HsWIcO%2Y58#@s;_04OR0yr4>`f@(s-f-__C_?y`Hye$OJkFkHz_+K zYsk_b!*)NuQzUMw>Kv=E|5&IW*2qG=HH)pwV1r)Ijc57+vj)>NlxJ?B>`_yYU|9KmnkOoRK+ z*JBICbbTsyRAa5u3YTXNhZ`SA@9H8*zVkfr)k8QYC>4L1aaZOnO;CDY`rFc-WqpRV1ngTAie8Qd@ombczY{Fv=S>p1A#^!wTF5?w1eJXmH#;}baRi}St zPczilHpyG?Ca-Rzi%p-+e3?pv*j% zpOD+9(rsB2`R*0p^`l&;ua60{(SS?c`=2q0T#{dG^9cX;(mDCa%0DTbQKppjO0M3$ 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 CE?n{e literal 0 HcmV?d00001 diff --git a/app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png b/app/code/Magento/Paypal/view/adminhtml/web/images/pp-logo-200px.png new file mode 100644 index 0000000000000000000000000000000000000000..780c84f6c563dc322932985cd46e363b90b7fe5e GIT binary patch literal 6454 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

Gf0buWGpcg4!IGor#*DeFC+by;z_ia_;y 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 BsptRz literal 0 HcmV?d00001 diff --git a/app/code/Magento/Paypal/view/adminhtml/web/styles.css b/app/code/Magento/Paypal/view/adminhtml/web/styles.css index d97033bd388d2..511623e1f596c 100644 --- a/app/code/Magento/Paypal/view/adminhtml/web/styles.css +++ b/app/code/Magento/Paypal/view/adminhtml/web/styles.css @@ -14,3 +14,20 @@ .payflow-settings-notice { border:1px solid #d1d0ce;padding:0 10px;margin: 0;} .payflow-settings-notice .important-label {color:#f00;} .payflow-settings-notice ul.options-list {list-style:disc;padding:0 2em;} +.paypal-express-section .heading {display: inline-block; background: url("images/pp-logo-200px.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;} +.paypal-express-section .button-container {display: inline-block; float: right;} +.paypal-express-section .config-alt {background: url("images/pp-alt.png") no-repeat; height: 26px; margin: 0.5rem 0 0; width: 158px;} +.paypal-express-section .link-more {margin-left: 5px;} +.paypal-other-section .heading {display: inline-block;} +.paypal-other-section .button-container {display: inline-block; float: right; margin: 1rem 0 0 !important;} +.paypal-other-section > .entry-edit-head > a::before {left: auto !important; right: 1.3rem !important;} +.paypal-all-in-one-section > .entry-edit-head {background: url("images/AM_mc_vs_dc_ae.jpg") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;} +.paypal-gateways-section > .entry-edit-head {background: url("images/pp-payflow-mark.png") no-repeat scroll 0 50% / 18rem auto; padding-left: 18rem;} +.paypal-top-section > .entry-edit-head.admin__collapsible-block {border-bottom: 0;} +.paypal-top-section.active > .entry-edit-head.admin__collapsible-block {border-bottom: 1px solid #ccc;} +.paypal-top-section > .admin__collapsible-block > a {font-size: 1.4rem; font-weight: normal; text-transform: uppercase;} +.paypal-recommended-header > .admin__collapsible-block > a::before {content: "" !important;} +.paypal-other-header > .admin__collapsible-block > a.open::before {content: "\25B2" !important;} +.paypal-other-header > .admin__collapsible-block > a::before {color: #000; content: "\25BC" !important; font-size: 1rem; top: 2.2rem;} +.paypal-other-header > .admin__collapsible-block > a {color: #007bdb !important; text-align: right;} +.payments-other-header > .admin__collapsible-block > a::before {content: "" !important;} \ No newline at end of file diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml index 61d9f6f2a475c..e4187754b44da 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml +++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml @@ -29,11 +29,14 @@ Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - pp-method-payflow - Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. + paypal-other-section + Includes Express Checkout)]]> payment/payflowpro/active - https://www.paypal.com/webapps/mpp/payflow-payment-gateway?partner_id=NB9WWHYEMVUMS 1 + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded @@ -234,12 +237,15 @@ - + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - pp-method-payflow - Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. + paypal-other-section + Includes Express Checkout)]]> payment/payflow_link/active - https://www.paypal.com/webapps/mpp/referral/paypal-payflow-link?partner_id=NB9WWHYEMVUMS + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded @@ -562,10 +568,13 @@ Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - pp-method-express + paypal-other-section Add PayPal as an additional payment method to your checkout page. payment/paypal_express/active - https://www.paypal.com/webapps/mpp/referral/paypal-express-checkout?partner_id=NB9WWHYEMVUMS + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded @@ -1200,11 +1209,15 @@ - pp-method-general + paypal-other-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment payment/hosted_pro/active - Accept payments with a PCI compliant checkout that keeps customers on your site. + Includes Express Checkout)]]> 1 + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded @@ -1421,12 +1434,15 @@ Choose a secure bundled payment solution for your business. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - - pp-method-general + + paypal-other-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - https://www.paypal.com/webapps/mpp/referral/paypal-payments-advanced?partner_id=NB9WWHYEMVUMS - Accept payments with a PCI-compliant checkout that keeps customers on your site. + Includes Express Checkout)]]> payment/payflow_advanced/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded @@ -1777,7 +1793,7 @@ Process payments using your own internet merchant account. https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - + 0 @@ -2039,9 +2055,7 @@ - - pp-general-uk - https://cms.paypal.com/cms_content/GB/en_GB/files/developer/HostedSolution.pdf + 0 From e44cf989222094d8b44b06c95ea5658ff0914ae7 Mon Sep 17 00:00:00 2001 From: Dmytro Yushkin Date: Tue, 2 Aug 2016 16:19:56 +0300 Subject: [PATCH 13/21] MAGETWO-55676: PayPal Payments Configuration UX/links update - Use 'attribute' element instead of attribute - Fixed by code style test --- .../Braintree/etc/adminhtml/system.xml | 5 ++-- .../System/Config/Fieldset/Payment.php | 1 + .../Paypal/Model/Config/StructurePlugin.php | 10 +++---- .../Magento/Paypal/etc/adminhtml/system.xml | 29 ++++++++++++------- app/code/Magento/Paypal/etc/system_file.xsd | 24 --------------- 5 files changed, 27 insertions(+), 42 deletions(-) delete mode 100644 app/code/Magento/Paypal/etc/system_file.xsd diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml index 4c5d339df9629..9c11a4a06e971 100644 --- a/app/code/Magento/Braintree/etc/adminhtml/system.xml +++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml @@ -5,16 +5,17 @@ * See COPYING.txt for license details. */ --> - +

- + No setup or monthly fees and your customers never leave your store to complete the purchase.]]> complex braintree-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment payment/braintree/active + recommended_solutions Magento\Config\Model\Config\Source\Yesno diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php index 4c423dbae528e..4abe12cbc3715 100644 --- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php +++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php @@ -154,6 +154,7 @@ protected function _isCollapseState($element) /** * @param \Magento\Framework\Data\Form\Element\AbstractElement $element * @return string + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ protected function _getExtraJs($element) { diff --git a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php index ad451de7f9b95..768802fa1b0b6 100644 --- a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php +++ b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php @@ -100,12 +100,10 @@ public function aroundGetElementByPathParts( if ($isSectionChanged && isset($result)) { if ($result instanceof Section) { $this->restructurePayments($result); - $result->setData( - array_merge( - $result->getData(), - ['showInDefault' => true, 'showInWebsite' => true, 'showInStore' => true] - ), $this->_scopeDefiner->getScope() - ); + $result->setData(array_merge( + $result->getData(), + ['showInDefault' => true, 'showInWebsite' => true, 'showInStore' => true] + ), $this->_scopeDefiner->getScope()); } } return $result; diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml index 9b085ac2b0ca9..666c7064c735a 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - +
@@ -51,7 +51,7 @@
- + complex paypal-express-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment @@ -60,13 +60,15 @@ 0 payment/paypal_express/active payment/payflow_express/active + recommended_solutions - + ]]> complex paypal-other-section paypal-all-in-one-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Choose a secure bundled payment solution for your business. + other_paypal_payment_solutions @@ -112,22 +114,24 @@ - + complex paypal-other-section paypal-gateways-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + other_paypal_payment_solutions
- + complex paypal-express-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Add another payment method to your existing solution or as a stand-alone option. https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + recommended_solutions @@ -135,12 +139,13 @@ - + complex paypal-other-section paypal-all-in-one-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Choose a secure bundled payment solution for your business. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + other_paypal_payment_solutions pp-general-uk http://www.youtube.com/watch?v=LBe-TW87eGI&list=PLF18B1094ABCD7CE8&index=1&feature=plpp_video @@ -180,12 +185,13 @@
- + complex paypal-express-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Add another payment method to your existing solution or as a stand-alone option. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + recommended_solutions @@ -200,24 +206,26 @@
- + complex paypal-express-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Add another payment method to your existing solution or as a stand-alone option. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + recommended_solutions - + complex paypal-other-section paypal-all-in-one-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Choose a secure bundled payment solution for your business. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + other_paypal_payment_solutions complex @@ -245,12 +253,13 @@ - + complex paypal-other-section paypal-gateways-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Process payments using your own internet merchant account. https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + other_paypal_payment_solutions
diff --git a/app/code/Magento/Paypal/etc/system_file.xsd b/app/code/Magento/Paypal/etc/system_file.xsd deleted file mode 100644 index f1eb8799b8fd0..0000000000000 --- a/app/code/Magento/Paypal/etc/system_file.xsd +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file From c01f70b28883723e7c2405351e8198508a248db4 Mon Sep 17 00:00:00 2001 From: Dmytro Yushkin Date: Tue, 2 Aug 2016 17:35:07 +0300 Subject: [PATCH 14/21] MAGETWO-55676: PayPal Payments Configuration UX/links update - Fixed unit test annotation --- .../Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php index 944a134f088e4..5d639afb9c346 100644 --- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php @@ -38,7 +38,7 @@ protected function setUp() } /** - * @covers Hint::render + * @covers \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint::render */ public function testRender() { @@ -58,7 +58,7 @@ public function testRender() } /** - * @covers Hint::render + * @covers \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint::render */ public function testRenderEmptyComment() { From 9a9b821dccb8eb5939bd71bef5fd6fff2b8d8f08 Mon Sep 17 00:00:00 2001 From: Dmytro Yushkin Date: Wed, 3 Aug 2016 12:32:25 +0300 Subject: [PATCH 15/21] MAGETWO-55676: PayPal Payments Configuration UX/links update - Added methods annotation --- app/code/Magento/Paypal/Model/Config/StructurePlugin.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php index 768802fa1b0b6..52f46a8411c02 100644 --- a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php +++ b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php @@ -110,6 +110,10 @@ public function aroundGetElementByPathParts( } /** + * Changes payment config structure. + * Groups which have `displayIn` element, transfer to appropriate group. + * Groups without `displayIn` transfer to other payment methods group. + * * @param Section $result * @return void */ @@ -139,6 +143,8 @@ private function restructurePayments(Section $result) } /** + * Recursive search of `displayIn` element in node children + * * @param string $section * @param array $data * @return array|null From eafc1856dafa08de11289bcd38219a80c998054a Mon Sep 17 00:00:00 2001 From: Roman Liukshyn Date: Wed, 3 Aug 2016 13:37:42 +0300 Subject: [PATCH 16/21] MAGETWO-55680: Create functional tests --- .../Test/Block/System/Config/Payments.php | 124 ++++++++++++++ .../SystemConfigEditSectionPayment.xml | 16 ++ .../Test/Block/System/Config/Braintree.php | 107 ++++++++++++ .../BraintreeSettlementReport.xml | 0 .../SalesOrderView.xml | 0 .../SystemConfigEditSectionPayment.xml | 12 ++ .../TestStep/CheckBraintreeConfigStep.php | 133 +++++++++++++++ .../Test/Constraint/AssertFieldsAreActive.php | 44 +++++ .../Constraint/AssertFieldsAreDisabled.php | 44 +++++ .../Constraint/AssertFieldsAreEnabled.php | 44 +++++ .../Constraint/AssertFieldsArePresent.php | 44 +++++ .../Test/TestCase/ConflictResolutionTest.php | 26 +++ .../Test/TestCase/ConflictResolutionTest.xml | 46 ++++++ .../Block/System/Config/ExpressCheckout.php | 130 +++++++++++++++ .../Test/Block/System/Config/PayflowLink.php | 122 ++++++++++++++ .../Test/Block/System/Config/PayflowPro.php | 122 ++++++++++++++ .../Block/System/Config/PaymentsAdvanced.php | 116 +++++++++++++ .../Test/Block/System/Config/PaymentsPro.php | 122 ++++++++++++++ .../SystemConfigEditSectionPayment.xml | 16 ++ .../Test/TestStep/CheckExpressConfigStep.php | 147 +++++++++++++++++ .../TestStep/CheckPayflowLinkConfigStep.php | 154 ++++++++++++++++++ .../TestStep/CheckPayflowProConfigStep.php | 153 +++++++++++++++++ .../CheckPaymentsAdvancedConfigStep.php | 143 ++++++++++++++++ .../TestStep/CheckPaymentsProConfigStep.php | 154 ++++++++++++++++++ .../app/Magento/Paypal/Test/etc/testcase.xml | 10 +- 25 files changed, 2028 insertions(+), 1 deletion(-) create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php rename dev/tests/functional/tests/app/Magento/Braintree/Test/Page/{adminhtml => Adminhtml}/BraintreeSettlementReport.xml (100%) rename dev/tests/functional/tests/app/Magento/Braintree/Test/Page/{adminhtml => Adminhtml}/SalesOrderView.xml (100%) create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml create mode 100644 dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php create mode 100644 dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php create mode 100644 dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php create mode 100644 dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php create mode 100644 dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php new file mode 100644 index 0000000000000..dc831e8bad3ad --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php @@ -0,0 +1,124 @@ + option[value='%s']"; + + /** + * @var string + */ + protected $solutionTitle = './strong[contains(text(), "%s")]'; + + /** + * 'Save Config' button. + * + * @var string + */ + protected $save = "#save"; + + /** + * @param string $countryCode + */ + public function switchMerchantCountry($countryCode) + { + $this->_rootElement->find(sprintf($this->merchantCountrySelector, $countryCode))->click(); + } + + /** + * Expand payment methods sections. + * + * @param $sectionId + */ + private function expandSection($sectionId) + { + $sectionName = "a[id*={$sectionId}]"; + $section = $this->_rootElement->find($sectionName . '.open'); + if(!$section->isVisible()) { + $this->_rootElement->find($sectionName)->click(); + } + } + + /** + * Find solution in section. + * + * @param $solution + * @return bool + */ + public function findSolution($solution) + { + if($this->_rootElement->find(sprintf($this->solutionTitle, $solution))) { + return true; + } + return false; + } + + /** + * Check if field is disabled. + * + * @param $fieldId + * @return bool + */ + public function isFieldDisabled($fieldId) + { + $field = $this->_rootElement->find($fieldId); + return $field->isDisabled(); + } + + /** + * Check if field is visible. + * + * @param $fieldId + * @return bool + */ + public function isFieldPresent($fieldId) + { + $field = $this->_rootElement->find($fieldId); + return $field->isVisible(); + } + + /** + * Check if field value is Yes. + * + * @param $fieldId + * @return bool + */ + public function isFieldEnabled($fieldId) + { + return (bool)$this->_rootElement->find($fieldId)->getValue(); + } + + /** + * Expand payment methods sections. + * + * @param array $sections + */ + public function expandPaymentSections(array $sections) + { + foreach ($sections as $key => $section) { + $this->expandSection($key); + foreach ($section as $id => $value) { + if (is_array($value)) { + $this->expandSection($id); + } + } + } + } +} diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml new file mode 100644 index 0000000000000..24c2ce030f7f0 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php new file mode 100644 index 0000000000000..6d6209a63b91f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php @@ -0,0 +1,107 @@ + '#payment_us_braintree_section_braintree_braintree_required_merchant_id', + 'Public Key' => '#payment_us_braintree_section_braintree_braintree_required_public_key', + 'Private Key' => '#payment_us_braintree_section_braintree_braintree_required_private_key', + ]; + + /** + * @return string + */ + public function getFields() + { + return $this->fields; + } + + /** + * @var array + */ + private $enablers = [ + 'Enable this Solution' => "#payment_us_braintree_section_braintree_active", + 'Enable PayPal through Braintree' => '#payment_us_braintree_section_braintree_active_braintree_paypal', + 'Vault enabled' => '#payment_us_braintree_section_braintree_braintree_cc_vault_active' + ]; + + /** + * @var string + */ + private $configureBraintreeButton = '#payment_us_braintree_section_braintree-head'; + + /** + * Specify credentials in Braintree configuration. + */ + public function specifyCredentials() + { + $this->_rootElement->find($this->fields['Merchant ID'])->setValue('1'); + $this->_rootElement->find($this->fields['Public Key'])->setValue('1'); + $this->_rootElement->find($this->fields['Private Key'])->setValue('1'); + } + + /** + * Clear credentials in Braintree configuration. + */ + public function clearCredentials() + { + $this->_rootElement->find($this->fields['Merchant ID'])->setValue(''); + $this->_rootElement->find($this->fields['Public Key'])->setValue(''); + $this->_rootElement->find($this->fields['Private Key'])->setValue(' '); + } + + /** + * @return array + */ + public function getEnablerFields() + { + return $this->enablers; + } + + /** + * Click 'Configure' button to expand Braintree configuration. + */ + public function clickConfigureButton() + { + $this->_rootElement->find($this->configureBraintreeButton)->click(); + } + + /** + * Set 'Enable this Solution' = Yes. + */ + public function enableBraintree() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('Yes'); + } + + /** + * Set 'Enable this Solution' = No. + */ + public function disableBraintree() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('No'); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/adminhtml/BraintreeSettlementReport.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/BraintreeSettlementReport.xml similarity index 100% rename from dev/tests/functional/tests/app/Magento/Braintree/Test/Page/adminhtml/BraintreeSettlementReport.xml rename to dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/BraintreeSettlementReport.xml diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/adminhtml/SalesOrderView.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SalesOrderView.xml similarity index 100% rename from dev/tests/functional/tests/app/Magento/Braintree/Test/Page/adminhtml/SalesOrderView.xml rename to dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SalesOrderView.xml diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml new file mode 100644 index 0000000000000..836525e05f78e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php new file mode 100644 index 0000000000000..140594f50c870 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php @@ -0,0 +1,133 @@ +systemConfigEditSectionPayment = $systemConfigEditSectionPayment; + $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; + $this->assertFieldsArePresent = $assertFieldsArePresent; + $this->assertFieldsAreActive = $assertFieldsAreActive; + $this->assertFieldsAreEnabled = $assertFieldsAreEnabled; + $this->countryCode = $countryCode; + $this->sections = $sections; + $this->braintreeConfigBlock = $this->systemConfigEditSectionPayment->getBraintreeConfigBlock(); + } + + /** + * . + * + * @return void + */ + public function run() + { + $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections); + $this->enableBraintree(); + $this->disableBraintree(); + } + + /** + * Enables Braintree and makes assertions for fields. + */ + private function enableBraintree() + { + $this->braintreeConfigBlock->clickConfigureButton(); + $this->braintreeConfigBlock->clearCredentials(); + $enablers = $this->braintreeConfigBlock->getEnablerFields(); + $this->assertFieldsAreDisabled->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->braintreeConfigBlock->specifyCredentials(); + $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->braintreeConfigBlock->enableBraintree(); + $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); + } + + /** + * Disables Express Checkout and makes assertions for fields. + */ + private function disableBraintree() + { + $enablers = $this->braintreeConfigBlock->getEnablerFields(); + $this->braintreeConfigBlock->clickConfigureButton(); + $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->assertFieldsAreEnabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution']] + ); + $this->braintreeConfigBlock->disableBraintree(); + $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php new file mode 100644 index 0000000000000..100913f4d4ad0 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php @@ -0,0 +1,44 @@ +getPaymentsConfigBlock()->isFieldDisabled($fieldId), + 'Field is disabled.' + ); + } + } + + /** + * Returns string representation of successful assertion. + * + * @return string + */ + public function toString() + { + return 'Field is active.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php new file mode 100644 index 0000000000000..9e9feb19d1430 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php @@ -0,0 +1,44 @@ +getPaymentsConfigBlock()->isFieldDisabled($fieldId), + 'Field is active.' + ); + } + } + + /** + * Returns string representation of successful assertion. + * + * @return string + */ + public function toString() + { + return 'Field is disabled.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php new file mode 100644 index 0000000000000..b62b3e1849615 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php @@ -0,0 +1,44 @@ +getPaymentsConfigBlock()->isFieldEnabled($fieldId), + 'Field is active.' + ); + } + } + + /** + * Returns string representation of successful assertion. + * + * @return string + */ + public function toString() + { + return 'Field is disabled.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php new file mode 100644 index 0000000000000..e686308681654 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php @@ -0,0 +1,44 @@ +getPaymentsConfigBlock()->isFieldPresent($fieldId), + 'Field is active.' + ); + } + } + + /** + * Returns string representation of successful assertion. + * + * @return string + */ + public function toString() + { + return 'Field is disabled.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php new file mode 100644 index 0000000000000..1e40682d21e1e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php @@ -0,0 +1,26 @@ +executeScenario(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml new file mode 100644 index 0000000000000..3c18acc37ca57 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml @@ -0,0 +1,46 @@ + + + + + + US + + + PayPal Express Checkout + Braintree + + + + Payments Advanced + (Includes Express Checkout) + + Payments Pro (Includes + Express Checkout) + + Payments Standard + + + + + + + + + + + + + + + + test_type:3rd_party_test + + + diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php new file mode 100644 index 0000000000000..70ca1031d9c57 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php @@ -0,0 +1,130 @@ + '#payment_us_paypal_alternative_payment_methods_express_' . + 'checkout_us_express_checkout_required_express_checkout_required_express_checkout_business_account', + 'API Username' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' . + 'required_express_checkout_required_express_checkout_api_username', + 'API Password' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' . + 'required_express_checkout_required_express_checkout_api_password', + 'API Signature' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' . + 'required_express_checkout_required_express_checkout_api_signature', + 'Merchant Account ID' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_' . + 'checkout_required_merchant_id', + 'Sort Order PayPal Credit' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_' . + 'checkout_required_express_checkout_bml_sort_order', + ]; + + /** + * @return string + */ + public function getFields() + { + return $this->fields; + } + + /** + * @var array + */ + private $enablers = [ + 'Enable this Solution' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_' . + 'checkout_required_enable_express_checkout', + 'Enable In-Context Checkout Experience' => '#payment_us_paypal_alternative_payment_methods_express_checkout_' . + 'us_express_checkout_required_enable_in_context_checkout', + 'Enable PayPal Credit' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_' . + 'checkout_required_enable_express_checkout_bml' + ]; + + /** + * @var string + */ + private $configureExpressButton = '#payment_us_paypal_alternative_payment_methods_express_checkout_us-head'; + + /** + * Specify credentials in PayPal Express Checkout configuration. + */ + public function specifyCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account']) + ->setValue('test@test.com'); + $this->_rootElement->find($this->fields['API Username'])->setValue('1'); + $this->_rootElement->find($this->fields['API Password'])->setValue('1'); + $this->_rootElement->find($this->fields['API Signature'])->setValue('1'); + } + + /** + * Set fields for credentials empty in PayPal Express Checkout configuration. + */ + public function clearCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue(''); + $this->_rootElement->find($this->fields['API Username'])->setValue(''); + $this->_rootElement->find($this->fields['API Password'])->setValue(''); + $this->_rootElement->find($this->fields['API Signature'])->setValue(''); + } + + /** + * Specify Merchant Account ID in PayPal Express Checkout configuration. + */ + public function specifyMerchantAccountId() + { + $this->_rootElement->find($this->fields['Merchant Account ID'])->setValue('1'); + } + + /** + * @return array + */ + public function getEnablerFields() + { + return $this->enablers; + } + + /** + * Click 'Configure' button to expand PayPal Express Checkout configuration. + */ + public function clickConfigureButton() + { + $this->_rootElement->find($this->configureExpressButton)->click(); + } + + /** + * Set 'Enable this Solution' = Yes. + */ + public function enableExpressCheckout() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('Yes'); + } + + /** + * Set 'Enable this Solution' = No. + */ + public function disableExpressCheckout() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('No'); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php new file mode 100644 index 0000000000000..88d11e438a05d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php @@ -0,0 +1,122 @@ + '#payment_us_paypal_payment_gateways_payflow_link_us_' . + 'payflow_link_required_payflow_link_payflow_link_business_account', + 'Partner' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' . + 'link_partner', + 'Vendor' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' . + 'link_vendor', + 'User' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' . + 'link_user', + 'Password' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow' . + '_link_pwd' + ]; + + /** + * @return string + */ + public function getFields() + { + return $this->fields; + } + + /** + * @var array + */ + private $enablers = [ + 'Enable Payflow Link' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_enable_' . + 'payflow_link', + 'Enable Express Checkout' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_' . + 'enable_express_checkout', + 'Enable PayPal Credit' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_enable_' . + 'express_checkout_bml' + ]; + + /** + * @var string + */ + private $configurePayflowLinkButton = '#payment_us_paypal_payment_gateways_payflow_link_us-head'; + + /** + * Specify credentials in PayPal Payflow Link configuration. + */ + public function specifyCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account']) + ->setValue('test@test.com'); + $this->_rootElement->find($this->fields['Partner'])->setValue('1'); + $this->_rootElement->find($this->fields['Vendor'])->setValue('1'); + $this->_rootElement->find($this->fields['User'])->setValue('1'); + $this->_rootElement->find($this->fields['Password'])->setValue('1'); + } + + /** + * Set fields for credentials empty in PayPal Payflow Link configuration. + */ + public function clearCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue(''); + $this->_rootElement->find($this->fields['Partner'])->setValue(''); + $this->_rootElement->find($this->fields['Vendor'])->setValue(''); + $this->_rootElement->find($this->fields['User'])->setValue(''); + $this->_rootElement->find($this->fields['Password'])->setValue(''); + } + + /** + * @return array + */ + public function getEnablerFields() + { + return $this->enablers; + } + + /** + * Click 'Configure' button to expand PayPal Payflow Link configuration. + */ + public function clickConfigureButton() + { + $this->_rootElement->find($this->configurePayflowLinkButton)->click(); + } + + /** + * Set 'Enable this Solution' = Yes. + */ + public function enablePayflowLink() + { + $this->_rootElement->find( + $this->enablers['Enable Payflow Link'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('Yes'); + } + + /** + * Set 'Enable this Solution' = No. + */ + public function disablePayflowLink() + { + $this->_rootElement->find( + $this->enablers['Enable Payflow Link'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('No'); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php new file mode 100644 index 0000000000000..ab0181b373d2e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php @@ -0,0 +1,122 @@ + '#payment_us_paypal_payment_gateways_paypal_payflowpro_' . + 'with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings_business_account', + 'Partner' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' . + 'required_paypal_payflow_api_settings_partner', + 'Vendor' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' . + 'required_paypal_payflow_api_settings_vendor', + 'User' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' . + 'required_paypal_payflow_api_settings_user', + 'Password' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' . + 'required_paypal_payflow_api_settings_pwd' + ]; + + /** + * @return string + */ + public function getFields() + { + return $this->fields; + } + + /** + * @var array + */ + private $enablers = [ + 'Enable this Solution' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal' . + '_payflow_required_enable_paypal_payflow', + 'Enable PayPal Credit' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal' . + '_payflow_required_enable_express_checkout_bml_payflow', + 'Vault enabled' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_' . + 'payflow_required_payflowpro_cc_vault_active' + ]; + + /** + * @var string + */ + private $configureProButton = '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout-head'; + + /** + * Specify credentials in PayPal Payflow Pro configuration. + */ + public function specifyCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account']) + ->setValue('test@test.com'); + $this->_rootElement->find($this->fields['Partner'])->setValue('1'); + $this->_rootElement->find($this->fields['Vendor'])->setValue('1'); + $this->_rootElement->find($this->fields['User'])->setValue('1'); + $this->_rootElement->find($this->fields['Password'])->setValue('1'); + } + + /** + * Set fields for credentials empty in PayPal Payflow Pro configuration. + */ + public function clearCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue(''); + $this->_rootElement->find($this->fields['Partner'])->setValue(''); + $this->_rootElement->find($this->fields['Vendor'])->setValue(''); + $this->_rootElement->find($this->fields['User'])->setValue(''); + $this->_rootElement->find($this->fields['Password'])->setValue(''); + } + + /** + * @return array + */ + public function getEnablerFields() + { + return $this->enablers; + } + + /** + * Click 'Configure' button to expand PayPal Payflow Pro configuration. + */ + public function clickConfigureButton() + { + $this->_rootElement->find($this->configureProButton)->click(); + } + + /** + * Set 'Enable this Solution' = Yes. + */ + public function enablePayflowPro() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('Yes'); + } + + /** + * Set 'Enable this Solution' = No. + */ + public function disablePayflowPro() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('No'); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php new file mode 100644 index 0000000000000..232282b2bedb2 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php @@ -0,0 +1,116 @@ + '#payment_us_paypal_group_all_in_one_payflow_advanced_' . + 'required_settings_payments_advanced_business_account', + 'Partner' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_partner', + 'Vendor' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_vendor', + 'User' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_user', + 'Password' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_pwd' + ]; + + /** + * @return string + */ + public function getFields() + { + return $this->fields; + } + + /** + * @var array + */ + private $enablers = [ + 'Enable this Solution' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_enable_' . + 'payflow_advanced', + 'Enable PayPal Credit' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_enable_' . + 'express_checkout_bml' + ]; + + /** + * @var string + */ + private $configureAdvancedButton = '#payment_us_paypal_group_all_in_one_payflow_advanced-head'; + + /** + * Specify credentials in PayPal Payments Advanced configuration. + */ + public function specifyCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account']) + ->setValue('test@test.com'); + $this->_rootElement->find($this->fields['Partner'])->setValue('1'); + $this->_rootElement->find($this->fields['Vendor'])->setValue('1'); + $this->_rootElement->find($this->fields['User'])->setValue('1'); + $this->_rootElement->find($this->fields['Password'])->setValue('1'); + } + + /** + * Set fields for credentials empty in PayPal Payments Advanced configuration. + */ + public function clearCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue(''); + $this->_rootElement->find($this->fields['Partner'])->setValue(''); + $this->_rootElement->find($this->fields['Vendor'])->setValue(''); + $this->_rootElement->find($this->fields['User'])->setValue(''); + $this->_rootElement->find($this->fields['Password'])->setValue(''); + } + + /** + * @return array + */ + public function getEnablerFields() + { + return $this->enablers; + } + + /** + * Click 'Configure' button to expand PayPal Payments Advanced configuration. + */ + public function clickConfigureButton() + { + $this->_rootElement->find($this->configureAdvancedButton)->click(); + } + + /** + * Set 'Enable this Solution' = Yes. + */ + public function enablePaymentsAdvanced() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('Yes'); + } + + /** + * Set 'Enable this Solution' = No. + */ + public function disablePaymentsAdvanced() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('No'); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php new file mode 100644 index 0000000000000..8197f52c3b78d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php @@ -0,0 +1,122 @@ + '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_' . + 'payflow_required_paypal_payflow_api_settings_business_account', + 'Partner' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' . + 'settings_partner', + 'Vendor' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' . + 'settings_vendor', + 'User' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_settings' . + '_user', + 'Password' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' . + 'settings_pwd' + ]; + + /** + * @return string + */ + public function getFields() + { + return $this->fields; + } + + /** + * @var array + */ + private $enablers = [ + 'Enable this Solution' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_enable_paypal' . + '_payflow', + 'Enable PayPal Credit' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_enable_' . + 'express_checkout_bml_payflow', + 'Vault enabled' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_payflowpro_cc_vault' . + '_active' + ]; + + /** + * @var string + */ + private $configureProButton = '#payment_us_paypal_group_all_in_one_wpp_usuk-head'; + + /** + * Specify credentials in PayPal Payments Pro configuration. + */ + public function specifyCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account']) + ->setValue('test@test.com'); + $this->_rootElement->find($this->fields['Partner'])->setValue('1'); + $this->_rootElement->find($this->fields['Vendor'])->setValue('1'); + $this->_rootElement->find($this->fields['User'])->setValue('1'); + $this->_rootElement->find($this->fields['Password'])->setValue('1'); + } + + /** + * Set fields for credentials empty in PayPal Payments Pro configuration. + */ + public function clearCredentials() + { + $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue(''); + $this->_rootElement->find($this->fields['Partner'])->setValue(''); + $this->_rootElement->find($this->fields['Vendor'])->setValue(''); + $this->_rootElement->find($this->fields['User'])->setValue(''); + $this->_rootElement->find($this->fields['Password'])->setValue(''); + } + + /** + * @return array + */ + public function getEnablerFields() + { + return $this->enablers; + } + + /** + * Click 'Configure' button to expand PayPal Payments Pro configuration. + */ + public function clickConfigureButton() + { + $this->_rootElement->find($this->configureProButton)->click(); + } + + /** + * Set 'Enable this Solution' = Yes. + */ + public function enablePaymentsPro() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('Yes'); + } + + /** + * Set 'Enable this Solution' = No. + */ + public function disablePaymentsPro() + { + $this->_rootElement->find( + $this->enablers['Enable this Solution'], + Locator::SELECTOR_CSS, + 'select' + )->setValue('No'); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml new file mode 100644 index 0000000000000..c2461cf39ae6c --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Page/Adminhtml/SystemConfigEditSectionPayment.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php new file mode 100644 index 0000000000000..d1534e36cc4d6 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php @@ -0,0 +1,147 @@ +systemConfigEditSectionPayment = $systemConfigEditSectionPayment; + $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; + $this->assertFieldsArePresent = $assertFieldsArePresent; + $this->assertFieldsAreActive = $assertFieldsAreActive; + $this->assertFieldsAreEnabled = $assertFieldsAreEnabled; + $this->countryCode = $countryCode; + $this->sections = $sections; + $this->expressCheckoutConfigBlock = $this->systemConfigEditSectionPayment->getExpressCheckoutConfigBlock(); + } + + /** + * . + * + * @return void + */ + public function run() + { + $this->systemConfigEditSectionPayment->open(); + $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->switchMerchantCountry($this->countryCode); + $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections); + $this->enableExpressCheckout(); + $this->disableExpressCheckout(); + } + + /** + * Enables Express Checkout and makes assertions for fields. + */ + private function enableExpressCheckout() + { + $this->expressCheckoutConfigBlock->clickConfigureButton(); + $this->expressCheckoutConfigBlock->clearCredentials(); + $enablers = $this->expressCheckoutConfigBlock->getEnablerFields(); + $this->assertFieldsAreDisabled->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->expressCheckoutConfigBlock->specifyCredentials(); + $this->expressCheckoutConfigBlock->enableExpressCheckout(); + $expressFields = $this->expressCheckoutConfigBlock->getFields(); + $this->assertFieldsArePresent->processAssert( + $this->systemConfigEditSectionPayment, + [$expressFields['Merchant Account ID'], $expressFields['Sort Order PayPal Credit']] + ); + $this->assertFieldsAreActive->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable In-Context Checkout Experience'], $enablers['Enable PayPal Credit']] + ); + $this->assertFieldsAreEnabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable In-Context Checkout Experience'], $enablers['Enable PayPal Credit']] + ); + $this->expressCheckoutConfigBlock->specifyMerchantAccountId(); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); + } + + /** + * Disables Express Checkout and makes assertions for fields. + */ + private function disableExpressCheckout() + { + $enablers = $this->expressCheckoutConfigBlock->getEnablerFields(); + $this->expressCheckoutConfigBlock->clickConfigureButton(); + $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->assertFieldsAreEnabled->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->expressCheckoutConfigBlock->disableExpressCheckout(); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable In-Context Checkout Experience'], $enablers['Enable PayPal Credit']] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php new file mode 100644 index 0000000000000..8fb4d4734e2ba --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php @@ -0,0 +1,154 @@ +systemConfigEditSectionPayment = $systemConfigEditSectionPayment; + $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; + $this->assertFieldsArePresent = $assertFieldsArePresent; + $this->assertFieldsAreActive = $assertFieldsAreActive; + $this->assertFieldsAreEnabled = $assertFieldsAreEnabled; + $this->countryCode = $countryCode; + $this->sections = $sections; + $this->payflowLinkConfigBlock = $this->systemConfigEditSectionPayment->getPayflowLinkConfigBlock(); + } + + /** + * . + * + * @return void + */ + public function run() + { + $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections); + $this->enablePayflowLink(); + $this->disablePayflowLink(); + } + + /** + * Enables Payflow Link and makes assertions for fields. + */ + private function enablePayflowLink() + { + $this->payflowLinkConfigBlock->clickConfigureButton(); + $this->payflowLinkConfigBlock->clearCredentials(); + $enablers = $this->payflowLinkConfigBlock->getEnablerFields(); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + $enablers + ); + $this->payflowLinkConfigBlock->specifyCredentials(); + $this->assertFieldsAreActive->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable Payflow Link']] + ); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable Express Checkout'], $enablers['Enable PayPal Credit']] + ); + $this->payflowLinkConfigBlock->enablePayflowLink(); + $this->assertFieldsAreActive->processAssert( + $this->systemConfigEditSectionPayment, + $enablers + ); + $this->assertFieldsAreEnabled->processAssert( + $this->systemConfigEditSectionPayment, + $enablers + ); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); + } + + /** + * Disables Payflow Link and makes assertions for fields. + */ + private function disablePayflowLink() + { + $enablers = $this->payflowLinkConfigBlock->getEnablerFields(); + $this->payflowLinkConfigBlock->clickConfigureButton(); + $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->assertFieldsAreEnabled->processAssert( + $this->systemConfigEditSectionPayment, + $enablers + ); + $this->payflowLinkConfigBlock->disablePayflowLink(); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable Express Checkout'], $enablers['Enable PayPal Credit']] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php new file mode 100644 index 0000000000000..01675de5f6c0b --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php @@ -0,0 +1,153 @@ +systemConfigEditSectionPayment = $systemConfigEditSectionPayment; + $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; + $this->assertFieldsArePresent = $assertFieldsArePresent; + $this->assertFieldsAreActive = $assertFieldsAreActive; + $this->assertFieldsAreEnabled = $assertFieldsAreEnabled; + $this->countryCode = $countryCode; + $this->sections = $sections; + $this->payflowProConfigBlock = $this->systemConfigEditSectionPayment->getPayflowProConfigBlock(); + } + + /** + * . + * + * @return void + */ + public function run() + { + $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections); + $this->enablePayflowPro(); + $this->disablePayflowPro(); + } + + /** + * Enables Payflow Pro and makes assertions for fields. + */ + private function enablePayflowPro() + { + $this->payflowProConfigBlock->clickConfigureButton(); + $this->payflowProConfigBlock->clearCredentials(); + $enablers = $this->payflowProConfigBlock->getEnablerFields(); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']] + ); + $this->payflowProConfigBlock->specifyCredentials(); + $this->assertFieldsAreActive->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution']] + ); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable PayPal Credit']] + ); + $this->payflowProConfigBlock->enablePayflowPro(); + $this->assertFieldsAreActive->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault enabled']] + ); + $this->assertFieldsAreEnabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']] + ); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); + } + + /** + * Disables Payflow Pro and makes assertions for fields. + */ + private function disablePayflowPro() + { + $enablers = $this->payflowProConfigBlock->getEnablerFields(); + $this->payflowProConfigBlock->clickConfigureButton(); + $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->assertFieldsAreEnabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']] + ); + $this->payflowProConfigBlock->disablePayflowPro(); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable PayPal Credit']] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php new file mode 100644 index 0000000000000..51e9b1eb908be --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php @@ -0,0 +1,143 @@ +systemConfigEditSectionPayment = $systemConfigEditSectionPayment; + $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; + $this->assertFieldsArePresent = $assertFieldsArePresent; + $this->assertFieldsAreActive = $assertFieldsAreActive; + $this->assertFieldsAreEnabled = $assertFieldsAreEnabled; + $this->countryCode = $countryCode; + $this->sections = $sections; + $this->paymentsAdvancedConfigBlock = $this->systemConfigEditSectionPayment->getPaymentsAdvancedConfigBlock(); + } + + /** + * . + * + * @return void + */ + public function run() + { + $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections); + $this->enablePaymentsAdvanced(); + $this->disablePaymentsAdvanced(); + } + + /** + * Enables Payments Advanced and makes assertions for fields. + */ + private function enablePaymentsAdvanced() + { + $this->paymentsAdvancedConfigBlock->clickConfigureButton(); + $this->paymentsAdvancedConfigBlock->clearCredentials(); + $enablers = $this->paymentsAdvancedConfigBlock->getEnablerFields(); + $this->assertFieldsAreDisabled->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->paymentsAdvancedConfigBlock->specifyCredentials(); + $this->assertFieldsAreActive->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution']] + ); + $this->paymentsAdvancedConfigBlock->enablePaymentsAdvanced(); + $this->assertFieldsAreActive->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']] + ); + $this->assertFieldsAreEnabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']] + ); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); + } + + /** + * Disables Payments Advanced and makes assertions for fields. + */ + private function disablePaymentsAdvanced() + { + $enablers = $this->paymentsAdvancedConfigBlock->getEnablerFields(); + $this->paymentsAdvancedConfigBlock->clickConfigureButton(); + $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->assertFieldsAreEnabled->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->paymentsAdvancedConfigBlock->disablePaymentsAdvanced(); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable PayPal Credit']] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php new file mode 100644 index 0000000000000..dc0102c8d1630 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php @@ -0,0 +1,154 @@ +systemConfigEditSectionPayment = $systemConfigEditSectionPayment; + $this->assertSolutionsAvailableInSection = $assertSolutionsAvailableInSection; + $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; + $this->assertFieldsArePresent = $assertFieldsArePresent; + $this->assertFieldsAreActive = $assertFieldsAreActive; + $this->assertFieldsAreEnabled = $assertFieldsAreEnabled; + $this->countryCode = $countryCode; + $this->sections = $sections; + $this->paymentsProConfigBlock = $this->systemConfigEditSectionPayment->getPaymentsProConfigBlock(); + } + + /** + * . + * + * @return void + */ + public function run() + { + $this->systemConfigEditSectionPayment->getPaymentsConfigBlock()->expandPaymentSections($this->sections); + $this->enablePaymentsPro(); + $this->disablePaymentsPro(); + } + + /** + * Enables Payments Pro and makes assertions for fields. + */ + private function enablePaymentsPro() + { + $this->paymentsProConfigBlock->clickConfigureButton(); + $this->paymentsProConfigBlock->clearCredentials(); + $enablers = $this->paymentsProConfigBlock->getEnablerFields(); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']] + ); + $this->paymentsProConfigBlock->specifyCredentials(); + $this->assertFieldsAreActive->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution']] + ); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable PayPal Credit']] + ); + $this->paymentsProConfigBlock->enablePaymentsPro(); + $this->assertFieldsAreActive->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit'], $enablers['Vault enabled']] + ); + $this->assertFieldsAreEnabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']] + ); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); + } + + /** + * Disables Payments Pro and makes assertions for fields. + */ + private function disablePaymentsPro() + { + $enablers = $this->paymentsProConfigBlock->getEnablerFields(); + $this->paymentsProConfigBlock->clickConfigureButton(); + $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->assertFieldsAreEnabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable this Solution'], $enablers['Enable PayPal Credit']] + ); + $this->paymentsProConfigBlock->disablePaymentsPro(); + $this->assertFieldsAreDisabled->processAssert( + $this->systemConfigEditSectionPayment, + [$enablers['Enable PayPal Credit']] + ); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml index 288824c7e595d..f361530def861 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml @@ -53,7 +53,7 @@ - + @@ -61,4 +61,12 @@ + + + + + + + + From f5273189502ced21dedaa07876c848ccd536a48c Mon Sep 17 00:00:00 2001 From: Roman Liukshyn Date: Wed, 3 Aug 2016 14:33:10 +0300 Subject: [PATCH 17/21] MAGETWO-55680: Create functional tests - Missing return statements, small code style fixes --- .../Test/Block/System/Config/Payments.php | 14 +++---- .../Test/Block/System/Config/Braintree.php | 38 +++++++++++++------ .../TestStep/CheckBraintreeConfigStep.php | 6 ++- .../Test/Constraint/AssertFieldsAreActive.php | 2 +- .../Constraint/AssertFieldsAreDisabled.php | 2 +- .../Constraint/AssertFieldsAreEnabled.php | 2 +- .../Constraint/AssertFieldsArePresent.php | 2 +- .../Test/TestCase/ConflictResolutionTest.php | 4 ++ .../Block/System/Config/ExpressCheckout.php | 34 ++++++++++++----- .../Test/Block/System/Config/PayflowLink.php | 32 +++++++++++----- .../Test/Block/System/Config/PayflowPro.php | 32 +++++++++++----- .../Block/System/Config/PaymentsAdvanced.php | 32 +++++++++++----- .../Test/Block/System/Config/PaymentsPro.php | 32 +++++++++++----- .../Test/TestStep/CheckExpressConfigStep.php | 6 ++- .../TestStep/CheckPayflowLinkConfigStep.php | 7 +++- .../TestStep/CheckPayflowProConfigStep.php | 6 ++- .../CheckPaymentsAdvancedConfigStep.php | 6 ++- .../TestStep/CheckPaymentsProConfigStep.php | 7 +++- 18 files changed, 186 insertions(+), 78 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php index dc831e8bad3ad..5534ab00fedbc 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php @@ -1,19 +1,12 @@ _rootElement->find($sectionName . '.open'); - if(!$section->isVisible()) { + if (!$section->isVisible()) { $this->_rootElement->find($sectionName)->click(); } } @@ -64,7 +59,7 @@ private function expandSection($sectionId) */ public function findSolution($solution) { - if($this->_rootElement->find(sprintf($this->solutionTitle, $solution))) { + if ($this->_rootElement->find(sprintf($this->solutionTitle, $solution))) { return true; } return false; @@ -109,6 +104,7 @@ public function isFieldEnabled($fieldId) * Expand payment methods sections. * * @param array $sections + * @return void */ public function expandPaymentSections(array $sections) { diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php index 6d6209a63b91f..0f8fa8b41b6c4 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php @@ -15,7 +15,7 @@ class Braintree extends Block { /** - * @var string + * @var array */ private $fields = [ 'Merchant ID' => '#payment_us_braintree_section_braintree_braintree_required_merchant_id', @@ -23,14 +23,6 @@ class Braintree extends Block 'Private Key' => '#payment_us_braintree_section_braintree_braintree_required_private_key', ]; - /** - * @return string - */ - public function getFields() - { - return $this->fields; - } - /** * @var array */ @@ -46,7 +38,19 @@ public function getFields() private $configureBraintreeButton = '#payment_us_braintree_section_braintree-head'; /** - * Specify credentials in Braintree configuration. + * Return credentials fields selectors. + * + * @return array + */ + public function getFields() + { + return $this->fields; + } + + /** + * Specify credentials in Braintree configuration. + * + * @return void */ public function specifyCredentials() { @@ -56,16 +60,20 @@ public function specifyCredentials() } /** - * Clear credentials in Braintree configuration. + * Clear credentials in Braintree configuration. + * + * @return void */ public function clearCredentials() { $this->_rootElement->find($this->fields['Merchant ID'])->setValue(''); $this->_rootElement->find($this->fields['Public Key'])->setValue(''); - $this->_rootElement->find($this->fields['Private Key'])->setValue(' '); + $this->_rootElement->find($this->fields['Private Key'])->setValue(''); } /** + * Return enabler fields selectors. + * * @return array */ public function getEnablerFields() @@ -75,6 +83,8 @@ public function getEnablerFields() /** * Click 'Configure' button to expand Braintree configuration. + * + * @return void */ public function clickConfigureButton() { @@ -83,6 +93,8 @@ public function clickConfigureButton() /** * Set 'Enable this Solution' = Yes. + * + * @return void */ public function enableBraintree() { @@ -95,6 +107,8 @@ public function enableBraintree() /** * Set 'Enable this Solution' = No. + * + * @return void */ public function disableBraintree() { diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php index 140594f50c870..a1485cf802ee0 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php @@ -87,7 +87,7 @@ public function __construct( } /** - * . + * Run step for checking Braintree configuration. * * @return void */ @@ -100,6 +100,8 @@ public function run() /** * Enables Braintree and makes assertions for fields. + * + * @return void */ private function enableBraintree() { @@ -117,6 +119,8 @@ private function enableBraintree() /** * Disables Express Checkout and makes assertions for fields. + * + * @return void */ private function disableBraintree() { diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php index 100913f4d4ad0..c1bcb2991dd1e 100644 --- a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreActive.php @@ -16,11 +16,11 @@ */ class AssertFieldsAreActive extends AbstractConstraint { - /** * Assert that fields are active. * * @param array $fieldIds + * @return void */ public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds) { diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php index 9e9feb19d1430..59cb12d580c7d 100644 --- a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreDisabled.php @@ -16,11 +16,11 @@ */ class AssertFieldsAreDisabled extends AbstractConstraint { - /** * Assert that field are disabled. * * @param array $fieldIds + * @return void */ public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds) { diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php index b62b3e1849615..31e9cd6924a8a 100644 --- a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsAreEnabled.php @@ -16,11 +16,11 @@ */ class AssertFieldsAreEnabled extends AbstractConstraint { - /** * Assert that field is present. * * @param array $fieldIds + * @return void */ public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds) { diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php index e686308681654..0491b2df124d1 100644 --- a/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Constraint/AssertFieldsArePresent.php @@ -16,11 +16,11 @@ */ class AssertFieldsArePresent extends AbstractConstraint { - /** * Assert that field is present. * * @param array $fieldIds + * @return void */ public function processAssert(SystemConfigEditSectionPayment $configEditSectionPayment, array $fieldIds) { diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php index 1e40682d21e1e..b1c2d71a43bdd 100644 --- a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.php @@ -7,6 +7,10 @@ use Magento\Mtf\TestCase\Scenario; +/** + * Tests conflict resolution for payments configuration. + * Class ConflictResolutionTest + */ class ConflictResolutionTest extends Scenario { /* tags */ diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php index 70ca1031d9c57..aefe03b1e9b54 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php @@ -15,7 +15,7 @@ class ExpressCheckout extends Block { /** - * @var string + * @var array */ private $fields = [ 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_alternative_payment_methods_express_' . @@ -32,14 +32,6 @@ class ExpressCheckout extends Block 'checkout_required_express_checkout_bml_sort_order', ]; - /** - * @return string - */ - public function getFields() - { - return $this->fields; - } - /** * @var array */ @@ -57,8 +49,20 @@ public function getFields() */ private $configureExpressButton = '#payment_us_paypal_alternative_payment_methods_express_checkout_us-head'; + /** + * Return credentials fields selectors. + * + * @return array + */ + public function getFields() + { + return $this->fields; + } + /** * Specify credentials in PayPal Express Checkout configuration. + * + * @return void */ public function specifyCredentials() { @@ -71,6 +75,8 @@ public function specifyCredentials() /** * Set fields for credentials empty in PayPal Express Checkout configuration. + * + * @return void */ public function clearCredentials() { @@ -82,6 +88,8 @@ public function clearCredentials() /** * Specify Merchant Account ID in PayPal Express Checkout configuration. + * + * @return void */ public function specifyMerchantAccountId() { @@ -89,6 +97,8 @@ public function specifyMerchantAccountId() } /** + * Return enabler fields selectors. + * * @return array */ public function getEnablerFields() @@ -98,6 +108,8 @@ public function getEnablerFields() /** * Click 'Configure' button to expand PayPal Express Checkout configuration. + * + * @return void */ public function clickConfigureButton() { @@ -106,6 +118,8 @@ public function clickConfigureButton() /** * Set 'Enable this Solution' = Yes. + * + * @return void */ public function enableExpressCheckout() { @@ -118,6 +132,8 @@ public function enableExpressCheckout() /** * Set 'Enable this Solution' = No. + * + * @return void */ public function disableExpressCheckout() { diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php index 88d11e438a05d..226a62f7633de 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php @@ -15,7 +15,7 @@ class PayflowLink extends Block { /** - * @var string + * @var array */ private $fields = [ 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_payment_gateways_payflow_link_us_' . @@ -30,14 +30,6 @@ class PayflowLink extends Block '_link_pwd' ]; - /** - * @return string - */ - public function getFields() - { - return $this->fields; - } - /** * @var array */ @@ -57,6 +49,8 @@ public function getFields() /** * Specify credentials in PayPal Payflow Link configuration. + * + * @return void */ public function specifyCredentials() { @@ -70,6 +64,8 @@ public function specifyCredentials() /** * Set fields for credentials empty in PayPal Payflow Link configuration. + * + * @return void */ public function clearCredentials() { @@ -81,6 +77,18 @@ public function clearCredentials() } /** + * Return credentials fields selectors. + * + * @return array + */ + public function getFields() + { + return $this->fields; + } + + /** + * Return enabler fields selectors. + * * @return array */ public function getEnablerFields() @@ -90,6 +98,8 @@ public function getEnablerFields() /** * Click 'Configure' button to expand PayPal Payflow Link configuration. + * + * @return void */ public function clickConfigureButton() { @@ -98,6 +108,8 @@ public function clickConfigureButton() /** * Set 'Enable this Solution' = Yes. + * + * @return void */ public function enablePayflowLink() { @@ -110,6 +122,8 @@ public function enablePayflowLink() /** * Set 'Enable this Solution' = No. + * + * @return void */ public function disablePayflowLink() { diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php index ab0181b373d2e..92db87785f3e7 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php @@ -15,7 +15,7 @@ class PayflowPro extends Block { /** - * @var string + * @var array */ private $fields = [ 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_' . @@ -30,14 +30,6 @@ class PayflowPro extends Block 'required_paypal_payflow_api_settings_pwd' ]; - /** - * @return string - */ - public function getFields() - { - return $this->fields; - } - /** * @var array */ @@ -57,6 +49,8 @@ public function getFields() /** * Specify credentials in PayPal Payflow Pro configuration. + * + * @return void */ public function specifyCredentials() { @@ -70,6 +64,8 @@ public function specifyCredentials() /** * Set fields for credentials empty in PayPal Payflow Pro configuration. + * + * @return void */ public function clearCredentials() { @@ -81,6 +77,18 @@ public function clearCredentials() } /** + * Return credentials fields selectors. + * + * @return array + */ + public function getFields() + { + return $this->fields; + } + + /** + * Return enabler fields selectors. + * * @return array */ public function getEnablerFields() @@ -90,6 +98,8 @@ public function getEnablerFields() /** * Click 'Configure' button to expand PayPal Payflow Pro configuration. + * + * @return void */ public function clickConfigureButton() { @@ -98,6 +108,8 @@ public function clickConfigureButton() /** * Set 'Enable this Solution' = Yes. + * + * @return void */ public function enablePayflowPro() { @@ -110,6 +122,8 @@ public function enablePayflowPro() /** * Set 'Enable this Solution' = No. + * + * @return void */ public function disablePayflowPro() { diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php index 232282b2bedb2..6e380b603e066 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php @@ -15,7 +15,7 @@ class PaymentsAdvanced extends Block { /** - * @var string + * @var array */ private $fields = [ 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_group_all_in_one_payflow_advanced_' . @@ -26,14 +26,6 @@ class PaymentsAdvanced extends Block 'Password' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_pwd' ]; - /** - * @return string - */ - public function getFields() - { - return $this->fields; - } - /** * @var array */ @@ -51,6 +43,8 @@ public function getFields() /** * Specify credentials in PayPal Payments Advanced configuration. + * + * @return void */ public function specifyCredentials() { @@ -64,6 +58,8 @@ public function specifyCredentials() /** * Set fields for credentials empty in PayPal Payments Advanced configuration. + * + * @return void */ public function clearCredentials() { @@ -75,6 +71,18 @@ public function clearCredentials() } /** + * Return credentials fields selectors. + * + * @return array + */ + public function getFields() + { + return $this->fields; + } + + /** + * Return enabler fields selectors. + * * @return array */ public function getEnablerFields() @@ -84,6 +92,8 @@ public function getEnablerFields() /** * Click 'Configure' button to expand PayPal Payments Advanced configuration. + * + * @return void */ public function clickConfigureButton() { @@ -92,6 +102,8 @@ public function clickConfigureButton() /** * Set 'Enable this Solution' = Yes. + * + * @return void */ public function enablePaymentsAdvanced() { @@ -104,6 +116,8 @@ public function enablePaymentsAdvanced() /** * Set 'Enable this Solution' = No. + * + * @return void */ public function disablePaymentsAdvanced() { diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php index 8197f52c3b78d..a6adf4dd4d8d3 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php @@ -15,7 +15,7 @@ class PaymentsPro extends Block { /** - * @var string + * @var array */ private $fields = [ 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_' . @@ -30,14 +30,6 @@ class PaymentsPro extends Block 'settings_pwd' ]; - /** - * @return string - */ - public function getFields() - { - return $this->fields; - } - /** * @var array */ @@ -57,6 +49,8 @@ public function getFields() /** * Specify credentials in PayPal Payments Pro configuration. + * + * @return void */ public function specifyCredentials() { @@ -70,6 +64,8 @@ public function specifyCredentials() /** * Set fields for credentials empty in PayPal Payments Pro configuration. + * + * @return void */ public function clearCredentials() { @@ -81,6 +77,18 @@ public function clearCredentials() } /** + * Return credentials fields selectors. + * + * @return array + */ + public function getFields() + { + return $this->fields; + } + + /** + * Return enabler fields selectors. + * * @return array */ public function getEnablerFields() @@ -90,6 +98,8 @@ public function getEnablerFields() /** * Click 'Configure' button to expand PayPal Payments Pro configuration. + * + * @return void */ public function clickConfigureButton() { @@ -98,6 +108,8 @@ public function clickConfigureButton() /** * Set 'Enable this Solution' = Yes. + * + * @return void */ public function enablePaymentsPro() { @@ -110,6 +122,8 @@ public function enablePaymentsPro() /** * Set 'Enable this Solution' = No. + * + * @return void */ public function disablePaymentsPro() { diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php index d1534e36cc4d6..fa0f4859e2c1d 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php @@ -87,7 +87,7 @@ public function __construct( } /** - * . + * Run step for checking PayPal Express Checkout configuration. * * @return void */ @@ -102,6 +102,8 @@ public function run() /** * Enables Express Checkout and makes assertions for fields. + * + * @return void */ private function enableExpressCheckout() { @@ -131,6 +133,8 @@ private function enableExpressCheckout() /** * Disables Express Checkout and makes assertions for fields. + * + * @return void */ private function disableExpressCheckout() { diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php index 8fb4d4734e2ba..73d1a3777fbf5 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php @@ -23,7 +23,6 @@ class CheckPayflowLinkConfigStep implements TestStepInterface */ private $systemConfigEditSectionPayment; - /** * @var AssertFieldsAreDisabled */ @@ -88,7 +87,7 @@ public function __construct( } /** - * . + * Run step for checking Payflow Link configuration. * * @return void */ @@ -101,6 +100,8 @@ public function run() /** * Enables Payflow Link and makes assertions for fields. + * + * @return void */ private function enablePayflowLink() { @@ -135,6 +136,8 @@ private function enablePayflowLink() /** * Disables Payflow Link and makes assertions for fields. + * + * @return void */ private function disablePayflowLink() { diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php index 01675de5f6c0b..5155e01db3a53 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php @@ -87,7 +87,7 @@ public function __construct( } /** - * . + * Run step for checking Payflow Pro configuration. * * @return void */ @@ -100,6 +100,8 @@ public function run() /** * Enables Payflow Pro and makes assertions for fields. + * + * @return void */ private function enablePayflowPro() { @@ -134,6 +136,8 @@ private function enablePayflowPro() /** * Disables Payflow Pro and makes assertions for fields. + * + * @return void */ private function disablePayflowPro() { diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php index 51e9b1eb908be..2cd01e425aa4c 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php @@ -87,7 +87,7 @@ public function __construct( } /** - * . + * Run step for checking Payments Advanced configuration. * * @return void */ @@ -100,6 +100,8 @@ public function run() /** * Enables Payments Advanced and makes assertions for fields. + * + * @return void */ private function enablePaymentsAdvanced() { @@ -127,6 +129,8 @@ private function enablePaymentsAdvanced() /** * Disables Payments Advanced and makes assertions for fields. + * + * @return void */ private function disablePaymentsAdvanced() { diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php index dc0102c8d1630..6ac13c679a192 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php @@ -77,7 +77,6 @@ public function __construct( $sections ) { $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment; - $this->assertSolutionsAvailableInSection = $assertSolutionsAvailableInSection; $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; $this->assertFieldsArePresent = $assertFieldsArePresent; $this->assertFieldsAreActive = $assertFieldsAreActive; @@ -88,7 +87,7 @@ public function __construct( } /** - * . + * Run step for checking Payments Pro configuration. * * @return void */ @@ -101,6 +100,8 @@ public function run() /** * Enables Payments Pro and makes assertions for fields. + * + * @return void */ private function enablePaymentsPro() { @@ -135,6 +136,8 @@ private function enablePaymentsPro() /** * Disables Payments Pro and makes assertions for fields. + * + * @return void */ private function disablePaymentsPro() { From afe356ffb82821b82968fac0629a3d0388b5cd60 Mon Sep 17 00:00:00 2001 From: Roman Liukshyn Date: Wed, 3 Aug 2016 17:17:36 +0300 Subject: [PATCH 18/21] MAGETWO-55680: Create functional tests - Added save config after disable payment method --- .../Braintree/Test/TestStep/CheckBraintreeConfigStep.php | 2 ++ .../Magento/Payment/Test/TestCase/ConflictResolutionTest.xml | 4 ++-- .../Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php | 2 ++ .../Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php | 2 ++ .../Paypal/Test/TestStep/CheckPayflowProConfigStep.php | 2 ++ .../Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php | 2 ++ .../Paypal/Test/TestStep/CheckPaymentsProConfigStep.php | 2 ++ 7 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php index a1485cf802ee0..e9cf62c14a8c1 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php @@ -133,5 +133,7 @@ private function disableBraintree() ); $this->braintreeConfigBlock->disableBraintree(); $this->assertFieldsAreActive->processAssert($this->systemConfigEditSectionPayment, $enablers); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); } } diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml index 3c18acc37ca57..f344b94fcf221 100644 --- a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml @@ -7,8 +7,8 @@ --> - + US diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php index fa0f4859e2c1d..bc6666583ae6e 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php @@ -147,5 +147,7 @@ private function disableExpressCheckout() $this->systemConfigEditSectionPayment, [$enablers['Enable In-Context Checkout Experience'], $enablers['Enable PayPal Credit']] ); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); } } diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php index 73d1a3777fbf5..6d4cef12ba048 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php @@ -153,5 +153,7 @@ private function disablePayflowLink() $this->systemConfigEditSectionPayment, [$enablers['Enable Express Checkout'], $enablers['Enable PayPal Credit']] ); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); } } diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php index 5155e01db3a53..07e495bac8abf 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php @@ -153,5 +153,7 @@ private function disablePayflowPro() $this->systemConfigEditSectionPayment, [$enablers['Enable PayPal Credit']] ); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); } } diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php index 2cd01e425aa4c..2859235e920ed 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php @@ -143,5 +143,7 @@ private function disablePaymentsAdvanced() $this->systemConfigEditSectionPayment, [$enablers['Enable PayPal Credit']] ); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); } } diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php index 6ac13c679a192..ff57d0fea4a03 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php @@ -153,5 +153,7 @@ private function disablePaymentsPro() $this->systemConfigEditSectionPayment, [$enablers['Enable PayPal Credit']] ); + $this->systemConfigEditSectionPayment->getPageActions()->save(); + $this->systemConfigEditSectionPayment->getMessagesBlock()->waitSuccessMessage(); } } From d2a3416563f56bbb6cf8839afa8072c2c8f86fb7 Mon Sep 17 00:00:00 2001 From: Dmytro Yushkin Date: Thu, 4 Aug 2016 12:51:46 +0300 Subject: [PATCH 19/21] MAGETWO-55676: PayPal Payments Configuration UX/links update - Translate labels added --- .../Braintree/etc/adminhtml/system.xml | 4 +- app/code/Magento/Braintree/i18n/en_US.csv | 3 +- .../Magento/Paypal/etc/adminhtml/system.xml | 14 +- .../etc/adminhtml/system/express_checkout.xml | 2 +- .../etc/adminhtml/system/payflow_advanced.xml | 2 +- .../etc/adminhtml/system/payflow_link.xml | 2 +- .../system/payments_pro_hosted_solution.xml | 2 +- ..._hosted_solution_with_express_checkout.xml | 2 +- .../adminhtml/system/paypal_payflowpro.xml | 2 +- app/code/Magento/Paypal/i18n/en_US.csv | 4 +- .../Structure/Reader/_files/actual/config.xml | 268 +++++++++++------- .../Reader/_files/expected/config.xml | 256 ++++++++++------- 12 files changed, 342 insertions(+), 219 deletions(-) diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml index 9c11a4a06e971..5f62a9d7cf192 100644 --- a/app/code/Magento/Braintree/etc/adminhtml/system.xml +++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml @@ -9,7 +9,7 @@
- + No setup or monthly fees and your customers never leave your store to complete the purchase.]]> complex braintree-section @@ -40,7 +40,7 @@ - + http://docs.magento.com/m2/ce/user_guide/payment/braintree.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint diff --git a/app/code/Magento/Braintree/i18n/en_US.csv b/app/code/Magento/Braintree/i18n/en_US.csv index 4cdb8538c3abf..f5e2d36e1e9bb 100644 --- a/app/code/Magento/Braintree/i18n/en_US.csv +++ b/app/code/Magento/Braintree/i18n/en_US.csv @@ -164,4 +164,5 @@ Debug,Debug "europe_bank_accout","Europe bank account" "credit_card","Credit card" "apple_pay_card","Apple pay card" -"android_pay_card","Android pay card" \ No newline at end of file +"android_pay_card","Android pay card" +"Accept credit/debit cards and PayPal in your Magento store.
No setup or monthly fees and your customers never leave your store to complete the purchase.","Accept credit/debit cards and PayPal in your Magento store.
No setup or monthly fees and your customers never leave your store to complete the purchase." \ No newline at end of file diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml index 666c7064c735a..68fe46bc258b7 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml @@ -51,7 +51,7 @@
- + complex paypal-express-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment @@ -70,7 +70,7 @@ Choose a secure bundled payment solution for your business. other_paypal_payment_solutions - + payment/paypal_payment_pro/active @@ -114,7 +114,7 @@ - + complex paypal-other-section paypal-gateways-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded @@ -125,7 +125,7 @@
- + complex paypal-express-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment @@ -185,7 +185,7 @@
- + complex paypal-express-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment @@ -206,7 +206,7 @@
- + complex paypal-express-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment @@ -274,7 +274,7 @@ complex paypal-other-section paypal-gateways-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - + payment/paypal_payment_pro/active diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml index c7da1959ec257..1876f07830ba7 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml @@ -12,7 +12,7 @@ paypal-other-section Add PayPal as an additional payment method to your checkout page. payment/paypal_express/active - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml index a99ce1df4521c..c6b29b094f896 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml @@ -12,7 +12,7 @@ Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Includes Express Checkout)]]> payment/payflow_advanced/active - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml index 45d7d1c488273..4167ea92c1b46 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml @@ -12,7 +12,7 @@ paypal-other-section Includes Express Checkout)]]> payment/payflow_link/active - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml index b4768736e17c3..37141f40549c9 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml @@ -13,7 +13,7 @@ payment/hosted_pro/active Includes Express Checkout)]]> 1 - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml index d86212ed34e8c..a70d8531f2165 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution_with_express_checkout.xml @@ -6,7 +6,7 @@ */ --> - + 0 diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml index 85640d113cf70..b567ac87c4fe2 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml @@ -13,7 +13,7 @@ Includes Express Checkout)]]> payment/payflowpro/active 1 - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv index ad97afb85e65e..5c3bf52d825b9 100644 --- a/app/code/Magento/Paypal/i18n/en_US.csv +++ b/app/code/Magento/Paypal/i18n/en_US.csv @@ -677,4 +677,6 @@ User,User The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% or more. See Details. " -"payflowpro","Payflow Pro" \ No newline at end of file +"payflowpro","Payflow Pro" +"Payments Pro","Payments Pro" +"Website Payments Pro","Website Payments Pro" \ No newline at end of file diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml index 633434d307487..6a607e45b68fa 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml +++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml @@ -5,14 +5,10 @@ * See COPYING.txt for license details. */ --> - +
- - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup - - + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded @@ -24,6 +20,21 @@ paypal/general/merchant_country + + + paypal-top-section paypal-recommended-header + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + + + + paypal-top-section paypal-other-header + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + + + + paypal-top-section payments-other-header + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded +
@@ -33,24 +44,38 @@ +
-
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group +
+ + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment + Add another payment method to your existing solution or as a stand-alone option. + https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + 0 + payment/paypal_express/active + payment/payflow_express/active + recommended_solutions + + + + + complex paypal-other-section paypal-all-in-one-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Choose a secure bundled payment solution for your business. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + other_paypal_payment_solutions - - + + payment/paypal_payment_pro/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html + 0 @@ -68,10 +93,15 @@ Accept credit card and PayPal payments securely. payment/wps_express/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html + + + payment/wps_express/active @@ -84,46 +114,45 @@ - - - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Process payments using your own internet merchant account. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + + + complex paypal-other-section paypal-gateways-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + other_paypal_payment_solutions - - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Add another payment method to your existing solution or as a stand-alone option. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - - 0 - payment/paypal_express/active - payment/payflow_express/active - -
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group + + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment + Add another payment method to your existing solution or as a stand-alone option. + https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + recommended_solutions + + + + + + + + + complex paypal-other-section paypal-all-in-one-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Choose a secure bundled payment solution for your business. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + other_paypal_payment_solutions pp-general-uk - https://www.paypal-business.co.uk/process-online-payments-with-paypal/index.htm http://www.youtube.com/watch?v=LBe-TW87eGI&list=PLF18B1094ABCD7CE8&index=1&feature=plpp_video Accept payments with a completely customizable checkout page. + @@ -132,10 +161,16 @@ Accept credit card and PayPal payments securely. payment/wps_express/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html + + + + payment/wps_express/active @@ -147,32 +182,19 @@ - - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Add another payment method to your existing solution or as a stand-alone option. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - - - - - -
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Add another payment method to your existing solution or as a stand-alone option. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - + + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment + Add another payment method to your existing solution or as a stand-alone option. + https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + recommended_solutions + @@ -184,49 +206,86 @@
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Add another payment method to your existing solution or as a stand-alone option. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - + recommended_solutions + + + + + + + + complex paypal-other-section paypal-all-in-one-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + Choose a secure bundled payment solution for your business. + https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + other_paypal_payment_solutions + + complex + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Accept credit card and PayPal payments securely. payment/wps_express/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html + + + payment/wps_express/active + - - - - - + + + + complex paypal-other-section paypal-gateways-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + Process payments using your own internet merchant account. + https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + other_paypal_payment_solutions
- + + payment/paypal_express/active + payment/payflow_express/active + + - + + + complex paypal-other-section paypal-gateways-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + + payment/paypal_payment_pro/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html + + + paypal-enabler paypal-ec-pe 0 @@ -238,75 +297,76 @@ - - + + + - - payment/paypal_express/active - payment/payflow_express/active -
- - - + + + + + + -
- + + -
- + + -
- + + -
- + + -
- + + -
- - - - + + + + + +
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml index e4187754b44da..9dc77b836656a 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml +++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml @@ -5,14 +5,10 @@ * See COPYING.txt for license details. */ --> - +
- - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup - - + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded @@ -24,6 +20,21 @@ paypal/general/merchant_country + + + paypal-top-section paypal-recommended-header + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + + + + paypal-top-section paypal-other-header + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + + + + paypal-top-section payments-other-header + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded +
@@ -33,7 +44,7 @@ Includes Express Checkout)]]> payment/payflowpro/active 1 - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint @@ -242,7 +253,7 @@ paypal-other-section Includes Express Checkout)]]> payment/payflow_link/active - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint @@ -571,7 +582,7 @@ paypal-other-section Add PayPal as an additional payment method to your checkout page. payment/paypal_express/active - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint @@ -1214,7 +1225,7 @@ payment/hosted_pro/active Includes Express Checkout)]]> 1 - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint @@ -1419,27 +1430,25 @@ +
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group + + + complex paypal-other-section paypal-all-in-one-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Choose a secure bundled payment solution for your business. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + other_paypal_payment_solutions paypal-other-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Includes Express Checkout)]]> payment/payflow_advanced/active - + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint @@ -1750,9 +1759,12 @@ - - + + payment/paypal_payment_pro/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html + 0 @@ -1770,7 +1782,12 @@ Accept credit card and PayPal payments securely. payment/wps_express/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html + + + @@ -1786,12 +1803,11 @@ - - - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Process payments using your own internet merchant account. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + + + complex paypal-other-section paypal-gateways-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + other_paypal_payment_solutions 0 @@ -2020,41 +2036,39 @@ - - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Add another payment method to your existing solution or as a stand-alone option. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - + + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment + Add another payment method to your existing solution or as a stand-alone option. + https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content 0 payment/paypal_express/active payment/payflow_express/active + recommended_solutions
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group + + + complex paypal-other-section paypal-all-in-one-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded Choose a secure bundled payment solution for your business. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + other_paypal_payment_solutions pp-general-uk - https://www.paypal-business.co.uk/process-online-payments-with-paypal/index.htm http://www.youtube.com/watch?v=LBe-TW87eGI&list=PLF18B1094ABCD7CE8&index=1&feature=plpp_video Accept payments with a completely customizable checkout page. + - + 0 @@ -2128,6 +2142,9 @@ Accept credit card and PayPal payments securely. payment/wps_express/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html + @@ -2135,6 +2152,9 @@ payment/wps_express/active + + + @@ -2143,15 +2163,16 @@ - - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Add another payment method to your existing solution or as a stand-alone option. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - + + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment + Add another payment method to your existing solution or as a stand-alone option. + https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + recommended_solutions + @@ -2159,16 +2180,17 @@
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group - Add another payment method to your existing solution or as a stand-alone option. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - + + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment + Add another payment method to your existing solution or as a stand-alone option. + https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + recommended_solutions + @@ -2180,49 +2202,86 @@
- - - 1 - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group + + + complex paypal-express-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Add another payment method to your existing solution or as a stand-alone option. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - + recommended_solutions + + + + + + + + complex paypal-other-section paypal-all-in-one-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + Choose a secure bundled payment solution for your business. + https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup + other_paypal_payment_solutions + + complex + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment Accept credit card and PayPal payments securely. payment/wps_express/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html + + + payment/wps_express/active + - - - - - + + + + complex paypal-other-section paypal-gateways-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + Process payments using your own internet merchant account. + https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content + other_paypal_payment_solutions
- + + payment/paypal_express/active + payment/payflow_express/active + + - + + + complex paypal-other-section paypal-gateways-section + Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded + + payment/paypal_payment_pro/active + + http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html + + + paypal-enabler paypal-ec-pe 0 @@ -2234,75 +2293,76 @@ - - + + + - - payment/paypal_express/active - payment/payflow_express/active -
- - - + + + + + + -
- + + -
- + + -
- + + -
- + + -
- + + -
- - - - + + + + + +
From 85b7c41222bf39bb0adfef315e33b1282b11f690 Mon Sep 17 00:00:00 2001 From: Roman Liukshyn Date: Wed, 10 Aug 2016 18:50:04 +0300 Subject: [PATCH 20/21] MAGETWO-55671: Order status should be changed related to Kount Status - Fixed annotation in integration test --- .../Controller/Adminhtml/Order/PaymentReviewTest.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php index d274784c1c8f7..f319a52e42743 100644 --- a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php +++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Order/PaymentReviewTest.php @@ -7,12 +7,10 @@ use Magento\Framework\Api\FilterBuilder; use Magento\Framework\Api\SearchCriteriaBuilder; -use Magento\Framework\App\Area; use Magento\Framework\Message\MessageInterface; use Magento\Payment\Model\Method\Adapter; use Magento\Sales\Api\Data\OrderInterface; use Magento\Sales\Api\OrderRepositoryInterface; -use Magento\Sales\Controller\Adminhtml\Order\ReviewPayment; use Magento\Sales\Model\Order; use Magento\TestFramework\TestCase\AbstractBackendController; @@ -33,9 +31,6 @@ class PaymentReviewTest extends AbstractBackendController protected function setUp() { - $this->resource = ReviewPayment::ADMIN_RESOURCE; - $this->uri = 'backend/sales/order/reviewpayment'; - $this->_getBootstrap()->loadArea(Area::AREA_ADMINHTML); parent::setUp(); /** @var FilterBuilder $filterBuilder */ @@ -61,6 +56,7 @@ protected function setUp() /** * @covers \Magento\Sales\Controller\Adminhtml\Order\ReviewPayment::execute * @magentoDataFixture Magento/Braintree/_files/fraud_order.php + * @magentoAppArea adminhtml */ public function testExecuteAccept() { @@ -81,6 +77,7 @@ public function testExecuteAccept() /** * @covers \Magento\Sales\Controller\Adminhtml\Order\ReviewPayment::execute * @magentoDataFixture Magento/Braintree/_files/fraud_order.php + * @magentoAppArea adminhtml */ public function testExecuteDeny() { From b9ec499193257cfba7a637d3f081f2e4286e2aef Mon Sep 17 00:00:00 2001 From: Roman Liukshyn Date: Thu, 11 Aug 2016 19:42:58 +0300 Subject: [PATCH 21/21] MAGETWO-54499: PayPal Payments Configuration UX Update - Fixed phpdocs in functional tests for conflict resolution --- .../Test/Block/System/Config/Payments.php | 8 ++++++++ .../Test/Block/System/Config/Braintree.php | 6 ++++++ .../Test/TestStep/CheckBraintreeConfigStep.php | 16 +++++++++++----- .../Test/TestCase/ConflictResolutionTest.xml | 2 +- .../Test/Block/System/Config/ExpressCheckout.php | 6 ++++++ .../Test/Block/System/Config/PayflowLink.php | 6 ++++++ .../Test/Block/System/Config/PayflowPro.php | 6 ++++++ .../Block/System/Config/PaymentsAdvanced.php | 6 ++++++ .../Test/Block/System/Config/PaymentsPro.php | 6 ++++++ .../Test/TestStep/CheckExpressConfigStep.php | 16 +++++++++++----- .../Test/TestStep/CheckPayflowLinkConfigStep.php | 16 +++++++++++----- .../Test/TestStep/CheckPayflowProConfigStep.php | 16 +++++++++++----- .../TestStep/CheckPaymentsAdvancedConfigStep.php | 16 +++++++++++----- .../Test/TestStep/CheckPaymentsProConfigStep.php | 16 +++++++++++----- 14 files changed, 111 insertions(+), 31 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php index 5534ab00fedbc..dc081dc5d261e 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php @@ -8,14 +8,22 @@ use Magento\Mtf\Block\Block; +/** + * Class Payments + * Payments configuration block on Stores > Configuration > Sales > Payment Methods page + */ class Payments extends Block { /** + * Merchant Country selector. + * * @var string */ protected $merchantCountrySelector = "select[id$='_account_merchant_country'] > option[value='%s']"; /** + * Solution title(e.g. PayPal Express Checkout, Payments Advanced, etc.) selector + * * @var string */ protected $solutionTitle = './strong[contains(text(), "%s")]'; diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php index 0f8fa8b41b6c4..f46f070216c6e 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php @@ -15,6 +15,8 @@ class Braintree extends Block { /** + * Braintree credentials fields sectors array. + * * @var array */ private $fields = [ @@ -24,6 +26,8 @@ class Braintree extends Block ]; /** + * Braintree enablers fields sectors array. + * * @var array */ private $enablers = [ @@ -33,6 +37,8 @@ class Braintree extends Block ]; /** + * Braintree 'Configure' button. + * * @var string */ private $configureBraintreeButton = '#payment_us_braintree_section_braintree-head'; diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php index e9cf62c14a8c1..21d11bbfdf739 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php @@ -19,6 +19,8 @@ class CheckBraintreeConfigStep implements TestStepInterface { /** + * Payments configuration page. + * * @var SystemConfigEditSectionPayment */ private $systemConfigEditSectionPayment; @@ -44,12 +46,16 @@ class CheckBraintreeConfigStep implements TestStepInterface private $assertFieldsAreEnabled; /** - * @var + * Country code. + * + * @var string */ private $countryCode; /** - * @var + * Payment sections on Payments configuration page. + * + * @var array */ private $sections; @@ -64,8 +70,8 @@ class CheckBraintreeConfigStep implements TestStepInterface * @param AssertFieldsArePresent $assertFieldsArePresent * @param AssertFieldsAreActive $assertFieldsAreActive * @param AssertFieldsAreEnabled $assertFieldsAreEnabled - * @param $countryCode - * @param $sections + * @param string $countryCode + * @param array $sections */ public function __construct( SystemConfigEditSectionPayment $systemConfigEditSectionPayment, @@ -74,7 +80,7 @@ public function __construct( AssertFieldsAreActive $assertFieldsAreActive, AssertFieldsAreEnabled $assertFieldsAreEnabled, $countryCode, - $sections + array $sections ) { $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment; $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml index f344b94fcf221..dc2ba760025fb 100644 --- a/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml +++ b/dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml @@ -8,7 +8,7 @@ + ticketId="MAGETWO-55707, MAGETWO-38531"> US diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php index aefe03b1e9b54..d83ae0c53ec0a 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php @@ -15,6 +15,8 @@ class ExpressCheckout extends Block { /** + * PayPal Express Checkout credentials fields sectors array. + * * @var array */ private $fields = [ @@ -33,6 +35,8 @@ class ExpressCheckout extends Block ]; /** + * PayPal Express Checkout enablers fields sectors array. + * * @var array */ private $enablers = [ @@ -45,6 +49,8 @@ class ExpressCheckout extends Block ]; /** + * PayPal Express Checkout 'Configure' button selector. + * * @var string */ private $configureExpressButton = '#payment_us_paypal_alternative_payment_methods_express_checkout_us-head'; diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php index 226a62f7633de..de6eb107c61ce 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php @@ -15,6 +15,8 @@ class PayflowLink extends Block { /** + * Payflow Link credentials fields sectors array. + * * @var array */ private $fields = [ @@ -31,6 +33,8 @@ class PayflowLink extends Block ]; /** + * Payflow Link enablers fields sectors array. + * * @var array */ private $enablers = [ @@ -43,6 +47,8 @@ class PayflowLink extends Block ]; /** + * Payflow Link 'Configure' button selector. + * * @var string */ private $configurePayflowLinkButton = '#payment_us_paypal_payment_gateways_payflow_link_us-head'; diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php index 92db87785f3e7..f05092745c760 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php @@ -15,6 +15,8 @@ class PayflowPro extends Block { /** + * Payflow Pro credentials fields sectors array. + * * @var array */ private $fields = [ @@ -31,6 +33,8 @@ class PayflowPro extends Block ]; /** + * Payflow Pro enablers fields sectors array. + * * @var array */ private $enablers = [ @@ -43,6 +47,8 @@ class PayflowPro extends Block ]; /** + * Payflow Pro 'Configure' button selector. + * * @var string */ private $configureProButton = '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout-head'; diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php index 6e380b603e066..cd6d1a5b1b38a 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php @@ -15,6 +15,8 @@ class PaymentsAdvanced extends Block { /** + * Payments Advanced credentials fields sectors array. + * * @var array */ private $fields = [ @@ -27,6 +29,8 @@ class PaymentsAdvanced extends Block ]; /** + * Payments Advanced enablers fields sectors array. + * * @var array */ private $enablers = [ @@ -37,6 +41,8 @@ class PaymentsAdvanced extends Block ]; /** + * Payments Advanced 'Configure' button selector. + * * @var string */ private $configureAdvancedButton = '#payment_us_paypal_group_all_in_one_payflow_advanced-head'; diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php index a6adf4dd4d8d3..709dc4b54b53f 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php @@ -15,6 +15,8 @@ class PaymentsPro extends Block { /** + * Payments Pro enablers fields sectors array. + * * @var array */ private $fields = [ @@ -31,6 +33,8 @@ class PaymentsPro extends Block ]; /** + * Payments Pro enablers fields sectors array. + * * @var array */ private $enablers = [ @@ -43,6 +47,8 @@ class PaymentsPro extends Block ]; /** + * Payments Pro 'Configure' button selector. + * * @var string */ private $configureProButton = '#payment_us_paypal_group_all_in_one_wpp_usuk-head'; diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php index bc6666583ae6e..2a0d87edcca7e 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php @@ -19,6 +19,8 @@ class CheckExpressConfigStep implements TestStepInterface { /** + * Payments configuration page. + * * @var SystemConfigEditSectionPayment */ private $systemConfigEditSectionPayment; @@ -44,12 +46,16 @@ class CheckExpressConfigStep implements TestStepInterface private $assertFieldsAreEnabled; /** - * @var + * Country code. + * + * @var string */ private $countryCode; /** - * @var + * Payment sections on Payments configuration page. + * + * @var array */ private $sections; @@ -64,8 +70,8 @@ class CheckExpressConfigStep implements TestStepInterface * @param AssertFieldsArePresent $assertFieldsArePresent * @param AssertFieldsAreActive $assertFieldsAreActive * @param AssertFieldsAreEnabled $assertFieldsAreEnabled - * @param $countryCode - * @param $sections + * @param string $countryCode + * @param array $sections */ public function __construct( SystemConfigEditSectionPayment $systemConfigEditSectionPayment, @@ -74,7 +80,7 @@ public function __construct( AssertFieldsAreActive $assertFieldsAreActive, AssertFieldsAreEnabled $assertFieldsAreEnabled, $countryCode, - $sections + array $sections ) { $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment; $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php index 6d4cef12ba048..930dc8f7f7281 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowLinkConfigStep.php @@ -19,6 +19,8 @@ class CheckPayflowLinkConfigStep implements TestStepInterface { /** + * Payments configuration page. + * * @var SystemConfigEditSectionPayment */ private $systemConfigEditSectionPayment; @@ -44,12 +46,16 @@ class CheckPayflowLinkConfigStep implements TestStepInterface private $assertFieldsAreEnabled; /** - * @var + * Country code. + * + * @var string */ private $countryCode; /** - * @var + * Payment sections on Payments configuration page. + * + * @var array */ private $sections; @@ -64,8 +70,8 @@ class CheckPayflowLinkConfigStep implements TestStepInterface * @param AssertFieldsArePresent $assertFieldsArePresent * @param AssertFieldsAreActive $assertFieldsAreActive * @param AssertFieldsAreEnabled $assertFieldsAreEnabled - * @param $countryCode - * @param $sections + * @param string $countryCode + * @param array $sections */ public function __construct( SystemConfigEditSectionPayment $systemConfigEditSectionPayment, @@ -74,7 +80,7 @@ public function __construct( AssertFieldsAreActive $assertFieldsAreActive, AssertFieldsAreEnabled $assertFieldsAreEnabled, $countryCode, - $sections + array $sections ) { $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment; $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php index 07e495bac8abf..a468fbde2f4d2 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPayflowProConfigStep.php @@ -19,6 +19,8 @@ class CheckPayflowProConfigStep implements TestStepInterface { /** + * Payments configuration page. + * * @var SystemConfigEditSectionPayment */ private $systemConfigEditSectionPayment; @@ -44,12 +46,16 @@ class CheckPayflowProConfigStep implements TestStepInterface private $assertFieldsAreEnabled; /** - * @var + * Country code. + * + * @var string */ private $countryCode; /** - * @var + * Payment sections on Payments configuration page. + * + * @var array */ private $sections; @@ -64,8 +70,8 @@ class CheckPayflowProConfigStep implements TestStepInterface * @param AssertFieldsArePresent $assertFieldsArePresent * @param AssertFieldsAreActive $assertFieldsAreActive * @param AssertFieldsAreEnabled $assertFieldsAreEnabled - * @param $countryCode - * @param $sections + * @param string $countryCode + * @param array $sections */ public function __construct( SystemConfigEditSectionPayment $systemConfigEditSectionPayment, @@ -74,7 +80,7 @@ public function __construct( AssertFieldsAreActive $assertFieldsAreActive, AssertFieldsAreEnabled $assertFieldsAreEnabled, $countryCode, - $sections + array $sections ) { $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment; $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php index 2859235e920ed..0cfa76efd7bbf 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsAdvancedConfigStep.php @@ -19,6 +19,8 @@ class CheckPaymentsAdvancedConfigStep implements TestStepInterface { /** + * Payments configuration page. + * * @var SystemConfigEditSectionPayment */ private $systemConfigEditSectionPayment; @@ -44,12 +46,16 @@ class CheckPaymentsAdvancedConfigStep implements TestStepInterface private $assertFieldsAreEnabled; /** - * @var + * Country code. + * + * @var string */ private $countryCode; /** - * @var + * Payment sections on Payments configuration page. + * + * @var array */ private $sections; @@ -64,8 +70,8 @@ class CheckPaymentsAdvancedConfigStep implements TestStepInterface * @param AssertFieldsArePresent $assertFieldsArePresent * @param AssertFieldsAreActive $assertFieldsAreActive * @param AssertFieldsAreEnabled $assertFieldsAreEnabled - * @param $countryCode - * @param $sections + * @param string $countryCode + * @param array $sections */ public function __construct( SystemConfigEditSectionPayment $systemConfigEditSectionPayment, @@ -74,7 +80,7 @@ public function __construct( AssertFieldsAreActive $assertFieldsAreActive, AssertFieldsAreEnabled $assertFieldsAreEnabled, $countryCode, - $sections + array $sections ) { $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment; $this->assertFieldsAreDisabled = $assertFieldsAreDisabled; diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php index ff57d0fea4a03..2555eab030720 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckPaymentsProConfigStep.php @@ -19,6 +19,8 @@ class CheckPaymentsProConfigStep implements TestStepInterface { /** + * Payments configuration page. + * * @var SystemConfigEditSectionPayment */ private $systemConfigEditSectionPayment; @@ -44,12 +46,16 @@ class CheckPaymentsProConfigStep implements TestStepInterface private $assertFieldsAreEnabled; /** - * @var + * Country code. + * + * @var string */ private $countryCode; /** - * @var + * Payment sections on Payments configuration page. + * + * @var array */ private $sections; @@ -64,8 +70,8 @@ class CheckPaymentsProConfigStep implements TestStepInterface * @param AssertFieldsArePresent $assertFieldsArePresent * @param AssertFieldsAreActive $assertFieldsAreActive * @param AssertFieldsAreEnabled $assertFieldsAreEnabled - * @param $countryCode - * @param $sections + * @param string $countryCode + * @param array $sections */ public function __construct( SystemConfigEditSectionPayment $systemConfigEditSectionPayment, @@ -74,7 +80,7 @@ public function __construct( AssertFieldsAreActive $assertFieldsAreActive, AssertFieldsAreEnabled $assertFieldsAreEnabled, $countryCode, - $sections + array $sections ) { $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment; $this->assertFieldsAreDisabled = $assertFieldsAreDisabled;