Andromeda Yelton
|
3a0d09db33
|
edition-adding on rights tab was hard to read with multiple editions
|
2012-09-10 14:37:37 -04:00 |
Raymond Yee
|
e0bc5ee996
|
Merge branch 'master' into relaunch
|
2012-09-10 08:52:23 -07:00 |
|
Raymond Yee
|
add83c9d9e
|
fixed case of LOCKSSpreserved.png
|
2012-09-10 08:49:12 -07:00 |
|
Andromeda Yelton
|
d9147fd088
|
clarifying instructions
|
2012-09-10 10:51:52 -04:00 |
|
Andromeda Yelton
|
3a1a523acb
|
typo
|
2012-09-10 10:51:43 -04:00 |
|
Raymond Yee
|
2f0cf85734
|
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
|
2012-09-10 07:25:29 -07:00 |
|
Raymond Yee
|
3417c6372c
|
Allow for passing in card instead of customer for creating stripe charge
|
2012-09-10 07:23:03 -07:00 |
eric
|
de9da54206
|
sorting the premiums turned out to be easy
|
2012-09-07 17:56:58 -04:00 |
|
eric
|
92a2ccc7ce
|
cleaned up the response when a pledge is modified rather than created
|
2012-09-07 17:48:48 -04:00 |
|
eric
|
f3ecec8410
|
just some tweaking to get the premium selection right
|
2012-09-07 17:11:25 -04:00 |
|
Raymond Yee
|
b8c0c8f98e
|
Remove remnants of balanced and wepay that I missed earlier
|
2012-09-07 13:47:15 -07:00 |
|
Raymond Yee
|
f639aa02dd
|
Merge branch 'newpayment' into relaunch
Conflicts:
frontend/views.py
payment/manager.py
|
2012-09-07 13:46:09 -07:00 |
|
eric
|
4700e63b06
|
resolve conflict
|
2012-09-07 16:26:09 -04:00 |
|
eric
|
f1b22649a5
|
cruft
|
2012-09-07 16:20:12 -04:00 |
|
eric
|
18608d3e7d
|
preapproval amount is now amount for requested premium, not previously pledged amount
|
2012-09-07 16:13:53 -04:00 |
|
eric
|
a361d7b53d
|
so we didn't really need to put premium description directly into context
|
2012-09-07 16:12:32 -04:00 |
|
Raymond Yee
|
1742572d95
|
Merge branch 'master' into relaunch
Conflicts:
frontend/views.py
|
2012-09-07 13:08:03 -07:00 |
|
eric
|
6f63c047ce
|
DRY pub year code moved to work model
|
2012-09-07 16:07:47 -04:00 |
|
Andromeda Yelton
|
18fbe3a175
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-09-07 14:48:35 -04:00 |
|
eric
|
6762c7d3f2
|
not really supposed to use Decimal.NaN changed to Decimal('NaN')
|
2012-09-07 14:40:00 -04:00 |
|
Raymond Yee
|
101cf1e7a0
|
Removed references to wepay and balanced
|
2012-09-07 11:31:49 -07:00 |
|
Raymond Yee
|
f9b3a5ddb5
|
updating version for stripe
|
2012-09-07 07:37:17 -07:00 |
|
eric
|
0c9d71e4d6
|
introduce PledgeExtra data object to simplify method calls
|
2012-09-07 09:46:38 -04:00 |
|
eric
|
790969745e
|
authorize method has changed
|
2012-09-07 09:45:43 -04:00 |
|
eric
|
6bbd973f62
|
only ask the donation for required amount [#21784207]]
|
2012-09-07 09:39:36 -04:00 |
|
eric
|
c2636f5bba
|
removed legacy DonateView
|
2012-09-07 01:11:28 -04:00 |
|
eric
|
eb185438b4
|
methods currently marked as classmethods are really staticmethods
|
2012-09-07 01:04:18 -04:00 |
|
eric
|
4d4e61d338
|
donation modification now works [#21784207]
|
2012-09-06 16:55:32 -04:00 |
|
eric
|
bd794a2ac5
|
clean up the donation endpoint pages so they work (if a bit ugly!)
|
2012-09-06 14:04:47 -04:00 |
|
eric
|
d63063b740
|
add missing notification for donation pledges
|
2012-09-06 13:27:34 -04:00 |
|
eric
|
d14548f3af
|
not sure how I missed this bug
|
2012-09-06 11:36:52 -04:00 |
|
eric
|
9395cd058b
|
now donating cents works, too
|
2012-09-06 11:36:13 -04:00 |
|
eric
|
8eeadc99d3
|
woo hoo, credit and donation scaffolding works end to end [#21784207]
|
2012-09-06 01:01:17 -04:00 |
|
Raymond Yee
|
a1dd7f6a43
|
Merge branch 'master' into newpayment
|
2012-09-05 16:28:06 -07:00 |
|
Raymond Yee
|
bcbc75ed3d
|
More analysis of what we need to figure out still about stripe.
|
2012-09-05 16:11:32 -07:00 |
|
eric
|
9ccfb4be48
|
Ed's tired of getting unglue.it bug reports
|
2012-09-05 11:17:36 -04:00 |
|
Raymond Yee
|
e8e6a51068
|
added a bit of handling of stripe Transfers
|
2012-08-31 22:59:22 -07:00 |
|
Raymond Yee
|
cc8c075842
|
show error from bad card with stripe call
|
2012-08-31 11:19:05 -07:00 |
|
Andromeda Yelton
|
49f36e659e
|
whoops resolving merge
|
2012-08-31 13:47:31 -04:00 |
|
Andromeda Yelton
|
f2e9559a3a
|
beginning of a notification to RHs when someone wishlists their work
|
2012-08-31 13:47:01 -04:00 |
|
Andromeda Yelton
|
2da4ba6f96
|
starting a notification for RHs when their books are wished for
|
2012-08-31 13:41:16 -04:00 |
|
eric
|
c20e6299bb
|
off to a great start this morning [#16582483]
|
2012-08-31 11:05:00 -04:00 |
|
eric
|
7afedcd0b6
|
ack_link now considers anonymous [#16582483]
|
2012-08-31 10:58:57 -04:00 |
|
eric
|
94270f33c6
|
add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager
also removed unused target, lists, ack-link,
|
2012-08-31 03:16:04 -04:00 |
|
eric
|
f299d9ecf7
|
rip out paypal and amazon code
|
2012-08-31 03:12:15 -04:00 |
|
eric
|
5140943ad8
|
django to 1.4.1 [#30997753]
|
2012-08-31 02:53:29 -04:00 |
|
eric
|
7c4a2b94f0
|
documented up_or_down parameter on pledge_modified signal handler
|
2012-08-31 02:50:38 -04:00 |
|
eric
|
618eda4aa5
|
eliminate db skew between prod and relaunch
|
2012-08-31 02:49:04 -04:00 |
|
Raymond Yee
|
5ac4976950
|
Basic test for creating Customer, a charge, and then deleting Customer
|
2012-08-30 16:51:59 -07:00 |
|
Raymond Yee
|
e44052712c
|
Now able to wrap stripe functionality in a StripeClient object that is tied to a specific api_key. We use separate api_key for Gluejar and for partner non-profit
|
2012-08-30 09:24:42 -07:00 |