 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 |
|
|
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
|
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 |
|
|
Thomas Steen Rasmussen
|
c2cfc0cdb4
|
add updated to list view
|
2017-09-14 22:58:45 +02:00 |
|
|
Thomas Steen Rasmussen
|
21184c9c67
|
add created and updated to order list and detail
|
2017-09-14 22:52:08 +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
|
13efe137b8
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-08-19 23:17:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
a07e74180e
|
redo migrations for Tickets app again, fix BaseTicket to be abstract
|
2017-08-19 22:22:54 +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
|
410905f3ce
|
redo migrations completely
|
2017-08-19 21:33:13 +02:00 |
|
|
Thomas Steen Rasmussen
|
8f352d8191
|
put tickets page under maintenance for now
|
2017-08-19 12:48:54 +02:00 |
|
|
Stephan Telling
|
eac39352cd
|
move generate_pdf_letter func to utils app
|
2017-08-17 18:38:25 +02:00 |
|
|
Stephan Telling
|
ee8c9cf01c
|
mend
|
2017-08-17 17:53:45 +02:00 |
|
|
Stephan Telling
|
5eedb8ff03
|
update INSTALLED_APPS. add ticket_type and re-add old Ticket model
also updates bootstrap script with ticket_type
|
2017-08-17 17:52:22 +02:00 |
|
|
Stephan Telling
|
c04838377b
|
remove imports and ticket class from shop
|
2017-08-15 14:19:06 +02:00 |
|
|
Thomas Steen Rasmussen
|
a4b618a269
|
make admin listing of custom orders more nice
|
2017-08-08 13:27:12 +02:00 |
|
|
Thomas Steen Rasmussen
|
1f89ff986c
|
round vat to 2 decimals
|
2017-08-08 13:26:58 +02:00 |
|
|
Thomas Steen Rasmussen
|
87da054985
|
better message
|
2017-07-19 14:42:46 +02:00 |
|
|
Thomas Steen Rasmussen
|
57f90ec1ce
|
fix irc message with ticket stats
|
2017-07-19 14:38:55 +02:00 |
|
|
Thomas Steen Rasmussen
|
79f240d4d1
|
settings is not a dict
|
2017-07-12 17:05:27 +02:00 |
|
|
Thomas Steen Rasmussen
|
974b90676e
|
make coinify callback hostname configurable, so we can workaround old openssl in their callback engine
|
2017-07-11 11:06:46 +02:00 |
|
|
Thomas Steen Rasmussen
|
2e13525ad7
|
only mark as paid if not already paid (aka. dont create tickets again if we see a double callback)
|
2017-07-11 07:31:15 +02:00 |
|
|
Thomas Steen Rasmussen
|
ec120bca39
|
only pass the invoicejson not the whole thing
|
2017-07-11 07:16:51 +02:00 |
|
|
Thomas Steen Rasmussen
|
fe3e2b3d0a
|
callbackobject.payload not invoicejson
|
2017-07-11 07:11:02 +02:00 |
|
|
Thomas Steen Rasmussen
|
69074d6496
|
another missing import
|
2017-07-11 07:06:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
1d23989df1
|
pass order to save_coinify_callback
|
2017-07-11 07:02:17 +02:00 |
|
|
Thomas Steen Rasmussen
|
588a36ee56
|
missing import
|
2017-07-11 06:57:39 +02:00 |
|
|
Thomas Steen Rasmussen
|
55316e1bd0
|
missing import
|
2017-07-11 06:54:15 +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 |
|
|
Thomas Steen Rasmussen
|
6c43e59371
|
send stats in seperate message, and shorten the ticket names a bit, and disable 1day tickets for now
|
2017-07-03 22:22:35 +02:00 |
|
|
Thomas Steen Rasmussen
|
5c689e4076
|
queue an irc message when we sell a ticket
|
2017-07-03 19:28:50 +02:00 |
|
|
Thomas Steen Rasmussen
|
4d9663123a
|
add coinifyapiinvoice property to order model
|
2017-06-20 09:02:13 +02:00 |
|
|
Thomas Steen Rasmussen
|
e839396d40
|
right, tempinvoice
|
2017-06-20 00:18:57 +02:00 |
|
|
Thomas Steen Rasmussen
|
cc874cdbb8
|
loop over invoices to check if they expired
|
2017-06-20 00:13:37 +02:00 |
|
|
Thomas Steen Rasmussen
|
3010033b75
|
pass request to create_coinify_invoice()
|
2017-06-19 23:52:01 +02:00 |
|
|
Thomas Steen Rasmussen
|
45a5f58ddf
|
add missing import
|
2017-06-19 23:46:52 +02:00 |
|
|
Stephan Telling
|
f2ad740ca2
|
fix #125
|
2017-05-23 23:15:31 +02:00 |
|
|
Thomas Steen Rasmussen
|
26a8a9d70d
|
quote key
|
2017-05-22 21:11:06 +02:00 |
|
|
Thomas Steen Rasmussen
|
36d3d6d3bf
|
json fun
|
2017-05-22 21:00:52 +02:00 |
|
|
Thomas Steen Rasmussen
|
6b42358ad6
|
fix json saves
|
2017-05-22 20:52:00 +02:00 |
|
|
Thomas Steen Rasmussen
|
cd59f9cf4b
|
add CoinifyAPIRequest to admin
|
2017-05-22 20:45:22 +02:00 |
|
|
Thomas Steen Rasmussen
|
475efc08fb
|
kwargs not invoicedict
|
2017-05-22 20:20:12 +02:00 |
|
|
Thomas Steen Rasmussen
|
9e5626ddf1
|
missing import
|
2017-05-22 20:12:37 +02:00 |
|
|
Thomas Steen Rasmussen
|
e2ba7c84a3
|
add missing argument
|
2017-05-22 20:03:41 +02:00 |
|
|
Thomas Steen Rasmussen
|
916fde4a4d
|
switch to jsonfield
|
2017-05-22 19:42:20 +02:00 |
|
|
Thomas Steen Rasmussen
|
1b27145ecb
|
some changes to models.py got lost somehow
|
2017-05-22 19:41:08 +02:00 |
|