Andreas Zweili
81f0fc0c4b
fix the currency calculation in the cart
2018-02-25 17:26:43 +01:00
Andreas Zweili
1c52e938c3
change the checkout url
2018-02-25 17:26:24 +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
Andreas Zweili
5f58134420
update a variable
2018-02-21 21:11:07 +01:00
Andreas Zweili
2a0472de68
correct intendation
2018-02-21 18:10:20 +01:00
Andreas Zweili
203d907508
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-21 17:30:00 +01:00
Andreas Zweili
861de5cb37
extend the documentation
2018-02-21 17:29:48 +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
a6ba0d4381
extend the test case introduction
2018-02-19 21:55:33 +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
Andreas Zweili
1000d773f0
refactor according to PEP8
2018-02-19 21:09:07 +01:00
Andreas Zweili
50c0bd847b
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-19 21:04:38 +01:00
Andreas Zweili
a763ae1c5b
Merge branch 'andreas' into cart
2018-02-19 21:04:33 +01:00
Andreas Zweili
acbe86d0ce
remove unnecessary h1 tags from template
2018-02-19 21:04:03 +01:00
Andreas Zweili
99d85555b6
extend the test cases
2018-02-19 21:03:38 +01:00
Andreas Zweili
04898405c9
extend the "Testing" section
2018-02-19 21:03:10 +01:00
Andreas Zweili
c69b1cdb07
remove unneeded escapes
2018-02-19 21:02:47 +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
Ivan Hörler
7161489cf2
unfinished try to set initial value in views.py line 243
2018-02-19 19:11:40 +01:00
Andreas Zweili
eacdbd3f30
push form hack
2018-02-19 18:39:53 +01:00
Ivan Hörler
29e99e49c0
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
some corrections to comply with PEP8
remove the inline pictures from the Article admin page
add surround the submit button with a P Tag
add another use case
fix a typo
add a entry about testing
correct the bib entries
correct spelling mistakes
wrap the jinja template in a sexylisting environment
remove todo tag
add empty lines for better visibiliy
remove whitespace
add a source for fixtures
2018-02-18 21:59:04 +01:00
Ivan Hörler
cb19ca6205
add amountform not working yet
2018-02-18 21:58:46 +01:00
Andreas Zweili
84b24501fb
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-18 20:31:37 +01:00
Ivan Hörler
f78bfb6db0
change Model.Form to CartPosition
2018-02-18 19:31:03 +01:00
Ivan Hörler
16ce980215
unfinished form for andreas
2018-02-18 19:28:39 +01:00
Andreas Zweili
147bc7531e
some corrections to comply with PEP8
2018-02-18 18:40:55 +01:00
Andreas Zweili
0d697114cf
remove the inline pictures from the Article admin page
...
I've removed the inline pictures because when you upload more than the
maximum allowed pictures at once it still works. Only if you upload
them one after the other the check works. Therefor it's safer to only
allow the upload through the Picture admin page. This way the check
works every time.
2018-02-18 18:37:21 +01:00
Andreas Zweili
190242bbb7
add surround the submit button with a P Tag
2018-02-18 18:33:14 +01:00
Ivan Hörler
71fe31e1c0
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
add a fixture for a test user
2018-02-18 17:55:32 +01:00
Ivan Hörler
e20fa526e6
change Organigram
2018-02-18 17:55:20 +01:00
Andreas Zweili
13f1832bad
add another use case
2018-02-18 14:57:38 +01:00