Merge solidus_starter_frontend into the monorepo

.github/workflows/prepare_post_release.yml

@@ -44,11 +44,6 @@ jobs:
         run: |
           bin/release/bump-docker-image-version \
             ${{ steps.pipeline_context.outputs.next_candidate_dev_version }}
-      - name: "Bump installer starter frontend version"
-        if: github.ref_name == 'main'
-        run: |
-          bin/release/bump-starter-frontend-version \
-            main
       - name: "Publish release draft & tag last commit"
         run: |
           bin/release/publish-release \

.github/workflows/prepare_release.yml

@@ -29,9 +29,6 @@ jobs:
       - name: "Bump docker image version"
         if: github.ref_name == 'main'
         run: bin/release/bump-docker-image-version ${{ steps.pipeline_context.outputs.candidate_version }}
-      - name: "Bump installer starter frontend version"
-        if: github.ref_name == 'main'
-        run: bin/release/bump-starter-frontend-version ${{ steps.pipeline_context.outputs.candidate_patch_branch }}
       - name: "Update Changelog"
         run: bin/release/update-changelog ${{ steps.pipeline_context.outputs.candidate_tag }}
       - name: "Compute labels for the PR"

.github/workflows/solidus_installer.yml

@@ -19,6 +19,9 @@ jobs:
     env:
       DB: sqlite
       RUBY_VERSION: "3.2"
+      SOLIDUS_STOREFRONT_TEMPLATE: ${{ github.workspace }}/storefront/template.rb
+      COVERAGE: true
+      COVERAGE_DIR: ${{ github.workspace }}/storefront/coverage
     steps:
       - uses: actions/checkout@v6
       - name: Install libvips
@@ -37,3 +40,23 @@ jobs:
         run: |
           cd $RUNNER_TEMP/my_app
           bundle list | grep 'solidus_paypal_commerce_platform (1.'
+      - name: Setup code coverage
+        # SimpleCov must start before the app is loaded (Ruby's Coverage only
+        # tracks files required after Coverage.start), so we load it from the top
+        # of the generated spec_helper.rb rather than from spec/support, which is
+        # required after rails_helper has already (eager-)loaded the app.
+        run: |
+          cd $RUNNER_TEMP/my_app
+          cp $GITHUB_WORKSPACE/storefront/lib/testing_support/coverage.rb spec/simplecov_setup.rb
+          printf 'require_relative "simplecov_setup"\n%s\n' "$(cat spec/spec_helper.rb)" > spec/spec_helper.rb
+      - name: Run starter frontend specs
+        run: |
+          cd $RUNNER_TEMP/my_app
+          bundle exec rspec spec
+      - name: Upload coverage report to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: solidusio/solidus
+          disable_search: true
+          files: ${{ env.COVERAGE_DIR }}/coverage.xml

.standard.yml

@@ -3,4 +3,4 @@ format: progress
 ruby_version: 3.1
 ignore:
   - "*/spec/dummy/**/*"
-  - "sandbox/**/*"
+  - "**/sandbox/**/*"

backend/app/controllers/spree/admin/payments_controller.rb

@@ -9,6 +9,7 @@ class PaymentsController < Spree::Admin::BaseController
       before_action :load_payment, except: [:create, :new, :index, :fire]
       before_action :load_payment_for_fire, only: :fire
       before_action :load_data
+      before_action :load_log_entries, only: [:show]
       before_action :require_bill_address, only: [:index]
 
       helper ::Spree::Admin::OrdersHelper
@@ -102,6 +103,13 @@ def load_payment
         @payment = Spree::Payment.find(params[:id])
       end
 
+      def load_log_entries
+        @all_log_entries = Spree::LogEntry
+          .where(source: @payment)
+          .or(Spree::LogEntry.where(source: @payment.refunds))
+          .order(:created_at)
+      end
+
       def load_payment_for_fire
         load_payment
         authorize! params[:e].to_sym, @payment

backend/app/views/spree/admin/payments/_log_entries.html.erb

@@ -1,12 +1,14 @@
 <table class='index' id='listing_log_entries'>
   <colgroup>
-    <col style="width: 30%">
-    <col style="width: 60%">
+    <col style="width: 25%">
+    <col style="width: 15%">
+    <col style="width: 50%">
     <col style="width: 10%">
   </colgroup>
   <thead>
     <tr>
       <th><%= Spree::LogEntry.human_attribute_name(:created_at) %></th>
+      <th><%= Spree::LogEntry.human_attribute_name(:source) %></th>
       <th><%= Spree::LogEntry.human_attribute_name(:details) %></th>
       <th></th>
     </tr>
@@ -17,6 +19,9 @@
       <td>
         <%= pretty_time(entry.created_at) %>
       </td>
+      <td>
+        <%= entry.source_type.constantize.model_name.human %>
+      </td>
       <td>
         <pre><%= entry.parsed_details.message %></pre>
       </td>

