Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

SystemDev_HRProject
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

6a67c92e

Commit 6a67c92e authored 2 months ago by duyanhehe

Downloads
- Plain Diff

Merge branch 'dev' of https://gitlab.uwe.ac.uk/td2-anh/systemdev_hrproject into dev

parents 9906c5c6 92c17aeb

No related branches found

No related tags found

Loading

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

app/dummydata.py 80 additions, 45 deletions

app/dummydata.py
app/routes/order.py 49 additions, 16 deletions

app/routes/order.py
app/routes/payments.py 43 additions, 31 deletions

app/routes/payments.py
app/routes/reservations.py 102 additions, 9 deletions

app/routes/reservations.py
app/templates/orders/order_detail.html 19 additions, 6 deletions

app/templates/orders/order_detail.html
app/templates/payments/payment.html 8 additions, 6 deletions

app/templates/payments/payment.html
app/templates/reservations/create_reservation.html 22 additions, 0 deletions

app/templates/reservations/create_reservation.html
app/templates/reservations/edit_table_reservation.html 32 additions, 0 deletions

app/templates/reservations/edit_table_reservation.html

with 355 additions and 113 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