ac7ae505e3
remove old code
2018-02-26 21:53:13 +01:00
a389e64149
fix order save to db
2018-02-26 21:22:07 +01:00
1274f76b71
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-26 21:02:13 +01:00
1be2249957
users must login to view their cart and to checkout
2018-02-26 21:01:55 +01:00
736c5d4ba3
fix url for order
2018-02-26 20:56:18 +01:00
ffcf6e6ba5
change orders to order and delete unused
2018-02-26 20:49:49 +01:00
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
6c46d0a6ce
add order
2018-02-26 19:56:45 +01:00
66a066165d
fix the currency calculation in the cart
2018-02-25 21:33:53 +01:00
798cee4c58
add some empty lines for better readability
2018-02-25 21:33:34 +01:00
b15745a3bc
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-25 19:59:23 +01:00
efa92ea074
correct the currency calculation
2018-02-25 19:58:30 +01:00
c5b118c7c2
correct the cart creation
2018-02-25 19:57:50 +01:00
2c52c2483a
improved the table styleing
2018-02-25 19:26:26 +01:00
e4a58c48fd
shorten a line to under 80 characters
2018-02-25 17:30:20 +01:00
81f0fc0c4b
fix the currency calculation in the cart
2018-02-25 17:26:43 +01:00
1c52e938c3
change the checkout url
2018-02-25 17:26:24 +01:00
7da09d736c
add a line to comply with PEP8
2018-02-25 14:23:18 +01:00
0d943106a0
correct queries which use the user object
2018-02-25 14:22:50 +01:00
6e54bdec0d
fix comment indents
2018-02-25 14:22:22 +01:00
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
5f58134420
update a variable
2018-02-21 21:11:07 +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
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
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
17885e82e4
add a fixture for a test user
2018-02-18 13:23:39 +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
ccee783a98
add local bootstrap to be able to develop offline
2018-02-15 07:46:43 +01:00
9b31f2a20f
add the currency name to all the prices
2018-02-13 20:00:15 +01:00
5b5f4dbc70
add offline fetching currencies data from local rss file
2018-02-13 09:15:22 +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
855620c619
Merge commit 'b228d5954ef71926b80ecc8c0f58435f0f3ae9c1' into cart
...
* commit 'b228d5954ef71926b80ecc8c0f58435f0f3ae9c1':
clean up the process_article_prices function
move some code out of the views.py file
update paths
rearrange figures
extend the documentation
extend the order and shoppingcart sections
update the documentation
add a class diagramme for the shoppingcartposition
update the documentation
add a bib entry for Dia
update the erd
add new class diagrammes
wrap the registration in a transaction
extend the documentation for models
extend the bibliography
add the erd diagramms and their description
add an .eps version of the dia erd file
add the final_erd files
2018-02-13 07:53:07 +01:00
b228d5954e
clean up the process_article_prices function
2018-02-12 22:48:54 +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
e0c5ba5154
fix offline currencies fetch throwing error
2018-02-12 21:51:33 +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
a01d08fded
add a max_length to the street number
2018-02-04 20:47:18 +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
ccf823fad2
add amount to template
2018-02-04 20:18:49 +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
c1a5627852
add for preview of andreas
2018-02-03 20:11:00 +01:00
0576cd4fb8
reflected need of model for cart positions (items in cart)
2018-02-02 13:21:03 +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
9c23d667c8
rename the empty_label to CHF
2018-01-28 22:04:48 +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
Andreas Zweili
Ivan Hörler