Skip to content

Commit d8f1163

Browse files
author
Natalia Momotenko
committed
MAGETWO-32275: Dashboard
- Merge remote-tracking branch 'magento2ce/develop' into develop Conflicts: app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
2 parents 086b7ca + b32bd91 commit d8f1163

File tree

446 files changed

+4373
-2162
lines changed

Some content is hidden

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

446 files changed

+4373
-2162
lines changed

‎CHANGELOG.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
0.42.0-beta7
2+
=============
3+
* Various improvements:
4+
* Added Varnish 4 support
5+
* Added CSS minification
6+
* Improved the performance toolkit
7+
* Fixed bugs:
8+
* Fixed an issue where the compiler for the single tenant mode did not resolve Repositories
9+
* Fixed an issue where the "Select all" mass action on the Customers page did not select all customers
10+
* Fixed an issue where values for a customer attribute of multiple-select type were not saved
11+
* Fixed an issue where the parental wakeup() method was not called in interceptors
12+
* Fixed an issue where bundle products with the same configurations added from different pages were displayed in the wishlist as separate items
13+
* Fixed an issue where the number of items added to the wishlist was not displayed on certain pages
14+
* Fixed an issue where logging was broken
15+
* Fixed an issue where it was impossible to use \Magento\Customer\Model\Resource\AddressRepository::getList with predefined direction(sortOrder)
16+
* Fixed an issue where editing a product from wishlist led caused a fatal error
17+
* Fixed an issue where the redirect link to continue shopping was absent in the success message after adding product to a wishlist
18+
* Fixed an issue where HTML tags where displayed in product prices on the Customer's Wishlist page in Admin
19+
* Fixed an issue where the Name and Email fields were not automatically when creating an email using the Email to Friend functionality
20+
* Fixed an issue with the redirect after searching product in a customer wishlist in Admin
21+
* Fixed an issue where a configurable product did not go out of stock when last subitem of some option was sold
22+
* Fixed an issue with varnish config generation for multiple IPs in access list field
23+
* Fixed the wrong di.xml in the Magento_Developer module
24+
* Fixed an issue where changes were not saved when default billing/shipping address was not selected in customer addresses
25+
* Fixed the issue where the Update Qty button looked disabled during a partial invoice creation
26+
* Fixed an issue where the creation date was not displayed in invoices and credit memo grids
27+
* Fixed an issue where it was impossible to install Magento_Quote on PHP 5.6
28+
* Fixed an issue that changes are not saved when default billing/shipping address is unchecked in customer addresses
29+
* Fixed an issue where "Update Qty" button looks disabled while creating partial invoice
30+
* Fixed an issue where date created column is not populated in invoices and credit memo grid
31+
* Fixed an issue with installation of Magento_Quote module on PHP 5.6
32+
* Fixed an issue with wrong link "File Permission Help"
33+
* Fixed an issue where dev/tools are broken when DI compiler is used due to skipped by the compiler dev/tools/Magento folder
34+
* Framework improvements:
35+
* JavaScript testsuites divided into frontend, backend and lib suites
36+
* Implemented image compression on server side upload
37+
* Implemented frontend page resources sorting
38+
* Removed the Magic __call method usage in templates
39+
* Introduced Jasmine + PhantomJS JavaScript testing infrastructure
40+
* Removed support of PHP 5.4
41+
* Setup Tool improvements:
42+
* Added tools for enabling/disabling modules: "module-enable --modules=Module_One,Module_Two, module-disable --modules=Module_One,Module_Two"
43+
* Added help option for displaying list of available modules: "help module-list"
44+
* GitHub requests :
45+
* [#593](https://github.com/magento/magento2/issues/593) -- Allow to use "0" as customer group
46+
* [#804](https://github.com/magento/magento2/issues/804) -- Comment about VAT number displayed under different field in Customer Configuration
47+
148
0.42.0-beta6
249
=============
350
* Various improvements:

‎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
@@ -114,7 +114,7 @@ public function isDisplayed()
114114
/**
115115
* Retrieve message text
116116
*
117-
* @return string
117+
* @return \Magento\Framework\Phrase
118118
*/
119119
public function getText()
120120
{

‎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
@@ -129,7 +129,7 @@ public function isDisplayed()
129129
/**
130130
* Retrieve message text
131131
*
132-
* @return string
132+
* @return \Magento\Framework\Phrase
133133
*/
134134
public function getText()
135135
{

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta6",
7-
"magento/module-core": "0.42.0-beta6",
8-
"magento/module-backend": "0.42.0-beta6",
9-
"magento/framework": "0.42.0-beta6",
6+
"magento/module-store": "0.42.0-beta7",
7+
"magento/module-core": "0.42.0-beta7",
8+
"magento/module-backend": "0.42.0-beta7",
9+
"magento/framework": "0.42.0-beta7",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta6",
14+
"version": "0.42.0-beta7",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta6",
7-
"magento/framework": "0.42.0-beta6",
6+
"magento/module-backend": "0.42.0-beta7",
7+
"magento/framework": "0.42.0-beta7",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta6",
11+
"version": "0.42.0-beta7",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/Block/System/Account/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected function _construct()
2727
}
2828

2929
/**
30-
* @return string
30+
* @return \Magento\Framework\Phrase
3131
*/
3232
public function getHeaderText()
3333
{

‎app/code/Magento/Backend/Block/System/Store/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected function _construct()
4949
/**
5050
* Get edit form container header text
5151
*
52-
* @return string
52+
* @return \Magento\Framework\Phrase
5353
*/
5454
public function getHeaderText()
5555
{

‎app/code/Magento/Backend/Block/System/Variable/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function getFormHtml()
9797
/**
9898
* Return translated header text depending on creating/editing action
9999
*
100-
* @return string
100+
* @return \Magento\Framework\Phrase
101101
*/
102102
public function getHeaderText()
103103
{

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected function _getShowEmptyStoresLabelFlag()
8383
* Render row store views
8484
*
8585
* @param \Magento\Framework\Object $row
86-
* @return string
86+
* @return \Magento\Framework\Phrase|string
8787
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
8888
* @SuppressWarnings(PHPMD.NPathComplexity)
8989
*/
@@ -135,7 +135,7 @@ public function render(\Magento\Framework\Object $row)
135135
* Render row store views for export
136136
*
137137
* @param \Magento\Framework\Object $row
138-
* @return string
138+
* @return \Magento\Framework\Phrase|string
139139
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
140140
*/
141141
public function renderExport(\Magento\Framework\Object $row)

‎app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Backend\Controller\Adminhtml\Dashboard;
8+
9+
class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
10+
{
11+
/**
12+
* @param \Magento\Backend\App\Action\Context $context
13+
* @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
14+
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
15+
* @param array $reportTypes
16+
* @param \Psr\Log\LoggerInterface $logger
17+
*/
18+
public function __construct(
19+
\Magento\Backend\App\Action\Context $context,
20+
\Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
21+
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
22+
array $reportTypes,
23+
\Psr\Log\LoggerInterface $logger
24+
) {
25+
parent::__construct($context, $dateFilter, $resultRedirectFactory, $reportTypes);
26+
$this->logger = $logger;
27+
}
28+
29+
/**
30+
* @return \Magento\Backend\Model\View\Result\Redirect
31+
*/
32+
public function execute()
33+
{
34+
try {
35+
$collectionsNames = array_values($this->reportTypes);
36+
foreach ($collectionsNames as $collectionName) {
37+
$this->_objectManager->create($collectionName)->aggregate();
38+
}
39+
$this->messageManager->addSuccess(__('We updated lifetime statistic.'));
40+
} catch (\Exception $e) {
41+
$this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
42+
$this->logger->critical($e);
43+
}
44+
return $this->resultRedirectFactory->create()->setPath('*/*');
45+
}
46+
}

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public function execute()
1616
$itemId = $this->getRequest()->getParam('item_id', null);
1717
if (!($model = $this->_objectManager->create('Magento\Store\Model\Store')->load($itemId))) {
1818
$this->messageManager->addError(__('Unable to proceed. Please, try again.'));
19-
$this->_redirect('adminhtml/*/');
2019
/** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
2120
$redirectResult = $this->resultRedirectFactory->create();
2221
return $redirectResult->setPath('adminhtml/*/');

‎app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function __construct(StoreManagerInterface $storeManager)
4242
* Translate element attribute
4343
*
4444
* @param string $code
45-
* @return string
45+
* @return \Magento\Framework\Phrase|string
4646
*/
4747
protected function _getTranslatedAttribute($code)
4848
{

‎app/code/Magento/Backend/Model/Config/Structure/Element/Field.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ protected function _getStaticOptions(array $options)
385385
* Translate a label
386386
*
387387
* @param string $label an option label that should be translated
388-
* @return string the translated version of the input label
388+
* @return \Magento\Framework\Phrase
389389
*/
390390
private function _translateLabel($label)
391391
{

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta6",
7-
"magento/module-directory": "0.42.0-beta6",
8-
"magento/module-core": "0.42.0-beta6",
9-
"magento/module-eav": "0.42.0-beta6",
10-
"magento/module-cron": "0.42.0-beta6",
11-
"magento/module-theme": "0.42.0-beta6",
12-
"magento/module-reports": "0.42.0-beta6",
13-
"magento/module-sales": "0.42.0-beta6",
14-
"magento/module-quote": "0.42.0-beta6",
15-
"magento/module-catalog": "0.42.0-beta6",
16-
"magento/module-user": "0.42.0-beta6",
17-
"magento/module-backup": "0.42.0-beta6",
18-
"magento/module-email": "0.42.0-beta6",
19-
"magento/module-customer": "0.42.0-beta6",
20-
"magento/module-translation": "0.42.0-beta6",
21-
"magento/module-require-js": "0.42.0-beta6",
22-
"magento/framework": "0.42.0-beta6",
6+
"magento/module-store": "0.42.0-beta7",
7+
"magento/module-directory": "0.42.0-beta7",
8+
"magento/module-core": "0.42.0-beta7",
9+
"magento/module-eav": "0.42.0-beta7",
10+
"magento/module-cron": "0.42.0-beta7",
11+
"magento/module-theme": "0.42.0-beta7",
12+
"magento/module-reports": "0.42.0-beta7",
13+
"magento/module-sales": "0.42.0-beta7",
14+
"magento/module-quote": "0.42.0-beta7",
15+
"magento/module-catalog": "0.42.0-beta7",
16+
"magento/module-user": "0.42.0-beta7",
17+
"magento/module-backup": "0.42.0-beta7",
18+
"magento/module-email": "0.42.0-beta7",
19+
"magento/module-customer": "0.42.0-beta7",
20+
"magento/module-translation": "0.42.0-beta7",
21+
"magento/module-require-js": "0.42.0-beta7",
22+
"magento/framework": "0.42.0-beta7",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.42.0-beta6",
26+
"version": "0.42.0-beta7",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
</block>
1616
</referenceContainer>
1717
<referenceContainer name="content">
18-
<block class="Magento\Backend\Block\Dashboard" name="dashboard"/>
18+
<block class="Magento\Backend\Block\Dashboard" name="dashboard">
19+
<block class="Magento\Backend\Block\Template" name="refresh_statistics" template="Magento_Backend::dashboard/totalbar/refreshstatistics.phtml"/>
20+
</block>
1921
</referenceContainer>
2022
</body>
2123
</page>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ window.changeDiagramsPeriod = function(periodObj) {
8080
<div class="dashboard-store-stats">
8181
<?php echo $block->getChildHtml('grids') ?>
8282
<div id="grid_tab_content" class="dashboard-store-stats-content"></div>
83+
<?php echo $block->getChildHtml('refresh_statistics') ?>
8384
</div>
8485
</div>
8586
<div class="dashboard-secondary col-m-4 col-m-pull-8">

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
?>
7+
<form action="<?php echo $block->getUrl('*/*/refreshStatistics'); ?>" method="post">
8+
<input name="form_key" type="hidden" value="<?php echo $block->getFormKey(); ?>" />
9+
<button type="submit" style="float:right; margin: 15px" title="Refresh data">
10+
<?php echo __('Refresh data') ?>
11+
</button>
12+
</form>

‎app/code/Magento/Backup/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta6",
7-
"magento/module-cron": "0.42.0-beta6",
8-
"magento/framework": "0.42.0-beta6",
6+
"magento/module-backend": "0.42.0-beta7",
7+
"magento/module-cron": "0.42.0-beta7",
8+
"magento/framework": "0.42.0-beta7",
99
"magento/magento-composer-installer": "*"
1010
},
1111
"type": "magento2-module",
12-
"version": "0.42.0-beta6",
12+
"version": "0.42.0-beta7",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ public function getProduct()
131131
}
132132

133133
/**
134-
* @return string
134+
* @return \Magento\Framework\Phrase
135135
*/
136136
public function getTabLabel()
137137
{
138138
return __('Bundle Items');
139139
}
140140

141141
/**
142-
* @return string
142+
* @return \Magento\Framework\Phrase
143143
*/
144144
public function getTabTitle()
145145
{

‎app/code/Magento/Bundle/Model/Product/Type.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ public function isSalable($product)
670670
* @param \Magento\Framework\Object $buyRequest
671671
* @param \Magento\Catalog\Model\Product $product
672672
* @param string $processMode
673-
* @return array|string
673+
* @return \Magento\Framework\Phrase|array|string
674674
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
675675
* @SuppressWarnings(PHPMD.NPathComplexity)
676676
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -852,7 +852,7 @@ private function multiToFlatArray(array $array)
852852
/**
853853
* Retrieve message for specify option(s)
854854
*
855-
* @return string
855+
* @return \Magento\Framework\Phrase
856856
*/
857857
public function getSpecifyOptionMessage()
858858
{

0 commit comments

Comments
 (0)