From 2e966630cc8ac2ea37604f59fdd25d7d34c96c01 Mon Sep 17 00:00:00 2001 From: Chris Pappas Date: Tue, 13 Feb 2024 14:15:38 -0500 Subject: [PATCH] Cpappas/revert oscar 3.1 (#4128) * Revert "[Copy]Django Oscar Upgrade to version 3.1 [#4102] [#4125] (#4126)" This reverts commit 77c8be5d0f9341e43796ae0cca014edb35d0f04a. * Revert "[Copy]Django Oscar Upgrade to version 3.1 [#4102] (#4125)" This reverts commit cfc34a88df2a3e1bb737741c67edcd766f1d95f6. * Revert "[Copy]Django Oscar Upgrade to version 3.1 (#4102)" This reverts commit 06b5abdaba925fd8a707d33ae7740574a1907c06. --- conftest.py | 1 + .../management/commands/tests/factories.py | 4 +- ecommerce/core/tests/test_create_demo_data.py | 4 +- ecommerce/core/tests/test_generate_courses.py | 2 +- ecommerce/coupons/tests/test_utils.py | 2 +- .../commands/create_enrollment_codes.py | 2 +- ecommerce/courses/models.py | 4 +- ecommerce/courses/publishers.py | 2 +- ecommerce/courses/tests/factories.py | 2 +- ecommerce/courses/tests/test_models.py | 4 +- ecommerce/courses/tests/test_publishers.py | 10 +- ecommerce/credit/views.py | 6 +- ecommerce/enterprise/conditions.py | 2 +- ecommerce/enterprise/tests/test_conditions.py | 4 +- ...e_enterprise_conditional_offers_command.py | 9 +- ecommerce/entitlements/tests/test_utils.py | 8 +- ecommerce/entitlements/utils.py | 5 +- .../migrations/0003_auto_20231108_1355.py | 21 - ecommerce/extensions/api/serializers.py | 12 +- ecommerce/extensions/api/utils.py | 2 +- .../extensions/api/v2/tests/views/__init__.py | 2 +- .../api/v2/tests/views/test_baskets.py | 18 +- .../api/v2/tests/views/test_coupons.py | 7 +- .../api/v2/tests/views/test_orders.py | 8 +- .../api/v2/tests/views/test_products.py | 2 +- .../api/v2/tests/views/test_publication.py | 8 +- .../api/v2/tests/views/test_stockrecords.py | 18 +- .../api/v2/tests/views/test_vouchers.py | 2 +- ecommerce/extensions/api/v2/views/coupons.py | 9 +- ecommerce/extensions/api/v2/views/orders.py | 2 +- .../extensions/api/v2/views/stockrecords.py | 4 +- ecommerce/extensions/api/v2/views/vouchers.py | 2 +- ecommerce/extensions/basket/models.py | 4 +- .../extensions/basket/tests/test_utils.py | 26 +- .../extensions/basket/tests/test_views.py | 2 +- .../management/commands/migrate_course.py | 2 +- .../0027_catalogue_entitlement_option.py | 5 +- .../migrations/0056_auto_20231108_1355.py | 97 -- .../migrations/0057_merge_20240119_1219.py | 14 - .../migrations/0058_merge_20240212_0911.py | 14 - ecommerce/extensions/catalogue/models.py | 1 - .../catalogue/tests/test_migrate_course.py | 2 +- ecommerce/extensions/catalogue/utils.py | 2 +- .../extensions/checkout/tests/test_mixins.py | 4 +- ecommerce/extensions/checkout/views.py | 2 +- .../migrations/0002_auto_20231108_1355.py | 26 - .../migrations/0008_auto_20231108_1355.py | 22 - .../dashboard/offers/tests/test_views.py | 1 - .../extensions/dashboard/offers/views.py | 6 +- .../refunds/tests/test_acceptance.py | 1 - .../tests/test_mixins.py | 4 +- .../fulfillment/tests/test_modules.py | 2 +- ecommerce/extensions/iap/api/v1/views.py | 2 +- .../commands/batch_update_mobile_seats.py | 2 +- ecommerce/extensions/iap/utils.py | 4 +- .../commands/remove_partner_offers.py | 2 +- .../migrations/0055_auto_20231108_1355.py | 22 - ecommerce/extensions/offer/models.py | 2 +- .../tests/test_dynamic_conditional_offer.py | 6 +- .../extensions/offer/tests/test_models.py | 2 +- .../extensions/offer/tests/test_utils.py | 2 +- .../migrations/0026_auto_20231108_1355.py | 45 - ecommerce/extensions/partner/admin.py | 2 +- .../migrations/0019_auto_20231108_1355.py | 49 - .../migrations/0033_auto_20231108_1355.py | 26 - .../payment/tests/views/test_paypal.py | 2 +- .../extensions/refund/tests/factories.py | 4 +- ecommerce/extensions/test/factories.py | 12 +- .../0013_make_voucher_names_unique.py | 36 - .../migrations/0014_auto_20231114_1156.py | 59 - .../extensions/voucher/tests/test_utils.py | 10 +- ecommerce/extensions/voucher/utils.py | 9 +- ecommerce/management/tests/test_utils.py | 6 +- ecommerce/programs/tests/test_conditions.py | 4 +- ecommerce/referrals/tests/factories.py | 2 +- .../js/test/specs/views/offer_view_spec.js | 4 +- ecommerce/static/js/views/offer_view.js | 4 +- .../static/templates/_offer_course_list.html | 2 +- .../dashboard/catalogue/category_form.html | 118 -- .../catalogue/category_row_actions.html | 46 +- .../dashboard/catalogue/product_update.html | 5 +- .../oscar/dashboard/offers/offer_detail.html | 247 ++- .../oscar/dashboard/orders/line_detail.html | 23 +- .../oscar/dashboard/orders/order_detail.html | 1365 ++++++++--------- .../oscar/dashboard/orders/order_list.html | 249 ++- .../oscar/dashboard/partials/search_form.html | 47 +- .../dashboard/refunds/refund_detail.html | 18 +- .../oscar/dashboard/refunds/refund_list.html | 17 +- ecommerce/tests/factories.py | 8 +- ecommerce/tests/mixins.py | 2 +- requirements/base.in | 3 +- requirements/base.txt | 10 +- requirements/constraints.txt | 2 +- requirements/dev.txt | 12 +- requirements/production.txt | 10 +- requirements/test.txt | 12 +- 96 files changed, 1141 insertions(+), 1798 deletions(-) delete mode 100644 ecommerce/extensions/analytics/migrations/0003_auto_20231108_1355.py delete mode 100644 ecommerce/extensions/catalogue/migrations/0056_auto_20231108_1355.py delete mode 100644 ecommerce/extensions/catalogue/migrations/0057_merge_20240119_1219.py delete mode 100644 ecommerce/extensions/catalogue/migrations/0058_merge_20240212_0911.py delete mode 100644 ecommerce/extensions/communication/migrations/0002_auto_20231108_1355.py delete mode 100644 ecommerce/extensions/customer/migrations/0008_auto_20231108_1355.py delete mode 100644 ecommerce/extensions/offer/migrations/0055_auto_20231108_1355.py delete mode 100644 ecommerce/extensions/order/migrations/0026_auto_20231108_1355.py delete mode 100644 ecommerce/extensions/partner/migrations/0019_auto_20231108_1355.py delete mode 100644 ecommerce/extensions/payment/migrations/0033_auto_20231108_1355.py delete mode 100644 ecommerce/extensions/voucher/migrations/0013_make_voucher_names_unique.py delete mode 100644 ecommerce/extensions/voucher/migrations/0014_auto_20231114_1156.py delete mode 100644 ecommerce/templates/oscar/dashboard/catalogue/category_form.html diff --git a/conftest.py b/conftest.py index 7f78e5dbfd7..c255287b609 100644 --- a/conftest.py +++ b/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( diff --git a/ecommerce/core/management/commands/tests/factories.py b/ecommerce/core/management/commands/tests/factories.py index 042988476ec..5afde342f67 100644 --- a/ecommerce/core/management/commands/tests/factories.py +++ b/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 diff --git a/ecommerce/core/tests/test_create_demo_data.py b/ecommerce/core/tests/test_create_demo_data.py index ca92765ec8d..ed4c118d5d4 100644 --- a/ecommerce/core/tests/test_create_demo_data.py +++ b/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): diff --git a/ecommerce/core/tests/test_generate_courses.py b/ecommerce/core/tests/test_generate_courses.py index 7e48411a9ce..72f59aa95fd 100644 --- a/ecommerce/core/tests/test_generate_courses.py +++ b/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) diff --git a/ecommerce/coupons/tests/test_utils.py b/ecommerce/coupons/tests/test_utils.py index c2a0a70fda2..ecfb0109f2c 100644 --- a/ecommerce/coupons/tests/test_utils.py +++ b/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 diff --git a/ecommerce/courses/management/commands/create_enrollment_codes.py b/ecommerce/courses/management/commands/create_enrollment_codes.py index cd6063ef0fa..6baf50ec998 100644 --- a/ecommerce/courses/management/commands/create_enrollment_codes.py +++ b/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 diff --git a/ecommerce/courses/models.py b/ecommerce/courses/models.py index 1ca3b846991..51a3682a657 100644 --- a/ecommerce/courses/models.py +++ b/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() diff --git a/ecommerce/courses/publishers.py b/ecommerce/courses/publishers.py index 850a2d771c6..2347a1f87cd 100644 --- a/ecommerce/courses/publishers.py +++ b/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), diff --git a/ecommerce/courses/tests/factories.py b/ecommerce/courses/tests/factories.py index 44a7e406e32..40175241bf2 100644 --- a/ecommerce/courses/tests/factories.py +++ b/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 diff --git a/ecommerce/courses/tests/test_models.py b/ecommerce/courses/tests/test_models.py index c917dc72081..fbc293e281f 100644 --- a/ecommerce/courses/tests/test_models.py +++ b/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) diff --git a/ecommerce/courses/tests/test_publishers.py b/ecommerce/courses/tests/test_publishers.py index dbc2dcd7008..eaeee9b9585 100644 --- a/ecommerce/courses/tests/test_publishers.py +++ b/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, diff --git a/ecommerce/credit/views.py b/ecommerce/credit/views.py index e62b7abb500..8fd7acac35d 100644 --- a/ecommerce/credit/views.py +++ b/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, diff --git a/ecommerce/enterprise/conditions.py b/ecommerce/enterprise/conditions.py index 7713ca73a8c..ced1cdc3dda 100644 --- a/ecommerce/enterprise/conditions.py +++ b/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 diff --git a/ecommerce/enterprise/tests/test_conditions.py b/ecommerce/enterprise/tests/test_conditions.py index e9082813383..af54b3fe5ed 100644 --- a/ecommerce/enterprise/tests/test_conditions.py +++ b/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) diff --git a/ecommerce/enterprise/tests/test_migrate_enterprise_conditional_offers_command.py b/ecommerce/enterprise/tests/test_migrate_enterprise_conditional_offers_command.py index 0b9ccacdc24..4a4cf23bd3c 100644 --- a/ecommerce/enterprise/tests/test_migrate_enterprise_conditional_offers_command.py +++ b/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, diff --git a/ecommerce/entitlements/tests/test_utils.py b/ecommerce/entitlements/tests/test_utils.py index 6462ad28bc9..2e3f6568f50 100644 --- a/ecommerce/entitlements/tests/test_utils.py +++ b/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,7 +29,7 @@ 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' @@ -37,8 +37,8 @@ def test_course_entitlement_update(self): '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 diff --git a/ecommerce/entitlements/utils.py b/ecommerce/entitlements/utils.py index 9dd40ea4bec..bd7e3feda6f 100644 --- a/ecommerce/entitlements/utils.py +++ b/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, } ) diff --git a/ecommerce/extensions/analytics/migrations/0003_auto_20231108_1355.py b/ecommerce/extensions/analytics/migrations/0003_auto_20231108_1355.py deleted file mode 100644 index a9b4ecd627c..00000000000 --- a/ecommerce/extensions/analytics/migrations/0003_auto_20231108_1355.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-08 13:55 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('analytics', '0002_auto_20140827_1705'), - ] - - operations = [ - migrations.AlterModelOptions( - name='userproductview', - options={'ordering': ['-pk'], 'verbose_name': 'User product view', 'verbose_name_plural': 'User product views'}, - ), - migrations.AlterModelOptions( - name='usersearch', - options={'ordering': ['-pk'], 'verbose_name': 'User search query', 'verbose_name_plural': 'User search queries'}, - ), - ] diff --git a/ecommerce/extensions/api/serializers.py b/ecommerce/extensions/api/serializers.py index f830139d85a..e00a211ddac 100644 --- a/ecommerce/extensions/api/serializers.py +++ b/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)) diff --git a/ecommerce/extensions/api/utils.py b/ecommerce/extensions/api/utils.py index a8a5e363116..64afc885a9a 100644 --- a/ecommerce/extensions/api/utils.py +++ b/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 diff --git a/ecommerce/extensions/api/v2/tests/views/__init__.py b/ecommerce/extensions/api/v2/tests/views/__init__.py index 1ed62fb054d..866244e6469 100644 --- a/ecommerce/extensions/api/v2/tests/views/__init__.py +++ b/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), } diff --git a/ecommerce/extensions/api/v2/tests/views/test_baskets.py b/ecommerce/extensions/api/v2/tests/views/test_baskets.py index 8f5fc8ca030..7ac25305a7f 100644 --- a/ecommerce/extensions/api/v2/tests/views/test_baskets.py +++ b/ecommerce/extensions/api/v2/tests/views/test_baskets.py @@ -79,7 +79,7 @@ def setUp(self): parent=self.base_product, title='LP 560-4', stockrecords__partner_sku=self.PAID_SKU, - stockrecords__price=Decimal('180000.00'), + stockrecords__price_excl_tax=Decimal('180000.00'), stockrecords__partner__short_code='oscr', ) factories.ProductFactory( @@ -87,7 +87,7 @@ def setUp(self): parent=self.base_product, title=u'Papier-mâché', stockrecords__partner_sku=self.ALTERNATE_FREE_SKU, - stockrecords__price=Decimal('0.00'), + stockrecords__price_excl_tax=Decimal('0.00'), stockrecords__partner__short_code='otto', ) factories.ProductFactory( @@ -95,7 +95,7 @@ def setUp(self): parent=self.base_product, title='LP 570-4 Superleggera', stockrecords__partner_sku=self.ALTERNATE_PAID_SKU, - stockrecords__price=Decimal('240000.00'), + stockrecords__price_excl_tax=Decimal('240000.00'), stockrecords__partner__short_code='dummy', ) # Ensure that the basket attribute type exists for these tests @@ -403,7 +403,7 @@ def setUp(self): self.products = ProductFactory.create_batch(3, stockrecords__partner=self.partner, categories=[]) self.path = reverse('api:v2:baskets:calculate') self.range = factories.RangeFactory(includes_all_products=True) - self.product_total = sum(product.stockrecords.first().price for product in self.products) + self.product_total = sum(product.stockrecords.first().price_excl_tax for product in self.products) self.user = self._login_as_user(is_staff=True) self.url = self._generate_sku_url(self.products, username=self.user.username) @@ -597,7 +597,7 @@ def test_basket_calculate_by_staff_user_other_username(self, mock_get_lms_resour products, url = self.setup_other_user_basket_calculate() expected = { - 'total_incl_tax_excl_discounts': sum(product.stockrecords.first().price + 'total_incl_tax_excl_discounts': sum(product.stockrecords.first().price_excl_tax for product in products), 'total_incl_tax': Decimal('0.00'), 'currency': 'USD' @@ -623,7 +623,7 @@ def test_basket_calculate_by_staff_user_other_username_non_atomic( products, url = self.setup_other_user_basket_calculate() expected = { - 'total_incl_tax_excl_discounts': sum(product.stockrecords.first().price + 'total_incl_tax_excl_discounts': sum(product.stockrecords.first().price_excl_tax for product in products), 'total_incl_tax': Decimal('0.00'), 'currency': 'USD' @@ -691,7 +691,7 @@ def test_basket_calculate_anonymous_skip_lms(self, mock_get_lms_resource_for_use products, url = self._setup_anonymous_basket_calculate() expected = { - 'total_incl_tax_excl_discounts': sum(product.stockrecords.first().price + 'total_incl_tax_excl_discounts': sum(product.stockrecords.first().price_excl_tax for product in products), 'total_incl_tax': Decimal('0.00'), 'currency': 'USD' @@ -867,7 +867,7 @@ def test_basket_calculate_by_staff_user_invalid_username(self, mock_get_lms_reso url = self._generate_sku_url(products, username='invalidusername') expected = { - 'total_incl_tax_excl_discounts': sum(product.stockrecords.first().price + 'total_incl_tax_excl_discounts': sum(product.stockrecords.first().price_excl_tax for product in products[1:]), 'total_incl_tax': Decimal('300.00'), 'currency': 'USD' @@ -932,7 +932,7 @@ def _create_program_with_courses_and_offer(self): products.append( factories.ProductFactory( stockrecords__partner=self.partner, - stockrecords__price=Decimal('10.00'), + stockrecords__price_excl_tax=Decimal('10.00'), stockrecords__partner_sku=sku, )) return products, program_uuid diff --git a/ecommerce/extensions/api/v2/tests/views/test_coupons.py b/ecommerce/extensions/api/v2/tests/views/test_coupons.py index 3415ebe6166..93739a48c7e 100644 --- a/ecommerce/extensions/api/v2/tests/views/test_coupons.py +++ b/ecommerce/extensions/api/v2/tests/views/test_coupons.py @@ -168,7 +168,7 @@ def test_clean_voucher_request_data_notify_email_validation_msg(self): def test_creating_multi_offer_coupon(self): """Test the creation of a multi-offer coupon.""" - ordinary_coupon = self.create_coupon(quantity=2, title='Test offer coupon') + ordinary_coupon = self.create_coupon(quantity=2) ordinary_coupon_vouchers = ordinary_coupon.attr.coupon_vouchers.vouchers.all() self.assertEqual( ordinary_coupon_vouchers[0].offers.first(), @@ -607,8 +607,7 @@ def test_update_name(self): new_coupon = Product.objects.get(id=self.coupon.id) vouchers = new_coupon.attr.coupon_vouchers.vouchers.all() for voucher in vouchers: - new_voucher_name = "%s - %d" % (data['name'], voucher.id + 1) - self.assertEqual(voucher.name, new_voucher_name) + self.assertEqual(voucher.name, 'New voucher name') def test_update_datetimes(self): """Test that updating a coupons date updates all of it's voucher dates.""" @@ -683,7 +682,7 @@ def test_update_coupon_price(self): new_coupon = Product.objects.get(id=self.coupon.id) stock_records = StockRecord.objects.filter(product=new_coupon).all() for stock_record in stock_records: - self.assertEqual(stock_record.price, 77) + self.assertEqual(stock_record.price_excl_tax, 77) def test_update_note(self): path = reverse('api:v2:coupons-detail', kwargs={'pk': self.coupon.id}) diff --git a/ecommerce/extensions/api/v2/tests/views/test_orders.py b/ecommerce/extensions/api/v2/tests/views/test_orders.py index f9492eb95f6..738a071f879 100644 --- a/ecommerce/extensions/api/v2/tests/views/test_orders.py +++ b/ecommerce/extensions/api/v2/tests/views/test_orders.py @@ -148,7 +148,7 @@ def test_orders_api_attributes_for_receipt_mfe( course = CourseFactory(id=course_id, name='Test Course', partner=self.partner) product = factories.ProductFactory( categories=[], - stockrecords__price=price, + stockrecords__price_excl_tax=price, stockrecords__price_currency=currency ) basket = factories.BasketFactory(owner=self.user, site=self.site) @@ -797,14 +797,14 @@ def test_create_manual_order_with_date_placed(self): time_at_initial_price = datetime.now(pytz.utc).isoformat() - stock_record.price = price_1 + stock_record.price_excl_tax = price_1 stock_record.save() - stock_record.price = price_2 + stock_record.price_excl_tax = price_2 stock_record.save() time_at_price_2 = datetime.now(pytz.utc).isoformat() - stock_record.price = final_price + stock_record.price_excl_tax = final_price stock_record.save() time_at_final_price = datetime.now(pytz.utc).isoformat() diff --git a/ecommerce/extensions/api/v2/tests/views/test_products.py b/ecommerce/extensions/api/v2/tests/views/test_products.py index 1de67d9790a..5f622716a35 100644 --- a/ecommerce/extensions/api/v2/tests/views/test_products.py +++ b/ecommerce/extensions/api/v2/tests/views/test_products.py @@ -201,7 +201,7 @@ def test_coupon_voucher_serializer(self): response_data = response.json() voucher = response_data['attribute_values'][0]['value'][0] - self.assertEqual(voucher['name'], 'Test coupon' + voucher['code']) + self.assertEqual(voucher['name'], 'Test coupon') self.assertEqual(voucher['usage'], Voucher.SINGLE_USE) self.assertEqual(voucher['benefit']['type'], Benefit.PERCENTAGE) self.assertEqual(voucher['benefit']['value'], 100.0) diff --git a/ecommerce/extensions/api/v2/tests/views/test_publication.py b/ecommerce/extensions/api/v2/tests/views/test_publication.py index f94fb89cffb..770ff8fe708 100644 --- a/ecommerce/extensions/api/v2/tests/views/test_publication.py +++ b/ecommerce/extensions/api/v2/tests/views/test_publication.py @@ -231,7 +231,7 @@ def assert_entitlement_saved(self, course, expected): self.assertEqual(entitlement.parent.product_class.name, COURSE_ENTITLEMENT_PRODUCT_CLASS_NAME) self.assertEqual(entitlement.attr.certificate_type, certificate_type) self.assertEqual(entitlement.attr.UUID, self.course_uuid) - self.assertEqual(entitlement.stockrecords.get(partner=self.partner).price, expected['price']) + self.assertEqual(entitlement.stockrecords.get(partner=self.partner).price_excl_tax, expected['price']) def assert_seat_saved(self, course, expected, test_mobile_seats=False): certificate_type = '' @@ -255,16 +255,16 @@ def assert_seat_saved(self, course, expected, test_mobile_seats=False): # Verify product price and expiration time. expires = EXPIRES if expected['expires'] else None self.assertEqual(seat.expires, expires) - self.assertEqual(seat.stockrecords.get(partner=self.partner).price, expected['price']) + self.assertEqual(seat.stockrecords.get(partner=self.partner).price_excl_tax, expected['price']) if test_mobile_seats and verified_product: android_seat = course.seat_products.get(title='Android ' + seat_title) self.assertEqual(android_seat.expires, expires) - self.assertEqual(android_seat.stockrecords.get(partner=self.partner).price, expected['price']) + self.assertEqual(android_seat.stockrecords.get(partner=self.partner).price_excl_tax, expected['price']) ios_seat = course.seat_products.get(title='Ios ' + seat_title) self.assertEqual(ios_seat.expires, expires) - self.assertEqual(ios_seat.stockrecords.get(partner=self.partner).price, expected['price']) + self.assertEqual(ios_seat.stockrecords.get(partner=self.partner).price_excl_tax, expected['price']) if test_mobile_seats and verified_product: android_seat = course.seat_products.get(title='Android ' + seat_title) diff --git a/ecommerce/extensions/api/v2/tests/views/test_stockrecords.py b/ecommerce/extensions/api/v2/tests/views/test_stockrecords.py index e676c198b3c..a1cfdcd9b7d 100644 --- a/ecommerce/extensions/api/v2/tests/views/test_stockrecords.py +++ b/ecommerce/extensions/api/v2/tests/views/test_stockrecords.py @@ -34,7 +34,7 @@ def test_list(self): """ Verify a list of stock records is returned. """ StockRecordFactory(partner__short_code='Tester') StockRecord.objects.create(partner=self.partner, product=self.product, partner_sku='dummy-sku', - price_currency='USD', price=200.00) + price_currency='USD', price_excl_tax=200.00) response = self.client.get(self.list_path) self.assertEqual(response.status_code, 200) @@ -74,19 +74,19 @@ def test_retrieve_by_sku(self): self.assertDictEqual(response.json(), self.serialize_stockrecord(self.stockrecord)) def test_update(self): - """ Verify update endpoint allows to update 'price_currency' and 'price'. """ + """ Verify update endpoint allows to update 'price_currency' and 'price_excl_tax'. """ self.user.user_permissions.add(self.change_permission) self.user.save() data = { "price_currency": "PKR", - "price": "500.00" + "price_excl_tax": "500.00" } response = self.attempt_update(data) self.assertEqual(response.status_code, 200) stockrecord = StockRecord.objects.get(id=self.stockrecord.id) - self.assertEqual(str(stockrecord.price), data['price']) + self.assertEqual(str(stockrecord.price_excl_tax), data['price_excl_tax']) self.assertEqual(stockrecord.price_currency, data['price_currency']) def test_update_without_permission(self): @@ -96,7 +96,7 @@ def test_update_without_permission(self): data = { "price_currency": "PKR", - "price": "500.00" + "price_excl_tax": "500.00" } response = self.attempt_update(data) self.assertEqual(response.status_code, 403) @@ -107,13 +107,13 @@ def test_update_as_staff(self): self.user.save() data = { - "price": "500.00" + "price_excl_tax": "500.00" } response = self.attempt_update(data) self.assertEqual(response.status_code, 200) def test_allowed_fields_for_update(self): - """ Verify the endpoint only allows the price and price_currency fields to be updated. """ + """ Verify the endpoint only allows the price_excl_tax and price_currency fields to be updated. """ self.user.user_permissions.add(self.change_permission) self.user.save() @@ -125,7 +125,7 @@ def test_allowed_fields_for_update(self): stockrecord = StockRecord.objects.get(id=self.stockrecord.id) self.assertEqual(self.serialize_stockrecord(self.stockrecord), self.serialize_stockrecord(stockrecord)) self.assertDictEqual(response.json(), { - 'message': 'Only the price_currency and price fields are allowed to be modified.'}) + 'message': 'Only the price_currency and price_excl_tax fields are allowed to be modified.'}) def attempt_update(self, data): """ Helper method that attempts to update an existing StockRecord object. @@ -167,7 +167,7 @@ def attempt_create(self): "partner": self.partner.id, "partner_sku": "new-sku", "price_currency": "USD", - "price": 50.00 + "price_excl_tax": 50.00 } return self.client.post(self.list_path, json.dumps(data), JSON_CONTENT_TYPE) diff --git a/ecommerce/extensions/api/v2/tests/views/test_vouchers.py b/ecommerce/extensions/api/v2/tests/views/test_vouchers.py index 8bed8b0d908..da9c146b27c 100644 --- a/ecommerce/extensions/api/v2/tests/views/test_vouchers.py +++ b/ecommerce/extensions/api/v2/tests/views/test_vouchers.py @@ -78,7 +78,7 @@ def test_list(self): actual_codes = [datum['code'] for datum in response.data['results']] expected_codes = [voucher.code for voucher in vouchers] - self.assertEqual(actual_codes, expected_codes[::-1]) + self.assertEqual(actual_codes, expected_codes) def test_list_with_code_filter(self): """ Verify the endpoint list all vouchers, filtered by the specified code. """ diff --git a/ecommerce/extensions/api/v2/views/coupons.py b/ecommerce/extensions/api/v2/views/coupons.py index 30bdb89ddb1..16f5a59b536 100644 --- a/ecommerce/extensions/api/v2/views/coupons.py +++ b/ecommerce/extensions/api/v2/views/coupons.py @@ -374,13 +374,6 @@ def update(self, request, *args, **kwargs): def update_voucher_data(self, request_data, vouchers): data = self.create_update_data_dict(data=request_data, fields=CouponVouchers.UPDATEABLE_VOUCHER_FIELDS) if data: - if 'name' in data: - for voucher in vouchers: - voucher.name = "%s - %d" % (data['name'], voucher.id + 1) - voucher.save() - - data.pop('name') - vouchers.update(**data) def create_update_data_dict(self, data, fields): @@ -474,7 +467,7 @@ def update_coupon_product_data(self, request_data, coupon): coupon_price = request_data.get('price') if coupon_price: - StockRecord.objects.filter(product=coupon).update(price=coupon_price) + StockRecord.objects.filter(product=coupon).update(price_excl_tax=coupon_price) note = request_data.get('note') if note is not None: diff --git a/ecommerce/extensions/api/v2/views/orders.py b/ecommerce/extensions/api/v2/views/orders.py index 6f7c60fcd8c..17eba2919e5 100644 --- a/ecommerce/extensions/api/v2/views/orders.py +++ b/ecommerce/extensions/api/v2/views/orders.py @@ -381,7 +381,7 @@ def _update_order_according_to_date_place(self, order, date_placed): for line in order.lines.all(): old_stock = line.stockrecord.history.filter(history_date__lt=date_placed).order_by('-history_date').first() stock_record = old_stock or line.stockrecord - price = stock_record.price or Decimal('0') + price = stock_record.price_excl_tax or Decimal('0') quantity = line.quantity line.line_price_before_discounts_incl_tax = price * quantity line.line_price_before_discounts_excl_tax = price * quantity diff --git a/ecommerce/extensions/api/v2/views/stockrecords.py b/ecommerce/extensions/api/v2/views/stockrecords.py index 31606c23fdb..5e22570ae68 100644 --- a/ecommerce/extensions/api/v2/views/stockrecords.py +++ b/ecommerce/extensions/api/v2/views/stockrecords.py @@ -39,9 +39,9 @@ def get_serializer_class(self): def update(self, request, *args, **kwargs): """ Update a stock record. """ - allowed_fields = ['price_currency', 'price'] + allowed_fields = ['price_currency', 'price_excl_tax'] if any([key not in allowed_fields for key in request.data.keys()]): return Response({ - 'message': "Only the price_currency and price fields are allowed to be modified." + 'message': "Only the price_currency and price_excl_tax fields are allowed to be modified." }, status=status.HTTP_400_BAD_REQUEST) return super(StockRecordViewSet, self).update(request, *args, **kwargs) diff --git a/ecommerce/extensions/api/v2/views/vouchers.py b/ecommerce/extensions/api/v2/views/vouchers.py index 2ab098067e4..2c1862112a5 100644 --- a/ecommerce/extensions/api/v2/views/vouchers.py +++ b/ecommerce/extensions/api/v2/views/vouchers.py @@ -193,7 +193,7 @@ def convert_catalog_response_to_offers(self, request, voucher, response): credit_provider_price = None else: multiple_credit_providers = False - credit_provider_price = StockRecord.objects.get(product=product).price + credit_provider_price = StockRecord.objects.get(product=product).price_excl_tax try: stock_record = stock_records.get(product__id=product.id) diff --git a/ecommerce/extensions/basket/models.py b/ecommerce/extensions/basket/models.py index 8a69c1cac4d..b2441f8d154 100644 --- a/ecommerce/extensions/basket/models.py +++ b/ecommerce/extensions/basket/models.py @@ -63,7 +63,7 @@ def flush(self): for line in self.all_lines(): # Do not fire events for free items. The volume we see for edX.org leads to a dramatic increase in CPU # usage. Given that orders for free items are ignored, there is no need for these events. - if line.stockrecord.price > 0: + if line.stockrecord.price_excl_tax > 0: properties = translate_basket_line_for_segment(line) track_segment_event(self.site, self.owner, 'Product Removed', properties) product_removed_event_fired = True @@ -104,7 +104,7 @@ def add_product(self, product, quantity=1, options=None): # Do not fire events for free items. The volume we see for edX.org leads to a dramatic increase in CPU # usage. Given that orders for free items are ignored, there is no need for these events. - if line.stockrecord.price > 0: + if line.stockrecord.price_excl_tax > 0: properties = translate_basket_line_for_segment(line) properties['cart_id'] = self.id track_segment_event(self.site, self.owner, 'Product Added', properties) diff --git a/ecommerce/extensions/basket/tests/test_utils.py b/ecommerce/extensions/basket/tests/test_utils.py index bc75832a52d..6c4a21abf1c 100644 --- a/ecommerce/extensions/basket/tests/test_utils.py +++ b/ecommerce/extensions/basket/tests/test_utils.py @@ -77,12 +77,12 @@ def test_add_utm_params_to_url(self): def test_prepare_basket_with_voucher(self): """ Verify a basket is returned and contains a voucher and the voucher is applied. """ # Prepare a product with price of 100 and a voucher with 10% discount for that product. - product = ProductFactory(stockrecords__price=100) + product = ProductFactory(stockrecords__price_excl_tax=100) new_range = RangeFactory(products=[product]) voucher, __ = prepare_voucher(_range=new_range, benefit_value=10) stock_record = StockRecord.objects.get(product=product) - self.assertEqual(stock_record.price, 100.00) + self.assertEqual(stock_record.price_excl_tax, 100.00) basket = prepare_basket(self.request, [product], voucher) self.assertIsNotNone(basket) @@ -113,7 +113,7 @@ def test_prepare_basket_enrollment_with_voucher(self): def test_multiple_vouchers(self): """ Verify only the last entered voucher is contained in the basket. """ - product = ProductFactory(stockrecords__price=100) + product = ProductFactory(stockrecords__price_excl_tax=100) new_range = RangeFactory(products=[product, ]) voucher1, __ = prepare_voucher(code='TEST1', _range=new_range, benefit_value=10) basket = prepare_basket(self.request, [product], voucher1) @@ -411,7 +411,7 @@ def test_prepare_basket_with_bundle_voucher(self): """ Test prepare_basket clears vouchers for a bundle """ - product = ProductFactory(stockrecords__price=100) + product = ProductFactory(stockrecords__price_excl_tax=100) new_range = RangeFactory(products=[product, ]) voucher, __ = prepare_voucher(_range=new_range, benefit_value=10) @@ -541,7 +541,7 @@ def test_prepare_basket_ignores_invalid_voucher(self): """ voucher_start_time = now() - datetime.timedelta(days=5) voucher_end_time = now() - datetime.timedelta(days=3) - product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price=100) + product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price_excl_tax=100) expired_voucher, __ = prepare_voucher(start_datetime=voucher_start_time, end_datetime=voucher_end_time) basket = prepare_basket(self.request, [product], expired_voucher) @@ -557,7 +557,7 @@ def test_prepare_basket_applies_valid_voucher_argument(self): an argument, even when there is also a valid voucher already on the basket. """ - product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price=100) + product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price_excl_tax=100) new_range = RangeFactory(products=[product]) new_voucher, __ = prepare_voucher(code='xyz', _range=new_range, benefit_value=10) existing_voucher, __ = prepare_voucher(code='test', _range=new_range, benefit_value=50) @@ -579,7 +579,7 @@ def test_prepare_basket_removes_existing_basket_invalid_voucher(self): """ voucher_start_time = now() - datetime.timedelta(days=5) voucher_end_time = now() - datetime.timedelta(days=3) - product = ProductFactory(stockrecords__partner__short_code='xyz', stockrecords__price=100) + product = ProductFactory(stockrecords__partner__short_code='xyz', stockrecords__price_excl_tax=100) expired_voucher, __ = prepare_voucher(start_datetime=voucher_start_time, end_datetime=voucher_end_time) basket = BasketFactory(owner=self.request.user, site=self.request.site) @@ -596,7 +596,7 @@ def test_prepare_basket_removes_existing_basket_invalid_range_voucher(self): Tests that prepare_basket removes an existing basket voucher that is not valid for the product and used to purchase that product. """ - product = ProductFactory(stockrecords__partner__short_code='xyz', stockrecords__price=100) + product = ProductFactory(stockrecords__partner__short_code='xyz', stockrecords__price_excl_tax=100) invalid_range_voucher, __ = prepare_voucher() basket = BasketFactory(owner=self.request.user, site=self.request.site) @@ -612,7 +612,7 @@ def test_prepare_basket_applies_existing_basket_valid_voucher(self): Tests that prepare_basket applies an existing basket voucher that is valid for multiple products when used to purchase any of those products. """ - product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price=100) + product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price_excl_tax=100) new_range = RangeFactory(products=[product]) voucher, __ = prepare_voucher(_range=new_range, benefit_value=10) @@ -647,7 +647,7 @@ def test_apply_voucher_on_basket_and_check_discount_with_invalid_voucher(self): does not apply voucher and returns the correct values. """ basket = BasketFactory(owner=self.request.user, site=self.request.site) - product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price=100) + product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price_excl_tax=100) voucher, __ = prepare_voucher() basket.add_product(product, 1) applied, msg = apply_voucher_on_basket_and_check_discount(voucher, self.request, basket) @@ -661,7 +661,7 @@ def test_apply_voucher_on_basket_and_check_discount_with_invalid_product(self): does not apply voucher and returns the correct values. """ basket = BasketFactory(owner=self.request.user, site=self.request.site) - product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price=0) + product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price_excl_tax=0) voucher, __ = prepare_voucher(_range=RangeFactory(products=[product])) basket.add_product(product, 1) applied, msg = apply_voucher_on_basket_and_check_discount(voucher, self.request, basket) @@ -675,7 +675,7 @@ def test_apply_voucher_on_basket_and_check_discount_with_multiple_vouchers(self) containing a valid voucher it only checks the new voucher. """ basket = BasketFactory(owner=self.request.user, site=self.request.site) - product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price=10) + product = ProductFactory(stockrecords__partner__short_code='test1', stockrecords__price_excl_tax=10) invalid_voucher, __ = prepare_voucher(code='TEST1') valid_voucher, __ = prepare_voucher(code='TEST2', _range=RangeFactory(products=[product])) basket.add_product(product, 1) @@ -742,7 +742,7 @@ def setUp(self): self.site_configuration.utm_cookie_name = 'test.edx.utm' toggle_switch(DISABLE_REPEAT_ORDER_CHECK_SWITCH_NAME, False) BasketAttributeType.objects.get_or_create(name=BUNDLE) - Option.objects.get_or_create(name='Course Entitlement', code='course_entitlement') + Option.objects.get_or_create(name='Course Entitlement', code='course_entitlement', type=Option.OPTIONAL) def _setup_request_cookie(self): utm_campaign = 'test-campaign' diff --git a/ecommerce/extensions/basket/tests/test_views.py b/ecommerce/extensions/basket/tests/test_views.py index 2a099784170..cbf6c237982 100644 --- a/ecommerce/extensions/basket/tests/test_views.py +++ b/ecommerce/extensions/basket/tests/test_views.py @@ -1593,7 +1593,7 @@ def test_coupon_applied_on_site_offer(self): voucher, product = prepare_voucher(benefit_value=voucher_discount) stockrecord = product.stockrecords.first() - stockrecord.price = product_price + stockrecord.price_excl_tax = product_price stockrecord.save() _range = factories.RangeFactory(includes_all_products=True) diff --git a/ecommerce/extensions/catalogue/management/commands/migrate_course.py b/ecommerce/extensions/catalogue/management/commands/migrate_course.py index 698dc4b4876..dbbf20fa7bd 100644 --- a/ecommerce/extensions/catalogue/management/commands/migrate_course.py +++ b/ecommerce/extensions/catalogue/management/commands/migrate_course.py @@ -192,7 +192,7 @@ def handle(self, *args, **options): data = ( getattr(seat.attr, 'certificate_type', ''), seat.attr.id_verification_required, - '{0} {1}'.format(stock_record.price_currency, stock_record.price), + '{0} {1}'.format(stock_record.price_currency, stock_record.price_excl_tax), stock_record.partner_sku, seat.slug, seat.expires diff --git a/ecommerce/extensions/catalogue/migrations/0027_catalogue_entitlement_option.py b/ecommerce/extensions/catalogue/migrations/0027_catalogue_entitlement_option.py index 0ec6d4340d3..5de81c2cbf7 100644 --- a/ecommerce/extensions/catalogue/migrations/0027_catalogue_entitlement_option.py +++ b/ecommerce/extensions/catalogue/migrations/0027_catalogue_entitlement_option.py @@ -4,20 +4,21 @@ from django.db import migrations, models from oscar.core.loading import get_model +Option = get_model('catalogue', 'Option') + def create_entitlement_option(apps, schema_editor): """ Create catalogue entitlement option. """ - Option = apps.get_model('catalogue', 'Option') Option.skip_history_when_saving = True course_entitlement_option = Option() course_entitlement_option.name = 'Course Entitlement' course_entitlement_option.code = 'course_entitlement' + course_entitlement_option.type = Option.OPTIONAL course_entitlement_option.save() def remove_entitlement_option(apps, schema_editor): """ Remove course entitlement option """ - Option = apps.get_model('catalogue', 'Option') Option.skip_history_when_saving = True course_entitlement_option = Option.objects.get(code='course_entitlement') course_entitlement_option.delete() diff --git a/ecommerce/extensions/catalogue/migrations/0056_auto_20231108_1355.py b/ecommerce/extensions/catalogue/migrations/0056_auto_20231108_1355.py deleted file mode 100644 index 819f10def86..00000000000 --- a/ecommerce/extensions/catalogue/migrations/0056_auto_20231108_1355.py +++ /dev/null @@ -1,97 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-08 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('catalogue', '0055_sf_opp_line_item_ent_attr'), - ] - - operations = [ - migrations.AlterModelOptions( - name='option', - options={'ordering': ['name'], 'verbose_name': 'Option', 'verbose_name_plural': 'Options'}, - ), - migrations.AddField( - model_name='category', - name='meta_description', - field=models.TextField(blank=True, null=True, verbose_name='Meta description'), - ), - migrations.AddField( - model_name='category', - name='meta_title', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'), - ), - migrations.AddField( - model_name='historicalcategory', - name='meta_description', - field=models.TextField(blank=True, null=True, verbose_name='Meta description'), - ), - migrations.AddField( - model_name='historicalcategory', - name='meta_title', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'), - ), - migrations.AddField( - model_name='historicaloption', - name='required', - field=models.BooleanField(default=False, verbose_name='Is this option required?'), - ), - migrations.AddField( - model_name='historicalproduct', - name='meta_description', - field=models.TextField(blank=True, null=True, verbose_name='Meta description'), - ), - migrations.AddField( - model_name='historicalproduct', - name='meta_title', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'), - ), - migrations.AddField( - model_name='option', - name='required', - field=models.BooleanField(default=False, verbose_name='Is this option required?'), - ), - migrations.AddField( - model_name='product', - name='meta_description', - field=models.TextField(blank=True, null=True, verbose_name='Meta description'), - ), - migrations.AddField( - model_name='product', - name='meta_title', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'), - ), - migrations.AlterField( - model_name='historicaloption', - name='name', - field=models.CharField(db_index=True, max_length=128, verbose_name='Name'), - ), - migrations.AlterField( - model_name='historicaloption', - name='type', - field=models.CharField(choices=[('text', 'Text'), ('integer', 'Integer'), ('boolean', 'True / False'), ('float', 'Float'), ('date', 'Date')], default='text', max_length=255, verbose_name='Type'), - ), - migrations.AlterField( - model_name='historicalproductattributevalue', - name='value_boolean', - field=models.BooleanField(blank=True, db_index=True, null=True, verbose_name='Boolean'), - ), - migrations.AlterField( - model_name='option', - name='name', - field=models.CharField(db_index=True, max_length=128, verbose_name='Name'), - ), - migrations.AlterField( - model_name='option', - name='type', - field=models.CharField(choices=[('text', 'Text'), ('integer', 'Integer'), ('boolean', 'True / False'), ('float', 'Float'), ('date', 'Date')], default='text', max_length=255, verbose_name='Type'), - ), - migrations.AlterField( - model_name='productattributevalue', - name='value_boolean', - field=models.BooleanField(blank=True, db_index=True, null=True, verbose_name='Boolean'), - ), - ] diff --git a/ecommerce/extensions/catalogue/migrations/0057_merge_20240119_1219.py b/ecommerce/extensions/catalogue/migrations/0057_merge_20240119_1219.py deleted file mode 100644 index a3581ee85c6..00000000000 --- a/ecommerce/extensions/catalogue/migrations/0057_merge_20240119_1219.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.2.20 on 2024-01-19 12:19 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('catalogue', '0056_add_variant_id_seat_product_attr'), - ('catalogue', '0056_auto_20231108_1355'), - ] - - operations = [ - ] diff --git a/ecommerce/extensions/catalogue/migrations/0058_merge_20240212_0911.py b/ecommerce/extensions/catalogue/migrations/0058_merge_20240212_0911.py deleted file mode 100644 index 8cd1cb7c52d..00000000000 --- a/ecommerce/extensions/catalogue/migrations/0058_merge_20240212_0911.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.2.20 on 2024-02-12 09:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('catalogue', '0057_add_app_store_id_product_attr'), - ('catalogue', '0057_merge_20240119_1219'), - ] - - operations = [ - ] diff --git a/ecommerce/extensions/catalogue/models.py b/ecommerce/extensions/catalogue/models.py index 3dd344d0e81..9c46fa186cd 100644 --- a/ecommerce/extensions/catalogue/models.py +++ b/ecommerce/extensions/catalogue/models.py @@ -62,7 +62,6 @@ def post_delete(self, instance, using=None, **kwargs): class Product(AbstractProduct): - course = models.ForeignKey( 'courses.Course', null=True, blank=True, related_name='products', on_delete=models.CASCADE ) diff --git a/ecommerce/extensions/catalogue/tests/test_migrate_course.py b/ecommerce/extensions/catalogue/tests/test_migrate_course.py index 380f1c450c5..340e55f9e52 100644 --- a/ecommerce/extensions/catalogue/tests/test_migrate_course.py +++ b/ecommerce/extensions/catalogue/tests/test_migrate_course.py @@ -84,7 +84,7 @@ def _mock_lms_apis(self): def assert_stock_record_valid(self, stock_record, seat, price): """ Verify the given StockRecord is configured correctly. """ self.assertEqual(stock_record.partner, self.partner) - self.assertEqual(stock_record.price, price) + self.assertEqual(stock_record.price_excl_tax, price) self.assertEqual(stock_record.price_currency, 'USD') self.assertEqual(stock_record.partner_sku, generate_sku(seat, self.partner)) diff --git a/ecommerce/extensions/catalogue/utils.py b/ecommerce/extensions/catalogue/utils.py index d8dd63b7fc4..fceb3a4ba03 100644 --- a/ecommerce/extensions/catalogue/utils.py +++ b/ecommerce/extensions/catalogue/utils.py @@ -128,7 +128,7 @@ def create_coupon_product_and_stockrecord(title, category, partner, price): StockRecord.objects.update_or_create( defaults={ 'price_currency': settings.OSCAR_DEFAULT_CURRENCY, - 'price': price + 'price_excl_tax': price }, partner=partner, partner_sku=sku, diff --git a/ecommerce/extensions/checkout/tests/test_mixins.py b/ecommerce/extensions/checkout/tests/test_mixins.py index e14eb71c193..ab4c232afbc 100644 --- a/ecommerce/extensions/checkout/tests/test_mixins.py +++ b/ecommerce/extensions/checkout/tests/test_mixins.py @@ -367,7 +367,7 @@ def test_handle_successful_order_with_email_opt_in(self, expected_opt_in, _): def test_place_free_order(self, __): """ Verify an order is placed and the basket is submitted. """ basket = create_basket(empty=True) - basket.add_product(ProductFactory(stockrecords__price=0)) + basket.add_product(ProductFactory(stockrecords__price_excl_tax=0)) order = EdxOrderPlacementMixin().place_free_order(basket) self.assertIsNotNone(order) @@ -376,7 +376,7 @@ def test_place_free_order(self, __): def test_non_free_basket_order(self, __): """ Verify an error is raised for non-free basket. """ basket = create_basket(empty=True) - basket.add_product(ProductFactory(stockrecords__price=10)) + basket.add_product(ProductFactory(stockrecords__price_excl_tax=10)) with self.assertRaises(BasketNotFreeError): EdxOrderPlacementMixin().place_free_order(basket) diff --git a/ecommerce/extensions/checkout/views.py b/ecommerce/extensions/checkout/views.py index 8627273fe87..376357cf8ab 100644 --- a/ecommerce/extensions/checkout/views.py +++ b/ecommerce/extensions/checkout/views.py @@ -223,7 +223,7 @@ def add_product_tracking(self, order): ) return "".join(products_for_tracking) - def get_object(self, queryset=None): + def get_object(self): kwargs = { 'number': self.request.GET['order_number'], 'site': self.request.site, diff --git a/ecommerce/extensions/communication/migrations/0002_auto_20231108_1355.py b/ecommerce/extensions/communication/migrations/0002_auto_20231108_1355.py deleted file mode 100644 index b8d71b0a73e..00000000000 --- a/ecommerce/extensions/communication/migrations/0002_auto_20231108_1355.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-08 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('communication', '0001_initial'), - ] - - operations = [ - migrations.AlterModelOptions( - name='communicationeventtype', - options={'ordering': ['name'], 'verbose_name': 'Communication event type', 'verbose_name_plural': 'Communication event types'}, - ), - migrations.AlterModelOptions( - name='email', - options={'ordering': ['-date_sent'], 'verbose_name': 'Email', 'verbose_name_plural': 'Emails'}, - ), - migrations.AlterField( - model_name='communicationeventtype', - name='name', - field=models.CharField(db_index=True, max_length=255, verbose_name='Name'), - ), - ] diff --git a/ecommerce/extensions/customer/migrations/0008_auto_20231108_1355.py b/ecommerce/extensions/customer/migrations/0008_auto_20231108_1355.py deleted file mode 100644 index 169c77ce6ab..00000000000 --- a/ecommerce/extensions/customer/migrations/0008_auto_20231108_1355.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-08 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('customer', '0007_auto_20211213_1702'), - ] - - operations = [ - migrations.AlterModelOptions( - name='productalert', - options={'ordering': ['-date_created'], 'verbose_name': 'Product alert', 'verbose_name_plural': 'Product alerts'}, - ), - migrations.AlterField( - model_name='productalert', - name='date_created', - field=models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='Date created'), - ), - ] diff --git a/ecommerce/extensions/dashboard/offers/tests/test_views.py b/ecommerce/extensions/dashboard/offers/tests/test_views.py index d2b27823e67..bfc6d462c1d 100644 --- a/ecommerce/extensions/dashboard/offers/tests/test_views.py +++ b/ecommerce/extensions/dashboard/offers/tests/test_views.py @@ -28,7 +28,6 @@ def test_site(self): metadata = { 'name': 'Test Offer', 'description': 'Blah!', - 'offer_type': 'Site', 'site': site.id, } metadata_url = reverse('dashboard:offer-metadata') diff --git a/ecommerce/extensions/dashboard/offers/views.py b/ecommerce/extensions/dashboard/offers/views.py index 13d4ec515d0..bd76adc25ea 100644 --- a/ecommerce/extensions/dashboard/offers/views.py +++ b/ecommerce/extensions/dashboard/offers/views.py @@ -23,10 +23,12 @@ def _store_form_kwargs(self, form): session_data[self._key()] = json_data self.request.session.save() - def _fetch_form_kwargs(self): + def _fetch_form_kwargs(self, step_name=None): + if not step_name: + step_name = self.step_name session_data = self.request.session.setdefault(self.wizard_name, {}) - json_data = session_data.get(self._key(self.step_name), None) + json_data = session_data.get(self._key(step_name), None) if json_data: form_kwargs = json.loads(json_data) form_kwargs['data']['site'] = Site.objects.get(pk=form_kwargs['data']['site_id']) diff --git a/ecommerce/extensions/dashboard/refunds/tests/test_acceptance.py b/ecommerce/extensions/dashboard/refunds/tests/test_acceptance.py index 2ab8af7487a..1801359a932 100644 --- a/ecommerce/extensions/dashboard/refunds/tests/test_acceptance.py +++ b/ecommerce/extensions/dashboard/refunds/tests/test_acceptance.py @@ -168,7 +168,6 @@ def test_processing_failure(self, approve): 'Please try again, or contact the E-Commerce Development Team.'.format(refund_id=refund_id) ) - @skip("Failing for some unknown reason, will fix it in another ticket.") @ddt.data(True, False) def test_cancel_action(self, approve): """ diff --git a/ecommerce/extensions/executive_education_2u/tests/test_mixins.py b/ecommerce/extensions/executive_education_2u/tests/test_mixins.py index 8721bda1310..ca1da4afb1e 100644 --- a/ecommerce/extensions/executive_education_2u/tests/test_mixins.py +++ b/ecommerce/extensions/executive_education_2u/tests/test_mixins.py @@ -53,7 +53,7 @@ def setUp(self): def test_order_note_created(self): basket = create_basket(empty=True) - basket.add_product(ProductFactory(stockrecords__price=0)) + basket.add_product(ProductFactory(stockrecords__price_excl_tax=0)) expected_note = json.dumps({ 'address': self.mock_address, @@ -74,7 +74,7 @@ def test_order_note_created(self): def test_non_free_basket_order(self): basket = create_basket(empty=True) - basket.add_product(ProductFactory(stockrecords__price=10)) + basket.add_product(ProductFactory(stockrecords__price_excl_tax=10)) with self.assertRaises(BasketNotFreeError): ExecutiveEducation2UOrderPlacementMixin().place_free_order( basket, diff --git a/ecommerce/extensions/fulfillment/tests/test_modules.py b/ecommerce/extensions/fulfillment/tests/test_modules.py index 0ee1d7b2fc9..60be1a7c036 100644 --- a/ecommerce/extensions/fulfillment/tests/test_modules.py +++ b/ecommerce/extensions/fulfillment/tests/test_modules.py @@ -596,7 +596,7 @@ def setUp(self): ) user = UserFactory() basket = factories.BasketFactory(owner=user, site=self.site) - factories.create_stockrecord(donation, num_in_stock=2, price=10) + factories.create_stockrecord(donation, num_in_stock=2, price_excl_tax=10) basket.add_product(donation, 1) self.order = create_order(number=1, basket=basket, user=user) diff --git a/ecommerce/extensions/iap/api/v1/views.py b/ecommerce/extensions/iap/api/v1/views.py index 7cb0725c0b2..bcf4f9a1ebe 100644 --- a/ecommerce/extensions/iap/api/v1/views.py +++ b/ecommerce/extensions/iap/api/v1/views.py @@ -439,7 +439,7 @@ def post(self, request): configuration = settings.PAYMENT_PROCESSOR_CONFIG[partner_short_code.lower()][IOSIAP.NAME.lower()] ios_product = list((filter(lambda sku: 'ios' in sku.partner_sku, mobile_products)))[0] course_data = { - 'price': ios_product.price, + 'price': ios_product.price_excl_tax, 'name': course.name, 'key': course_run_key } diff --git a/ecommerce/extensions/iap/management/commands/batch_update_mobile_seats.py b/ecommerce/extensions/iap/management/commands/batch_update_mobile_seats.py index 06df1320cba..f7df3a0dfa9 100644 --- a/ecommerce/extensions/iap/management/commands/batch_update_mobile_seats.py +++ b/ecommerce/extensions/iap/management/commands/batch_update_mobile_seats.py @@ -167,7 +167,7 @@ def _create_ios_product(self, course, ios_product, site): partner_short_code = site.siteconfiguration.partner.short_code configuration = settings.PAYMENT_PROCESSOR_CONFIG[partner_short_code.lower()][IOSIAP.NAME.lower()] course_data = { - 'price': ios_product.price, + 'price': ios_product.price_excl_tax, 'name': course.name, 'key': course.id, } diff --git a/ecommerce/extensions/iap/utils.py b/ecommerce/extensions/iap/utils.py index e50a9db0f0a..ecd02d9c3d4 100644 --- a/ecommerce/extensions/iap/utils.py +++ b/ecommerce/extensions/iap/utils.py @@ -71,7 +71,9 @@ def create_mobile_seat(sku_prefix, existing_web_seat): partner_sku = 'mobile.{}.{}'.format(sku_prefix.lower(), existing_stock_record.partner_sku.lower()) mobile_stock_record.partner_sku = partner_sku mobile_stock_record.price_currency = existing_stock_record.price_currency - mobile_stock_record.price = existing_stock_record.price + mobile_stock_record.price_excl_tax = existing_stock_record.price_excl_tax + mobile_stock_record.price_retail = existing_stock_record.price_retail + mobile_stock_record.cost_price = existing_stock_record.cost_price mobile_stock_record.save() return mobile_stock_record diff --git a/ecommerce/extensions/offer/management/commands/remove_partner_offers.py b/ecommerce/extensions/offer/management/commands/remove_partner_offers.py index a90af228385..31baa3a7bbd 100644 --- a/ecommerce/extensions/offer/management/commands/remove_partner_offers.py +++ b/ecommerce/extensions/offer/management/commands/remove_partner_offers.py @@ -8,7 +8,7 @@ from django.core.management import BaseCommand from django.db.models import signals from django.template.defaultfilters import pluralize -from oscar.apps.offer.receivers import delete_unused_related_conditions_and_benefits +from oscar.apps.offer.signals import delete_unused_related_conditions_and_benefits from oscar.core.loading import get_model from ecommerce.extensions.order.management.commands.prompt import query_yes_no diff --git a/ecommerce/extensions/offer/migrations/0055_auto_20231108_1355.py b/ecommerce/extensions/offer/migrations/0055_auto_20231108_1355.py deleted file mode 100644 index b31abad9c2f..00000000000 --- a/ecommerce/extensions/offer/migrations/0055_auto_20231108_1355.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-08 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('offer', '0054_auto_20230601_2037'), - ] - - operations = [ - migrations.AlterModelOptions( - name='range', - options={'ordering': ['name'], 'verbose_name': 'Range', 'verbose_name_plural': 'Ranges'}, - ), - migrations.AddField( - model_name='conditionaloffer', - name='combinations', - field=models.ManyToManyField(blank=True, help_text='Select other non-exclusive offers that this offer can be combined with on the same items', limit_choices_to={'exclusive': False}, related_name='in_combination', to='offer.ConditionalOffer'), - ), - ] diff --git a/ecommerce/extensions/offer/models.py b/ecommerce/extensions/offer/models.py index ae6de42206d..8ba3c339e0e 100644 --- a/ecommerce/extensions/offer/models.py +++ b/ecommerce/extensions/offer/models.py @@ -198,7 +198,7 @@ def get_applicable_lines(self, offer, basket, range=None): # pylint: disable=re offer.id, applicable_lines ) - return [(line.product.stockrecords.first().price, line) for line in applicable_lines] + return [(line.product.stockrecords.first().price_excl_tax, line) for line in applicable_lines] return super(Benefit, self).get_applicable_lines(offer, basket, range=range) # pylint: disable=bad-super-call diff --git a/ecommerce/extensions/offer/tests/test_dynamic_conditional_offer.py b/ecommerce/extensions/offer/tests/test_dynamic_conditional_offer.py index 726fa48d074..a3ce50c5a1d 100644 --- a/ecommerce/extensions/offer/tests/test_dynamic_conditional_offer.py +++ b/ecommerce/extensions/offer/tests/test_dynamic_conditional_offer.py @@ -111,7 +111,7 @@ def test_name(self): {'discount_applicable': False, 'discount_percent': 15}, None,) def test_is_satisfied_true(self, discount_jwt, jwt_decode_handler, request): # pylint: disable=unused-argument - product = ProductFactory(product_class=self.seat_product_class, stockrecords__price=10, categories=[]) + product = ProductFactory(product_class=self.seat_product_class, stockrecords__price_excl_tax=10, categories=[]) self.basket.add_product(product) request.return_value = Mock(method='GET', GET={'discount_jwt': discount_jwt}) @@ -126,7 +126,7 @@ def test_is_satisfied_quantity_more_than_1(self, request): # pylint: disable=u """ This discount should not apply if are buying more than one of the same course. """ - product = ProductFactory(stockrecords__price=10, categories=[]) + product = ProductFactory(stockrecords__price_excl_tax=10, categories=[]) self.basket.add_product(product, quantity=2) self.assertFalse(self.condition.is_satisfied(self.offer, self.basket)) @@ -136,6 +136,6 @@ def test_is_satisfied_not_seat_product(self, request): # pylint: disable=unuse """ This discount should not apply if are not purchasing a seat product. """ - product = ProductFactory(stockrecords__price=10, categories=[]) + product = ProductFactory(stockrecords__price_excl_tax=10, categories=[]) self.basket.add_product(product) self.assertFalse(self.condition.is_satisfied(self.offer, self.basket)) diff --git a/ecommerce/extensions/offer/tests/test_models.py b/ecommerce/extensions/offer/tests/test_models.py index dcedc9674c4..9806f874e58 100644 --- a/ecommerce/extensions/offer/tests/test_models.py +++ b/ecommerce/extensions/offer/tests/test_models.py @@ -640,7 +640,7 @@ def test_get_applicable_lines(self): basket.add_product(entitlement_product) basket.add_product(seat) - applicable_lines = [(line.product.stockrecords.first().price, line) for line in basket.all_lines()] + applicable_lines = [(line.product.stockrecords.first().price_excl_tax, line) for line in basket.all_lines()] basket.add_product(no_certificate_product) self.mock_access_token_response() diff --git a/ecommerce/extensions/offer/tests/test_utils.py b/ecommerce/extensions/offer/tests/test_utils.py index ac7f7035fef..080c82ab889 100644 --- a/ecommerce/extensions/offer/tests/test_utils.py +++ b/ecommerce/extensions/offer/tests/test_utils.py @@ -50,7 +50,7 @@ def setUp(self): self.course = CourseFactory(partner=self.partner) self.verified_seat = self.course.create_or_update_seat('verified', False, 100) self.stock_record = StockRecord.objects.filter(product=self.verified_seat).first() - self.seat_price = self.stock_record.price + self.seat_price = self.stock_record.price_excl_tax self._range = RangeFactory(products=[self.verified_seat, ]) self.percentage_benefit = BenefitFactory(type=Benefit.PERCENTAGE, range=self._range, value=35.00) diff --git a/ecommerce/extensions/order/migrations/0026_auto_20231108_1355.py b/ecommerce/extensions/order/migrations/0026_auto_20231108_1355.py deleted file mode 100644 index e5b77c7b3dd..00000000000 --- a/ecommerce/extensions/order/migrations/0026_auto_20231108_1355.py +++ /dev/null @@ -1,45 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-08 13:55 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('order', '0025_auto_20210922_1857'), - ] - - operations = [ - migrations.AlterModelOptions( - name='orderdiscount', - options={'ordering': ['pk'], 'verbose_name': 'Order Discount', 'verbose_name_plural': 'Order Discounts'}, - ), - migrations.AlterModelOptions( - name='ordernote', - options={'ordering': ['-date_updated'], 'verbose_name': 'Order Note', 'verbose_name_plural': 'Order Notes'}, - ), - migrations.RemoveField( - model_name='historicalline', - name='est_dispatch_date', - ), - migrations.RemoveField( - model_name='historicalline', - name='unit_cost_price', - ), - migrations.RemoveField( - model_name='historicalline', - name='unit_retail_price', - ), - migrations.RemoveField( - model_name='line', - name='est_dispatch_date', - ), - migrations.RemoveField( - model_name='line', - name='unit_cost_price', - ), - migrations.RemoveField( - model_name='line', - name='unit_retail_price', - ), - ] diff --git a/ecommerce/extensions/partner/admin.py b/ecommerce/extensions/partner/admin.py index 709dc7fe2e4..8a37912498a 100644 --- a/ecommerce/extensions/partner/admin.py +++ b/ecommerce/extensions/partner/admin.py @@ -11,7 +11,7 @@ @admin.register(StockRecord) class StockRecordAdminExtended(admin.ModelAdmin): - list_display = ('product', 'partner', 'partner_sku', 'price', 'num_in_stock') + list_display = ('product', 'partner', 'partner_sku', 'price_excl_tax', 'cost_price', 'num_in_stock') list_filter = ('partner',) raw_id_fields = ('product',) diff --git a/ecommerce/extensions/partner/migrations/0019_auto_20231108_1355.py b/ecommerce/extensions/partner/migrations/0019_auto_20231108_1355.py deleted file mode 100644 index ace3a9bba01..00000000000 --- a/ecommerce/extensions/partner/migrations/0019_auto_20231108_1355.py +++ /dev/null @@ -1,49 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-08 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partner', '0018_remove_partner_enable_sailthru'), - ] - - operations = [ - migrations.RemoveField( - model_name='historicalstockrecord', - name='cost_price', - ), - migrations.RemoveField( - model_name='historicalstockrecord', - name='price_retail', - ), - migrations.RemoveField( - model_name='stockrecord', - name='cost_price', - ), - migrations.RemoveField( - model_name='stockrecord', - name='price_retail', - ), - migrations.AlterField( - model_name='historicalstockrecord', - name='price_excl_tax', - field=models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True, verbose_name='Price'), - ), - migrations.RenameField( - model_name='historicalstockrecord', - old_name='price_excl_tax', - new_name='price', - ), - migrations.AlterField( - model_name='stockrecord', - name='price_excl_tax', - field=models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True, verbose_name='Price'), - ), - migrations.RenameField( - model_name='stockrecord', - old_name='price_excl_tax', - new_name='price', - ), - ] diff --git a/ecommerce/extensions/payment/migrations/0033_auto_20231108_1355.py b/ecommerce/extensions/payment/migrations/0033_auto_20231108_1355.py deleted file mode 100644 index 9be98b22c65..00000000000 --- a/ecommerce/extensions/payment/migrations/0033_auto_20231108_1355.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-08 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('payment', '0032_alter_source_card_type'), - ] - - operations = [ - migrations.AlterModelOptions( - name='source', - options={'ordering': ['pk'], 'verbose_name': 'Source', 'verbose_name_plural': 'Sources'}, - ), - migrations.AlterModelOptions( - name='sourcetype', - options={'ordering': ['name'], 'verbose_name': 'Source Type', 'verbose_name_plural': 'Source Types'}, - ), - migrations.AlterField( - model_name='sourcetype', - name='name', - field=models.CharField(db_index=True, max_length=128, verbose_name='Name'), - ), - ] diff --git a/ecommerce/extensions/payment/tests/views/test_paypal.py b/ecommerce/extensions/payment/tests/views/test_paypal.py index 2008d438ef6..65a31efbd17 100644 --- a/ecommerce/extensions/payment/tests/views/test_paypal.py +++ b/ecommerce/extensions/payment/tests/views/test_paypal.py @@ -153,7 +153,7 @@ def test_execution_for_bulk_purchase(self): course.create_or_update_seat('verified', True, 50, create_enrollment_code=True) self.basket = create_basket(owner=UserFactory(), site=self.site) enrollment_code = Product.objects.get(product_class__name=ENROLLMENT_CODE_PRODUCT_CLASS_NAME) - factories.create_stockrecord(enrollment_code, num_in_stock=2, price='10.00') + factories.create_stockrecord(enrollment_code, num_in_stock=2, price_excl_tax='10.00') self.basket.add_product(enrollment_code, quantity=1) # Create a payment record the view can use to retrieve a basket diff --git a/ecommerce/extensions/refund/tests/factories.py b/ecommerce/extensions/refund/tests/factories.py index 32dda784473..90d3b9b6c8d 100644 --- a/ecommerce/extensions/refund/tests/factories.py +++ b/ecommerce/extensions/refund/tests/factories.py @@ -17,7 +17,7 @@ ProductClass = get_model("catalogue", "ProductClass") -class RefundFactory(factory.django.DjangoModelFactory): +class RefundFactory(factory.DjangoModelFactory): status = getattr(settings, 'OSCAR_INITIAL_REFUND_STATUS', REFUND.OPEN) user = factory.SubFactory(UserFactory) total_credit_excl_tax = Decimal(1.00) @@ -42,7 +42,7 @@ class Meta: model = get_model('refund', 'Refund') -class RefundLineFactory(factory.django.DjangoModelFactory): +class RefundLineFactory(factory.DjangoModelFactory): status = getattr(settings, 'OSCAR_INITIAL_REFUND_LINE_STATUS', REFUND_LINE.OPEN) refund = factory.SubFactory(RefundFactory) line_credit_excl_tax = Decimal(1.00) diff --git a/ecommerce/extensions/test/factories.py b/ecommerce/extensions/test/factories.py index 53ccb7fea6f..511beae1b5c 100644 --- a/ecommerce/extensions/test/factories.py +++ b/ecommerce/extensions/test/factories.py @@ -68,7 +68,7 @@ def create_basket(owner=None, site=None, empty=False, price='10.00', product_cla product = create_product(product_class=product_class_instance) else: product = create_product() - create_stockrecord(product, num_in_stock=2, price=D(price)) + create_stockrecord(product, num_in_stock=2, price_excl_tax=D(price)) basket.add_product(product) return basket @@ -306,7 +306,7 @@ class EnterpriseOfferFactory(ConditionalOfferFactory): emails_for_usage_alert = 'example_1@example.com, example_2@example.com' -class OfferAssignmentFactory(factory.django.DjangoModelFactory): +class OfferAssignmentFactory(factory.DjangoModelFactory): offer = factory.SubFactory(EnterpriseOfferFactory) code = factory.Sequence(lambda n: 'VOUCHERCODE{number}'.format(number=n)) user_email = factory.Sequence(lambda n: 'example_%s@example.com' % n) @@ -322,7 +322,7 @@ class DynamicPercentageDiscountBenefitFactory(BenefitFactory): proxy_class = class_path(DynamicPercentageDiscountBenefit) -class CodeAssignmentNudgeEmailTemplatesFactory(factory.django.DjangoModelFactory): +class CodeAssignmentNudgeEmailTemplatesFactory(factory.DjangoModelFactory): email_greeting = factory.Faker('sentence') email_closing = factory.Faker('sentence') email_subject = factory.Faker('sentence') @@ -333,7 +333,7 @@ class Meta: model = CodeAssignmentNudgeEmailTemplates -class CodeAssignmentNudgeEmailsFactory(factory.django.DjangoModelFactory): +class CodeAssignmentNudgeEmailsFactory(factory.DjangoModelFactory): email_template = factory.SubFactory(CodeAssignmentNudgeEmailTemplatesFactory) user_email = factory.Sequence(lambda n: 'learner_%s@example.com' % n) email_date = datetime.now() @@ -343,7 +343,7 @@ class Meta: model = CodeAssignmentNudgeEmails -class SDNFallbackMetadataFactory(factory.django.DjangoModelFactory): +class SDNFallbackMetadataFactory(factory.DjangoModelFactory): class Meta: model = SDNFallbackMetadata @@ -352,7 +352,7 @@ class Meta: download_timestamp = datetime.now() - timedelta(days=10) -class SDNFallbackDataFactory(factory.django.DjangoModelFactory): +class SDNFallbackDataFactory(factory.DjangoModelFactory): class Meta: model = SDNFallbackData diff --git a/ecommerce/extensions/voucher/migrations/0013_make_voucher_names_unique.py b/ecommerce/extensions/voucher/migrations/0013_make_voucher_names_unique.py deleted file mode 100644 index c9fb7403b29..00000000000 --- a/ecommerce/extensions/voucher/migrations/0013_make_voucher_names_unique.py +++ /dev/null @@ -1,36 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-14 11:20 - -from django.core.paginator import Paginator -from django.db import migrations - - -def make_voucher_names_unique(apps, schema_editor): - """ - Appends a number to voucher names. - """ - Voucher = apps.get_model('voucher', 'Voucher') - vouchers = Voucher.objects.order_by('date_created') - paginator = Paginator(vouchers, 1000) - - for page_number in paginator.page_range: - page = paginator.page(page_number) - updates = [] - - for obj in page.object_list: - obj.name = '%d - %s' % (obj.id, obj.name) - if len(obj.name) > 128: - obj.name = obj.name[:128] - updates.append(obj) - - Voucher.objects.bulk_update(updates, ['name']) - - -class Migration(migrations.Migration): - - dependencies = [ - ('voucher', '0012_voucher_is_public'), - ] - - operations = [ - migrations.RunPython(make_voucher_names_unique, migrations.RunPython.noop), - ] diff --git a/ecommerce/extensions/voucher/migrations/0014_auto_20231114_1156.py b/ecommerce/extensions/voucher/migrations/0014_auto_20231114_1156.py deleted file mode 100644 index 07e9af22939..00000000000 --- a/ecommerce/extensions/voucher/migrations/0014_auto_20231114_1156.py +++ /dev/null @@ -1,59 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-14 11:56 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('voucher', '0013_make_voucher_names_unique'), - ] - - operations = [ - migrations.AlterModelOptions( - name='voucher', - options={'get_latest_by': 'date_created', 'ordering': ['-date_created'], 'verbose_name': 'Voucher', 'verbose_name_plural': 'Vouchers'}, - ), - migrations.AlterModelOptions( - name='voucherapplication', - options={'ordering': ['-date_created'], 'verbose_name': 'Voucher Application', 'verbose_name_plural': 'Voucher Applications'}, - ), - migrations.AlterModelOptions( - name='voucherset', - options={'get_latest_by': 'date_created', 'ordering': ['-date_created'], 'verbose_name': 'VoucherSet', 'verbose_name_plural': 'VoucherSets'}, - ), - migrations.RemoveField( - model_name='voucherset', - name='offer', - ), - migrations.AlterField( - model_name='historicalvoucherapplication', - name='date_created', - field=models.DateTimeField(blank=True, db_index=True, editable=False), - ), - migrations.AlterField( - model_name='voucher', - name='date_created', - field=models.DateTimeField(auto_now_add=True, db_index=True), - ), - migrations.AlterField( - model_name='voucher', - name='name', - field=models.CharField(help_text='This will be shown in the checkout and basket once the voucher is entered', max_length=128, unique=True, verbose_name='Name'), - ), - migrations.AlterField( - model_name='voucherapplication', - name='date_created', - field=models.DateTimeField(auto_now_add=True, db_index=True), - ), - migrations.AlterField( - model_name='voucherset', - name='date_created', - field=models.DateTimeField(auto_now_add=True, db_index=True), - ), - migrations.AlterField( - model_name='voucherset', - name='name', - field=models.CharField(max_length=100, unique=True, verbose_name='Name'), - ), - ] diff --git a/ecommerce/extensions/voucher/tests/test_utils.py b/ecommerce/extensions/voucher/tests/test_utils.py index a96539e675f..6741a79fc9f 100644 --- a/ecommerce/extensions/voucher/tests/test_utils.py +++ b/ecommerce/extensions/voucher/tests/test_utils.py @@ -76,7 +76,7 @@ def setUp(self): self.catalog = Catalog.objects.create(partner=self.partner) self.stock_record = StockRecord.objects.filter(product=self.verified_seat).first() - self.seat_price = self.stock_record.price + self.seat_price = self.stock_record.price_excl_tax self.catalog.stock_records.add(self.stock_record) self.coupon = self.create_coupon( @@ -255,11 +255,11 @@ def test_create_voucher_with_long_name(self): }) trimmed = ( 'This Is A Really Really Really Really Really Really Long ' - 'Voucher Name That Needs To Be Trimmed To Fit Into The N' + 'Voucher Name That Needs To Be Trimmed To Fit Into The Name Column Of Th' ) vouchers = create_vouchers(**self.data) voucher = vouchers[0] - self.assertEqual(voucher.name, trimmed + voucher.code) + self.assertEqual(voucher.name, trimmed) @ddt.data( {'end_datetime': ''}, @@ -374,7 +374,7 @@ def assert_report_first_row(self, row, coupon, voucher): if offer.condition.range.catalog: discount_data = get_voucher_discount_info( offer.benefit, - offer.condition.range.catalog.stock_records.first().price + offer.condition.range.catalog.stock_records.first().price_excl_tax ) coupon_type = _('Discount') if discount_data['is_discounted'] else _('Enrollment') discount_percentage = _('{percentage} %').format(percentage=discount_data['discount_percentage']) @@ -540,7 +540,7 @@ def test_report_for_inactive_coupons(self): # are only shown in row[0] # The data that is unique among vouchers like Code, Url, Status, etc. # starts from row[1] - self.assertEqual(rows[0]['Coupon Name'], self.coupon.title + rows[1]['Code']) + self.assertEqual(rows[0]['Coupon Name'], self.coupon.title) self.assertEqual(rows[2]['Status'], _('Inactive')) def test_generate_coupon_report_for_query_coupons(self): diff --git a/ecommerce/extensions/voucher/utils.py b/ecommerce/extensions/voucher/utils.py index 704a73252ad..6254cf020d8 100644 --- a/ecommerce/extensions/voucher/utils.py +++ b/ecommerce/extensions/voucher/utils.py @@ -128,7 +128,7 @@ def _get_info_for_coupon_report(coupon, voucher): note = '' coupon_stockrecord = StockRecord.objects.get(product=coupon) - invoiced_amount = currency(coupon_stockrecord.price) + invoiced_amount = currency(coupon_stockrecord.price_excl_tax) offer = voucher.best_offer offer_range = offer.condition.range program_uuid = offer.condition.program_uuid @@ -151,8 +151,8 @@ def _get_info_for_coupon_report(coupon, voucher): course_seat_types = offer_range.course_seat_types if course_id: - price = currency(seat_stockrecord.price) - discount_data = get_voucher_discount_info(benefit, seat_stockrecord.price) + price = currency(seat_stockrecord.price_excl_tax) + discount_data = get_voucher_discount_info(benefit, seat_stockrecord.price_excl_tax) coupon_type, discount_percentage, discount_amount = _get_discount_info(discount_data) else: benefit_type = get_benefit_type(benefit) @@ -537,9 +537,8 @@ def create_new_voucher(code, end_datetime, name, start_datetime, voucher_type): if not isinstance(end_datetime, datetime.datetime): end_datetime = dateutil.parser.parse(end_datetime) - name = name[:128 - len(voucher_code)] + voucher_code voucher = Voucher.objects.create( - name=name, + name=name[:128], code=voucher_code, usage=voucher_type, start_datetime=start_datetime, diff --git a/ecommerce/management/tests/test_utils.py b/ecommerce/management/tests/test_utils.py index 805fa9badcc..52074217acb 100644 --- a/ecommerce/management/tests/test_utils.py +++ b/ecommerce/management/tests/test_utils.py @@ -35,7 +35,7 @@ def test_no_basket_ids(self): def test_success(self): product_price = 100 percentage_discount = 10 - product = ProductFactory(stockrecords__price=product_price) + product = ProductFactory(stockrecords__price_excl_tax=product_price) voucher, product = prepare_voucher(_range=RangeFactory(products=[product]), benefit_value=percentage_discount) self.request.user = UserFactory() basket = prepare_basket(self.request, [product], voucher) @@ -82,7 +82,7 @@ def test_success_with_cybersource(self): """ Test basket with cybersource payment basket.""" product_price = 100 percentage_discount = 10 - product = ProductFactory(stockrecords__price=product_price) + product = ProductFactory(stockrecords__price_excl_tax=product_price) voucher, product = prepare_voucher(_range=RangeFactory(products=[product]), benefit_value=percentage_discount) self.request.user = UserFactory() basket = prepare_basket(self.request, [product], voucher) @@ -210,7 +210,7 @@ def test_when_unable_to_fulfill_basket(self): def test_with_expired_voucher(self): """ Test creates order when called with basket with expired voucher""" basket = create_basket() - product = ProductFactory(stockrecords__price=100, stockrecords__partner=self.partner, + product = ProductFactory(stockrecords__price_excl_tax=100, stockrecords__partner=self.partner, stockrecords__price_currency='USD') voucher, product = prepare_voucher(code='TEST101', _range=RangeFactory(products=[product])) self.request.user = UserFactory() diff --git a/ecommerce/programs/tests/test_conditions.py b/ecommerce/programs/tests/test_conditions.py index e17ea36853e..68f3f5c50ad 100644 --- a/ecommerce/programs/tests/test_conditions.py +++ b/ecommerce/programs/tests/test_conditions.py @@ -24,7 +24,7 @@ class ProgramCourseRunSeatsConditionTests(ProgramTestMixin, TestCase): def setUp(self): super(ProgramCourseRunSeatsConditionTests, self).setUp() self.condition = factories.ProgramCourseRunSeatsConditionFactory() - self.test_product = ProductFactory(stockrecords__price=10, categories=[]) + self.test_product = ProductFactory(stockrecords__price_excl_tax=10, categories=[]) self.site.siteconfiguration.enable_partial_program = True def test_name(self): @@ -168,7 +168,7 @@ def test_is_satisfied_free_basket(self): """ Ensure the basket returns False if the basket total is zero. """ offer = factories.ProgramOfferFactory(partner=self.partner, condition=self.condition) basket = BasketFactory(site=self.site, owner=UserFactory()) - test_product = factories.ProductFactory(stockrecords__price=0, + test_product = factories.ProductFactory(stockrecords__price_excl_tax=0, stockrecords__partner__short_code='test') basket.add_product(test_product) self.assertFalse(self.condition.is_satisfied(offer, basket)) diff --git a/ecommerce/referrals/tests/factories.py b/ecommerce/referrals/tests/factories.py index bc8b4bd7fb2..cc7bd57ce7a 100644 --- a/ecommerce/referrals/tests/factories.py +++ b/ecommerce/referrals/tests/factories.py @@ -7,7 +7,7 @@ from ecommerce.tests.factories import SiteFactory -class ReferralFactory(factory.django.DjangoModelFactory): +class ReferralFactory(factory.DjangoModelFactory): class Meta: model = Referral diff --git a/ecommerce/static/js/test/specs/views/offer_view_spec.js b/ecommerce/static/js/test/specs/views/offer_view_spec.js index 905d7be7781..edd3bd2b9c7 100644 --- a/ecommerce/static/js/test/specs/views/offer_view_spec.js +++ b/ecommerce/static/js/test/specs/views/offer_view_spec.js @@ -27,7 +27,7 @@ define([ partner: 1, partner_sku: '8CF08E5', price_currency: 'USD', - price: '100.00' + price_excl_tax: '100.00' }, image_url: 'img/src/url', seat_type: 'Not verified', @@ -49,7 +49,7 @@ define([ partner: 1, partner_sku: '8CF08E5', price_currency: 'USD', - price: '100.00' + price_excl_tax: '100.00' }, image_url: 'img/src/url2', seat_type: 'verified', diff --git a/ecommerce/static/js/views/offer_view.js b/ecommerce/static/js/views/offer_view.js index a12f3cd0665..84bebdc2577 100644 --- a/ecommerce/static/js/views/offer_view.js +++ b/ecommerce/static/js/views/offer_view.js @@ -127,7 +127,7 @@ define([ if (course.get('seat_type') === 'credit' && !course.multiple_credit_providers) { price = parseFloat(course.get('credit_provider_price')).toFixed(2); } else { - price = parseFloat(course.get('stockrecords').price).toFixed(2); + price = parseFloat(course.get('stockrecords').price_excl_tax).toFixed(2); } if (benefit.type === 'Percentage') { @@ -140,7 +140,7 @@ define([ } // eslint-disable-next-line no-param-reassign - course.get('stockrecords').price = price; + course.get('stockrecords').price_excl_tax = price; course.set({new_price: newPrice.toFixed(2)}); }, diff --git a/ecommerce/static/templates/_offer_course_list.html b/ecommerce/static/templates/_offer_course_list.html index cf850fbe942..8eb7ffc9142 100644 --- a/ecommerce/static/templates/_offer_course_list.html +++ b/ecommerce/static/templates/_offer_course_list.html @@ -52,7 +52,7 @@

{% trans "Upload, change or remove images" as tmsg %}{{ tmsg | force_escape {% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.low_stock_threshold nolabel=True %} {% endif %} {% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.price_currency nolabel=True %} - {% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.price nolabel=True %} + {% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.cost_price nolabel=True %} + {% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.price_excl_tax nolabel=True %} {% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.price_retail nolabel=True %} {% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.id nolabel=True %} @@ -337,4 +338,4 @@

{% trans "Upload, change or remove images" as tmsg %}{{ tmsg | force_escape {% endblock fixed_actions_group %} -{% endblock dashboard_content %} \ No newline at end of file +{% endblock dashboard_content %} diff --git a/ecommerce/templates/oscar/dashboard/offers/offer_detail.html b/ecommerce/templates/oscar/dashboard/offers/offer_detail.html index 883829a4234..5ce6a254ceb 100644 --- a/ecommerce/templates/oscar/dashboard/offers/offer_detail.html +++ b/ecommerce/templates/oscar/dashboard/offers/offer_detail.html @@ -3,174 +3,113 @@ {% load i18n %} {% block title %} - {% blocktrans with name=offer.name %} - {{ name }} | Offers - {% endblocktrans %} | {{ block.super }} +{% filter force_escape %}{% blocktrans with name=offer.name %}{{ name }} | Offers {% endblocktrans %} {% endfilter %}| {{ block.super }} {% endblock %} {% block breadcrumbs %} - + {% endblock %} {% block header %} -
-
- {% csrf_token %} - {% if offer.is_suspended %} - - {% else %} - - {% endif %} - {% if not offer.vouchers.exists %} - {% trans "Delete offer" %} - {% endif %} -
-

{{ offer.name }}

-
+
+
+ {% csrf_token %} {% if offer.is_suspended %} + {% else %} + {% endif %} + {% trans "Delete offer" as tmsg %}{{ tmsg | force_escape }} +
+

{{ offer.name }}

+
{% endblock header %} {% block dashboard_content %} + + + + + + + +
+ {% if offer.is_available %} + {% trans "Offer currently available" as tmsg %}{{ tmsg | force_escape }} {% else %} + {% trans "Offer not available due to restrictions!" as tmsg %}{{ tmsg | force_escape }} {% endif %} + {% trans "Total cost:" as tmsg %}{{ tmsg | force_escape }} {{ offer.total_discount|currency }}{% trans "Number of orders:" as tmsg %}{{ tmsg | force_escape }} {{ offer.num_orders }}{% trans "Number of uses:" as tmsg %}{{ tmsg | force_escape }} {{ offer.num_applications }}
- +
+
{% trans "Date created:" as tmsg %}{{ tmsg | force_escape }} {{ offer.date_created }}
+

{% trans "Offer details" as tmsg %}{{ tmsg | force_escape }}

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + - - - + -
{% trans "Name" as tmsg %}{{ tmsg | force_escape }}{{ offer.name }}{% trans "Edit" as tmsg %}{{ tmsg | force_escape }}
{% trans "Description" as tmsg %}{{ tmsg | force_escape }}{{ offer.description|safe|default:"-" }}
{% trans "Site" as tmsg %}{{ tmsg | force_escape }}{{ offer.site|safe|default:"-" }}
{% trans "Incentive" as tmsg %}{{ tmsg | force_escape }}{{ offer.benefit.description|safe }}{% trans "Edit" as tmsg %}{{ tmsg | force_escape }}
{% trans "Condition" as tmsg %}{{ tmsg | force_escape }}{{ offer.condition.description|safe }}{% trans "Edit" as tmsg %}{{ tmsg | force_escape }}
{% trans "Restrictions" as tmsg %}{{ tmsg | force_escape }} - {% if offer.is_available %} - {% trans "Offer currently available" %} - {% else %} - {% trans "Offer not available due to restrictions!" %} - {% endif %} + {% for restriction in offer.availability_restrictions %} {% if not restriction.is_satisfied %} + + {{ restriction.description }} +
{% else %} {{ restriction.description }}
+ {% endif %} {% endfor %} 		{% trans "Total cost:" %} {{ offer.total_discount|currency }}{% trans "Number of orders:" %} {{ offer.num_orders }}{% trans "Number of uses:" %} {{ offer.num_applications }}{% trans "Edit" as tmsg %}{{ tmsg | force_escape }}
+ + -
-
{% trans "Date created:" %} {{ offer.date_created }}
-

{% trans "Offer details" %}

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% if offer.is_voucher_offer_type %} - - - - - {% endif %} - -
{% trans "Name" %}{{ offer.name }}{% trans "Edit" %}
{% trans "Description" %}{{ offer.description|safe|default:"-" }}
{% trans "Type" %}{{ offer.get_offer_type_display }}
{% trans "Incentive" %}{{ offer.benefit.description|safe }}{% trans "Edit" %}
{% trans "Condition" %}{{ offer.condition.description|safe }}{% trans "Edit" %}
{% trans "Restrictions" %} - {% for restriction in offer.availability_restrictions %} - {% if not restriction.is_satisfied %} - - {{ restriction.description }} -
- {% else %} - {{ restriction.description }}
- {% endif %} - {% endfor %} - 		{% trans "Edit" %}
{% trans "Num of vouchers" %}{{ offer.vouchers.count }}
- - {% if offer.is_voucher_offer_type %} -
-

{% trans "Attached vouchers" %}

-
- - {% if offer.vouchers.exists %} - - - - - - - - - {% for voucher in offer.vouchers.all %} - - - - - - {% endfor %} - - {% else %} +{% if order_discounts %} +
+ {% trans "Export to CSV" as tmsg %}{{ tmsg | force_escape }} +

{% trans "Orders that used this offer" as tmsg %}{{ tmsg | force_escape }}

+
+
{% trans "Name" %}{% trans "Code" %}{% trans "Status" %}
- {{ voucher.name }} - - {{ voucher.code }} - - {% if voucher.is_active %} - {% trans "Active" %} - {% else %} - {% trans "Inactive" %} - {% endif %} -
+ + + + + + + + {% for discount in order_discounts %} {% with order=discount.order %} - + + + + - {% endif %} -
{% trans "Order number" as tmsg %}{{ tmsg | force_escape }}{% trans "Order date" as tmsg %}{{ tmsg | force_escape }}{% trans "Order total" as tmsg %}{{ tmsg | force_escape }}{% trans "Cost" as tmsg %}{{ tmsg | force_escape }}
{% trans "No vouchers are attached to this offer." %}{{ order.number }}{{ order.date_placed }}{{ order.total_incl_tax|currency }}{{ discount.amount|currency }}
- {% endif %} - - {% if order_discounts %} -
- {% trans "Export to CSV" %} -

{% trans "Orders that used this offer" %}

-
- - - - - - - - - {% for discount in order_discounts %} - {% with order=discount.order %} - - - - - - - {% endwith %} - {% endfor %} - -
{% trans "Order number" %}{% trans "Order date" %}{% trans "Order total" %}{% trans "Cost" %}
{{ order.number }}{{ order.date_placed }}{{ order.total_incl_tax|currency }}{{ discount.amount|currency }}
- {% include 'oscar/dashboard/partials/pagination.html' %} - {% endif %} - -{% endblock dashboard_content %} \ No newline at end of file + {% endwith %} {% endfor %} + + +{% include 'oscar/dashboard/partials/pagination.html' %} +{% endif %} +{% endblock dashboard_content %} diff --git a/ecommerce/templates/oscar/dashboard/orders/line_detail.html b/ecommerce/templates/oscar/dashboard/orders/line_detail.html index 12c2a5a1a6a..4e803309999 100644 --- a/ecommerce/templates/oscar/dashboard/orders/line_detail.html +++ b/ecommerce/templates/oscar/dashboard/orders/line_detail.html @@ -9,15 +9,18 @@ {% endblock %} {% block breadcrumbs %} - + {% endblock %} {% block headertext %} @@ -180,4 +183,4 @@

{% trans "Payment events" as tmsg %}{{ tmsg | force_escape }}

-{% endblock dashboard_content %} \ No newline at end of file +{% endblock dashboard_content %} diff --git a/ecommerce/templates/oscar/dashboard/orders/order_detail.html b/ecommerce/templates/oscar/dashboard/orders/order_detail.html index af4d64b07c5..5e4582c714e 100644 --- a/ecommerce/templates/oscar/dashboard/orders/order_detail.html +++ b/ecommerce/templates/oscar/dashboard/orders/order_detail.html @@ -1,759 +1,738 @@ {% extends 'oscar/dashboard/layout.html' %} {% load i18n %} +{% load compress %} +{% load static %} {% load currency_filters %} {% block body_class %}{{ block.super }} orders{% endblock %} {% block title %} - {% blocktrans with number=order.number %}Order {{ number }}{% endblocktrans %} | {{ block.super }} + {% filter force_escape %}{% blocktrans with number=order.number %}Order {{ number }}{% endblocktrans %} {% endfilter %} | {{ block.super }} {% endblock %} +{% block extrascripts %} + {{ block.super }} + + {# Translation support for JavaScript strings. #} + + + {% compress js %} + + + + {% endcompress %} +{% endblock extrascripts %} + {% block breadcrumbs %} - + {% endblock %} {% block headertext %} - {% blocktrans with number=order.number %}Order #{{ number }}{% endblocktrans %} -{% endblock %} + {% filter force_escape %}{% blocktrans with number=order.number %}Order #{{ number }}{% endblocktrans %}{% endfilter %} +{% endblock %} {% block dashboard_content %} - {% block customer_information %} - - - {% if order.guest_email %} - - - - - - - - - {% elif order.user %} - - - - - - - - - {% else %} - - {% endif %} -
{% trans "Customer Information" %}
{% trans "Name" %}{% trans "Email address" %}
- {% trans "Customer checked out as a guest." %} - {{ order.email }}
{% trans "Name" %}{% trans "Email address" %}
{{ order.user.get_full_name|default:"-" }}{{ order.user.email|default:"-" }}
{% trans "Customer has deleted their account." %}
- {% endblock customer_information %} - - {% block order_information %} - - - - - - - - - - - - - - -
{% trans "Order information" %}
{% trans "Order Total" %}{% trans "Date of purchase" %}{% trans "Time of purchase" %}{% trans "Status" %}
{{ order.total_incl_tax|currency:order.currency }}{{ order.date_placed|date }}{{ order.date_placed|time }}{{ order.status|default:"N/A" }}
- {% endblock order_information %} - - {% block additional_order_information %} - {% endblock additional_order_information %} + {% block customer_information %} + + + {% if order.user %} + + + + + + + + + + + {% else %} + + + + {% endif %} +
{% trans "Customer Information" as tmsg %}{{ tmsg | force_escape }}
{% trans "Username" as tmsg %}{{ tmsg | force_escape }}{% trans "Full name" as tmsg %}{{ tmsg | force_escape }}{% trans "Email address" as tmsg %}{{ tmsg | force_escape }}
{{ order.user.username }}{{ order.user.get_full_name }}{{ order.user.email }}
{% trans "Customer has deleted their account." as tmsg %}{{ tmsg | force_escape }}
+ {% endblock customer_information %} + + {% block order_information %} + + + + + + + + {% if order.is_fulfillable %} + + {% endif %} + + + + + + + {% if order.is_fulfillable %} + + {% endif %} + +
{% trans "Order information" as tmsg %}{{ tmsg | force_escape }}
{% trans "Order Total" as tmsg %}{{ tmsg | force_escape }}{% trans "Date of purchase" as tmsg %}{{ tmsg | force_escape }}{% trans "Time of purchase" as tmsg %}{{ tmsg | force_escape }}{% trans "Status" as tmsg %}{{ tmsg | force_escape }} Actions
{{ order.total_incl_tax|currency:order.currency }}{{ order.date_placed|date }}{{ order.date_placed|time }}{{ order.status|default:"N/A" }} + {% trans "Retry Fulfillment" as tmsg %}{{ tmsg | force_escape }} +
+ {% endblock order_information %} + + {% block additional_order_information %} + {% endblock additional_order_information %}
-

{% trans "Order Details" %}

+

{% trans "Order Details" as tmsg %}{{ tmsg | force_escape }}

-
- {% block shipping_events %} -
-

{% trans "Shipping Events" %}

-
- {% with events=order.shipping_events.all %} - - {% if events %} - - - - - - - - - - {% for event in events %} - {% with line_qtys=event.line_quantities.all %} - - - - - - - {% endwith %} - {% endfor %} - - {% else %} - - - - - - {% endif %} -
{% trans "Date" %}{% trans "Event" %}{% trans "Lines" %}{% trans "Reference" %}
{{ event.date_created }}{{ event.event_type.name }} - {% for line_qty in event.line_quantities.all %} - - {% blocktrans with title=line_qty.line.title event_qty=line_qty.quantity total_qty=line_qty.line.quantity %} - {{ title }} (quantity {{ event_qty }}/{{ total_qty }}) - {% endblocktrans %} - - {% endfor %} - {{ event.notes|default:"-" }}
{% trans "No shipping events." %}
- {% endwith %} - {% endblock %} +
+ {% block tab_shipping %} +
+

{% trans "Shipping" as tmsg %}{{ tmsg | force_escape }}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Method name" as tmsg %}{{ tmsg | force_escape }}{{ order.shipping_method }}
{% trans "Method code" as tmsg %}{{ tmsg | force_escape }}{{ order.shipping_code|upper }}
{% trans "Charge (incl tax)" as tmsg %}{{ tmsg | force_escape }}{{ order.shipping_incl_tax|currency:order.currency }}
{% trans "Charge (excl tax)" as tmsg %}{{ tmsg | force_escape }}{{ order.shipping_excl_tax|currency:order.currency }}
{% trans "Address" as tmsg %}{{ tmsg | force_escape }} + {% for field in order.shipping_address.active_address_fields %} + {{ field }}
+ {% endfor %} + + {% trans "Update" as tmsg %}{{ tmsg | force_escape }} + +
{% trans "Phone" as tmsg %}{{ tmsg | force_escape }}{{ order.shipping_address.phone_number|default:"-" }}
{% trans "Instructions" as tmsg %}{{ tmsg | force_escape }}{{ order.shipping_address.notes|default:"-"|linebreaks }}
+ {% endblock %} +
- {% block payment_events %} +
+ {% block tab_payment %} + + {% if order.billing_address %} +
+

{% trans "Billing address" as tmsg %}{{ tmsg | force_escape }}

+
+

+ {% for field in order.billing_address.active_address_fields %} + {{ field }}
+ {% endfor %} +

+ {% endif %} + + {% with sources=order.sources.all %}
-

{% trans "Payment Events" %}

+

{% trans "Payment sources" as tmsg %}{{ tmsg | force_escape }}

- {% with events=order.payment_events.all %} - - {% if events %} - - - - - - - - - - - {% for event in events %} - {% with line_qtys=event.line_quantities.all %} - - - - - - - - {% endwith %} - {% endfor %} - - {% else %} - - - - {% endif %} -
{% trans "Date" %}{% trans "Event" %}{% trans "Amount" %}{% trans "Lines" %}{% trans "Reference" %}
{{ event.date_created }}{{ event.event_type.name }}{{ event.amount|currency:order.currency }} - {% for line_qty in event.line_quantities.all %} - {% trans "Product:" %} {{ line_qty.line.title }} - {% trans "quantity" %} {{ line_qty.quantity }}
- {% endfor %} - 		{{ event.reference|default:"-" }}
{% trans "No payment events." %}
- {% endwith %} + {% if sources %} + + + + + + + + + + + + {% for source in sources %} + + + + + + + + {% endfor %} + +
{% trans "Source" as tmsg %}{{ tmsg | force_escape }}{% trans "Allocation" as tmsg %}{{ tmsg | force_escape }}{% trans "Amount debited" as tmsg %}{{ tmsg | force_escape }}{% trans "Amount refunded" as tmsg %}{{ tmsg | force_escape }}{% trans "Reference" as tmsg %}{{ tmsg | force_escape }}
{{ source.source_type }}{{ source.amount_allocated|currency:order.currency }}{{ source.amount_debited|currency:order.currency }}{{ source.amount_refunded|currency:order.currency }}{{ source.reference|default:"-" }}
+ {% else %} + + + + +
{% trans "No payment sources found for this order." as tmsg %}{{ tmsg | force_escape }}
+ {% endif %} + {% endwith %} + + {% block payment_transactions %} + {% if payment_transactions %} +
+

{% trans "Transactions" as tmsg %}{{ tmsg | force_escape }}

+
+ + + + + + + + + + + + {% for txn in payment_transactions %} + + + + + + + + {% endfor %} + +
{% trans "Source" as tmsg %}{{ tmsg | force_escape }}{% trans "Amount" as tmsg %}{{ tmsg | force_escape }}{% trans "Reference" as tmsg %}{{ tmsg | force_escape }}{% trans "Status" as tmsg %}{{ tmsg | force_escape }}{% trans "Date" as tmsg %}{{ tmsg | force_escape }}
{{ txn.source.source_type }}{{ txn.amount|currency:order.currency }}{{ txn.reference|default:"-" }}{{ txn.status|default:"-" }}{{ txn.date_created }}
+ {% endif %} {% endblock %} + + {% endblock %}
-
- {% block tab_shipping %} +
+ {% block tab_discounts %} + + {% with discounts=order.discounts.all %}
-

{% trans "Shipping" %}

+

{% trans "Discounts" as tmsg %}{{ tmsg | force_escape }}

+ {% if discounts %} + + + + + + + + + + + + + {% for discount in discounts %} + + + + + + + + + {% endfor %} + +
{% trans "Type" as tmsg %}{{ tmsg | force_escape }}{% trans "Voucher" as tmsg %}{{ tmsg | force_escape }}{% trans "Offer name" as tmsg %}{{ tmsg | force_escape }}{% trans "Frequency" as tmsg %}{{ tmsg | force_escape }}{% trans "Message" as tmsg %}{{ tmsg | force_escape }}{% trans "Amount" as tmsg %}{{ tmsg | force_escape }}
{{ discount.get_category_display }} + {{ discount.voucher.code|default:"-" }} + + {% if discount.offer %} + {{ discount.offer.name }} + {% else %} + {{ discount.offer_name }} + {% endif %} + {{ discount.frequency }}{{ discount.message|default:"-" }}{{ discount.amount|currency:order.currency }}
+ {% else %} + + + + +
{% trans "No discounts were applied to this order." as tmsg %}{{ tmsg | force_escape }}
+ {% endif %} + {% endwith %} + + {% endblock %} +
+ +
+ {% block tab_notes %} +
+

{% trans "Notes" as tmsg %}{{ tmsg | force_escape }}

+
+ {% with notes=order.notes.all %} - - - - - - - - - - - - - + {% if notes %} + + + + + + + + {% for note in notes %} - - - - - - + + + + - - - - - - - - - + {% endfor %} + {% else %} + + + + {% endif %}
{% trans "Method name" %}{{ order.shipping_method }}
{% trans "Method code" %}{{ order.shipping_code|upper }}
{% trans "Charge (incl tax)" %}{{ order.shipping_incl_tax|currency:order.currency }}
{% trans "Date" as tmsg %}{{ tmsg | force_escape }}{% trans "User" as tmsg %}{{ tmsg | force_escape }}{% trans "Type" as tmsg %}{{ tmsg | force_escape }}{% trans "Message" as tmsg %}{{ tmsg | force_escape }}{% trans "Admin" as tmsg %}{{ tmsg | force_escape }}
{% trans "Charge (excl tax)" %}{{ order.shipping_excl_tax|currency:order.currency }}
{% trans "Address" %} - {% for field in order.shipping_address.active_address_fields %} - {{ field }}
- {% endfor %} - - {% trans "Update" %} - + 		{{ note.date_created }}{{ note.user|default:"-" }}{{ note.note_type|default:"-" }}{{ note.message|linebreaks }} + {% if note.is_editable %} +   + {% trans "Edit" as tmsg %}{{ tmsg | force_escape }} +
+ {% csrf_token %} + + + +
+ {% endif %}
{% trans "Phone" %}{{ order.shipping_address.phone_number|default:"-" }}
{% trans "Instructions" %}{{ order.shipping_address.notes|default:"-"|linebreaks }}
{% trans "No notes available." as tmsg %}{{ tmsg | force_escape }}
- {% endblock %} -
- -
- {% block tab_refund %} -
- {% include "oscar/dashboard/partials/refund_table.html" with refunds=order.refunds.all %} -
- {% endblock %} -
- -
- {% block tab_payment %} + {% endwith %} - {% if order.billing_address %} -
-

{% trans "Billing address" %}

-
-

- {% for field in order.billing_address.active_address_fields %} - {{ field }}
- {% endfor %} -

- {% endif %} - - {% with sources=order.sources.all %} -
-

{% trans "Payment sources" %}

-
- {% if sources %} - - - - - - - - - - - - {% for source in sources %} - - - - - - - - {% endfor %} - -
{% trans "Source" %}{% trans "Allocation" %}{% trans "Amount debited" %}{% trans "Amount refunded" %}{% trans "Reference" %}
{{ source.source_type }}{{ source.amount_allocated|currency:order.currency }}{{ source.amount_debited|currency:order.currency }}{{ source.amount_refunded|currency:order.currency }}{{ source.reference|default:"-" }}
- {% else %} - - -
{% trans "No payment sources found for this order." %}
- {% endif %} - {% endwith %} - - {% block payment_transactions %} - {% if payment_transactions %} -
-

{% trans "Transactions" %}

-
- - - - - - - - - - - - {% for txn in payment_transactions %} - - - - - - - - {% endfor %} - -
{% trans "Source" %}{% trans "Amount" %}{% trans "Reference" %}{% trans "Status" %}{% trans "Date" %}
{{ txn.source.source_type }}{{ txn.amount|currency:order.currency }}{{ txn.reference|default:"-" }}{{ txn.status|default:"-" }}{{ txn.date_created }}
- {% endif %} - {% endblock %} - - {% endblock %} -
- -
- {% block tab_discounts %} - - {% with discounts=order.discounts.all %} -
-

{% trans "Discounts" %}

-
- {% if discounts %} - - - - - - - - - - - - - {% for discount in discounts %} - - - - - - - - - {% endfor %} - -
{% trans "Type" %}{% trans "Voucher" %}{% trans "Offer name" %}{% trans "Frequency" %}{% trans "Message" %}{% trans "Amount" %}
{{ discount.get_category_display }} - {{ discount.voucher.code|default:"-" }} - - {% if discount.offer %} - {{ discount.offer.name }} - {% else %} - {{ discount.offer_name }} - {% endif %} - {{ discount.frequency }}{{ discount.message|default:"-" }}{{ discount.amount|currency:order.currency }}
- {% else %} - - -
{% trans "No discounts were applied to this order." %}
- {% endif %} - {% endwith %} - - {% endblock %} -
- -
- {% block tab_notes %} -
-

{% trans "Notes" %}

-
- {% with notes=order.notes.all %} - - {% if notes %} - - - - - - - - {% for note in notes %} - - - - - - - - {% endfor %} - {% else %} - - - - {% endif %} -
{% trans "Date" %}{% trans "User" %}{% trans "Type" %}{% trans "Message" %}{% trans "Admin" %}
{{ note.date_created }}{{ note.user|default:"-" }}{{ note.note_type|default:"-" }}{{ note.message|linebreaks }} - {% if note.is_editable %} - {% trans "Edit" %} -
- {% csrf_token %} - - - -
- {% endif %} -
{% trans "No notes available." %}
- {% endwith %} - -
- {% csrf_token %} - - {% include "oscar/dashboard/partials/form_fields.html" with form=note_form %} -
- - {% trans "Notes are only editable for 5 minutes after being saved." %} -
-
- {% endblock %} +
+ {% csrf_token %} + + {% include "oscar/partials/form_fields.html" with form=note_form %} +
+ + {% trans "Notes are only editable for 5 minutes after being saved." as tmsg %}{{ tmsg | force_escape }} +
+
+ {% endblock %}
- {% block extra_tabs %}{% endblock %} + {% block extra_tabs %} +
+ {% include "oscar/dashboard/partials/refund_table.html" with refunds=order.refunds.all %} +
+ {% endblock %}
{% endblock dashboard_content %} {% block onbodyload %} - {{ block.super }} - oscar.dashboard.orders.initTabs(); - oscar.dashboard.orders.initTable(); -{% endblock %} \ No newline at end of file + {{ block.super }} + oscar.dashboard.orders.initTabs(); + oscar.dashboard.orders.initTable(); +{% endblock %} diff --git a/ecommerce/templates/oscar/dashboard/orders/order_list.html b/ecommerce/templates/oscar/dashboard/orders/order_list.html index 246a5a98019..2d74912f3a0 100644 --- a/ecommerce/templates/oscar/dashboard/orders/order_list.html +++ b/ecommerce/templates/oscar/dashboard/orders/order_list.html @@ -1,181 +1,160 @@ {% extends 'oscar/dashboard/layout.html' %} +{% load compress %} {% load currency_filters %} +{% load static %} {% load sorting_tags %} {% load i18n %} -{% load widget_tweaks %} {% block body_class %}{{ block.super }} orders{% endblock %} {% block title %} - {% trans "Orders" %} | {{ block.super }} + {% trans "Orders" as tmsg %}{{ tmsg | force_escape }} | {{ block.super }} +{% endblock %} + +{% block extrascripts %} + {{ block.super }} + + {# Translation support for JavaScript strings. #} + + + {% compress js %} + + + + {% endcompress %} {% endblock %} {% block breadcrumbs %} - + {% endblock %} {% block header %}
-

{% trans "Orders" %}

+

{% trans "Orders" as tmsg %}{{ tmsg | force_escape }}

{% endblock header %} {% block dashboard_content %} -
-

{% trans "Search" %}

-
-
-
- {% for field in form %} - {% if "order" in field.id_for_label %} - {% if field.is_hidden %} - {% render_field field class+='form-control' %} - {% else %} -
- {{ field.label_tag }} - {% render_field field class+='form-control' %} - {% for error in field.errors %} -
    -
  • {{ error }}
    • -
- {% endfor %} -
- {% endif %} - {% endif %} - {% endfor %} - - {% trans "Advanced Search" %} -
- - {# Search modal, if there are form errors the form is automatically openend #} - {% include "oscar/dashboard/partials/advanced_search_modal.html" with form=form style='horizontal' %} - - {% if search_filters %} -
- - {% for filter in search_filters %} - {{ filter }} - {% endfor %} -
- - {% endif %} -
+ {% include "oscar/dashboard/partials/search_form.html" %} - {% if orders %} -
- {% csrf_token %} + {% if orders %} + + {% csrf_token %} + {% include "oscar/dashboard/orders/partials/bulk_edit_form.html" with status=active_status %} - {% block order_list %} + {% block order_list %} - - - - - - - - - - - - + + + + + + + + + + + {% for order in orders %} - - - + + + - + - - + {% endfor %}
-

- {% if search_filters %} - {% trans "Order Search Results" %} - {% else %} - {% trans "All Orders" %} - {% endif %} +

{{ queryset_description }}

-
+ +
- - + +
{% anchor 'number' _("Order number") %}{% anchor 'total_incl_tax' _("Total inc tax") %}{% trans "Number of items" %}{% trans "Status" %}{% trans "Customer" %}{% trans "Shipping address" %}{% trans "Billing address" %}{% trans "Date of purchase" %}
{% anchor 'number' _("Order number") as tmsg %}{{ tmsg | force_escape }}{% anchor 'total_incl_tax' _("Total inc tax") as tmsg %}{{ tmsg | force_escape }}{% trans "Number of items" as tmsg %}{{ tmsg | force_escape }}{% trans "Status" as tmsg %}{{ tmsg | force_escape }}{% trans "Username" as tmsg %}{{ tmsg | force_escape }}{% trans "Email" as tmsg %}{{ tmsg | force_escape }}{% trans "Date of purchase" as tmsg %}{{ tmsg | force_escape }}
{{ order.number }}
{{ order.number }} + {{ order.total_incl_tax|currency:order.currency }} {{ order.num_items }}{{ order.status|default:"-" }}{{ order.status|default:"-" }} - {% if order.guest_email %} - {{ order.guest_email }} - {% elif order.user %} - {{ order.user.get_full_name|default:"-" }} + {% if order.user %} + {{ order.user.username }} {% else %} - <{% trans "Deleted" %}> + <{% trans "Deleted" as tmsg %}{{ tmsg | force_escape }}> {% endif %} {{ order.shipping_address|default:"-" }}{{ order.billing_address|default:"-" }} + {% if order.user %} + {{ order.user.email }} + {% else %} + <{% trans "Deleted" as tmsg %}{{ tmsg | force_escape }}> + {% endif %} + {{ order.date_placed }} - {% trans "View" %} + {% trans "View" as tmsg %}{{ tmsg | force_escape }} + {% if order.is_fulfillable %} + {% trans "Retry Fulfillment" as tmsg %}{{ tmsg | force_escape }} + {% endif %}
- {% endblock order_list %} - {% block order_actions %} -
-

{% trans "Change order status" %}:

- {% if order_statuses %} -
-
- -
-
-
- -
- {% else %} - {% trans "This order can't have its status changed." %} - {% endif %} -
- {% endblock %} - - {% include "oscar/dashboard/partials/pagination.html" %} -
- {% else %} - - - -
- {% if search_filters %} - {% trans "Order Search Results" %} - {% else %} - {% trans "All Orders" %} - {% endif %} -
{% trans "No orders found." %}
- {% endif %} - - {% endblock dashboard_content %} - - {% block onbodyload %} - {{ block.super }} - oscar.dashboard.orders.initTable(); - {% if form.errors %} - $('#SearchModal').modal('show'); - {% endif %} - {% endblock onbodyload %} \ No newline at end of file + {% endblock order_list %} + + {% block order_actions %} +
+

{% trans "Change order status" as tmsg %}{{ tmsg | force_escape }}:

+ {% if order_statuses %} +
+
+ + + +
+
+ + {% else %} + {% trans "This order can't have its status changed." as tmsg %}{{ tmsg | force_escape }} + {% endif %} +
+ {% endblock %} + + + {% include "oscar/dashboard/orders/partials/bulk_edit_form.html" with status=active_status %} + {% include "oscar/partials/pagination.html" %} + + {% else %} + + + + + +
{{ queryset_description }}
{% trans "No orders found." as tmsg %}{{ tmsg | force_escape }}
+ {% endif %} + +{% endblock dashboard_content %} + +{% block onbodyload %} + {{ block.super }} + oscar.dashboard.orders.initTable(); + oscar.dashboard.search.init(); +{% endblock onbodyload %} diff --git a/ecommerce/templates/oscar/dashboard/partials/search_form.html b/ecommerce/templates/oscar/dashboard/partials/search_form.html index 163a0e409b4..0050c8cce3c 100644 --- a/ecommerce/templates/oscar/dashboard/partials/search_form.html +++ b/ecommerce/templates/oscar/dashboard/partials/search_form.html @@ -1,16 +1,16 @@ {% load i18n %}
-

{% trans "Search" %}

+

{% trans "Search" as tmsg %}{{ tmsg | force_escape }}

-
+
{% for field in form %} {% if field.id_for_label in exposed_field_ids %} {% if field.is_hidden %} {{ field }} {% else %} -
+ {{ field.label_tag }} {{ field }} {% for error in field.errors %} @@ -18,33 +18,34 @@

{% trans "Search" %}

  • {{ error }}
    • {% endfor %} -
    + {% endif %} {% endif %} {% endfor %} {% trans "Advanced Search" as tmsg %}{{ tmsg | force_escape }}
    -
    - diff --git a/ecommerce/templates/oscar/dashboard/refunds/refund_detail.html b/ecommerce/templates/oscar/dashboard/refunds/refund_detail.html index 25453f8abae..b794a79c8c7 100644 --- a/ecommerce/templates/oscar/dashboard/refunds/refund_detail.html +++ b/ecommerce/templates/oscar/dashboard/refunds/refund_detail.html @@ -26,13 +26,15 @@ {% endblock extrascripts %} {% block breadcrumbs %} - + {% endblock breadcrumbs %} {% block headertext %} @@ -198,4 +200,4 @@

    {% trans "Payment Events" as tmsg %}{{ tmsg | force_escape }}

    {% endwith %} {% endblock payment_events %} -{% endblock dashboard_content %} \ No newline at end of file +{% endblock dashboard_content %} diff --git a/ecommerce/templates/oscar/dashboard/refunds/refund_list.html b/ecommerce/templates/oscar/dashboard/refunds/refund_list.html index 28c82eefed6..adf46e5ee85 100644 --- a/ecommerce/templates/oscar/dashboard/refunds/refund_list.html +++ b/ecommerce/templates/oscar/dashboard/refunds/refund_list.html @@ -25,17 +25,17 @@ {% endblock extrascripts %} {% block breadcrumbs %} - + {% endblock breadcrumbs %} {% block header %}
    -

    {% trans "Refunds" %}

    +

    {% trans "Refunds" as tmsg %}{{ tmsg | force_escape }}

    {% endblock header %} @@ -45,7 +45,6 @@

    {% trans "Refunds" %}

    {% if refunds %} {% include "oscar/dashboard/partials/refund_action_modal.html" %} {% block refund_list %} -

    @@ -106,4 +105,4 @@

    {% endif %} -{% endblock dashboard_content %} \ No newline at end of file +{% endblock dashboard_content %} diff --git a/ecommerce/tests/factories.py b/ecommerce/tests/factories.py index b9bf3ab585f..74e8ca29789 100644 --- a/ecommerce/tests/factories.py +++ b/ecommerce/tests/factories.py @@ -11,7 +11,7 @@ from ecommerce.core.models import SiteConfiguration -class PartnerFactory(factory.django.DjangoModelFactory): +class PartnerFactory(factory.DjangoModelFactory): class Meta: model = get_model('partner', 'Partner') django_get_or_create = ('name',) @@ -20,7 +20,7 @@ class Meta: short_code = FuzzyText(length=8) -class SiteFactory(factory.django.DjangoModelFactory): +class SiteFactory(factory.DjangoModelFactory): class Meta: model = Site @@ -28,7 +28,7 @@ class Meta: name = FuzzyText() -class SiteConfigurationFactory(factory.django.DjangoModelFactory): +class SiteConfigurationFactory(factory.DjangoModelFactory): class Meta: model = SiteConfiguration @@ -48,7 +48,7 @@ class StockRecordFactory(OscarStockRecordFactory): price_currency = 'USD' -class UserFactory(factory.django.DjangoModelFactory): +class UserFactory(factory.DjangoModelFactory): class Meta: model = get_model('core', 'User') diff --git a/ecommerce/tests/mixins.py b/ecommerce/tests/mixins.py index 31c6679ac56..349c6f11e0b 100644 --- a/ecommerce/tests/mixins.py +++ b/ecommerce/tests/mixins.py @@ -175,7 +175,7 @@ def setUp(self): parent=self.base_product, title='Cardboard Cutout', stockrecords__partner_sku=self.FREE_SKU, - stockrecords__price=Decimal('0.00'), + stockrecords__price_excl_tax=Decimal('0.00'), ) self.set_jwt_cookie(SYSTEM_ENTERPRISE_OPERATOR_ROLE, ALL_ACCESS_CONTEXT) diff --git a/requirements/base.in b/requirements/base.in index 6dd03194b2e..afe614819e3 100755 --- a/requirements/base.in +++ b/requirements/base.in @@ -46,11 +46,10 @@ inapppy==2.5.2 jsonfield jsonfield2 libsass==0.9.2 -markdown==3.4.3 +markdown==2.6.9 mysqlclient<1.5 newrelic ndg-httpsclient -openedx-atlas path.py==7.2 paypalrestsdk premailer==2.9.2 diff --git a/requirements/base.txt b/requirements/base.txt index 63bccb9e11e..ecf4538a637 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -166,7 +166,7 @@ django-libsass==0.9 # via -r requirements/base.in django-model-utils==4.3.1 # via edx-rbac -django-oscar==3.1 +django-oscar==2.2 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -178,7 +178,7 @@ django-simple-history==3.0.0 # -r requirements/base.in django-solo==2.1.0 # via -r requirements/base.in -django-tables2==2.3.4 +django-tables2==2.4.1 # via django-oscar django-threadlocals==0.10 # via -r requirements/base.in @@ -248,7 +248,7 @@ extras==1.0.0 # via # cybersource-rest-client-python # python-subunit -factory-boy==3.1.0 +factory-boy==2.12.0 # via django-oscar faker==18.10.1 # via factory-boy @@ -331,7 +331,7 @@ lxml==4.9.2 # via # premailer # zeep -markdown==3.4.3 +markdown==2.6.9 # via -r requirements/base.in markupsafe==2.1.3 # via jinja2 @@ -362,8 +362,6 @@ oauthlib==3.2.2 # getsmarter-api-clients # requests-oauthlib # social-auth-core -openedx-atlas==0.5.0 - # via -r requirements/base.in packaging==23.1 # via drf-yasg paramiko==3.2.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index c5bc0d394ae..dee238aab54 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -15,7 +15,7 @@ cybersource-rest-client-python==0.0.21 # Django 3.2 support is added in version 2.2 so pinning it to 2.2 -django-oscar==3.1 +django-oscar==2.2 # Pinned because transifex-client==0.13.6 pins it urllib3>=1.24.2,<2.0.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index 7c94773baac..9cc538352fa 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -252,7 +252,7 @@ django-model-utils==4.3.1 # via # -r requirements/test.txt # edx-rbac -django-oscar==3.1 +django-oscar==2.2 # via -r requirements/test.txt django-phonenumber-field==5.0.0 # via @@ -262,7 +262,7 @@ django-simple-history==3.0.0 # via -r requirements/test.txt django-solo==2.1.0 # via -r requirements/test.txt -django-tables2==2.3.4 +django-tables2==2.4.1 # via # -r requirements/test.txt # django-oscar @@ -333,7 +333,7 @@ edx-drf-extensions==9.1.2 # edx-rbac edx-ecommerce-worker @ git+https://github.com/openedx/ecommerce-worker.git@2u/3.3.5 # via -r requirements/test.txt -edx-i18n-tools==1.3.0 +edx-i18n-tools==0.9.2 # via -r requirements/test.txt edx-opaque-keys==2.3.0 # via @@ -358,7 +358,7 @@ extras==1.0.0 # -r requirements/test.txt # cybersource-rest-client-python # python-subunit -factory-boy==3.1.0 +factory-boy==2.12.0 # via # -r requirements/test.txt # django-oscar @@ -521,7 +521,7 @@ lxml==4.9.2 # -r requirements/test.txt # premailer # zeep -markdown==3.4.3 +markdown==2.6.9 # via -r requirements/test.txt markupsafe==2.1.3 # via @@ -570,8 +570,6 @@ oauthlib==3.2.2 # getsmarter-api-clients # requests-oauthlib # social-auth-core -openedx-atlas==0.5.0 - # via -r requirements/base.in packaging==23.1 # via # -r requirements/docs.txt diff --git a/requirements/production.txt b/requirements/production.txt index bd75ae22646..3ecca7c774e 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -169,7 +169,7 @@ django-libsass==0.9 # via -r requirements/base.in django-model-utils==4.3.1 # via edx-rbac -django-oscar==3.1 +django-oscar==2.2 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -183,7 +183,7 @@ django-simple-history==3.0.0 # -r requirements/base.in django-solo==2.1.0 # via -r requirements/base.in -django-tables2==2.3.4 +django-tables2==2.4.1 # via django-oscar django-threadlocals==0.10 # via -r requirements/base.in @@ -253,7 +253,7 @@ extras==1.0.0 # via # cybersource-rest-client-python # python-subunit -factory-boy==3.1.0 +factory-boy==2.12.0 # via django-oscar faker==18.10.1 # via factory-boy @@ -338,7 +338,7 @@ lxml==4.9.2 # via # premailer # zeep -markdown==3.4.3 +markdown==2.6.9 # via -r requirements/base.in markupsafe==2.1.3 # via jinja2 @@ -372,8 +372,6 @@ oauthlib==3.2.2 # getsmarter-api-clients # requests-oauthlib # social-auth-core -openedx-atlas==0.5.0 - # via -r requirements/base.in packaging==23.1 # via drf-yasg paramiko==3.2.0 diff --git a/requirements/test.txt b/requirements/test.txt index 78635c3543a..ed19aae6046 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -242,7 +242,7 @@ django-model-utils==4.3.1 # via # -r requirements/base.txt # edx-rbac -django-oscar==3.1 +django-oscar==2.2 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -256,7 +256,7 @@ django-simple-history==3.0.0 # -r requirements/base.txt django-solo==2.1.0 # via -r requirements/base.txt -django-tables2==2.3.4 +django-tables2==2.4.1 # via # -r requirements/base.txt # django-oscar @@ -324,7 +324,7 @@ edx-drf-extensions==9.1.2 # edx-rbac edx-ecommerce-worker @ git+https://github.com/openedx/ecommerce-worker.git@2u/3.3.5 # via -r requirements/base.txt -edx-i18n-tools==1.3.0 +edx-i18n-tools==0.9.2 # via -r requirements/test.in edx-opaque-keys==2.3.0 # via @@ -350,7 +350,7 @@ extras==1.0.0 # -r requirements/base.txt # cybersource-rest-client-python # python-subunit -factory-boy==3.1.0 +factory-boy==2.12.0 # via # -r requirements/base.txt # -r requirements/test.in @@ -500,7 +500,7 @@ lxml==4.9.2 # -r requirements/test.in # premailer # zeep -markdown==3.4.3 +markdown==2.6.9 # via -r requirements/base.txt markupsafe==2.1.3 # via @@ -549,8 +549,6 @@ oauthlib==3.2.2 # getsmarter-api-clients # requests-oauthlib # social-auth-core -openedx-atlas==0.5.0 - # via -r requirements/base.in packaging==23.1 # via # -r requirements/base.txt