597dd70ba7
change the template in the checkout view
2018-02-25 14:21:32 +01:00
f36550e9d4
add a user object to the checkout view
2018-02-25 14:20:59 +01:00
5b1530c0bd
add checkout template, view and function
2018-02-25 13:12:13 +01:00
9f8a01dbaf
clean for next step
2018-02-25 12:02:32 +01:00
52a6ae1ecc
improved message if items in cart are deleted until there are none.
2018-02-25 11:46:32 +01:00
ff36017fa4
fixed add update and delete function
2018-02-25 09:30:46 +01:00
83bf8ea362
fix add and replace
2018-02-21 22:35:29 +01:00
e2fce385da
add delete operation to cart
2018-02-21 21:59:50 +01:00
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
cfa588f3b3
correct the variable name
...
With the wrong name the cart crashes at the first run
2018-02-21 21:11:26 +01:00
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
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
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
cb19ca6205
add amountform not working yet
2018-02-18 21:58:46 +01:00
16ce980215
unfinished form for andreas
2018-02-18 19:28:39 +01:00
59073ad8c2
add of checkout form
2018-02-17 10:51:32 +01:00
23df5ca639
fix update all prices to one alone and save price_in_chf to db in position_price
2018-02-13 08:27:25 +01:00
7a245b317d
move some code out of the views.py file
2018-02-12 22:38:16 +01:00
5084b2a42b
Merge branch 'cart' into andreas
2018-02-12 21:56:19 +01:00
059ca9d0f7
add update routine for existing items
2018-02-11 23:49:36 +01:00
9120b019aa
remove the solution with the filter
2018-02-11 22:37:27 +01:00
6ef396a6d2
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-11 22:00:17 +01:00
7a9c06bbba
push for review
2018-02-11 21:56:53 +01:00
5220b4d567
add comments of thaught
2018-02-11 20:07:18 +01:00
080bb7823d
commit of pseudo idea of the form
2018-02-11 19:58:49 +01:00
775f32887a
add art# and Price of all items
2018-02-11 18:19:21 +01:00
8b6568c640
add a rough version of the "total" calculation
2018-02-11 16:48:45 +01:00
d0217960d3
how to get(article.id) in line 273
2018-02-11 16:24:36 +01:00
e57eafaf9e
wrap the registration in a transaction
...
Sometimes when the creation of the person object fails the user get's
created anyway resulting in a user without a user profile.
By wrapping both the user and profile creation in a transaction the
user gets only created if the person profile worked as well.
2018-02-05 21:25:18 +01:00
4f17a85dc7
add total summ
2018-02-04 21:48:29 +01:00
ccde016af5
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-04 20:39:21 +01:00
e47156ce2a
add a check for the currency session variable
2018-02-04 20:38:54 +01:00
b74f3ee585
remove unneeded line
2018-02-04 20:38:35 +01:00
f1e6d680ba
fix article_list assignment
2018-02-04 20:36:10 +01:00
14095a7f63
Merge branch 'cart' of https://git.2li.ch/ibz/web_AI-5 into cart
2018-02-04 20:04:12 +01:00
4cbb662fb4
fix the currency selector in the details view
2018-02-04 20:03:09 +01:00
e36e290314
change cart view to list all chosen items
2018-02-04 19:58:17 +01:00
d3b0d0df0b
fix message bug
2018-02-04 19:44:09 +01:00
e9a24863dc
add patch
2018-02-04 19:27:09 +01:00
afbc2b500b
add onsolved problem for help
2018-02-04 18:58:21 +01:00
1fe10e2185
commit for andreas
2018-02-04 18:32:54 +01:00
08a1a99ac4
Revert "broken models relationship in admin. please look at the erd.png"
...
This reverts commit c6b1bb975b
2018-02-02 08:44:02 +01:00
c6b1bb975b
broken models relationship in admin. please look at the erd.png
2018-02-01 21:28:17 +01:00
43b362d466
refactor firsthit
2018-02-01 17:05:58 +01:00
eb77635920
first hit to addtocartform
2018-02-01 17:02:08 +01:00
c5dbcc3d58
add a check for the currency key in the session
2018-01-28 21:31:27 +01:00
6ee5f56e73
add the currency calculation to the article view
2018-01-28 21:26:36 +01:00
915f31c413
add the currency calculation to the categories view
2018-01-28 21:14:55 +01:00
0162e10915
remove old code
2018-01-28 21:09:57 +01:00
62db260ec1
rename the articles_list in the category view
2018-01-28 21:09:27 +01:00
1481727a51
add the currency calculation to the index page
2018-01-28 20:41:14 +01:00
e76b3cb80d
add a function to get the id of the hidden status
2018-01-28 20:39:22 +01:00
68a8110aea
add a function to collect the category list
2018-01-28 20:37:47 +01:00
ed0649f5fc
refactor the models import
2018-01-28 20:31:51 +01:00
3dbb614bbb
add the category list to all the views
...
Since the categories are part of the navigation I think they should be
visible from everywhere.
2018-01-28 20:25:35 +01:00
19af243c4f
not finished AJAX request for currencies
2018-01-14 19:57:48 +01:00
013d3d2d28
falsche vorgehensweise um settings.py zurück zu bekommen
2018-01-14 14:07:53 +01:00
852751bc27
Merge branch 'frontendstyling' into andreas
2018-01-13 08:29:31 +01:00
3b73c67c66
add pictures to the article details page
2017-12-31 15:12:09 +01:00
d500712dc2
changed some of the views and implemented a more selfish perspective of a shop.
...
For shure not ideal and in NO way DRY but a solution for now.
2017-12-29 22:32:27 +01:00
1f3ab70dd6
add a registration
2017-12-29 16:46:21 +01:00
d8a1d9ef54
add a user profile
2017-12-28 19:22:00 +01:00
f9f1c89a01
make imports more explicit
2017-12-28 16:40:04 +01:00
b8fa6eef5c
refactor the views
2017-12-19 20:12:21 +01:00
e63627ca4f
fix the category list
2017-12-17 19:37:49 +01:00
6894a1bfba
add a view to show the details of an article
2017-12-17 10:37:04 +01:00
7c5af973f2
add a view to list all articles in a category
2017-12-17 10:36:44 +01:00
cc313a50f3
add an index view and a coresponding template
2017-12-17 10:35:21 +01:00
0427c43a25
slight refactor to conform with pep8
2017-11-19 22:22:26 +01:00
1a63c54761
rename the django project
2017-11-12 21:35:59 +01:00
25d0c6f2b0
Revert "rename the django project"
...
This reverts commit 9e88888750
2017-11-12 21:02:40 +01:00
9e88888750
rename the django project
2017-11-12 20:22:52 +01:00
Andreas Zweili
Ivan Hörler