Commit Graph

74 Commits

Author SHA1 Message Date
Andreas Zweili fc2af695a2 add a link to the Readme 2018-02-28 21:58:18 +01:00
Ivan Hörler de24264331 undo currency dropdown onclick and fix price tag in order 2018-02-28 21:47:19 +01:00
Ivan Hörler 404941b235 fix pos_price in Orderview 2018-02-28 21:40:17 +01:00
Ivan Hörler 3a8a5ea1da refactor and clean 2018-02-28 21:05:27 +01:00
Ivan Hörler db1fb337ba cleanup code and refacture visual usability 2018-02-28 08:13:13 +01:00
Ivan Hörler 1e577f4520 improve dropdown 2018-02-28 01:23:20 +01:00
Ivan Hörler ab30417a80 cleanup 2018-02-28 01:22:27 +01:00
Ivan Hörler a18765b0a6 add orders RESTfull 2018-02-27 23:56:41 +01:00
Ivan Hörler f170f5b0da add checkout cancel button 2018-02-27 22:16:24 +01:00
Andreas Zweili 208d7d51df correct the html templates 2018-02-27 18:21:34 +01:00
Andreas Zweili a1e74a32c2 readd the order url
somehow this got lost
2018-02-26 22:51:43 +01:00
Andreas Zweili 691fdc12f5 display the position amount correctly 2018-02-26 21:53:21 +01:00
Ivan Hörler a389e64149 fix order save to db 2018-02-26 21:22:07 +01:00
Ivan Hörler 736c5d4ba3 fix url for order 2018-02-26 20:56:18 +01:00
Ivan Hörler ffcf6e6ba5 change orders to order and delete unused 2018-02-26 20:49:49 +01:00
Ivan Hörler 6c46d0a6ce add order 2018-02-26 19:56:45 +01:00
Ivan Hörler 2c52c2483a improved the table styleing 2018-02-25 19:26:26 +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 e2fce385da add delete operation to cart 2018-02-21 21:59:50 +01:00
Andreas Zweili 5f58134420 update a variable 2018-02-21 21:11:07 +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 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 50c0bd847b Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart 2018-02-19 21:04:38 +01:00
Andreas Zweili a763ae1c5b Merge branch 'andreas' into cart 2018-02-19 21:04:33 +01:00
Andreas Zweili acbe86d0ce remove unnecessary h1 tags from template 2018-02-19 21:04:03 +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 190242bbb7 add surround the submit button with a P Tag 2018-02-18 18:33:14 +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
Andreas Zweili 9120b019aa remove the solution with the filter 2018-02-11 22:37:27 +01:00
Andreas Zweili 7a9c06bbba push for review 2018-02-11 21:56:53 +01:00
Ivan Hörler 775f32887a add art# and Price of all items 2018-02-11 18:19:21 +01:00
Ivan Hörler 4f17a85dc7 add total summ 2018-02-04 21:48:29 +01:00
Ivan Hörler ccf823fad2 add amount to template 2018-02-04 20:18:49 +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 e9a24863dc add patch 2018-02-04 19:27:09 +01:00
Ivan Hörler 1fe10e2185 commit for andreas 2018-02-04 18:32:54 +01:00
Ivan Hörler eb77635920 first hit to addtocartform 2018-02-01 17:02:08 +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 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