Commit graph

305 commits

Author SHA1 Message Date
Thomas Steen Rasmussen 9102796e6e only check if terms are checked when payment method buttons are used 2016-06-01 15:27:33 +02:00
Thomas Steen Rasmussen 809df2e952 a few t&c related tweaks 2016-06-01 15:20:42 +02:00
Thomas Steen Rasmussen 5672d00a2e add checkbox to accept t&c 2016-06-01 15:16:12 +02:00
Thomas Steen Rasmussen 4966624402 refer to general terms & conditions in the invoice for more info on order cancellation 2016-06-01 14:16:12 +02:00
Thomas Steen Rasmussen f108317031 styling legal stuff 2016-06-01 14:05:11 +02:00
Thomas Steen Rasmussen e3e72cd6a8 add a metric fuckton of legal stuff 2016-06-01 14:01:27 +02:00
Thomas Steen Rasmussen 0b4b7df2c0 use info@bornhack.dk 2016-06-01 12:50:12 +02:00
Thomas Steen Rasmussen 7acf2e5acd add danish bank account 2016-06-01 12:50:12 +02:00
Víðir Valberg Guðmundsson 1d768b6458 Oops 2016-06-01 11:11:24 +02:00
Víðir Valberg Guðmundsson 267a9e4986 Fix #26 2016-06-01 11:10:12 +02:00
Víðir Valberg Guðmundsson 181b7b34e9 Add reference number to bank_transfer.html 2016-06-01 10:40:13 +02:00
Víðir Valberg Guðmundsson 62f3f815d8 Add shop_tags to bank_transfer.html 2016-06-01 10:27:41 +02:00
Thomas Steen Rasmussen 4735efb660 shine up the bank order page a bit 2016-06-01 09:36:42 +02:00
Thomas Steen Rasmussen 3a73c96dd8 add bankaccount 2016-06-01 09:29:21 +02:00
Thomas Steen Rasmussen acb5d9c0da add a few debug lines 2016-06-01 01:30:05 +02:00
Thomas Steen Rasmussen ed54cde150 remove all the debug stuff, re-get object from db, see if that works 2016-06-01 01:25:14 +02:00
Thomas Steen Rasmussen 6379537b05 see if refresh_from_db() helps here 2016-06-01 01:16:32 +02:00
Thomas Steen Rasmussen 40c73e4c4f more sleep, more debug 2016-06-01 01:13:08 +02:00
Thomas Steen Rasmussen 8bb73c5536 no format string here 2016-06-01 01:03:32 +02:00
Thomas Steen Rasmussen 8d9d564e7e sleep 2 seconds, add debug output 2016-06-01 00:57:11 +02:00
Thomas Steen Rasmussen aefc1fc89c test if this is a timing issue 2016-05-31 23:58:34 +02:00
Víðir Valberg Guðmundsson 94b473b1dd Fix EnsureUserOwnsOrderMixin 2016-05-31 23:30:26 +02:00
Thomas Steen Rasmussen e56c301a90 tickets are generated instantly 2016-05-31 23:24:10 +02:00
Víðir Valberg Guðmundsson d3bc597f54 Adding invoice pdf link to Order admin 2016-05-31 23:23:15 +02:00
Thomas Steen Rasmussen 9203285299 invoice styling 2016-05-31 23:15:59 +02:00
Thomas Steen Rasmussen 50e5427d3d missing import 2016-05-31 23:15:33 +02:00
Thomas Steen Rasmussen 91f5c4b5f9 delete expired coinifyapiinvoice objects 2016-05-31 22:57:55 +02:00
Thomas Steen Rasmussen 2042313780 add __str__ method for coinifyapiinvoice model 2016-05-31 22:22:21 +02:00
Víðir Valberg Guðmundsson 3ac0740a78 Add id to order admin. Close #23 2016-05-31 22:15:56 +02:00
Thomas Steen Rasmussen 354384d12d really fix coinify callback code 2016-05-31 21:48:21 +02:00
Thomas Steen Rasmussen 8a354afcca fix coinify callback 2016-05-31 21:41:31 +02:00
Thomas Steen Rasmussen d57e89b5ae fix coinify callback 2016-05-31 21:19:40 +02:00
Víðir Valberg Guðmundsson 9e31be2f11 Cancellation of orders. Close #18 2016-05-31 21:02:16 +02:00
Thomas Steen Rasmussen 5e8d55d553 use IPN secret instead of API secret 2016-05-31 20:50:08 +02:00
Víðir Valberg Guðmundsson ef47fa96d4 Add price to product detail 2016-05-31 20:35:37 +02:00
Thomas Steen Rasmussen ce70df9918 covert to float before sending to coinify 2016-05-31 20:28:23 +02:00
Víðir Valberg Guðmundsson 8c60d476ec Fix #19 2016-05-31 19:55:33 +02:00
Víðir Valberg Guðmundsson 1cc6d08fed Right adjust price 2016-05-31 19:36:19 +02:00
Víðir Valberg Guðmundsson 385fb6f075 Don't slugify product names - we'll do it manually 2016-05-31 19:10:19 +02:00
Víðir Valberg Guðmundsson 30b86536a2 Make shop into a table. 2016-05-31 18:47:08 +02:00
Thomas Steen Rasmussen a7535753a8 do not crap out when anonymous user browses the site 2016-05-31 10:58:52 +02:00
Thomas Steen Rasmussen d2dd113bd1 invoice styling 2016-05-31 08:44:29 +02:00
Thomas Steen Rasmussen 80f0847e1b invoice styling 2016-05-31 08:39:42 +02:00
Thomas Steen Rasmussen 4fcb838ce8 invoice styling 2016-05-31 08:35:54 +02:00
Thomas Steen Rasmussen 7c11a06361 invoice styling 2016-05-31 08:31:27 +02:00
Thomas Steen Rasmussen b77898f4db this is not a block tag 2016-05-31 08:28:39 +02:00
Thomas Steen Rasmussen e85176dade invoice styling 2016-05-31 08:25:19 +02:00
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