Skip to content

Commit fa8e10d

Browse files
viktymviktym
committed
MAGETWO-59893: Email Associated with PayPal Merchant Account Adaptation for On-Boarding
- Make field "Email Associated with PayPal Merchant Account" optional - Remove it from Conflict Resolution test
1 parent d7a3849 commit fa8e10d

File tree

6 files changed

+2
-26
lines changed

6 files changed

+2
-26
lines changed

‎app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
<label>Express Checkout</label>
2424
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
2525
<field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
26-
<label>Email Associated with PayPal Merchant Account</label>
26+
<label>Email Associated with PayPal Merchant Account (Optional)</label>
27+
<frontend_class>not-required</frontend_class>
2728
<comment>
2829
<![CDATA[<a href="http://www.magentocommerce.com/paypal">Start accepting payments via PayPal!</a>]]>
2930
</comment>

‎dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ class ExpressCheckout extends Block
2020
* @var array
2121
*/
2222
private $fields = [
23-
'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_alternative_payment_methods_express_' .
24-
'checkout_us_express_checkout_required_express_checkout_required_express_checkout_business_account',
2523
'API Username' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' .
2624
'required_express_checkout_required_express_checkout_api_username',
2725
'API Password' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' .
@@ -72,8 +70,6 @@ public function getFields()
7270
*/
7371
public function specifyCredentials()
7472
{
75-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
76-
->setValue('test@test.com');
7773
$this->_rootElement->find($this->fields['API Username'])->setValue('1');
7874
$this->_rootElement->find($this->fields['API Password'])->setValue('1');
7975
$this->_rootElement->find($this->fields['API Signature'])->setValue('1');
@@ -86,7 +82,6 @@ public function specifyCredentials()
8682
*/
8783
public function clearCredentials()
8884
{
89-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
9085
$this->_rootElement->find($this->fields['API Username'])->setValue('');
9186
$this->_rootElement->find($this->fields['API Password'])->setValue('');
9287
$this->_rootElement->find($this->fields['API Signature'])->setValue('');

‎dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ class PayflowLink extends Block
2020
* @var array
2121
*/
2222
private $fields = [
23-
'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_payment_gateways_payflow_link_us_' .
24-
'payflow_link_required_payflow_link_payflow_link_business_account',
2523
'Partner' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' .
2624
'link_partner',
2725
'Vendor' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' .
@@ -60,8 +58,6 @@ class PayflowLink extends Block
6058
*/
6159
public function specifyCredentials()
6260
{
63-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
64-
->setValue('test@test.com');
6561
$this->_rootElement->find($this->fields['Partner'])->setValue('1');
6662
$this->_rootElement->find($this->fields['Vendor'])->setValue('1');
6763
$this->_rootElement->find($this->fields['User'])->setValue('1');
@@ -75,7 +71,6 @@ public function specifyCredentials()
7571
*/
7672
public function clearCredentials()
7773
{
78-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
7974
$this->_rootElement->find($this->fields['Partner'])->setValue('');
8075
$this->_rootElement->find($this->fields['Vendor'])->setValue('');
8176
$this->_rootElement->find($this->fields['User'])->setValue('');

‎dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ class PayflowPro extends Block
2020
* @var array
2121
*/
2222
private $fields = [
23-
'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_' .
24-
'with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings_business_account',
2523
'Partner' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' .
2624
'required_paypal_payflow_api_settings_partner',
2725
'Vendor' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' .
@@ -60,8 +58,6 @@ class PayflowPro extends Block
6058
*/
6159
public function specifyCredentials()
6260
{
63-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
64-
->setValue('test@test.com');
6561
$this->_rootElement->find($this->fields['Partner'])->setValue('1');
6662
$this->_rootElement->find($this->fields['Vendor'])->setValue('1');
6763
$this->_rootElement->find($this->fields['User'])->setValue('1');
@@ -75,7 +71,6 @@ public function specifyCredentials()
7571
*/
7672
public function clearCredentials()
7773
{
78-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
7974
$this->_rootElement->find($this->fields['Partner'])->setValue('');
8075
$this->_rootElement->find($this->fields['Vendor'])->setValue('');
8176
$this->_rootElement->find($this->fields['User'])->setValue('');

‎dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ class PaymentsAdvanced extends Block
2020
* @var array
2121
*/
2222
private $fields = [
23-
'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_group_all_in_one_payflow_advanced_' .
24-
'required_settings_payments_advanced_business_account',
2523
'Partner' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_partner',
2624
'Vendor' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_vendor',
2725
'User' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_user',
@@ -54,8 +52,6 @@ class PaymentsAdvanced extends Block
5452
*/
5553
public function specifyCredentials()
5654
{
57-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
58-
->setValue('test@test.com');
5955
$this->_rootElement->find($this->fields['Partner'])->setValue('1');
6056
$this->_rootElement->find($this->fields['Vendor'])->setValue('1');
6157
$this->_rootElement->find($this->fields['User'])->setValue('1');
@@ -69,7 +65,6 @@ public function specifyCredentials()
6965
*/
7066
public function clearCredentials()
7167
{
72-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
7368
$this->_rootElement->find($this->fields['Partner'])->setValue('');
7469
$this->_rootElement->find($this->fields['Vendor'])->setValue('');
7570
$this->_rootElement->find($this->fields['User'])->setValue('');

‎dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ class PaymentsPro extends Block
2020
* @var array
2121
*/
2222
private $fields = [
23-
'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_' .
24-
'payflow_required_paypal_payflow_api_settings_business_account',
2523
'Partner' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' .
2624
'settings_partner',
2725
'Vendor' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' .
@@ -60,8 +58,6 @@ class PaymentsPro extends Block
6058
*/
6159
public function specifyCredentials()
6260
{
63-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
64-
->setValue('test@test.com');
6561
$this->_rootElement->find($this->fields['Partner'])->setValue('1');
6662
$this->_rootElement->find($this->fields['Vendor'])->setValue('1');
6763
$this->_rootElement->find($this->fields['User'])->setValue('1');
@@ -75,7 +71,6 @@ public function specifyCredentials()
7571
*/
7672
public function clearCredentials()
7773
{
78-
$this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
7974
$this->_rootElement->find($this->fields['Partner'])->setValue('');
8075
$this->_rootElement->find($this->fields['Vendor'])->setValue('');
8176
$this->_rootElement->find($this->fields['User'])->setValue('');

0 commit comments

Comments
 (0)