Skip to content

Commit aa274dc

Browse files
vzabaznovvzabaznov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-66470
2 parents d699fc8 + ed9edb1 commit aa274dc

File tree

213 files changed

+8300
-546
lines changed

Some content is hidden

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

213 files changed

+8300
-546
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ atlassian*
3232

3333
/pub/media/*.*
3434
!/pub/media/.htaccess
35+
/pub/media/attribute/*
36+
!/pub/media/attribute/.htaccess
3537
/pub/media/analytics/*
3638
/pub/media/catalog/*
3739
!/pub/media/catalog/.htaccess

‎PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<!--- Provide a description of the changes proposed in the pull request -->
55

66
### Fixed Issues (if relevant)
7-
<!--- Provide a list of fixed issues in the format magento/magetno2#<issue_number>, if relevant -->
8-
1. magento/magetno2#<issue_number>: Issue title
7+
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
8+
1. magento/magento2#<issue_number>: Issue title
99
2. ...
1010

1111
### Manual testing scenarios

‎app/code/Magento/Authorizenet/etc/di.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,23 @@
2626
</argument>
2727
</arguments>
2828
</type>
29+
<type name="Magento\Config\Model\Config\TypePool">
30+
<arguments>
31+
<argument name="sensitive" xsi:type="array">
32+
<item name="payment/authorizenet_directpost/login" xsi:type="string">1</item>
33+
<item name="payment/authorizenet_directpost/trans_key" xsi:type="string">1</item>
34+
<item name="payment/authorizenet_directpost/trans_md5" xsi:type="string">1</item>
35+
<item name="payment/authorizenet_directpost/merchant_email" xsi:type="string">1</item>
36+
<item name="payment/authorizenet_directpost/cgi_url" xsi:type="string">1</item>
37+
<item name="payment/authorizenet_directpost/cgi_url_td" xsi:type="string">1</item>
38+
<item name="payment/authorizenet_directpost/email_customer" xsi:type="string">1</item>
39+
</argument>
40+
<argument name="environment" xsi:type="array">
41+
<item name="payment/authorizenet_directpost/cgi_url" xsi:type="string">1</item>
42+
<item name="payment/authorizenet_directpost/cgi_url_td" xsi:type="string">1</item>
43+
<item name="payment/authorizenet_directpost/debug" xsi:type="string">1</item>
44+
<item name="payment/authorizenet_directpost/test" xsi:type="string">1</item>
45+
</argument>
46+
</arguments>
47+
</type>
2948
</config>

‎app/code/Magento/Backend/Block/Menu.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*
1414
* @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
1515
* @method array getAdditionalCacheKeyInfo()
16+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1617
*/
1718
class Menu extends \Magento\Backend\Block\Template
1819
{
@@ -381,7 +382,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
381382
$itemName = substr($menuId, strrpos($menuId, '::') + 2);
382383
$itemClass = str_replace('_', '-', strtolower($itemName));
383384

384-
if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake']) {
385+
if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1) {
385386
$output .= '</ul></li><li class="column"><ul role="menu">';
386387
}
387388

‎app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,18 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
121121
]
122122
);
123123

124+
$fieldset->addField(
125+
'group_code',
126+
'text',
127+
[
128+
'name' => 'group[code]',
129+
'label' => __('Code'),
130+
'value' => $groupModel->getCode(),
131+
'required' => true,
132+
'disabled' => $groupModel->isReadOnly()
133+
]
134+
);
135+
124136
$categories = $this->_category->toOptionArray();
125137

126138
$fieldset->addField(

‎app/code/Magento/Backend/etc/di.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,24 @@
194194
</argument>
195195
</arguments>
196196
</type>
197+
<type name="Magento\Config\Model\Config\TypePool">
198+
<arguments>
199+
<argument name="sensitive" xsi:type="array">
200+
<item name="admin/url/custom" xsi:type="string">1</item>
201+
<item name="admin/url/custom_path" xsi:type="string">1</item>
202+
<item name="trans_email/ident_custom1/email" xsi:type="string">1</item>
203+
<item name="trans_email/ident_custom1/name" xsi:type="string">1</item>
204+
<item name="trans_email/ident_custom2/email" xsi:type="string">1</item>
205+
<item name="trans_email/ident_custom2/name" xsi:type="string">1</item>
206+
<item name="trans_email/ident_general/email" xsi:type="string">1</item>
207+
<item name="trans_email/ident_general/name" xsi:type="string">1</item>
208+
<item name="trans_email/ident_sales/email" xsi:type="string">1</item>
209+
<item name="trans_email/ident_sales/name" xsi:type="string">1</item>
210+
<item name="trans_email/ident_support/email" xsi:type="string">1</item>
211+
<item name="trans_email/ident_support/name" xsi:type="string">1</item>
212+
</argument>
213+
</arguments>
214+
</type>
197215
<type name="Magento\Backend\Model\View\Layout\Filter">
198216
<arguments>
199217
<argument name="filters" xsi:type="array">

‎app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
namespace Magento\Braintree\Gateway\Response;
77

8-
use \Braintree\Transaction;
98
use Magento\Braintree\Gateway\Config\Config;
109
use Magento\Payment\Gateway\Helper\ContextHelper;
1110
use Magento\Sales\Api\Data\OrderPaymentInterface;

‎app/code/Magento/Braintree/etc/di.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,4 +556,20 @@
556556
</argument>
557557
</arguments>
558558
</type>
559+
<type name="Magento\Config\Model\Config\TypePool">
560+
<arguments>
561+
<argument name="sensitive" xsi:type="array">
562+
<item name="payment/braintree/merchant_id" xsi:type="string">1</item>
563+
<item name="payment/braintree/private_key" xsi:type="string">1</item>
564+
<item name="payment/braintree/merchant_account_id" xsi:type="string">1</item>
565+
<item name="payment/braintree/kount_id" xsi:type="string">1</item>
566+
<item name="payment/braintree_paypal/merchant_name_override" xsi:type="string">1</item>
567+
<item name="payment/braintree/descriptor_phone" xsi:type="string">1</item>
568+
<item name="payment/braintree/descriptor_url" xsi:type="string">1</item>
569+
</argument>
570+
<argument name="environment" xsi:type="array">
571+
<item name="payment/braintree/descriptor_url" xsi:type="string">1</item>
572+
</argument>
573+
</arguments>
574+
</type>
559575
</config>

‎app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Magento\Bundle\Model\Product\Attribute\Source\Shipment\Type as ShipmentType;
1212
use Magento\Framework\Stdlib\ArrayManager;
1313
use Magento\Ui\Component\Container;
14-
use Magento\Ui\Component\DynamicRows;
1514
use Magento\Ui\Component\Form;
1615
use Magento\Ui\Component\Modal;
1716
use Magento\Catalog\Api\Data\ProductAttributeInterface;

‎app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<?php
1212
$idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
1313
/** @var \Magento\Bundle\Pricing\Render\FinalPriceBox $block */
14-
$productId = $block->getSaleableItem()->getId();
14+
15+
1516
/** @var \Magento\Bundle\Pricing\Price\FinalPrice $finalPriceModel */
1617
$finalPriceModel = $block->getPrice();
1718
$minimalPrice = $finalPriceModel->getMinimalPrice();

0 commit comments

Comments
 (0)