rebase to spree 2.4.11.beta #1
Open
Conversation
This file contains hidden or 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
…ken_or_user so it can be used by both simple_current_order and current_order Set simple_current_order to an empty order in case it's not found to avoid hitting the database needlessly Using double quotes Fixes spree#5647 Conflicts: core/lib/spree/core/controller_helpers/order.rb
Show return authorization return item preferred_reimbursement_type When item isn't editable Fixes spree#5651
Changes: - allows the SameProduct rule to exchange an item for the same item - filters out out-of-stock variants for the SameProduct rule Fixes spree#5652
Zipcode validation was failing in our fork because we have extra validation and the country didn't match up in these. Also, remove some unused rspec address definitions. fixes spree#5654
Using Promotion::Rules::Product rules with line item actions (Promotion::Actions::CreateItemAdjustments) was broken when the match_policy was "none". Closes spree#5664
Add a bit of leniency in the edge-of-edge cases on multiple reimbursement types and rounding issues. See code comments. Closes spree#5656
Return items preferred reimbursement type returns an instance, not a class. Comparison in reimbursement type validator was always returning false. Closes spree#5657
…e-dependency-in-2-4 Fix spree_auth_devise version for 2-4-stable
Removed class "security" from clear cache field-set, as this will cause other extension which uses deface and depend on ".row .security" to append itself twice. A notable example would be the spree_i18n extension's override, which appears twice and screws up locale selection dropdown at the frontend.
There are a couple places in the code where it uses 2014 as the expiry for a credit card. That's all fine and dandy for the next month or so, but come January 1. This should make sure that everyone stays happy. fixes spree#5691
resolves spree#5655 LineItemsController class_attribute prevent update on empty options fixes spree#5672
Prefer correctness over premature optimization. With the delete_all there is not a cascade delete of related objects including the inventory unit. When building an order on the backend this causes orphaned inventory unit records which manifest themselves confusingly in the RMA area as you have rows for each line item. This was noted as a comment[1] on the original commit and a PR was requested. This is that PR. 1. spree@aadb5ae#commitcomment-9487805 Fixes spree#6592
This could be used to execute arbitrary files on the host system, as well as disclosing the existence of files on the system. Signed-off-by: Jeff Dutil <JDutil@BurlingtonWebApps.com>
Fix rounding the Reimbursement total
Bug: Calling update! on an adjustment with no source always returns nil.
Ruby scopes variables by block scope, and onditionals do not open a new scope.
Essentially, what happens in this function, is that an `amount` var is
immediately defined (at the top of the function) and set to nil.
This then completely takes precedence over the `amount` instance method,
returning nil instead of the actual amount.
The fix is to use `self.amount` when refering to the method, although a much
better practice would be to not use vars that match real variables.
We have done no testing on 3.0, where the method has been refactored. Chances
are that it's suffering from the same bug.
POC code, displaying the bug:
class A
def amount
1
end
def amount=
"whatever"
end
def update!
return amount if false
if false
amount = 2
end
amount
end
end
A.new.update! # => nil
Also note that even if source was present, `amount=` never gets called because
`amount = 2` creates a local variable, while `self.amount = 2` would call the
function.
Adjustment#update! returning nil when !source.present.
The initial intent of Spree::Alert was to push notifications from Spree Commerce to store owners when there were security alerts or new versions released. This functionality hasn't been used much though in the past several years with only a couple alerts issued for security updates. The implementation was simply sticking the alerts in admin cookies, and has now taken up too much space causing CookieOverflow errors. Since this feature isn't really being used, and most developers rather follow the https://groups.google.com/forum/#!forum/spree-user mailing list or the Spree Commerce blog & twitter accounts we're just going to remove it and shut down the alerts.spreecommerce.com service. Fixes spree#6465 Fixes spree#6516
…ication-positions-on-association-collection-removal Maintain classification positions on association collection removal
Destroy dependent zone members.
Add correct scope for quantity not available translation
Add translation referenced in `backend/app/views/spree/admin/return_authorizations/new.html.erb`
It was breaking the layout a little.
Remove rogue `<td>` tag
Add missing translation to en.yml
due to an issue with the paymill integration https://github.com/Shopify/active_merchant/pull/1561
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
No description provided.