backend/app/views/spree/admin/payments/show.html.erb

@@ -21,9 +21,9 @@
   </fieldset>
 <% end %>
 
-<% if @payment.log_entries.any? %>
+<% if @all_log_entries.any? %>
   <fieldset class="no-border-bottom">
     <legend><%= plural_resource_name(Spree::LogEntry) %></legend>
-    <%= render 'spree/admin/payments/log_entries', log_entries: @payment.log_entries %>
+    <%= render 'spree/admin/payments/log_entries', log_entries: @all_log_entries %>
   </fieldset>
 <% end %>

backend/spec/features/admin/orders/log_entries_spec.rb

@@ -53,4 +53,29 @@
       end
     end
   end
+
+  context "with a log entry belonging to a refund of the payment", :js do
+    let(:payment) { create(:payment, amount: 100) }
+    let(:refund) { create(:refund, payment:, amount: 10) }
+
+    before do
+      response = ActiveMerchant::Billing::Response.new(
+        true,
+        "Refund processed",
+        transid: "REFUND-1"
+      )
+
+      refund.log_entries.create!(details: response.to_yaml)
+    end
+
+    it "shows the refund entry on the payment page with 'Refund' as its source" do
+      visit spree.admin_order_payments_path(payment.order)
+      click_on payment.number
+
+      within("#listing_log_entries") do
+        expect(page).to have_content("Refund processed")
+        expect(page).to have_content("Refund")
+      end
+    end
+  end
 end

bin/sandbox

@@ -107,6 +107,7 @@ unbundled bin/rails db:drop db:create
 
 echo "~~~> Running the solidus:install generator"
 export SOLIDUS_ADMIN_LOOKBOOK=true
+export SOLIDUS_STOREFRONT_TEMPLATE="$PWD/../storefront/template.rb"
 unbundled bin/rails generate solidus:install --admin-preview --auto-accept $@
 
 echo "

core/app/models/spree/exchange.rb

@@ -22,7 +22,10 @@ def display_amount
 
     def perform!
       begin
-        shipments = Spree::Config.stock.coordinator_class.new(@order, @reimbursement_objects.map(&:build_exchange_inventory_unit)).shipments
+        shipments = Spree::Config.stock.coordinator_class.new(
+          @order,
+          inventory_units: @reimbursement_objects.map(&:build_exchange_inventory_unit)
+        ).shipments
       rescue Spree::Order::InsufficientStock
         raise UnableToCreateShipments.new("Could not generate shipments for all items. Out of stock?")
       end

core/app/models/spree/in_memory_order_updater.rb

@@ -236,7 +236,6 @@ def recalculate_line_item_prices
     end
 
     def persist_totals
-      shipments.each(&:persist_amounts)
       log_state_change("payment")
       log_state_change("shipment")
       order.save!

core/app/models/spree/order.rb

@@ -513,9 +513,9 @@ def create_proposed_shipments
     end
 
     def create_shipments_for_line_item(line_item)
-      units = Spree::Config.stock.inventory_unit_builder_class.new(self).missing_units_for_line_item(line_item)
+      inventory_units = Spree::Config.stock.inventory_unit_builder_class.new(self).missing_units_for_line_item(line_item)
 
-      Spree::Config.stock.coordinator_class.new(self, units).shipments.each do |shipment|
+      Spree::Config.stock.coordinator_class.new(self, inventory_units:).shipments.each do |shipment|
         shipments << shipment
       end
     end

core/app/models/spree/shipment.rb

@@ -224,6 +224,8 @@ def recalculate_state
       self.state =
         if shipped?
           "shipped"
+        elsif inventory_units.none?
+          "pending"
         elsif order.canceled? || inventory_units.all?(&:canceled?)
           "canceled"
         elsif !order.can_ship?

core/app/models/spree/stock/simple_coordinator.rb

@@ -27,7 +27,14 @@ class SimpleCoordinator
         :filtered_stock_locations, :inventory_units_by_variant, :desired,
         :availability, :allocator, :packages
 
-      def initialize(order, inventory_units = nil)
+      def initialize(order, inventory_units_deprecated = nil, inventory_units: nil)
+        if inventory_units_deprecated
+          Spree.deprecator.warn "Using the `inventory_units` positional " \
+            "argument is deprecated in favor of using the keyword argument. "
+
+          inventory_units ||= inventory_units_deprecated
+        end
+
         @order = order
         @inventory_units =
           inventory_units || Spree::Config.stock.inventory_unit_builder_class.new(order).units

core/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -1 +1,19 @@
-apply "https://github.com/solidusio/solidus_starter_frontend/raw/main/template.rb"
+# frozen_string_literal: true
+
+template =
+  ENV["SOLIDUS_STOREFRONT_TEMPLATE"] ||
+  begin
+    version = Spree.solidus_version if defined?(Spree) && Spree.respond_to?(:solidus_version)
+    gem_version = version ? Gem::Version.new(version) : nil
+
+    ref =
+      if gem_version && !gem_version.prerelease?
+        "v#{gem_version.segments[0, 2].join(".")}"
+      else
+        "main"
+      end
+
+    "https://github.com/solidusio/solidus/raw/#{ref}/storefront/template.rb"
+  end
+
+apply template

