Commit Graph

42 Commits

Author SHA1 Message Date
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
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 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 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 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
Andreas Zweili 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
Ivan Hörler 19af243c4f not finished AJAX request for currencies 2018-01-14 19:57:48 +01:00
Ivan Hörler 013d3d2d28 falsche vorgehensweise um settings.py zurück zu bekommen 2018-01-14 14:07:53 +01:00
Andreas Zweili 852751bc27 Merge branch 'frontendstyling' into andreas 2018-01-13 08:29:31 +01:00
Andreas Zweili 3b73c67c66 add pictures to the article details page 2017-12-31 15:12:09 +01:00
Ivan Hörler 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
Andreas Zweili 1f3ab70dd6 add a registration 2017-12-29 16:46:21 +01:00
Andreas Zweili d8a1d9ef54 add a user profile 2017-12-28 19:22:00 +01:00
Andreas Zweili f9f1c89a01 make imports more explicit 2017-12-28 16:40:04 +01:00
Andreas Zweili b8fa6eef5c refactor the views 2017-12-19 20:12:21 +01:00
Andreas Zweili e63627ca4f fix the category list 2017-12-17 19:37:49 +01:00
Andreas Zweili 6894a1bfba add a view to show the details of an article 2017-12-17 10:37:04 +01:00
Andreas Zweili 7c5af973f2 add a view to list all articles in a category 2017-12-17 10:36:44 +01:00
Andreas Zweili cc313a50f3 add an index view and a coresponding template 2017-12-17 10:35:21 +01:00
Andreas Zweili 0427c43a25 slight refactor to conform with pep8 2017-11-19 22:22:26 +01:00
Andreas Zweili 1a63c54761 rename the django project 2017-11-12 21:35:59 +01:00
Andreas Zweili 25d0c6f2b0 Revert "rename the django project"
This reverts commit 9e88888750.
2017-11-12 21:02:40 +01:00
Andreas Zweili 9e88888750 rename the django project 2017-11-12 20:22:52 +01:00