[pull] main from solidusio:main

CHANGELOG.md

@@ -1,3 +1,92 @@
+## Solidus v4.6.0 (2025-09-09)
+
+<!-- Please, don't edit manually. The content is automatically generated. -->
+
+## Solidus
+
+* Fix typos by @jackhac in https://github.com/solidusio/solidus/pull/6207
+
+## Solidus Core
+
+* Fix typos by @jackhac in https://github.com/solidusio/solidus/pull/6207
+* Display the store's currency in the Admin Order Index Component by @magpieuk in https://github.com/solidusio/solidus/pull/5929
+* Respect Spree.user_class' table name in metadata migration by @tvdeyen in https://github.com/solidusio/solidus/pull/6157
+* Better Spree::UserAddress scope deprecation warnings by @tvdeyen in https://github.com/solidusio/solidus/pull/6163
+* Add new order events by @benjaminwil in https://github.com/solidusio/solidus/pull/6170
+* [Docs] Fix Meta Data Restriction Comment to reflect default setting by @fthobe in https://github.com/solidusio/solidus/pull/6171
+* Separate order mailer subscriber from reimbursement mailer subscriber by @benjaminwil in https://github.com/solidusio/solidus/pull/6156
+* Fixed migrations so you can rollback them all by @aiperon in https://github.com/solidusio/solidus/pull/6188
+* Inherit from ActiveRecord::Migration version for all supported Rails by @harmonymjb in https://github.com/solidusio/solidus/pull/6192
+* Move OrderMailerSubscriber#send_confirmation_email by @benjaminwil in https://github.com/solidusio/solidus/pull/6199
+* Add reverse charge status to stores by @fthobe in https://github.com/solidusio/solidus/pull/6136
+* Fix flaky test errors using chrome 134 by @tvdeyen in https://github.com/solidusio/solidus/pull/6203
+* Move carton shipped emails to subscriber by @benjaminwil in https://github.com/solidusio/solidus/pull/6219
+* Change migration version to 7.0 by @AlistairNorman in https://github.com/solidusio/solidus/pull/6220
+* Add subscribers for inventory cancellation and order cancellation emails by @benjaminwil in https://github.com/solidusio/solidus/pull/6205
+* Make linters happy by @tvdeyen in https://github.com/solidusio/solidus/pull/6223
+* Disallow migrations with the wrong versions by @benjaminwil in https://github.com/solidusio/solidus/pull/6221
+* Add reverse charge fields to address by @fthobe in https://github.com/solidusio/solidus/pull/6168
+* Dummy app generator: Only configure app/assets/javascripts if present by @mamhoff in https://github.com/solidusio/solidus/pull/6227
+* Use Firefox for system specs by @mamhoff in https://github.com/solidusio/solidus/pull/6230
+* Configurable Solidus event subscribers by @benjaminwil in https://github.com/solidusio/solidus/pull/6234
+* Move Taxon -> Promotion Rule association to legacy promotions by @mamhoff in https://github.com/solidusio/solidus/pull/6243
+* Require spree/config in spree/core by @mamhoff in https://github.com/solidusio/solidus/pull/6248
+* Addressbook: Add foreign key, dependent/inverse_of options by @mamhoff in https://github.com/solidusio/solidus/pull/6265
+* Replace `puts` in tasks and generators with Rails.logger or Logger.new by @mamhoff in https://github.com/solidusio/solidus/pull/6244
+
+## Solidus Admin
+
+* Fix typos by @jackhac in https://github.com/solidusio/solidus/pull/6207
+* Display the store's currency in the Admin Order Index Component by @magpieuk in https://github.com/solidusio/solidus/pull/5929
+* Fix flaky test errors using chrome 134 by @tvdeyen in https://github.com/solidusio/solidus/pull/6203
+* Make linters happy by @tvdeyen in https://github.com/solidusio/solidus/pull/6223
+* Add reverse charge fields to address by @fthobe in https://github.com/solidusio/solidus/pull/6168
+* Use Firefox for system specs by @mamhoff in https://github.com/solidusio/solidus/pull/6230
+* Fix install_lookbook step by @chaimann in https://github.com/solidusio/solidus/pull/6154
+* Fix ui/forms/input component for tag: :textarea by @chaimann in https://github.com/solidusio/solidus/pull/6174
+* [Admin] Fix Unclosed form_tag in table component by @swamp09 in https://github.com/solidusio/solidus/pull/6172
+* Fix flaky specs by @mamhoff in https://github.com/solidusio/solidus/pull/6197
+* [Backend] Fix issue refunding uncompleted payments by @jtapia in https://github.com/solidusio/solidus/pull/6094
+* [Admin][UI] New select component by @chaimann in https://github.com/solidusio/solidus/pull/6190
+* Refactor `ui/forms/address` component by @chaimann in https://github.com/solidusio/solidus/pull/6191
+* Use semantic links to edit option types by @forkata in https://github.com/solidusio/solidus/pull/6201
+* Admin select component performance by @chaimann in https://github.com/solidusio/solidus/pull/6213
+* Refactor address form component (properly this time) by @chaimann in https://github.com/solidusio/solidus/pull/6225
+* [Admin][UI] Alert component by @chaimann in https://github.com/solidusio/solidus/pull/6226
+* [Admin] fix table sorting by @chaimann in https://github.com/solidusio/solidus/pull/6238
+* Update importmap-rails to v2 by @tvdeyen in https://github.com/solidusio/solidus/pull/6202
+
+## Solidus Backend
+
+* Add reverse charge status to stores by @fthobe in https://github.com/solidusio/solidus/pull/6136
+* Fix flaky test errors using chrome 134 by @tvdeyen in https://github.com/solidusio/solidus/pull/6203
+* Add reverse charge fields to address by @fthobe in https://github.com/solidusio/solidus/pull/6168
+* Fix flaky specs by @mamhoff in https://github.com/solidusio/solidus/pull/6197
+* [Backend] Fix issue refunding uncompleted payments by @jtapia in https://github.com/solidusio/solidus/pull/6094
+* Add 500ms delay before AJAX in Select2 by @mamhoff in https://github.com/solidusio/solidus/pull/6235
+
+## Solidus API
+
+* Add reverse charge status to stores by @fthobe in https://github.com/solidusio/solidus/pull/6136
+* Add reverse charge fields to address by @fthobe in https://github.com/solidusio/solidus/pull/6168
+* Refactor load_user_roles into current_user_roles helper by @mamhoff in https://github.com/solidusio/solidus/pull/6245
+* Refactor "current_api_user" into instacached helper by @mamhoff in https://github.com/solidusio/solidus/pull/6246
+
+## Solidus Promotions
+
+* Fix typos by @jackhac in https://github.com/solidusio/solidus/pull/6207
+* Fix flaky test errors using chrome 134 by @tvdeyen in https://github.com/solidusio/solidus/pull/6203
+* Replace `puts` in tasks and generators with Rails.logger or Logger.new by @mamhoff in https://github.com/solidusio/solidus/pull/6244
+* Fix flaky specs by @mamhoff in https://github.com/solidusio/solidus/pull/6197
+* Update importmap-rails to v2 by @tvdeyen in https://github.com/solidusio/solidus/pull/6202
+* [Promotions] Set Flickwerk patches in initializer by @tvdeyen in https://github.com/solidusio/solidus/pull/6161
+* Fix Rubocop offense by @mamhoff in https://github.com/solidusio/solidus/pull/6196
+* Use `human_attribute_name` for promo calculator labels by @mamhoff in https://github.com/solidusio/solidus/pull/6195
+* Promotions: Add a PercentWithCap calculator by @mamhoff in https://github.com/solidusio/solidus/pull/6200
+
+**Full Changelog**: https://github.com/solidusio/solidus/compare/v4.5.0...v4.6.0
+
+
 ## Solidus v4.5.0 (2025-02-19)
 
 <!-- Please, don't edit manually. The content is automatically generated. -->

