Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func
Conflicts: common/djangoapps/course_modes/models.py lms/envs/common.py lms/envs/dev.py
Showing
- common/djangoapps/course_modes/models.py 16 additions, 0 deletionscommon/djangoapps/course_modes/models.py
- common/djangoapps/course_modes/tests.py 3 additions, 0 deletionscommon/djangoapps/course_modes/tests.py
- common/djangoapps/student/models.py 0 additions, 3 deletionscommon/djangoapps/student/models.py
- lms/djangoapps/shoppingcart/__init__.py 0 additions, 0 deletionslms/djangoapps/shoppingcart/__init__.py
- lms/djangoapps/shoppingcart/exceptions.py 10 additions, 0 deletionslms/djangoapps/shoppingcart/exceptions.py
- lms/djangoapps/shoppingcart/migrations/0001_initial.py 166 additions, 0 deletionslms/djangoapps/shoppingcart/migrations/0001_initial.py
- lms/djangoapps/shoppingcart/migrations/0002_auto__add_field_paidcourseregistration_mode.py 112 additions, 0 deletions...tions/0002_auto__add_field_paidcourseregistration_mode.py
- lms/djangoapps/shoppingcart/migrations/0003_auto__del_field_orderitem_line_cost.py 111 additions, 0 deletions...rt/migrations/0003_auto__del_field_orderitem_line_cost.py
- lms/djangoapps/shoppingcart/migrations/0004_auto__add_field_orderitem_fulfilled_time.py 114 additions, 0 deletions...grations/0004_auto__add_field_orderitem_fulfilled_time.py
- lms/djangoapps/shoppingcart/migrations/__init__.py 0 additions, 0 deletionslms/djangoapps/shoppingcart/migrations/__init__.py
- lms/djangoapps/shoppingcart/models.py 322 additions, 0 deletionslms/djangoapps/shoppingcart/models.py
- lms/djangoapps/shoppingcart/processors/CyberSource.py 405 additions, 0 deletionslms/djangoapps/shoppingcart/processors/CyberSource.py
- lms/djangoapps/shoppingcart/processors/__init__.py 33 additions, 0 deletionslms/djangoapps/shoppingcart/processors/__init__.py
- lms/djangoapps/shoppingcart/processors/exceptions.py 17 additions, 0 deletionslms/djangoapps/shoppingcart/processors/exceptions.py
- lms/djangoapps/shoppingcart/processors/tests/__init__.py 0 additions, 0 deletionslms/djangoapps/shoppingcart/processors/tests/__init__.py
- lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py 288 additions, 0 deletions...ngoapps/shoppingcart/processors/tests/test_CyberSource.py
- lms/djangoapps/shoppingcart/tests/__init__.py 0 additions, 0 deletionslms/djangoapps/shoppingcart/tests/__init__.py
- lms/djangoapps/shoppingcart/tests/test_models.py 185 additions, 0 deletionslms/djangoapps/shoppingcart/tests/test_models.py
- lms/djangoapps/shoppingcart/tests/test_views.py 222 additions, 0 deletionslms/djangoapps/shoppingcart/tests/test_views.py
- lms/djangoapps/shoppingcart/urls.py 15 additions, 0 deletionslms/djangoapps/shoppingcart/urls.py
Loading
Please register or sign in to comment