Uk/hub closed new #1522
Closed
Uk/hub closed new #1522
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
This was referenced Apr 5, 2017
Closed
mkllnk
requested changes
Apr 12, 2017
| @@ -1,7 +1,7 @@ | |||
| module OpenFoodNetwork | |||
| class EnterpriseInjectionData | |||
| def active_distributors | |||
| @active_distributors ||= Enterprise.distributors_with_active_order_cycles | |||
| @active_distributors ||= Enterprise.distributors_with_active_order_cycles.andand.ready_for_checkout | |||
There was a problem hiding this comment.
The andand is not needed for scopes.
app/controllers/base_controller.rb
Outdated
|
|
||
| def ensure_shop_ready | ||
| # Don't display order cycles if shop is not ready for checkout | ||
| @order_cycles = {} unless @distributor.ready_for_checkout? |
There was a problem hiding this comment.
It doesn't seem wise to me to first query order cycles and then just forget about them. We can check that pre-condition first, right?
|
My suggested changes are in Matt-Yorkley#6. Hope to merge this next week. |
Merging mklink's updates
Merged
|
Merged in #1537. |
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.
Updated PR for #1343. Supercedes #1347 and #1516.