core/app/models/spree/line_item.rb

@@ -18,7 +18,7 @@ class LineItem < Spree::Base
 
     has_one :product, through: :variant
 
-    has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :destroy
+    has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :destroy, autosave: true
     has_many :inventory_units, inverse_of: :line_item
 
     before_validation :normalize_quantity

core/app/models/spree/order.rb

@@ -102,7 +102,7 @@ def states
     has_many :cartons, -> { distinct }, through: :inventory_units
 
     # Adjustments and promotions
-    has_many :adjustments, -> { order(:created_at) }, as: :adjustable, inverse_of: :adjustable, dependent: :destroy
+    has_many :adjustments, -> { order(:created_at) }, as: :adjustable, inverse_of: :adjustable, dependent: :destroy, autosave: true
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
     has_many :shipment_adjustments, through: :shipments, source: :adjustments
     has_many :all_adjustments,

core/app/models/spree/order_taxation.rb

@@ -57,7 +57,7 @@ def update_adjustments(item, taxed_items)
 
       # Remove any tax adjustments tied to rates which no longer match.
       unmatched_adjustments = tax_adjustments - active_adjustments
-      item.adjustments.destroy(unmatched_adjustments)
+      unmatched_adjustments.each(&:mark_for_destruction)
     end
 
     # Update or create a new tax adjustment on an item.
