Cpappas/revert oscar 3.1 (#4128)

* Revert "[Copy]Django Oscar Upgrade to version 3.1 [#4102] [#4125] (#4126)"

This reverts commit 77c8be5.

* Revert "[Copy]Django Oscar Upgrade to version 3.1 [#4102] (#4125)"

This reverts commit cfc34a8.

* Revert "[Copy]Django Oscar Upgrade to version 3.1  (#4102)"

This reverts commit 06b5abd.

conftest.py

@@ -132,6 +132,7 @@ def django_db_setup(django_db_setup, django_db_blocker, django_db_use_migrations
         Option.objects.get_or_create(
             name='Course Entitlement',
             code='course_entitlement',
+            type=Option.OPTIONAL,
         )
 
         coupon, _ = ProductClass.objects.get_or_create(

ecommerce/core/management/commands/tests/factories.py

@@ -5,14 +5,14 @@
 from oscar.core.loading import get_model
 
 
-class PaymentEventFactory(factory.django.DjangoModelFactory):
+class PaymentEventFactory(factory.DjangoModelFactory):
     id = FuzzyInteger(1000, 999999)
 
     class Meta:
         model = get_model('order', 'PaymentEvent')
 
 
-class SuperUserFactory(factory.django.DjangoModelFactory):
+class SuperUserFactory(factory.DjangoModelFactory):
     id = FuzzyInteger(1000, 999999)
     is_superuser = True
     lms_user_id = 56765

ecommerce/core/tests/test_create_demo_data.py

@@ -23,12 +23,12 @@ def assert_seats_created(self, course_id, course_title, price):
         audit_seat = seats[1]
         self.assertFalse(hasattr(audit_seat.attr, 'certificate_type'))
         self.assertFalse(audit_seat.attr.id_verification_required)
-        self.assertEqual(audit_seat.stockrecords.get(partner=self.partner).price, 0)
+        self.assertEqual(audit_seat.stockrecords.get(partner=self.partner).price_excl_tax, 0)
 
         verified_seat = seats[0]
         self.assertEqual(verified_seat.attr.certificate_type, 'verified')
         self.assertTrue(verified_seat.attr.id_verification_required)
-        self.assertEqual(verified_seat.stockrecords.get(partner=self.partner).price, price)
+        self.assertEqual(verified_seat.stockrecords.get(partner=self.partner).price_excl_tax, price)
 
     @responses.activate
     def test_handle(self):

ecommerce/core/tests/test_generate_courses.py

@@ -192,5 +192,5 @@ def test_create_seat(self, seat_type, mock_logger):
         course = Course.objects.get(id='course-v1:test-course-generator+1+1')
         seats = course.seat_products
         seat = seats[0]
-        self.assertEqual(seat.stockrecords.get(partner=self.partner).price, price)
+        self.assertEqual(seat.stockrecords.get(partner=self.partner).price_excl_tax, price)
         mock_logger.info.assert_any_call("%s has been set to %s", seat_type, True)

ecommerce/coupons/tests/test_utils.py

@@ -54,7 +54,7 @@ def test_is_voucher_applied(self):
         """
         Verify is_voucher_applied return correct value.
         """
-        product = ProductFactory(stockrecords__price=100)
+        product = ProductFactory(stockrecords__price_excl_tax=100)
         voucher, product = prepare_voucher(
             _range=RangeFactory(products=[product]),
             benefit_value=10

ecommerce/courses/management/commands/create_enrollment_codes.py

@@ -215,7 +215,7 @@ def get_course_info(course):
         if len(seats) == 1:
             seat = seats[0]
             seat_type = getattr(seat.attr, 'certificate_type', '').lower()
-            price = seat.stockrecords.all()[0].price
+            price = seat.stockrecords.all()[0].price_excl_tax
             id_verification_required = getattr(seat.attr, 'id_verification_required', False)
 
             return seat_type, price, id_verification_required

ecommerce/courses/models.py

@@ -252,7 +252,7 @@ def create_or_update_seat(
                 course_id
             )
 
-        stock_record.price = price
+        stock_record.price_excl_tax = price
         stock_record.price_currency = settings.OSCAR_DEFAULT_CURRENCY
         stock_record.save()
 
@@ -329,7 +329,7 @@ def _create_or_update_enrollment_code(self, seat_type, id_verification_required,
                 partner_sku=enrollment_code_sku
             )
 
-        stock_record.price = price
+        stock_record.price_excl_tax = price
         stock_record.price_currency = settings.OSCAR_DEFAULT_CURRENCY
         stock_record.save()
 

ecommerce/courses/publishers.py

@@ -53,7 +53,7 @@ def serialize_seat_for_commerce_api(self, seat):
         return {
             'name': mode_for_product(seat),
             'currency': stock_record.price_currency,
-            'price': int(stock_record.price),
+            'price': int(stock_record.price_excl_tax),
             'sku': stock_record.partner_sku,
             'bulk_sku': bulk_sku,
             'expires': self.get_seat_expiration(seat),

ecommerce/courses/tests/factories.py

@@ -6,7 +6,7 @@
 from ecommerce.courses.models import Course
 
 
-class CourseFactory(factory.django.DjangoModelFactory):
+class CourseFactory(factory.DjangoModelFactory):
     class Meta:
         model = Course
 

ecommerce/courses/tests/test_models.py

@@ -106,7 +106,7 @@ def assert_course_seat_valid(self, seat, course, certificate_type, id_verificati
         self.assertEqual(getattr(seat.attr, 'certificate_type', ''), certificate_type)
         self.assertEqual(seat.attr.course_key, course.id)
         self.assertEqual(seat.attr.id_verification_required, id_verification_required)
-        self.assertEqual(seat.stockrecords.first().price, price)
+        self.assertEqual(seat.stockrecords.first().price_excl_tax, price)
 
         if variant_id:
             self.assertEqual(seat.attr.variant_id, variant_id)
@@ -161,7 +161,7 @@ def test_create_seat_with_enrollment_code(self):
         self.assertIsNone(enrollment_code.expires)
 
         stock_record = StockRecord.objects.get(product=enrollment_code)
-        self.assertEqual(stock_record.price, price)
+        self.assertEqual(stock_record.price_excl_tax, price)
         self.assertEqual(stock_record.price_currency, settings.OSCAR_DEFAULT_CURRENCY)
         self.assertEqual(stock_record.partner, self.partner)
 

ecommerce/courses/tests/test_publishers.py

@@ -72,7 +72,7 @@ def _create_mobile_seat_for_course(self, course, sku_prefix):
             product=mobile_seat,
             partner_sku="mobile.{}.{}".format(sku_prefix.lower(), web_stock_record.partner_sku.lower()),
             price_currency=web_stock_record.price_currency,
-            price=web_stock_record.price,
+            price_excl_tax=web_stock_record.price_excl_tax,
         )
         return mobile_seat
 
@@ -164,7 +164,7 @@ def test_serialize_seat_for_commerce_api(self):
         expected = {
             'name': 'verified',
             'currency': 'USD',
-            'price': int(stock_record.price),
+            'price': int(stock_record.price_excl_tax),
             'sku': stock_record.partner_sku,
             'bulk_sku': None,
             'expires': None,
@@ -195,7 +195,7 @@ def test_serialize_seat_for_commerce_api_with_mobile_skus(self):
         expected = {
             'name': 'verified',
             'currency': 'USD',
-            'price': int(stock_record.price),
+            'price': int(stock_record.price_excl_tax),
             'sku': stock_record.partner_sku,
             'bulk_sku': None,
             'expires': None,
@@ -229,7 +229,7 @@ def test_serialize_seat_for_commerce_api_with_professional(self, is_verified, ex
         expected = {
             'name': expected_mode,
             'currency': 'USD',
-            'price': int(stock_record.price),
+            'price': int(stock_record.price_excl_tax),
             'sku': stock_record.partner_sku,
             'bulk_sku': None,
             'expires': None,
@@ -247,7 +247,7 @@ def test_serialize_seat_with_enrollment_code(self):
         expected = {
             'name': 'verified',
             'currency': 'USD',
-            'price': int(stock_record.price),
+            'price': int(stock_record.price_excl_tax),
             'sku': stock_record.partner_sku,
             'bulk_sku': ec_stock_record.partner_sku,
             'expires': None,

ecommerce/credit/views.py

@@ -154,12 +154,12 @@ def _get_providers_detail(self, credit_seats):
             if code:
                 discount = format_benefit_value(voucher.benefit)
                 if discount_type == 'Percentage':
-                    new_price = stockrecord.price - (stockrecord.price * (discount_value / 100))
+                    new_price = stockrecord.price_excl_tax - (stockrecord.price_excl_tax * (discount_value / 100))
                 else:
-                    new_price = stockrecord.price - discount_value
+                    new_price = stockrecord.price_excl_tax - discount_value
                 new_price = '{0:.2f}'.format(new_price)
             providers_dict[seat.attr.credit_provider].update({
-                'price': stockrecord.price,
+                'price': stockrecord.price_excl_tax,
                 'sku': stockrecord.partner_sku,
                 'credit_hours': seat.attr.credit_hours,
                 'discount': discount,

ecommerce/enterprise/conditions.py

@@ -80,7 +80,7 @@ def is_offer_max_discount_available(basket, offer):
 
 def _get_basket_discount_value(basket, offer):
     """Calculate the discount value based on benefit type and value"""
-    sum_basket_lines = basket.all_lines().aggregate(total=Sum('stockrecord__price'))['total'] or Decimal(0.0)
+    sum_basket_lines = basket.all_lines().aggregate(total=Sum('stockrecord__price_excl_tax'))['total'] or Decimal(0.0)
     # calculate discount value that will be covered by the offer
     benefit_type = get_benefit_type(offer.benefit)
     benefit_value = offer.benefit.value

ecommerce/enterprise/tests/test_conditions.py

@@ -49,7 +49,7 @@ def setUp(self):
         self.user = UserFactory()
         self.condition = factories.EnterpriseCustomerConditionFactory()
 
-        self.test_product = ProductFactory(stockrecords__price=10, categories=[])
+        self.test_product = ProductFactory(stockrecords__price_excl_tax=10, categories=[])
         self.course_run_1 = CourseFactory(partner=self.partner)
         self.course_run_1.create_or_update_seat('verified', True, Decimal(100))
 
@@ -227,7 +227,7 @@ def test_is_satisfied_free_basket(self):
         offer = factories.EnterpriseOfferFactory(partner=self.partner, condition=self.condition)
         basket = BasketFactory(site=self.site, owner=self.user)
         test_product = factories.ProductFactory(
-            stockrecords__price=0,
+            stockrecords__price_excl_tax=0,
             stockrecords__partner__short_code='test'
         )
         basket.add_product(test_product)

ecommerce/enterprise/tests/test_migrate_enterprise_conditional_offers_command.py

@@ -54,8 +54,7 @@ def setUp(self):
 
         for i in range(2):
             code = '{}EntUserPercentBenefit'.format(i)
-            name = 'Test_1 voucher{}'.format(i)
-            voucher = VoucherFactory(code=code, name=name)
+            voucher = VoucherFactory(code=code)
             offer_name = "Coupon [{}]-{}-{}".format(
                 voucher.pk,
                 benefit_percent.type,
@@ -70,8 +69,7 @@ def setUp(self):
 
         for i in range(2):
             code = '{}EntUserAbsoluteBenefit'.format(i)
-            name = 'Test_2 voucher{}'.format(i)
-            voucher = VoucherFactory(code=code, name=name)
+            voucher = VoucherFactory(code=code)
             offer_name = "Coupon [{}]-{}-{}".format(
                 voucher.pk,
                 benefit_absolute.type,
@@ -95,8 +93,7 @@ def setUp(self):
 
         for i in range(3):
             code = '{}NoEntUserPercentBenefit'.format(i)
-            name = 'Test_3 voucher{}'.format(i)
-            voucher = VoucherFactory(code=code, name=name)
+            voucher = VoucherFactory(code=code)
             offer_name = "Coupon [{}]-{}-{}".format(
                 voucher.pk,
                 benefit.type,

ecommerce/entitlements/tests/test_utils.py

@@ -19,7 +19,7 @@ def test_course_entitlement_creation(self):
         self.assertEqual(product.attr.UUID, 'foo-bar')
 
         stock_record = StockRecord.objects.get(product=product, partner=self.partner)
-        self.assertEqual(stock_record.price, 100)
+        self.assertEqual(stock_record.price_excl_tax, 100)
 
     def test_course_entitlement_update(self):
         """ Test course entitlement product update """
@@ -29,16 +29,16 @@ def test_course_entitlement_update(self):
         assert product.attr.variant_id == original_variant_id
         stock_record = StockRecord.objects.get(product=product, partner=self.partner)
 
-        self.assertEqual(stock_record.price, 100)
+        self.assertEqual(stock_record.price_excl_tax, 100)
         self.assertEqual(product.title, 'Course Foo Bar Entitlement')
 
         new_variant_id = '11111111-1111-1111-1111-11111111'
         product = create_or_update_course_entitlement(
             'verified', 200, self.partner, 'foo-bar', 'Foo Bar Entitlement', variant_id=new_variant_id)
 
         stock_record = StockRecord.objects.get(product=product, partner=self.partner)
-        self.assertEqual(stock_record.price, 200)
-        self.assertEqual(stock_record.price, 200)
+        self.assertEqual(stock_record.price_excl_tax, 200)
+        self.assertEqual(stock_record.price_excl_tax, 200)
 
         product.refresh_from_db()
         assert product.attr.variant_id == new_variant_id

ecommerce/entitlements/utils.py

@@ -74,12 +74,11 @@ def create_or_update_course_entitlement(
     course_entitlement.structure = Product.CHILD
     course_entitlement.is_discountable = True
     course_entitlement.title = 'Course {}'.format(title)
-    course_entitlement.parent = parent_entitlement
     course_entitlement.attr.certificate_type = certificate_type
     course_entitlement.attr.UUID = UUID
     course_entitlement.attr.id_verification_required = id_verification_required
     course_entitlement.attr.credit_provider = credit_provider
-
+    course_entitlement.parent = parent_entitlement
     if variant_id:
         course_entitlement.attr.variant_id = variant_id
     if has_existing_course_entitlement:
@@ -95,7 +94,7 @@ def create_or_update_course_entitlement(
             'product': course_entitlement,
             'partner': partner,
             'partner_sku': generate_sku(course_entitlement, partner),
-            'price': price,
+            'price_excl_tax': price,
             'price_currency': settings.OSCAR_DEFAULT_CURRENCY,
         }
     )

ecommerce/extensions/api/serializers.py

@@ -330,18 +330,18 @@ class StockRecordSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = StockRecord
-        fields = ('id', 'product', 'partner', 'partner_sku', 'price_currency', 'price',)
+        fields = ('id', 'product', 'partner', 'partner_sku', 'price_currency', 'price_excl_tax',)
 
 
 class PartialStockRecordSerializerForUpdate(StockRecordSerializer):
     """ Stock record objects serializer for PUT requests.
 
-    Allowed fields to update are 'price_currency' and 'price'.
+    Allowed fields to update are 'price_currency' and 'price_excl_tax'.
     """
 
     class Meta:
         model = StockRecord
-        fields = ('price_currency', 'price',)
+        fields = ('price_currency', 'price_excl_tax',)
 
 
 class ProductSerializer(ProductPaymentInfoMixin, serializers.HyperlinkedModelSerializer):
@@ -843,12 +843,12 @@ def _update_mobile_seats(self, course):
 
                 mobile_stock_record = mobile_seat.stockrecords.first()
                 web_stock_record = web_seat.stockrecords.first()
-                if mobile_stock_record.price != web_stock_record.price:
-                    mobile_stock_record.price = web_stock_record.price
+                if mobile_stock_record.price_excl_tax != web_stock_record.price_excl_tax:
+                    mobile_stock_record.price_excl_tax = web_stock_record.price_excl_tax
                     mobile_stock_record.save()
 
                     if 'ios' in mobile_stock_record.partner_sku:
-                        self._update_app_store_product(mobile_seat, web_stock_record.price)
+                        self._update_app_store_product(mobile_seat, web_stock_record.price_excl_tax)
 
         except Exception as e:  # pylint: disable=broad-except
             logger.error(u'Failed to update mobile seats [%s]: [%s]', course.id, str(e))

ecommerce/extensions/api/utils.py

@@ -21,7 +21,7 @@ def format_seat(seat):
         result = seat_template.format(
             course.name,
             stock_record.partner_sku,
-            stock_record.price,
+            stock_record.price_excl_tax,
         )
         return result
 

ecommerce/extensions/api/v2/tests/views/__init__.py

@@ -87,5 +87,5 @@ def serialize_stockrecord(self, stockrecord):
             'product': stockrecord.product.id,
             'partner_sku': stockrecord.partner_sku,
             'price_currency': stockrecord.price_currency,
-            'price': str(stockrecord.price),
+            'price_excl_tax': str(stockrecord.price_excl_tax),
         }