92d4e0dd71
Merge branch 'master' of git.2li.ch:ibz/web_AI-5
2018-03-02 16:08:23 +01:00
f7e8b9cd85
show exchangerate in checkout
2018-03-02 16:07:33 +01:00
7e8ac5077e
correct the order view
2018-03-02 16:07:15 +01:00
4fb45dfdb1
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
add a link to the Readme
2018-02-28 22:22:39 +01:00
51c5affa85
delete total of order in profile view
2018-02-28 22:22:28 +01:00
fc2af695a2
add a link to the Readme
2018-02-28 21:58:18 +01:00
de24264331
undo currency dropdown onclick and fix price tag in order
2018-02-28 21:47:19 +01:00
404941b235
fix pos_price in Orderview
2018-02-28 21:40:17 +01:00
3a8a5ea1da
refactor and clean
2018-02-28 21:05:27 +01:00
db1fb337ba
cleanup code and refacture visual usability
2018-02-28 08:13:13 +01:00
1e577f4520
improve dropdown
2018-02-28 01:23:20 +01:00
ab30417a80
cleanup
2018-02-28 01:22:27 +01:00
a18765b0a6
add orders RESTfull
2018-02-27 23:56:41 +01:00
f170f5b0da
add checkout cancel button
2018-02-27 22:16:24 +01:00
f6ae6cf872
add profile oders in tableform with
2018-02-27 22:01:39 +01:00
c74438904c
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
change some code
correct the html templates
remove todo tags
resize the mockup picture so it doesn't use a whole page
add a page break to move the interface section to it's own page
add captions and centering to the tikz figures
make the swot table a bit smaller
update readme
2018-02-27 20:46:18 +01:00
a8a27c6b75
add profile view of orders
2018-02-27 20:46:05 +01:00
208d7d51df
correct the html templates
2018-02-27 18:21:34 +01:00
a1e74a32c2
readd the order url
...
somehow this got lost
2018-02-26 22:51:43 +01:00
691fdc12f5
display the position amount correctly
2018-02-26 21:53:21 +01:00
a389e64149
fix order save to db
2018-02-26 21:22:07 +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
6c46d0a6ce
add order
2018-02-26 19:56:45 +01:00
2c52c2483a
improved the table styleing
2018-02-25 19:26:26 +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
e2fce385da
add delete operation to cart
2018-02-21 21:59:50 +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
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
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
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
190242bbb7
add surround the submit button with a P Tag
2018-02-18 18:33:14 +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
9120b019aa
remove the solution with the filter
2018-02-11 22:37:27 +01:00
7a9c06bbba
push for review
2018-02-11 21:56:53 +01:00
775f32887a
add art# and Price of all items
2018-02-11 18:19:21 +01:00
4f17a85dc7
add total summ
2018-02-04 21:48:29 +01:00
ccf823fad2
add amount to template
2018-02-04 20:18:49 +01:00
e36e290314
change cart view to list all chosen items
2018-02-04 19:58:17 +01:00
Andreas Zweili
Ivan Hörler