ibz/web_AI-5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
425 Commits 7 Branches 0 Tags 6.7 MiB
6e54bdec0d
Commit Graph

82 Commits

Author SHA1 Message Date
Andreas Zweili
6e54bdec0d fix comment indents 2018-02-25 14:22:22 +01:00
Andreas Zweili
597dd70ba7 change the template in the checkout view 2018-02-25 14:21:32 +01:00
Andreas Zweili
f36550e9d4 add a user object to the checkout view 2018-02-25 14:20:59 +01:00
Ivan Hörler
5b1530c0bd add checkout template, view and function 2018-02-25 13:12:13 +01:00
Ivan Hörler
9f8a01dbaf clean for next step 2018-02-25 12:02:32 +01:00
Ivan Hörler
52a6ae1ecc improved message if items in cart are deleted until there are none. 2018-02-25 11:46:32 +01:00
Ivan Hörler
ff36017fa4 fixed add update and delete function 2018-02-25 09:30:46 +01:00
Ivan Hörler
83bf8ea362 fix add and replace 2018-02-21 22:35:29 +01:00
Ivan Hörler
e2fce385da add delete operation to cart 2018-02-21 21:59:50 +01:00
Andreas Zweili
935c97de46 assign the list before the view starts 
Unassigned variables cause the cart to crash at the first run.
 2018-02-21 21:11:52 +01:00
Andreas Zweili
cfa588f3b3 correct the variable name 
With the wrong name the cart crashes at the first run
 2018-02-21 21:11:26 +01:00
Ivan Hörler
e79cba32c1 create zip to render in html position_list and amount_form. 2018-02-21 08:04:47 +01:00
Ivan Hörler
799b1ba502 add print helps to find issue in initial value 2018-02-20 21:57:13 +01:00
Ivan Hörler
933cd40336 add operation mode in restrict_cart_to_one_article function 2018-02-20 21:22:25 +01:00
Ivan Hörler
a6ca585918 fix currency connection 2018-02-20 21:03:53 +01:00
Ivan Hörler
ae1e5e5051 add initial value with dictionary 2018-02-20 20:59:18 +01:00
Ivan Hörler
56a724567e Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart 
* 'cart' of git.2li.ch:ibz/web_AI-5:
  extend the test case introduction
  remove unused code
  refactor according to PEP8
  refactor according to PEP8
  remove unnecessary h1 tags from template
  extend the test cases
  extend the "Testing" section
  remove unneeded escapes

# Conflicts:
#	django/didgeridoo/webshop/views.py
 2018-02-19 23:00:32 +01:00
Ivan Hörler
cbbe74a5b3 created funciton to restrict cart to get several same items 2018-02-19 22:58:25 +01:00
Andreas Zweili
5e716b7f2b remove unused code 2018-02-19 21:13:29 +01:00
Andreas Zweili
dbb6fe9acb refactor according to PEP8 2018-02-19 21:13:08 +01:00
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
cb19ca6205 add amountform not working yet 2018-02-18 21:58:46 +01:00
Ivan Hörler
16ce980215 unfinished form for andreas 2018-02-18 19:28:39 +01:00
Ivan Hörler
59073ad8c2 add of checkout form 2018-02-17 10:51:32 +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
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
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
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
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