Skip to content

Commit b7aa8fd

Browse files
shiftedrealityshiftedreality
committed
Merge branch '2.1-develop' of https://github.com/magento/magento2ce into MAGETWO-93205
2 parents 6e5aa02 + a160f2b commit b7aa8fd

File tree

78 files changed

+110
-89
lines changed

Some content is hidden

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

78 files changed

+110
-89
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/Braintree/view/frontend/templates/paypal/button.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ $config = [
3030
class="action-braintree-paypal-logo" disabled>
3131
<img class="braintree-paypal-button-hidden"
3232
src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
33-
alt="Pay with PayPal"/>
33+
alt="<?php echo $block->escapeHtml(__('Pay with PayPal')); ?>"
34+
title="<?php echo $block->escapeHtml(__('Pay with PayPal')); ?>"/>
3435
</button>
3536
</div>

‎app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'product/composite/fieldset/options/type/checkbox.phtml';
18+
protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml';
1919

2020
/**
2121
* @param string $elementId

‎app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'product/composite/fieldset/options/type/multi.phtml';
18+
protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml';
1919

2020
/**
2121
* @param string $elementId

‎app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'product/composite/fieldset/options/type/radio.phtml';
18+
protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/radio.phtml';
1919

2020
/**
2121
* @param string $elementId

‎app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'product/composite/fieldset/options/type/select.phtml';
18+
protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/select.phtml';
1919

2020
/**
2121
* @param string $elementId

‎app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
2020
/**
2121
* @var string
2222
*/
23-
protected $_template = 'product/edit/bundle.phtml';
23+
protected $_template = 'Magento_Bundle::product/edit/bundle.phtml';
2424

2525
/**
2626
* Core registry

‎app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Option extends \Magento\Backend\Block\Widget
2626
/**
2727
* @var string
2828
*/
29-
protected $_template = 'product/edit/bundle/option.phtml';
29+
protected $_template = 'Magento_Bundle::product/edit/bundle/option.phtml';
3030

3131
/**
3232
* Core registry

‎app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Search extends \Magento\Backend\Block\Widget
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'product/edit/bundle/option/search.phtml';
18+
protected $_template = 'Magento_Bundle::product/edit/bundle/option/search.phtml';
1919

2020
/**
2121
* @return void

‎app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Selection extends \Magento\Backend\Block\Widget
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'product/edit/bundle/option/selection.phtml';
18+
protected $_template = 'Magento_Bundle::product/edit/bundle/option/selection.phtml';
1919

2020
/**
2121
* Catalog data

0 commit comments

Comments
 (0)