@@ -77,7 +77,8 @@ def update_adjustment(item, tax_item)
         label: tax_item.label,
         included: tax_item.included_in_price
       )
-      tax_adjustment.update!(amount: tax_item.amount)
+
+      tax_adjustment.amount = tax_item.amount
       tax_adjustment
     end
   end

core/app/models/spree/order_updater.rb

@@ -157,9 +157,12 @@ def update_adjustment_total
       recalculate_adjustments
 
       all_items = line_items + shipments
-      order_tax_adjustments = adjustments.select(&:tax?)
+      # Ignore any adjustments that have been marked for destruction in our
+      # calculations. They'll get removed when/if we persist the order.
+      valid_adjustments = adjustments.reject(&:marked_for_destruction?)
+      order_tax_adjustments = valid_adjustments.select(&:tax?)
 
-      order.adjustment_total = all_items.sum(&:adjustment_total) + adjustments.sum(&:amount)
+      order.adjustment_total = all_items.sum(&:adjustment_total) + valid_adjustments.sum(&:amount)
       order.included_tax_total = all_items.sum(&:included_tax_total) + order_tax_adjustments.select(&:included?).sum(&:amount)
       order.additional_tax_total = all_items.sum(&:additional_tax_total) + order_tax_adjustments.reject(&:included?).sum(&:amount)
 

core/lib/spree/core/version.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.6.0.dev"
+  VERSION = "4.7.0.dev"
 
   def self.solidus_version = VERSION
 
   def self.minimum_required_rails_version = "7.0"
 
-  def self.previous_solidus_minor_version = "4.5"
+  def self.previous_solidus_minor_version = "4.6"
 
   def self.solidus_gem_version = Gem::Version.new(solidus_version)
 end

core/spec/models/spree/order_taxation_spec.rb

@@ -68,7 +68,7 @@
 
     it "creates a new tax adjustment", aggregate_failures: true do
       apply
-      expect(line_item.adjustments.count).to eq 1
+      expect(line_item.adjustments.size).to eq 1
 
       tax_adjustment = line_item.adjustments.first
       expect(tax_adjustment.label).to eq "Tax!"
@@ -132,12 +132,11 @@
         )
       end
 
-      it "removes the tax adjustment" do
-        expect {
-          taxation.apply(new_taxes)
-        }.to change {
-          line_item.adjustments.count
-        }.from(1).to(0)
+      it "marks the tax adjustment for destruction" do
+        order.save!
+        taxation.apply(new_taxes)
+
+        expect(line_item.adjustments.first).to be_marked_for_destruction
       end
     end
 
@@ -174,7 +173,7 @@
       end
 
       it "creates a new tax adjustment", aggregate_failures: true do
