7130ee5625
progress icon replaced by wished-by-N text for books on supporter page with no campaign yet
2011-12-22 09:51:49 -05:00
ffe2ab5bd6
fixed Goodreads loading; unicode in exception message was a nono
2011-12-22 01:17:30 -05:00
7ed4ef6f75
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-21 23:38:39 +00:00
81c99c8724
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-21 18:37:22 -05:00
473c80827c
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-21 23:35:11 +00:00
21c009998a
Starting to display more information about recipients tied to transactions
2011-12-21 18:33:36 -05:00
e0d892f14b
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-21 23:12:39 +00:00
48c5988a08
Added a recipient_status to show status of individual recipients in all the transactions tied to a campaign list
2011-12-21 18:11:46 -05:00
ae9a1726eb
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-21 22:57:37 +00:00
88f9b106f8
Explicitly go through all the campaigns to zero out totals when dropping all transactions
2011-12-21 17:52:04 -05:00
400d0ce5dd
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-21 22:36:51 +00:00
17d4acceab
changed PaymentManager.cancel to PaymentManager.cancel_transaction and added PaymentManager.cancel_campaign to parallel other methods in PaymentManager
...
morphing the campaign_admin view towards being able to push all the campaigns through the various states
2011-12-21 17:32:08 -05:00
1872615f2a
Added a signal to handle the deletion of a transaction. Don't expect to delete transactions in production but for testing, it's important to get the current Campaign tally right based on transactions
2011-12-21 15:28:31 -05:00
ddcee58eeb
badges on supporter page now stay put regardless of whose page you're looking at and whether they have a tagline
2011-12-21 14:33:48 -05:00
5baf0a9737
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-21 19:26:46 +00:00
973aad7a17
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-21 14:26:31 -05:00
4098933cf6
Added a method to drop all the transactions to help with testing
2011-12-21 14:25:21 -05:00
4c9bf21ce8
Got rid of a bunch of print statements
2011-12-21 13:49:24 -05:00
614b36d15c
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-21 13:48:45 -05:00
d0b2809c9e
moving badges for recommended and popular into tab area
2011-12-21 13:48:34 -05:00
fb9fc99545
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-21 17:34:50 +00:00
322f03a460
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-21 12:33:44 -05:00
c3c0249b42
Added a PaymentManager.finish_campaign()
...
Fixed a small bug in which r['status'] is None and being attached as a text node in PaymentManager.checkStatus()
2011-12-21 12:31:58 -05:00
e8860238e0
on-wishlist checkmark now displays properly on supporter page
2011-12-21 11:34:35 -05:00
2428a5eef9
moved support button on work page to be more prominent and align better with other icons
2011-12-21 10:59:49 -05:00
75fceed7c5
Now display the campaigns with three different types of transactions: ACTIVE, INCOMPLETE, COMPLETED on the campaign_admin view
2011-12-20 20:36:27 -05:00
0a6480446a
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-20 22:44:09 +00:00
4e36892910
Putting in stub for campaign_admin.
...
Let admin do a PaymentManger.checkStatus() to get the latest information about Transactions (using the PayPal PaymentDetails and PreapprovalDetails API methods)
2011-12-20 17:42:06 -05:00
12a3f7f72f
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-20 16:13:28 -05:00
4f624de4a1
tab width on work page
2011-12-20 16:13:18 -05:00
c7293e253a
updating look of campaign and landing page to match latest from Stefan
2011-12-20 15:33:20 -05:00
be12fa9bda
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-20 20:01:57 +00:00
c055767173
set the expiry date based on the campaign deadline. There is a setting PREAPPROVAL_PERIOD_AFTER_CAMPAIGN for specifying how many days after the campaign deadline should we ask for a preapproval deadline. I've put in 90 days.
2011-12-20 14:56:01 -05:00
47399ab23a
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 14:07:43 -05:00
10fdf1f90a
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-20 13:31:30 -05:00
2432b991b5
the learn more section: it toggles. toggle toggle toggle
2011-12-20 13:31:20 -05:00
6952cbde52
require googlebooks_id to be unique on Edition. this may cause errors to pop up elsewhere when we have a race to add an edition
2011-12-20 12:57:17 -05:00
dd9566c377
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 17:49:26 +00:00
9231923b88
remove duplicate editions
2011-12-20 12:37:50 -05:00
19976b2520
added beginning of a management command to remove duplicate editions
2011-12-20 12:19:23 -05:00
9f2cef6fa3
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 15:46:10 +00:00
269ebc4789
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-20 10:39:14 -05:00
c8c61b5ef9
separating the color green from an abstract call-to-action color(also at present green)
2011-12-20 10:39:02 -05:00
aab7b6f926
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 10:35:42 -05:00
2d6a6de487
ElementTree.fromstring expects a string of utf8, not a unicode object, which works most of the time, but not if the UnicodeString contains some non-ascii data I guess. The test suite started failing with a UnicodeEncodeError: 'ascii' codec can't encode character u'\u2014' in position 12164: ordinal not in range(128), I think when the GR bookshelf used by this test changed to include some Unicode
2011-12-20 10:31:15 -05:00
5a5ca2262e
adding TEST_RUNNER back in with latest djcelery test runner djcelery.contrib.test_runner.CeleryTestSuiteRunner to avoid deadlock when running tests
2011-12-20 09:45:10 -05:00
b22d8a82c5
removed TEST_RUNNER declaration since djcelery.contrib.test_runner.run_tests no longer seems to exist in latest djcelery package. not really sure why it was there in the first place.
2011-12-20 09:15:57 -05:00
d78a5cfe6c
blindly trying what the error messages say to do
2011-12-19 23:45:44 -05:00
f81a4e8e6d
removed isbn_10 column and fixed many isbn13 non-compliance issues
...
apply migrations!
2011-12-19 23:26:55 -05:00
bad343e3d2
views.py: wiring in the email address of partnering non-profit
...
payment/manager.py: wire in the email address of the campaign recipient and the Gluejar commission rate
move the Gluejar commission rate to dev.py/prod.py
2011-12-19 18:34:30 -05:00
Andromeda Yelton
eric
Raymond Yee
Raymond Yee
Ed Summers