Commit graph

2090 commits

Author SHA1 Message Date
Thomas Steen Rasmussen c7906a069b a bit of spacing 2016-05-29 14:49:47 +02:00
Thomas Steen Rasmussen 4b933f2a06 add more details to order list page 2016-05-29 14:48:57 +02:00
Thomas Steen Rasmussen a124911a44 forgot the url namespace prefix (again) 2016-05-29 14:33:41 +02:00
Thomas Steen Rasmussen b3f6131be4 working on shop 2016-05-29 14:28:47 +02:00
Thomas Steen Rasmussen 57e120c45f add link to previous orders to the shop frontpage 2016-05-29 14:04:46 +02:00
Thomas Steen Rasmussen 7eae7ee9ff migrations for previous commit 2016-05-29 13:24:12 +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 2e40dfb1d1 fix json path 2016-05-29 13:01:36 +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 7476679c3f register the new models in the admin 2016-05-29 12:54:02 +02:00
Thomas Steen Rasmussen 6e3accfc79 this field has been renamed 2016-05-29 12:50:25 +02:00
Thomas Steen Rasmussen c3fbc0aa7b migration 2016-05-29 12:48:31 +02:00
Thomas Steen Rasmussen e019b241e8 pass request to the url methods on Order 2016-05-29 12:40:36 +02:00
Thomas Steen Rasmussen 1cbd958327 working on order detail page 2016-05-29 12:37:14 +02:00
Thomas Steen Rasmussen f73ff466eb forgot () 2016-05-29 12:36:07 +02:00
Thomas Steen Rasmussen c36e9c6eb0 working on shop and coinify payment 2016-05-29 12:29:38 +02:00
Thomas Steen Rasmussen b938f1374b missing import 2016-05-29 12:10:51 +02:00
Thomas Steen Rasmussen 5df37d9f93 more work on coinify payment 2016-05-29 12:08:29 +02:00
Thomas Steen Rasmussen 490b01a4df change CoinifyRedirectView to a RedirectView with SingleObjectMixin 2016-05-29 11:52:20 +02:00
Thomas Steen Rasmussen ca3dd850b0 pk not orderid 2016-05-29 11:40:58 +02:00
Thomas Steen Rasmussen fd7ba26428 typo 2016-05-29 11:38:23 +02:00
Thomas Steen Rasmussen 1e42ddf7bf just use regular reverse here 2016-05-29 11:35:04 +02:00
Thomas Steen Rasmussen 7c24f93751 whitespace matters 2016-05-29 11:30:24 +02:00
Thomas Steen Rasmussen b97fcfc115 add coinify credentials to settings 2016-05-29 10:55:55 +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
Víðir Valberg Guðmundsson 35e1f68eae Boilerplate for law required stuff. 2016-05-19 11:20:20 +02:00
Thomas Steen Rasmussen 407c8c31c4 fix public category filtering 2016-05-17 21:55:09 +02:00
Thomas Steen Rasmussen 1b0a8019aa where did those quotes come from 2016-05-17 21:42:28 +02:00
Thomas Steen Rasmussen 42749bacd3 get category object 2016-05-17 21:24:04 +02:00
Thomas Steen Rasmussen 900bce6bc3 only show public categories 2016-05-17 21:10:01 +02:00
Thomas Steen Rasmussen 2303b175a0 add migration 2016-05-17 21:04:40 +02:00
Thomas Steen Rasmussen e5d78099cf move .public to category instead of product 2016-05-17 20:56:11 +02:00
Thomas Steen Rasmussen 17f17d18f7 return super dispatch 2016-05-17 20:42:02 +02:00
Thomas Steen Rasmussen b52be5af8c only show public products 2016-05-17 15:51:25 +02:00
Thomas Steen Rasmussen f5e05ac51c make epay callback code handle multiple callbacks for the same order (happens sometimes) 2016-05-17 15:35:28 +02:00
Thomas Steen Rasmussen 9ff4be7272 first steps towards an invoice worker 2016-05-17 15:31:41 +02:00
Thomas Steen Rasmussen 2ed981776f add migration 2016-05-17 15:15:30 +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 adfca40062 rename file, typo 2016-05-17 08:38:02 +02:00
Thomas Steen Rasmussen 562314caed move a few more checks to mixins 2016-05-17 08:34:54 +02:00
Thomas Steen Rasmussen 01779363d5 this code is no longer needed, the mixin checks if the order is paid 2016-05-17 08:27:13 +02:00
Thomas Steen Rasmussen f06a8c76c3 add a mixin to use when we want to make sure an order is unpaid 2016-05-17 08:21:59 +02:00
Thomas Steen Rasmussen ffedb8327d missing import 2016-05-17 08:15:14 +02:00
Thomas Steen Rasmussen f934cbf0aa convert to int, print a warning if we receive a wrong amount from epay 2016-05-17 08:13:00 +02:00
Thomas Steen Rasmussen ded056baf0 fix __str__ method for epaycallback 2016-05-17 08:08:30 +02:00