-
-
Notifications
You must be signed in to change notification settings - Fork 729
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
Allow producer to edit their products on hubs' orders #13113
Open
chahmedejaz
wants to merge
9
commits into
openfoodfoundation:master
Choose a base branch
from
chahmedejaz:task/13031-allow-producers-to-edit-orders
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d199126
add enterprise producers_to_edit_orders setting
chahmedejaz f42711c
add ability to view supplier products containing orders
chahmedejaz a63dba8
add ability update supplier line_items in orders
chahmedejaz 79f0f9e
add ability search supplier products in orders
chahmedejaz 173110b
add bulk_management ability
chahmedejaz cf42a64
restrict page sections from supplier
chahmedejaz a868ed1
incorporate show_customer_names_to_suppliers setting
chahmedejaz e4ef890
update respective specs
chahmedejaz 90c1863
fix lint issues
chahmedejaz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -162,6 +162,9 @@ def can_manage_line_items_in_orders? | |
end | ||
end | ||
|
||
def can_manage_line_items_in_orders_only? | ||
!can_manage_orders? && can_manage_line_items_in_orders? | ||
end | ||
Comment on lines
+165
to
+167
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. spec ? |
||
|
||
protected | ||
|
||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,7 +43,13 @@ def visible_line_items | |
|
||
# Any line items that I can edit | ||
def editable_line_items | ||
Spree::LineItem.where(order_id: editable_orders.select(:id)) | ||
if @user.can_manage_line_items_in_orders_only? | ||
Spree::LineItem.editable_by_producers( | ||
@permissions.managed_enterprises.select("enterprises.id") | ||
) | ||
else | ||
Spree::LineItem.where(order_id: editable_orders.select(:id)) | ||
end | ||
Comment on lines
+46
to
+52
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. specs ? |
||
end | ||
|
||
private | ||
|
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 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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that should be it's own method instead of having disguised as lambda here.