Thomas Steen Rasmussen
|
024f5dd093
|
this was probably what it was meant to be
|
2019-07-30 01:46:27 +02:00 |
|
 Víðir Valberg Guðmundsson
|
2c8f04a9a0
|
Merge pull request #361 from bornhack/backoffice_invoice_scanning
Save ticket tokens to db. Rename some fields to make using tickets more sane. Initial scanning of tickets.
|
2019-07-29 22:41:37 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
55860efb8c
|
Add create tickets action for orders.
|
2019-07-29 22:32:49 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
7a2127d1ff
|
Make it easier to set ticket type for products.
|
2019-07-29 21:31:07 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
b7feb96c9b
|
Adding a badge token to tickets that grant that.
|
2019-07-24 21:08:36 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
04d858adf3
|
Merge branch 'master' into backoffice_invoice_scanning
|
2019-07-23 21:55:31 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
2627055077
|
Fix tests.
|
2019-07-23 21:15:19 +02:00 |
|
|
Thomas Steen Rasmussen
|
ca0ed4fb27
|
redirect back to shop after adding something to an order, and make link to shopping cart bigger
|
2019-07-21 16:27:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
8de597d5e5
|
better wording on bank transfer page
|
2019-07-21 15:55:14 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
cad3b21fc4
|
handed_out -> ticket_generated
|
2019-07-18 21:20:29 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
b1b810f165
|
Rename handed_out field on ORP to ticket_generated. Rename checked_in on tickets to used. Add save token migration.
|
2019-07-18 21:04:49 +02:00 |
|
|
Thomas Steen Rasmussen
|
9fc13e43bc
|
make some more room on the proforma invoice because multipage pdf generation is fucked right now
|
2019-07-18 11:09:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
881b0f4cf4
|
add the word Included to the VAT line on customorder invoices
|
2019-07-11 08:02:04 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
24c95a82fd
|
Don't empty out comment and invoice address when closing order.
|
2019-07-09 21:03:56 +02:00 |
|
|
Thomas Steen Rasmussen
|
928ab96437
|
also generate for instances where pdf is None (happens after instantiating a new)
|
2019-07-09 11:46:25 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
fa855fb69e
|
Add cancel and proforma buttons to review and pay template.
|
2019-07-09 10:59:03 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
3ba33649cb
|
Redirect to review if the order is closed but not paid. Also remove the option to remove products when the order is closed.
|
2019-07-09 10:46:30 +02:00 |
|
|
Thomas Steen Rasmussen
|
effd900b62
|
add proforma invoice support
|
2019-07-09 10:38:14 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
fef09baa3d
|
Make review and pay button save changes made to order. Also move shop related templates back into shop app.
|
2019-07-09 10:07:00 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
9adc2a878f
|
Add "review and pay" as a step in order payment. (#356)
|
2019-07-09 00:29:18 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
bf2f0c7898
|
Blackness.
|
2019-06-16 14:32:24 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
e78013c87c
|
Blackness.
|
2019-03-29 22:19:49 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
4aad051c72
|
More tests - and some blackness.
|
2019-03-29 22:06:52 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
e5e1443218
|
Running black.
|
2019-03-29 21:21:24 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
c69bf46255
|
Adding more tests, finding more errors - again!
|
2019-03-29 20:58:35 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
2ce2205bd3
|
Adding more tests, finding more errors.
|
2019-03-29 17:06:53 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
95dcba3fc3
|
Actually test this - it returnet False because the form was unbound.
|
2019-03-29 15:37:08 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
d65624e95b
|
Actually found and error by writing tests! Yay!
|
2019-03-29 15:21:55 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
26c2e492c3
|
Optimize tests a bit.
|
2019-03-29 12:15:15 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
32b4cdfbee
|
Adding test for ProductDetailView.
|
2019-03-29 11:49:04 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
b04e7235d9
|
Adding a test for the OrderProductRelationForm.
|
2019-03-29 11:19:31 +01:00 |
|
|
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 |
|