1. 17 Mar, 2015 1 commit
  2. 10 Feb, 2015 1 commit
    • Country Access: block enrollment · e609f982
      Block users from enrolling in a course if the user
      is blocked by country access rules.
      
      1) Enrollment via the login/registration page.
      2) Enrollment from the marketing iframe (via student.views.change_enrollment)
      3) Enrollment using 100% redeem codes.
      4) Enrollment via upgrade.
      
      This does NOT cover enrollment through third party authentication,
      which is sufficiently complex to deserve its own commit.
      Will Daly committed
  3. 08 Feb, 2015 1 commit
  4. 04 Feb, 2015 2 commits
  5. 03 Feb, 2015 1 commit
  6. 29 Jan, 2015 2 commits
  7. 22 Jan, 2015 1 commit
  8. 21 Jan, 2015 1 commit
  9. 13 Jan, 2015 1 commit
    • Enable redeem codes. · b1884306
      Update the redeem code schema
      
      Updating the redeem code schema.
      
      Adding migration file.
      
      Adding course mode support when redeeming a code.
      
      Conflicts:
      	lms/djangoapps/shoppingcart/views.py
      
      Add sales admin privileges for redeem code generation.
      
      Making sure redeem code URLs work for verified courses.
      
      pep8 violations
      
      Code Review and Test Cleanup changes
      
      Added tests, fixed tests.
      
      Updating the boolean checks in ecommerce template
      stephensanchez committed
  10. 09 Jan, 2015 1 commit
    • WL-135 added the migration for the expiration_date field in the coupons model · 10f8d8c0
      added the functionality of adding the expiration date, and also handled in the shopping cart when the user try to add the expired coupon code in the shopping cart
      
      added expiration date in the coupons list in the ecommerce page
      
      added the unit tests and jasmine tests
      
      fix the quality issues and rebased with master
      
      regenerated the migration file with a different number
      
      i18n and verified te course mode
      
      changes suggested by  stephan
      Muhammad Shoaib committed
  11. 06 Jan, 2015 1 commit
  12. 31 Dec, 2014 1 commit
  13. 30 Dec, 2014 1 commit
  14. 29 Dec, 2014 2 commits
  15. 17 Dec, 2014 2 commits
  16. 09 Dec, 2014 1 commit
  17. 04 Dec, 2014 1 commit
  18. 27 Nov, 2014 1 commit
  19. 17 Nov, 2014 1 commit
  20. 10 Nov, 2014 2 commits
  21. 20 Oct, 2014 1 commit
    • EX-71 New shopping Cart UI Single person purchase · 4f7c4949
      Ex-74 Registration Code redemption
      
      fix the translation issues
      
      added a check if a user is already registered in a course. Changed the messages
      
      added course depth=0 and removed pep8 violations
      
      Ex-72-added additional billing information
      
      Added a new CSV file in the instructor dashboard sales tab to download all the order sales separated from the invoice sales
      
      fix path to image
      
      updated the failed unit tests and add some minor tweaks in the Shoppingcart.scss
      
      Ex-78 New UI In receipt page
      
      EX-73 Purchasers can buy a course on behalf of a different student
      
      WL-78 updated the receipt page UI.
      
      Wl-72 updated Billing Information UI and removed the Order Address fields
      
      WL-71 Remove Purchase Type Buttons from UI
      
      WL-71 Updated minor UI issues and updated test cases
      
      WL-78 updated the enrollment links in the receipt page
      
      made changes in Order generated sales csv in Instructor Dashboard.
       The total_registration_codes and total_used_codes
        were not correctly stored in the csv file.
      
      1) The total_registration_codes were not filtered with
       course_id.
      2) The total_used_codes that a user had redeemed
       were not correctly included in the CSV.
      
      added a fix in the courseware view to let the users visit the courseware if they have enrolled in the course by clicking on the enrollment link
      
      rebase and resolved conflicts with master
      
      WL-97 Bulk Registration Email Confirmation
      Below is the commit summary.
      - Make email text bold as per requirement.
      - Improve email template quality and reorder points.
      - Add text in billing details page : "if no additional billing details are populated the payment confirmation will be sent to the user making the purchase"
      - Update text on receipt page "You have successfully purchase 3 course registration codes"
      
      WL-100 fixed the bug on the edit/add coupon and set course price.
      Ajax requests were duplicating in each callback. fixed this issue by creating the manual ajax request rather than the Lean Modal Ajax requests
      
      allow for better White Label branding in shopping cart purchase emails
      
      fix up typos and text
      
      fix goof
      
      fix
      
      fix
      
      incorporated model changes as suggested by Jason.
      
      updated order sales csv
      
      updated test cases for CourseRegCodeItem model and csv for the order generated sales
      
      updated the migrations history
      
      fixed the lms acceptance tests
      
      Be sure to check for multiple types
      
      address PR feedback
      
      PR feedback
      
      PR feedback
      
      pep8 fix
      asadiqbal08 committed
  22. 07 Oct, 2014 1 commit
  23. 23 Sep, 2014 1 commit
  24. 16 Sep, 2014 2 commits
  25. 20 Aug, 2014 1 commit
  26. 05 Aug, 2014 2 commits
  27. 10 Jul, 2014 1 commit
    • asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS · 5734d2a8
      Added username into Authors file
      
      [Ex-12] Add user to input coupon code in the Shopping Cart
      
      [Ex-13] Discount should be reflected in the Payment confirmation page and email
      
      added E-commerce Tab in Instructor Dashboard
      
      added name/email in authors file
      
      removed the is_active column, change the colors scheme, fixed bugs
      
      wip
      
      wip
      
      test github account
      
      STORE_BILLING_INFO set to True
      
      cybersource api update, reference number updated, merchant_data removed from params
      
      View Course buttons on receipt
      
      link for course added to receipt
      
      receipt.html view course button - func update
      
      receipt.html course link update
      
      move new CyberSource implementation to a separate file so that we can keep the original
      
      remove config changes
      
      remove config changes
      
      remove coupon redemption during clear cart and update test cases
      
      [Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)
      
      update data model max_length to 255
      
      remove array paid_course_ids init in views.py
      
      removed the is_active filter=false, added styling to the inactive coupon codes
      
      remove coupon redemption during clear cart and update test cases
      
      [Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)
      
      update data model max_length to 255
      
      Add column to the list of coupons in the E-Commerce tab
      
      Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts
      
      make the new CyberSource2 also microsite aware
      
      updating migration for student and shopping cart apps
      
      added user signup functionality that orignated from the Microsites
      
      added non-microsite user signup tests
      
      fix the hard coded callback URL to localhost
      
      add comment
      
      Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user
      
      made changes as suggested by diana khuang
      
      add the CourseAccessRoles table to the Django Admin website
      
      shopping cart coupon checkout changes as suggested by Jason Bau
      
      changes are made according to the suggesstions on PR#4172
      
      changes made in the coupons file
      
      changes in the coupons get_coupon_info view
      
      fix merge conflict resolution error
      
      changes in the remove_coupon view json response
      
      changes as suggested by David Baumgold
      
      pep8/pylint fixes
      
      Changes as suggested by jasonBau
      
      don't assume item in shopping cart is a PaidCourseRegistration
      
      fix up some logging
      
      changed the urls of the coupon views and use the post to get the values from the request
      asadiqbal08 committed
  28. 29 May, 2014 1 commit
  29. 08 May, 2014 1 commit
    • Make course ids and usage ids opaque to LMS and Studio [partial commit] · cd746bf8
      This commit adds the non-courseware lms/djangoapps and lms/lib.
      
      These keys are now objects with a limited interface, and the particular
      internal representation is managed by the data storage layer (the
      modulestore).
      
      For the LMS, there should be no outward-facing changes to the system.
      The keys are, for now, a change to internal representation only. For
      Studio, the new serialized form of the keys is used in urls, to allow
      for further migration in the future.
      
      Co-Author: Andy Armstrong <andya@edx.org>
      Co-Author: Christina Roberts <christina@edx.org>
      Co-Author: David Baumgold <db@edx.org>
      Co-Author: Diana Huang <dkh@edx.org>
      Co-Author: Don Mitchell <dmitchell@edx.org>
      Co-Author: Julia Hansbrough <julia@edx.org>
      Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
      Co-Author: Sarina Canelake <sarina@edx.org>
      
      [LMS-2370]
      Calen Pennington committed
  30. 15 Jan, 2014 1 commit
  31. 13 Jan, 2014 1 commit
  32. 06 Jan, 2014 2 commits