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 |
|
Thomas Steen Rasmussen
|
8644d4ba2f
|
Coinify multiinvoice fix (#126)
* rework coinify api stuff, work in progress
* fix imports
* indentation
* rework coinify api stuff, work in progress
* fix imports
* indentation
|
2017-05-22 18:03:09 +02:00 |
|
|
Stephan Telling
|
469b708782
|
Merge pull request #124 from bornhack/emailworker
add emailworker for async emails
|
2017-05-21 22:37:56 +02:00 |
|
|
Stephan Telling
|
46cf9c53f7
|
verify invoice emails gets added to the queue and fix names
|
2017-05-21 20:43:05 +02:00 |
|
|
Stephan Telling
|
febecc137d
|
rename send email to add email and log on error
|
2017-05-21 20:15:27 +02:00 |
|
|
Stephan Telling
|
098b6ea83c
|
update invoiceworker to reflect the new email system
Also removes some comments (for consistency) and some unused imports
|
2017-04-30 12:36:03 +02:00 |
|
|
Stephan Telling
|
a8eb0ffe97
|
use filefield for email attachments, add logging for emailworker
|
2017-04-30 11:32:49 +02:00 |
|
|
Stephan Telling
|
16eb7cf594
|
use os.path.join to create paths for pdf files
|
2017-04-30 11:28:10 +02:00 |
|
|
Stephan Telling
|
2bab46050f
|
fix spelling in invoice_email, your -> you
|
2017-04-28 08:29:04 +02:00 |
|
|
Stephan Telling
|
49d4f74472
|
redo email for shop and edd email for team app
|
2017-04-18 20:46:57 +02:00 |
|
|
Thomas Steen Rasmussen
|
cc771d20f1
|
only show creditnotes belonging to the logged in user
|
2017-04-14 15:36:41 +02:00 |
|
|
Thomas Steen Rasmussen
|
43c0ce5882
|
encode before hashing
|
2017-04-11 08:33:52 +02:00 |
|
|
Thomas Steen Rasmussen
|
29eda9999f
|
remove unused code frm another project
|
2017-04-11 08:33:17 +02:00 |
|
|
Thomas Steen Rasmussen
|
2550b99b2b
|
encode to utf8 before hashing
|
2017-04-11 08:19:18 +02:00 |
|
|
Thomas Steen Rasmussen
|
6288cfd9df
|
remove 2016 from coinify messages
|
2017-04-08 11:58:29 +02:00 |
|
|
Thomas Steen Rasmussen
|
63a10d3af1
|
encode, decode, do something to make this work
|
2017-04-08 11:41:36 +02:00 |
|
|
Thomas Steen Rasmussen
|
7506326cd7
|
decode the utf8 encoded body to a unicode string before passing it on
|
2017-04-08 11:28:08 +02:00 |
|
|
Thomas Steen Rasmussen
|
0d5d6dc31e
|
str() not neccesary here
|
2017-04-08 11:09:54 +02:00 |
|
|
Thomas Steen Rasmussen
|
8a318400ae
|
changed the wrong model :(
|
2017-04-08 11:04:39 +02:00 |
|
|
Thomas Steen Rasmussen
|
e4e5688e3c
|
permit blank payload in callbacks
|
2017-04-08 10:55:40 +02:00 |
|
|
Thomas Steen Rasmussen
|
e5215830b0
|
catch anything here
|
2017-04-08 10:50:51 +02:00 |
|
|
Thomas Steen Rasmussen
|
1b98c01f63
|
improved error handling, always save callback body, various fixes
|
2017-04-03 18:00:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
c90837a8f0
|
json.loads wants strings
|
2017-04-02 21:55:14 +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
|
3f9fd744ee
|
reenable epay payments
|
2017-04-02 17:04:20 +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
|
b4bfd82174
|
remove print from shop_tags.py
|
2017-03-27 18:12:59 +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
|
850de5554f
|
fix customer comment error when changing payment method for an order with empty comment
|
2017-03-26 10:15:54 +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
|
5ef381f973
|
move coinify vendor stuff to a submodule
|
2017-03-24 01:58:04 +01:00 |
|
|
Thomas Steen Rasmussen
|
8202d3fdb1
|
fixup the order detail page a bit
|
2017-03-24 01:55:09 +01:00 |
|
|
Thomas Steen Rasmussen
|
eac9cbfa1e
|
permit blank
|
2017-03-23 20:21:19 +01:00 |
|
|
Thomas Steen Rasmussen
|
171553677c
|
fixup logging
|
2017-03-23 18:32:13 +01:00 |
|
|
Thomas Steen Rasmussen
|
4f61a95d83
|
refactor invoiceworker to be run by uwsgi, support graceful shutdown, and support reloading code without exiting
|
2017-03-21 13:35:00 +01:00 |
|