EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,667 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

2667 Commits (df4e434c45d24206a59984f97dcf061b968c01fe)

Author SHA1 Message Date
Raymond Yee df4e434c45 Fold stripe2.py into stripelib.py 2012-09-21 11:24:42 -07:00
Raymond Yee 1f6fd19918 Merge branch 'relaunch' into relaunch_ry 2012-09-20 10:39:56 -07:00
Raymond Yee bdaedcc148 Merge pull request #9 from Gluejar/stripe_for_donation 
Stripe for donation
 2012-09-20 10:38:58 -07:00
eric 381f59fe62 Merge branch 'relaunch' into stripe_for_donation 2012-09-20 11:02:38 -04:00
Raymond Yee 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
Raymond Yee 05d082604c updating selenium script for relaunch 2012-09-19 14:30:47 -07:00
eric 3ce8d605a6 add stripe stuff to donation form 2012-09-19 14:04:28 -04:00
eric b2df67e22f removed reconcile_pledge.js on pages that don't need it 2012-09-19 14:01:05 -04:00
Raymond Yee e53ea51d99 Merge branch 'relaunch' into relaunch_ry 2012-09-19 08:37:17 -07:00
Raymond Yee 2f084e2a7b Merge branch 'master' into relaunch_ry 2012-09-19 08:20:35 -07:00
eshellman 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
Raymond Yee 980bb218a0 stripe2.Execute actually charges the transaction -- NEED to do some more error checking 2012-09-18 17:56:38 -07:00
Raymond Yee 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
eshellman 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
Andromeda Yelton f2e4647e73 lockss needs a page listing the books unglued in each year to crawl 2012-09-18 14:16:59 -04:00
eshellman 499b1f78b2 Merge pull request #6 from Gluejar/fix_zero_wisher_grammar 
Fix zero wisher grammar
 2012-09-18 10:41:09 -07:00
Andromeda Yelton 82f6ceffd4 addressing comment 2012-09-18 13:09:19 -04:00
Andromeda Yelton b0c2f0926b whoops there are other cases 2012-09-18 12:12:50 -04:00
thatandromeda 33ef8f6844 Update frontend/templates/press.html 2012-09-18 12:45:36 -03:00
Raymond Yee 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
Andromeda Yelton 35180252e0 bugfix [#36104625] 2012-09-18 11:10:53 -04:00
Andromeda Yelton f03855f2de bugfix [#36104625] 2012-09-18 11:10:01 -04:00
Raymond Yee 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
Raymond Yee f88017c607 Merge branch 'relaunch' into relaunch_ry 2012-09-17 14:56:58 -07:00
Raymond Yee 69e959a0c8 fleshing out of payment.models.Account 2012-09-17 14:55:28 -07:00
eric 389e01d1cc fixed out of order migrations. 2012-09-17 16:00:28 -04:00
eshellman 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
Raymond Yee f08206c5d0 got rid of repeated line (thanks, Eric -- fd1887ea44 (commitcomment-1865176) ) 2012-09-17 10:54:39 -07:00
Raymond Yee e39e5348e5 Merge branch 'relaunch' into relaunch_ry 2012-09-17 09:11:27 -07:00
Raymond Yee da2f1e0665 Merge branch 'master' into relaunch 2012-09-14 17:05:29 -07:00
Raymond Yee 7ecf4494db Merge branch 'master' into relaunch_ry 2012-09-14 17:04:55 -07:00
Raymond Yee fd1887ea44 [#36028929] Work to pull out relevant fields in stripe Customer and Charge model with goal of figuring out which to add to payment.models.{Account | Transaction} 2012-09-14 17:00:21 -07:00
thatandromeda 503049afee Merge pull request #1 from Gluejar/fix_google_id 
the google books id is always the first in our db. changing to the id fo...
 2012-09-14 11:58:26 -07:00
eshellman a3390b88bb Merge pull request #2 from Gluejar/fix_wishlist_js 
adding functionality erroneously removed, plus updating to use recent jq...[#35857177]
 2012-09-14 07:07:17 -07:00
Andromeda Yelton 6a2efa9c68 adding functionality erroneously removed, plus updating to use recent jquery function 2012-09-14 09:21:05 -04:00
Raymond Yee c545173793 First pass at payment.models.Account 2012-09-13 16:43:54 -07:00
Raymond Yee a68cd81823 Merge branch 'master' into relaunch_ry 2012-09-13 15:55:43 -07:00
Raymond Yee c099bfe12c Merge branch 'relaunch_ry' into relaunch 2012-09-13 14:27:33 -07:00
Raymond Yee 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
eric 270b47ef62 the google books id is always the first in our db. changing to the id for preferred edition [#35918643] 2012-09-13 14:55:46 -04:00
thatandromeda cbd9640287 Update frontend/templates/base.html 
better link, now that that blog post exists
 2012-09-13 15:42:11 -03:00
Raymond Yee b08643a0ac Merge branch 'master' into relaunch 2012-09-13 10:50:43 -07:00
Raymond Yee b85fbfc78b Merge branch 'master' into relaunch_ry 2012-09-13 10:42:35 -07:00
Raymond Yee eac0e24b1b Small change: now storing amount and status for transaction with new pledge. 2012-09-13 10:39:42 -07:00
Andromeda Yelton 4cd685a61a communicate about lack of active campaigns 2012-09-13 11:22:40 -04:00
Andromeda Yelton 7bd44fb93e link to work page not download page 2012-09-13 11:17:05 -04:00
Andromeda Yelton fdf27c4029 make work title on download page a link 2012-09-13 11:14:32 -04:00
Andromeda Yelton d4309dd46c digital shift coverage of OLA unglued ebook launch 2012-09-12 11:55:27 -04:00
Andromeda Yelton de78548a32 list press releases on press page 2012-09-12 11:31:22 -04:00
Andromeda Yelton fb648bbb5c Merge branch 'fix_lockss' 2012-09-12 10:37:29 -04:00