[Do Not Merge] 2 2 stable head upgrade #1
Closed
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
Allow gateways to double check that value when reusing the card
[Fixes spree/spree#4673] [Fixes spree/spree#4678] Conflicts: api/app/views/spree/api/shipments/small.v1.rabl frontend/spec/features/caching/products_spec.rb
Oh, Picture-o, Picture-o Fixes spree/spree#4710
Similar to spree/spree#4521, this commit adds data-hooks that make manipulation of the admin/products/new page considerably easier, cleaner, and more succinct. Fixes spree/spree#4682 and spree/spree#4683 Conflicts: backend/app/views/spree/admin/products/_form.html.erb
I just demo-ed Spree the other day for a talk and had to change my rails version from 4.0.4 to 4.0.5 to get everything to work (obviously incredibly minor but I think worth fixing.)
Fixes spree/spree#4743 Conflicts: frontend/app/views/spree/shared/_google_analytics.html.erb
Conflicts: core/app/models/spree/line_item.rb
The cache keys were not unique anymore because we were passing nil, e.g. `@order` is not defined when rendering api/orders.json, same thing happened with all nested objects using a instance var instead of rabl `root_object` Fixes spree/spree#4757
Previous to Spree 2.2 orders didn't have a shipment_total. This should populate that new column for legacy orders Fixes spree/spree#4684
Gateway provided via active merchant might use those first and last name instead of the single name string Fixes spree/spree#4728
this addresses a change from spree/spree@71d4dee Fixes spree/spree#4770
While running Spree in Dutch locale, adding a Payment recognizes the decimal separator as thousands separator. So when using the pre filled value (e.g. 45.21) this will be converted to a much larger amount (4521.00). The fix makes sure that a localized value is filled in (45,21 instead of 45.21). Tested on Spree 2.2.1 Fixes spree/spree#4753 Conflicts: backend/app/views/spree/admin/payments/_form.html.erb
shipment.adjustment no longer exists so we can kill this. also wasn't tested, so no need to change test cases. My understanding is with the adjustment refactoring we don't need to deal with the open/close anymore anyway. Conflicts: api/app/controllers/spree/api/shipments_controller.rb
in check_authorization method. The original code is: session[:access_token] ||= params[:token] So once session[:access_token] has been set, I can't reset it unless I close my browser to invalidate session. The example scenario is below. If I had a order url with token "http://www.example.com/orders/R176458284/token/383caf1a6dd71df4" However, I incorrectly copy and paste it to browser and open it: "http://www.example.com/orders/R176458284/token/383caf1a6dd71" Now I got a unauthorized 401 page, that's correct because my token is wrong. But after that, I try the correct link again and it still won't work since session[:access_token] has already been set and won't be set again even I pass a new params[:token] I believe the correct logic is to check params[:token] first, once params[:token] is available, session[:access_token] should always be overridden by params[:token]. Thanks. Fixes spree/spree#4791
… a variant by name or SKU, rather than just returning the first 25 items from a stock location Closes spree/spree#4795
Added payment.save! to 3 failing tests that were looking for payment.log_entries to recieve :create!. Due to the parent not being saved, the method was not recieved and the test failed. Now fixed. Conflicts: core/spec/models/spree/payment_spec.rb
Conflicts: backend/app/views/spree/admin/orders/_shipment_manifest.html.erb
Out of the box you will never run into a situation where this text needs escaping, however, it is possible that a third party extension will set a success message with quotes (or in the situation I ran into, a missing translation can cause this). This will cleanly apply to 2-3-stable and 2-4-stable if desired, I haven't tested previous versions but can't imagine any issues. fixes spree/spree#5950
These have been removed in earlier commits in this repository.
This reverts commit 6e03f01. This causes an infinite loop of validation during tests.
This reverts commit 2373085. Breaks an API test. Will review further.
Fixes a failing test in orders controller
This then expects the order to be associated with this address, which then causes exceptions.
Spree::Store isn't a part of stock Spree 2.2. peterberkenbosch says to make this change since we're going to overwrite this email in our app anyway.
The checkout callback was added previously, but this one got missed.
stewart
pushed a commit
to stewart/solidus
that referenced
this pull request
Dec 21, 2016
…it-amount-remaining Backport StoreCredit#amount_remaining Solidus PR
JDutil
pushed a commit
to JDutil/solidus
that referenced
this pull request
Feb 6, 2020
Move solidus_comments from gem to code
waiting-for-dev
added a commit
to nebulab/solidus
that referenced
this pull request
Feb 9, 2023
We're changing the format for the auto-generated release notes from: - This is the PR title #1 (@author) to: * This is the PR title by @author in solidusio#1 By mimicking the default GitHub format, we make it easier to generate them manually through GitHub's "Generate release notes" [1] button or through the API [2]. At the same time, we're fixing the missing links to the PR when we copy the draft content to the Changelog file, as GitHub doesn't autolink references in files. From their documentation [3]: > Note: Autolinked references are not created in wikis or files in a repository. We'll still miss the link to the contributor, but it's a tradeoff we pay to make our lives easier if the automation fails. Anyway, it can be accessed once landed on the pull request URL. [1] - https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes [2] - https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#generate-release-notes-content-for-a-release [3] - https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-url Closes solidusio#4904 & 4908
waiting-for-dev
added a commit
to nebulab/solidus
that referenced
this pull request
Feb 9, 2023
We're changing the format for the auto-generated release notes from: - This is the PR title #1 (@author) to: * This is the PR title by @author in solidusio#1 By mimicking the default GitHub format, we make it easier to generate them manually through GitHub's "Generate release notes" [1] button or through the API [2]. At the same time, we're fixing the missing links to the PR when we copy the draft content to the Changelog file, as GitHub doesn't autolink references in files. From their documentation [3]: > Note: Autolinked references are not created in wikis or files in a repository. We'll still miss the link to the contributor, but it's a tradeoff we pay to make our lives easier if the automation fails. Anyway, it can be accessed once landed on the pull request URL. [1] - https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes [2] - https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#generate-release-notes-content-for-a-release [3] - https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-url Closes solidusio#4904 & 4908
waiting-for-dev
added a commit
to nebulab/solidus
that referenced
this pull request
Feb 9, 2023
We're changing the format for the auto-generated release notes from: - This is the PR title #1 (@author) to: * This is the PR title by @author in solidusio#1 By mimicking the default GitHub format, we make it easier to generate them manually through GitHub's "Generate release notes" [1] button or through the API [2]. At the same time, we're fixing the missing links to the PR when we copy the draft content to the Changelog file, as GitHub doesn't autolink references in files. From their documentation [3]: > Note: Autolinked references are not created in wikis or files in a repository. We'll still miss the link to the contributor, but it's a tradeoff we pay to make our lives easier if the automation fails. Anyway, it can be accessed once landed on the pull request URL. [1] - https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes [2] - https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#generate-release-notes-content-for-a-release [3] - https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-url Closes solidusio#4904 & 4908
3 tasks
waiting-for-dev
added a commit
to nebulab/solidus
that referenced
this pull request
Feb 9, 2023
We're changing the format for the auto-generated release notes from: - This is the PR title #1 (@author) to: * This is the PR title by @author in solidusio#1 By mimicking the default GitHub format, we make it easier to generate them manually through GitHub's "Generate release notes" [1] button or through the API [2]. At the same time, we're fixing the missing links to the PR when we copy the draft content to the Changelog file, as GitHub doesn't autolink references in files. From their documentation [3]: > Note: Autolinked references are not created in wikis or files in a repository. We'll still miss the link to the contributor, but it's a tradeoff we pay to make our lives easier if the automation fails. Anyway, it can be accessed once landed on the pull request URL. [1] - https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes [2] - https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#generate-release-notes-content-for-a-release [3] - https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-url Closes solidusio#4904 & solidusio#4908
3 tasks
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.
This is a sync from spree 2-2-stable in to the rebase-rewritten history of Bonobos.
This brings us up to date with the most recent 2-2-stable.
TODO