ed6bb5f3e0
BROKEN CODE -- checked in while I switch to working on other branch
2012-09-24 11:30:21 -07:00
6a4d8fd3ff
Merge branch 'relaunch' into paymentmanager_account
2012-09-24 09:52:24 -07:00
de4092d23d
Merge pull request #14 from Gluejar/nonprofit_switch
...
Nonprofit switch [deliver #36476831 ]
2012-09-24 09:50:22 -07:00
59f530f8b7
Merge branch 'relaunch_ry' into paymentmanager_account
2012-09-24 09:09:57 -07:00
4a82d59a49
Merge branch 'relaunch' into relaunch_ry
2012-09-24 09:09:11 -07:00
a91a70e6ef
Merge pull request #12 from Gluejar/master
...
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
e8494864d4
This code is BROKEN -- but I'm committing this to capture current state of work -- problem is
...
global name 'stripe_token' is not defined
Exception Location: /Users/raymondyee/C/src/Gluejar/regluit/payment/stripelib.py in __init__, line 285
when you run the selenium test -- brings up issue of where to create Stripe account in PaymentManager abstraction
2012-09-21 17:40:33 -07:00
9a65996644
Merge pull request #16 from Gluejar/improvify_download_page
...
Improvify download page [#36156381 ]
2012-09-21 17:09:08 -07:00
c4a2db66f7
Fix index out of bounds errors when no unglued epub is available [ #36156381 ]
2012-09-21 19:54:43 -04:00
d8cbf39849
removed odd semicolons from non-working readmill code [ #36156381 ]
2012-09-21 18:19:11 -04:00
a7210ad778
fund pledge_the_pledge page [ #36476831 ]
2012-09-21 17:31:28 -04:00
422826c4c2
Merge branch 'relaunch' into nonprofit_switch
2012-09-21 17:17:07 -04:00
63af76efc5
donation page
2012-09-21 17:15:30 -04:00
2ea3059682
[ #36469239 ] get rid of retain_cc_info since we will retain CC info for all pledges
2012-09-21 12:51:21 -07:00
df4e434c45
Fold stripe2.py into stripelib.py
2012-09-21 11:24:42 -07:00
b100b04f10
Fix version of pycrypto to 2.5
2012-09-20 16:23:06 -07:00
5589e5d209
Merge pull request #7 from Gluejar/improvify_download_page
...
Improvify download page
2012-09-20 12:58:45 -07:00
acf1763672
Update frontend/templates/press.html
2012-09-20 15:27:36 -03:00
1f6fd19918
Merge branch 'relaunch' into relaunch_ry
2012-09-20 10:39:56 -07:00
bdaedcc148
Merge pull request #9 from Gluejar/stripe_for_donation
...
Stripe for donation
2012-09-20 10:38:58 -07:00
381f59fe62
Merge branch 'relaunch' into stripe_for_donation
2012-09-20 11:02:38 -04:00
cf0d6455e4
Now I can show that payment.stripe2.Execute works -- can be invoked in the campaigntest.test_relaunch
2012-09-19 16:45:40 -07:00
05d082604c
updating selenium script for relaunch
2012-09-19 14:30:47 -07:00
3ce8d605a6
add stripe stuff to donation form
2012-09-19 14:04:28 -04:00
b2df67e22f
removed reconcile_pledge.js on pages that don't need it
2012-09-19 14:01:05 -04:00
756c1da430
download page test needs to cover readmill addition and new unglued flag handling
2012-09-19 12:37:37 -04:00
5419c869ed
now the readmill script works on the lightbox too
2012-09-19 12:08:27 -04:00
e53ea51d99
Merge branch 'relaunch' into relaunch_ry
2012-09-19 08:37:17 -07:00
2f084e2a7b
Merge branch 'master' into relaunch_ry
2012-09-19 08:20:35 -07:00
4d562b64d5
Merge pull request #8 from Gluejar/lockss
...
lockss needs a page listing the books unglued in each year to crawl
2012-09-19 07:31:27 -07:00
efa3187535
dynamically generate the readmill download url don't hardcode it you moron
2012-09-19 10:25:23 -04:00
980bb218a0
stripe2.Execute actually charges the transaction -- NEED to do some more error checking
2012-09-18 17:56:38 -07:00
be45a27b45
moving transaction.host None -> PAYMENT_HOST_NONE
...
a few typos (t->transaction, missing host)
skeleton for stripe2.py -- the module to implement various methods used by payment.manager
2012-09-18 17:01:07 -07:00
6221e4f750
Merge pull request #4 from Gluejar/relaunch_ry
...
fleshing out of Account & recording as preapprovals & now needing to write a stripe module to handle Preapproval
2012-09-18 16:32:21 -07:00
f2e4647e73
lockss needs a page listing the books unglued in each year to crawl
2012-09-18 14:16:59 -04:00
499b1f78b2
Merge pull request #6 from Gluejar/fix_zero_wisher_grammar
...
Fix zero wisher grammar
2012-09-18 10:41:09 -07:00
f581dd354b
readmill support
2012-09-18 13:40:52 -04:00
0de46d0bb6
DRM-free logo
2012-09-18 13:35:14 -04:00
82f6ceffd4
addressing comment
2012-09-18 13:09:19 -04:00
b0c2f0926b
whoops there are other cases
2012-09-18 12:12:50 -04:00
33ef8f6844
Update frontend/templates/press.html
2012-09-18 12:45:36 -03:00
ebb2144055
Responding to Eric's comment: yes Account.date_created should have auto_now_add not auto_add
...
I modified migration and model.
2012-09-18 08:16:12 -07:00
35180252e0
bugfix [ #36104625 ]
2012-09-18 11:10:53 -04:00
f03855f2de
bugfix [ #36104625 ]
2012-09-18 11:10:01 -04:00
6a650affc8
Now recording pledge as such -- and not charging immediately.
...
running into exception at https://github.com/Gluejar/regluit/blob/relaunch_ry/payment/manager.py#L554-- have to start implementing a baseclass for stripelib to handle pledge modification
2012-09-17 16:56:07 -07:00
f88017c607
Merge branch 'relaunch' into relaunch_ry
2012-09-17 14:56:58 -07:00
69e959a0c8
fleshing out of payment.models.Account
2012-09-17 14:55:28 -07:00
389e01d1cc
fixed out of order migrations.
2012-09-17 16:00:28 -04:00
1f1737c328
Merge pull request #3 from Gluejar/relaunch_ry
...
A first pass at storing Stripe Customer data in relaunch branch
2012-09-17 11:33:54 -07:00
f08206c5d0
got rid of repeated line (thanks, Eric -- fd1887ea44 (commitcomment-1865176) )
2012-09-17 10:54:39 -07:00
Raymond Yee
eric
thatandromeda