Commit Graph

169 Commits

Author SHA1 Message Date
Andreas Zweili 70e21130ea integrate process_article_prices() into cart 2018-02-13 20:45:28 +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
Ivan Hörler e9a24863dc add patch 2018-02-04 19:27:09 +01:00
Ivan Hörler afbc2b500b add onsolved problem for help 2018-02-04 18:58:21 +01:00
Ivan Hörler 1fe10e2185 commit for andreas 2018-02-04 18:32:54 +01:00
Ivan Hörler c1a5627852 add for preview of andreas 2018-02-03 20:11:00 +01:00
Ivan Hörler 0576cd4fb8 reflected need of model for cart positions (items in cart) 2018-02-02 13:21:03 +01:00
Ivan Hörler 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
Ivan Hörler c6b1bb975b broken models relationship in admin. please look at the erd.png 2018-02-01 21:28:17 +01:00
Ivan Hörler 43b362d466 refactor firsthit 2018-02-01 17:05:58 +01:00
Ivan Hörler eb77635920 first hit to addtocartform 2018-02-01 17:02:08 +01:00
Andreas Zweili 9c23d667c8 rename the empty_label to CHF 2018-01-28 22:04:48 +01:00
Andreas Zweili c5dbcc3d58 add a check for the currency key in the session 2018-01-28 21:31:27 +01:00
Andreas Zweili 6ee5f56e73 add the currency calculation to the article view 2018-01-28 21:26:36 +01:00
Andreas Zweili 915f31c413 add the currency calculation to the categories view 2018-01-28 21:14:55 +01:00
Andreas Zweili 0162e10915 remove old code 2018-01-28 21:09:57 +01:00
Andreas Zweili 62db260ec1 rename the articles_list in the category view 2018-01-28 21:09:27 +01:00
Andreas Zweili fb6831920c remove jquery from the base template 2018-01-28 20:41:32 +01:00
Andreas Zweili 1481727a51 add the currency calculation to the index page 2018-01-28 20:41:14 +01:00
Andreas Zweili e76b3cb80d add a function to get the id of the hidden status 2018-01-28 20:39:22 +01:00
Andreas Zweili 68a8110aea add a function to collect the category list 2018-01-28 20:37:47 +01:00
Andreas Zweili ed0649f5fc refactor the models import 2018-01-28 20:31:51 +01:00