reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity
271 commits 2 branches 0 tags 164 MiB
Commit graph

48 commits

Author SHA1 Message Date
Thomas Steen Rasmussen 3b7ae7c0b6 missing import 2016-05-31 07:43:51 +02:00
Thomas Steen Rasmussen 52f9246ffb invoice styling 2016-05-31 07:42:01 +02:00
Thomas Steen Rasmussen ed79b8f73a misc. invoice fixes 2016-05-31 06:51:42 +02:00
Víðir Valberg Guðmundsson 3c52b4080e Name is not required. 2016-05-31 01:02:47 +02:00
Víðir Valberg Guðmundsson aa3a3c0428 List and display tickets (close #6) 2016-05-31 00:58:50 +02:00
Víðir Valberg Guðmundsson a4b578642d Adding Commonmark and a template tag for that. We're going to use it in the shop app as well, so it's in its own app now (utils). 2016-05-30 21:52:01 +02:00
Thomas Steen Rasmussen a91ed3bc5c working on invoice upload stuff 2016-05-30 20:15:39 +02:00
Thomas Steen Rasmussen 2fdfacc4d7 switch to using a filefield to save the invoice pdf 2016-05-30 19:49:44 +02:00
Thomas Steen Rasmussen 3e80c51572 add __str__ method for Order model 2016-05-30 17:32:53 +02:00
Thomas Steen Rasmussen 935af5f188 commit a bunch of invoice related stuff - generate pdf invoice, save to archive, email to customer 2016-05-30 16:58:55 +02:00
Thomas Steen Rasmussen aba0596252 show order in __str__ on coinifyapicallback model 2016-05-29 19:55:07 +02:00
Thomas Steen Rasmussen 59a66107bb rename CoinfyCallback model to CoinifyAPICallback 2016-05-29 19:33:26 +02:00
Thomas Steen Rasmussen be13ccdf78 ordering is a list 2016-05-29 18:02:12 +02:00
Thomas Steen Rasmussen 15ceea3f5a show orders with newest at the top 2016-05-29 17:49:37 +02:00
Thomas Steen Rasmussen b3f6131be4 working on shop 2016-05-29 14:28:47 +02:00
Thomas Steen Rasmussen 131aa96690 save all coinify callbacks, even the invalid ones; also save headers 2016-05-29 13:20:51 +02:00
Thomas Steen Rasmussen bb85b77841 define coinify cancel url in the api call, rename cancel url method on Order 2016-05-29 13:00:00 +02:00
Thomas Steen Rasmussen c36e9c6eb0 working on shop and coinify payment 2016-05-29 12:29:38 +02:00
Thomas Steen Rasmussen 07d74878c5 working on coinify payments 2016-05-29 10:43:38 +02:00
Thomas Steen Rasmussen 6016a6b605 Merge remote-tracking branch 'origin/feature/tickets' into feature/tickets 
# Conflicts:
#	shop/models.py
#	shop/urls.py
 2016-05-25 22:53:02 +02:00
Thomas Steen Rasmussen 9387b8bdc4 working on coinify payments 2016-05-25 22:48:02 +02:00
Víðir Valberg Guðmundsson c0045177aa Marking an Order as paid should generate Tickets 2016-05-25 20:05:31 +02:00
Víðir Valberg Guðmundsson ff4f42bbdc Adding Ticket model to be able to discern tickets from products. 2016-05-25 19:13:45 +02:00
Thomas Steen Rasmussen e5d78099cf move .public to category instead of product 2016-05-17 20:56:11 +02:00
Thomas Steen Rasmussen 8a653265cc add Invoice model 2016-05-17 15:09:40 +02:00
Thomas Steen Rasmussen 9cce10c281 add public field to Product 2016-05-17 15:09:31 +02:00
Thomas Steen Rasmussen ded056baf0 fix __str__ method for epaycallback 2016-05-17 08:08:30 +02:00
Thomas Steen Rasmussen 8eb943c877 fix ordering and __str__ methods for epaycallback model 2016-05-17 08:04:53 +02:00
Thomas Steen Rasmussen ff6af58eda more work on epay callback - add md5valid field to callback model 2016-05-17 07:59:42 +02:00
Thomas Steen Rasmussen 089185f38c re-add get_absolute_url method for order 2016-05-17 07:21:22 +02:00
Thomas Steen Rasmussen dd292c22c7 remember namespace prefixes on reverse() calls 2016-05-17 07:15:10 +02:00
Thomas Steen Rasmussen 0e3fe85dfe working on epay payment 2016-05-17 07:06:25 +02:00
Thomas Steen Rasmussen 96582c93ae tell epay to send the user to our thanks url after payment 2016-05-16 21:45:34 +02:00
Thomas Steen Rasmussen 5a5efbe69a remember namespace prefix for reverse() lookups 2016-05-16 17:23:53 +02:00
Thomas Steen Rasmussen a49168e95c dk vat is 25% - but only 20% of an amount including vat is vat :) 2016-05-16 17:11:48 +02:00
Thomas Steen Rasmussen ba01e103a3 missing import; use reverse_lazy 2016-05-16 17:11:07 +02:00
Thomas Steen Rasmussen 5be92b46ff add missing get_absolute_url() for Order model 2016-05-16 16:54:11 +02:00
Víðir Valberg Guðmundsson f4be670301 No need for subtotal 2016-05-16 16:20:15 +02:00
Víðir Valberg Guðmundsson bee6a65ede Prices are with VAT, turning the calculation around. 2016-05-16 16:14:16 +02:00
Víðir Valberg Guðmundsson 9eefc6bdfd Adding subtotal, VAT and total to order. Also redirect to shop index if there are no products. 2016-05-16 16:09:25 +02:00
Víðir Valberg Guðmundsson 373a4cf65b Editing of an order (remove/update products) 2016-05-16 15:44:03 +02:00
Víðir Valberg Guðmundsson c45a3aa8c9 Getting there! 2016-05-16 00:09:00 +02:00
Víðir Valberg Guðmundsson 326e9d70cd Adding cart with number of items in order to menu 2016-05-14 19:42:25 +02:00
Thomas Steen Rasmussen 1f67035740 forgot to add finalized field to model 2016-05-13 08:37:47 +02:00
Thomas Steen Rasmussen b942d674ef more work on shop 2016-05-13 08:36:56 +02:00
Thomas Steen Rasmussen 82ae2b8c23 more work on shop 2016-05-12 19:08:54 +02:00
Thomas Steen Rasmussen 7955bdfae1 rename to blockchain instead of altcoin 2016-05-11 08:37:39 +02:00
Víðir Valberg Guðmundsson 5cfcf13e7d We don't only operate on tickets - renaming and refactoring accordingly 2016-05-10 22:20:01 +02:00
Renamed from tickets/models.py (Browse further)