Thomas Steen Rasmussen
|
916f1ed59f
|
forgot to include the epay callback url in the form
|
2016-05-29 16:15:49 +02:00 |
|
|
Thomas Steen Rasmussen
|
3eaf9cec91
|
redirect to clean url after epay payment
|
2016-05-29 16:10:06 +02:00 |
|
|
Thomas Steen Rasmussen
|
afc380343a
|
fix block name in closing tag
|
2016-05-29 16:00:22 +02:00 |
|
|
Thomas Steen Rasmussen
|
a53811b4c1
|
use a paymenttype independent order.get_cancel_url everywhere
|
2016-05-29 15:55:48 +02:00 |
|
|
Thomas Steen Rasmussen
|
283f4013a9
|
spacing
|
2016-05-29 15:55:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
c43b275494
|
wording on order detail page
|
2016-05-29 15:44:27 +02:00 |
|
|
Thomas Steen Rasmussen
|
21b1e2156f
|
fix |truefalseicon filter
|
2016-05-29 15:35:14 +02:00 |
|
|
Thomas Steen Rasmussen
|
9e66a9c4c6
|
do not use django template code here
|
2016-05-29 15:25:49 +02:00 |
|
|
Thomas Steen Rasmussen
|
ef53a8149b
|
do not escape our html string
|
2016-05-29 15:21:55 +02:00 |
|
|
Thomas Steen Rasmussen
|
af184cd671
|
order list styling
|
2016-05-29 15:18:36 +02:00 |
|
|
Thomas Steen Rasmussen
|
93fed32cad
|
styling order list page
|
2016-05-29 15:16:29 +02:00 |
|
|
Thomas Steen Rasmussen
|
d55de77201
|
styling order list page
|
2016-05-29 15:04:52 +02:00 |
|
|
Thomas Steen Rasmussen
|
c7906a069b
|
a bit of spacing
|
2016-05-29 14:49:47 +02:00 |
|
|
Thomas Steen Rasmussen
|
4b933f2a06
|
add more details to order list page
|
2016-05-29 14:48:57 +02:00 |
|
|
Thomas Steen Rasmussen
|
a124911a44
|
forgot the url namespace prefix (again)
|
2016-05-29 14:33:41 +02:00 |
|
|
Thomas Steen Rasmussen
|
b3f6131be4
|
working on shop
|
2016-05-29 14:28:47 +02:00 |
|
|
Thomas Steen Rasmussen
|
57e120c45f
|
add link to previous orders to the shop frontpage
|
2016-05-29 14:04:46 +02:00 |
|
|
Thomas Steen Rasmussen
|
7eae7ee9ff
|
migrations for previous commit
|
2016-05-29 13:24:12 +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
|
2e40dfb1d1
|
fix json path
|
2016-05-29 13:01:36 +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
|
7476679c3f
|
register the new models in the admin
|
2016-05-29 12:54:02 +02:00 |
|
|
Thomas Steen Rasmussen
|
6e3accfc79
|
this field has been renamed
|
2016-05-29 12:50:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
c3fbc0aa7b
|
migration
|
2016-05-29 12:48:31 +02:00 |
|
|
Thomas Steen Rasmussen
|
e019b241e8
|
pass request to the url methods on Order
|
2016-05-29 12:40:36 +02:00 |
|
|
Thomas Steen Rasmussen
|
1cbd958327
|
working on order detail page
|
2016-05-29 12:37:14 +02:00 |
|
|
Thomas Steen Rasmussen
|
f73ff466eb
|
forgot ()
|
2016-05-29 12:36:07 +02:00 |
|
|
Thomas Steen Rasmussen
|
c36e9c6eb0
|
working on shop and coinify payment
|
2016-05-29 12:29:38 +02:00 |
|
|
Thomas Steen Rasmussen
|
b938f1374b
|
missing import
|
2016-05-29 12:10:51 +02:00 |
|
|
Thomas Steen Rasmussen
|
5df37d9f93
|
more work on coinify payment
|
2016-05-29 12:08:29 +02:00 |
|
|
Thomas Steen Rasmussen
|
490b01a4df
|
change CoinifyRedirectView to a RedirectView with SingleObjectMixin
|
2016-05-29 11:52:20 +02:00 |
|
|
Thomas Steen Rasmussen
|
ca3dd850b0
|
pk not orderid
|
2016-05-29 11:40:58 +02:00 |
|
|
Thomas Steen Rasmussen
|
fd7ba26428
|
typo
|
2016-05-29 11:38:23 +02:00 |
|
|
Thomas Steen Rasmussen
|
1e42ddf7bf
|
just use regular reverse here
|
2016-05-29 11:35:04 +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 |
|
|
Víðir Valberg Guðmundsson
|
35e1f68eae
|
Boilerplate for law required stuff.
|
2016-05-19 11:20:20 +02:00 |
|
|
Thomas Steen Rasmussen
|
407c8c31c4
|
fix public category filtering
|
2016-05-17 21:55:09 +02:00 |
|
|
Thomas Steen Rasmussen
|
1b0a8019aa
|
where did those quotes come from
|
2016-05-17 21:42:28 +02:00 |
|
|
Thomas Steen Rasmussen
|
42749bacd3
|
get category object
|
2016-05-17 21:24:04 +02:00 |
|
|
Thomas Steen Rasmussen
|
900bce6bc3
|
only show public categories
|
2016-05-17 21:10:01 +02:00 |
|
|
Thomas Steen Rasmussen
|
2303b175a0
|
add migration
|
2016-05-17 21:04:40 +02:00 |
|
|
Thomas Steen Rasmussen
|
e5d78099cf
|
move .public to category instead of product
|
2016-05-17 20:56:11 +02:00 |
|
|
Thomas Steen Rasmussen
|
17f17d18f7
|
return super dispatch
|
2016-05-17 20:42:02 +02:00 |
|
|
Thomas Steen Rasmussen
|
b52be5af8c
|
only show public products
|
2016-05-17 15:51:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
f5e05ac51c
|
make epay callback code handle multiple callbacks for the same order (happens sometimes)
|
2016-05-17 15:35:28 +02:00 |
|
|
Thomas Steen Rasmussen
|
9ff4be7272
|
first steps towards an invoice worker
|
2016-05-17 15:31:41 +02:00 |
|
|
Thomas Steen Rasmussen
|
2ed981776f
|
add migration
|
2016-05-17 15:15:30 +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
|
562314caed
|
move a few more checks to mixins
|
2016-05-17 08:34:54 +02:00 |
|
|
Thomas Steen Rasmussen
|
01779363d5
|
this code is no longer needed, the mixin checks if the order is paid
|
2016-05-17 08:27:13 +02:00 |
|
|
Thomas Steen Rasmussen
|
f06a8c76c3
|
add a mixin to use when we want to make sure an order is unpaid
|
2016-05-17 08:21:59 +02:00 |
|
|
Thomas Steen Rasmussen
|
ffedb8327d
|
missing import
|
2016-05-17 08:15:14 +02:00 |
|
|
Thomas Steen Rasmussen
|
f934cbf0aa
|
convert to int, print a warning if we receive a wrong amount from epay
|
2016-05-17 08:13:00 +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
|
528aa2bccf
|
add migration
|
2016-05-17 08:01:11 +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
|
1aec9bc4b6
|
use an OrderedDict to ensure order of query params
|
2016-05-17 07:54:54 +02:00 |
|
|
Thomas Steen Rasmussen
|
f62a4dd8a3
|
forgot the most important bit lol
|
2016-05-17 07:46:36 +02:00 |
|
|
Thomas Steen Rasmussen
|
c1203db188
|
rework epay callback validation
|
2016-05-17 07:42:31 +02:00 |
|
|
Thomas Steen Rasmussen
|
12d76f4330
|
make order available in epay thanks page
|
2016-05-17 07:27:06 +02:00 |
|
|
Thomas Steen Rasmussen
|
2168477bb4
|
self.request not just request
|
2016-05-17 07:23:46 +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
|
7932302e42
|
.total not .amount
|
2016-05-17 07:13:10 +02:00 |
|
|
Thomas Steen Rasmussen
|
67cbe33e3a
|
fix trailing commas, rename to epay.py
|
2016-05-17 07:10:18 +02:00 |
|
|
Thomas Steen Rasmussen
|
e0c3be498b
|
fix import
|
2016-05-17 07:08:03 +02:00 |
|
|
Thomas Steen Rasmussen
|
0e3fe85dfe
|
working on epay payment
|
2016-05-17 07:06:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
ebec7265df
|
missing import
|
2016-05-16 21:59:54 +02:00 |
|
|
Thomas Steen Rasmussen
|
548f052218
|
order matters
|
2016-05-16 21:57:52 +02:00 |
|
|
Thomas Steen Rasmussen
|
75778344ec
|
missing import
|
2016-05-16 21:54:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
217d7d8af9
|
add epay models to admin
|
2016-05-16 21:45:43 +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
|
32779b662e
|
fix epay callback
|
2016-05-16 21:14:56 +02:00 |
|
|
Thomas Steen Rasmussen
|
1abbf3acc6
|
add pdf code and pdf letterheads
|
2016-05-16 21:04:01 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
029ca1cf00
|
Adding currency tags to display prices correct
|
2016-05-16 20:56:52 +02:00 |
|
|
Thomas Steen Rasmussen
|
1fb5454590
|
more work on payments
|
2016-05-16 19:31:14 +02:00 |
|
|
Thomas Steen Rasmussen
|
ce98d97d74
|
missing import
|
2016-05-16 19:12:59 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
fc7495c7ce
|
Implement EnsureUserOwnsOrderMixin to keep things DRY
|
2016-05-16 18:48:50 +02:00 |
|
|
Thomas Steen Rasmussen
|
e8badb817a
|
use DetailView, add epay_thanks, unfinished
|
2016-05-16 18:26:27 +02:00 |
|
|
Thomas Steen Rasmussen
|
0b4125d6d9
|
epay expects øre not kroner
|
2016-05-16 17:48:04 +02:00 |
|
|
Thomas Steen Rasmussen
|
b4235ef642
|
load bootstrap tags
|
2016-05-16 17:46:20 +02:00 |
|
|
Thomas Steen Rasmussen
|
9dcb47cc3c
|
load jquery on epay page
|
2016-05-16 17:44:33 +02:00 |
|
|
Thomas Steen Rasmussen
|
1c429d0ec2
|
wrap in str()
|
2016-05-16 17:41:24 +02:00 |
|
|
Thomas Steen Rasmussen
|
334a10359e
|
self.request not just request
|
2016-05-16 17:37:10 +02:00 |
|
|
Thomas Steen Rasmussen
|
aed20d2821
|
provide epay with a complete url to return the customer to after payment
|
2016-05-16 17:35:08 +02:00 |
|
|
Thomas Steen Rasmussen
|
d22ef963d4
|
missing import
|
2016-05-16 17:25:57 +02:00 |
|
|
Thomas Steen Rasmussen
|
5a5efbe69a
|
remember namespace prefix for reverse() lookups
|
2016-05-16 17:23:53 +02:00 |
|
|
Thomas Steen Rasmussen
|
2e079732cf
|
return to order details after adding product to order
|
2016-05-16 17:17:14 +02:00 |
|
|
Thomas Steen Rasmussen
|
a49168e95c
|
dk vat is 25% - but only 20% of an amount including vat is vat :)
|
2016-05-16 17:11:48 +02:00 |
|
|
Thomas Steen Rasmussen
|
ba01e103a3
|
missing import; use reverse_lazy
|
2016-05-16 17:11:07 +02:00 |
|
|
Thomas Steen Rasmussen
|
db597a4a36
|
use reverse_lazy instead of reverse
|
2016-05-16 17:07:18 +02:00 |
|
|
Thomas Steen Rasmussen
|
5be92b46ff
|
add missing get_absolute_url() for Order model
|
2016-05-16 16:54:11 +02:00 |
|
|
Thomas Steen Rasmussen
|
3a80691e2c
|
fix epay payment
|
2016-05-16 16:49:52 +02:00 |
|
|
Thomas Steen Rasmussen
|
f88172cd97
|
pass pk not orderid
|
2016-05-16 16:36:15 +02:00 |
|
|
Thomas Steen Rasmussen
|
2117e80cf6
|
working on payments
|
2016-05-16 16:32:02 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
f4be670301
|
No need for subtotal
|
2016-05-16 16:20:15 +02:00 |
|
|
Thomas Steen Rasmussen
|
f9cea6cdba
|
missing import
|
2016-05-16 16:14:49 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
bee6a65ede
|
Prices are with VAT, turning the calculation around.
|
2016-05-16 16:14:16 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
9eefc6bdfd
|
Adding subtotal, VAT and total to order. Also redirect to shop index if there are no products.
|
2016-05-16 16:09:25 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
373a4cf65b
|
Editing of an order (remove/update products)
|
2016-05-16 15:44:03 +02:00 |
|
|
Thomas Steen Rasmussen
|
2287e6dda5
|
working on epay payment
|
2016-05-16 15:31:37 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
68fce085e7
|
Fixes for when there is no order + adding a new product to the order
|
2016-05-16 00:20:09 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
5ed1d3075b
|
Use 'open' instead of 'finalized'
|
2016-05-16 00:14:45 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
c45a3aa8c9
|
Getting there!
|
2016-05-16 00:09:00 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
326e9d70cd
|
Adding cart with number of items in order to menu
|
2016-05-14 19:42:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
d423ab54de
|
add form to product detail page
|
2016-05-14 19:20:47 +02:00 |
|
|
Thomas Steen Rasmussen
|
65b6465b40
|
forgot to return a response
|
2016-05-14 16:34:06 +02:00 |
|
|
Thomas Steen Rasmussen
|
d2fae2480a
|
pk not id
|
2016-05-14 16:32:42 +02:00 |
|
|
Thomas Steen Rasmussen
|
447cf0d909
|
typo==fail
|
2016-05-14 16:28:54 +02:00 |
|
|
Thomas Steen Rasmussen
|
b55291fe8e
|
fix index regex
|
2016-05-14 16:26:02 +02:00 |
|
|
Thomas Steen Rasmussen
|
1ecf55f70c
|
no quotes here
|
2016-05-14 16:24:10 +02:00 |
|
|
Thomas Steen Rasmussen
|
452804dca2
|
.pk not .id
|
2016-05-14 16:24:03 +02:00 |
|
|
Thomas Steen Rasmussen
|
5f4889e132
|
fix url regex for product_detail
|
2016-05-14 16:11:08 +02:00 |
|
|
Thomas Steen Rasmussen
|
571e4175e8
|
use url not reverse in templates
|
2016-05-13 09:01:52 +02:00 |
|
|
Thomas Steen Rasmussen
|
a061685937
|
{% load bootstrap3 %}
|
2016-05-13 08:52:07 +02:00 |
|
|
Thomas Steen Rasmussen
|
c8cf189156
|
super fix
|
2016-05-13 08:50:04 +02:00 |
|
|
Thomas Steen Rasmussen
|
fabc583193
|
add migration
|
2016-05-13 08:46:40 +02:00 |
|
|
Thomas Steen Rasmussen
|
55dfa457d2
|
remove unneeded line
|
2016-05-13 08:44:31 +02:00 |
|
|
Thomas Steen Rasmussen
|
1f67035740
|
forgot to add finalized field to model
|
2016-05-13 08:37:47 +02:00 |
|
|
Thomas Steen Rasmussen
|
b942d674ef
|
more work on shop
|
2016-05-13 08:36:56 +02:00 |
|
|
Thomas Steen Rasmussen
|
62fe63bd03
|
switch to a regular form
|
2016-05-12 19:10:46 +02:00 |
|
|
Thomas Steen Rasmussen
|
82ae2b8c23
|
more work on shop
|
2016-05-12 19:08:54 +02:00 |
|
|
Thomas Steen Rasmussen
|
5b279ff493
|
fix import
|
2016-05-12 18:20:31 +02:00 |
|
|
Thomas Steen Rasmussen
|
2e03f3ed3a
|
missing import
|
2016-05-12 18:16:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
29c0696f3f
|
check that this order belongs to this user
|
2016-05-12 18:14:30 +02:00 |
|
|
Thomas Steen Rasmussen
|
bbee72c67f
|
self.get_object() not self.instance
|
2016-05-12 18:14:16 +02:00 |
|
|
Thomas Steen Rasmussen
|
7553df8014
|
better docstring
|
2016-05-12 18:10:51 +02:00 |
|
|
Thomas Steen Rasmussen
|
e218c4c6ae
|
missing import
|
2016-05-12 18:10:36 +02:00 |
|
|
Thomas Steen Rasmussen
|
0aab582666
|
typofest 2016
|
2016-05-12 18:04:58 +02:00 |
|
|
Thomas Steen Rasmussen
|
c16d26c2db
|
typo
|
2016-05-12 18:02:40 +02:00 |
|
|
Thomas Steen Rasmussen
|
10d344f6f8
|
forgot to push a few things before
|
2016-05-12 10:01:26 +02:00 |
|
|
Thomas Steen Rasmussen
|
7212cb0081
|
a bit more work on still unfinished shop
|
2016-05-12 09:51:35 +02:00 |
|
|
Thomas Steen Rasmussen
|
7955bdfae1
|
rename to blockchain instead of altcoin
|
2016-05-11 08:37:39 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
5cfcf13e7d
|
We don't only operate on tickets - renaming and refactoring accordingly
|
2016-05-10 22:20:01 +02:00 |
|