Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 5e8ed65

Browse files
pdohogne-magentopdohogne-magento
committed
Merge remote-tracking branch 'jackalopes/MAGETWO-69470-sales-rule-generate-coupon' into BundledPR-Sep7b
2 parents 317d266 + 868fc1f commit 5e8ed65

File tree

4 files changed

+17
-48
lines changed

4 files changed

+17
-48
lines changed

‎app/code/Magento/SalesRule/Model/Service/CouponManagementService.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Coupon management service class
1010
*
11+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1112
*/
1213
class CouponManagementService implements \Magento\SalesRule\Api\CouponManagementInterface
1314
{
@@ -88,7 +89,9 @@ public function generate(\Magento\SalesRule\Api\Data\CouponGenerationSpecInterfa
8889
$couponSpec->getRuleId()
8990
);
9091
}
91-
if (!$rule->getUseAutoGeneration()) {
92+
if (!$rule->getUseAutoGeneration()
93+
&& $rule->getCouponType() != \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
94+
) {
9295
throw new \Magento\Framework\Exception\LocalizedException(
9396
__('Specified rule does not allow automatic coupon generation')
9497
);

‎app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,6 @@
4747
</settings>
4848
</dataProvider>
4949
</dataSource>
50-
<htmlContent name="promo_sales_rule_edit_tab_coupons_content">
51-
<block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons" name="promo_sales_rule_edit_tab_coupons" as="promo_sales_rule_edit_tab_coupons" template="Magento_SalesRule::tab/coupons.phtml">
52-
<arguments>
53-
<argument name="config" xsi:type="array">
54-
<item name="label" xsi:type="string" translate="true">Manage Coupon Codes</item>
55-
<item name="collapsible" xsi:type="boolean">true</item>
56-
<item name="opened" xsi:type="boolean">false</item>
57-
<item name="sortOrder" xsi:type="string">50</item>
58-
<item name="canShow" xsi:type="boolean">false</item>
59-
<item name="componentType" xsi:type="string">fieldset</item>
60-
<item name="component" xsi:type="string">Magento_SalesRule/js/form/element/manage-coupon-codes</item>
61-
</argument>
62-
</arguments>
63-
<block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons\Form" name="promo_quote_edit_tab_coupons_form"/>
64-
<block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons\Grid" name="promo_quote_edit_tab_coupons_grid"/>
65-
</block>
66-
</htmlContent>
6750
<fieldset name="general">
6851
<settings>
6952
<additionalClasses>
@@ -548,4 +531,16 @@
548531
</htmlContent>
549532
</container>
550533
</fieldset>
534+
<fieldset name="manage_coupon_codes" sortOrder="50" component="Magento_SalesRule/js/form/element/manage-coupon-codes">
535+
<settings>
536+
<collapsible>true</collapsible>
537+
<label translate="true">Manage Coupon Codes</label>
538+
</settings>
539+
<htmlContent name="html_content">
540+
<block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons" name="promo_sales_rule_edit_tab_coupons" as="promo_sales_rule_edit_tab_coupons" template="Magento_SalesRule::tab/coupons.phtml">
541+
<block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons\Form" name="promo_quote_edit_tab_coupons_form"/>
542+
<block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons\Grid" name="promo_quote_edit_tab_coupons_grid"/>
543+
</block>
544+
</htmlContent>
545+
</fieldset>
551546
</form>

‎dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</labels>
8383
<manage_coupon_code>
8484
<class>\Magento\SalesRule\Test\Block\Adminhtml\Promo\Quote\Edit\Section\ManageCouponCode</class>
85-
<selector>[id="sales-rule-form-tab-coupons"]</selector>
85+
<selector>[data-index="manage_coupon_codes"]</selector>
8686
<strategy>css selector</strategy>
8787
</manage_coupon_code>
8888
</sections>

‎dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityPartTwoTest.xml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -132,34 +132,5 @@
132132
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
133133
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleFreeShippingIsApplied" />
134134
</variation>
135-
<variation name="CreateSalesRuleEntityTestVariation17">
136-
<data name="address/data/country_id" xsi:type="string">United States</data>
137-
<data name="address/data/region_id" xsi:type="string">California</data>
138-
<data name="address/data/postcode" xsi:type="string">95814</data>
139-
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
140-
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
141-
<data name="salesRule/data/name" xsi:type="string">Cart Price Rule2 %isolation%</data>
142-
<data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
143-
<data name="salesRule/data/is_active" xsi:type="string">Yes</data>
144-
<data name="salesRule/data/website_ids/0" xsi:type="string">Main Website</data>
145-
<data name="salesRule/data/customer_group_ids/0" xsi:type="string">NOT LOGGED IN</data>
146-
<data name="salesRule/data/coupon_type" xsi:type="string">Auto</data>
147-
<data name="salesRule/data/simple_action" xsi:type="string">Fixed amount discount</data>
148-
<data name="salesRule/data/discount_amount" xsi:type="string">35</data>
149-
<data name="salesRule/data/apply_to_shipping" xsi:type="string">No</data>
150-
<data name="salesRule/data/simple_free_shipping" xsi:type="string">No</data>
151-
<data name="salesRule/data/store_labels/0" xsi:type="string">Coupon code+fixed amount discount</data>
152-
<data name="salesRuleEdit/data/qty" xsi:type="string">1</data>
153-
<data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>
154-
<data name="productQuantity/productForSalesRule1" xsi:type="string">2</data>
155-
<data name="cartPrice/sub_total" xsi:type="string">200.00</data>
156-
<data name="cartPrice/grand_total" xsi:type="string">140.00</data>
157-
<data name="cartPrice/discount" xsi:type="string">70.00</data>
158-
<data name="tag" xsi:type="string">to_maintain:yes</data>
159-
<data name="issue" xsi:type="string">MAGETWO-65554: [FT] Magento\SalesRule\Test\TestCase\CreateSalesRuleEntityTest fails on CI</data>
160-
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleSuccessSaveMessage" />
161-
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleForm" />
162-
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
163-
</variation>
164135
</testCase>
165136
</config>

0 commit comments

Comments
 (0)