File tree Expand file tree Collapse file tree 2 files changed +4
-6
lines changed
app/code/Magento/SalesRule
Controller/Adminhtml/Promo/Quote Expand file tree Collapse file tree 2 files changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -64,8 +64,9 @@ public function execute()
64
64
{
65
65
$ data = $ this ->getRequest ()->getPostValue ();
66
66
if ($ data ) {
67
- $ data ['simple_free_shipping ' ] = isset ($ data ['simple_free_shipping ' ]) ? $ data ['simple_free_shipping ' ] : null
68
-
67
+ if ($ data ['simple_free_shipping ' ] === '' ) {
68
+ $ data ['simple_free_shipping ' ] = null ;
69
+ }
69
70
try {
70
71
/** @var $model \Magento\SalesRule\Model\Rule */
71
72
$ model = $ this ->_objectManager ->create (\Magento \SalesRule \Model \Rule::class);
Original file line number Diff line number Diff line change 37
37
<fillField selector =" {{AdminCartPriceRulesFormSection.ruleName}}" userInput =" {{CartPriceRuleConditionAndFreeShippingApplied.name}}" stepKey =" fillRuleName" />
38
38
<fillField selector =" {{AdminCartPriceRulesFormSection.description}}" userInput =" {{CartPriceRuleConditionAndFreeShippingApplied.description}}" stepKey =" fillDescription" />
39
39
<selectOption selector =" {{AdminCartPriceRulesFormSection.websites}}" userInput =" {{CartPriceRuleConditionAndFreeShippingApplied.websites}}" stepKey =" selectWebsites" />
40
- <click selector =" {{AdminCartPriceRulesFormSection.customerGroups}}" stepKey =" expandCustomerGroups" />
41
- <fillField selector =" {{AdminCartPriceRulesFormSection.customerGroupsInput}}" userInput =" General" stepKey =" fillCustomerGroup" />
42
- <click selector =" {{AdminCartPriceRulesFormSection.customerGroupsFirstResult}}" stepKey =" selectGroup" />
43
- <click selector =" {{AdminCartPriceRulesFormSection.customerGroupsDoneBtn}}" stepKey =" closeMultiSelect" />
40
+ <selectOption userInput =" {{SimpleCatalogPriceRule.customerGroups}}" selector =" {{AdminCartPriceRulesFormSection.customerGroups}}" stepKey =" selectCustomerGroups" />
44
41
<selectOption selector =" {{AdminCartPriceRulesFormSection.coupon}}" userInput =" {{CartPriceRuleConditionAndFreeShippingApplied.coupon_type}}" stepKey =" selectCouponType" />
45
42
<scrollTo selector =" {{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey =" scrollToActionsHeader" />
46
43
<actionGroup ref =" AdminCreateCartPriceRuleActionsSectionDiscountFieldsActionGroup" stepKey =" createActiveCartPriceRuleActionsSection" >
You can’t perform that action at this time.
0 commit comments