e79cba32c1
create zip to render in html position_list and amount_form.
2018-02-21 08:04:47 +01:00
799b1ba502
add print helps to find issue in initial value
2018-02-20 21:57:13 +01:00
933cd40336
add operation mode in restrict_cart_to_one_article function
2018-02-20 21:22:25 +01:00
a6ca585918
fix currency connection
2018-02-20 21:03:53 +01:00
ae1e5e5051
add initial value with dictionary
2018-02-20 20:59:18 +01:00
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
cbbe74a5b3
created funciton to restrict cart to get several same items
2018-02-19 22:58:25 +01:00
a6ba0d4381
extend the test case introduction
2018-02-19 21:55:33 +01:00
5e716b7f2b
remove unused code
2018-02-19 21:13:29 +01:00
dbb6fe9acb
refactor according to PEP8
2018-02-19 21:13:08 +01:00
1000d773f0
refactor according to PEP8
2018-02-19 21:09:07 +01:00
50c0bd847b
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-19 21:04:38 +01:00
a763ae1c5b
Merge branch 'andreas' into cart
2018-02-19 21:04:33 +01:00
acbe86d0ce
remove unnecessary h1 tags from template
2018-02-19 21:04:03 +01:00
99d85555b6
extend the test cases
2018-02-19 21:03:38 +01:00
04898405c9
extend the "Testing" section
2018-02-19 21:03:10 +01:00
c69b1cdb07
remove unneeded escapes
2018-02-19 21:02:47 +01:00
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
7161489cf2
unfinished try to set initial value in views.py line 243
2018-02-19 19:11:40 +01:00
eacdbd3f30
push form hack
2018-02-19 18:39:53 +01:00
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
cb19ca6205
add amountform not working yet
2018-02-18 21:58:46 +01:00
84b24501fb
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-18 20:31:37 +01:00
f78bfb6db0
change Model.Form to CartPosition
2018-02-18 19:31:03 +01:00
16ce980215
unfinished form for andreas
2018-02-18 19:28:39 +01:00
147bc7531e
some corrections to comply with PEP8
2018-02-18 18:40:55 +01:00
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
190242bbb7
add surround the submit button with a P Tag
2018-02-18 18:33:14 +01:00
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
e20fa526e6
change Organigram
2018-02-18 17:55:20 +01:00
13f1832bad
add another use case
2018-02-18 14:57:38 +01:00
a9bec6a329
fix a typo
2018-02-18 14:57:20 +01:00
c06999d980
add a entry about testing
2018-02-18 14:23:23 +01:00
b133c85f87
correct the bib entries
2018-02-18 14:22:55 +01:00
d707e846a7
correct spelling mistakes
2018-02-18 14:05:55 +01:00
15de24943f
wrap the jinja template in a sexylisting environment
2018-02-18 14:04:08 +01:00
868460f972
remove todo tag
2018-02-18 14:03:41 +01:00
8318751ef4
add empty lines for better visibiliy
2018-02-18 14:03:25 +01:00
88814d67e9
remove whitespace
2018-02-18 14:03:14 +01:00
4a1e818766
add a source for fixtures
2018-02-18 13:57:35 +01:00
17885e82e4
add a fixture for a test user
2018-02-18 13:23:39 +01:00
e877e38b55
add some stuf
2018-02-17 15:59:48 +01:00
8bbd3c63a9
wrap the tikz code in a latex export
2018-02-17 11:58:37 +01:00
aa9b5b973c
adjust width of Tikz SWOT graphic
2018-02-17 11:32:19 +01:00
fe10cf005c
add SWOT Analysis with tikz graphic's
2018-02-17 11:27:20 +01:00
7f98e528e9
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
fix "Varianten" heading
correct wording
correct false escaping in the documentation
exend the section "Varianten"
move a section
remove a comment and some todo tags
add the currency name to all the prices
2018-02-17 10:51:42 +01:00
59073ad8c2
add of checkout form
2018-02-17 10:51:32 +01:00
5a379d1c7d
fix "Varianten" heading
2018-02-15 21:00:30 +01:00
2b365ee143
correct wording
2018-02-15 20:57:03 +01:00
7d8d8d1435
correct false escaping in the documentation
2018-02-15 20:28:26 +01:00
Ivan Hörler
Andreas Zweili