Commit Graph

144 Commits

Author SHA1 Message Date
Ivan Hörler
cea3252322 add bootstrap to ansible and vagrant for django-bootstrap3 support 2017-12-27 19:32:14 +01:00
Ivan Hörler
318d599a2f Add date to currencies list 2017-12-27 18:17:14 +01:00
Andreas Zweili
f6597ec69e fix the admin view of order of goods 2017-12-27 15:10:12 +01:00
Ivan Hörler
1b7252a669 Merge branch 'master' into currency
* master:
  fix a typo
  move some parts from the vagrant file into a separate script
  make the setup script executable
  fix a typo
  add a setup script to the ansible role
  add a pip install routine to the ansible role
  add the repository to the ansible role
  fix a typo in the ansbible role
  add missing packages to the ansible role
  add a list of allowed hosts to the django settings
  change ansible includes to import_tasks
  extend the admin interface for the order class
  add an intermediate class between order and article
  add a date field to the orders class
  sort city outputs by zip code
  update readme with more up to date information
2017-12-26 13:03:20 +01:00
Andreas Zweili
054909b145 add a list of allowed hosts to the django settings 2017-12-25 22:32:07 +01:00
Andreas Zweili
0ef5cdff80 extend the admin interface for the order class
In order to be able to correctly edit the an order we need the
information of the induvidual order positions. In addition a better
layout is required to better find the information.
2017-12-21 23:07:58 +01:00
Andreas Zweili
f4aa223135 add an intermediate class between order and article
Because we need additional fields in an order it's necessary to add an
additional class where the information gets stored.
2017-12-21 23:06:09 +01:00
Andreas Zweili
3dc9aa33bb add a date field to the orders class
In order to be able to identify the correct customer order it's
necessary to have the date of the order available.
2017-12-21 23:05:10 +01:00
Andreas Zweili
991fbfc6f5 sort city outputs by zip code 2017-12-20 19:51:49 +01:00
Ivan Hörler
4da981e5d6 Merge commit 'bc3b14b5dd697f1784acbcbfa0ef0948de4ef560' into currency
* commit 'bc3b14b5dd697f1784acbcbfa0ef0948de4ef560':
  add a base.html file and refactor the other html files
  refactor the views
2017-12-19 22:38:21 +01:00
Ivan Hörler
fc5184fa77 get currency from SNB rss to work 2017-12-19 22:33:00 +01:00
Ivan Hörler
776f81b3c9 testpush 2017-12-19 21:28:05 +01:00
Andreas Zweili
bc3b14b5dd add a base.html file and refactor the other html files 2017-12-19 20:21:46 +01:00
Andreas Zweili
b8fa6eef5c refactor the views 2017-12-19 20:12:21 +01:00
Ivan Hörler
409b18807b corrections and first try to migrate 2017-12-18 19:19:08 +01:00
Ivan Hörler
28841df4e3 Merge branch 'master' into currency
* master:
  fix the category list
  add a view to show the details of an article
  add a view to list all articles in a category
  point the project root to the webshop app
  add an index view and a coresponding template
2017-12-18 19:11:24 +01:00
Ivan Hörler
344447b909 UN-finished Push of currency branch. Preview only, do not change. Ivan on charge. 2017-12-18 09:03:52 +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
a73f48a40a point the project root to the webshop app 2017-12-17 10:35:46 +01:00
Andreas Zweili
cc313a50f3 add an index view and a coresponding template 2017-12-17 10:35:21 +01:00
Andreas Zweili
83bb342383 cities return both the zip code and their name
Since some cities have multiple zip codes it's necessary that they
return both the zip code and the name.
2017-12-12 20:32:57 +01:00
Andreas Zweili
6b5bd3fe45 only allow positiv prices
In order to only allow positiv prices I had import two new classes.
2017-12-06 21:14:14 +01:00
Andreas Zweili
2ec5a9ca7e display the option name in the settings list 2017-12-06 20:35:06 +01:00
Andreas Zweili
71438ed14c add images to the Picture model
In addition to the image attribute I added the directory where the
images get stored.
2017-12-06 20:32:49 +01:00
Andreas Zweili
4626d02435 set the media root 2017-12-06 20:31:47 +01:00
Andreas Zweili
9e0a80a419 change the article description to TextField type
A text field makes it easier to edit the description than with a
CharField because the text box is bigger.
2017-12-06 18:28:35 +01:00
Andreas Zweili
843ff35eaf add category foreign keys to the article 2017-12-06 18:27:58 +01:00
Andreas Zweili
134c5ea066 remove the article foreign key from the categories
Articles belong to a category not the other way round.
2017-12-06 18:26:57 +01:00
Andreas Zweili
a3ffae1ad3 add django-extensions for generating the diagrammes 2017-12-03 17:00:57 +01:00
Andreas Zweili
db7e4f4e79 give some models a verbose name 2017-11-26 21:24:17 +01:00
Andreas Zweili
de2d105eba rename the settings model to setting 2017-11-26 21:23:18 +01:00
Andreas Zweili
772924ef8d display the salutations names 2017-11-19 22:22:40 +01:00
Andreas Zweili
0427c43a25 slight refactor to conform with pep8 2017-11-19 22:22:26 +01:00
Andreas Zweili
c4cc64eb23 refactor the admin file 2017-11-18 09:22:17 +01:00
Andreas Zweili
fb94b92edc refactor the models 2017-11-18 09:18:06 +01:00
Andreas Zweili
1085ef3295 make the manage.py script executable 2017-11-14 21:26:52 +01:00
Andreas Zweili
c754670931 update the models 2017-11-14 21:26:44 +01:00
Andreas Zweili
c539123a47 partial creation of the models 2017-11-13 22:55:20 +01:00
Andreas Zweili
64a4edd3f6 add the webshop app to django 2017-11-13 22:48:51 +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