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 |
|
eric
|
0c9d71e4d6
|
introduce PledgeExtra data object to simplify method calls
|
2012-09-07 09:46:38 -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
|
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
|
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 |
|
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 |
Andromeda Yelton
|
8c030df830
|
adding some tests for my recent commits hooray
|
2012-08-29 15:56:14 -04:00 |
|
Andromeda Yelton
|
075792880b
|
needs to handle exception where unglued ebook does not exist
|
2012-08-27 16:48:07 -04:00 |
|
Andromeda Yelton
|
55fc10e813
|
hm that wasn't how context.update works. moved countdown back to main context
|
2012-08-27 16:46:21 -04:00 |
|
Andromeda Yelton
|
58be27670e
|
whoops typo, %w is not %s
|
2012-08-27 16:38:35 -04:00 |
|
Andromeda Yelton
|
48e20a7cdd
|
bringing all the lightboxes under the hijax.js system
|
2012-08-27 15:35:29 -04:00 |
|
Andromeda Yelton
|
a6e034a36a
|
rudimentary download page plus logic to serve it
|
2012-08-24 15:14:32 -04:00 |
|
Andromeda Yelton
|
aa3667d260
|
working on download page
|
2012-08-23 13:38:48 -04:00 |
|
Andromeda Yelton
|
adef29f536
|
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
Conflicts:
core/signals.py
|
2012-08-16 17:11:12 -04:00 |
|
Andromeda Yelton
|
368a3ca8ec
|
making license display more standards-compliant
|
2012-08-15 10:05:10 -04:00 |
|
Andromeda Yelton
|
28670ed01a
|
building LOCKSS manifest page
|
2012-08-15 09:40:37 -04:00 |
|
eric
|
10560fb36b
|
merge credit into relaunch
|
2012-08-14 21:15:31 -04:00 |
|
Andromeda Yelton
|
25ce01716c
|
also include no-mpremium option in pledge modify
|
2012-08-14 14:44:07 -04:00 |
|
Andromeda Yelton
|
2369d6508e
|
include no-premium option in pledgeview
|
2012-08-14 14:32:54 -04:00 |
|
eric
|
403420a283
|
Add user-to-user credit transfers [#21784207]
|
2012-08-13 21:00:28 -04:00 |
|
eric
|
5362c202bb
|
added management command to create credits, balance notification [#21784207]
|
2012-08-07 14:12:50 -04:00 |
|
Andromeda Yelton
|
da0f4970c2
|
improving data flow of acks throughout system
|
2012-08-06 15:44:43 -04:00 |
|
Andromeda Yelton
|
8db1e5b59a
|
set up acks page to deal with ack_name, _link, _dedication and anonymity bit
|
2012-08-06 13:35:29 -04:00 |
|
Andromeda Yelton
|
6d4044bcde
|
intermediate state
|
2012-07-24 08:08:34 -04:00 |
|
Andromeda Yelton
|
5855593c5b
|
adding support for acknowledgement fields throughout data pipeline
|
2012-07-23 08:31:57 -04:00 |
|
Andromeda Yelton
|
3de4c40647
|
pledge page shows only custom premiums in main list
|
2012-07-23 07:43:21 -04:00 |
|
Andromeda Yelton
|
c4a96a5d34
|
work page will now display only custom premiums
|
2012-07-23 07:41:20 -04:00 |
|
eric
|
fdce89d17b
|
Added language filtering [finish #24232285]
|
2012-07-21 16:26:16 -04:00 |
|
eric
|
d7638463b1
|
reporting facility for languages
|
2012-07-20 14:29:04 -04:00 |
|
Raymond Yee
|
167bd8a4c1
|
Fixing a situation in which there is an error in the pledge view
|
2012-07-18 11:09:48 -07:00 |
|
Raymond Yee
|
1e49732693
|
almost ready to send this out to supporters with failed pledges
|
2012-07-13 15:55:41 -07:00 |
|
Raymond Yee
|
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 |
|
Raymond Yee
|
94384fcb59
|
Work in progress
|
2012-07-11 19:51:36 -07:00 |
|
Raymond Yee
|
7a76a2cbaf
|
Merge branch 'master' into ola_fulfill
|
2012-07-10 14:15:28 -07:00 |
|
Raymond Yee
|
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 |
|
eric
|
94787951ad
|
allowed staff to manage campaigns
|
2012-07-10 15:58:19 -04:00 |
|
eric
|
e2962e1075
|
[finish #30516251] supporter acknowledgement page basic version
|
2012-07-07 18:13:05 -04:00 |
|
eric
|
8977734bd7
|
[fix #31636971] update campaign.left when campaign changes
|
2012-06-21 23:20:57 -04:00 |
|
Raymond Yee
|
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 |
|
Raymond Yee
|
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 |
|
Raymond Yee
|
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 |