TaxRate M-M TaxCategory #1851
Merged
TaxRate M-M TaxCategory #1851
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
houndci-bot
reviewed
Apr 21, 2017
| @@ -4,7 +4,10 @@ class TaxCategory < Spree::Base | |||
| validates :name, presence: true | |||
| validates_uniqueness_of :name, unless: :deleted_at | |||
|
|
|||
| has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category | |||
|
|
|||
houndci-bot
reviewed
Apr 21, 2017
| @@ -4,7 +4,10 @@ class TaxCategory < Spree::Base | |||
| validates :name, presence: true | |||
| validates_uniqueness_of :name, unless: :deleted_at | |||
|
|
|||
| has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category | |||
|
|
|||
vladstoick
force-pushed
the
tax_category_tax_rate_relation
branch
3 times, most recently
from
c3babf9
to
d8bb9e9
Compare
mamhoff
suggested changes
Apr 22, 2017
There was a problem hiding this comment.
This looks like a great improvement. One thing though: Would you mind moving the spec changes to be the first commit, mark them as pending, and re-enable them once you're done with the refactoring? We want to make sure every single commit passes CI, and the way the commits are organized here they won't, unfortunately.
Also, please have a look at Chris Beams guide on commit messages. Some of your commit messages have very long headings, and almost none give any background as to why you did the change.
| <td class="align-center"><%=tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td> | ||
| <td class="align-center"> | ||
| <% if tax_rate.tax_categories.any? %> | ||
| <%= tax_rate.tax_categories.map(&:name).join(", ") %> |
There was a problem hiding this comment.
Here, you might want to use an internationalized separator, as not all locales will work with a comma separated list. Most will though, so I won't insist. :)
vladstoick
force-pushed
the
tax_category_tax_rate_relation
branch
2 times, most recently
from
9487529
to
3293845
Compare
vladstoick
force-pushed
the
tax_category_tax_rate_relation
branch
from
3293845
to
bdc504a
Compare
jordan-brough
suggested changes
May 22, 2017
| TaxRate.find_each do |tax_rate| | ||
| tax_category_ids = TaxRateTaxCategory.where(tax_rate_id: tax_rate.id).pluck(:tax_category_id) | ||
|
|
||
| if tax_category_ids.count == 1 |
There was a problem hiding this comment.
Nitpick: Don't need this if right? The logic in the else would handle it?
| @@ -4,7 +4,9 @@ class TaxCategory < Spree::Base | |||
| validates :name, presence: true | |||
| validates_uniqueness_of :name, unless: :deleted_at | |||
|
|
|||
| has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category | |||
| has_many :tax_rate_tax_categories, class_name: Spree::TaxRateTaxCategory, dependent: :destroy | |||
There was a problem hiding this comment.
Since inverse_of is currently broken in Solidus it's probably worth adding it to these since we're starting fresh with them?
vladstoick
force-pushed
the
tax_category_tax_rate_relation
branch
from
bdc504a
to
877bd25
Compare
jordan-brough
approved these changes
May 22, 2017
vladstoick
force-pushed
the
tax_category_tax_rate_relation
branch
from
877bd25
to
a2f5206
Compare
vladstoick
force-pushed
the
tax_category_tax_rate_relation
branch
3 times, most recently
from
9c6b3cb
to
9337dcc
Compare
mamhoff
approved these changes
May 22, 2017
solidusio#1851 will change the type of relation to a many to many so specs will temporarily need to be skipped until changes are made to the specs.
Implements solidusio#1836 The current relation between TaxRate and TaxCategory can lead to unnecessary tax rates if a store has multiple tax categories and if it supports countries (such as Australia) that have a standard tax rate. This means that for each TaxCategory, the store will have an extra tax rate even if the percent is the same. By transforming this relation to a M-M we can allow stores to create tax rates that have multiple tax categories.
Specs have been disabled until changes to the relation between TaxRate and TaxCategory have been updated.
vladstoick
force-pushed
the
tax_category_tax_rate_relation
branch
from
7a66fff
to
8033843
Compare
jordan-brough
pushed a commit
to Lostmyname/solidus
that referenced
this pull request
Jun 2, 2017
solidusio#1851 will change the type of relation to a many to many so specs will temporarily need to be skipped until changes are made to the specs.
vladstoick
added a commit
to Lostmyname/solidus
that referenced
this pull request
Aug 4, 2017
solidusio#1851 will change the type of relation to a many to many so specs will temporarily need to be skipped until changes are made to the specs.
jordan-brough
pushed a commit
to Lostmyname/solidus
that referenced
this pull request
Dec 12, 2017
solidusio#1851 will change the type of relation to a many to many so specs will temporarily need to be skipped until changes are made to the specs.
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.
Related to issue #1836
tax_rate.tax_category_id.tax_categories: []