Commit Graph

1553 Commits (0aba595e050648b9a99f4ac54de260c88e5c4730)

Author SHA1 Message Date
eric 0aba595e05 campaign admin broken by missing jquery 2012-03-23 11:11:43 -04:00
eric 137c48a70d setup campaign, I mean 2012-03-23 11:10:34 -04:00
eric 360d11f88a yes we should deprecate setup_work 2012-03-23 11:09:51 -04:00
eric 84411ca6e0 filled in legal stuff placeholder 2012-03-22 21:25:04 -04:00
eric d03459922e fixed stuff I broke when making html validate 2012-03-22 21:25:04 -04:00
Raymond Yee c08bd9b54b I had left a debugging message in pledge_modify.html -- now removed.
I figured out the problem of why regluit.test.campaigntest.support_campaign could not see the new Transaction -- it was locked in a database transaction that had an older snapshot of the db.  fix came from http://stackoverflow.com/a/4739960/7782
2012-03-22 14:51:43 -07:00
eric 08af63e055 modified default premiums to make them implementable via existing profile 2012-03-22 17:05:39 -04:00
eric eeaae9131a [fix #26883175] a35bb7cbba broke this by omitting jquery 2012-03-22 16:57:12 -04:00
eric 29789da14d learn more was broken on these pages 2012-03-22 16:19:15 -04:00
Raymond Yee a7ac79bfc2 Merge branch 'payment' of github.com:Gluejar/regluit into payment 2012-03-22 12:13:42 -07: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 2bfb37ac43 [#22755723] I think these changes now allow one to modify pledges and the validation of the CampaignPledgeForm is happening properly now. 2012-03-22 12:09:13 -07:00
Raymond Yee 9f72351c67 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-22 10:18:07 -07:00
eric 6e9f0ee669 tidy lists in metric page 2012-03-22 09:04:28 -04: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 9629e23b21 [#22755723] First step: adding premium field to Transaction model.
MIGRATION REQUIRED
2012-03-20 15:05:29 -07:00
Raymond Yee 5823c0e2de [#23019867] At this point, a supporter can change the pledge amount to a smaller amount (no new PayPal transaction required) or a larger amount (a new PayPal transaction is required and the old transaction is canceled.)
I've not implemented the storage of the premium yet -- that's coming next.
I've not implemented straight out cancellation of a pledge yet.
More UI refinement needed, especially around encouraging supporters not to decrease (or cancel) a pledge and refinements to help people know that they have made a modification.
2012-03-20 14:10:21 -07:00
Raymond Yee 508a87a6dc Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-20 13:24:26 -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
eric 58cb0c9f2a while mucking around, set feed to atom to match type I set in autodiscovery link [#26402939] 2012-03-20 13:53:53 -04:00
eric 530e07f383 moved atom feed (it's not rss) to autodiscovery link element [#26402939] 2012-03-20 13:01:29 -04:00
Raymond Yee 0e9dc0e798 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-20 09:41:49 -07:00
eric 38bca40bdd landing page was missing the wishlist javascript! [addresses comment on #26590795] 2012-03-20 12:29:29 -04:00
eric 163445d4f5 bulletized the premium list in faq using [accept #26309601] 2012-03-20 11:45:34 -04:00
Andromeda Yelton 52fcbf8d4f font embiggening, moved badge on campaign list to match other list pages 2012-03-20 10:44:56 -04:00
Andromeda Yelton 84ae0acafa modified generic cover image to display something in the thumbnail view 2012-03-20 10:28:35 -04:00
Andromeda Yelton 53d99ae72f addressing https://www.pivotaltracker.com/story/show/26590795 2012-03-20 09:52:57 -04:00
Raymond Yee 46ca784030 [#23019867] First pass at allow for pledges to be modified 2012-03-19 16:32:37 -07:00
Raymond Yee 97f3d01ab4 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-19 13:38:15 -07:00
Andromeda Yelton 7568aa3f14 more informative text than ACTIVE now in status field 2012-03-19 16:36:05 -04:00
Andromeda Yelton 76b261ff3e making terms look more like legalese per https://www.pivotaltracker.com/story/show/26309601 2012-03-19 16:08:05 -04:00
Andromeda Yelton 6d3d032f9b addresses https://www.pivotaltracker.com/story/show/25969011 2012-03-19 15:52:09 -04:00
Andromeda Yelton 5e5e966651 if showing in slideshow on empty supporter wishlist, now offers add-to-wishlist rather than remove-this 2012-03-19 15:32:33 -04:00
eric 0460f4780d word smithing on self-publishing faq 2012-03-19 15:01:17 -04: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 6b4c426a74 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-19 11:45:36 -07:00
Raymond Yee dab3ecfc31 Do not override the source on a Wish if a work is already on the wishlist 2012-03-19 18:23:25 +00:00
Raymond Yee 4392e0dd18 Merge branch 'payment' of github.com:Gluejar/regluit into payment 2012-03-16 15:57:29 -07:00
Raymond Yee d3bd2453ef Merge branch 'payment' of github.com:Gluejar/regluit 2012-03-16 22:22:41 +00:00
Raymond Yee 432513bea0 Merge branch 'master' into payment 2012-03-16 13:51:28 -07:00
Raymond Yee 62d47fee26 [#22561067] Ooops I had missed a couple of datetime.datetime.today() in frontend/forms.py 2012-03-16 13:24:55 -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 1d13d49865 Merge branch 'payment' of github.com:Gluejar/regluit 2012-03-16 09:30:24 -07:00
Raymond Yee a17bd85519 Now support_campaign can get all the way to just before pledging at the PayPal sandbox 2012-03-16 09:27:06 -07:00
eric b955e50951 review and edit faq 2012-03-16 00:00:49 -04: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
Raymond Yee f9f899b3d1 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-14 15:20:25 -07:00
Raymond Yee 9199f78606 test/campaigntests.py has a BasicGuiTest.testFrontPage, which tests whether the Learn More link will toggle the description panel.
paypal/tests.py:  made loginSandbox drop the test parameter and callable from outside of paypal/tests.py -- now, for example, from test/campaigntests.py
settings/dev.py:  added LIVE_SERVER_TEST_URL, UNGLUEIT_TEST_USER, UNGLUEIT_TEST_PASSWORD -- parameters useful for selenium-based live server testing
the beginnings of test/campaigntests.support_campaign() -- a selenium script to drive automated pledging to campaign for testing purposes
2012-03-14 15:06:29 -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
Andromeda Yelton 37b1b12a6b Merge branch 'master' of github.com:Gluejar/regluit 2012-03-14 08:46:11 -04:00