Skip to content

Commit 569e2eb

Browse files
magento-cicd2magento-cicd2
authored
merge magento/2.3-develop into magento-pangolin/2.3-tests-pr
2 parents 32cb505 + 9b8849d commit 569e2eb

File tree

140 files changed

+3377
-982
lines changed

Some content is hidden

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

140 files changed

+3377
-982
lines changed

‎app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
"successText": "<?= $block->escapeHtmlAttr(__('Successful! Test again?')) ?>",
1212
"failedText": "<?= $block->escapeHtmlAttr(__('Connection failed! Test again?')) ?>",
1313
"fieldMapping": "<?= /* @noEscape */ $block->getFieldMapping() ?>"}, "validation": {}}'>
14-
<span><span><span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span></span></span>
14+
<span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
1515
</button>

‎app/code/Magento/Backend/Block/Dashboard/Bar.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\Backend\Block\Dashboard;
77

8+
use Magento\Store\Model\Store;
9+
810
/**
911
* Adminhtml dashboard bar block
1012
*
@@ -23,6 +25,8 @@ class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
2325
protected $_currentCurrencyCode = null;
2426

2527
/**
28+
* Get totals
29+
*
2630
* @return array
2731
*/
2832
public function getTotals()
@@ -31,6 +35,8 @@ public function getTotals()
3135
}
3236

3337
/**
38+
* Add total
39+
*
3440
* @param string $label
3541
* @param float $value
3642
* @param bool $isQuantity
@@ -73,6 +79,7 @@ public function setCurrency($currency)
7379
* Retrieve currency model if not set then return currency model for current store
7480
*
7581
* @return \Magento\Directory\Model\Currency
82+
* @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
7683
*/
7784
public function getCurrency()
7885
{
@@ -90,7 +97,8 @@ public function getCurrency()
9097
$this->getRequest()->getParam('group')
9198
)->getWebsite()->getBaseCurrency();
9299
} else {
93-
$this->_currentCurrencyCode = $this->_storeManager->getStore()->getBaseCurrency();
100+
$this->_currentCurrencyCode = $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)
101+
->getBaseCurrency();
94102
}
95103
}
96104

‎app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<?php if ($block->hasDefaultOption()) : ?>
3737
<li class="store-switcher-all <?php if (!($block->getDefaultSelectionName() != $block->getCurrentSelectionName())) : ?>disabled<?php endif; ?> <?php if (!$block->hasScopeSelected()) : ?>current<?php endif; ?>">
3838
<?php if ($block->getDefaultSelectionName() != $block->getCurrentSelectionName()) : ?>
39-
?>
4039
<a data-role="store-view-id" data-value="" href="#">
4140
<?= $block->escapeHtml($block->getDefaultSelectionName()) ?>
4241
</a>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,4 @@
3838
<waitForPageLoad stepKey="waitForSaveUser" time="10"/>
3939
<see userInput="You saved the user." stepKey="seeSuccessMessage" />
4040
</actionGroup>
41-
42-
<!--Delete User-->
43-
<actionGroup name="AdminDeleteNewUserActionGroup">
44-
45-
<click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
46-
<fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
47-
<scrollToTopOfPage stepKey="scrollToTop"/>
48-
<click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
49-
<waitForPageLoad stepKey="waitForDeletePopupOpen" time="5"/>
50-
<click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
51-
<waitForPageLoad stepKey="waitForPageLoad" time="10"/>
52-
<see userInput="You deleted the user." stepKey="seeSuccessMessage" />
53-
</actionGroup>
54-
5541
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
88

