Skip to content

Commit c57bf03

Browse files
author
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into develop
Conflicts: app/code/Magento/Checkout/Controller/Cart.php app/code/Magento/Checkout/Controller/Cart/Configure.php app/code/Magento/Checkout/Controller/Cart/CouponPost.php app/code/Magento/Checkout/Controller/Cart/EstimatePost.php app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
2 parents 45bfca1 + 412f811 commit c57bf03

File tree

498 files changed

+9968
-9223
lines changed

Some content is hidden

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

498 files changed

+9968
-9223
lines changed

‎Gruntfile.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ module.exports = function (grunt) {
99

1010
// Required plugins
1111
// _____________________________________________
12-
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
12+
13+
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt),
14+
svgo = require('imagemin-svgo');
1315

1416
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
1517

@@ -21,8 +23,6 @@ module.exports = function (grunt) {
2123
pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
2224
});
2325

24-
var svgo = require('imagemin-svgo');
25-
2626
// Configuration
2727
// _____________________________________________
2828

@@ -318,7 +318,8 @@ module.exports = function (grunt) {
318318

319319
cssmin: {
320320
options: {
321-
report: 'gzip'
321+
report: 'gzip',
322+
keepSpecialComments: 0
322323
},
323324
setup: {
324325
files: {
@@ -342,6 +343,20 @@ module.exports = function (grunt) {
342343
}
343344
},
344345

346+
// Concatenation
347+
// ---------------------------------------------
348+
349+
concat: {
350+
options: {
351+
stripBanners: true,
352+
banner: '/**\n * Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n'
353+
},
354+
setup: {
355+
src: '<%= path.css.setup %>/setup.css',
356+
dest: '<%= path.css.setup %>/setup.css'
357+
}
358+
},
359+
345360

346361
// Watches files for changes and runs tasks based on the changed files
347362
// ---------------------------------------------
@@ -545,7 +560,8 @@ module.exports = function (grunt) {
545560
grunt.task.run([
546561
'less:' + component,
547562
'autoprefixer:' + component,
548-
'cssmin:' + component
563+
'cssmin:' + component,
564+
'concat:' + component
549565
]);
550566
}
551567
if (component == undefined) {

‎app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getUnreadMessages()
6666
/**
6767
* Retrieve popup title
6868
*
69-
* @return string
69+
* @return \Magento\Framework\Phrase
7070
*/
7171
public function getPopupTitle()
7272
{

‎app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function isDisplayed()
116116
/**
117117
* Retrieve message text
118118
*
119-
* @return string
119+
* @return \Magento\Framework\Phrase
120120
*/
121121
public function getText()
122122
{

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function _shouldBeDisplayed()
3131
/**
3232
* Retrieve message text
3333
*
34-
* @return string
34+
* @return \Magento\Framework\Phrase
3535
*/
3636
public function getText()
3737
{

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function _shouldBeDisplayed()
3030
/**
3131
* Retrieve message text
3232
*
33-
* @return string
33+
* @return \Magento\Framework\Phrase
3434
*/
3535
public function getText()
3636
{

‎app/code/Magento/AdminNotification/Model/System/Message/Security.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function isDisplayed()
131131
/**
132132
* Retrieve message text
133133
*
134-
* @return string
134+
* @return \Magento\Framework\Phrase
135135
*/
136136
public function getText()
137137
{

‎app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ protected function _prepareColumns()
110110
'items',
111111
[
112112
'header' => __('Items'),
113-
'align' => 'right',
114113
'type' => 'number',
115114
'sortable' => false,
116115
'index' => 'items_count'
@@ -122,8 +121,7 @@ protected function _prepareColumns()
122121
$this->addColumn(
123122
'total',
124123
[
125-
'header' => __('Grand Total'),
126-
'align' => 'right',
124+
'header' => __('Total'),
127125
'sortable' => false,
128126
'type' => 'currency',
129127
'currency_code' => $baseCurrencyCode,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ protected function _prepareLayout()
7171
$sales = $collection->getFirstItem();
7272

7373
$this->addTotal(__('Lifetime Sales'), $sales->getLifetime());
74-
$this->addTotal(__('Average Orders'), $sales->getAverage());
74+
$this->addTotal(__('Average Order'), $sales->getAverage());
7575
}
7676
}

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,25 @@ protected function _prepareColumns()
9191
'orders_avg_amount',
9292
[
9393
'header' => __('Average'),
94-
'align' => 'right',
9594
'sortable' => false,
9695
'type' => 'currency',
9796
'currency_code' => $baseCurrencyCode,
98-
'index' => 'orders_avg_amount'
97+
'index' => 'orders_avg_amount',
98+
'header_css_class' => 'col-avg',
99+
'column_css_class' => 'col-avg'
99100
]
100101
);
101102

102103
$this->addColumn(
103104
'orders_sum_amount',
104105
[
105106
'header' => __('Total'),
106-
'align' => 'right',
107107
'sortable' => false,
108108
'type' => 'currency',
109109
'currency_code' => $baseCurrencyCode,
110-
'index' => 'orders_sum_amount'
110+
'index' => 'orders_sum_amount',
111+
'header_css_class' => 'col-total',
112+
'column_css_class' => 'col-total'
111113
]
112114
);
113115

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,27 @@ protected function _prepareColumns()
8989
'orders_avg_amount',
9090
[
9191
'header' => __('Average'),
92-
'align' => 'right',
9392
'sortable' => false,
9493
'type' => 'currency',
9594
'currency_code' => $baseCurrencyCode,
9695
'index' => 'orders_avg_amount',
97-
'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
96+
'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
97+
'header_css_class' => 'col-avg',
98+
'column_css_class' => 'col-avg'
9899
]
99100
);
100101

101102
$this->addColumn(
102103
'orders_sum_amount',
103104
[
104105
'header' => __('Total'),
105-
'align' => 'right',
106106
'sortable' => false,
107107
'type' => 'currency',
108108
'currency_code' => $baseCurrencyCode,
109109
'index' => 'orders_sum_amount',
110-
'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
110+
'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
111+
'header_css_class' => 'col-total',
112+
'column_css_class' => 'col-total'
111113
]
112114
);
113115

0 commit comments

Comments
 (0)