Commit Graph

881 Commits (6e7344d8a4912006ed784358786b834bd1388e32)

Author SHA1 Message Date
eric 6e7344d8a4 and now, you can borrow a library book! yay! 2013-10-18 15:35:48 -04:00
eric 60cd2f626b borrowability reflected on work page 2013-10-18 13:33:47 -04:00
eric 93d128102e display of borrowability and library holdings
needed another date column on acqs to manage this
bookpanel getting complicated- moved some logic into tempalte tags
library page now shows b2u books it owns
"library" has its own view now
2013-10-18 12:36:55 -04:00
eric c2649f6ab2 implemented borrowing methods, "BORROWED" license acq, RESERVES
includes a schema migration!
2013-10-16 22:48:29 -04:00
eric e6573ac0c5 library user can buy a library license 2013-10-15 16:18:30 -04:00
eric 157d41eead make the purchase options reflect user libraries 2013-10-11 17:50:54 -04:00
eric fcc1876859 Revisit manage_campaign page for b2u 2013-10-11 12:50:59 -04:00
eric d99aaa97c9 card number authentication!
create libraries and administer them in admin.
card patterns mimc ezproxy format
http://www.oclc.org/support/services/ezproxy/documentation/usr/number.en
.html
after you join a library, it appears in your explore bar
2013-10-10 02:41:50 -04:00
eric 19101a3109 ungluing date calculator and many documetation improvements 2013-10-03 22:54:25 -04:00
eric b091612605 Merge branch 'master' into b2u_errata
Conflicts:
	frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
eric 58755d76e1 fix dollar per day computation to use launch date when present
also, activated had never been activated!
2013-09-26 09:26:50 -04:00
eric 18d1d69ccb wrong object 2013-09-24 16:22:41 -04:00
eric 9b5a254f1d Adapt marc record machinery to B2U titles 2013-09-23 12:39:47 -04:00
eric be711e142d cleaned up marc file storage issues before implementing b2u
MIGRATION!
1. multi-record marc files no longer saved, sent to user directly
2. works with both s3 and file system- default storage by name used for
both read and write.
3. stupid storage of computed filenames/urls eliminated
4. removed verbose logging
5. no need to have pymarc write to a StringIO
6. the MARCRecord.clean method didn't do anything
2013-09-23 00:34:51 -04:00
eric 405913c746 fix oclcnum buggy code 2013-09-22 23:41:24 -04:00
Raymond Yee 3b34c43581 Merge branch 'insert_dated_copyright' 2013-09-20 18:00:30 -07:00
Raymond Yee 8543a9ac2f change pyepub to regluit.pyepub 2013-09-20 17:59:40 -07:00
Raymond Yee ed1f17169d Merge pull request #210 from Gluejar/insert_dated_copyright
Insert dated copyright -> Se tests and main tests passed on my laptop.
2013-09-20 17:44:35 -07:00
eric 99fe9f9011 rewrite license page 2013-09-20 17:46:06 -04:00
eric c83f1f657d remove more debugging stuff 2013-09-20 17:45:28 -04:00
eric aedf080965 add license to opf file metadata 2013-09-20 17:44:37 -04:00
eric de2e56a25a add campaign to test to exercise the inserted file 2013-09-18 17:36:42 -04:00
eric ed341884ea add license page to epub before sending it for watermarking 2013-09-15 21:43:58 -04:00
eric e075fd0081 not using unglueit.com any more 2013-09-11 13:43:49 -04:00
eric 6294c15aad TGFT 2013-09-06 00:14:06 -04:00
eric aad6d72207 Merge branch 'master' into b2u_download
Conflicts:
	core/signals.py
2013-09-05 22:56:46 -04:00
eric b801eb4927 add acq handling to download
needs migration. should migrate core back to 0052 to refresh acq table

download page no longer passes ebook ids to send_to_kindle, url
calculations are now done in view
2013-09-05 22:54:11 -04:00
eric 715bf049bc Merge branch 'b2u_fulfillment' of https://github.com/Gluejar/regluit into b2u_fulfillment
Conflicts:
	core/signals.py
2013-08-29 22:16:42 -04:00
eric f8df110163 only watermark on purchase 2013-08-29 11:57:41 -04:00
Raymond Yee 646c8f09e3 I think it's right to move the logic into the else: https://github.com/Gluejar/regluit/pull/202#discussion_r6059064 2013-08-29 06:29:45 -07:00
Raymond Yee 4e161bebe6 explicit import of regluit.core.parameters
move to using the openly available github hosted version of Eric's Open Access Ebooks for  core.EbookFileTests.test_ebookfile test
Should we delete the static/test epub?
2013-08-28 17:13:35 -07:00
eric 0ba5c9a00e cleanup, plus tests 2013-08-27 18:03:35 -04:00
eric e51fa1190e wired watermarker into file uploads. migration needed 2013-08-26 23:56:01 -04:00
eric 567f20d5a2 move more constants 2013-08-25 23:52:09 -04:00
eric 1c33c34f21 purchase complete notification, contextual wishlist active, fulfillment in signal handler 2013-08-22 14:30:56 -04:00
eric f93fe51e29 days_per_copy properties 2013-08-22 14:23:47 -04:00
eric 3bdb755419 move constant to params file to improve import 2013-08-22 14:22:54 -04:00
eric 159ad0db05 fix tests, fix bugs found by tests 2013-08-20 01:01:36 -04:00
eric 18c836d6cd connect purchases to the new Acq table which records purchases 2013-08-19 22:54:43 -04:00
eric 26c4d522b4 made the cc_date and test consistent whether its a date or a datetime 2013-08-19 16:01:32 -04:00
eric 94eb6aeab0 Demphasize "wishes" on the website in preparation for B2U 2013-08-18 18:10:25 -04:00
eric d5b9f88380 move "extra data" into a json field dict to improve payment code tidieness
need to install jsonfield
note: this is https://bitbucket.org/schinckel/django-jsonfield
I tried https://github.com/bradjasper/django-jsonfield but it was not
compatible with South
2013-08-18 15:21:55 -04:00
eric bf5dcd688a fix some date comparison code to get tests to pass 2013-08-18 15:18:01 -04:00
eric 52e58daa20 move some code to indicate it's not being maintained 2013-08-18 15:16:15 -04:00
eric c88f8165ba Merge branch 'master' into ebook_selling 2013-08-16 15:50:24 -04:00
eric 837de35375 selling now works up to purchase page 2013-08-16 15:49:44 -04:00
eric b05b622609 not all records have 050 and 082; code for 082 was putting call number in Dewey! 2013-08-12 17:22:24 -04:00
eric 2c06139a6f make dollar/day a float validate cc_date_initial, max target prevent changes after launch 2013-08-10 16:29:58 -04:00
eric 7f325c0775 Finish B2U Campaign setup 2013-08-09 19:00:54 -04:00
eric 75c32569e2 B2U campaign percentages 2013-08-08 22:32:58 -04:00