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

1308 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Steen Rasmussen c676abd5cf add missing request argument 2018-01-07 17:36:44 +01:00
Víðir Valberg Guðmundsson f8379e2fda
Merge pull request #196 from bornhack/feature/improve_shop_product_admin 
Erhm...
 2018-01-07 17:25:20 +01:00
Víðir Valberg Guðmundsson 61f7e43bdb Erhm... 2018-01-07 17:20:45 +01:00
Stephan Telling 914c4e456e
Merge pull request #195 from bornhack/feature/improve_shop_product_admin 
Woops, available_in can be null
 2018-01-07 17:16:49 +01:00
Víðir Valberg Guðmundsson 19963db102 Woops, available_in can be null 2018-01-07 17:15:03 +01:00
Víðir Valberg Guðmundsson eb4a038019
Merge pull request #194 from bornhack/fix-card-btn 
place card btn in proper div
 2018-01-07 16:45:33 +01:00
Stephan Telling f047deba76
place card btn in proper div 2018-01-07 16:43:11 +01:00
Stephan Telling 84f187709b
Merge pull request #193 from bornhack/feature/improve_shop_product_admin 
Adding search and improve stuff on shop product admin.
 2018-01-07 16:00:13 +01:00
Víðir Valberg Guðmundsson 8e81a04b38
Merge pull request #192 from bornhack/reenable-cardpayment 
reenable cardpayment
 2018-01-07 15:58:42 +01:00
Víðir Valberg Guðmundsson 004be0a834 Adding search and improve stuff on shop product admin. 2018-01-07 15:56:52 +01:00
Stephan Telling 590bf9fa65
reenable cardpayment 2018-01-07 15:55:32 +01:00
Thomas Steen Rasmussen a0c646e1cf polish backoffice part 2 2017-12-12 22:48:45 +01:00
Benjamin Bach ecdc62df7c Add IBAN/SWIFT to custom invoices, bank name in settings - fixes #172 (#187) 2017-12-12 22:16:06 +01:00
Stephan Telling 93a827bf7e mark orders as paid in bootstrap script (#189) 
they are marked as payed such that tickets are generated so we can
design the backoffice$
 2017-12-12 22:13:38 +01:00
Thomas Steen Rasmussen 8595377066 rework backoffice part 1; ticket checkin and badge handout views still need some work 2017-12-12 21:57:17 +01:00
Thomas Steen Rasmussen 0806ff138e typo 2017-12-04 10:49:24 +01:00
Thomas Steen Rasmussen 74729ade14 fixup backoffice handout view a bit 2017-12-04 10:43:25 +01:00
Víðir Valberg Guðmundsson 6a082e6b58 Lower the percentage for camp redirect. 2017-11-25 14:54:34 +01:00
Víðir Valberg Guðmundsson d8e7ad2d17 Loewr the percentage for camp redirect. 2017-11-25 14:48:46 +01:00
Víðir Valberg Guðmundsson 22da1cd268 Only responsible people should see the edit task button. 2017-11-25 13:26:09 +01:00
Thomas Steen Rasmussen 4dab2c1a4f create and edit tasks 2017-11-25 13:02:32 +01:00
Víðir Valberg Guðmundsson c20771da8a Fixed some stuff for ya' @tykling 2017-11-24 22:19:17 +01:00
Thomas Steen Rasmussen f725a5c941 more work on tasks 2017-11-24 22:06:23 +01:00
Stephan Telling d028c16966
add teamtasks in bootstrap script 2017-11-24 17:40:10 +01:00
Thomas Steen Rasmussen 142afa5ead add teamtask support 2017-11-23 23:09:14 +01:00
Víðir Valberg Guðmundsson d4265edaa0 Remove docker compose setup, not working optimal. Might return later. 2017-11-23 21:47:10 +01:00
Thomas Steen Rasmussen 2e4a44271d filter unpaid, cancelled and refunded orders from backoffice view 2017-11-23 08:35:30 +01:00
Thomas Steen Rasmussen adbf1f4280 a few more changes to the shop order detail page related to 2017 merch batch 2 sale 2017-11-22 01:10:44 +01:00
Thomas Steen Rasmussen ead22bc0a7 disable credit card payments for now 2017-11-21 18:50:52 +01:00
Thomas Steen Rasmussen 40a76fa986 show in t&c that we only permit card payments on some products 2017-11-14 15:57:55 +01:00
Víðir Valberg Guðmundsson 1d4cfe7927
Merge pull request #182 from bornhack/docker-compose 
Docker compose
 2017-11-05 18:07:31 +01:00
Víðir Valberg Guðmundsson 3e55c1dc8d Update readme. 2017-11-05 17:48:21 +01:00
Víðir Valberg Guðmundsson e514df89f2 Adding run target to the Makefile. 2017-11-05 17:46:26 +01:00
Víðir Valberg Guðmundsson c3ebb6ebd3 Make sure that the enviroment_setting.py file is there. 2017-11-05 17:41:37 +01:00
Víðir Valberg Guðmundsson 44d2ce22ab Got the site up running using docker-compose. Also added a Makefile for convenience. 2017-11-05 17:26:20 +01:00
Stephan Telling 8b25a4ceb4
fix #169 2017-11-05 17:14:34 +01:00
Stephan Telling eb9f531b77
fix #165 2017-11-05 16:13:50 +01:00
Stephan Telling 5dd4eaf7f1
fix #170 2017-11-05 15:29:23 +01:00
Thomas Steen Rasmussen e957942181 remove old has_tickets context_processors 2017-10-04 00:25:19 +02:00
Thomas Steen Rasmussen 66014811a4 remove the old Ticket model, move irc notification signal handler to the new Tickets app, various cleanup, fixes #168 2017-10-04 00:06:49 +02:00
Thomas Steen Rasmussen e0e65212bc mark orderproductrelations as handed_out=True when Ticket objects have been created 2017-10-03 23:45:22 +02:00
Thomas Steen Rasmussen c914c23117 add datatables.net jquery table plugin to infodesk page 2017-10-03 23:09:11 +02:00
Thomas Steen Rasmussen 803c8c7ff3 Backoffice first steps + add 403.html (#173) 
* start working on backoffice

* add 403.html
 2017-10-03 21:14:07 +02:00
Vidir Valberg Gudmundsson a4930af92a Removed svgs (which are now in assets repo). 2017-10-01 16:56:36 +02:00
Thomas Steen Rasmussen 7eb8d2d6d2 copy paste error 2017-09-17 15:27:47 +02:00
Thomas Steen Rasmussen d14d67496d add danish_vat field to creditnote model and template 2017-09-17 15:00:38 +02:00
Thomas Steen Rasmussen 0064d69d90 maintain linebreaks in customer info in credit notes 2017-09-17 14:40:05 +02:00
Thomas Steen Rasmussen 88cb7934c1 only send to customer for credit notes linked to a user object 2017-09-17 14:32:21 +02:00
Thomas Steen Rasmussen c0f2478819 add customer field to credit notes for when they are not related to a user directly 2017-09-17 14:20:21 +02:00
Vidir Valberg Gudmundsson 7cf8085829 Fix #161. 2017-09-16 21:29:44 +02:00