Commit Graph

505 Commits (cf3351d84bf982a68554deeb4aa3d8353df0ca52)

Author SHA1 Message Date
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
eric ccef6ba411 again [start #32488017] 2012-07-10 16:06:57 -04:00
eric 15ea12534a [#32488017] merge conflicts 2012-07-10 16:03:36 -04:00
eric f2a1bac760 [start #32488017] added some logging of send_mail task 2012-07-10 15:57:44 -04:00
Raymond Yee c8f0143630 Merge branch 'master' into ola_fulfill 2012-07-09 14:04:21 -07:00
Raymond Yee a5d0ef36d7 Merge branch 'feedback' 2012-07-09 10:09:59 -07:00
Raymond Yee 2f49651466 Force the from_email to be settings.DEFAULT_FROM_EMAIL unless you really want your from_email 2012-07-09 10:08:49 -07:00
Raymond Yee d869431b43 a first pass at getting a model for getting premium feedback for the OLA campaign 2012-07-09 09:28:50 -07:00
eric e2962e1075 [finish #30516251] supporter acknowledgement page basic version 2012-07-07 18:13:05 -04:00
eric 21e3cb582d fix tabs 2012-07-07 18:12:54 -04:00
eric 1764cd62d6 small optimization of supporter count 2012-07-07 16:38:23 -04:00
Andromeda Yelton 85247c306e Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
	core/models.py
2012-07-05 10:21:08 -04:00
Andromeda Yelton 0329976165 send signal for unsuccessful campaign notifications 2012-07-05 10:04:27 -04:00
Raymond Yee 5e3cf5d7aa Latest integration of campaign data in our own db plus the spreadsheet you can download from Amazon payments
to produce CVS file
2012-07-03 07:46:42 -07:00
Raymond Yee 5b733d214c setting up to automate daily campaign status update 2012-06-29 18:05:14 -07:00
Raymond Yee 9ac4aa26bd hook the unsuccessful_campaign to the right notice 2012-06-29 09:52:06 -07:00
Andromeda Yelton 8fbc65a305 merge 2012-06-28 14:31:48 -07:00
Andromeda Yelton de929363e5 we are going to need an unsuccessful campaign signal asap, sadly 2012-06-28 14:07:33 -07:00
Raymond Yee d3da49cf74 Stepping stone to correlating payments with Amazon data
print 1 email / line
2012-06-26 19:36:14 -07:00
eric dfe17f94fa [finish #31637107] refactored transaction summary code, now considers pending and other transactions 2012-06-21 23:20:58 -04:00
eric 0a259165a1 [fix #31498847] the helrond bug 2012-06-21 23:20:57 -04:00
eric e9e9ee135b expect the test to succeed again 2012-06-21 23:20:57 -04:00
eric cb9eb1e24e detab code 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 e3ec5ba1ee don't return empty rightsholder for campaign if it's SUCCESSFUL.
Remaining question:  why does the RH for a campaign depend at all on campaign status?  If it doesn't, we should remove dependence
2012-06-21 07:36:44 -07:00
Raymond Yee 3988335072 Add a command to list queued notices 2012-06-21 05:18:12 -07:00
Raymond Yee 6389c25f11 Trying to import successful_campaign differently 2012-06-20 21:09:05 -07:00
Raymond Yee ea4fc308a0 Allowing campaign.update_status to go SUCCESSFUL w/o regard to specific deadline.
Set a bookloader test to expected failure while it might be a transient error
2012-06-20 15:48:55 -07:00
Raymond Yee 1f77371b7b 1) the title of ISBN:9780226032030 changed from 'Forbidden journeys' to 'Forbidden Journeys'
2) using humanize tag naturalday on the book panel
2012-06-18 13:55:45 -07:00
Raymond Yee 457aba97bd Merge branch 'master' into fps 2012-06-13 14:43:24 -04:00
Andromeda Yelton 2241134e92 comment notifications should contain link to comments tab 2012-06-13 08:52:53 -03:00
Raymond Yee c745452b4f Merge branch 'master' into fps 2012-06-11 11:44:19 -04:00
eric ed92de66be default premium description in fixture was different from TOS: username, not name to be used in acknowledgements 2012-06-11 11:39:25 -04:00
Raymond Yee 3d07e09424 Merge branch 'master' into fps
Conflicts:
	payment/manager.py
2012-06-08 15:02:57 -04:00
Jason d029e02bb4 Adding skeleton row locking code for demo 2012-06-01 12:20:17 -04:00
Andromeda Yelton 79bdcf3f5c commenting 2012-05-29 21:16:01 -04:00
Andromeda Yelton 1c5264d8a1 removing reference to payment_processor context variable, made irrelevant now that we have transaction.host 2012-05-29 21:01:17 -04:00
Andromeda Yelton 48481bd819 improving ple pledge_modified 2012-05-29 20:50:53 -04:00
Raymond Yee fccedc50d7 Goodreads problem has been fixed: http://www.goodreads.com/topic/show/908732?utm_medium=email&utm_source=comment_instant#comment_51301819 2012-05-29 16:23:57 -07:00
Raymond Yee 52ed00b80b Marking core.GoodreadsTest.test_review_list_unauth as expected failure for now. I believe there is a problem on
the Goodreads side and have reported the problem:  http://www.goodreads.com/topic/show/908732-api-problem-http-status-code-500-for-list-xml#comment_51296303

I will need to turn this test back on once Goodreads fixes the problem
2012-05-29 15:27:54 -07:00
Raymond Yee 8ce6ffe530 Pull which payment processor is involved from the transaction itself not from the settings.PAYMENT_PROCESSOR 2012-05-29 15:01:48 -07:00
Raymond Yee 111e10f380 Expose what http code we are getting from goodreads when we get something that is not 200 2012-05-29 12:47:38 -07:00
eric 4e81f743b4 removed import loop 2012-05-29 12:08:28 -04: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 bafeb92bdd [#29809805] fixed email dedupe email at account activate fails when more than one prior account 2012-05-26 17:27:10 -04:00
Raymond Yee a2514eb99c Got rid of small typo in wishlist_unglued_book_released notice type description 2012-05-25 13:49:45 -07:00
eric 1bb459e71d resolve test conficts 2012-05-25 14:54:08 -04:00
eric 8ca9b7900c [start #28494261] "official" notification get sent by email too wishers by default. needs syncdb 2012-05-25 14:52:50 -04:00