Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

secondExercise
- Activity
- Members
- Environments

Snippets Groups Projects

ea867aee

There was a problem fetching the pipeline summary.

Commit ea867aee authored 7 years ago by Hugo Carrasco

Downloads
- Plain Diff

Merge branch 'feature/mathiafl/item-stock-intergration' into 'master'

Feature/mathiafl/item stock intergration

See merge request tdt4242_7/secondExercise!16

parents 4c4744a5 25995b61

No related branches found

No related tags found

No related merge requests found

Pipeline #

Changes 12
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

secondExercise/helper_functions.py 20 additions, 0 deletions

secondExercise/helper_functions.py
secondExercise/settings.py 13 additions, 3 deletions

secondExercise/settings.py
webshop/admin.py 5 additions, 1 deletion

webshop/admin.py
webshop/migrations/0005_item_stock.py 18 additions, 0 deletions

webshop/migrations/0005_item_stock.py
webshop/models.py 28 additions, 13 deletions

webshop/models.py
webshop/static/webshop/css/cart.css 10 additions, 2 deletions

webshop/static/webshop/css/cart.css
webshop/templates/base.html 26 additions, 5 deletions

webshop/templates/base.html
webshop/templates/email/confirmation.html 33 additions, 0 deletions

webshop/templates/email/confirmation.html
webshop/templates/email/confirmation.txt 17 additions, 0 deletions

webshop/templates/email/confirmation.txt
webshop/templates/webshop/cart.html 57 additions, 3 deletions

webshop/templates/webshop/cart.html
webshop/urls.py 3 additions, 2 deletions

webshop/urls.py
webshop/views.py 21 additions, 13 deletions

webshop/views.py

with 251 additions and 42 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment