Víðir Valberg Guðmundsson
20f380dfd6
Planked code form betterforms. (Aka django 3.0 upgrade) ( #436 )
...
* Bump django from 2.2.8 to 3.0.2 in /src/requirements
Bumps [django](https://github.com/django/django ) from 2.2.8 to 3.0.2.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/2.2.8...3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Planked code form betterforms.
* Remove betterform from requirements.
* Try with master of django-allauth-2fa.
* Use static templatetag library, staticfiles is gone.
* Use newly released django-allauth-2fa 0.8 instead of git url.
* Django 3.0.3 is out.
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-02-07 18:21:34 +01:00
Víðir Valberg Guðmundsson
04d858adf3
Merge branch 'master' into backoffice_invoice_scanning
2019-07-23 21:55:31 +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
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
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
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
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
Thomas Flummer
95cd376f36
added danish bank transfer info ( #281 )
...
fixes issue #237
2018-11-20 00:19:32 +01: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
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
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
193c182422
Add stock_amount to product and reflect it in product detail template. ( #213 )
2018-04-21 17:00:39 +02:00
Stephan Telling
f047deba76
place card btn in proper div
2018-01-07 16:43:11 +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
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
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
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
Thomas Steen Rasmussen
4c621aed4b
make it possible to have customorders and invoices without Danish VAT
2017-09-14 21:02:59 +02:00
Stephan Telling
984b82ba11
update tickets app with list and detail views
...
Also this commit allows users to download their ticket as PDF.
2017-08-19 22:06:32 +02:00
Thomas Steen Rasmussen
8f352d8191
put tickets page under maintenance for now
2017-08-19 12:48:54 +02:00
Stephan Telling
d38d6ce66a
Merge branch 'master' of github.com:bornhack/bornhack-website
2017-07-08 20:17:40 +02:00
Stephan Telling
1cea9cf4a4
wrap text about foreign payments in alert class
2017-07-08 20:14:14 +02:00
Víðir Valberg Guðmundsson
2c5815982c
Make product categories clickable.
2017-07-08 17:48:10 +02:00
Stephan Telling
f2ad740ca2
fix #125
2017-05-23 23:15:31 +02:00
Stephan Telling
2bab46050f
fix spelling in invoice_email, your -> you
2017-04-28 08:29:04 +02:00
Thomas Steen Rasmussen
3f69d8521e
show if a ticket is used or not
2017-04-02 21:40:44 +02:00
Thomas Steen Rasmussen
529be396f4
fixup the shop to work in the new multicamp world, fix pdf generation, add new letterhead templates, rework invoiceworker into a generic worker runner
2017-03-28 00:12:11 +02:00
Stephan Telling
079ea6b2b8
add rough euro prices to the shop. fix #32
2017-03-26 13:57:00 +02:00
Thomas Steen Rasmussen
27e5fcc407
a few more changes to order_detail.html template, and import fixed py3 version of coinify api
2017-03-24 03:01:28 +01:00
Thomas Steen Rasmussen
8202d3fdb1
fixup the order detail page a bit
2017-03-24 01:55:09 +01:00
Thomas Steen Rasmussen
0ff37bbca5
move code to src/ folder
2017-01-30 12:06:49 +01:00
Víðir Valberg Guðmundsson
