8bd7a5eb65
[deliver #36743191 ] move stripe implementation UI back to stripe.js
2012-09-26 15:03:46 -07:00
f327db6efd
Merge pull request #19 from Gluejar/improvify_download_page
...
Improvify download page with readmill [finish #36156381 ]
2012-09-26 13:04:39 -07:00
9af9c09e5d
more thoughtful handling of readmill url
2012-09-26 14:59:13 -04:00
1cbe62d573
Redirecting to pledge_complete works now -- though there's definitely clean up to do
2012-09-25 11:52:56 -07:00
278a36e2f2
unglued_epub_url should be looking only at unglued books, not all epubs
2012-09-25 11:42:20 -04:00
050bf58da5
add ability to set oclcnumbers for editions. [#finish 32289887]
...
(note also subtle chage to isbn editiing)
2012-09-24 21:51:57 -04:00
d0be2f8761
[ #36469239 ] I can now get a transaction to work via stripelib.py now
2012-09-24 16:29:20 -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
fde2202661
try removing dates again
2012-09-22 23:46:00 -04:00
91ab80d112
Revert "remove user's join date (need the space!)"
...
This reverts commit 756f6f6498
2012-09-22 23:43:59 -04:00
756f6f6498
remove user's join date (need the space!)
2012-09-22 23:38:39 -04:00
1de7dd1654
Merge branch 'master' into improvify_download_page
2012-09-22 13:51:28 -04: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
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
b6862cad3d
fix copying the premiums [ #36192903 ]
2012-09-21 13:54:59 -04:00
5d7e6a39bd
managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [ #36192903 ][ #30068227 ]
2012-09-21 12:10:13 -04:00
5589e5d209
Merge pull request #7 from Gluejar/improvify_download_page
...
Improvify download page
2012-09-20 12:58:45 -07:00
05d082604c
updating selenium script for relaunch
2012-09-19 14:30:47 -07:00
2f084e2a7b
Merge branch 'master' into relaunch_ry
2012-09-19 08:20:35 -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
f2e4647e73
lockss needs a page listing the books unglued in each year to crawl
2012-09-18 14:16:59 -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
69e959a0c8
fleshing out of payment.models.Account
2012-09-17 14:55:28 -07:00
c545173793
First pass at payment.models.Account
2012-09-13 16:43:54 -07:00
c5f22742c1
In making a stripe charge, record transaction.type and transaction.approved.
...
Fixed Campaign.transactions() to handle default variables properly (compare with dfe17f94fa (L0R257)
2012-09-13 14:12:49 -07:00
b85fbfc78b
Merge branch 'master' into relaunch_ry
2012-09-13 10:42:35 -07:00
eac0e24b1b
Small change: now storing amount and status for transaction with new pledge.
2012-09-13 10:39:42 -07:00
18a598f628
need to change lockss page since unglued adheres to editions
2012-09-12 10:11:49 -04:00
77ceed03ad
Now -- a checkbox for whether to retain CC info and functionality for creating Customer / charge vs charge directly
2012-09-11 15:53:39 -07:00
2ab1f8c7ea
Now creating a charge based on token
2012-09-11 15:17:37 -07:00
5636637266
Merge branch 'master' into relaunch_ry
...
Conflicts:
frontend/views.py
2012-09-11 10:42:49 -07:00
2df3047dc0
display all editions for staff
2012-09-10 23:51:22 -04:00
e5804a4d4d
please use spaces, not tabs to indent
2012-09-10 23:47:06 -04:00
0e1839d531
Merge branch 'master' into relaunch_ry
...
Conflicts:
core/signals.py
frontend/views.py
2012-09-10 14:18:30 -07:00
bcceaa719b
integrating stripe into fund_the_pledge
2012-09-10 13:17:30 -07:00
7398fdf161
unglued property should adhere to editions, not ebooks
2012-09-10 15:18:40 -04:00
92a2ccc7ce
cleaned up the response when a pledge is modified rather than created
2012-09-07 17:48:48 -04:00
f3ecec8410
just some tweaking to get the premium selection right
2012-09-07 17:11:25 -04:00
4700e63b06
resolve conflict
2012-09-07 16:26:09 -04:00
f1b22649a5
cruft
2012-09-07 16:20:12 -04:00
18608d3e7d
preapproval amount is now amount for requested premium, not previously pledged amount
2012-09-07 16:13:53 -04:00
a361d7b53d
so we didn't really need to put premium description directly into context
2012-09-07 16:12:32 -04:00
1742572d95
Merge branch 'master' into relaunch
...
Conflicts:
frontend/views.py
2012-09-07 13:08:03 -07:00
6f63c047ce
DRY pub year code moved to work model
2012-09-07 16:07:47 -04:00
0c9d71e4d6
introduce PledgeExtra data object to simplify method calls
2012-09-07 09:46:38 -04:00
6bbd973f62
only ask the donation for required amount [ #21784207 ]]
2012-09-07 09:39:36 -04:00
c2636f5bba
removed legacy DonateView
2012-09-07 01:11:28 -04:00
4d4e61d338
donation modification now works [ #21784207 ]
2012-09-06 16:55:32 -04:00
bd794a2ac5
clean up the donation endpoint pages so they work (if a bit ugly!)
2012-09-06 14:04:47 -04:00
9395cd058b
now donating cents works, too
2012-09-06 11:36:13 -04:00
8eeadc99d3
woo hoo, credit and donation scaffolding works end to end [ #21784207 ]
2012-09-06 01:01:17 -04:00
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
f299d9ecf7
rip out paypal and amazon code
2012-08-31 03:12:15 -04:00
8c030df830
adding some tests for my recent commits hooray
2012-08-29 15:56:14 -04:00
075792880b
needs to handle exception where unglued ebook does not exist
2012-08-27 16:48:07 -04:00
55fc10e813
hm that wasn't how context.update works. moved countdown back to main context
2012-08-27 16:46:21 -04:00
58be27670e
whoops typo, %w is not %s
2012-08-27 16:38:35 -04:00
48e20a7cdd
bringing all the lightboxes under the hijax.js system
2012-08-27 15:35:29 -04:00
a6e034a36a
rudimentary download page plus logic to serve it
2012-08-24 15:14:32 -04:00
aa3667d260
working on download page
2012-08-23 13:38:48 -04:00
adef29f536
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
...
Conflicts:
core/signals.py
2012-08-16 17:11:12 -04:00
368a3ca8ec
making license display more standards-compliant
2012-08-15 10:05:10 -04:00
28670ed01a
building LOCKSS manifest page
2012-08-15 09:40:37 -04:00
10560fb36b
merge credit into relaunch
2012-08-14 21:15:31 -04:00
25ce01716c
also include no-mpremium option in pledge modify
2012-08-14 14:44:07 -04:00
2369d6508e
include no-premium option in pledgeview
2012-08-14 14:32:54 -04:00
403420a283
Add user-to-user credit transfers [ #21784207 ]
2012-08-13 21:00:28 -04:00
5362c202bb
added management command to create credits, balance notification [ #21784207 ]
2012-08-07 14:12:50 -04:00
da0f4970c2
improving data flow of acks throughout system
2012-08-06 15:44:43 -04:00
8db1e5b59a
set up acks page to deal with ack_name, _link, _dedication and anonymity bit
2012-08-06 13:35:29 -04:00
6d4044bcde
intermediate state
2012-07-24 08:08:34 -04:00
5855593c5b
adding support for acknowledgement fields throughout data pipeline
2012-07-23 08:31:57 -04:00
3de4c40647
pledge page shows only custom premiums in main list
2012-07-23 07:43:21 -04:00
c4a96a5d34
work page will now display only custom premiums
2012-07-23 07:41:20 -04:00
fdce89d17b
Added language filtering [finish #24232285 ]
2012-07-21 16:26:16 -04:00
d7638463b1
reporting facility for languages
2012-07-20 14:29:04 -04:00
167bd8a4c1
Fixing a situation in which there is an error in the pledge view
2012-07-18 11:09:48 -07:00
1e49732693
almost ready to send this out to supporters with failed pledges
2012-07-13 15:55:41 -07:00
de415480ae
first pass at calculating transactions that need to be recharged
...
modification to fabfile to download a file of emails
2012-07-13 10:17:51 -07:00
94384fcb59
Work in progress
2012-07-11 19:51:36 -07:00
7a76a2cbaf
Merge branch 'master' into ola_fulfill
2012-07-10 14:15:28 -07:00
94bd6fff2d
First pass at having a pledge recharge view (DON'T KNOW WHETHER THIS EVEN BUILDS PROPERLY)
2012-07-10 13:36:32 -07:00
94787951ad
allowed staff to manage campaigns
2012-07-10 15:58:19 -04:00
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
8977734bd7
[ fix #31636971 ] update campaign.left when campaign changes
2012-06-21 23:20:57 -04:00
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
30bf30177c
Added a case for pledge_modified to have a up_or_down to be 'canceled' -- and change in template text to handle the canceling of a pledge
2012-06-15 16:14:26 -04:00
2b7da6e91e
First attempt to place the notices properly coming from a pledge modify -- inside payment.manager.cancel_related_transaction -- but current problem is now that we get too many notices
2012-06-15 11:38:38 -04:00
eda96f716b
ending time should round up, not down. also times less than days were not going to display right due to type errors. now they will.
2012-06-15 12:06:38 -03:00
d652db5c03
removing is_preview since it's no longer needed
2012-06-13 09:41:23 -03:00
ce5ee124d9
removing pagination from work_list -- likely unnecessary and this should be faster
2012-06-01 13:15:50 -04:00
Raymond Yee
eshellman
Andromeda Yelton