Skip to content

Commit 16839c0

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #16760: [Backport] Declare module namespace before template path in Magento_Sales and Magento_Paypal (by @mageprince) - #16759: [Backport] Declare module namespace before template path in Magento_Theme, Magento_Newsletter and Magento_Tax (by @mageprince) - #16550: [Backport #16458] Add missing showInStore attributes (by @aschrammel)
2 parents 756dc8c + 1a5bce3 commit 16839c0

File tree

55 files changed

+61
-61
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+61
-61
lines changed

app/code/Magento/Braintree/etc/adminhtml/system.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<comment>http://docs.magento.com/m2/ce/user_guide/payment/braintree.html</comment>
4545
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
4646
</group>
47-
<group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="5">
47+
<group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="5">
4848
<comment><![CDATA[<a href="https://www.braintreegateway.com/login" target="_blank">Click here to login to your existing Braintree account</a>. Or to setup a new account and accept payments on your website, <a href="https://apply.braintreegateway.com/signup/us" target="_blank">click here to signup for a Braintree account</a>.<br><br>Powered by <a href="https://www.braintreepayments.com/features/hosted-fields" target="_blank">Braintree v.zero with Hosted Fields</a> 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. <a href="https://www.braintreepayments.com/features/hosted-fields" target="_blank">Find out more</a>.]]></comment>
4949
<label>Basic Braintree Settings</label>
5050
<attribute type="expanded">1</attribute>
@@ -78,7 +78,7 @@
7878
<backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
7979
</field>
8080
</group>
81-
<group id="braintree_advanced" translate="label" showInDefault="1" showInWebsite="1" sortOrder="20">
81+
<group id="braintree_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="20">
8282
<label>Advanced Braintree Settings</label>
8383
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
8484
<field id="braintree_cc_vault_title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -126,7 +126,7 @@
126126
<config_path>payment/braintree/sort_order</config_path>
127127
</field>
128128
</group>
129-
<group id="braintree_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="30">
129+
<group id="braintree_country_specific" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="30">
130130
<label>Country Specific Settings</label>
131131
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
132132
<field id="allowspecific" translate="label" type="allowspecific" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -147,7 +147,7 @@
147147
<config_path>payment/braintree/countrycreditcard</config_path>
148148
</field>
149149
</group>
150-
<group id="braintree_paypal" translate="label" showInDefault="1" showInWebsite="1" sortOrder="40">
150+
<group id="braintree_paypal" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
151151
<label>PayPal through Braintree</label>
152152
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
153153
<field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -216,7 +216,7 @@
216216
<config_path>payment/braintree_paypal/skip_order_review</config_path>
217217
</field>
218218
</group>
219-
<group id="braintree_3dsecure" translate="label" showInDefault="1" showInWebsite="1" sortOrder="41">
219+
<group id="braintree_3dsecure" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="41">
220220
<label>3D Secure Verification Settings</label>
221221
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
222222
<field id="verify_3dsecure" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -240,7 +240,7 @@
240240
<config_path>payment/braintree/verify_specific_countries</config_path>
241241
</field>
242242
</group>
243-
<group id="braintree_dynamic_descriptor" translate="label" showInDefault="1" showInWebsite="1" sortOrder="50">
243+
<group id="braintree_dynamic_descriptor" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
244244
<label>Dynamic Descriptors</label>
245245
<comment><![CDATA[Dynamic descriptors are sent on a per-transaction basis and define what will appear on your customers credit card statements for a specific purchase.
246246
The clearer the description of your product, the less likely customers will issue chargebacks due to confusion or non-recognition.
@@ -274,4 +274,4 @@
274274
</group>
275275
</section>
276276
</system>
277-
</config>
277+
</config>

app/code/Magento/Newsletter/Block/Adminhtml/Problem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Problem extends \Magento\Backend\Block\Template
1717
/**
1818
* @var string
1919
*/
20-
protected $_template = 'problem/list.phtml';
20+
protected $_template = 'Magento_Newsletter::problem/list.phtml';
2121

2222
/**
2323
* @var \Magento\Newsletter\Model\ResourceModel\Problem\Collection

app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Edit extends \Magento\Backend\Block\Template
1616
/**
1717
* @var string
1818
*/
19-
protected $_template = 'queue/edit.phtml';
19+
protected $_template = 'Magento_Newsletter::queue/edit.phtml';
2020

2121
/**
2222
* Core registry

app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Subscriber extends \Magento\Backend\Block\Template
2525
/**
2626
* @var string
2727
*/
28-
protected $_template = 'subscriber/list.phtml';
28+
protected $_template = 'Magento_Newsletter::subscriber/list.phtml';
2929

3030
/**
3131
* @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory

app/code/Magento/Newsletter/Block/Adminhtml/Template.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Template extends \Magento\Backend\Block\Template
1616
/**
1717
* @var string
1818
*/
19-
protected $_template = 'template/list.phtml';
19+
protected $_template = 'Magento_Newsletter::template/list.phtml';
2020

2121
/**
2222
* @return $this

app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ class Form extends \Magento\Backend\Block\Template
1313
/**
1414
* @var string
1515
*/
16-
protected $_template = 'billing/agreement/view/form.phtml';
16+
protected $_template = 'Magento_Paypal::billing/agreement/view/form.phtml';
1717
}

app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Info extends \Magento\Backend\Block\Template implements \Magento\Backend\B
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'billing/agreement/view/tab/info.phtml';
18+
protected $_template = 'Magento_Paypal::billing/agreement/view/tab/info.phtml';
1919

2020
/**
2121
* Core registry

app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ class Advanced extends \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink
1616
*
1717
* @var string
1818
*/
19-
protected $_template = 'system/config/payflowlink/advanced.phtml';
19+
protected $_template = 'Magento_Paypal::system/config/payflowlink/advanced.phtml';
2020
}

app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Info extends \Magento\Config\Block\System\Config\Form\Field
1616
*
1717
* @var string
1818
*/
19-
protected $_template = 'system/config/payflowlink/info.phtml';
19+
protected $_template = 'Magento_Paypal::system/config/payflowlink/info.phtml';
2020

2121
/**
2222
* Render fieldset html

app/code/Magento/Paypal/Block/Hosted/Pro/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ class Form extends \Magento\Payment\Block\Form
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'hss/info.phtml';
18+
protected $_template = 'Magento_Paypal::hss/info.phtml';
1919
}

0 commit comments

Comments
 (0)