Andreas Zweili
3073baf43f
remove the person variable
2018-02-26 22:32:21 +01:00
Andreas Zweili
b9d2d9f6ae
only query the exchange_rate if the currency was set
2018-02-26 22:24:01 +01:00
Andreas Zweili
865ff557bd
add some empty lines for readability
2018-02-26 22:23:29 +01:00
Andreas Zweili
a232ca414c
move the person up
2018-02-26 22:23:15 +01:00
Andreas Zweili
6c172405ca
add the orderposition modell
2018-02-26 22:22:45 +01:00
Andreas Zweili
45571b8ea9
use CHF as the default currency_name
2018-02-26 22:22:22 +01:00
Andreas Zweili
d51e9dfa08
shorten the order view
2018-02-26 21:56:07 +01:00
Andreas Zweili
db737eca02
only get the cart
...
the cart was created in the cart view. In the checkout we only want to
display it.
2018-02-26 21:55:38 +01:00
Andreas Zweili
494ce66631
only execute the currency part if it exists in the session
2018-02-26 21:55:15 +01:00
Andreas Zweili
f62a6a91d9
only create the order
2018-02-26 21:54:40 +01:00
Andreas Zweili
3970555cf1
shorten the line a bit
2018-02-26 21:54:11 +01:00
Andreas Zweili
ac7ae505e3
remove old code
2018-02-26 21:53:13 +01:00
Ivan Hörler
a389e64149
fix order save to db
2018-02-26 21:22:07 +01:00
Andreas Zweili
1274f76b71
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-26 21:02:13 +01:00
Andreas Zweili
1be2249957
users must login to view their cart and to checkout
2018-02-26 21:01:55 +01:00
Ivan Hörler
736c5d4ba3
fix url for order
2018-02-26 20:56:18 +01:00
Ivan Hörler
ffcf6e6ba5
change orders to order and delete unused
2018-02-26 20:49:49 +01:00
Ivan Hörler
037df6b9bc
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
fix the currency calculation in the cart
add some empty lines for better readability
2018-02-26 19:58:13 +01:00
Ivan Hörler
6c46d0a6ce
add order
2018-02-26 19:56:45 +01:00
Andreas Zweili
66a066165d
fix the currency calculation in the cart
2018-02-25 21:33:53 +01:00
Andreas Zweili
798cee4c58
add some empty lines for better readability
2018-02-25 21:33:34 +01:00
Andreas Zweili
b15745a3bc
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-25 19:59:23 +01:00
Andreas Zweili
efa92ea074
correct the currency calculation
2018-02-25 19:58:30 +01:00
Andreas Zweili
c5b118c7c2
correct the cart creation
2018-02-25 19:57:50 +01:00
Ivan Hörler
2c52c2483a
improved the table styleing
2018-02-25 19:26:26 +01:00
Andreas Zweili
e4a58c48fd
shorten a line to under 80 characters
2018-02-25 17:30:20 +01:00
Andreas Zweili
81f0fc0c4b
fix the currency calculation in the cart
2018-02-25 17:26:43 +01:00
Andreas Zweili
7da09d736c
add a line to comply with PEP8
2018-02-25 14:23:18 +01:00
Andreas Zweili
0d943106a0
correct queries which use the user object
2018-02-25 14:22:50 +01:00
Andreas Zweili
6e54bdec0d
fix comment indents
2018-02-25 14:22:22 +01:00
Andreas Zweili
597dd70ba7
change the template in the checkout view
2018-02-25 14:21:32 +01:00
Andreas Zweili
f36550e9d4
add a user object to the checkout view
2018-02-25 14:20:59 +01:00
Ivan Hörler
5b1530c0bd
add checkout template, view and function
2018-02-25 13:12:13 +01:00
Ivan Hörler
9f8a01dbaf
clean for next step
2018-02-25 12:02:32 +01:00
Ivan Hörler
52a6ae1ecc
improved message if items in cart are deleted until there are none.
2018-02-25 11:46:32 +01:00
Ivan Hörler
ff36017fa4
fixed add update and delete function
2018-02-25 09:30:46 +01:00
Ivan Hörler
83bf8ea362
fix add and replace
2018-02-21 22:35:29 +01:00
Ivan Hörler
e2fce385da
add delete operation to cart
2018-02-21 21:59:50 +01:00
Andreas Zweili
935c97de46
assign the list before the view starts
...
Unassigned variables cause the cart to crash at the first run.
2018-02-21 21:11:52 +01:00
Andreas Zweili
cfa588f3b3
correct the variable name
...
With the wrong name the cart crashes at the first run
2018-02-21 21:11:26 +01:00
Ivan Hörler
e79cba32c1
create zip to render in html position_list and amount_form.
2018-02-21 08:04:47 +01:00
Ivan Hörler
799b1ba502
add print helps to find issue in initial value
2018-02-20 21:57:13 +01:00
Ivan Hörler
933cd40336
add operation mode in restrict_cart_to_one_article function
2018-02-20 21:22:25 +01:00
Ivan Hörler
a6ca585918
fix currency connection
2018-02-20 21:03:53 +01:00
Ivan Hörler
ae1e5e5051
add initial value with dictionary
2018-02-20 20:59:18 +01:00
Ivan Hörler
56a724567e
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
extend the test case introduction
remove unused code
refactor according to PEP8
refactor according to PEP8
remove unnecessary h1 tags from template
extend the test cases
extend the "Testing" section
remove unneeded escapes
# Conflicts:
# django/didgeridoo/webshop/views.py
2018-02-19 23:00:32 +01:00
Ivan Hörler
cbbe74a5b3
created funciton to restrict cart to get several same items
2018-02-19 22:58:25 +01:00
Andreas Zweili
5e716b7f2b
remove unused code
2018-02-19 21:13:29 +01:00
Andreas Zweili
dbb6fe9acb
refactor according to PEP8
2018-02-19 21:13:08 +01:00
Ivan Hörler
c5419bfc60
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
push form hack
# Conflicts:
# django/didgeridoo/webshop/forms.py
# django/didgeridoo/webshop/templates/webshop/cart.html
# django/didgeridoo/webshop/views.py
2018-02-19 20:05:04 +01:00