Commit Graph

3919 Commits (8317356cc22023c0fafda3aa0c9b6772794d663f)

Author SHA1 Message Date
Andromeda Yelton b063fe6c3f don't fail for spurious reason 2013-06-26 11:25:35 -04:00
Andromeda Yelton 14051e2f21 pop kindle email from session after use 2013-06-26 09:46:56 -04:00
Andromeda Yelton 02899d332f can has readmill logo 2013-06-26 09:46:47 -04:00
Andromeda Yelton a6879ac20d unbind send-to-kindle action after send, don't display options not available without javascript to non-js users 2013-06-26 09:43:15 -04:00
Andromeda Yelton 8395a4afb4 other things have logos, readmill should too 2013-06-26 09:31:26 -04:00
Raymond Yee 701533117f fixed some seemingly bad defaults in baseprocessor
basic pass at payment.manager.PaymentManager.charge
2013-06-25 15:34:20 -07:00
eric bb5bc2112d add readmill and send to kindle instructions 2013-06-25 17:42:06 -04:00
eric 6dd6d7de5a add instructions and png for embedded browser 2013-06-25 17:41:14 -04:00
eric e92532524f merge session.next_page into cookie.next functionality 2013-06-25 16:02:12 -04:00
eric fbe37359f2 simplify kindle_config view and add link to the work page 2013-06-25 16:01:08 -04:00
eric ff65b6b7dd validation nit 2013-06-25 15:59:00 -04:00
Raymond Yee 867e745f75 Merge branch 'master' into instant_charge 2013-06-25 11:26:39 -07:00
Raymond Yee bf516c96e8 Merge pull request #184 from Gluejar/new_stripe_version
dead pledge code cleaned up.
2013-06-25 11:25:03 -07:00
Raymond Yee cae7f6d862 also delete the commented out pledge method 2013-06-25 11:23:21 -07:00
Raymond Yee 22dc844b07 Getting rid of tests that call PaymentManager.pledge 2013-06-25 11:05:52 -07:00
Raymond Yee 1725331aa0 cleaning out some old refs to Paypal 2013-06-25 10:39:49 -07:00
eric f79c456f53 I don't like putting None in a dict, especially when it bloats the code 2013-06-25 01:35:09 -04:00
eric 3407b7cec4 add helpful link to response from send-to-kindle
also, move the kindle result messages into a template
2013-06-25 01:11:43 -04:00
eric e33077138f move ebook id to title attribute 2013-06-25 01:09:36 -04:00
Raymond Yee 5e3fca0282 in stripelib.py, I am resurrecting PledgeScenarioTest
in manager.py, a very rough first pass at charge -- not working yet, but doesn't break things either
2013-06-24 16:19:12 -07:00
Andromeda Yelton bcec6d4914 no smtp auth failures for you 2013-06-24 15:42:51 -04:00
Andromeda Yelton aa7e5bfe5e kindle instructions 2013-06-24 14:52:03 -04:00
Andromeda Yelton 50fce4bb1a sharing->email 2013-06-24 14:28:01 -04:00
Andromeda Yelton 1380040bd2 Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download 2013-06-24 13:56:39 -04:00
Andromeda Yelton 69f0451bea segregate flows of one-click and information-seeking options, address feedback 2013-06-24 13:53:28 -04:00
Raymond Yee f6499d7dc5 Merge branch 'master' into instant_charge 2013-06-24 09:18:52 -07:00
Raymond Yee 0950c3bc40 Merge branch 'master' into new_stripe_version 2013-06-24 09:18:31 -07:00
Raymond Yee 86caa9b3ed Making changes to fix breakage in core.tests.BookLoaderTests.test_add_by_isbn
2000-07-01 -> 2000
Ace Trade -> Penguin
2013-06-24 08:04:36 -07:00
Andromeda Yelton 3c950966bc Merge branch 'master' into simpler_download 2013-06-24 08:36:51 -04:00
Raymond Yee 53178d80ce moving to stripe 1.9.1 2013-06-21 15:14:51 -07:00
Raymond Yee 1c86a0ae5a I'm going to modify test for reflect readmill change -- it seems like there is no extra readmill button for test scenario 2013-06-20 14:17:47 -07:00
Raymond Yee a36ff38745 extraneous creation of StripeClient 2013-06-20 13:39:06 -07:00
Raymond Yee 93e0e8593c Merge pull request #183 from Gluejar/fix_readmill_redirect
need this to work
2013-06-20 13:35:48 -07:00
eric 5d1f6fa224 quick fix for readmill 2013-06-20 14:34:44 -04:00
Raymond Yee c76a320912 * Comment out current payment.manager.PaymentManager.pledge -- tests run ok -- so it looks like I suspect: that we don't use that code and it's a hold-over from PayPal code
* stub for stripelib.Processor.Pay
2013-06-19 18:54:32 -07:00
eric 5fe6f5d3a0 no campaigns *right now* 2013-06-18 09:39:57 -04:00
eric 835ff4be8e Rightsholder can upload ebook files and set buy-to unglue prices [#51733385][#51745045]
note that to test file upload loacal, you need to set up file storage
in local settings. for example,
MEDIA_ROOT = '/Documents/media/'

DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
2013-06-17 18:53:28 -04:00
eric 1ea77acf09 move latest ending logic from form to model/settings 2013-06-17 18:53:28 -04:00
eric 3ea697c768 create offers
must migrate core schema!
2013-06-17 18:53:28 -04:00
Andromeda Yelton 9e5f41968b download options should be sensitive to filetype 2013-06-17 18:53:28 -04:00
Andromeda Yelton cd504780e6 redesigning information flow to address feedback 2013-06-17 18:53:28 -04:00
Andromeda Yelton 8fd153f085 rewiring to remove buttons 2013-06-17 18:53:28 -04:00
eric 1e310e8896 fix overzealous global replace 2013-06-14 23:09:55 -04:00
Andromeda Yelton 7070f033e7 download options should be sensitive to filetype 2013-06-12 15:24:26 -04:00
Andromeda Yelton 2337676e1c redesigning information flow to address feedback 2013-06-12 15:11:43 -04:00
Andromeda Yelton 8e00242c35 Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download 2013-06-12 14:05:46 -04:00
Andromeda Yelton 0819c77312 rewiring to remove buttons 2013-06-12 14:05:30 -04:00
eric a5af94be7a add user agent inspection 2013-06-10 12:58:19 -04:00
Andromeda Yelton e21b002b6a Merge branch 'master' into simpler_download 2013-06-10 11:59:19 -04:00
Andromeda Yelton 704fdc5b60 Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download 2013-06-10 11:58:03 -04:00