Thomas Steen Rasmussen
|
3a02cb0035
|
whoopsie
|
2016-06-18 20:59:07 +02:00 |
|
|
Thomas Steen Rasmussen
|
c6d4c1edc3
|
commit creditnote stuff
|
2016-06-18 20:51:53 +02:00 |
|
|
Thomas Steen Rasmussen
|
c00dedb6d5
|
default to no payment method
|
2016-06-04 10:01:31 +02:00 |
|
|
Thomas Steen Rasmussen
|
7d679beae6
|
handle orders with no products
|
2016-06-04 09:49:22 +02:00 |
|
 Víðir Valberg Guðmundsson
|
e4585c8f7e
|
Mark order as closed when marking as paid. Add button to mark as paid.
|
2016-06-03 21:31:12 +02:00 |
|
|
Thomas Steen Rasmussen
|
0ed0a4d289
|
sort by price too
|
2016-06-01 18:42:26 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
267a9e4986
|
Fix #26
|
2016-06-01 11:10:12 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
d3bc597f54
|
Adding invoice pdf link to Order admin
|
2016-05-31 23:23:15 +02:00 |
|
|
Thomas Steen Rasmussen
|
91f5c4b5f9
|
delete expired coinifyapiinvoice objects
|
2016-05-31 22:57:55 +02:00 |
|
|
Thomas Steen Rasmussen
|
2042313780
|
add __str__ method for coinifyapiinvoice model
|
2016-05-31 22:22:21 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
385fb6f075
|
Don't slugify product names - we'll do it manually
|
2016-05-31 19:10:19 +02:00 |
|
|
Thomas Steen Rasmussen
|
485f7311c5
|
bunch of nonsense
|
2016-05-31 08:19:42 +02:00 |
|
|
Thomas Steen Rasmussen
|
bf9ad04fe6
|
missing import
|
2016-05-31 08:17:14 +02:00 |
|
|
Thomas Steen Rasmussen
|
50e7c9c0f3
|
copy/paste error
|
2016-05-31 08:12:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
36293892d9
|
one more Decimal() conversion
|
2016-05-31 08:01:55 +02:00 |
|
|
Thomas Steen Rasmussen
|
cc1fd1d806
|
fun with data types
|
2016-05-31 07:47:18 +02:00 |
|
|
Thomas Steen Rasmussen
|
3b7ae7c0b6
|
missing import
|
2016-05-31 07:43:51 +02:00 |
|
|
Thomas Steen Rasmussen
|
52f9246ffb
|
invoice styling
|
2016-05-31 07:42:01 +02:00 |
|
|
Thomas Steen Rasmussen
|
ed79b8f73a
|
misc. invoice fixes
|
2016-05-31 06:51:42 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
3c52b4080e
|
Name is not required.
|
2016-05-31 01:02:47 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
aa3a3c0428
|
List and display tickets (close #6)
|
2016-05-31 00:58:50 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
a4b578642d
|
Adding Commonmark and a template tag for that. We're going to use it in the shop app as well, so it's in its own app now (utils).
|
2016-05-30 21:52:01 +02:00 |
|
|
Thomas Steen Rasmussen
|
a91ed3bc5c
|
working on invoice upload stuff
|
2016-05-30 20:15:39 +02:00 |
|
|
Thomas Steen Rasmussen
|
2fdfacc4d7
|
switch to using a filefield to save the invoice pdf
|
2016-05-30 19:49:44 +02:00 |
|
|
Thomas Steen Rasmussen
|
3e80c51572
|
add __str__ method for Order model
|
2016-05-30 17:32:53 +02:00 |
|
|
Thomas Steen Rasmussen
|
935af5f188
|
commit a bunch of invoice related stuff - generate pdf invoice, save to archive, email to customer
|
2016-05-30 16:58:55 +02:00 |
|
|
Thomas Steen Rasmussen
|
aba0596252
|
show order in __str__ on coinifyapicallback model
|
2016-05-29 19:55:07 +02:00 |
|
|
Thomas Steen Rasmussen
|
59a66107bb
|
rename CoinfyCallback model to CoinifyAPICallback
|
2016-05-29 19:33:26 +02:00 |
|
|
Thomas Steen Rasmussen
|
be13ccdf78
|
ordering is a list
|
2016-05-29 18:02:12 +02:00 |
|
|
Thomas Steen Rasmussen
|
15ceea3f5a
|
show orders with newest at the top
|
2016-05-29 17:49:37 +02:00 |
|
|
Thomas Steen Rasmussen
|
b3f6131be4
|
working on shop
|
2016-05-29 14:28:47 +02:00 |
|
|
Thomas Steen Rasmussen
|
131aa96690
|
save all coinify callbacks, even the invalid ones; also save headers
|
2016-05-29 13:20:51 +02:00 |
|
|
Thomas Steen Rasmussen
|
bb85b77841
|
define coinify cancel url in the api call, rename cancel url method on Order
|
2016-05-29 13:00:00 +02:00 |
|
|
Thomas Steen Rasmussen
|
c36e9c6eb0
|
working on shop and coinify payment
|
2016-05-29 12:29:38 +02:00 |
|
|
Thomas Steen Rasmussen
|
07d74878c5
|
working on coinify payments
|
2016-05-29 10:43:38 +02:00 |
|
|
Thomas Steen Rasmussen
|
6016a6b605
|
Merge remote-tracking branch 'origin/feature/tickets' into feature/tickets
# Conflicts:
# shop/models.py
# shop/urls.py
|
2016-05-25 22:53:02 +02:00 |
|
|
Thomas Steen Rasmussen
|
9387b8bdc4
|
working on coinify payments
|
2016-05-25 22:48:02 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
c0045177aa
|
Marking an Order as paid should generate Tickets
|
2016-05-25 20:05:31 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
ff4f42bbdc
|
Adding Ticket model to be able to discern tickets from products.
|
2016-05-25 19:13:45 +02:00 |
|
|
Thomas Steen Rasmussen
|
e5d78099cf
|
move .public to category instead of product
|
2016-05-17 20:56:11 +02:00 |
|
|
Thomas Steen Rasmussen
|
8a653265cc
|
add Invoice model
|
2016-05-17 15:09:40 +02:00 |
|
|
Thomas Steen Rasmussen
|
9cce10c281
|
add public field to Product
|
2016-05-17 15:09:31 +02:00 |
|
|
Thomas Steen Rasmussen
|
ded056baf0
|
fix __str__ method for epaycallback
|
2016-05-17 08:08:30 +02:00 |
|
|
Thomas Steen Rasmussen
|
8eb943c877
|
fix ordering and __str__ methods for epaycallback model
|
2016-05-17 08:04:53 +02:00 |
|
|
Thomas Steen Rasmussen
|
ff6af58eda
|
more work on epay callback - add md5valid field to callback model
|
2016-05-17 07:59:42 +02:00 |
|
|
Thomas Steen Rasmussen
|
089185f38c
|
re-add get_absolute_url method for order
|
2016-05-17 07:21:22 +02:00 |
|
|
Thomas Steen Rasmussen
|
dd292c22c7
|
remember namespace prefixes on reverse() calls
|
2016-05-17 07:15:10 +02:00 |
|
|
Thomas Steen Rasmussen
|
0e3fe85dfe
|
working on epay payment
|
2016-05-17 07:06:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
96582c93ae
|
tell epay to send the user to our thanks url after payment
|
2016-05-16 21:45:34 +02:00 |
|
|
Thomas Steen Rasmussen
|
5a5efbe69a
|
remember namespace prefix for reverse() lookups
|
2016-05-16 17:23:53 +02:00 |
|