Merge branch 'main' into add-compliance-fields-to-address

Author: fthobe

CHANGELOG.md

@@ -1,3 +1,120 @@
+## Solidus v4.5.0 (2025-02-19)
+
+<!-- Please, don't edit manually. The content is automatically generated. -->
+
+## Solidus
+
+* Add not about sprockets manifest before running rails commands by @tvdeyen in https://github.com/solidusio/solidus/pull/6130
+
+## Solidus Core
+
+* Move Line Item Actions to solidus_legacy_promotions by @mamhoff in https://github.com/solidusio/solidus/pull/5916
+* Remove rails binstubs from built gems by @tvdeyen in https://github.com/solidusio/solidus/pull/5917
+* [FIX] Remove spacing at top of OrderShipping#ship method by @adammathys in https://github.com/solidusio/solidus/pull/5954
+* Test app task: Allow passing in user class by @mamhoff in https://github.com/solidusio/solidus/pull/5956
+* Backend: Add missing error translation by @mamhoff in https://github.com/solidusio/solidus/pull/5979
+* Add show all results to en.yml by @fthobe in https://github.com/solidusio/solidus/pull/5988
+* Do not constantize Spree.user_class in UserClassHandle by @mamhoff in https://github.com/solidusio/solidus/pull/5999
+* Allow to set Rails deprecations behavior during tests by @tvdeyen in https://github.com/solidusio/solidus/pull/6000
+* Introducing product brand using taxon_brand_selector by @shahmayur001 in https://github.com/solidusio/solidus/pull/5989
+* Make state machine modules auto-loadable by @mamhoff in https://github.com/solidusio/solidus/pull/6056
+* Make Spree::Money autoloadable by @tvdeyen in https://github.com/solidusio/solidus/pull/6040
+* Tax Categories on Line Items respect updates to Variant and Product Tax Categories by @harmonymjb in https://github.com/solidusio/solidus/pull/6059
+* Unauthorized redirect handling config by @mamhoff in https://github.com/solidusio/solidus/pull/6051
+* Lint: Fix Money spec by @mamhoff in https://github.com/solidusio/solidus/pull/6068
+* Fix preferences serialization compatibility with Rails version check by @swamp09 in https://github.com/solidusio/solidus/pull/6083
+* Make Controller Helpers autoloadable by @mamhoff in https://github.com/solidusio/solidus/pull/6062
+* Move permission sets back to app/ by @mamhoff in https://github.com/solidusio/solidus/pull/6090
+* Allows Rails 8, updates sqlite in Gemfile to match what CI runs by @rjacoby in https://github.com/solidusio/solidus/pull/6091
+* Remove Spree::UserAddress#archived flag by @mamhoff in https://github.com/solidusio/solidus/pull/3852
+* Add permalink history for taxon on friendly-id by @shahmayur001 in https://github.com/solidusio/solidus/pull/6100
+* Refactor Line Item Total Calculations by @jarednorman in https://github.com/solidusio/solidus/pull/6080
+* Fix DummyApp Generator by @tvdeyen in https://github.com/solidusio/solidus/pull/6121
+* Rails 8: Include manifest.js in install generator by @mamhoff in https://github.com/solidusio/solidus/pull/6122
+* Add Ruby 3.4 support by @tvdeyen in https://github.com/solidusio/solidus/pull/6117
+* Add primary Taxon to products (#6047) by @fthobe in https://github.com/solidusio/solidus/pull/6109
+* Admin promotion categories add/edit by @chaimann in https://github.com/solidusio/solidus/pull/6101
+* Move line_item_comparison_hooks config to Spree::Config by @mamhoff in https://github.com/solidusio/solidus/pull/6050
+* Admin and User Metadata for transactional ressources and users (#5897) by @fthobe in https://github.com/solidusio/solidus/pull/6118
+* Revert "Merge pull request #6122 from mamhoff/create-manifest-js-in-g… by @mamhoff in https://github.com/solidusio/solidus/pull/6124
+* Fix migration typo (missing keyword `foreign_key`) by @chaimann in https://github.com/solidusio/solidus/pull/6126
+* Use Flickwerk for loading patches in solidus_promotions and solidus_legacy_promotions by @mamhoff in https://github.com/solidusio/solidus/pull/6049
+* Added GTIN and Condition to variant for structured data use by @rahulsingh321 in https://github.com/solidusio/solidus/pull/6097
+
+## Solidus Admin
+
+* Remove rails binstubs from built gems by @tvdeyen in https://github.com/solidusio/solidus/pull/5917
+* Unauthorized redirect handling config by @mamhoff in https://github.com/solidusio/solidus/pull/6051
+* Allows Rails 8, updates sqlite in Gemfile to match what CI runs by @rjacoby in https://github.com/solidusio/solidus/pull/6091
+* Admin promotion categories add/edit by @chaimann in https://github.com/solidusio/solidus/pull/6101
+* Added GTIN and Condition to variant for structured data use by @rahulsingh321 in https://github.com/solidusio/solidus/pull/6097
+* Fix component translation scopes by @mamhoff in https://github.com/solidusio/solidus/pull/5927
+* Feat(Admin): Dynamic routing proxies by @mamhoff in https://github.com/solidusio/solidus/pull/5933
+* test: Wait for modal to open before testing its content by @tvdeyen in https://github.com/solidusio/solidus/pull/5993
+* [specs] Wait for modal before testing its content by @MadelineCollier in https://github.com/solidusio/solidus/pull/5998
+* Use Order#email to show the order's email in new admin by @softr8 in https://github.com/solidusio/solidus/pull/5596
+* [Admin][Users]Add new admin store_credits show page by @MadelineCollier in https://github.com/solidusio/solidus/pull/5978
+* [Admin][Products] Add product properties create/edit flow to admin by @MadelineCollier in https://github.com/solidusio/solidus/pull/6011
+* tests: Give even more dialogs more time to open in tests by @tvdeyen in https://github.com/solidusio/solidus/pull/6017
+* [Admin][Users] Add new admin store credits edit_amount flow by @MadelineCollier in https://github.com/solidusio/solidus/pull/6031
+* [Admin][Users] Add new admin store credits edit_memo flow by @MadelineCollier in https://github.com/solidusio/solidus/pull/6033
+* [Admin][Users] Add new admin store credits invalidate flow  by @MadelineCollier in https://github.com/solidusio/solidus/pull/6034
+* Use at least solidus_support 0.12.0 by @tvdeyen in https://github.com/solidusio/solidus/pull/6037
+* [Admin][Users] Add new admin store credits create flow by @MadelineCollier in https://github.com/solidusio/solidus/pull/6036
+* [Admin] Add Prettier config by @tvdeyen in https://github.com/solidusio/solidus/pull/6043
+* Pin view_component to < 3.21.0 by @tvdeyen in https://github.com/solidusio/solidus/pull/6048
+* Fix unsafe html view component, allow ViewComponent 3.21+ by @mamhoff in https://github.com/solidusio/solidus/pull/6055
+* [Admin] Use Rails.application.mounted_helpers in base component by @mamhoff in https://github.com/solidusio/solidus/pull/6039
+* [Admin] Open edit and new forms in dialog with turbo frame by @tvdeyen in https://github.com/solidusio/solidus/pull/6046
+* Fix missing options in select tags by @chaimann in https://github.com/solidusio/solidus/pull/6120
+* Remove Display Order from side menu by @chaimann in https://github.com/solidusio/solidus/pull/6119
+* [Admin] Fix tailwindcss-rails Version to v3 for Solidus Admin Compatibility by @swamp09 in https://github.com/solidusio/solidus/pull/6135
+* [Admin] Allow bulk delete resources by @chaimann in https://github.com/solidusio/solidus/pull/6134
+
+## Solidus Backend
+
+* Remove rails binstubs from built gems by @tvdeyen in https://github.com/solidusio/solidus/pull/5917
+* Backend: Add missing error translation by @mamhoff in https://github.com/solidusio/solidus/pull/5979
+* Unauthorized redirect handling config by @mamhoff in https://github.com/solidusio/solidus/pull/6051
+* Add primary Taxon to products (#6047) by @fthobe in https://github.com/solidusio/solidus/pull/6109
+* Added GTIN and Condition to variant for structured data use by @rahulsingh321 in https://github.com/solidusio/solidus/pull/6097
+* Fix field container identifier on admin stock location by @forkata in https://github.com/solidusio/solidus/pull/6107
+
+## Solidus API
+
+* Remove rails binstubs from built gems by @tvdeyen in https://github.com/solidusio/solidus/pull/5917
+* Allows Rails 8, updates sqlite in Gemfile to match what CI runs by @rjacoby in https://github.com/solidusio/solidus/pull/6091
+* Remove Spree::UserAddress#archived flag by @mamhoff in https://github.com/solidusio/solidus/pull/3852
+* Add primary Taxon to products (#6047) by @fthobe in https://github.com/solidusio/solidus/pull/6109
+* Admin and User Metadata for transactional ressources and users (#5897) by @fthobe in https://github.com/solidusio/solidus/pull/6118
+* Added GTIN and Condition to variant for structured data use by @rahulsingh321 in https://github.com/solidusio/solidus/pull/6097
+
+## Solidus Sample
+
+* Introducing product brand using taxon_brand_selector by @shahmayur001 in https://github.com/solidusio/solidus/pull/5989
+* Added GTIN and Condition to variant for structured data use by @rahulsingh321 in https://github.com/solidusio/solidus/pull/6097
+
+## Solidus Promotions
+
+* Add Ruby 3.4 support by @tvdeyen in https://github.com/solidusio/solidus/pull/6117
+* Admin promotion categories add/edit by @chaimann in https://github.com/solidusio/solidus/pull/6101
+* Move line_item_comparison_hooks config to Spree::Config by @mamhoff in https://github.com/solidusio/solidus/pull/6050
+* Use Flickwerk for loading patches in solidus_promotions and solidus_legacy_promotions by @mamhoff in https://github.com/solidusio/solidus/pull/6049
+* Fix component translation scopes by @mamhoff in https://github.com/solidusio/solidus/pull/5927
+* test: Wait for modal to open before testing its content by @tvdeyen in https://github.com/solidusio/solidus/pull/5993
+* Use at least solidus_support 0.12.0 by @tvdeyen in https://github.com/solidusio/solidus/pull/6037
+* [Admin] Allow bulk delete resources by @chaimann in https://github.com/solidusio/solidus/pull/6134
+* Better promotion menus by @mamhoff in https://github.com/solidusio/solidus/pull/5934
+* Fix admin promotions controller by @mamhoff in https://github.com/solidusio/solidus/pull/5943
+* [FIX] A few small tweaks for the new promotion admin by @adammathys in https://github.com/solidusio/solidus/pull/5953
+* Fix(promotions): Validate benefits on save by @mamhoff in https://github.com/solidusio/solidus/pull/5981
+* Fix(Promotions): Return 200 on benefits#edit by @mamhoff in https://github.com/solidusio/solidus/pull/5997
+* Add can apply to promotions by @mamhoff in https://github.com/solidusio/solidus/pull/6013
+* Fixed wording, typos, license notice & linked to migration guide by @fthobe in https://github.com/solidusio/solidus/pull/6106
+
+**Full Changelog**: https://github.com/solidusio/solidus/compare/v4.4.0...v4.5.0
+
+
 ## Solidus v4.4.0 (2024-11-12)
 
 <!-- Please, don't edit manually. The content is automatically generated. -->

GOVERNANCE.md

@@ -169,7 +169,7 @@ To join the stakeholders, you must be part of one of the groups described above.
 Partners are individuals or companies that are financially contributing to the platform’s Open Collective organization,
 in exchange for a pre-established set of benefits, mainly the ability to vote during stakeholder meetings.
 
-To join the stakeholders group as Partner, it's just needed that you setup a monthy donation via Open Collective with any of
+To join the stakeholders group as Partner, it's just needed that you setup a monthly donation via Open Collective with any of
 following partnership tiers:
 
 - **Supporter ($10/month)**: Doesn’t guarantee access to a partnership program.

README.md

@@ -14,7 +14,7 @@
 [![Open Source Helpers](https://www.codetriage.com/solidusio/solidus/badges/users.svg)](https://www.codetriage.com/solidusio/solidus)
 [![Slack](https://shields.io/badge/slack-start_chatting-blue?logo=slack)](http://slack.solidus.io)
 
-**A free, open-source ecommerce platform that gives you complete control over your store.**
+**A free, open-source e-commerce platform that gives you complete control over your store.**
 
 - **Visit our website**: [https://solidus.io/](https://solidus.io/)
 - **Read our Community Guidelines**: [https://guides.solidus.io/policies/community-guidelines/](https://guides.solidus.io/policies/community-guidelines/)
@@ -53,7 +53,7 @@ Support this project by becoming a Solidus Ambassador. Your logo will show up he
 
 ## Summary
 
-Solidus is a complete open source ecommerce solution built with Ruby on Rails.
+Solidus is a complete open source e-commerce solution built with Ruby on Rails.
 It is a fork of [Spree](https://spreecommerce.org).
 
 See the [Solidus class documentation](http://docs.solidus.io) and the [Solidus
@@ -69,7 +69,7 @@ Solidus consists of several gems. When you require the `solidus` gem in your
 - [`solidus_sample`](https://github.com/solidusio/solidus/tree/master/sample) (Sample data)
 
 All of the gems are designed to work together to provide a fully functional
-ecommerce platform. However, you may only want to use the
+e-commerce platform. However, you may only want to use the
 [`solidus_core`](https://github.com/solidusio/solidus/tree/master/core) gem
 combine it with your own custom frontend, admin interface, and API.
 

admin/README.md

@@ -1,6 +1,6 @@
 # Solidus Admin
 
-A Rails engine that provides an administrative interface to the Solidus ecommerce platform.
+A Rails engine that provides an administrative interface to the Solidus e-commerce platform.
 
 ## Overview
 

admin/app/components/solidus_admin/orders/index/component.rb

@@ -153,7 +153,7 @@ def total_column
     {
       header: :total,
       data: ->(order) do
-        content_tag :div, number_to_currency(order.total)
+        content_tag :div, order.display_total
       end
     }
   end

admin/app/components/solidus_admin/orders/show/summary/component.html.erb

@@ -2,12 +2,12 @@
   <%= render component('ui/panel').new(title: t('.summary')) do %>
     <%= render component('ui/details_list').new(
       items: [
-        { label: t('.subtotal'), value: number_to_currency(@order.item_total), class: 'font-semibold' },
-        { label: t('.taxes'), value: number_to_currency(@order.additional_tax_total) },
-        { label: t('.shipping'), value: number_to_currency(@order.shipment_total) },
-        { label: link_to(t('.add_promo_code'), '#', class: "body-link"), value: number_to_currency(@order.promo_total) },
-        { label: link_to(t('.adjustments'), solidus_admin.order_adjustments_path(@order), class: "body-link"), value: number_to_currency(@order.adjustment_total) },
-        { label: t('.total'), value: number_to_currency(@order.total), class: 'font-semibold' }
+        { label: t('.subtotal'), value: @order.display_item_total, class: 'font-semibold' },
+        { label: t('.taxes'), value: @order.display_additional_tax_total },
+        { label: t('.shipping'), value: @order.display_shipment_total },
+        { label: link_to(t('.add_promo_code'), '#', class: "body-link"), value: @order.display_promo_total },
+        { label: link_to(t('.adjustments'), solidus_admin.order_adjustments_path(@order), class: "body-link"), value: @order.display_adjustment_total },
+        { label: t('.total'), value: @order.display_total, class: 'font-semibold' }
       ]
     ) %>
   <% end %>

admin/app/components/solidus_admin/products/show/component.html.erb

@@ -36,8 +36,14 @@
           <%= render component("ui/forms/field").text_field(f, :meta_title) %>
           <%= render component("ui/forms/field").text_field(f, :meta_description) %>
           <%= render component("ui/forms/field").text_area(f, :meta_keywords) %>
+          <%= render component("ui/forms/field").text_field(f, :gtin) %>
+          <%= render component("ui/forms/field").select(
+            f,
+            :condition,
+            condition_options,
+            include_blank: t('spree.unset'),
+          ) %>
         <% end %>
-
         <%= render component('ui/panel').new(title: "Media") do |panel| %>
           <% panel.with_action(
             name: t(".manage_images"),

admin/app/components/solidus_admin/products/show/component.rb

@@ -25,4 +25,10 @@ def option_type_options
       ["#{_1} (#{_2})", _3]
     end
   end
+
+  def condition_options
+    @condition_options ||= Spree::Variant.conditions.map do |key, value|
+      [t("spree.condition.#{key}"), value]
+    end
+  end
 end

admin/app/components/solidus_admin/ui/forms/input/component.rb

@@ -91,6 +91,8 @@ def initialize(tag: :input, size: :m, error: nil, **attributes)
   def call
     if @tag == :select && @attributes[:choices]
       with_content options_for_select(@attributes.delete(:choices), @attributes.delete(:value))
+    elsif @tag == :textarea && @attributes[:value]
+      with_content @attributes.delete(:value)
     end
 
     build_tag

admin/app/components/solidus_admin/ui/table/component.html.erb

@@ -88,9 +88,10 @@
   <% end %>
 
   <%= render component("ui/table/toolbar").new("data-#{stimulus_id}-target": "batchToolbar", role: "toolbar", "aria-label": t(".batch_actions"), hidden: true) do %>
-    <%= form_tag '', id: batch_actions_form_id %>
-    <% @data.batch_actions.each do |batch_action| %>
-      <%= render_batch_action_button(batch_action) %>
+    <%= form_tag '', id: batch_actions_form_id do %>
+      <% @data.batch_actions.each do |batch_action| %>
+        <%= render_batch_action_button(batch_action) %>
+      <% end %>
     <% end %>
   <% end %>