Commit Graph

71 Commits

Author SHA1 Message Date
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
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
2014-07-10 09:35:32 -04:00
Dave St.Germain
dbd4e73b04 Fixes LMS-2352 by unifying :hover and :focus styles. 2014-03-14 11:49:00 -04:00
Frances Botsford
cf16eb052d fixes for verification ui discrepancies
UX-351
2014-02-11 14:13:25 -05:00
Frances Botsford
63a22ad0e5 PR review changes for LMS reverification 2014-01-31 22:20:32 +00:00
Frances Botsford
436a1ec7f6 downstairs fixxup on lms reverification 2014-01-31 22:11:57 +00:00
Frances Botsford
86588c492b added notification styles for re-verification and general on LMS 2014-01-31 22:08:09 +00:00
Frances Botsford
5aea466093 styling complete on reverify dash 2014-01-31 22:08:08 +00:00
Frances Botsford
003d82345f adjusting style and html for re-verification on lms 2014-01-31 22:06:37 +00:00
Frances Botsford
6c7d715e0e re-verification dashboard styles 2014-01-31 21:48:35 +00:00
Jason Bau
c8a98051dd CSV Reporting of Shopping Cart Purchases, with tests
squashing to one commit to make cherry-picking by feature possible
2013-11-18 14:45:41 -08:00
Brian Talbot
c64542e10a LMS: revises re-verification instruction UI and help text 2013-10-29 15:21:13 -04:00
Brian Talbot
280c463209 LMS: adds in styling and base UI for reverification flow 2013-10-29 15:15:10 -04:00
Brian Talbot
e9a2787bb3 LMS: adds conditional content/instructions for registration upgrade flow 2013-10-28 14:58:14 -04:00
Brian Talbot
17f3970fc8 LMS: resolves styling issues for button UI in verification flows 2013-10-26 23:09:09 -04:00
Brian Talbot
a76a61a7e5 LMS: revises styling/placement of message for verified status on dashboard 2013-10-25 15:25:30 -04:00
Brian Talbot
91dce9ca7b LMS: preps track selection view for upgrade cases 2013-10-25 15:23:51 -04:00
Brian Talbot
618d307d1f LMS: preps track selection view for upgrade cases 2013-10-25 15:23:51 -04:00
Giulio Gratta
5a46177a5e A11Y changes: better :focus styling, increased contrast, and added image alt texts
- Doubled up :hover and :focus styling to improve a11y
- Increase contrast of certain UI elements for improved a11y
- Added some image alt text for a11y
- Changed video caption styling to blue and made them underline on hover and added a skip link before video for screenreaders.

Fixes Bugs:
- LMS-1336
2013-10-24 12:47:19 -07:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
Frances Botsford
8c224a2aad fixes on review and some corrections to verification sass 2013-10-16 13:51:38 -04:00
Brian Talbot
ef2218296f LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits 2013-10-16 12:29:49 -04:00
Frances Botsford
d949eb924d correcting some incorrect rules in verification sass 2013-10-16 11:57:20 -04:00
Frances Botsford
1b430066f7 some layout tweaks to the verification choose your track page 2013-10-16 09:07:38 -04:00
Jason Bau
667a1eadb5 Stanford paid course registration
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
2013-09-26 18:25:00 -07:00
Frances Botsford
56a808c7ae a few missed placeholder conversions in verification sass 2013-09-17 13:57:13 -04:00
Diana Huang
d191847ff5 Merge branch 'release'
Conflicts:
	lms/static/sass/views/_verification.scss
2013-09-17 10:55:22 -04:00
Brian Talbot
c101465fe9 Verification: converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-16 16:18:51 -04:00
Brian Talbot
d600e437d6 Verification: hiding technical help copy when on requirements/prep view 2013-09-16 13:36:03 -04:00
Brian Talbot
c1134acf05 Verification: revises copy and layout of the review step's confirm/next actions UI 2013-09-16 13:36:03 -04:00
Brian Talbot
2680f8dfcc Verification: further revises webcam support w/in browser settings copy 2013-09-16 13:36:03 -04:00
Brian Talbot
882df8d319 Verification: adds in browser support links, icon-based button help tips, and technical support help info 2013-09-16 13:36:02 -04:00
Brian Talbot
253f8e2d15 Verification: revises UI header copy 2013-09-10 16:51:21 -04:00
Brian Talbot
d066692bce Verification: revising textarea reset formatting and increasing close modal control size 2013-09-10 13:03:25 -04:00
Frances Botsford
18b4b0b03f modal functionality for edit name on vcerts 2013-09-10 13:03:09 -04:00
Frances Botsford
5c7443be38 cleanup copy on reqs, photo, and choose pages 2013-09-10 09:13:00 -04:00
Brian Talbot
79a9c8677a Verification: revises presentation of customized certificate receipt ciew 2013-09-06 17:23:43 -04:00
Frances Botsford
af2424daf1 adjustments to choose and contribution for vcerts 2013-09-06 10:23:46 -04:00
Brian Talbot
f2e55a3d6a Verification: abstracting out specific color-based Sass variables to be *somewhat* friendly to theming 2013-09-05 14:29:10 -04:00
Frances Botsford
a8989f2fe6 adjusting go to course button for vcert receipt 2013-09-05 12:40:37 -04:00
Frances Botsford
304a329b08 initial receipt html and styling for vcert 2013-09-05 12:24:03 -04:00
Frances Botsford
db57118f7d i18n and updated secondary action buttons on the photo page 2013-09-04 14:35:48 -04:00
Frances Botsford
b2ddea7a80 updated copy for vcert flow 2013-09-04 13:46:38 -04:00
Brian Talbot
b75398b0df Verification: moves common page elements/copy into central templates w/ supportive styling 2013-09-03 17:17:13 -04:00
Brian Talbot
70ba52b4fa Verification: syncing all submit button-type styling (including newly used element on verified view) 2013-09-03 16:37:34 -04:00
Brian Talbot
dc850370b2 Verification: resolves layout issue with progress nav in diff screen widths 2013-09-03 16:33:25 -04:00
Brian Talbot
4b3918c7e5 Verification: adds styling for already verified view and refactors html/styling for shared elements 2013-09-03 16:30:42 -04:00
Brian Talbot
47a9f8fc5f Verification: added in supporting disabled/not ready styling for wizard nav + expandable height fix 2013-09-03 12:55:17 -04:00
Brian Talbot
c77deeecff Verification: removes physical sizes from HTML templates and adds placeholder hooks 2013-09-02 21:42:51 -04:00
Brian Talbot
39d7534246 Verification: adds in progress styling support based on body classes 2013-09-02 21:20:02 -04:00
Brian Talbot
822caca3f7 Verified: revises styling/presentation of alerts/errors for intro state 2013-08-30 16:03:49 -04:00