Commit Graph

277 Commits

Author SHA1 Message Date
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
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
Andreas Zweili
c2758afb00 add a name to the register button 2018-01-28 20:30:35 +01:00
Andreas Zweili
138f712e3b add names and ids to forms and buttons 2018-01-28 20:28:36 +01:00
Andreas Zweili
13ad0fe98e add a method to the ExchangeRate model to calculate the new currency 2018-01-28 20:26:41 +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
Andreas Zweili
faba1a597d add a form for a currency drop down 2018-01-28 20:24:35 +01:00
Ivan Hörler
2f940e57c7 getting rid of clutter. 2018-01-21 22:47:14 +01:00
Ivan Hörler
dba76057b3 added new generic rss fetch and parse functions and setup to store not only today value but all values in file and update if new are available. 2018-01-21 21:31:26 +01:00
Ivan Hörler
b53f52cac1 a work in progress test of custom filters 2018-01-19 15:40:55 +01:00
Ivan Hörler
9d6c4b308c fixed AJAX request and response 2018-01-16 00:54:35 +01:00
Ivan Hörler
fce2f77cb2 add same id as value and name now it pops up because of app.js but does override somehow 2018-01-15 00:07:14 +01:00
Ivan Hörler
2a1a565f90 typos 2018-01-14 23:39:20 +01:00
Ivan Hörler
7ff173d9c7 yess! 2018-01-14 23:38:10 +01:00
Ivan Hörler
595d02433c handling all post prevents errors. 2018-01-14 23:23:41 +01:00
Ivan Hörler
d74adc65f4 bad 2018-01-14 22:54:46 +01:00
Ivan Hörler
f44a13cf98 minimal refactoring 2018-01-14 22:50:54 +01:00
Ivan Hörler
1f0940a2a6 updated to newer syntax 2018-01-14 22:11:57 +01:00
Ivan Hörler
c7d9e62f05 again. 2018-01-14 22:11:34 +01:00
Ivan Hörler
5e91470470 Revert "change function name from camelcase to python syntactical underlines"
This reverts commit 213d231c81.
2018-01-14 22:09:18 +01:00
Ivan Hörler
213d231c81 change function name from camelcase to python syntactical underlines 2018-01-14 22:02:43 +01:00
Ivan Hörler
2117c97874 for andreas 2018-01-14 21:30:57 +01:00
Ivan Hörler
4ea27b0bbc delete redundacy 2018-01-14 21:21:01 +01:00
Ivan Hörler
19af243c4f not finished AJAX request for currencies 2018-01-14 19:57:48 +01:00
Ivan Hörler
e765a999c6 divided the navigation to separate file. 2018-01-14 19:57:22 +01:00
Ivan Hörler
7fb1c36e98 changed static url's to correctly detected ones. by runserver. needs to be checked for apache! 2018-01-14 19:56:33 +01:00
Ivan Hörler
05b77b8845 unfinished part of currency dropdown 2018-01-14 17:13:41 +01:00
Ivan Hörler
ec92099fc9 duno how to restore. created new. 2018-01-14 14:11:27 +01:00
Ivan Hörler
013d3d2d28 falsche vorgehensweise um settings.py zurück zu bekommen 2018-01-14 14:07:53 +01:00
Ivan Hörler
c4d018be95 first try of a form for currency dropdown 2018-01-14 13:44:11 +01:00
Ivan Hörler
368c7342ef add of a dropdown and footerinformation nicely 2018-01-14 13:43:13 +01:00
Ivan Hörler
d5ad3c77d5 Merge commit '0048475a2d63a08805050d767834606e6547eab9' into currency
* commit '0048475a2d63a08805050d767834606e6547eab9':
  remove a migration file
  add a cronjob to trigger the currency updates
  add migrations to the ignore list
  remove a duplicate entry
  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.
  selfmade css file
  unfinshed atempt to make a nav abandoned for later use maybe
  add bootstrap to ansible and vagrant for django-bootstrap3 support
