Skip to content

Commit d520a75

Browse files
author
Yevhen Miroshnychenko
committed
Merge branch '2.1-develop' into MAGETWO-93265
2 parents 6473fa9 + f7731d5 commit d520a75

File tree

63 files changed

+346
-121
lines changed

Some content is hidden

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

63 files changed

+346
-121
lines changed

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ protected function saveAndReplaceAdvancedPrices()
380380
),
381381
'qty' => $rowData[self::COL_TIER_PRICE_QTY],
382382
'value' => $rowData[self::COL_TIER_PRICE],
383-
'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
383+
'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
384384
];
385385
}
386386
}

‎app/code/Magento/Authorizenet/Model/Directpost.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -820,11 +820,14 @@ protected function declineOrder(\Magento\Sales\Model\Order $order, $message = ''
820820
{
821821
try {
822822
$response = $this->getResponse();
823-
if (
824-
$voidPayment && $response->getXTransId() && strtoupper($response->getXType())
825-
== self::REQUEST_TYPE_AUTH_ONLY
823+
if ($voidPayment
824+
&& $response->getXTransId()
825+
&& strtoupper($response->getXType()) == self::REQUEST_TYPE_AUTH_ONLY
826826
) {
827-
$order->getPayment()->setTransactionId(null)->setParentTransactionId($response->getXTransId())->void();
827+
$order->getPayment()
828+
->setTransactionId(null)
829+
->setParentTransactionId($response->getXTransId())
830+
->void($response);
828831
}
829832
$order->registerCancellation($message)->save();
830833
} catch (\Exception $e) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function _prepareForm()
3737
['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
3838
);
3939

40-
$this->_prepareStoreFieldSet($form);
40+
$this->_prepareStoreFieldset($form);
4141

4242
$form->addField(
4343
'store_type',

‎app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public function execute()
5050
$user = $this->_objectManager->create('Magento\User\Model\User')->load($userId);
5151

5252
$user->setId($userId)
53-
->setUsername($this->getRequest()->getParam('username', false))
54-
->setFirstname($this->getRequest()->getParam('firstname', false))
55-
->setLastname($this->getRequest()->getParam('lastname', false))
53+
->setUserName($this->getRequest()->getParam('username', false))
54+
->setFirstName($this->getRequest()->getParam('firstname', false))
55+
->setLastName($this->getRequest()->getParam('lastname', false))
5656
->setEmail(strtolower($this->getRequest()->getParam('email', false)));
5757

5858
if ($this->_objectManager->get('Magento\Framework\Validator\Locale')->isValid($interfaceLocale)) {

‎app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
data-mage-init='{"dropdown":{}}'
3030
data-toggle="dropdown">
3131
<span class="admin__action-dropdown-text">
32-
<span class="admin-user-account-text"><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span>
32+
<span class="admin-user-account-text"><?php echo $block->escapeHtml($block->getUser()->getUserName()); ?></span>
3333
</span>
3434
</a>
3535
<ul class="admin__action-dropdown-menu">
@@ -39,7 +39,7 @@
3939
href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/system_account/index') ?>"
4040
<?php /* @escapeNotVerified */ echo $block->getUiId('user', 'account', 'settings')?>
4141
title="<?php echo $block->escapeHtml(__('Account Setting')) ?>">
42-
<?php /* @escapeNotVerified */ echo __('Account Setting') ?> (<span class="admin-user-name"><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span>)
42+
<?php /* @escapeNotVerified */ echo __('Account Setting') ?> (<span class="admin-user-name"><?php echo $block->escapeHtml($block->getUser()->getUserName()); ?></span>)
4343
</a>
4444
</li>
4545
<?php endif; ?>

‎app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
<script data-template="search-suggest" type="text/x-magento-template">
2929
<ul class="search-global-menu">
3030
<li class="item">
31-
<a id="searchPreviewProducts" href="<?php /* @escapeNotVerified */ echo $block->getURL('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
31+
<a id="searchPreviewProducts" href="<?php /* @escapeNotVerified */ echo $block->getUrl('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
3232
</li>
3333
<li class="item">
34-
<a id="searchPreviewOrders" href="<?php /* @escapeNotVerified */ echo $block->getURL('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
34+
<a id="searchPreviewOrders" href="<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
3535
</li>
3636
<li class="item">
37-
<a id="searchPreviewCustomers" href="<?php /* @escapeNotVerified */ echo $block->getURL('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
37+
<a id="searchPreviewCustomers" href="<?php /* @escapeNotVerified */ echo $block->getUrl('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
3838
</li>
3939
<li class="item">
40-
<a id="searchPreviewPages" href="<?php /* @escapeNotVerified */ echo $block->getURL('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
40+
<a id="searchPreviewPages" href="<?php /* @escapeNotVerified */ echo $block->getUrl('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
4141
</li>
4242
<% if (data.items.length) { %>
4343
<% _.each(data.items, function(value){ %>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ $numColumns = sizeof($block->getColumns());
7272
<?php if ($block->getPagerVisibility()): ?>
7373
<div class="admin__data-grid-pager-wrap">
7474
<select name="<?php /* @escapeNotVerified */ echo $block->getVarNameLimit() ?>"
75-
id="<?php echo $block->escapeHTML($block->getHtmlId())?>_page-limit"
75+
id="<?php echo $block->escapeHtml($block->getHtmlId())?>_page-limit"
7676
onchange="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.loadByElement(this)"
7777
class="admin__control-select">
7878
<option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
@@ -91,7 +91,7 @@ $numColumns = sizeof($block->getColumns());
9191
selected="selected"<?php endif; ?>>200
9292
</option>
9393
</select>
94-
<label for="<?php echo $block->escapeHTML($block->getHtmlId())?><?php echo $block->escapeHTML($block->getHtmlId())?>_page-limit"
94+
<label for="<?php echo $block->escapeHtml($block->getHtmlId())?><?php echo $block->escapeHtml($block->getHtmlId())?>_page-limit"
9595
class="admin__control-support-text"><?php /* @escapeNotVerified */ echo __('per page') ?></label>
9696

9797
<div class="admin__data-grid-pager">
@@ -107,12 +107,12 @@ $numColumns = sizeof($block->getColumns());
107107
<button type="button" class="action-previous disabled"><span><?php /* @escapeNotVerified */ echo __('Previous page') ?></span></button>
108108
<?php endif; ?>
109109
<input type="text"
110-
id="<?php echo $block->escapeHTML($block->getHtmlId())?>_page-current"
110+
id="<?php echo $block->escapeHtml($block->getHtmlId())?>_page-current"
111111
name="<?php /* @escapeNotVerified */ echo $block->getVarNamePage() ?>"
112112
value="<?php /* @escapeNotVerified */ echo $_curPage ?>"
113113
class="admin__control-text"
114114
onkeypress="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.inputPage(event, '<?php /* @escapeNotVerified */ echo $_lastPage ?>')" <?php /* @escapeNotVerified */ echo $block->getUiId('current-page') ?> />
115-
<label class="admin__control-support-text" for="<?php echo $block->escapeHTML($block->getHtmlId())?>_page-current">
115+
<label class="admin__control-support-text" for="<?php echo $block->escapeHtml($block->getHtmlId())?>_page-current">
116116
<?php /* @escapeNotVerified */ echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
117117
</label>
118118
<?php if ($_curPage < $_lastPage): ?>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function handle(array $handlingSubject, array $response)
8686
private function getCreditCardType($type)
8787
{
8888
$replaced = str_replace(' ', '-', strtolower($type));
89-
$mapper = $this->config->getCctypesMapper();
89+
$mapper = $this->config->getCcTypesMapper();
9090

9191
return $mapper[$replaced];
9292
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private function convertDetailsToJSON($details)
146146
private function getCreditCardType($type)
147147
{
148148
$replaced = str_replace(' ', '-', strtolower($type));
149-
$mapper = $this->config->getCctypesMapper();
149+
$mapper = $this->config->getCcTypesMapper();
150150

151151
return $mapper[$replaced];
152152
}

‎app/code/Magento/Braintree/Model/Ui/ConfigProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function getConfig()
8484
self::CODE => [
8585
'isActive' => $this->config->isActive($storeId),
8686
'clientToken' => $this->getClientToken(),
87-
'ccTypesMapper' => $this->config->getCctypesMapper(),
87+
'ccTypesMapper' => $this->config->getCcTypesMapper(),
8888
'sdkUrl' => $this->config->getSdkUrl(),
8989
'countrySpecificCardTypes' => $this->config->getCountrySpecificCardTypeConfig($storeId),
9090
'availableCardTypes' => $this->config->getAvailableCardTypes($storeId),

0 commit comments

Comments
 (0)