-        expect(order.adjustments.count).to eq 1
+        expect(order.adjustments.size).to eq 1
 
         tax_adjustment = order.adjustments.first
         expect(tax_adjustment.label).to eq "Order Tax!"

core/spec/models/spree/order_updater_spec.rb

@@ -69,28 +69,39 @@ module Spree
       end
 
       describe 'tax recalculation' do
-        let!(:ship_address) { create(:address) }
-        let!(:tax_zone) { create(:global_zone) } # will include the above address
-        let!(:tax_rate) { create(:tax_rate, zone: tax_zone, tax_categories: [tax_category]) }
+        let(:tax_category) { create(:tax_category) }
+        let(:ship_address) { create(:address, state: new_york) }
+        let(:new_york) { create(:state, state_code: "NY") }
+        let(:tax_zone) { create(:zone, states: [new_york]) }
+
+        let!(:tax_rate) do
+          create(
+            :tax_rate,
+            name: "New York Sales Tax",
+            tax_categories: [tax_category],
+            zone: tax_zone,
+            included_in_price: false,
+            amount: 0.1
+          )
+        end
 
         let(:order) do
           create(
             :order_with_line_items,
-            line_items_attributes: [{ price: 10, variant: }],
-            ship_address:,
+            line_items_attributes: [{ price: 10, variant: variant }],
+            ship_address: ship_address,
           )
         end
         let(:line_item) { order.line_items[0] }
 
         let(:variant) { create(:variant, tax_category:) }
-        let(:tax_category) { create(:tax_category) }
 
         context 'when the item quantity has changed' do
           before do
             line_item.update!(quantity: 2)
           end
 
-          it 'updates the promotion amount' do
+          it 'updates the additional_tax_total' do
             expect {
               order.recalculate
             }.to change {
@@ -99,6 +110,60 @@ module Spree
           end
         end
 
+        context 'when the address has changed to a different state' do
+          let(:new_shipping_address) { create(:address) }
+
+          before do
+            order.ship_address = new_shipping_address
+          end
+
+          it 'removes the old taxes' do
+            expect {
+              order.recalculate
+            }.to change {
+              order.all_adjustments.tax.count
+            }.from(1).to(0)
+
+            expect(order.additional_tax_total).to eq 0
+            expect(order.adjustment_total).to eq 0
+          end
+        end
+
+        context "with an order-level tax adjustment" do
+          let(:colorado) { create(:state, state_code: "CO") }
+          let(:colorado_tax_zone) { create(:zone, states: [colorado]) }
+          let(:ship_address) { create(:address, state: colorado) }
+
+          let!(:colorado_delivery_fee) do
+            create(
+              :tax_rate,
+              amount: 0.27,
+              calculator: Spree::Calculator::FlatFee.new,
+              level: "order",
+              name: "Colorado Delivery Fee",
+              tax_categories: [tax_category],
+              zone: colorado_tax_zone
+            )
+          end
+
+          before { order.recalculate }
+
+          it "updates the order-level tax adjustment" do
+            expect {
+              order.ship_address = create(:address)
+              order.recalculate
+            }.to change { order.additional_tax_total }.from(0.27).to(0).
+                and change { order.adjustment_total }.from(0.27).to(0)
+          end
+
+          it "deletes the order-level tax adjustments when it persists the order" do
+            expect {
+              order.ship_address = create(:address)
+              order.recalculate
+            }.to change { order.all_adjustments.count }.from(1).to(0)
+          end
+        end
+
         context 'with a custom tax_calculator_class' do
           let(:custom_calculator_class) { double }
           let(:custom_calculator_instance) { double }

docker-compose.yml

@@ -28,7 +28,7 @@ services:
         NODE_VERSION: 20
         MYSQL_VERSION: "8.0"
         BUNDLER_VERSION: 2
-    image: solidus-4.6.0.dev
+    image: solidus-4.7.0.dev
     command: bash -c "(bundle check || bundle) && bash -c 'echo Container initialized, see README.md for further steps.' && tail -f /dev/null"
     environment:
       CAPYBARA_DRIVER: selenium_chrome_headless_docker_friendly