Skip to content

Commit

Permalink
Update branch
Browse files Browse the repository at this point in the history
  • Loading branch information
IKarbowiak committed Nov 27, 2019
2 parents b3ffb03 + e9894c2 commit e4ec5d5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Now force pytest to ignore the environment variable containing the django settings module - #4992 by @NyanKiyoshi
- Extend JWT token payload with user information - #4987 by @salwator
- Optimize the queries for product list in the dashboard - #4995 by @IKarbowiak
- Drop dashboard 1.0 - #5000 by @IKarbowiak
- Fixed serialization error on weight fields when running `loaddata` and `dumpdb` - #5005 by @NyanKiyoshi
- Fixed JSON encoding error on Google Analytics reporting - #5004 by @NyanKiyoshi
- Drop dashboard 1.0 - #5000 by @IKarbowiak
Expand Down
2 changes: 1 addition & 1 deletion saleor/order/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,5 +349,5 @@ def get_voucher_discount_for_order(order: Order) -> Money:
if order.voucher.type == VoucherType.SHIPPING:
return order.voucher.get_discount_amount_for(order.shipping_price)
if order.voucher.type == VoucherType.SPECIFIC_PRODUCT:
return get_products_voucher_discount_for_order(order, order.voucher)
return get_products_voucher_discount_for_order(order.voucher)
raise NotImplementedError("Unknown discount type")

0 comments on commit e4ec5d5

Please sign in to comment.