Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
ecommerce
Commits
aeb3a2b4
Commit
aeb3a2b4
authored
Jan 31, 2018
by
Ahsan Ulhaq
Committed by
Ahsan Ul Haq
Feb 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade django to latest version
LEARNER-1306
parent
2d7ba9e8
Hide whitespace changes
Inline
Side-by-side
Showing
85 changed files
with
87 additions
and
86 deletions
+87
-86
ecommerce/core/tests/test_admin.py
+1
-1
ecommerce/core/tests/test_views.py
+1
-1
ecommerce/coupons/tests/test_views.py
+1
-1
ecommerce/coupons/views.py
+1
-1
ecommerce/courses/tests/test_views.py
+1
-1
ecommerce/credit/tests/test_views.py
+1
-1
ecommerce/enterprise/entitlements.py
+1
-1
ecommerce/enterprise/templates/enterprise/enterpriseoffer_form.html
+1
-1
ecommerce/enterprise/templates/enterprise/enterpriseoffer_list.html
+1
-1
ecommerce/enterprise/tests/test_views.py
+1
-1
ecommerce/enterprise/utils.py
+1
-1
ecommerce/enterprise/views.py
+1
-1
ecommerce/extensions/api/v2/tests/views/__init__.py
+1
-1
ecommerce/extensions/api/v2/tests/views/mixins.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_baskets.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_catalog.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_checkout.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_coupons.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_courses.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_enterprise.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_orders.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_partners.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_payments.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_products.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_providers.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_publication.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_refunds.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_sdn.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_stockrecords.py
+1
-1
ecommerce/extensions/api/v2/tests/views/test_vouchers.py
+1
-1
ecommerce/extensions/basket/tests/test_views.py
+1
-1
ecommerce/extensions/checkout/tests/test_views.py
+1
-1
ecommerce/extensions/checkout/utils.py
+1
-1
ecommerce/extensions/dashboard/orders/tests.py
+1
-1
ecommerce/extensions/dashboard/orders/views.py
+1
-1
ecommerce/extensions/dashboard/refunds/tests/test_acceptance.py
+1
-1
ecommerce/extensions/dashboard/refunds/tests/test_views.py
+1
-1
ecommerce/extensions/dashboard/tests.py
+1
-1
ecommerce/extensions/dashboard/users/tests/test_views.py
+1
-1
ecommerce/extensions/fulfillment/modules.py
+1
-1
ecommerce/extensions/order/tests/test_admin.py
+1
-1
ecommerce/extensions/payment/processors/cybersource.py
+1
-1
ecommerce/extensions/payment/processors/paypal.py
+1
-1
ecommerce/extensions/payment/tests/mixins.py
+1
-1
ecommerce/extensions/payment/tests/processors/test_paypal.py
+1
-1
ecommerce/extensions/payment/tests/processors/test_signals.py
+1
-1
ecommerce/extensions/payment/tests/views/test_cybersource.py
+1
-1
ecommerce/extensions/payment/tests/views/test_paypal.py
+1
-1
ecommerce/extensions/payment/tests/views/test_sdn.py
+1
-1
ecommerce/extensions/payment/views/cybersource.py
+1
-1
ecommerce/extensions/voucher/utils.py
+1
-1
ecommerce/programs/templates/programs/programoffer_form.html
+1
-1
ecommerce/programs/templates/programs/programoffer_list.html
+1
-1
ecommerce/programs/tests/test_views.py
+1
-1
ecommerce/programs/views.py
+1
-1
ecommerce/settings/test.py
+1
-0
ecommerce/social_auth/tests/test_strategies.py
+1
-1
ecommerce/templates/base.html
+1
-1
ecommerce/templates/coupons/coupon_app.html
+1
-1
ecommerce/templates/coupons/offer.html
+1
-1
ecommerce/templates/courses/course_app.html
+1
-1
ecommerce/templates/edx/base.html
+1
-1
ecommerce/templates/edx/checkout/receipt.html
+1
-1
ecommerce/templates/edx/credit/checkout.html
+1
-1
ecommerce/templates/edx/error.html
+1
-1
ecommerce/templates/edx/partials/_base_navbar.html
+1
-1
ecommerce/templates/edx/partials/_staff_navbar.html
+1
-1
ecommerce/templates/edx/partials/_student_navbar.html
+1
-1
ecommerce/templates/oscar/basket/basket.html
+1
-1
ecommerce/templates/oscar/basket/partials/client_side_checkout_basket.html
+1
-1
ecommerce/templates/oscar/checkout/cancel_checkout.html
+1
-1
ecommerce/templates/oscar/checkout/error.html
+1
-1
ecommerce/templates/oscar/checkout/payment_error.html
+1
-1
ecommerce/templates/oscar/dashboard/catalogue/product_update.html
+1
-1
ecommerce/templates/oscar/dashboard/orders/order_detail.html
+1
-1
ecommerce/templates/oscar/dashboard/orders/order_list.html
+1
-1
ecommerce/templates/oscar/dashboard/refunds/refund_detail.html
+1
-1
ecommerce/templates/oscar/dashboard/refunds/refund_list.html
+1
-1
ecommerce/templates/payment/cybersource.html
+1
-1
ecommerce/templates/payment/stripe.html
+1
-1
ecommerce/templates/rest_framework_swagger/index.html
+1
-1
ecommerce/tests/mixins.py
+1
-1
ecommerce/tests/test_urls.py
+1
-1
ecommerce/theming/tests/test_middleware.py
+1
-1
requirements/base.txt
+3
-3
No files found.
ecommerce/core/tests/test_admin.py
View file @
aeb3a2b4
from
django.contrib
import
messages
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.test.factories
import
UserFactory
from
ecommerce.core.constants
import
USER_LIST_VIEW_SWITCH
...
...
ecommerce/core/tests/test_views.py
View file @
aeb3a2b4
...
...
@@ -5,9 +5,9 @@ import mock
from
auth_backends.tests.mixins
import
LogoutViewTestMixin
from
django.conf
import
settings
from
django.contrib.auth
import
get_user_model
from
django.core.urlresolvers
import
reverse
from
django.db
import
DatabaseError
from
django.test.utils
import
override_settings
from
django.urls
import
reverse
from
rest_framework
import
status
from
ecommerce.core.constants
import
Status
...
...
ecommerce/coupons/tests/test_views.py
View file @
aeb3a2b4
...
...
@@ -6,7 +6,7 @@ import httpretty
import
mock
import
pytz
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils.timezone
import
now
from
factory.fuzzy
import
FuzzyText
from
oscar.core.loading
import
get_class
,
get_model
...
...
ecommerce/coupons/views.py
View file @
aeb3a2b4
...
...
@@ -6,9 +6,9 @@ import logging
from
django.contrib
import
messages
from
django.contrib.auth.decorators
import
login_required
from
django.core.exceptions
import
PermissionDenied
from
django.core.urlresolvers
import
reverse
from
django.http
import
Http404
,
HttpResponse
,
HttpResponseRedirect
from
django.shortcuts
import
render
from
django.urls
import
reverse
from
django.utils
import
timezone
from
django.utils.decorators
import
method_decorator
from
django.utils.text
import
slugify
...
...
ecommerce/courses/tests/test_views.py
View file @
aeb3a2b4
...
...
@@ -3,7 +3,7 @@ import json
import
ddt
import
httpretty
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
testfixtures
import
LogCapture
from
ecommerce.core.constants
import
ENROLLMENT_CODE_SWITCH
...
...
ecommerce/credit/tests/test_views.py
View file @
aeb3a2b4
...
...
@@ -9,7 +9,7 @@ from datetime import timedelta
import
ddt
import
httpretty
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils
import
timezone
from
oscar.core.loading
import
get_model
from
oscar.test.factories
import
RangeFactory
...
...
ecommerce/enterprise/entitlements.py
View file @
aeb3a2b4
...
...
@@ -13,8 +13,8 @@ from urllib import urlencode
from
django.conf
import
settings
from
django.core.cache
import
cache
from
django.core.urlresolvers
import
reverse
from
django.http
import
HttpResponseRedirect
from
django.urls
import
reverse
from
oscar.core.loading
import
get_model
from
requests.exceptions
import
ConnectionError
,
Timeout
from
slumber.exceptions
import
SlumberBaseException
...
...
ecommerce/enterprise/templates/enterprise/enterpriseoffer_form.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load crispy_forms_tags %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}
{% if editing %}
...
...
ecommerce/enterprise/templates/enterprise/enterpriseoffer_list.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load i18n %}
{% load offer_tags %}
{% load static
files
%}
{% load static %}
{% block title %}{% trans "Enterprise Offers" %}{% endblock %}
...
...
ecommerce/enterprise/tests/test_views.py
View file @
aeb3a2b4
import
uuid
import
httpretty
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.core.loading
import
get_model
from
ecommerce.enterprise.benefits
import
EnterprisePercentageDiscountBenefit
...
...
ecommerce/enterprise/utils.py
View file @
aeb3a2b4
...
...
@@ -9,7 +9,7 @@ from urllib import urlencode
import
waffle
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils.translation
import
ugettext
as
_
from
edx_rest_api_client.client
import
EdxRestApiClient
from
oscar.core.loading
import
get_model
...
...
ecommerce/enterprise/views.py
View file @
aeb3a2b4
...
...
@@ -2,7 +2,7 @@
import
logging
from
django.contrib
import
messages
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.views.generic
import
CreateView
,
ListView
,
UpdateView
from
oscar.core.loading
import
get_model
...
...
ecommerce/extensions/api/v2/tests/views/__init__.py
View file @
aeb3a2b4
from
django.core.urlresolvers
import
reverse
from
django.test
import
RequestFactory
from
django.urls
import
reverse
from
oscar.core.loading
import
get_class
,
get_model
from
oscar.test.factories
import
ProductAttributeValueFactory
...
...
ecommerce/extensions/api/v2/tests/views/mixins.py
View file @
aeb3a2b4
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.core.loading
import
get_model
from
ecommerce.courses.tests.factories
import
CourseFactory
...
...
ecommerce/extensions/api/v2/tests/views/test_baskets.py
View file @
aeb3a2b4
...
...
@@ -11,8 +11,8 @@ import ddt
import
httpretty
import
mock
from
django.contrib.auth
import
get_user_model
from
django.core.urlresolvers
import
reverse
from
django.test
import
override_settings
from
django.urls
import
reverse
from
oscar.core.loading
import
get_model
from
oscar.test
import
factories
from
oscar.test.factories
import
BasketFactory
...
...
ecommerce/extensions/api/v2/tests/views/test_catalog.py
View file @
aeb3a2b4
...
...
@@ -3,7 +3,7 @@ import json
import
ddt
import
httpretty
import
mock
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.core.loading
import
get_model
from
requests.exceptions
import
ConnectionError
,
Timeout
from
slumber.exceptions
import
SlumberBaseException
...
...
ecommerce/extensions/api/v2/tests/views/test_checkout.py
View file @
aeb3a2b4
...
...
@@ -3,8 +3,8 @@ from __future__ import unicode_literals
import
json
from
django.conf
import
settings
from
django.core.urlresolvers
import
reverse
from
django.test
import
override_settings
from
django.urls
import
reverse
from
oscar.core.loading
import
get_model
from
ecommerce.core.tests
import
toggle_switch
...
...
ecommerce/extensions/api/v2/tests/views/test_coupons.py
View file @
aeb3a2b4
...
...
@@ -9,8 +9,8 @@ from uuid import uuid4
import
ddt
import
httpretty
import
pytz
from
django.core.urlresolvers
import
reverse
from
django.test
import
RequestFactory
from
django.urls
import
reverse
from
django.utils.timezone
import
now
from
oscar.apps.catalogue.categories
import
create_from_breadcrumbs
from
oscar.core.loading
import
get_class
,
get_model
...
...
ecommerce/extensions/api/v2/tests/views/test_courses.py
View file @
aeb3a2b4
...
...
@@ -6,7 +6,7 @@ import jwt
import
mock
from
django.conf
import
settings
from
django.contrib.auth
import
get_user_model
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.core.loading
import
get_class
,
get_model
from
ecommerce.core.constants
import
ISO_8601_FORMAT
,
SEAT_PRODUCT_CLASS_NAME
...
...
ecommerce/extensions/api/v2/tests/views/test_enterprise.py
View file @
aeb3a2b4
...
...
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
import
httpretty
import
mock
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
ecommerce.enterprise.tests.mixins
import
EnterpriseServiceMockMixin
from
ecommerce.tests.testcases
import
TestCase
...
...
ecommerce/extensions/api/v2/tests/views/test_orders.py
View file @
aeb3a2b4
...
...
@@ -4,8 +4,8 @@ import ddt
import
httpretty
import
mock
from
django.contrib.auth.models
import
Permission
from
django.core.urlresolvers
import
reverse
from
django.test
import
RequestFactory
,
override_settings
from
django.urls
import
reverse
from
oscar.core.loading
import
get_model
from
ecommerce.extensions.api.serializers
import
OrderSerializer
...
...
ecommerce/extensions/api/v2/tests/views/test_partners.py
View file @
aeb3a2b4
import
json
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.core.loading
import
get_model
from
ecommerce.tests.factories
import
PartnerFactory
...
...
ecommerce/extensions/api/v2/tests/views/test_payments.py
View file @
aeb3a2b4
...
...
@@ -2,8 +2,8 @@ import json
from
django.conf
import
settings
from
django.core.cache
import
cache
from
django.core.urlresolvers
import
reverse
from
django.test
import
override_settings
from
django.urls
import
reverse
from
waffle.models
import
Switch
from
ecommerce.core.models
import
SiteConfiguration
...
...
ecommerce/extensions/api/v2/tests/views/test_products.py
View file @
aeb3a2b4
...
...
@@ -4,8 +4,8 @@ import datetime
import
json
import
pytz
from
django.core.urlresolvers
import
reverse
from
django.test
import
RequestFactory
from
django.urls
import
reverse
from
oscar.core.loading
import
get_model
from
ecommerce.core.constants
import
COUPON_PRODUCT_CLASS_NAME
,
COURSE_ENTITLEMENT_PRODUCT_CLASS_NAME
...
...
ecommerce/extensions/api/v2/tests/views/test_providers.py
View file @
aeb3a2b4
...
...
@@ -2,7 +2,7 @@ import json
import
ddt
import
httpretty
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
rest_framework
import
status
from
ecommerce.extensions.api.serializers
import
ProviderSerializer
...
...
ecommerce/extensions/api/v2/tests/views/test_publication.py
View file @
aeb3a2b4
...
...
@@ -5,7 +5,7 @@ from decimal import Decimal
import
mock
import
pytz
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
freezegun
import
freeze_time
from
oscar.core.loading
import
get_model
...
...
ecommerce/extensions/api/v2/tests/views/test_refunds.py
View file @
aeb3a2b4
...
...
@@ -3,7 +3,7 @@ import json
import
ddt
import
httpretty
import
mock
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.core.loading
import
get_model
from
rest_framework
import
status
...
...
ecommerce/extensions/api/v2/tests/views/test_sdn.py
View file @
aeb3a2b4
...
...
@@ -2,7 +2,7 @@ import json
import
ddt
import
mock
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
requests.exceptions
import
HTTPError
,
Timeout
from
rest_framework
import
status
...
...
ecommerce/extensions/api/v2/tests/views/test_stockrecords.py
View file @
aeb3a2b4
import
json
from
django.contrib.auth.models
import
Permission
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.core.loading
import
get_model
from
ecommerce.courses.tests.factories
import
CourseFactory
...
...
ecommerce/extensions/api/v2/tests/views/test_vouchers.py
View file @
aeb3a2b4
...
...
@@ -6,8 +6,8 @@ import ddt
import
httpretty
import
mock
import
pytz
from
django.core.urlresolvers
import
reverse
from
django.http
import
Http404
from
django.urls
import
reverse
from
django.utils.timezone
import
now
from
opaque_keys.edx.keys
import
CourseKey
from
oscar.core.loading
import
get_model
...
...
ecommerce/extensions/basket/tests/test_views.py
View file @
aeb3a2b4
...
...
@@ -10,9 +10,9 @@ import pytz
from
django.conf
import
settings
from
django.contrib.messages
import
get_messages
from
django.core.cache
import
cache
from
django.core.urlresolvers
import
reverse
from
django.http
import
HttpResponseRedirect
from
django.test
import
override_settings
from
django.urls
import
reverse
from
factory.fuzzy
import
FuzzyText
from
oscar.apps.basket.forms
import
BasketVoucherForm
from
oscar.core.loading
import
get_class
,
get_model
...
...
ecommerce/extensions/checkout/tests/test_views.py
View file @
aeb3a2b4
...
...
@@ -4,7 +4,7 @@ from decimal import Decimal
import
ddt
import
httpretty
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.core.loading
import
get_model
from
oscar.test
import
factories
...
...
ecommerce/extensions/checkout/utils.py
View file @
aeb3a2b4
...
...
@@ -3,7 +3,7 @@ import urllib
from
babel.numbers
import
format_currency
as
default_format_currency
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils.translation
import
get_language
,
to_locale
from
edx_rest_api_client.client
import
EdxRestApiClient
from
requests.exceptions
import
ConnectionError
,
Timeout
...
...
ecommerce/extensions/dashboard/orders/tests.py
View file @
aeb3a2b4
...
...
@@ -2,8 +2,8 @@ import os
from
unittest
import
skipIf
from
django.contrib.messages
import
constants
as
MSG
from
django.core.urlresolvers
import
reverse
from
django.test
import
override_settings
from
django.urls
import
reverse
from
nose.plugins.skip
import
SkipTest
from
oscar.core.loading
import
get_model
from
oscar.test
import
factories
...
...
ecommerce/extensions/dashboard/orders/views.py
View file @
aeb3a2b4
from
django.contrib
import
messages
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils.safestring
import
mark_safe
from
django.utils.translation
import
ugettext_lazy
as
_
from
oscar.apps.dashboard.orders.views
import
OrderDetailView
as
CoreOrderDetailView
...
...
ecommerce/extensions/dashboard/refunds/tests/test_acceptance.py
View file @
aeb3a2b4
...
...
@@ -2,7 +2,7 @@ import os
from
unittest
import
skip
import
ddt
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
nose.plugins.skip
import
SkipTest
from
oscar.core.loading
import
get_model
from
oscar.test
import
factories
...
...
ecommerce/extensions/dashboard/refunds/tests/test_views.py
View file @
aeb3a2b4
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
ecommerce.extensions.refund.status
import
REFUND
from
ecommerce.extensions.refund.tests.factories
import
RefundFactory
...
...
ecommerce/extensions/dashboard/tests.py
View file @
aeb3a2b4
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.test.factories
import
OrderFactory
,
UserFactory
from
ecommerce.tests.testcases
import
TestCase
...
...
ecommerce/extensions/dashboard/users/tests/test_views.py
View file @
aeb3a2b4
...
...
@@ -3,7 +3,7 @@ import json
import
httpretty
import
mock
from
django.contrib.messages
import
constants
as
MSG
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
requests
import
Timeout
from
testfixtures
import
LogCapture
...
...
ecommerce/extensions/fulfillment/modules.py
View file @
aeb3a2b4
...
...
@@ -10,7 +10,7 @@ import logging
import
requests
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
edx_rest_api_client.client
import
EdxRestApiClient
from
oscar.core.loading
import
get_model
from
requests.exceptions
import
ConnectionError
,
Timeout
# pylint: disable=ungrouped-imports
...
...
ecommerce/extensions/order/tests/test_admin.py
View file @
aeb3a2b4
from
django.contrib
import
messages
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.test.factories
import
UserFactory
from
ecommerce.core.tests
import
toggle_switch
...
...
ecommerce/extensions/payment/processors/cybersource.py
View file @
aeb3a2b4
...
...
@@ -9,7 +9,7 @@ import uuid
from
decimal
import
Decimal
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.apps.payment.exceptions
import
GatewayError
,
TransactionDeclined
,
UserCancelled
from
oscar.core.loading
import
get_class
from
zeep
import
Client
...
...
ecommerce/extensions/payment/processors/paypal.py
View file @
aeb3a2b4
...
...
@@ -10,7 +10,7 @@ from urlparse import urljoin
import
paypalrestsdk
import
waffle
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils.functional
import
cached_property
from
django.utils.translation
import
get_language
from
oscar.apps.payment.exceptions
import
GatewayError
...
...
ecommerce/extensions/payment/tests/mixins.py
View file @
aeb3a2b4
...
...
@@ -10,7 +10,7 @@ import ddt
import
mock
import
responses
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
factory.django
import
mute_signals
from
oscar.apps.order.exceptions
import
UnableToPlaceOrder
from
oscar.apps.payment.exceptions
import
PaymentError
,
TransactionDeclined
,
UserCancelled
...
...
ecommerce/extensions/payment/tests/processors/test_paypal.py
View file @
aeb3a2b4
...
...
@@ -11,8 +11,8 @@ import mock
import
paypalrestsdk
import
responses
from
django.conf
import
settings
from
django.core.urlresolvers
import
reverse
from
django.test
import
RequestFactory
from
django.urls
import
reverse
from
django.utils
import
translation
from
factory.fuzzy
import
FuzzyInteger
from
oscar.apps.payment.exceptions
import
GatewayError
...
...
ecommerce/extensions/payment/tests/processors/test_signals.py
View file @
aeb3a2b4
from
django.conf
import
settings
from
django.core.cache
import
cache
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
waffle.models
import
Switch
from
ecommerce.extensions.api.v2.views.payments
import
PAYMENT_PROCESSOR_CACHE_KEY
...
...
ecommerce/extensions/payment/tests/views/test_cybersource.py
View file @
aeb3a2b4
...
...
@@ -7,7 +7,7 @@ import ddt
import
mock
import
responses
from
django.conf
import
settings
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
freezegun
import
freeze_time
from
oscar.apps.payment.exceptions
import
TransactionDeclined
from
oscar.core.loading
import
get_class
,
get_model
...
...
ecommerce/extensions/payment/tests/views/test_paypal.py
View file @
aeb3a2b4
...
...
@@ -4,8 +4,8 @@ from __future__ import unicode_literals
import
ddt
import
mock
import
responses
from
django.core.urlresolvers
import
reverse
from
django.test.client
import
RequestFactory
from
django.urls
import
reverse
from
oscar.apps.order.exceptions
import
UnableToPlaceOrder
from
oscar.apps.payment.exceptions
import
PaymentError
from
oscar.core.loading
import
get_class
,
get_model
...
...
ecommerce/extensions/payment/tests/views/test_sdn.py
View file @
aeb3a2b4
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
ecommerce.tests.testcases
import
TestCase
...
...
ecommerce/extensions/payment/views/cybersource.py
View file @
aeb3a2b4
...
...
@@ -7,10 +7,10 @@ import six
import
waffle
from
django.contrib
import
messages
from
django.core.exceptions
import
ObjectDoesNotExist
from
django.core.urlresolvers
import
reverse
from
django.db
import
transaction
from
django.http
import
JsonResponse
from
django.shortcuts
import
redirect
from
django.urls
import
reverse
from
django.utils.decorators
import
method_decorator
from
django.utils.functional
import
cached_property
from
django.utils.safestring
import
mark_safe
...
...
ecommerce/extensions/voucher/utils.py
View file @
aeb3a2b4
...
...
@@ -10,7 +10,7 @@ import dateutil.parser
import
pytz
from
django.conf
import
settings
from
django.core.cache
import
cache
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils.translation
import
ugettext_lazy
as
_
from
opaque_keys.edx.keys
import
CourseKey
from
oscar.core.loading
import
get_model
...
...
ecommerce/programs/templates/programs/programoffer_form.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load crispy_forms_tags %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}
{% if editing %}
...
...
ecommerce/programs/templates/programs/programoffer_list.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load i18n %}
{% load offer_tags %}
{% load static
files
%}
{% load static %}
{% block title %}{% trans "Program Offers" %}{% endblock %}
...
...
ecommerce/programs/tests/test_views.py
View file @
aeb3a2b4
import
uuid
import
httpretty
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
oscar.core.loading
import
get_model
from
ecommerce.extensions.test
import
factories
...
...
ecommerce/programs/views.py
View file @
aeb3a2b4
import
logging
from
django.contrib
import
messages
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.views.generic
import
CreateView
,
ListView
,
UpdateView
from
oscar.core.loading
import
get_model
...
...
ecommerce/settings/test.py
View file @
aeb3a2b4
...
...
@@ -8,6 +8,7 @@ from ecommerce.settings.base import *
SITE_ID
=
1
PROTOCOL
=
'http'
ALLOWED_HOSTS
=
[
'*'
]
# TEST SETTINGS
INSTALLED_APPS
+=
(
...
...
ecommerce/social_auth/tests/test_strategies.py
View file @
aeb3a2b4
...
...
@@ -5,8 +5,8 @@ from calendar import timegm
import
httpretty
from
django.contrib.auth
import
get_user_model
from
django.core.urlresolvers
import
reverse
from
django.test
import
override_settings
from
django.urls
import
reverse
from
jwkest.jwk
import
SYMKey
from
jwkest.jws
import
JWS
from
social_django.models
import
DjangoStorage
...
...
ecommerce/templates/base.html
View file @
aeb3a2b4
{% load i18n %}
{% load static
files
%}
{% load static %}
<!DOCTYPE html>
<!--[if lt IE 7]> <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" class="no-js lt-ie9 lt-ie8"> <![endif]-->
...
...
ecommerce/templates/coupons/coupon_app.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}{% trans "Coupon Codes" %}{% endblock %}
...
...
ecommerce/templates/coupons/offer.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}{% trans "Redeem" %}{% endblock %}
...
...
ecommerce/templates/courses/course_app.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}{% trans "Courses" %}{% endblock %}
...
...
ecommerce/templates/edx/base.html
View file @
aeb3a2b4
...
...
@@ -3,7 +3,7 @@
{% load compress %}
{% load core_extras %}
{% load i18n %}
{% load static
files
%}
{% load static %}
<!DOCTYPE html>
<html
lang=
{{
LANGUAGE_CODE
}}
>
...
...
ecommerce/templates/edx/checkout/receipt.html
View file @
aeb3a2b4
...
...
@@ -4,7 +4,7 @@
{% load i18n %}
{% load l10n %}
{% load offer_tags %}
{% load static
files
%}
{% load static %}
{% load enterprise %}
{% block title %}
...
...
ecommerce/templates/edx/credit/checkout.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load core_extras %}
{% load static
files
%}
{% load static %}
{% load i18n %}
{% block title %}
...
...
ecommerce/templates/edx/error.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}{% endblock %}
...
...
ecommerce/templates/edx/partials/_base_navbar.html
View file @
aeb3a2b4
{% load i18n %}
{% load static
files
%}
{% load static %}
<header
class=
"navbar navbar-default"
>
<div
class=
"container"
>
...
...
ecommerce/templates/edx/partials/_staff_navbar.html
View file @
aeb3a2b4
{% extends 'edx/partials/_base_navbar.html' %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block navbar_brand %}
{% if admin == "course" %}
...
...
ecommerce/templates/edx/partials/_student_navbar.html
View file @
aeb3a2b4
{% extends 'edx/partials/_base_navbar.html' %}
{% load static
files
%}
{% load static %}
{% block navbar_brand %}
<h1
class=
"navbar-brand"
>
...
...
ecommerce/templates/oscar/basket/basket.html
View file @
aeb3a2b4
...
...
@@ -2,7 +2,7 @@
{% load core_extras %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}
{% trans 'Basket' %}
...
...
ecommerce/templates/oscar/basket/partials/client_side_checkout_basket.html
View file @
aeb3a2b4
...
...
@@ -3,7 +3,7 @@
{% load crispy_forms_tags %}
{% load offer_tags %}
{% load widget_tweaks %}
{% load static
files
%}
{% load static %}
{% include 'partials/alert_messages.html' %}
...
...
ecommerce/templates/oscar/checkout/cancel_checkout.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}
{% trans "Checkout Cancelled" %}
...
...
ecommerce/templates/oscar/checkout/error.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}
{% trans "Checkout Error" %}
...
...
ecommerce/templates/oscar/checkout/payment_error.html
View file @
aeb3a2b4
{% extends 'edx/base.html' %}
{% load i18n %}
{% load static
files
%}
{% load static %}
{% block title %}
{% trans "Payment Failed" %}
...
...
ecommerce/templates/oscar/dashboard/catalogue/product_update.html
View file @
aeb3a2b4
{% extends 'dashboard/layout.html' %}
{% load i18n %}
{% load thumbnail %}
{% load static
files
%}
{% load static %}
{% load form_tags %}
...
...
ecommerce/templates/oscar/dashboard/orders/order_detail.html
View file @
aeb3a2b4
{% extends 'dashboard/layout.html' %}
{% load i18n %}
{% load compress %}
{% load static
files
%}
{% load static %}
{% load currency_filters %}
{% block body_class %}{{ block.super }} orders{% endblock %}
...
...
ecommerce/templates/oscar/dashboard/orders/order_list.html
View file @
aeb3a2b4
{% extends 'dashboard/layout.html' %}
{% load compress %}
{% load currency_filters %}
{% load static
files
%}
{% load static %}
{% load sorting_tags %}
{% load i18n %}
...
...
ecommerce/templates/oscar/dashboard/refunds/refund_detail.html
View file @
aeb3a2b4
{% extends 'dashboard/layout.html' %}
{% load compress %}
{% load static
files
%}
{% load static %}
{% load currency_filters %}
{% load i18n %}
...
...
ecommerce/templates/oscar/dashboard/refunds/refund_list.html
View file @
aeb3a2b4
{% extends 'dashboard/layout.html' %}
{% load compress %}
{% load static
files
%}
{% load static %}
{% load currency_filters %}
{% load sorting_tags %}
{% load i18n %}
...
...
ecommerce/templates/payment/cybersource.html
View file @
aeb3a2b4
{% load static
files
%}
{% load static %}
{# NOTE: Using compress tags here results in the JS not being loaded. #}
...
...
ecommerce/templates/payment/stripe.html
View file @
aeb3a2b4
{% load compress %}
{% load static
files
%}
{% load static %}
{# NOTE: We use Stripe v2 for credit card payments since v3 requires using Elements, which would force us #}
{# to make a custom payment form just for Stripe. Using v2 allows us to continue using the same payment form #}
...
...
ecommerce/templates/rest_framework_swagger/index.html
View file @
aeb3a2b4
...
...
@@ -2,7 +2,7 @@
{% load compress %}
{% load core_extras %}
{% load static
files
%}
{% load static %}
{% block title %}edX E-Commerce API {{ swagger_settings.api_version }}{% endblock %}
...
...
ecommerce/tests/mixins.py
View file @
aeb3a2b4
...
...
@@ -11,7 +11,7 @@ from django.conf import settings
from
django.contrib.auth
import
get_user_model
from
django.contrib.sites.models
import
Site
from
django.core.cache
import
cache
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
django.utils.timezone
import
now
from
mock
import
patch
from
oscar.core.loading
import
get_class
,
get_model
...
...
ecommerce/tests/test_urls.py
View file @
aeb3a2b4
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
ecommerce.core.url_utils
import
get_lms_dashboard_url
from
ecommerce.tests.testcases
import
TestCase
...
...
ecommerce/theming/tests/test_middleware.py
View file @
aeb3a2b4
...
...
@@ -2,7 +2,7 @@
Tests for theming middleware.
"""
from
django.
core.urlresolver
s
import
reverse
from
django.
url
s
import
reverse
from
ecommerce.tests.testcases
import
TestCase
...
...
requirements/base.txt
View file @
aeb3a2b4
...
...
@@ -6,10 +6,10 @@
-e git+https://github.com/edx/analytics-python.git@1.2.11#egg=analytics-python==1.2.11
coreapi==2.3.1
django==1.1
0.7
django==1.1
1.9
django-compressor==2.2
django-crispy-forms==1.
6.1
django_extensions==1.9.
0
django-crispy-forms==1.
7.0
django_extensions==1.9.
9
django-filter==1.0.4
django-libsass==0.5
django-oscar==1.5.1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment