Ivan Hörler
c5419bfc60
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
push form hack
# Conflicts:
# django/didgeridoo/webshop/forms.py
# django/didgeridoo/webshop/templates/webshop/cart.html
# django/didgeridoo/webshop/views.py
2018-02-19 20:05:04 +01:00
Ivan Hörler
7161489cf2
unfinished try to set initial value in views.py line 243
2018-02-19 19:11:40 +01:00
Andreas Zweili
eacdbd3f30
push form hack
2018-02-19 18:39:53 +01:00
Ivan Hörler
29e99e49c0
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
...
* 'cart' of git.2li.ch:ibz/web_AI-5:
some corrections to comply with PEP8
remove the inline pictures from the Article admin page
add surround the submit button with a P Tag
add another use case
fix a typo
add a entry about testing
correct the bib entries
correct spelling mistakes
wrap the jinja template in a sexylisting environment
remove todo tag
add empty lines for better visibiliy
remove whitespace
add a source for fixtures
2018-02-18 21:59:04 +01:00
Ivan Hörler
cb19ca6205
add amountform not working yet
2018-02-18 21:58:46 +01:00
Andreas Zweili
84b24501fb
Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
2018-02-18 20:31:37 +01:00
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