190242bbb7
add surround the submit button with a P Tag
2018-02-18 18:33:14 +01:00
17885e82e4
add a fixture for a test user
2018-02-18 13:23:39 +01:00
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
59073ad8c2
add of checkout form
2018-02-17 10:51:32 +01:00
ccee783a98
add local bootstrap to be able to develop offline
2018-02-15 07:46:43 +01:00
9b31f2a20f
add the currency name to all the prices
2018-02-13 20:00:15 +01:00
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
b228d5954e
clean up the process_article_prices function
2018-02-12 22:48:54 +01:00
7a245b317d
move some code out of the views.py file
2018-02-12 22:38:16 +01:00
5084b2a42b
Merge branch 'cart' into andreas
2018-02-12 21:56:19 +01:00
059ca9d0f7
add update routine for existing items
2018-02-11 23:49:36 +01:00
9120b019aa
remove the solution with the filter
2018-02-11 22:37:27 +01:00
6ef396a6d2
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-11 22:00:17 +01:00
7a9c06bbba
push for review
2018-02-11 21:56:53 +01:00
5220b4d567
add comments of thaught
2018-02-11 20:07:18 +01:00
080bb7823d
commit of pseudo idea of the form
2018-02-11 19:58:49 +01:00
775f32887a
add art# and Price of all items
2018-02-11 18:19:21 +01:00
8b6568c640
add a rough version of the "total" calculation
2018-02-11 16:48:45 +01:00
d0217960d3
how to get(article.id) in line 273
2018-02-11 16:24:36 +01:00
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
4f17a85dc7
add total summ
2018-02-04 21:48:29 +01:00
a01d08fded
add a max_length to the street number
2018-02-04 20:47:18 +01:00
ccde016af5
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-04 20:39:21 +01:00
e47156ce2a
add a check for the currency session variable
2018-02-04 20:38:54 +01:00
b74f3ee585
remove unneeded line
2018-02-04 20:38:35 +01:00
f1e6d680ba
fix article_list assignment
2018-02-04 20:36:10 +01:00
ccf823fad2
add amount to template
2018-02-04 20:18:49 +01:00
14095a7f63
Merge branch 'cart' of https://git.2li.ch/ibz/web_AI-5 into cart
2018-02-04 20:04:12 +01:00
4cbb662fb4
fix the currency selector in the details view
2018-02-04 20:03:09 +01:00
e36e290314
change cart view to list all chosen items
2018-02-04 19:58:17 +01:00
d3b0d0df0b
fix message bug
2018-02-04 19:44:09 +01:00
e9a24863dc
add patch
2018-02-04 19:27:09 +01:00
afbc2b500b
add onsolved problem for help
2018-02-04 18:58:21 +01:00
1fe10e2185
commit for andreas
2018-02-04 18:32:54 +01:00
c1a5627852
add for preview of andreas
2018-02-03 20:11:00 +01:00
0576cd4fb8
reflected need of model for cart positions (items in cart)
2018-02-02 13:21:03 +01:00
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
c6b1bb975b
broken models relationship in admin. please look at the erd.png
2018-02-01 21:28:17 +01:00
43b362d466
refactor firsthit
2018-02-01 17:05:58 +01:00
eb77635920
first hit to addtocartform
2018-02-01 17:02:08 +01:00
c5dbcc3d58
add a check for the currency key in the session
2018-01-28 21:31:27 +01:00
6ee5f56e73
add the currency calculation to the article view
2018-01-28 21:26:36 +01:00
915f31c413
add the currency calculation to the categories view
2018-01-28 21:14:55 +01:00
0162e10915
remove old code
2018-01-28 21:09:57 +01:00
62db260ec1
rename the articles_list in the category view
2018-01-28 21:09:27 +01:00
fb6831920c
remove jquery from the base template
2018-01-28 20:41:32 +01:00
1481727a51
add the currency calculation to the index page
2018-01-28 20:41:14 +01:00
e76b3cb80d
add a function to get the id of the hidden status
2018-01-28 20:39:22 +01:00
68a8110aea
add a function to collect the category list
2018-01-28 20:37:47 +01:00
ed0649f5fc
refactor the models import
2018-01-28 20:31:51 +01:00
c2758afb00
add a name to the register button
2018-01-28 20:30:35 +01:00
138f712e3b
add names and ids to forms and buttons
2018-01-28 20:28:36 +01:00
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
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
b53f52cac1
a work in progress test of custom filters
2018-01-19 15:40:55 +01:00
9d6c4b308c
fixed AJAX request and response
2018-01-16 00:54:35 +01:00
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
1f0940a2a6
updated to newer syntax
2018-01-14 22:11:57 +01:00
c7d9e62f05
again.
2018-01-14 22:11:34 +01:00
5e91470470
Revert "change function name from camelcase to python syntactical underlines"
...
This reverts commit 213d231c81
2018-01-14 22:09:18 +01:00
213d231c81
change function name from camelcase to python syntactical underlines
2018-01-14 22:02:43 +01:00
19af243c4f
not finished AJAX request for currencies
2018-01-14 19:57:48 +01:00
e765a999c6
divided the navigation to separate file.
2018-01-14 19:57:22 +01:00
05b77b8845
unfinished part of currency dropdown
2018-01-14 17:13:41 +01:00
013d3d2d28
falsche vorgehensweise um settings.py zurück zu bekommen
2018-01-14 14:07:53 +01:00
368c7342ef
add of a dropdown and footerinformation nicely
2018-01-14 13:43:13 +01:00
852751bc27
Merge branch 'frontendstyling' into andreas
2018-01-13 08:29:31 +01:00
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
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
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
3b73c67c66
add pictures to the article details page
2017-12-31 15:12:09 +01:00
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
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
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
1f3ab70dd6
add a registration
2017-12-29 16:46:21 +01:00
7bb875e696
selfmade css file
2017-12-29 15:12:29 +01:00
45ca9ca55e
unfinshed atempt to make a nav abandoned for later use maybe
2017-12-29 15:11:45 +01:00
d8a1d9ef54
add a user profile
2017-12-28 19:22:00 +01:00
59db6e221e
extend the base template with login, profile and logout links
2017-12-28 19:21:29 +01:00
de3e07dedb
add templates to support user authentication
2017-12-28 19:20:28 +01:00
56e56f0c1c
add url patterns to support user authentication
2017-12-28 19:19:47 +01:00
516dd47493
remove an unnecessary shebang
2017-12-28 19:15:35 +01:00
fce1a6a8c2
remove unnecessary attributes from the Person model
2017-12-28 19:14:41 +01:00
f9f1c89a01
make imports more explicit
2017-12-28 16:40:04 +01:00
6ddd869722
add fixtures with test data
2017-12-27 19:33:29 +01:00
f6597ec69e
fix the admin view of order of goods
2017-12-27 15:10:12 +01:00
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
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
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
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
991fbfc6f5
sort city outputs by zip code
2017-12-20 19:51:49 +01:00
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
bc3b14b5dd
add a base.html file and refactor the other html files
2017-12-19 20:21:46 +01:00
b8fa6eef5c
refactor the views
2017-12-19 20:12:21 +01:00
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
344447b909
UN-finished Push of currency branch. Preview only, do not change. Ivan on charge.
2017-12-18 09:03:52 +01:00
e63627ca4f
fix the category list
2017-12-17 19:37:49 +01:00
6894a1bfba
add a view to show the details of an article
2017-12-17 10:37:04 +01:00
7c5af973f2
add a view to list all articles in a category
2017-12-17 10:36:44 +01:00
cc313a50f3
add an index view and a coresponding template
2017-12-17 10:35:21 +01:00
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
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
2ec5a9ca7e
display the option name in the settings list
2017-12-06 20:35:06 +01:00
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
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
843ff35eaf
add category foreign keys to the article
2017-12-06 18:27:58 +01:00
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
db7e4f4e79
give some models a verbose name
2017-11-26 21:24:17 +01:00
de2d105eba
rename the settings model to setting
2017-11-26 21:23:18 +01:00
772924ef8d
display the salutations names
2017-11-19 22:22:40 +01:00
0427c43a25
slight refactor to conform with pep8
2017-11-19 22:22:26 +01:00
c4cc64eb23
refactor the admin file
2017-11-18 09:22:17 +01:00
fb94b92edc
refactor the models
2017-11-18 09:18:06 +01:00
c754670931
update the models
2017-11-14 21:26:44 +01:00
c539123a47
partial creation of the models
2017-11-13 22:55:20 +01:00
1a63c54761
rename the django project
2017-11-12 21:35:59 +01:00
25d0c6f2b0
Revert "rename the django project"
...
This reverts commit 9e88888750
2017-11-12 21:02:40 +01:00
9e88888750
rename the django project
2017-11-12 20:22:52 +01:00
Andreas Zweili
Ivan Hörler