Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from solidusio:main #387

Merged
merged 54 commits into from
Dec 21, 2023
Merged

[pull] main from solidusio:main #387

merged 54 commits into from
Dec 21, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 19, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

nirnaeth and others added 6 commits October 6, 2023 13:59
Fixes [#4867](#4867).

For both bogus_credit_card and simple_bogus_credit_card, identifies the method from which the
message is being created and adds that information to the log.
This module was a pretend shared behavior while the inlcuding classes
were not related.

Eventually we'll replace some of the default scopes with regular sorting
scopes since default scopes often cause issues.

Co-Authored-By: Rainer Dema <[email protected]>
Specify they're for version >= 5.

Co-Authored-By: Alberto Vena <[email protected]>
…dus-stripe-instructions

Add caveat to spree.rb.tt stripe configuration instructions
elia and others added 6 commits December 19, 2023 10:43
This configuration is a vanilla TW build removing the need for
temporary files and ERB tags. Also relegates the dependency on
tailwindcss-rails only to the development of the gem itself.

By relying on a known target path for the build it will be easy to
setup a local TW build that will override that path in the host Rails
application, leaving the implementors free to go with whatever JS/CSS
builder they want.
`bin/rails db:rollback`

fails with

```
Caused by:
ArgumentError: wrong number of arguments (given 2, expected 3)
```
This commit is fixing the rollback
We're not writing application code in which it's ok to assume that all
tasks should load the environment first.
Stop using teaspoon from source
elia added 3 commits December 19, 2023 16:34
[admin] Provide a pre-built CSS file and a script to customize TW for local modifications
elia added 6 commits December 19, 2023 17:03
[admin] Build the admin CSS before running the specs
Match the name in Backend to make it easier to reason about it.
[admin] Reuse the same class name as Backend for MenuItem
elia and others added 2 commits December 19, 2023 22:16
This adds support for the unreleased Rails 7.1 version.

Co-authored-by: Andrea Longhi <[email protected]>
peterberkenbosch and others added 27 commits December 20, 2023 18:13
Fixing `alias_method': undefined method `amount' for class `Spree::ShippingRate' (NameError)

See rails/rails#49250.
With this change, all the sample images will have the same aspect ratio,
in high-resolution. Previously, some of them were too small and with a
different ratio.
Fix `default_price` association not found exception on `Spree::Variant`.
This commit removes the following deprecations:

DEPRECATION WARNING: Spree::Order model aliases `bill_address`, but `bill_address` is not an attribute. Starting in Rails 7.2, alias_attribute with non-attribute targets will raise. Use `alias_method :billing_address, :bill_address` or define the method manually.

DEPRECATION WARNING: Spree::Order model aliases `ship_address`, but `ship_address` is not an attribute. Starting in Rails 7.2, alias_attribute with non-attribute targets will raise. Use `alias_method :shipping_address, :ship_address` or define the method manually.

DEPRECATION WARNING: Spree::CreditCard model aliases `cc_type` and has a method called `cc_type=` defined. Starting in Rails 7.2 `brand=` will not be calling `cc_type=` anymore. You may want to additionally define `brand=` to preserve the current behavior.
Apparently now Rails returns the host without the initial .
…cord::Base

DEPRECATION WARNING: SchemaMigration no longer inherits from ActiveRecord::Base. If you want to use the default connection, remove this argument. If you want to use a specific connection, instantiate MigrationContext with the connection's schema migration, for example `MigrationContext.new(path, Dog.connection.schema_migration)`. (called from new at /Users/andrea/nebulab/solidus/core/lib/spree/testing_support/dummy_app/rake_tasks.rb:41)
Due to deprecations, with a previous commit we replaced `alias_attribute`
calls for these two attributes with `alias_method`, but the latter doesn't
fully cover the previous behavior.

When `shipping_address` or `billing_address` are passed as attributes,
the error `ActiveModel::UnknownAttributeError` is now raised. For this
reason, we're starting to replace them with the right association name.

We may want to revisit the possibility to still use `billing_address` and
`shipping_address` as providing these aliases doesn't seem to be fully
viable anymore.
Starting from Rails 7.1, `ActionView::TestCase#output_buffer` uses
`ActionView::OutputBuffer` rather than `ActiveSupport::SafeBuffer`.

Due to the slightly different behavior, before comparing it to a
string we we need first to convert it.

See rails/rails@532e39a
In Rails 7.1 AS will check the global configuration when the macro is
used.
Adding the previews path after setting the autoload ensures the file
is not autoloaded by Zeitwerk.

Co-Authored-By: andrea longhi <[email protected]>
…ponents-style

[Admin] Refactor admin components for consistent code style
@pull pull bot merged commit f1c4920 into nebulab:main Dec 21, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants