Commit Graph

189 Commits

Author SHA1 Message Date
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
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
Andreas Zweili 17885e82e4 add a fixture for a test user 2018-02-18 13:23:39 +01:00
Ivan Hörler 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
Ivan Hörler 59073ad8c2 add of checkout form 2018-02-17 10:51:32 +01:00
Ivan Hörler ccee783a98 add local bootstrap to be able to develop offline 2018-02-15 07:46:43 +01:00
Andreas Zweili 9b31f2a20f add the currency name to all the prices 2018-02-13 20:00:15 +01:00
Ivan Hörler 5b5f4dbc70 add offline fetching currencies data from local rss file 2018-02-13 09:15:22 +01:00
Ivan Hörler 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
Ivan Hörler 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
Andreas Zweili b228d5954e clean up the process_article_prices function 2018-02-12 22:48:54 +01:00
Andreas Zweili 7a245b317d move some code out of the views.py file 2018-02-12 22:38:16 +01:00
Andreas Zweili 5084b2a42b Merge branch 'cart' into andreas 2018-02-12 21:56:19 +01:00
Ivan Hörler e0c5ba5154 fix offline currencies fetch throwing error 2018-02-12 21:51:33 +01:00
Ivan Hörler 059ca9d0f7 add update routine for existing items 2018-02-11 23:49:36 +01:00
Andreas Zweili 9120b019aa remove the solution with the filter 2018-02-11 22:37:27 +01:00
Andreas Zweili 6ef396a6d2 Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart 2018-02-11 22:00:17 +01:00
Andreas Zweili 7a9c06bbba push for review 2018-02-11 21:56:53 +01:00
Ivan Hörler 5220b4d567 add comments of thaught 2018-02-11 20:07:18 +01:00
Ivan Hörler 080bb7823d commit of pseudo idea of the form 2018-02-11 19:58:49 +01:00
Ivan Hörler 775f32887a add art# and Price of all items 2018-02-11 18:19:21 +01:00
Andreas Zweili 8b6568c640 add a rough version of the "total" calculation 2018-02-11 16:48:45 +01:00
Ivan Hörler d0217960d3 how to get(article.id) in line 273 2018-02-11 16:24:36 +01:00
Andreas Zweili 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
Ivan Hörler 4f17a85dc7 add total summ 2018-02-04 21:48:29 +01:00
Andreas Zweili a01d08fded add a max_length to the street number 2018-02-04 20:47:18 +01:00
Andreas Zweili ccde016af5 Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart 2018-02-04 20:39:21 +01:00
Andreas Zweili e47156ce2a add a check for the currency session variable 2018-02-04 20:38:54 +01:00
Andreas Zweili b74f3ee585 remove unneeded line 2018-02-04 20:38:35 +01:00
Ivan Hörler f1e6d680ba fix article_list assignment 2018-02-04 20:36:10 +01:00
Ivan Hörler ccf823fad2 add amount to template 2018-02-04 20:18:49 +01:00
Andreas Zweili 14095a7f63 Merge branch 'cart' of https://git.2li.ch/ibz/web_AI-5 into cart 2018-02-04 20:04:12 +01:00
Andreas Zweili 4cbb662fb4 fix the currency selector in the details view 2018-02-04 20:03:09 +01:00
Ivan Hörler e36e290314 change cart view to list all chosen items 2018-02-04 19:58:17 +01:00
Ivan Hörler d3b0d0df0b fix message bug 2018-02-04 19:44:09 +01:00