2018-01-13 13:42:06 +01:00
Andreas Zweili
0048475a2d remove a migration file 2018-01-13 10:46:49 +01:00
Andreas Zweili
95ec91fbf0 remove a duplicate entry 2018-01-13 09:34:01 +01:00
Ivan Hörler
10c9d8602d add order by dates 2018-01-13 08:39:24 +01:00
Andreas Zweili
852751bc27 Merge branch 'frontendstyling' into andreas 2018-01-13 08:29:31 +01:00
Ivan Hörler
e8ffe635f9 typos in template 2018-01-11 19:24:52 +01:00
Ivan Hörler
b02e8c1343 corrected offline error to be catched. 2018-01-11 19:21:13 +01:00
Ivan Hörler
6cf9d77cae Corrected a race condition of strings in views.py and the related parts of exchange_rates.py 2018-01-11 07:54:51 +01:00
Ivan Hörler
aca21b4353 changed view and catched a bug in currencies.views.py 2018-01-10 22:43:22 +01:00
Ivan Hörler
a4307da75f Merge branch 'currency' of git.2li.ch:ibz/web_AI-5 into currency
* 'currency' of git.2li.ch:ibz/web_AI-5:
  correct the datetimefield on the orders model
2018-01-10 00:59:01 +01:00
Ivan Hörler
6290eb7a6a corrected currencies app and added different view. 2018-01-10 00:58:34 +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
4f51e17504 Merge remote-tracking branch 'origin/master' into currency
* origin/master:
  remove the old media directory
  create the path /srv/media/images in the Vagrant vm
  create the media directory on the production server
  add pictures to the article details page
  move the media root and add support for MEDIA_URL
  readd two commands
2018-01-03 08:35:18 +01:00
Ivan Hörler
47ed36e3af vagrant provision does not work so i need to commit unsolved files 2018-01-03 08:34:25 +01:00
Ivan Hörler
50b16ec842 commit for history. going to implement new databasestructure now. 2018-01-02 14:51:06 +01:00
Andreas Zweili
877b536e4a remove the old media directory 2017-12-31 15:23:31 +01:00
Andreas Zweili
3b73c67c66 add pictures to the article details page 2017-12-31 15:12:09 +01:00
Andreas Zweili
559f77545d move the media root and add support for MEDIA_URL 2017-12-31 15:09:26 +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
Ivan Hörler
dc083d9c5e Merge branch 'currency' into frontendstyling
* currency: (25 commits)
  changed view and deleted the database unique filed
  add tableview in /currencies
  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
  Add date to currencies list
  ...

# Conflicts:
#	Vagrantfile
#	ansible/roles/web_AI-5/tasks/main.yml
#	django/didgeridoo/didgeridoo/settings.py
#	django/didgeridoo/webshop/templates/webshop/base.html
2017-12-29 19:43:16 +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
Ivan Hörler
19afc446ed changed view and deleted the database unique filed 2017-12-29 19:26:01 +01:00
Ivan Hörler
13805f790d add tableview in /currencies 2017-12-29 17:02:33 +01:00
Andreas Zweili
ddd4001fb3 Merge branch 'master' into production 2017-12-29 16:46:48 +01:00
Andreas Zweili
1f3ab70dd6 add a registration 2017-12-29 16:46:21 +01:00
Ivan Hörler
7bb875e696 selfmade css file 2017-12-29 15:12:29 +01:00
Ivan Hörler
45ca9ca55e unfinshed atempt to make a nav abandoned for later use maybe 2017-12-29 15:11:45 +01:00
Andreas Zweili
c229194e50 disable debugging for production 2017-12-29 11:04:48 +01:00
Andreas Zweili
d8a1d9ef54 add a user profile 2017-12-28 19:22:00 +01:00
Andreas Zweili
59db6e221e extend the base template with login, profile and logout links 2017-12-28 19:21:29 +01:00
Andreas Zweili
de3e07dedb add templates to support user authentication 2017-12-28 19:20:28 +01:00
Andreas Zweili
56e56f0c1c add url patterns to support user authentication 2017-12-28 19:19:47 +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
Andreas Zweili
acafb61399 redirect logins back to the index 2017-12-28 19:14:00 +01:00
Andreas Zweili
f9f1c89a01 make imports more explicit 2017-12-28 16:40:04 +01:00
Andreas Zweili
f48c316f39 remove an unnecessary configuration 2017-12-28 16:26:54 +01:00
Andreas Zweili
6ddd869722 add fixtures with test data 2017-12-27 19:33:29 +01:00
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
Ivan Hörler
9061e66151 Duno if thats your and my config and has to be ignored but for now il commit it. 2017-12-26 13:02:19 +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