Skip to content

Commit eb4d879

Browse files
author
Roman Ganin
committed
MAGETWO-35068: Filter isn't working in Order Total Report
1 parent f65cbac commit eb4d879

File tree

2 files changed

+5
-5
lines changed
  • app/code/Magento/Reports/view/adminhtml/templates
  • lib/internal/Magento/Framework/View/Template/Html

2 files changed

+5
-5
lines changed

app/code/Magento/Reports/view/adminhtml/templates/grid.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ require([
112112
period_date_from.adviceContainer = $('<?php echo $block->getSuffixId('period_date_from_advice')?>');
113113
period_date_to.adviceContainer = $('<?php echo $block->getSuffixId('period_date_to_advice')?>');
114114

115-
validateFilterDate = function() {
115+
var validateFilterDate = function() {
116116
if (period_date_from && period_date_to) {
117117
var valid = true;
118118
jQuery(period_date_from).add(period_date_to).each(function() {

lib/internal/Magento/Framework/View/Template/Html/Minifier.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,17 @@ public function minify($file)
116116
'#(?<!]]>)\s+</#',
117117
'</',
118118
preg_replace(
119-
'#((?:<\?php\s+(?!echo)[^\?]*)\?>)\s+#',
119+
'#((?:<\?php\s+(?!echo|if|elseif|print)[^\?]*)\?>)\s+#',
120120
'$1',
121121
preg_replace(
122122
'#(?<!' . implode('|', $this->inlineHtmlTags) . ')\> \<#',
123123
'><',
124124
preg_replace(
125-
'#(?ix)(?>[^\S ]\s*|\s{2,})(?=(?:(?:[^<]++|<(?!/?(?:textarea|pre|script)\b))*+)'
126-
. '(?:<(?>textarea|pre|script)\b|\z))#',
125+
'#(?ix)(?>[^\S ]\s*|\s{2,})(?=(?:(?:[^<]++|<(?!/?(?:textarea|pre|script|style)\b))*+)'
126+
. '(?:<(?>textarea|pre|script|style)\b|\z))#',
127127
' ',
128128
preg_replace(
129-
'#(?<!:)//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
129+
'#(?<!:|\\\\)//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
130130
'',
131131
preg_replace(
132132
'#(?<!:)//[^\n\r]*(\s\?\>)#',

0 commit comments

Comments
 (0)