Commit Graph

380 Commits (790969745ed20d5f3a48fdb7f8d6154b5109a530)

Author SHA1 Message Date
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
Andromeda Yelton 2b9b4a7331 share links in pledge_complete need to include url base 2012-05-14 13:42:34 -04:00
Raymond Yee b07d6c267d Customize paymentReason for amazon -- in Paypal, we don't have it wired up anywhere yet 2012-05-14 10:15:40 -07:00
eric 6bb564aca6 [finish #28851641]campaign managers now have access to edition creation and editing for works they manage 2012-05-14 01:07:02 -04:00
eric ea9ac7508e repaired the invocation ot I_just_pledged emailshare [#27785469] 2012-05-13 22:59:07 -04:00
eric 296b5b5b20 countdown broke preview 2012-05-13 22:13:45 -04:00
Raymond Yee 66f08eab10 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-13 13:55:08 -07:00
eric d9a96c2ada putting from email in reply-to: header [#29498563] 2012-05-13 16:38:58 -04:00
Raymond Yee 9badabb53b Merge branch 'master' of github.com:Gluejar/regluit into ry 2012-05-13 13:33:53 -07:00
Andromeda Yelton 193e4ef324 methods are not properties, whoops 2012-05-13 15:33:54 -04:00
Raymond Yee a54aa1a342 First pass -- pledge view will redirect to pledge modify view if there is already an active transaction 2012-05-13 12:18:48 -07:00
Andromeda Yelton d2cf8a773b improvifying pledge front end around modify and cancel 2012-05-13 10:49:23 -04:00
Andromeda Yelton ae76f89034 fixing problems with context for you_have_pledged notification 2012-05-12 22:42:09 -04:00
eric 77a66e5420 [#29498563] fixed urls by moving email share messages to django templates; eliminated sender from form 2012-05-12 11:12:43 -04:00
Raymond Yee fbd58d5e4e Add import of notification 2012-05-11 14:14:49 -07:00
Raymond Yee ba36838dfa must import notification 2012-05-11 14:03:28 -07:00
eric 17d641cf65 wired pledge_you_have_pledged [#27785469] 2012-05-11 15:53:46 -04:00
eric 81d158f505 [#28851641] Edition creation and editing !!! Needs a schema migration. 2012-05-11 14:13:09 -04:00
Andromeda Yelton c6186c7808 need to hardcode staff names and pics on recommended as is_staff doesn't produce behavior we want 2012-05-09 16:33:22 -04:00
Andromeda Yelton beff46fd8c standardizing on Unglue.it rather than Unglue.It 2012-05-08 16:15:23 -04:00
Andromeda Yelton 11c19b950d preventing information leakage about campaign status changes during preview and preventing non-staff from launching campaigns 2012-05-08 15:51:17 -04:00
Andromeda Yelton 6e1aa4dfd0 changed work_list page to clearly communicate that it's staff picks when facet = recommended 2012-05-08 14:28:06 -04:00
Andromeda Yelton 9fc2444f37 need to be explicit that premium_id is a list or it will try to iterate through a string and fail bafflingly 2012-05-08 10:51:04 -04:00
Raymond Yee b06a1e218a Merge branch 'fps' of github.com:Gluejar/regluit into ry 2012-05-07 16:50:00 -07:00
eric 1ab9304475 [finish #28949611] rights holders are now the default campaign manager; they can remove themselves after they add another manager 2012-05-07 17:32:58 -04:00
Jason e09418a7a2 Updating paypal code to use common global transaciton status, fixing bugs in paypal interface with abstract payment manager class 2012-05-04 10:30:05 -04:00
Andromeda Yelton 4be0cab5a0 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-04 10:05:54 -04:00
Andromeda Yelton 8902ec84b3 made manage_campaign workflow suck less 2012-05-04 09:56:41 -04:00
Raymond Yee b9bbecb351 Merge branch 'master' of github.com:Gluejar/regluit into fps
Conflicts:
	settings/common.py
	settings/dev.py
	settings/prod.py
2012-05-02 18:01:20 -07:00
Ed Summers b8b007c427 last_campaign_status is a string not function 2012-05-02 17:53:45 +00:00
Andromeda Yelton 122454b949 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-01 13:56:12 -04:00
Andromeda Yelton 3deb660ce3 more css tweaks per stefan 2012-05-01 13:49:23 -04:00
eric 1c2e48bc87 added edition to campaign model to allow selection of a preferred edition [finish #28736373] 2012-05-01 10:56:19 -04:00
Andromeda Yelton ce36f6771d css changes per Stefan, part 1 2012-05-01 09:56:19 -04:00
eric bc9f1d3cd3 [fix #28759049] prefixing ebook contribution form not handled properly in view or form 2012-04-27 17:14:57 -04:00
Raymond Yee 47a22f3ccb Merge branch 'master' of github.com:Gluejar/regluit into fps 2012-04-26 15:50:49 -07:00
Raymond Yee 4219149132 Small tweaks to get rid of remnants of PayPal IPN_* variables -- I can now use campaign_admin to actually move fake amazon bucks. Still some IPN_* stuff remaining to clean up. 2012-04-26 19:31:55 +00:00
Raymond Yee 061f656e63 Merge branch 'jkace' of github.com:Gluejar/regluit into fps
Also fixed things so that regluit.test.campaigntest.support_campaign runs for Amazon without error -- though I still need to confirm that the status of transactions properly handled
Next up:  see whether this works for PayPal too.

Conflicts:
	frontend/views.py
2012-04-25 13:10:53 -07:00
Jason 3bc14c1ac9 Modifying frontend/views to use new transaction status codes 2012-04-25 13:55:30 -04:00
Andromeda Yelton 8706e9a900 email sharing needs to populate the sender field in order to validate 2012-04-25 13:45:18 -04:00
eric d0148cf6dc [finish #28524505] add change email form 2012-04-24 22:20:10 -04:00
eric 2a79a82dd7 detab text 2012-04-24 22:17:30 -04:00
Raymond Yee 709cb4ce41 now stuck on the status of an ACTIVE transaction in amazon in campaign_test 2012-04-24 18:03:57 -07:00
Andromeda Yelton 911f6f6212 pledge and pledge_modify don't need to use different templates, just an if statement or two. DRY 2012-04-19 10:50:40 -04:00
eric d88a908082 [finish #27470423] provide preview of unlaunched campaigns 2012-04-10 16:13:28 -04:00
Andromeda Yelton edf3617f5a partial de-suckification of pledge_complete page 2012-04-10 15:00:28 -04:00
eric e36facbeda [finish #27468521] campaign form must also be valid to launch it 2012-04-09 16:52:24 -04:00
eric 163c7a924a [finish #27522103] clear rightsholder creation form when new rightsholder successfully created 2012-04-07 15:31:11 -04:00
eric e764a44ace fixed issues with campaign setup [fix #27468285] 2012-04-07 14:12:54 -04:00
eric 26c0ad2b27 fixed failure when editing campaign managers [fix #27468285] [finish #27531719] 2012-04-05 17:53:00 -04:00
eric db736818fc [finish #27524965] fixed issue where released claim prevents new claim 2012-04-05 16:55:10 -04:00
Raymond Yee 8a6de4ef1d A proxy for the mailchimp js 2012-04-04 09:15:18 -07:00
eric 5d5c60993e added form to edit campaign managers [start #27468285] 2012-04-03 15:54:41 -04:00
Andromeda Yelton 24b7a77228 modifying display of claim status 2012-04-03 09:56:41 -04:00
Raymond Yee 6d50897508 Clarify the pledge modification process for the supporter. 2012-03-28 10:12:09 -07:00
Andromeda Yelton 81c2c7a935 default to active tab when supporter has active campaigns, else wishlist tab 2012-03-28 09:08:05 -04:00
Andromeda Yelton 2ab92b6a2f Merge github.com:Gluejar/regluit 2012-03-28 09:00:31 -04:00
eric 8892a935dd Implemented limited edition premiums, front and back end [finish #27011359] 2012-03-26 18:47:02 -04:00
Andromeda Yelton 1a53a79752 merge all the things 2012-03-26 16:16:57 -04:00
eric 7264b9846f Added management of custom premiums. (migration needed) [finish #26921893] 2012-03-26 15:32:23 -04:00
Andromeda Yelton 66d62ef3aa making pledge complete page prettier and more featureful: next actions, more speciic email sharing text, enforce login 2012-03-26 15:26:47 -04:00
Raymond Yee 0e61d7477a [#22756079] Changed name of constants (e.g., IPN_PAY_STATUS_ACTIVE to IPN_PREAPPROVAL_STATUS_ACTIVE to make the meaning of these constants clearer
Also fixed an error in how I'm using transaction management in regluit.test.campaigntest.support_campaign
2012-03-23 11:28:09 -07:00
eric 6237fcebfe detabbing views code 2012-03-23 11:15:37 -04:00
eric 360d11f88a yes we should deprecate setup_work 2012-03-23 11:09:51 -04:00
eric d03459922e fixed stuff I broke when making html validate 2012-03-22 21:25:04 -04:00
Raymond Yee 6d0e5c6a3e [#23019867] I think these changes now allow one to modify pledges and the validation of the CampaignPledgeForm is happening properly now. 2012-03-22 12:12:46 -07:00
Raymond Yee ffb7c8cd33 [#23019867] I believe this commit implements the rest of the pledge changing functionality and works as far as I can tell so far.
The one part I don't get yet is why the regluit.test.campaigntest.support_campaign script can successfully drive the browser to create a transction and then
change that pledge to create 2 transactions in total -- and yet until regluit.payment.manager.PaymentManager.check_status is run twice, there seems to be only
one transaction visible to the script.

Does this have to do with Django transactions?  I don't know yet.
2012-03-21 15:06:56 -07:00
Raymond Yee 9ece33899a support_campaign test is now able to run all the way to doing a modification of pledge for lesser amounts 2012-03-20 11:21:06 -07:00
Raymond Yee 46ca784030 [#23019867] First pass at allow for pledges to be modified 2012-03-19 16:32:37 -07:00
Raymond Yee 744693f178 1) Fix an error in which I wasn't checking properly that the pledge_complete page should allow only the pledging user to see the results.
2) Now tests.campaigntest.support_campaign takes us all the way through pledging for the first campaign
2012-03-19 11:46:41 -07:00
Raymond Yee 46c4c3fdce [#20640595] Add a work to a user's wishlist upon a successful return from a PayPal pledge.
(Still need to implement warning upon trying to remove a work that user has pledged too.)
2012-03-16 13:03:38 -07:00
Raymond Yee 571e565b5e [Fixes #26515771] Now if you hit submit on default blank campaign pledge page, we won't get an error. 2012-03-15 14:54:38 -07:00
Andromeda Yelton 506f06f4cf ensuring that the slideshow returns the right set of books and they display properly 2012-03-14 09:19:06 -04:00
eric 89e6afe82c You can't delete a cookie that ain't there, you lunkhead [#24981847] 2012-03-13 18:01:26 -04:00
eric 62038dce9c implement cookie based redirect for login/signup from a wishlist action [deliver #24981847] 2012-03-13 17:04:05 -04:00
eric b6a5d28f09 followed Raymond's suggestion to simplify yesterday 2012-03-13 17:04:05 -04:00
Andromeda Yelton ffcea5c3d6 Merge branch 'master' of github.com:Gluejar/regluit 2012-03-13 16:27:39 -04:00
Andromeda Yelton 201ff7b38f fixing empty slideshow for is_preview 2012-03-13 16:26:57 -04:00
eric 6d0e5455f9 metrics enhancements [finish #26329807] 2012-03-12 23:34:10 -04:00
eric b659d80855 we can only have one order_by per facet! 2012-03-12 16:40:45 -04:00
Andromeda Yelton 6205417b8c Merge branch 'master' of github.com:Gluejar/regluit 2012-03-12 14:46:53 -04:00
Andromeda Yelton b5c284cc2d better text for twitter and email sharing 2012-03-12 13:18:11 -04:00
eric 3d5ab78f3f exception handling to log openlibrary json failures and send user on to fallback 2012-03-10 11:03:58 -05:00
eric 3a70949f36 added handling for moved works to wishlist action 2012-03-09 16:05:01 -05:00
eric 87eee4ed9f add prefix to forms so html will validate [#26203269] 2012-03-09 13:00:16 -05:00
Raymond Yee a252f9d173 [#22561067] Implemented regluit.utils.localdatetime.now is by default datetime.datetime.now() (in Django 1.3) and django.utils.timezone.now() in Django 1.4+
One overrides regluit.utils.localdatetime._now to do "time travel" -- useful for testing scenarios requiring time changes (such as Campaigns)
Get rid of call references to datetime.datetime.now() or utcnow() and datetime.date.today() in favor of regluit.utils.localdatetime.now() and date_today().
2012-03-09 00:45:39 +00:00
Andromeda Yelton 2c1ceeaf22 merge all the things 2012-03-08 10:49:04 -05:00
Andromeda Yelton a3378efb17 factored the reused slideshow code from home and supporter into its own function 2012-03-08 09:36:59 -05:00
eric 142fe72f93 added db metrics page [deliver #26022545] /info/metrics.html 2012-03-07 22:07:01 -05:00
Andromeda Yelton cea2979ade oh harrumph jenkins, it worked locally 2012-03-07 14:24:05 -05:00
Andromeda Yelton 05860bfa06 foregrounding search and browse features when own wishlist is empty 2012-03-07 13:23:34 -05:00
Andromeda Yelton c9be954972 can now set default tab for ungluedlist, worklist, supporter in views.py. pagination remembers user tab, overrides default. 2012-03-02 09:40:10 -05:00
Andromeda Yelton 369d8c527e Merge branch 'master' of github.com:Gluejar/regluit 2012-03-01 09:27:27 -05:00