Skip to content

Commit 8e84545

Browse files
slopukhovslopukhov
committed
Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-65622
2 parents 9a51e38 + ed9edb1 commit 8e84545

File tree

121 files changed

+6302
-292
lines changed

Some content is hidden

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

121 files changed

+6302
-292
lines changed

‎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/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/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/Catalog/Model/Product/Image.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public function getQuality()
292292
*/
293293
public function setKeepAspectRatio($keep)
294294
{
295-
$this->_keepAspectRatio = (bool)$keep;
295+
$this->_keepAspectRatio = $keep && $keep !== 'false';
296296
return $this;
297297
}
298298

@@ -302,7 +302,7 @@ public function setKeepAspectRatio($keep)
302302
*/
303303
public function setKeepFrame($keep)
304304
{
305-
$this->_keepFrame = (bool)$keep;
305+
$this->_keepFrame = $keep && $keep !== 'false';
306306
return $this;
307307
}
308308

@@ -312,7 +312,7 @@ public function setKeepFrame($keep)
312312
*/
313313
public function setKeepTransparency($keep)
314314
{
315-
$this->_keepTransparency = (bool)$keep;
315+
$this->_keepTransparency = $keep && $keep !== 'false';
316316
return $this;
317317
}
318318

@@ -322,7 +322,7 @@ public function setKeepTransparency($keep)
322322
*/
323323
public function setConstrainOnly($flag)
324324
{
325-
$this->_constrainOnly = (bool)$flag;
325+
$this->_constrainOnly = $flag && $flag !== 'false';
326326
return $this;
327327
}
328328

‎app/code/Magento/Catalog/Model/ResourceModel/Category.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ public function getChildrenCategories($category)
749749
)->setOrder(
750750
'position',
751751
\Magento\Framework\DB\Select::SQL_ASC
752-
)->joinUrlRewrite()->load();
752+
)->joinUrlRewrite();
753753

754754
return $collection;
755755
}

‎app/code/Magento/CatalogInventory/Helper/Stock.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public function __construct(
8282
public function assignStatusToProduct(Product $product, $status = null)
8383
{
8484
if ($status === null) {
85-
$websiteId = $this->getStockConfiguration()->getDefaultScopeId();
86-
$stockStatus = $this->stockRegistryProvider->getStockStatus($product->getId(), $websiteId);
85+
$scopeId = $this->getStockConfiguration()->getDefaultScopeId();
86+
$stockStatus = $this->stockRegistryProvider->getStockStatus($product->getId(), $scopeId);
8787
$status = $stockStatus->getStockStatus();
8888
}
8989
$product->setIsSalable($status);
@@ -98,10 +98,10 @@ public function assignStatusToProduct(Product $product, $status = null)
9898
*/
9999
public function addStockStatusToProducts(AbstractCollection $productCollection)
100100
{
101-
$websiteId = $this->getStockConfiguration()->getDefaultScopeId();
101+
$scopeId = $this->getStockConfiguration()->getDefaultScopeId();
102102
foreach ($productCollection as $product) {
103103
$productId = $product->getId();
104-
$stockStatus = $this->stockRegistryProvider->getStockStatus($productId, $websiteId);
104+
$stockStatus = $this->stockRegistryProvider->getStockStatus($productId, $scopeId);
105105
$status = $stockStatus->getStockStatus();
106106
$product->setIsSalable($status);
107107
}

‎app/code/Magento/Checkout/Block/Cart/Item/Renderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public function getProductOptions()
268268
}
269269

270270
/**
271-
* Get list of all otions for product
271+
* Get list of all options for product
272272
*
273273
* @return array
274274
* @codeCoverageIgnore

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,11 @@
4949
</argument>
5050
</arguments>
5151
</type>
52+
<type name="Magento\Config\Model\Config\TypePool">
53+
<arguments>
54+
<argument name="sensitive" xsi:type="array">
55+
<item name="checkout/payment_failed/copy_to" xsi:type="string">1</item>
56+
</argument>
57+
</arguments>
58+
</type>
5259
</config>

0 commit comments

Comments
 (0)