Commit graph

258 commits

Author SHA1 Message Date
Thomas Steen Rasmussen 485f7311c5 bunch of nonsense 2016-05-31 08:19:42 +02:00
Thomas Steen Rasmussen bf9ad04fe6 missing import 2016-05-31 08:17:14 +02:00
Thomas Steen Rasmussen 50e7c9c0f3 copy/paste error 2016-05-31 08:12:25 +02:00
Thomas Steen Rasmussen 2a267c0f9f get order from invoice object 2016-05-31 08:10:13 +02:00
Thomas Steen Rasmussen 36293892d9 one more Decimal() conversion 2016-05-31 08:01:55 +02:00
Thomas Steen Rasmussen e77a089dc2 missing import 2016-05-31 07:53:00 +02:00
Thomas Steen Rasmussen cc1fd1d806 fun with data types 2016-05-31 07:47:18 +02:00
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 f8ed60f8b6 Remove "ticket", should be mentioned in the product name 2016-05-31 01:06:29 +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
Thomas Steen Rasmussen 093f9bddf9 .invoice.pdf 2016-05-31 00:00:57 +02:00
Thomas Steen Rasmussen 7936a931b1 fix invoice link 2016-05-30 23:58:22 +02:00
Thomas Steen Rasmussen ac5f31ef93 move watermark to the back please 2016-05-30 23:37:32 +02:00
Thomas Steen Rasmussen 65bb088095 working on invoice styling 2016-05-30 23:27:23 +02:00
Thomas Steen Rasmussen b417592baa set email sender to info@bornhack.dk 2016-05-30 23:13:52 +02:00
Thomas Steen Rasmussen 61b8c21572 add timestamps to invoice worker 2016-05-30 23:05:33 +02:00
Víðir Valberg Guðmundsson 0f6d8944a0 Adding content to the template might help 2016-05-30 22:57:15 +02:00
Víðir Valberg Guðmundsson 700b876fd3 Adding TicketListView 2016-05-30 22:50:43 +02:00
Víðir Valberg Guðmundsson 539b3ee105 Fix product detail template a bit for mobile. 2016-05-30 22:28:17 +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 ef1d306617 add download link for invoices to order list 2016-05-30 21:29:18 +02:00
Thomas Steen Rasmussen 065d3f8660 filter filefield by excluding '' 2016-05-30 21:09:07 +02:00
Thomas Steen Rasmussen 740b6276c1 fix order/invoice errors in invoice worker 2016-05-30 20:57:26 +02:00
Víðir Valberg Guðmundsson 8737c2f8ad Adding breadcrumbs 2016-05-30 20:56:16 +02:00
Thomas Steen Rasmussen 55fccf54fe attach file contents, not the file object 2016-05-30 20:50:39 +02:00
Thomas Steen Rasmussen 8a499ab6de missing import 2016-05-30 20:39:54 +02:00
Thomas Steen Rasmussen 0b4426b3d3 a few more fixes for the new invoice generation 2016-05-30 20:30:52 +02:00
Thomas Steen Rasmussen 23b1b5e350 migration for previous commit 2016-05-30 20:24:49 +02:00
Thomas Steen Rasmussen a91ed3bc5c working on invoice upload stuff 2016-05-30 20:15:39 +02:00
Víðir Valberg Guðmundsson 8981f0a387 Html design is hard... 2016-05-30 19:59:12 +02:00
Thomas Steen Rasmussen 2fdfacc4d7 switch to using a filefield to save the invoice pdf 2016-05-30 19:49:44 +02:00
Víðir Valberg Guðmundsson 475f996a02 Products should be viewable when not logged in. 2016-05-30 19:27:03 +02:00
Víðir Valberg Guðmundsson c214036c51 Doing previous orders button a bit more prominent 2016-05-30 19:27:03 +02:00
Thomas Steen Rasmussen f33470034d missing import 2016-05-30 18:41:25 +02:00
Thomas Steen Rasmussen a4dd75e5c8 open in binary mode when saving files to archive 2016-05-30 18:39:05 +02:00
Thomas Steen Rasmussen 349cc325d7 use print here, we are selfless 2016-05-30 18:35:55 +02:00
Thomas Steen Rasmussen da5b0f0f26 convert to int(), wrap in try/except 2016-05-30 18:18:31 +02:00
Thomas Steen Rasmussen 6f61220363 commit some more invoice stuff 2016-05-30 18:09:32 +02:00
Víðir Valberg Guðmundsson d8a1ec132b Use Order.mark_as_paid() in EpayCallbackView 2016-05-30 18:05:35 +02:00
Víðir Valberg Guðmundsson 02edd45b20 Fix #8 and layout of products 2016-05-30 18:03:54 +02:00
Thomas Steen Rasmussen 878e888219 missing imports 2016-05-30 17:33:02 +02:00
Thomas Steen Rasmussen 3e80c51572 add __str__ method for Order model 2016-05-30 17:32:53 +02:00
Thomas Steen Rasmussen e74783162f migration for previous commit 2016-05-30 17:32:43 +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 ff94193fcc fix saving of coinify callbacks 2016-05-29 19:53:56 +02:00
Thomas Steen Rasmussen eb04ee94b4 fix returns from coinifycallback 2016-05-29 19:47:44 +02:00
Thomas Steen Rasmussen a6b50c79fc add missing model to CoinifyCallbackView 2016-05-29 19:44:43 +02:00
Thomas Steen Rasmussen a46480c960 missing import 2016-05-29 19:42:10 +02:00
Thomas Steen Rasmussen d6d5ef4f84 migration for previous commit 2016-05-29 19:37:45 +02:00
Thomas Steen Rasmussen 59a66107bb rename CoinfyCallback model to CoinifyAPICallback 2016-05-29 19:33:26 +02:00
Thomas Steen Rasmussen daab6c4019 CoinifyCallback() only needs the secret 2016-05-29 19:29:06 +02:00
Thomas Steen Rasmussen 3c8a1427da move csrf_exempt decorator to dispatch() 2016-05-29 19:21:44 +02:00
Thomas Steen Rasmussen cf46544294 csrf exempt decorator on coinify callback view 2016-05-29 18:45:04 +02:00
Thomas Steen Rasmussen eb80287ded migration for previous commits 2016-05-29 18:27:41 +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 e98bd530e2 add model to epaycallbackview 2016-05-29 17:12:09 +02:00
Thomas Steen Rasmussen e1b87bf565 hm, revert these to detailview might fix this 2016-05-29 17:07:09 +02:00
Thomas Steen Rasmussen 1e2cfcf71d use TemplateView not View 2016-05-29 16:57:25 +02:00
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