core/spec/models/spree/in_memory_order_updater_spec.rb

@@ -575,7 +575,6 @@ module Spree
 
         it "updates the shipment amount" do
           expect(shipment).to receive(:assign_amounts)
-          expect(shipment).to receive(:persist_amounts)
           updater.recalculate
         end
       end

core/spec/models/spree/shipment_spec.rb

@@ -120,6 +120,15 @@
       }.to change { shipment.state }.from("pending").to("canceled")
     end
 
+    it "returns pending if the shipment doesn't have any inventory units" do
+      expect {
+        shipment.inventory_units.each(&:destroy!)
+        shipment.reload
+
+        recalculate_state
+      }.not_to change { shipment.state }.from("pending")
+    end
+
     it "returns pending unless order.can_ship?" do
       allow(order).to receive_messages can_ship?: false
       expect(recalculate_state).to eq "pending"
@@ -135,15 +144,29 @@
       expect(recalculate_state).to eq "shipped"
     end
 
-    it "returns pending when unpaid" do
-      allow(order).to receive_messages paid?: false
-      expect(recalculate_state).to eq "pending"
-    end
-
     it "returns ready when paid" do
       allow(order).to receive_messages paid?: true
       expect(recalculate_state).to eq "ready"
     end
+
+    context "when the order hasn't been paid" do
+      let(:order) { create(:order_ready_to_complete, line_items_count: 1) }
+
+      it "returns pending" do
+        expect(recalculate_state).to eq "pending"
+      end
+
+      context "when the shipment's inventory units have been destroyed" do
+        it "returns pending" do
+          expect {
+            shipment.inventory_units.each(&:destroy!)
+            shipment.reload
+
+            recalculate_state
+          }.not_to change { shipment.state }.from("pending")
+        end
+      end
+    end
   end
 
   context "display_amount" do

promotions/app/models/concerns/solidus_promotions/conditions/taxon_condition.rb

@@ -52,6 +52,8 @@ def taxon_ids_with_children
       end
 
       def load_taxon_ids_with_children
+        return [] unless taxon_ids.present?
+
         aggregation_function = if ActiveRecord::Base.connection.adapter_name.downcase.match?(/postgres/)
           "string_agg(child.id::text, ',')"
         else

promotions/app/models/solidus_promotions/conditions/taxon_revenue.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module SolidusPromotions
+  module Conditions
+    class TaxonRevenue < Condition
+      include OrderLevelCondition
+      include TaxonCondition
+
+      preference :operator, :string, default: "gte"
+      preference :amount, :decimal, default: 0
+      preference :currency, :string, default: -> { Spree::Config.currency }
+
+      OPERATORS = {"gte" => :>=, "gt" => :>, "lt" => :<, "lte" => :<=}.freeze
+
+      def self.operator_options
+        OPERATORS.map do |name, _method|
+          [I18n.t(name, scope: [:solidus_promotions, :operators]), name]
+        end
+      end
+
+      def order_eligible?(order, _options = {})
+        matching = order.line_items.select do |line_item|
+          taxon_ids_with_children.any? do |taxon_and_descendant_ids|
+            (line_item.variant.product.classifications.map(&:taxon_id) & taxon_and_descendant_ids).any?
+          end
+        end
+        matching.sum(&:discounted_amount).public_send(OPERATORS.fetch(preferred_operator), preferred_amount)
+      end
+    end
+  end
+end

promotions/app/patches/models/solidus_promotions/in_memory_order_updater_patch.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module SolidusPromotions
+  module InMemoryOrderUpdaterPatch
+    # This is only needed for stores upgrading from the legacy promotion system.
+    # Once we've removed support for the legacy promotion system, we can remove this.
+    def recalculate(persist: true)
+      if SolidusPromotions.config.sync_order_promotions
+        MigrationSupport::OrderPromotionSyncer.new(order: order).call
+      end
+      super
+    end
+
+    Spree::InMemoryOrderUpdater.prepend self
+  end
+end

promotions/app/patches/models/solidus_promotions/order_recalculator_patch.rb → promotions/app/patches/models/solidus_promotions/order_updater_patch.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusPromotions
-  module OrderRecalculatorPatch
+  module OrderUpdaterPatch
     # This is only needed for stores upgrading from the legacy promotion system.
     # Once we've removed support for the legacy promotion system, we can remove this.
     def recalculate
@@ -12,6 +12,5 @@ def recalculate
     end
 
     Spree::OrderUpdater.prepend self
-    Spree::InMemoryOrderUpdater.prepend self
   end
 end