Skip to content

Commit 004e5d0

Browse files
author
Yaroslav Onischenko
committed
Merge remote-tracking branch 'mainline/develop' into develop
2 parents 596eb3e + a307ea0 commit 004e5d0

File tree

196 files changed

+4402
-3377
lines changed

Some content is hidden

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

196 files changed

+4402
-3377
lines changed

‎app/code/Magento/Backend/App/Action/Context.php‎

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

8+
use Magento\Framework\Controller\ResultFactory;
9+
810
/**
911
* Backend Controller context
1012
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -62,6 +64,7 @@ class Context extends \Magento\Framework\App\Action\Context
6264
* @param \Magento\Framework\App\ViewInterface $view
6365
* @param \Magento\Framework\Message\ManagerInterface $messageManager
6466
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
67+
* @param \Magento\Framework\Controller\ResultFactory $resultFactory
6568
* @param \Magento\Backend\Model\Session $session
6669
* @param \Magento\Framework\AuthorizationInterface $authorization
6770
* @param \Magento\Backend\Model\Auth $auth
@@ -83,6 +86,7 @@ public function __construct(
8386
\Magento\Framework\App\ViewInterface $view,
8487
\Magento\Framework\Message\ManagerInterface $messageManager,
8588
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
89+
ResultFactory $resultFactory,
8690
\Magento\Backend\Model\Session $session,
8791
\Magento\Framework\AuthorizationInterface $authorization,
8892
\Magento\Backend\Model\Auth $auth,
@@ -102,7 +106,8 @@ public function __construct(
102106
$actionFlag,
103107
$view,
104108
$messageManager,
105-
$resultRedirectFactory
109+
$resultRedirectFactory,
110+
$resultFactory
106111
);
107112

108113
$this->_session = $session;

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function getHtml()
104104
$html =
105105
'<div class="range" id="' . $htmlId . '_range"><div class="range-line date">' . '<input type="text" name="'
106106
. $this->_getHtmlName() . '[from]" id="' . $htmlId . '_from"' . ' value="' . $this->getEscapedValue('from')
107-
. '" class="input-text no-changes" placeholder="' . __(
107+
. '" class="input-text admin__control-text no-changes" placeholder="' . __(
108108
'From'
109109
) . '" ' . $this->getUiId(
110110
'filter',
@@ -114,7 +114,7 @@ public function getHtml()
114114
$html .= '<div class="range-line date">' . '<input type="text" name="' . $this->_getHtmlName() . '[to]" id="'
115115
. $htmlId . '_to"' . ' value="' . $this->getEscapedValue(
116116
'to'
117-
) . '" class="input-text no-changes" placeholder="' . __(
117+
) . '" class="input-text admin__control-text no-changes" placeholder="' . __(
118118
'To'
119119
) . '" ' . $this->getUiId(
120120
'filter',

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,24 @@
9090
<argument name="instanceName" xsi:type="string">Magento\Backend\Model\View\Result\Page</argument>
9191
</arguments>
9292
</type>
93+
<type name="Magento\Framework\Controller\ResultFactory">
94+
<arguments>
95+
<argument name="typeMap" xsi:type="array">
96+
<item name="redirect" xsi:type="array">
97+
<item name="type" xsi:type="const">Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT</item>
98+
<item name="class" xsi:type="string">Magento\Backend\Model\View\Result\Redirect</item>
99+
</item>
100+
<item name="page" xsi:type="array">
101+
<item name="type" xsi:type="const">Magento\Framework\Controller\ResultFactory::TYPE_PAGE</item>
102+
<item name="class" xsi:type="string">Magento\Backend\Model\View\Result\Page</item>
103+
</item>
104+
<item name="forward" xsi:type="array">
105+
<item name="type" xsi:type="const">Magento\Framework\Controller\ResultFactory::TYPE_FORWARD</item>
106+
<item name="class" xsi:type="string">Magento\Backend\Model\View\Result\Forward</item>
107+
</item>
108+
</argument>
109+
</arguments>
110+
</type>
93111
<type name="Magento\Framework\View\Layout\BuilderFactory">
94112
<arguments>
95113
<argument name="typeMap" xsi:type="array">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $numColumns = sizeof($block->getColumns());
1414
<?php if ($block->getCollection()): ?>
1515
<div class="dashboard-item-content">
1616
<?php if ($block->getCollection()->getSize()>0): ?>
17-
<table class="table-info dashboard-data" id="<?php echo $block->getId() ?>_table">
17+
<table class="admin__table-primary dashboard-data" id="<?php echo $block->getId() ?>_table">
1818
<?php
1919
/* This part is commented to remove all <col> tags from the code. */
2020
/* foreach ($block->getColumns() as $_column): ?>

‎app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle */ ?>
1212
<?php $options = $block->decorateArray($block->getOptions()); ?>
1313
<?php if (count($options)): ?>
14-
<fieldset id="catalog_product_composite_configure_fields_bundle" class="fieldset admin__fieldset composite-bundle <?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
14+
<fieldset id="catalog_product_composite_configure_fields_bundle"
15+
class="fieldset admin__fieldset composite-bundle<?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
1516
<legend class="legend admin__legend"><span><?php echo __('Bundle Items') ?></span></legend><br />
1617
<?php foreach ($options as $option) : ?>
1718
<?php if ($option->getSelections()) : ?>

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

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
5151
<td class="col-product">
5252
<div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
53-
<div>
54-
<strong><?php echo __('SKU') ?>:</strong>
53+
<div class="product-sku-block">
54+
<span><?php echo __('SKU') ?>:</span>
5555
<?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
5656
</div>
5757
</td>
@@ -67,46 +67,46 @@
6767
</td>
6868
<td class="col-ordered-qty">
6969
<?php if ($block->canShowPriceInfo($_item)): ?>
70-
<table cellspacing="0" class="qty-table">
70+
<table class="data-table qty-table">
7171
<tr>
72-
<td><?php echo __('Ordered') ?></td>
73-
<td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
72+
<th><?php echo __('Ordered') ?></th>
73+
<td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
7474
</tr>
7575
<?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
7676
<tr>
77-
<td><?php echo __('Invoiced') ?></td>
78-
<td><strong><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></strong></td>
77+
<th><?php echo __('Invoiced') ?></th>
78+
<td><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
7979
</tr>
8080
<?php endif; ?>
8181
<?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
8282
<tr>
83-
<td><?php echo __('Shipped') ?></td>
84-
<td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
83+
<th><?php echo __('Shipped') ?></th>
84+
<td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
8585
</tr>
8686
<?php endif; ?>
8787
<?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
8888
<tr>
89-
<td><?php echo __('Refunded') ?></td>
90-
<td><strong><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></strong></td>
89+
<th><?php echo __('Refunded') ?></th>
90+
<td><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
9191
</tr>
9292
<?php endif; ?>
9393
<?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
9494
<tr>
95-
<td><?php echo __('Canceled') ?></td>
96-
<td><strong><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></strong></td>
95+
<th><?php echo __('Canceled') ?></th>
96+
<td><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
9797
</tr>
9898
<?php endif; ?>
9999
</table>
100100
<?php elseif ($block->isShipmentSeparately($_item)): ?>
101-
<table cellspacing="0" class="qty-table">
101+
<table class="data-table qty-table">
102102
<tr>
103-
<td><?php echo __('Ordered') ?></td>
104-
<td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
103+
<th><?php echo __('Ordered') ?></th>
104+
<td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
105105
</tr>
106106
<?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
107107
<tr>
108-
<td><?php echo __('Shipped') ?></td>
109-
<td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
108+
<th><?php echo __('Shipped') ?></th>
109+
<td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
110110
</tr>
111111
<?php endif; ?>
112112
</table>
@@ -118,17 +118,24 @@
118118
<td class="col-return-to-stock">
119119
<?php if ($block->canShowPriceInfo($_item)): ?>
120120
<?php if ($block->canReturnItemToStock($_item)) : ?>
121-
<input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]" value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
121+
<input type="checkbox"
122+
class="admin__control-checkbox"
123+
name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
124+
value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
125+
<label class="admin__field-label"></label>
122126
<?php endif; ?>
123127
<?php else: ?>
124128
&nbsp;
125129
<?php endif; ?>
126130
</td>
127131
<?php endif; ?>
128-
<td class="col-refund">
132+
<td class="col-refund col-qty">
129133
<?php if ($block->canShowPriceInfo($_item)): ?>
130134
<?php if ($block->canEditQty()) : ?>
131-
<input type="text" class="input-text qty-input" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]" value="<?php echo $_item->getQty()*1 ?>" />
135+
<input type="text"
136+
class="input-text admin__control-text qty-input"
137+
name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
138+
value="<?php echo $_item->getQty()*1 ?>" />
132139
<?php else: ?>
133140
<?php echo $_item->getQty()*1 ?>
134141
<?php endif; ?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
4949
<td class="col-product">
5050
<div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
51-
<div>
52-
<strong><?php echo __('SKU') ?>:</strong>
51+
<div class="product-sku-block">
52+
<span><?php echo __('SKU') ?>:</span>
5353
<?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
5454
</div>
5555
</td>

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

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
5050
<td class="col-product">
5151
<div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
52-
<div>
53-
<strong><?php echo __('SKU') ?>:</strong>
52+
<div class="product-sku-block">
53+
<span><?php echo __('SKU') ?>:</span>
5454
<?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
5555
</div>
5656
</td>
@@ -68,46 +68,46 @@
6868
</td>
6969
<td class="col-qty">
7070
<?php if ($block->canShowPriceInfo($_item)): ?>
71-
<table cellspacing="0" class="qty-table">
71+
<table class="data-table qty-table">
7272
<tr>
73-
<td><?php echo __('Ordered') ?></td>
73+
<th><?php echo __('Ordered') ?></th>
7474
<td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
7575
</tr>
7676
<?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
7777
<tr>
78-
<td><?php echo __('Invoiced') ?></td>
79-
<td><strong><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></strong></td>
78+
<th><?php echo __('Invoiced') ?></th>
79+
<td><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
8080
</tr>
8181
<?php endif; ?>
8282
<?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
8383
<tr>
84-
<td><?php echo __('Shipped') ?></td>
85-
<td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
84+
<th><?php echo __('Shipped') ?></th>
85+
<td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
8686
</tr>
8787
<?php endif; ?>
8888
<?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
8989
<tr>
90-
<td><?php echo __('Refunded') ?></td>
91-
<td><strong><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></strong></td>
90+
<th><?php echo __('Refunded') ?></th>
91+
<td><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
9292
</tr>
9393
<?php endif; ?>
9494
<?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
9595
<tr>
96-
<td><?php echo __('Canceled') ?></td>
97-
<td><strong><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></strong></td>
96+
<th><?php echo __('Canceled') ?></th>
97+
<td><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
9898
</tr>
9999
<?php endif; ?>
100100
</table>
101101
<?php elseif ($block->isShipmentSeparately($_item)): ?>
102-
<table cellspacing="0" class="qty-table">
102+
<table class="data-table qty-table">
103103
<tr>
104-
<td><?php echo __('Ordered') ?></td>
105-
<td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
104+
<th><?php echo __('Ordered') ?></th>
105+
<td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
106106
</tr>
107107
<?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
108108
<tr>
109-
<td><?php echo __('Shipped') ?></td>
110-
<td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
109+
<th><?php echo __('Shipped') ?></th>
110+
<td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
111111
</tr>
112112
<?php endif; ?>
113113
</table>
@@ -118,7 +118,10 @@
118118
<td class="col-qty-invoice">
119119
<?php if ($block->canShowPriceInfo($_item)): ?>
120120
<?php if ($block->canEditQty()) : ?>
121-
<input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" />
121+
<input type="text"
122+
class="input-text admin__control-text qty-input"
123+
name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
124+
value="<?php echo $_item->getQty()*1 ?>" />
122125
<?php else : ?>
123126
<?php echo $_item->getQty()*1 ?>
124127
<?php endif; ?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
4949
<td class="col-product">
5050
<div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
51-
<div>
52-
<strong><?php echo __('SKU') ?>:</strong>
51+
<div class="product-sku-block">
52+
<span><?php echo __('SKU') ?>:</span>
5353
<?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
5454
</div>
5555
<?php else: ?>

0 commit comments

Comments
 (0)