Commit graph

149 commits

Author SHA1 Message Date
Víðir Valberg Guðmundsson 863e089c2b Fix tests. 2019-03-27 23:45:08 +01:00
Víðir Valberg Guðmundsson f708864d14 Bah. 2019-03-27 23:39:42 +01:00
Víðir Valberg Guðmundsson ce4a744da6 No need for this. 2019-03-27 23:37:34 +01:00
Víðir Valberg Guðmundsson 4cbb25a537 Use OrderProductRelationForm to validate stock when adding a new product to order, also make it possible to update the quantity of a product on the product detail page if it is already in the current order. 2019-03-27 23:34:44 +01:00
Víðir Valberg Guðmundsson 59cde9163f Use a modelformset for the order detail view to be able to validate stock on updates of quantities and payment of the order. 2019-03-27 22:53:23 +01:00
Víðir Valberg Guðmundsson 101cb2db63 Check stock when incrementing orderproduct quantity. 2019-03-27 20:25:06 +01:00
Víðir Valberg Guðmundsson 8a5b2e5ed1 Add a worker to cancel old orders. 2019-03-27 13:49:46 +01:00
Víðir Valberg Guðmundsson 39383e0acb Check for orders which are cancelled=False instead of those who are paid to avoid "overselling". 2019-03-27 12:57:50 +01:00
Víðir Valberg Guðmundsson bda1d77275 Forgot about credit notes. 2019-03-26 21:39:44 +01:00
Víðir Valberg Guðmundsson 0b2075425e Keep view code in the respective apps, implement the template in the profiles app. 2019-03-26 21:22:54 +01:00
Víðir Valberg Guðmundsson 8fb9e60601 Add a safety valve for creating tickets when marking an order as paid. Fix #136 2019-03-17 16:28:01 +01:00
Víðir Valberg Guðmundsson 512be60da5 Products can not be handed out if order is not paid. Fix #284. 2019-03-17 15:31:15 +01:00
Thomas Steen Rasmussen a5e67fcb8c remove extra mark_as_cancelled method 2019-03-17 15:21:03 +01:00
Thomas Steen Rasmussen 481a7d1a95 add mass order cancel adminaction 2019-03-17 15:04:28 +01:00
Thomas Steen Rasmussen ad0368f486 make it possible to filter products by category and ticket type, and remove description from product list 2019-02-10 14:53:01 +01:00
Thomas Flummer 95cd376f36 added danish bank transfer info (#281)
fixes issue #237
2018-11-20 00:19:32 +01:00
Thomas Steen Rasmussen 2c1e5f12fe add textfield notes to Order for internal orga notes about the order 2018-08-27 12:44:53 +02:00
Thomas Steen Rasmussen f396708156 finish work on custom invoice address 2018-08-27 11:52:42 +02:00
Patrick Welzel 8b8191e16d add custom address field to shop.models.Order and invoice template 2018-08-22 15:41:24 +02:00
Víðir Valberg Guðmundsson b3ef1d7538 Add the ticket to the order admin. 2018-08-17 11:59:28 +02:00
Thomas Steen Rasmussen 6828807f2c forgot to rename variable one place 2018-07-26 21:06:00 +02:00
Thomas Steen Rasmussen 9517fb25ea pass request everywhere it is needed 2018-07-26 15:03:49 +02:00
Thomas Steen Rasmussen d3ba04b6f2 fix coinify callbacks by passing request argument to order.mark_as_paid() 2018-07-13 14:38:01 +02:00
Thomas Steen Rasmussen f5be4d68d1 info and shop should use the |trustedcommonmark filter 2018-06-04 08:28:09 +02:00
Thomas Steen Rasmussen bff5bb292e add debate as eventtype in bootstrap-devsite, and fix commonmark templatefilter a few places I missed 2018-06-03 16:29:28 +02:00
Thomas Steen Rasmussen 811b8171af working on #232, this commit changes backoffice to be camp specific (although many of the actual functions are camp independent). Add backoffice/mixins.py with BackofficeViewMixin to keep it DRY. Add backoffice views to manage proposals. Move SpeakerProposal and EventProposal detail template to includes to they can be used from backoffice. Rename our commonmark templatetags so the names are more intuitive. 2018-06-03 15:34:04 +02:00
Thomas Steen Rasmussen 18c33383b7 add url support for speakerproposals and eventproposals, including new models Url and UrlType. Also switch to Django 2.0 path() syntax in various urls.py files getting rid of a lot of ugly regex \o/ 2018-05-23 23:28:27 +02:00
Víðir Valberg Guðmundsson d8871b871f Merge remote-tracking branch 'origin/master' into add_tests_to_shop 2018-04-24 18:12:10 +02:00
Víðir Valberg Guðmundsson ac68daf0b6 Update admin. Fix some more tests. Add stock info to template. 2018-04-24 18:06:19 +02:00
Víðir Valberg Guðmundsson a250635132 Added the first tests to the project. Using factory_boy for great success. (#219) 2018-04-22 08:31:10 +02:00
Víðir Valberg Guðmundsson c9ae322025 Added the first tests to the project. Using factory_boy for great success. 2018-04-21 23:06:41 +02:00
Víðir Valberg Guðmundsson 193c182422 Add stock_amount to product and reflect it in product detail template. (#213) 2018-04-21 17:00:39 +02:00
Víðir Valberg Guðmundsson be7035594f Add created/updated to CreditNote and Invoice admins. Fix #199. 2018-04-15 17:29:24 +02:00
Víðir Valberg Guðmundsson aae3d7e3c9 Got channels2 working. 2018-04-03 20:52:39 +02:00
Víðir Valberg Guðmundsson ff758b15ff Initial work on uprading. 2018-04-03 18:44:10 +02:00
Thomas Steen Rasmussen 03fc20a459 add missing migrations after cleanup and adding of on_delete to all foreignkeys 2018-03-18 09:07:34 +01:00
Stephan Telling df5e167376
add on_delete to all foreignkeys 2018-03-04 16:26:35 +01:00
Stephan Telling 488767b4f0 cleanup in shop/ 2018-03-04 16:00:30 +01:00
Thomas Steen Rasmussen c676abd5cf add missing request argument 2018-01-07 17:36:44 +01:00
Víðir Valberg Guðmundsson 61f7e43bdb Erhm... 2018-01-07 17:20:45 +01:00
Víðir Valberg Guðmundsson 19963db102 Woops, available_in can be null 2018-01-07 17:15:03 +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 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
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 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 e957942181 remove old has_tickets context_processors 2017-10-04 00:25:19 +02:00