99
/**
10-
* Bundle Extended Attribures Block.
10+
* Bundle Extended Attributes Block.
1111
*
1212
* @author Magento Core Team <core@magentocommerce.com>
1313
*/

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,43 +68,43 @@
6868
<table class="qty-table">
6969
<tr>
7070
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
71-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
71+
<td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
7272
</tr>
7373
<?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
7474
<tr>
7575
<th><?= $block->escapeHtml(__('Invoiced')) ?></th>
76-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyInvoiced()*1) ?></td>
76+
<td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
7777
</tr>
7878
<?php endif; ?>
7979
<?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
8080
<tr>
8181
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
82-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
82+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
8383
</tr>
8484
<?php endif; ?>
8585
<?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
8686
<tr>
8787
<th><?= $block->escapeHtml(__('Refunded')) ?></th>
88-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyRefunded()*1) ?></td>
88+
<td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
8989
</tr>
9090
<?php endif; ?>
9191
<?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
9292
<tr>
9393
<th><?= $block->escapeHtml(__('Canceled')) ?></th>
94-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyCanceled()*1) ?></td>
94+
<td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
9595
</tr>
9696
<?php endif; ?>
9797
</table>
9898
<?php elseif ($block->isShipmentSeparately($_item)) : ?>
9999
<table class="qty-table">
100100
<tr>
101101
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
102-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
102+
<td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
103103
</tr>
104104
<?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
105105
<tr>
106106
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
107-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
107+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
108108
</tr>
109109
<?php endif; ?>
110110
</table>
@@ -133,9 +133,9 @@
133133
<input type="text"
134134
class="input-text admin__control-text qty-input"
135135
name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>][qty]"
136-
value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>" />
136+
value="<?= (float)$_item->getQty() * 1 ?>" />
137137
<?php else : ?>
138-
<?= $block->escapeHtml($_item->getQty()*1) ?>
138+
<?= (float)$_item->getQty() * 1 ?>
139139
<?php endif; ?>
140140
<?php else : ?>
141141
&nbsp;

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</td>
6464
<td class="col-qty">
6565
<?php if ($block->canShowPriceInfo($_item)) : ?>
66-
<?= $block->escapeHtml($_item->getQty()*1) ?>
66+
<?= (float)$_item->getQty() * 1 ?>
6767
<?php else : ?>
6868
&nbsp;
6969
<?php endif; ?>

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,43 +78,43 @@
7878
<table class="qty-table">
7979
<tr>
8080
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
81-
<td><span><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></span></td>
81+
<td><span><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></span></td>
8282
</tr>
8383
<?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
8484
<tr>
8585
<th><?= $block->escapeHtml(__('Invoiced')) ?></th>
86-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyInvoiced()*1) ?></td>
86+
<td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
8787
</tr>
8888
<?php endif; ?>
8989
<?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
9090
<tr>
9191
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
92-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
92+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
9393
</tr>
9494
<?php endif; ?>
9595
<?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
9696
<tr>
9797
<th><?= $block->escapeHtml(__('Refunded')) ?></th>
98-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyRefunded()*1) ?></td>
98+
<td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
9999
</tr>
100100
<?php endif; ?>
101101
<?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
102102
<tr>
103103
<th><?= $block->escapeHtml(__('Canceled')) ?></th>
104-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyCanceled()*1) ?></td>
104+
<td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
105105
</tr>
106106
<?php endif; ?>
107107
</table>
108108
<?php elseif ($block->isShipmentSeparately($_item)) : ?>
109109
<table class="qty-table">
110110
<tr>
111111
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
112-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
112+
<td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
113113
</tr>
114114
<?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
115115
<tr>
116116
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
117-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
117+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
118118
</tr>
119119
<?php endif; ?>
120120
</table>
@@ -128,9 +128,9 @@
128128
<input type="text"
129129
class="input-text admin__control-text qty-input"
130130
name="invoice[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
131-
value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>" />
131+
value="<?= (float)$_item->getQty() * 1 ?>" />
132132
<?php else : ?>
133-
<?= $block->escapeHtml($_item->getQty()*1) ?>
133+
<?= (float)$_item->getQty() * 1 ?>
134134
<?php endif; ?>
135135
<?php else : ?>
136136
&nbsp;

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</td>
6565
<td class="col-qty">
6666
<?php if ($block->canShowPriceInfo($_item)) : ?>
67-
<?= $block->escapeHtml($_item->getQty()*1) ?>
67+
<?= (float)$_item->getQty() * 1 ?>
6868
<?php else : ?>
6969
&nbsp;
7070
<?php endif; ?>

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,43 +87,43 @@
8787
<table class="qty-table">
8888
<tr>
8989
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
90-
<td><?= $block->escapeHtml($_item->getQtyOrdered()*1) ?></td>
90+
<td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
9191
</tr>
9292
<?php if ((float) $_item->getQtyInvoiced()) : ?>
9393
<tr>
9494
<th><?= $block->escapeHtml(__('Invoiced')) ?></th>
95-
<td><?= $block->escapeHtml($_item->getQtyInvoiced()*1) ?></td>
95+
<td><?= (float)$_item->getQtyInvoiced() * 1 ?></td>
9696
</tr>
9797
<?php endif; ?>
9898
<?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
9999
<tr>
100100
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
101-
<td><?= $block->escapeHtml($_item->getQtyShipped()*1) ?></td>
101+
<td><?= (float)$_item->getQtyShipped() * 1 ?></td>
102102
</tr>
103103
<?php endif; ?>
104104
<?php if ((float) $_item->getQtyRefunded()) : ?>
105105
<tr>
106106
<th><?= $block->escapeHtml(__('Refunded')) ?></th>
107-
<td><?= $block->escapeHtml($_item->getQtyRefunded()*1) ?></td>
107+
<td><?= (float)$_item->getQtyRefunded() * 1 ?></td>
108108
</tr>
109109
<?php endif; ?>
110110
<?php if ((float) $_item->getQtyCanceled()) : ?>
111111
<tr>
112112
<th><?= $block->escapeHtml(__('Canceled')) ?></th>
113-
<td><?= $block->escapeHtml($_item->getQtyCanceled()*1) ?></td>
113+
<td><?= (float)$_item->getQtyCanceled() * 1 ?></td>
114114
</tr>
115115
<?php endif; ?>
116116
</table>
117117
<?php elseif ($block->isShipmentSeparately($_item)) : ?>
118118
<table class="qty-table">
119119
<tr>
120120
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
121-
<td><?= $block->escapeHtml($_item->getQtyOrdered()*1) ?></td>
121+
<td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
122122
</tr>
123123
<?php if ((float) $_item->getQtyShipped()) : ?>
124124
<tr>
125125
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
126-
<td><?= $block->escapeHtml($_item->getQtyShipped()*1) ?></td>
126+
<td><?= (float)$_item->getQtyShipped() * 1 ?></td>
127127
</tr>
128128
<?php endif; ?>
129129
</table>

0 commit comments

Comments
 (0)