Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cumulate quantities of similar dishes in KC report and Route sheet #668

Merged
merged 1 commit into from
Feb 22, 2017

Conversation

lamontfr
Copy link
Contributor

@lamontfr lamontfr commented Feb 20, 2017

Fixes #666.

Changes proposed in this pull request:

  • order/models.py Order.get_kitchen_items() : cumulate quantities for dishes having the same component_group
  • order/models.py Order.get_delivery_list() : cumulate quantities and concatenate remark for dishes having the same component_group.
  • order/tests.py : added tests for multiple order items having the same side dish in a given order

Status

  • READY

How to verify this change

1- Click on Kitchen Count in the menu
2- Generate orders for the day
3- Continue to print the Kitchen count and write down the quantities of each side dish in the summary near the top
4- Continue to Display a Route sheet for a route and write down the quantities of each side dish for a specific client
5- Go back to the Kitchen count orders list
6- Click to edit the order of the client chosen in point 4 above
7- Click on Add an order item
8- Choose the component group for the new order item to be identical to that of another side dish in the order
9- Set quantity = 1 and price = 2
10- Set billable to Yes
11- Click to update order
12- Click on Kitchen Count in the menu
13- Continue to print the Kitchen count and verify that the quantity for the side dish chosen in point 8 has increased by 1
14- Continue to Display the Route sheet for the route chosen in point 4 and verify that for the client chosen in point 4 the quantity for the side dish chosen in point 8 has increased by 1

@coveralls
Copy link

Coverage Status

Coverage increased (+0.07%) to 94.967% when pulling f96456a on lamontfr:fix666 into fcbe341 on savoirfairelinux:dev.

Copy link
Contributor

@lingxiaoyang lingxiaoyang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified.

Before PR:
image

After PR:
image

@lingxiaoyang lingxiaoyang merged commit d89c8ac into savoirfairelinux:dev Feb 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants