Commit graph

1007 commits

Author SHA1 Message Date
Thomas Steen Rasmussen 83563e8cb3 missing dispatch super() 2016-05-29 16:40:32 +02:00
Thomas Steen Rasmussen c5c53daa39 fix epay callback, and move some stuff around 2016-05-29 16:36:23 +02:00
Thomas Steen Rasmussen d3c65e1c23 self.get_object().pk please 2016-05-29 16:27:38 +02:00
Thomas Steen Rasmussen 8a0eaa0c0b forgot to include callback url in epay hash calculation 2016-05-29 16:23:24 +02:00
Thomas Steen Rasmussen 018723f27d syntax 2016-05-29 16:20:48 +02:00
Thomas Steen Rasmussen 916f1ed59f forgot to include the epay callback url in the form 2016-05-29 16:15:49 +02:00
Thomas Steen Rasmussen 3eaf9cec91 redirect to clean url after epay payment 2016-05-29 16:10:06 +02:00
Thomas Steen Rasmussen afc380343a fix block name in closing tag 2016-05-29 16:00:22 +02:00
Thomas Steen Rasmussen a53811b4c1 use a paymenttype independent order.get_cancel_url everywhere 2016-05-29 15:55:48 +02:00
Thomas Steen Rasmussen 283f4013a9 spacing 2016-05-29 15:55:25 +02:00
Thomas Steen Rasmussen c43b275494 wording on order detail page 2016-05-29 15:44:27 +02:00
Thomas Steen Rasmussen 21b1e2156f fix |truefalseicon filter 2016-05-29 15:35:14 +02:00
Thomas Steen Rasmussen 9e66a9c4c6 do not use django template code here 2016-05-29 15:25:49 +02:00
Thomas Steen Rasmussen ef53a8149b do not escape our html string 2016-05-29 15:21:55 +02:00
Thomas Steen Rasmussen af184cd671 order list styling 2016-05-29 15:18:36 +02:00
Thomas Steen Rasmussen 93fed32cad styling order list page 2016-05-29 15:16:29 +02:00
Thomas Steen Rasmussen d55de77201 styling order list page 2016-05-29 15:04:52 +02:00
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