Commit Graph

472 Commits (2441158d676968a702b254de477b4109c5b599c3)

Author SHA1 Message Date
eric 63af76efc5 donation page 2012-09-21 17:15:30 -04:00
Raymond Yee 2ea3059682 [#36469239] get rid of retain_cc_info since we will retain CC info for all pledges 2012-09-21 12:51:21 -07:00
eric b6862cad3d fix copying the premiums [#36192903] 2012-09-21 13:54:59 -04:00
eric 5d7e6a39bd managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [#36192903][#30068227] 2012-09-21 12:10:13 -04:00
eshellman 5589e5d209 Merge pull request #7 from Gluejar/improvify_download_page
Improvify download page
2012-09-20 12:58:45 -07:00
Raymond Yee 05d082604c updating selenium script for relaunch 2012-09-19 14:30:47 -07:00
Raymond Yee 2f084e2a7b Merge branch 'master' into relaunch_ry 2012-09-19 08:20:35 -07:00
Andromeda Yelton efa3187535 dynamically generate the readmill download url don't hardcode it you moron 2012-09-19 10:25:23 -04:00
Raymond Yee 980bb218a0 stripe2.Execute actually charges the transaction -- NEED to do some more error checking 2012-09-18 17:56:38 -07:00
Raymond Yee be45a27b45 moving transaction.host None -> PAYMENT_HOST_NONE
a few typos (t->transaction, missing host)
skeleton for stripe2.py -- the module to implement various methods used by payment.manager
2012-09-18 17:01:07 -07:00
Andromeda Yelton f2e4647e73 lockss needs a page listing the books unglued in each year to crawl 2012-09-18 14:16:59 -04:00
Raymond Yee 6a650affc8 Now recording pledge as such -- and not charging immediately.
running into exception at https://github.com/Gluejar/regluit/blob/relaunch_ry/payment/manager.py#L554-- have to start implementing a baseclass for stripelib to handle pledge modification
2012-09-17 16:56:07 -07:00
Raymond Yee 69e959a0c8 fleshing out of payment.models.Account 2012-09-17 14:55:28 -07:00
Raymond Yee c545173793 First pass at payment.models.Account 2012-09-13 16:43:54 -07:00
Raymond Yee c5f22742c1 In making a stripe charge, record transaction.type and transaction.approved.
Fixed Campaign.transactions() to handle default variables properly (compare with dfe17f94fa (L0R257) )
2012-09-13 14:12:49 -07:00
Raymond Yee b85fbfc78b Merge branch 'master' into relaunch_ry 2012-09-13 10:42:35 -07:00
Raymond Yee eac0e24b1b Small change: now storing amount and status for transaction with new pledge. 2012-09-13 10:39:42 -07:00
Andromeda Yelton 18a598f628 need to change lockss page since unglued adheres to editions 2012-09-12 10:11:49 -04:00
Raymond Yee 77ceed03ad Now -- a checkbox for whether to retain CC info and functionality for creating Customer / charge vs charge directly 2012-09-11 15:53:39 -07:00
Raymond Yee 2ab1f8c7ea Now creating a charge based on token 2012-09-11 15:17:37 -07:00
Raymond Yee 5636637266 Merge branch 'master' into relaunch_ry
Conflicts:
	frontend/views.py
2012-09-11 10:42:49 -07:00
eric 2df3047dc0 display all editions for staff 2012-09-10 23:51:22 -04:00
eric e5804a4d4d please use spaces, not tabs to indent 2012-09-10 23:47:06 -04:00
Raymond Yee 0e1839d531 Merge branch 'master' into relaunch_ry
Conflicts:
	core/signals.py
	frontend/views.py
2012-09-10 14:18:30 -07:00
Raymond Yee bcceaa719b integrating stripe into fund_the_pledge 2012-09-10 13:17:30 -07:00
Andromeda Yelton 7398fdf161 unglued property should adhere to editions, not ebooks 2012-09-10 15:18:40 -04:00
eric 92a2ccc7ce cleaned up the response when a pledge is modified rather than created 2012-09-07 17:48:48 -04:00
eric f3ecec8410 just some tweaking to get the premium selection right 2012-09-07 17:11:25 -04:00
eric 4700e63b06 resolve conflict 2012-09-07 16:26:09 -04:00
eric f1b22649a5 cruft 2012-09-07 16:20:12 -04:00
eric 18608d3e7d preapproval amount is now amount for requested premium, not previously pledged amount 2012-09-07 16:13:53 -04:00
eric a361d7b53d so we didn't really need to put premium description directly into context 2012-09-07 16:12:32 -04:00
Raymond Yee 1742572d95 Merge branch 'master' into relaunch
Conflicts:
	frontend/views.py
2012-09-07 13:08:03 -07:00
eric 6f63c047ce DRY pub year code moved to work model 2012-09-07 16:07:47 -04:00
eric 0c9d71e4d6 introduce PledgeExtra data object to simplify method calls 2012-09-07 09:46:38 -04:00
eric 6bbd973f62 only ask the donation for required amount [#21784207]] 2012-09-07 09:39:36 -04:00
eric c2636f5bba removed legacy DonateView 2012-09-07 01:11:28 -04:00
eric 4d4e61d338 donation modification now works [#21784207] 2012-09-06 16:55:32 -04:00
eric bd794a2ac5 clean up the donation endpoint pages so they work (if a bit ugly!) 2012-09-06 14:04:47 -04:00
eric 9395cd058b now donating cents works, too 2012-09-06 11:36:13 -04:00
eric 8eeadc99d3 woo hoo, credit and donation scaffolding works end to end [#21784207] 2012-09-06 01:01:17 -04:00
eric 94270f33c6 add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager
also removed unused target, lists, ack-link,
2012-08-31 03:16:04 -04:00
eric f299d9ecf7 rip out paypal and amazon code 2012-08-31 03:12:15 -04:00
Andromeda Yelton 8c030df830 adding some tests for my recent commits hooray 2012-08-29 15:56:14 -04:00
Andromeda Yelton 075792880b needs to handle exception where unglued ebook does not exist 2012-08-27 16:48:07 -04:00
Andromeda Yelton 55fc10e813 hm that wasn't how context.update works. moved countdown back to main context 2012-08-27 16:46:21 -04:00
Andromeda Yelton 58be27670e whoops typo, %w is not %s 2012-08-27 16:38:35 -04:00
Andromeda Yelton 48e20a7cdd bringing all the lightboxes under the hijax.js system 2012-08-27 15:35:29 -04:00
Andromeda Yelton a6e034a36a rudimentary download page plus logic to serve it 2012-08-24 15:14:32 -04:00
Andromeda Yelton aa3667d260 working on download page 2012-08-23 13:38:48 -04:00
Andromeda Yelton adef29f536 Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
Conflicts:
	core/signals.py
2012-08-16 17:11:12 -04:00
Andromeda Yelton 368a3ca8ec making license display more standards-compliant 2012-08-15 10:05:10 -04:00
Andromeda Yelton 28670ed01a building LOCKSS manifest page 2012-08-15 09:40:37 -04:00
eric 10560fb36b merge credit into relaunch 2012-08-14 21:15:31 -04:00
Andromeda Yelton 25ce01716c also include no-mpremium option in pledge modify 2012-08-14 14:44:07 -04:00
Andromeda Yelton 2369d6508e include no-premium option in pledgeview 2012-08-14 14:32:54 -04:00
eric 403420a283 Add user-to-user credit transfers [#21784207] 2012-08-13 21:00:28 -04:00
eric 5362c202bb added management command to create credits, balance notification [#21784207] 2012-08-07 14:12:50 -04:00
Andromeda Yelton da0f4970c2 improving data flow of acks throughout system 2012-08-06 15:44:43 -04:00
Andromeda Yelton 8db1e5b59a set up acks page to deal with ack_name, _link, _dedication and anonymity bit 2012-08-06 13:35:29 -04:00
Andromeda Yelton 6d4044bcde intermediate state 2012-07-24 08:08:34 -04:00
Andromeda Yelton 5855593c5b adding support for acknowledgement fields throughout data pipeline 2012-07-23 08:31:57 -04:00
Andromeda Yelton 3de4c40647 pledge page shows only custom premiums in main list 2012-07-23 07:43:21 -04:00
Andromeda Yelton c4a96a5d34 work page will now display only custom premiums 2012-07-23 07:41:20 -04:00
eric fdce89d17b Added language filtering [finish #24232285] 2012-07-21 16:26:16 -04:00
eric d7638463b1 reporting facility for languages 2012-07-20 14:29:04 -04:00
Raymond Yee 167bd8a4c1 Fixing a situation in which there is an error in the pledge view 2012-07-18 11:09:48 -07:00
Raymond Yee 1e49732693 almost ready to send this out to supporters with failed pledges 2012-07-13 15:55:41 -07:00
Raymond Yee de415480ae first pass at calculating transactions that need to be recharged
modification to fabfile to download a file of emails
2012-07-13 10:17:51 -07:00
Raymond Yee 94384fcb59 Work in progress 2012-07-11 19:51:36 -07:00
Raymond Yee 7a76a2cbaf Merge branch 'master' into ola_fulfill 2012-07-10 14:15:28 -07:00
Raymond Yee 94bd6fff2d First pass at having a pledge recharge view (DON'T KNOW WHETHER THIS EVEN BUILDS PROPERLY) 2012-07-10 13:36:32 -07:00
eric 94787951ad allowed staff to manage campaigns 2012-07-10 15:58:19 -04:00
eric e2962e1075 [finish #30516251] supporter acknowledgement page basic version 2012-07-07 18:13:05 -04:00
eric 8977734bd7 [fix #31636971] update campaign.left when campaign changes 2012-06-21 23:20:57 -04:00
Raymond Yee d37792c813 [#31605173] This plugs .../pledge/work_id where work_id tied to no campaign or a campaign that is not ACTIVE 2012-06-21 10:16:51 -07:00
Raymond Yee 30bf30177c Added a case for pledge_modified to have a up_or_down to be 'canceled' -- and change in template text to handle the canceling of a pledge 2012-06-15 16:14:26 -04:00
Raymond Yee 2b7da6e91e First attempt to place the notices properly coming from a pledge modify -- inside payment.manager.cancel_related_transaction -- but current problem is now that we get too many notices 2012-06-15 11:38:38 -04:00
Andromeda Yelton eda96f716b ending time should round up, not down. also times less than days were not going to display right due to type errors. now they will. 2012-06-15 12:06:38 -03:00
Andromeda Yelton d652db5c03 removing is_preview since it's no longer needed 2012-06-13 09:41:23 -03:00
Andromeda Yelton ce5ee124d9 removing pagination from work_list -- likely unnecessary and this should be faster 2012-06-01 13:15:50 -04:00
Raymond Yee e27ad644b5 Merge branch 'campaignformviewnixed' 2012-05-29 11:48:41 -07:00
Andromeda Yelton a8762dca73 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-29 08:55:36 -04:00
Andromeda Yelton 2563dda3e5 creating signal for pledge_modified and moving you_have_pledged to signals framework so they interact properly -- at most one sent 2012-05-29 08:54:57 -04:00
eric 365976933e [#29809805] made username change form more pythonic 2012-05-26 17:30:12 -04:00
eric 61f45a5716 [#29809805] fixed changed email doesn't check for duplicate email 2012-05-26 17:28:57 -04:00
Raymond Yee acaa931445 I think that the CampaignFormView should be deleted -- but before I merge this into master, I want to let others confirm 2012-05-25 19:39:02 -07:00
eric f0dde230f3 [#27015121] forgot to add context to Pledgeview
Seems to me there's refactoring that can be done with these two views!
2012-05-25 18:44:28 -04:00
eric 7de9616e23 [finish #27015121] add going to amazon text, premium amount now inline. 2012-05-25 18:18:29 -04:00
Raymond Yee 1335b3cb72 [#29500707]
Fleshing out exception handling for pledge_cancel
selenium tests work for both amazon and paypal on RY laptop -- now going to test them on ry-dev
2012-05-24 18:47:50 -07:00
Raymond Yee 60b84b0358 Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge 2012-05-24 14:10:10 -07:00
Andromeda Yelton 86313666ee making [#29858801] happen -- now you can get back to the home page by clicking on the logo even if logged in 2012-05-24 15:29:45 -04:00
Raymond Yee b55af7977d [#29500707] The core of the cancel pledge is in place, though refinements, particularly in the UI still needs to be made.
Outstanding issues:

* Will the IPNs on a cancel come quickly enough so that the user will no longer see "Modify Pledge" when redirected to the Work page
* How to provide better feedback on the fact that a transaction has indeed been canceled?  Do we need to use notifications here?
* This code is working on RY's laptop -- but now needs to be tested where there IPNs available.
2012-05-23 09:12:21 -07:00
Raymond Yee a0bc6deefc Closing in on pledge_cancel 2012-05-23 07:22:48 -07:00
Raymond Yee b8336c4ed6 En route to implementing pledge cancellation 2012-05-21 07:56:18 -07:00
Raymond Yee 272d795ded Renaming the current functionality that has been named "cancel" to be "nevermind" because that functionality arose to support users changing their mind
The new PledgeCancel is a placeholder for the functionality I will build next to let users actually cancel existing transactions
Finally, I use  the setting.PAYMENT_PROCESSOR to set the default value of Transaction.host ('paypal' or 'amazon')
2012-05-18 16:59:48 -07:00
eric 9d33a95147 [ fixed #29647161] fixed login redirect which was failing when next included a query string 2012-05-15 14:18:17 -04:00
thatandromeda 0e59ee746b Update frontend/views.py 2012-05-14 18:23:13 -03:00
Andromeda Yelton 6d14ba1c30 only really need to set context for site once, not separately for view and triggered notification 2012-05-14 16:56:36 -04:00
Andromeda Yelton 3fe2800dfa Merge branch 'master' of github.com:Gluejar/regluit 2012-05-14 13:51:06 -04:00