Merge pull request #796 from edx/douglashall/SOL-1834/fix_conditional_offer_model_creation

SOL-1834 Use coupon ID when creating ConditionalOffer models

ecommerce/extensions/api/v2/views/coupons.py

@@ -211,7 +211,6 @@ class CouponViewSet(EdxOrderPlacementMixin, viewsets.ModelViewSet):
                 start_datetime=data['start_date'],
                 voucher_type=data['voucher_type'],
                 max_uses=data['max_uses'],
-                coupon_id=coupon_product.id,
                 catalog_query=data['catalog_query'],
                 course_seat_types=data['course_seat_types']
             )

ecommerce/extensions/voucher/utils.py

@@ -333,7 +333,6 @@ def create_vouchers(
         quantity,
         start_datetime,
         voucher_type,
-        coupon_id=None,
         code=None,
         max_uses=None,
         _range=None,
@@ -380,7 +379,7 @@ def create_vouchers(
         benefit_type=benefit_type,
         benefit_value=benefit_value,
         max_uses=max_uses,
-        coupon_id=coupon_id
+        coupon_id=coupon.id
     )
     for __ in range(quantity):
         voucher = _create_new_voucher(