Fix class/module nesting #2098
Merged
Fix class/module nesting #2098
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
added 2 commits
July 18, 2017 16:44
Previously it was unclear when these were evaluated that Spree::ReturnItem is actually an active record class (inherited from Spree::Base). This makes it clear that we're actually nesting a class in a module in a class in a module.
Spree::Reimbursement::Credit is a class nested in a class, which isn't clear from the declaration. Spree::Reimbursement is an active record model that inherits from Spree::Base
houndci-bot
reviewed
Jul 18, 2017
| return true | ||
| else | ||
| add_error(:number_of_days, Spree.t('return_item_time_period_ineligible')) | ||
| return false |
| class TimeSincePurchase < Spree::ReturnItem::EligibilityValidator::BaseValidator | ||
| def eligible_for_return? | ||
| if (@return_item.inventory_unit.order.completed_at + Spree::Config[:return_eligibility_number_of_days].days) > Time.current | ||
| return true |
| return true | ||
| else | ||
| add_error(:rma_required, Spree.t('return_item_rma_ineligible')) | ||
| return false |
| class RMARequired < Spree::ReturnItem::EligibilityValidator::BaseValidator | ||
| def eligible_for_return? | ||
| if @return_item.return_authorization.present? | ||
| return true |
| return true | ||
| else | ||
| add_error(:order_not_completed, Spree.t('return_item_order_not_completed')) | ||
| return false |
| class OrderCompleted < Spree::ReturnItem::EligibilityValidator::BaseValidator | ||
| def eligible_for_return? | ||
| if @return_item.inventory_unit.order.completed? | ||
| return true |
| add_error(:inventory_unit_reimbursed, Spree.t('return_item_inventory_unit_reimbursed')) | ||
| return false | ||
| else | ||
| return true |
| def eligible_for_return? | ||
| if @return_item.inventory_unit.return_items.reimbursed.valid.any? | ||
| add_error(:inventory_unit_reimbursed, Spree.t('return_item_inventory_unit_reimbursed')) | ||
| return false |
| return true | ||
| else | ||
| add_error(:inventory_unit_shipped, Spree.t('return_item_inventory_unit_ineligible')) | ||
| return false |
| class InventoryShipped < Spree::ReturnItem::EligibilityValidator::BaseValidator | ||
| def eligible_for_return? | ||
| if @return_item.inventory_unit.shipped? | ||
| return true |
jhawthorn
approved these changes
Jul 19, 2017
|
Ahh, I guess require_dependency is what the autoloader uses to do these things. But yea, I'm happy explicitly spelling it out. |
😆 |
tvdeyen
approved these changes
Jul 19, 2017
mamhoff
approved these changes
Jul 20, 2017
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.
We had some cases in solidus where we were unclearly nesting classes and modules inside other classes and modules.
This breaks out the unclear definitions into what they should be.