Possibility to apply discount on order #6930
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add order.discounts models and move all bussines voucher logic to use it * Add OrderDiscount.amount field * Solve incorrect definition inside the migration file * Fix tests * Clean up the code * Update changelog * Apply changes after review * Add note about depreceated discount fields to changelog * Apply changes after review
…#6862) * Add order.discounts models and move all bussines voucher logic to use it * Add OrderDiscount.amount field * Solve incorrect definition inside the migration file * Fix tests * Clean up the code * Update changelog * Add mutation responsible for managing the discount assigned to order * Add mutations for discounting the prices for order lines * Fix for incorrect calculation of the prices after apply the discount * Fix tests * Add missing discount fields in order line * Add validation before adding new discount to order/orderLine * Update discount value type for the order line * Add disscount value to order line * Use proper type for discount type * Proper save the changes in discount's reason * Add order.discounts models and move all bussines voucher logic to use it * Add OrderDiscount.amount field * Solve incorrect definition inside the migration file * Fix tests * Clean up the code * Update changelog * Rename function to apply discount to value * Add validation to OrderDiscountDelete mutation * Add order field to the response of the ORderLine discount mutations * Add tests to cover the order discount mutations * Apply changes after review * Add note about depreceated discount fields to changelog * Add dataloader for order.discount. Add tests to cover the new field in Order type * Apply changes after review * Clean up the OrderDiscountsByOrderId dataloader * Add benchmark tests for checking the discount section and events * Clean up changelog after the merge base branch
* Add order.discounts models and move all bussines voucher logic to use it * Add OrderDiscount.amount field * Solve incorrect definition inside the migration file * Fix tests * Clean up the code * Update changelog * Add mutation responsible for managing the discount assigned to order * Add mutations for discounting the prices for order lines * Fix for incorrect calculation of the prices after apply the discount * Fix tests * Add missing discount fields in order line * Add validation before adding new discount to order/orderLine * Update discount value type for the order line * Add disscount value to order line * Use proper type for discount type * Proper save the changes in discount's reason * Add order.discounts models and move all bussines voucher logic to use it * Add OrderDiscount.amount field * Solve incorrect definition inside the migration file * Fix tests * Clean up the code * Update changelog * Rename function to apply discount to value * Add validation to OrderDiscountDelete mutation * Add order field to the response of the ORderLine discount mutations * Add tests to cover the order discount mutations * Add order events for discounting order. * Add order event for each discount action * Add discount events for order lines * Trigger discount events only from discount mutations * Add new event for automatically update the order with discount * Add to the autmatically discount event info about previous discount values * Fix incorrect call inside delete order discount mutation * Extend the mutation tests to check the proper events * Apply changes after review * Add note about depreceated discount fields to changelog * Add dataloader for order.discount. Add tests to cover the new field in Order type * Apply changes after review * Add missing dots in OrderEventDiscountObject and OrderDiscount fields description * Clean up the OrderDiscountsByOrderId dataloader
korycins
added
feature branch
test deployment
github-actions
bot
temporarily deployed
to
possibility-to-apply-discount-on-order
|
Here is the report for 9e338d9 (mirumee:possibility-to-apply-discount-on-order) Found 4 differences! (click me)
# saleor.graphql.accountbenchmark account
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
delete staff members 32 32 0
query staff user 20 20 4
staff create 22 22 4
staff update groups and permissions 33 33 5
# saleor.graphql.accountbenchmark permission group
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
permission group create 19 19 2
permission group delete 20 20 3
permission group query 7 7 0
permission group update 33 33 1
permission group update remove users with manage staff 27 27 3
# saleor.graphql.attributebenchmark attribute
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
query attribute 7 7 2
query attributes 11 11 3
# saleor.graphql.checkoutbenchmark checkout mutations
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
add billing address to checkout 49 49 5
add shipping to checkout 64 64 10
checkout email update 23 23 0
checkout payment charge 41 41 16
checkout shipping address update 69 69 13
checkout voucher code 68 68 11
- complete checkout 95 96 21
create checkout 76 76 12
- customer complete checkout 132 133 35
update checkout lines 87 87 16
# saleor.graphql.checkoutbenchmark homepage
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
user checkout details 39 39 2
# saleor.graphql.discountbenchmark sales
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
sales query with channel slug 16 16 0
sales query withot channel slug 15 15 0
# saleor.graphql.discountbenchmark vouchers
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
vouchers query with channel slug 16 16 0
vouchers query withot channel slug 15 15 0
# saleor.graphql.menubenchmark homepage
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
retrieve main menu 5 5 0
retrieve secondary menu 5 5 0
# saleor.graphql.orderbenchmark fulfillment refund and return products
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
fulfillment refund products order lines 46 46 2
fulfillment return products order lines 99 99 11
# saleor.graphql.orderbenchmark order
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
+ staff order details - 69 41
- user order details 22 23 1
# saleor.graphql.pagebenchmark page type
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
query page type 17 17 5
query page types 19 19 5
# saleor.graphql.productbenchmark category
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
category view 24 24 1
# saleor.graphql.productbenchmark collection
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
collection view 6 6 0
retrieve collection channel listings 4 4 0
# saleor.graphql.productbenchmark homepage
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
report product sales 10 10 3
retrieve product list 4 4 0
# saleor.graphql.productbenchmark product
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
product details 26 26 0
retrieve channel listings 18 18 0
retrieve product attributes 8 8 0
retrive products with product types and attributes 6 6 0
# saleor.graphql.productbenchmark variant
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
product variant bulk create 59 59 2
retrieve variant list 24 24 0
# saleor.graphql.productbenchmark variant stocks
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
product variants stocks create 22 22 5
product variants stocks delete 19 19 5
product variants stocks update 27 27 5
# saleor.graphql.producttest product sorting attributes
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
sort product not having attribute data 23 23 0
# saleor.graphql.shippingbenchmark shipping methods
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
vouchers query with channel slug 10 10 0
vouchers query without channel slug 9 9 0
# saleor.graphql.shopbenchmark homepage
test name left count right count duplicate count
----------------------------------------------------------- ----------- ----------- ---------------
retrieve shop 2 2 0
|
Codecov Report
@@ Coverage Diff @@
## master #6930 +/- ##
==========================================
- Coverage 93.05% 93.01% -0.04%
==========================================
Files 422 423 +1
Lines 30604 31126 +522
Branches 3129 3162 +33
==========================================
+ Hits 28478 28953 +475
- Misses 1494 1531 +37
- Partials 632 642 +10
Continue to review full report at Codecov.
|
github-actions
bot
temporarily deployed
to
possibility-to-apply-discount-on-order
github-actions
bot
temporarily deployed
to
possibility-to-apply-discount-on-order
github-actions
bot
temporarily deployed
to
possibility-to-apply-discount-on-order
| @@ -366,6 +365,20 @@ def _create_order( | |||
| status=status, | |||
| channel=checkout.channel, | |||
| ) | |||
| if checkout.discount: | |||
| # store voucher as a fixed value as it this the simplest solution for now. | |||
| # This will be solved when we refactor the voucher logic to use .discounts | |||
There was a problem hiding this comment.
Do we have a ClickUp task for this? Maybe it would useful to link it here.
There was a problem hiding this comment.
I will include this github thread to the task after I will analyze all requirements for this.
| @@ -548,7 +754,7 @@ def resolve_lines(root: models.Order, info): | |||
| @staticmethod | |||
| @permission_required(OrderPermissions.MANAGE_ORDERS) | |||
| def resolve_events(root: models.Order, _info): | |||
| return root.events.all().order_by("pk") | |||
| return root.events.prefetch_related("user").all().order_by("pk") | |||
There was a problem hiding this comment.
Ideally, the OrderEvent type should have a data loader for users, I think the simplest one would do the job:
class UserByIdLoader(DataLoader):
context_key = "user_by_id"
def batch_load(self, keys):
users = User.objects.in_bulk(keys)
return [users.get(user_id) for user_id in keys]
There was a problem hiding this comment.
We already discovered the issue with the missing dataloader here and in OrderEvent type. I believe @fowczarek already created the tasks for this as the changes require more work to do it properly. . I've added here the prefetch as I discover that we are generating huge amount of queries by calling order events. But the loaders here should be added in separate PR.
| return discount_parameters | ||
|
|
||
|
|
||
| def order_discount_event( |
There was a problem hiding this comment.
I would consider moving these to a new file saleor/order/events/discounts.py but if you don't have time let's skip it for now. Later we could try to refactor other events.
|
|
||
| return decorator | ||
|
|
||
|
|
||
| def get_voucher_discount_assigned_to_order(order: Order): |
There was a problem hiding this comment.
Again, I would consider if we can move all purely discount-related functions to saleor/order/utils/discounts.py.
* update the way of calculating the order discount * Apply changes after review
fowczarek
approved these changes
Mar 4, 2021
github-actions
bot
temporarily deployed
to
possibility-to-apply-discount-on-order
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I want to merge this change because it introduces the possibility to discount the draft orders.
Impact
Pull Request Checklist