Commit Graph

37 Commits

Author SHA1 Message Date
Ivan Hörler f6ae6cf872 add profile oders in tableform with 2018-02-27 22:01:39 +01:00
Andreas Zweili 9b0fc0ba06 allow the ExchangeRate to be null
If we buy the article in CHF there is no ExchangeRate object
2018-02-26 22:31:37 +01:00
Ivan Hörler 6c46d0a6ce add order 2018-02-26 19:56:45 +01:00
Ivan Hörler cb19ca6205 add amountform not working yet 2018-02-18 21:58:46 +01:00
Andreas Zweili 7a9c06bbba push for review 2018-02-11 21:56:53 +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 013d3d2d28 falsche vorgehensweise um settings.py zurück zu bekommen 2018-01-14 14:07:53 +01:00
Andreas Zweili 9ef8a4371e correct the datetimefield on the orders model
In Django it's better to use timezone.now instead of datetime.now()
this is because it has additional settings for timezones which this
way wouldn't get reflected in the attributes and lead to wrong
datetime values.
2018-01-04 12:30:01 +01:00
Ivan Hörler 487c96710a Merge commit 'ee7232cd502afbf15f36769da0835b4a1e1358df' into currency
* commit 'ee7232cd502afbf15f36769da0835b4a1e1358df':
  checkout the production branch on the production server
  add a registration
  disable debugging for production
  add a user profile
  extend the base template with login, profile and logout links
  add templates to support user authentication
  add url patterns to support user authentication
  remove an unnecessary shebang
  remove unnecessary attributes from the Person model
  redirect logins back to the index
  make imports more explicit
  remove an unnecessary configuration
  remove an old file
  change the article status to active
  change the content include because the org-mode file is called doku
  add a python package to the ansible role
  add fixtures with test data
  fix the admin view of order of goods
  added sketch of Siteview to docs
2017-12-29 19:28:31 +01:00
Andreas Zweili 516dd47493 remove an unnecessary shebang 2017-12-28 19:15:35 +01:00
Andreas Zweili fce1a6a8c2 remove unnecessary attributes from the Person model 2017-12-28 19:14:41 +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 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 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 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 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 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 fb94b92edc refactor the models 2017-11-18 09:18:06 +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 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