Skip to content

Commit 017df8f

Browse files
author
Igor Melnikov
committed
Merge branch 'MAGETWO-48846-td-remove-javascript-from-coupons-block' into origin-develop
2 parents babc0bb + 90a4ac9 commit 017df8f

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

app/code/Magento/SalesRule/view/adminhtml/templates/tab/coupons.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
*/
66
?>
77
<div id="sales-rule-form-tab-coupons">
8-
<?php echo $this->getChildHtml('promo_quote_edit_tab_coupons_form') ?>
9-
<?php echo $this->getChildHtml('promo_quote_edit_tab_coupons_grid') ?>
8+
<?php echo $block->getChildHtml('promo_quote_edit_tab_coupons_form') ?>
9+
<?php echo $block->getChildHtml('promo_quote_edit_tab_coupons_grid') ?>
1010
</div>

app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-type.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ define([
1010
'use strict';
1111

1212
return select.extend({
13+
1314
/**
1415
* Hide fields on coupon tab
15-
*
16-
* @returns {void}
1716
*/
1817
onUpdate: function () {
1918

app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ define([
1212
'use strict';
1313

1414
return fieldset.extend({
15+
16+
/*eslint-enable no-unused-vars*/
1517
/**
1618
* Initialize element
1719
*
@@ -22,11 +24,14 @@ define([
2224

2325
this._super();
2426

27+
/*eslint-enable no-unused-vars*/
28+
2529
async.async('#sales-rule-form-tab-coupons', document.getElementById('container'), function (node) {
2630
var useAutoGeneration = uiRegistry.get(
2731
'sales_rule_form.sales_rule_form.rule_information.use_auto_generation'
2832
);
29-
useAutoGeneration.on('checked', function() {
33+
34+
useAutoGeneration.on('checked', function () {
3035
obj.enableDisableFields();
3136
});
3237
obj.enableDisableFields();
@@ -37,10 +42,8 @@ define([
3742

3843
/**
3944
* Enable/disable fields on Coupons tab
40-
*
41-
* @returns {void}
4245
*/
43-
enableDisableFields: function() {
46+
enableDisableFields: function () {
4447
var selector = '[id=sales-rule-form-tab-coupons] input, [id=sales-rule-form-tab-coupons] select, ' +
4548
'[id=sales-rule-form-tab-coupons] button',
4649
isUseAutoGenerationChecked = !uiRegistry

0 commit comments

Comments
 (0)