Merge branch 'MAGETWO-94887' into 2.3-develop-pr9

Mastiuhin Olexandr · Mastiuhin Olexandr · commit 1c10010e3707 · 2018-09-26T16:08:25.000+03:00
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -48,7 +48,7 @@ define([
                         if (typeof controlButtonArea != 'undefined') {
                             var buttons = controlButtonArea.childElements();
                             for (var i = 0; i < buttons.length; i++) {
-                                if (buttons[i].innerHTML.include(button.label)) {
+                                if (buttons[i].innerHTML.include(button.getLabel())) {
                                     return;
                                 }
                             }
@@ -1432,6 +1432,10 @@ define([
             node.update('<span>' + this._label + '</span>');
             content[position] = node;
             Element.insert(element, content);
+        },
+
+        getLabel: function(){
+            return this._label;
         }
     };
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ define([`
`48`	`48`	`if (typeof controlButtonArea != 'undefined') {`
`49`	`49`	`var buttons = controlButtonArea.childElements();`
`50`	`50`	`for (var i = 0; i < buttons.length; i++) {`
`51`		`- if (buttons[i].innerHTML.include(button.label)) {`
	`51`	`+ if (buttons[i].innerHTML.include(button.getLabel())) {`
`52`	`52`	`return;`
`53`	`53`	`}`
`54`	`54`	`}`
`@@ -1432,6 +1432,10 @@ define([`
`1432`	`1432`	`node.update('<span>' + this._label + '</span>');`
`1433`	`1433`	`content[position] = node;`
`1434`	`1434`	`Element.insert(element, content);`
	`1435`	`+ },`
	`1436`	`+`
	`1437`	`+ getLabel: function(){`
	`1438`	`+ return this._label;`
`1435`	`1439`	`}`
`1436`	`1440`	`};`
`1437`	`1441`