spree_storefront 5.1.0.beta3 → 5.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1dbc02737b8c05caa58fafb4584ef7c49e619654a1209e2f83c72c95f596961
-  data.tar.gz: e070440be4bb251b30a0b6d8f3d57f12cd50bd75e564966799eef441c9a3b4aa
+  metadata.gz: 7bfebb039f9950d259f5d7807453bef4e385aefc320b97bc6ff01fc1fe0964cf
+  data.tar.gz: ac3b738d43b2c19ad49a56995a10976b7353941279c13512f1b5f54febac5e8d
 SHA512:
-  metadata.gz: 487843eb1f23fc955b6bc4d45b2a89112edf2d0cb68075f8714e0a1da197b3e2692dcc434859c3e59b53d4286b1af0da65ba532e016559930dcb90e20e7d08a5
-  data.tar.gz: e791a45a470fe19e42d9daea9ae3b7b5152dec22f65c4bdc2eeb141a2be7bca42b1f099777588de234e44e42fc2a7fc9be6ea6be46ee4034507630897ea9fc48
+  metadata.gz: 1d5540addf2ebad7bc9b1ea6ff4ea0a6431ba28a2d96bca3e942e31744b61f555a5a9be91efdaed3825bac6224ab477c0435cca3f210d45df7fcbd0ac309b847
+  data.tar.gz: 4d162ae16a80f1115672bba5fcbbcec9e1029f5d56f49e015b99200ce5c05f11275e68bc2d4c74ece38322815dca2a1694ff287f372a2d041c2cff7c01d03fbc

data/Rakefile

@@ -11,5 +11,11 @@ task default: :spec
 desc "Generates a dummy app for testing"
 task :test_app do
   ENV['LIB_NAME'] = 'spree/storefront'
-  Rake::Task['common:test_app'].execute
+
+  Rake::Task['common:test_app'].execute(
+    user_class: 'User',
+    authentication: 'devise',
+    install_storefront: 'true',
+    install_admin: 'false'
+  )
 end

data/app/controllers/spree/account/gift_cards_controller.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Account
+    class GiftCardsController < BaseController
+      def index
+        @gift_cards = @user.gift_cards.order(created_at: :desc).page(params[:page]).per(25)
+      end
+
+      private
+
+      def accurate_title
+        Spree.t(:gift_cards)
+      end
+    end
+  end
+end

data/app/controllers/spree/checkout_controller.rb

@@ -4,7 +4,6 @@ module Spree
     include Spree::CheckoutHelper
     include Spree::CheckoutAnalyticsHelper
 
-    before_action :require_user, unless: -> { current_store.prefers_guest_checkout? }
     before_action :load_order
     before_action :remove_out_of_stock_items, only: [:edit, :update]
 
@@ -191,6 +190,8 @@ module Spree
             redirect_to spree_login_path
           end
         end
+      elsif !current_store.prefers_guest_checkout?
+        require_user(redirect_path: spree_signup_path)
       end
 
       # completed orders shouldn't be updated anymore
@@ -257,7 +258,7 @@ module Spree
     end
 
     def should_restart_checkout?
-      (@order.quick_checkout? || @order.ship_address.nil?) && (@order.delivery? || @order.payment?)
+      (@order.quick_checkout? || (@order.requires_ship_address? && @order.ship_address.nil?)) && (@order.delivery? || @order.payment?)
     end
 
     def restart_checkout
@@ -314,7 +315,9 @@ module Spree
         @order.bill_address ||= try_spree_current_user.bill_address
       end
       # for guest users or users without addresses, we need to build an empty one here
-      @order.ship_address ||= Address.new(country: current_store.default_country, user: try_spree_current_user)
+      if @order.requires_ship_address?
+        @order.ship_address ||= Address.new(country: current_store.default_country, user: try_spree_current_user)
+      end
     end
 
     def before_delivery
@@ -325,7 +328,11 @@ module Spree
     end
 
     def before_payment
-      @order.bill_address ||= @order.ship_address.clone
+      @order.bill_address ||= if @order.requires_ship_address?
+                                @order.ship_address.clone
+                              else
+                                Spree::Address.new(country: current_store.default_country, user: try_spree_current_user)
+                              end
 
       if @order.checkout_steps.include? 'delivery'
         packages = @order.shipments.map(&:to_package)
@@ -374,10 +381,9 @@ module Spree
     end
 
     def remove_expired_gift_card
-      return unless defined?(Spree::GiftCards::Remove)
       return unless @order.gift_card.present? && @order.gift_card.expired?
 
-      Spree::GiftCards::Remove.call(order: @order)
+      Spree::Dependencies.gift_card_remove_service.constantize.call(order: @order)
     end
   end
 end

data/app/controllers/spree/line_items_controller.rb

@@ -22,8 +22,6 @@ module Spree
                                           quantity: @quantity,
                                           options: options)
 
-      flash.now[:error] = result.value.errors.full_messages.to_sentence if result.failure?
-
       @line_item = result.value
 
       if result.success?
@@ -45,9 +43,12 @@ module Spree
       quantity = line_item_params[:quantity]&.to_i || 1
       result = cart_set_item_quantity_service.call(order: @order, line_item: @line_item, quantity: quantity)
 
-      @error = result.value.errors.full_messages.to_sentence if result.failure?
-
-      load_line_items if result.success?
+      if result.success?
+        load_line_items
+      else
+        @error = result.value.errors.full_messages.to_sentence
+        flash.now[:error] = @error
+      end
 
       respond_to do |format|
         format.turbo_stream
@@ -57,9 +58,15 @@ module Spree
 
     def destroy
       result = cart_remove_line_item_service.call(order: @order, line_item: @line_item)
-      load_line_items if result.success?
 
-      track_event('product_removed', { line_item: @line_item })
+      if result.success?
+        load_line_items
+
+        track_event('product_removed', { line_item: @line_item })
+      else
+        @error = result.value.errors.full_messages.to_sentence
+        flash.now[:error] = @error
+      end
 
       respond_to do |format|
         format.turbo_stream

data/app/controllers/spree/products_controller.rb

@@ -23,7 +23,7 @@ module Spree
       load_product
       # An interesting thing is that since we're querying the translations table (in the multi_search),
       # when using not default locale, our related products are different for different locales.
-      @products = current_store.products.active(current_currency).where.not(id: @product.id).
+      @products = storefront_products_scope.where.not(id: @product.id).
                   multi_search(@product.name).includes(storefront_products_includes).
                   limit(@section.preferred_max_products_to_show)
     end

data/app/controllers/spree/search_controller.rb

@@ -13,7 +13,7 @@ module Spree
       @taxons = []
 
       if query.present? && query.length >= Spree::Storefront::Config.search_min_query_length
-        products_scope = current_store.products.active(current_currency).multi_search(query)
+        products_scope = storefront_products_scope.multi_search(query)
         @products = products_scope.includes(storefront_products_includes)
         @taxons = current_store.taxons.search_by_name(query)
       end

data/app/controllers/spree/store_controller.rb

@@ -123,29 +123,31 @@ module Spree
     end
 
     def storefront_products_scope
-      current_store.products.active(current_currency)
+      @storefront_products_scope ||= current_store.products.active(current_currency)
     end
 
     def default_products_finder_params
-      taxon = @taxon || current_taxon
+      @default_products_finder_params ||= begin
+        taxon = @taxon || current_taxon
 
-      filter = permitted_products_params.fetch(:filter, {}).dup
+        filter = permitted_products_params.fetch(:filter, {}).dup
 
-      filter[:taxon_ids] ||= [taxon&.id.to_s].compact
-      filter[:taxons] = filter[:taxon_ids].join(',')
+        filter[:taxon_ids] ||= [taxon&.id.to_s].compact
+        filter[:taxons] = filter[:taxon_ids].join(',')
 
-      if filter.key?(:min_price) || filter.key?(:max_price)
-        min_price = filter[:min_price].presence || 0
-        max_price = filter[:max_price].presence || 'Infinity'
+        if filter.key?(:min_price) || filter.key?(:max_price)
+          min_price = filter[:min_price].presence || 0
+          max_price = filter[:max_price].presence || 'Infinity'
 
-        filter[:price] = [min_price, max_price].compact.join(',')
-      end
+          filter[:price] = [min_price, max_price].compact.join(',')
+        end
 
-      permitted_products_params.merge(
-        store: current_store,
-        filter: filter,
-        currency: current_currency
-      )
+        permitted_products_params.merge(
+          store: current_store,
+          filter: filter,
+          currency: current_currency
+        )
+      end
     end
 
     def storefront_products
@@ -202,13 +204,13 @@ module Spree
       redirect_back(fallback_location: default)
     end
 
-    def require_user(return_to = nil)
+    def require_user(return_to: nil, redirect_path: nil)
       return if try_spree_current_user
 
       store_location(return_to)
 
       respond_to do |format|
-        format.html { redirect_to spree_login_path }
+        format.html { redirect_to redirect_path || spree_login_path }
         format.turbo_stream { render turbo_stream: turbo_stream.slideover_open('slideover-account', 'account-pane') }
       end
     end

data/app/helpers/spree/cart_helper.rb

@@ -22,7 +22,7 @@ module Spree
         class: opts[:class],
         data: {
           'quantity-picker-target': opts[:action],
-          action: "click->quantity-picker##{opts[:action]} click->cart#disableCart"
+          action: "click->quantity-picker##{opts[:action]} click->cart#disableCart turbo-stream-form:submit-end->cart#enableCart"
         }
       )
     end

data/app/helpers/spree/checkout_helper.rb

@@ -47,8 +47,7 @@ module Spree
     end
 
     def quick_checkout_enabled?(order)
-      order.payment_required? && order.shipments.count <= 1 &&
-        (order.digital? || !order.some_digital?) # Either fully digital or not digital at all
+      order.quick_checkout_available?
     end
 
     def can_use_store_credit_on_checkout?(order)

data/app/helpers/spree/filters_helper.rb

@@ -26,19 +26,23 @@ module Spree
     end
 
     def product_filters_aggregations
-      @product_filters_aggregations ||= storefront_products_for_filters.
-                                        joins(variants_including_master: :option_values).
-                                        group("#{Spree::OptionValue.table_name}.id").
-                                        distinct.
-                                        count
+      @product_filters_aggregations ||= Rails.cache.fetch(["product-filters-aggregations", storefront_products_for_filters.cache_key_with_version], expires_in: 1.day) do
+        storefront_products_for_filters.
+        joins(variants_including_master: :option_values).
+        group("#{Spree::OptionValue.table_name}.id").
+        distinct.
+        count
+      end
     end
 
     def product_single_filter_aggregations
-      @product_single_filter_aggregations ||= default_storefront_products_for_filters.
-                                              joins(variants_including_master: :option_values).
-                                              group("#{Spree::OptionValue.table_name}.id").
-                                              distinct.
-                                              count
+      @product_single_filter_aggregations ||= Rails.cache.fetch(["product-single-filter-aggregations", default_storefront_products_for_filters.cache_key_with_version], expires_in: 1.day) do
+        default_storefront_products_for_filters.
+        joins(variants_including_master: :option_values).
+        group("#{Spree::OptionValue.table_name}.id").
+        distinct.
+        count
+      end
     end
 
     def products_count_for_filter(name, value_id)
@@ -48,23 +52,27 @@ module Spree
 
     def filter_price_range
       @filter_price_range ||= begin
-        product_ids = products_for_filters_scope(except_filters: [:price]).ids
+        products = products_for_filters_scope(except_filters: [:price])
 
-        {
-          min: Spree::Price.for_products(product_ids).minimum(:amount) || 0.to_d,
-          max: Spree::Price.for_products(product_ids).maximum(:amount) || 0.to_d
-        }
+        Rails.cache.fetch(["price-range", products.cache_key_with_version, current_currency], expires_in: 1.day) do
+          {
+            min: Spree::Price.for_products(products, current_currency).minimum(:amount) || 0.to_d,
+            max: Spree::Price.for_products(products, current_currency).maximum(:amount) || 0.to_d
+          }
+        end
       end
     end
 
     def filter_stock_count
       @filter_stock_count ||= begin
-        products_scope = products_for_filters_scope(except_filters: [:purchasable, :out_of_stock])
+        products = products_for_filters_scope(except_filters: [:purchasable, :out_of_stock])
 
-        {
-          in_stock: products_scope.in_stock.distinct.count,
-          out_of_stock: products_scope.out_of_stock.distinct.count
-        }
+        Rails.cache.fetch(["stock-count", products.cache_key_with_version], expires_in: 1.day) do
+          {
+            in_stock: products.in_stock.distinct.count,
+            out_of_stock: products.out_of_stock.distinct.count
+          }
+        end
       end
     end
 
@@ -76,14 +84,18 @@ module Spree
       if filter_selected
         default_storefront_filter_values_scope
       else
-        Spree::OptionValue.for_products(storefront_products_for_filters).distinct
+        all_option_values_scope
       end
     end
 
+    def all_option_values_scope
+      @all_option_values_scope ||= Spree::OptionValue.for_products(storefront_products_scope).distinct
+    end
+
     def filter_values_for_filter(filter)
       selected = single_option_filter_selected?(filter.name)
       if filter.option_values.loaded?
-        storefront_filter_values_ids = storefront_filter_values_scope(selected).pluck(:id)
+        storefront_filter_values_ids = storefront_filter_values_scope(selected).ids
 
         filter.option_values.find_all { |option_value| storefront_filter_values_ids.include?(option_value.id) }
       else

data/app/helpers/spree/products_helper.rb

@@ -165,7 +165,7 @@ module Spree
         {
           '@type' => 'ListItem',
           'position' => index + 1,
-          'url' => spree.product_url(product_slug)
+          'url' => spree.product_url(product_slug, host: current_store.url_or_custom_domain)
         }
       end
     end
@@ -213,5 +213,9 @@ module Spree
 
       Spree::ColorsPreviewStylesPresenter.new(option_type.option_values.map { |ov| { name: ov.name, filter_name: ov.name } }).to_s
     end
+
+    def product_properties(product)
+      product.product_properties.joins(:property).merge(Spree::Property.available_on_front_end).sort_by_property_position
+    end
   end
 end

data/app/helpers/spree/storefront_helper.rb

@@ -1,6 +1,8 @@
 module Spree
   module StorefrontHelper
     include BaseHelper
+    include Spree::ImagesHelper
+    include Spree::ShipmentHelper
     include Heroicon::Engine.helpers
 
     # Renders the storefront partials for the given section.
@@ -65,14 +67,15 @@ module Spree
 
     def svg_country_icon(country_code)
       country_code = :us if country_code.to_s.downcase == 'en'
+      country_code = :jp if country_code.to_s.downcase == 'ja'
       tag.span(class: "fi fi-#{country_code.downcase}")
     end
 
     def show_account_pane?
       !try_spree_current_user &&
-        (defined?(spree_login_path) && !paths_equal?(canonical_path, spree_login_path)) &&
-        (defined?(spree_signup_path) && !paths_equal?(canonical_path, spree_signup_path)) &&
-        (defined?(spree_forgot_password_path) && !paths_equal?(canonical_path, spree_forgot_password_path))
+        defined?(spree_login_path) && !paths_equal?(canonical_path, spree_login_path) &&
+        defined?(spree_signup_path) && !paths_equal?(canonical_path, spree_signup_path) &&
+        defined?(spree_forgot_password_path) && !paths_equal?(canonical_path, spree_forgot_password_path)
     end
 
     def paths_equal?(path1, path2)

data/app/javascript/spree/storefront/controllers/card_validation_controller.js

@@ -56,6 +56,8 @@ export default class extends Controller {
   }
 
   updateCardIcon(cardType) {
+    cardType = (cardType === "mastercard" ? "master" : cardType)
+
     const iconElement = document.getElementById(`credit-card-icon-${cardType}`)
     if (iconElement) {
       this.typeContainerTarget.innerHTML = iconElement.innerHTML

data/app/javascript/spree/storefront/controllers/cart_controller.js

@@ -7,4 +7,9 @@ export default class extends Controller {
     this.containerTarget.classList.add('pointer-events-none', 'opacity-50')
     this.spinnerTarget.classList.remove('hidden')
   }
+
+  enableCart() {
+    this.containerTarget.classList.remove('pointer-events-none', 'opacity-50')
+    this.spinnerTarget.classList.add('hidden')
+  }
 }

data/app/views/devise/passwords/edit.html.erb

@@ -6,7 +6,7 @@
     <div class="flex flex-col mb-4">
       <%= f.label :password, Spree.t(:password) %>
       <% if @minimum_password_length %>
-        <em>(<%= @minimum_password_length %> characters minimum)</em>
+        <em><%= Spree.t(:minimum_password_length, count: @minimum_password_length) %></em>
       <% end %>
       <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: 'text-input', required: true %>
     </div>

data/app/views/devise/registrations/new.html.erb

@@ -10,7 +10,7 @@
       <div class="flex flex-col mb-4">
         <%= f.label :password, Spree.t(:password) %>
         <% if @minimum_password_length %>
-          <em>(<%= @minimum_password_length %> characters minimum)</em>
+          <em><%= Spree.t(:minimum_password_length, count: @minimum_password_length) %></em>
         <% end %>
         <%= f.password_field :password, autocomplete: "new-password", class: 'text-input', required: true %>
       </div>

data/app/views/devise/shared/_links.html.erb

@@ -9,14 +9,14 @@
     <%= link_to Spree.t(:forgot_password), new_password_path(resource_name) %>
   <% end %>
   <%- if devise_mapping.confirmable? && controller_name != 'user_confirmations' %>
-    <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+    <%= link_to Spree.t(:didn_t_receive_confirmation_instructions), new_confirmation_path(resource_name) %>
   <% end %>
   <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'user_unlocks' %>
-    <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+    <%= link_to Spree.t(:didn_t_receive_unlock_instructions), new_unlock_path(resource_name) %>
   <% end %>
   <%- if devise_mapping.omniauthable? %>
     <%- resource_class.omniauth_providers.each do |provider| %>
-      <%= button_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), data: { turbo: false } %>
+      <%= button_to Spree.t(:sign_in_with_provider, provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider), data: { turbo: false } %>
     <% end %>
   <% end %>
 </div>

data/app/views/spree/addresses/edit.html.erb

@@ -42,13 +42,13 @@
             <%= check_box_tag "default_shipping", "true", @address.user_default_shipping?,
               class: 'input-checkbox input-address-default',
               disabled: @address.user_default_shipping? %>
-            Set as default delivery address
+            <%= Spree.t("address_book.set_as_default_delivery_address") %>
           <% end %>
           <%= label_tag "default_billing", class: "flex items-center gap-2 text-sm mb-4" do %>
             <%= check_box_tag "default_billing", "true", @address.user_default_billing?,
               class: 'input-checkbox input-address-default',
               disabled: @address.user_default_billing? %>
-            Set as default billing address
+            <%= Spree.t("address_book.set_as_default_billing_address") %>
           <% end %>
         </div>
         <div class="border-t border-default -mx-4 lg:mx-0 px-4 flex justify-end items-center gap-4 py-6 lg:px-8">

data/app/views/spree/checkout/_address.html.erb

@@ -13,20 +13,7 @@
           </h5>
           <ul class="select_address list-group mb-5 border mt-3 rounded-md border-default">
             <% user_available_addresses.each_with_index do |address, idx| %>
-              <li class="p-0 m-0 border-b border-default" id="<%= [address_type, dom_id(address)].join('_') %>">
-                <% checked = (address.id == @order.ship_address_id || (!@order.ship_address_id && idx == 0)) %>
-                <div class="custom-control custom-radio px-5 py-4 flex items-center">
-                  <%= radio_button_tag "order_#{address_name}_id", address.id, checked, class: 'custom-control-input radio-input mt-1 mr-5', data: { action: 'checkout-address-book#select' } %>
-                  <label class="custom-control-label d-block select-none cursor-pointer max-w-[calc(100%-58px)]" for="<%= "order_#{address_name}_id_#{address.id}" %>">
-                    <%= turbo_frame_tag dom_id(address) do %>
-                      <%= render 'spree/shared/address', address: address %>
-                      <div class="address-book-actions mt-3 <% unless checked %>hidden<% end %>">
-                        <%= link_to Spree.t(:edit), spree.edit_address_path(address, checkout: @order.token), class: 'text-dark' %>
-                      </div>
-                    <% end %>
-                  </label>
-                </div>
-              </li>
+              <%= render 'spree/checkout/address_list_item', address: address, idx: idx, order: @order, address_type: address_type, address_name: address_name %>
             <% end %>
             <li class="list-group-item p-0 m-0">
               <div class="custom-control custom-radio px-5 py-4 flex items-center">
@@ -49,7 +36,7 @@
                     <% end %>
                   </div>
                 </label>
-              </label>
+              </div>
             </li>
           </ul>
         </div>
@@ -58,7 +45,7 @@
 
     <%= form_for @order, url: spree.update_checkout_path(@order.token, @order.state), html: { id: "checkout_form_#{@order.state}" } do |form| %>
       <div>
-        <%= form.hidden_field :state_lock_version %>
+        <%= render 'spree/checkout/order_lock_version', order: @order %>
         <%= form.hidden_field :ship_address_id, data: { 'checkout-address-book-target': 'addressId' } %>
       </div>
 
@@ -77,9 +64,8 @@
   </div>
 <% else %>
   <%= form_for @order, url: spree.update_checkout_path(@order.token, @order.state), html: { id: "checkout_form_#{@order.state}" } do |form| %>
+    <%= render 'spree/checkout/order_lock_version', order: @order %>
     <div class="mb-5">
-      <%= form.hidden_field :state_lock_version %>
-
       <% if !try_spree_current_user || try_spree_current_user.email.blank? %>
         <div class="grid grid-cols-1 lg:grid-cols-2 mb-3 font-body">
           <h5 class="font-body">
@@ -118,34 +104,35 @@
       <% unless try_spree_current_user %>
         <% if already_have_an_account? %>
           <div class="py-2 text-sm">
-            It seems you already have an account with us. Please
-            <%= link_to Spree.t(:login), spree_login_path, class: 'text-primary font-semibold' %> to continue.
+            <%= Spree.t("storefront.checkout.it_seems_you_already_have_an_account_html", link: link_to(Spree.t(:login), spree_login_path, class: 'text-primary font-semibold')) %>
           </div>
         <% end %>
       <% end %>
 
-      <div class="mb-4" data-controller="checkout-address-book" data-checkout-address-book-target="list">
-        <div id="<%= address_type %>">
-          <h5 class="mt-5 mb-4 font-body">
-            <%= Spree.t(address_type + '_address') %>
-          </h5>
-          <%= form.fields_for address_name do |address_form| %>
-            <div class="inner checkout-content-inner" data-hook='<%= "#{address_type}_inner" %>'>
-              <%= render partial: 'spree/addresses/form', locals: {
-                address_name: address_name,
-                address_form: address_form,
-                address_type: address_type,
-                address: Spree::Address.new(country: current_store.default_country, user: try_spree_current_user),
-                form: form
-              } %>
-            </div>
-          <% end %>
+      <% if @order.requires_ship_address? %>
+        <div class="mb-4" data-controller="checkout-address-book" data-checkout-address-book-target="list">
+          <div id="<%= address_type %>">
+            <h5 class="mt-5 mb-4 font-body">
+              <%= Spree.t(address_type + '_address') %>
+            </h5>
+            <%= form.fields_for address_name do |address_form| %>
+              <div class="inner checkout-content-inner" data-hook='<%= "#{address_type}_inner" %>'>
+                <%= render partial: 'spree/addresses/form', locals: {
+                  address_name: address_name,
+                  address_form: address_form,
+                  address_type: address_type,
+                  address: address_form.object.persisted? ? address_form.object : Spree::Address.new(country: current_store.default_country, user: try_spree_current_user),
+                  form: form
+                } %>
+              </div>
+            <% end %>
+          </div>
         </div>
-      </div>
+        <%= hidden_field_tag 'save_user_address', true, data: { hook: "save_user_address" } %>
+      <% end %>
 
       <%= render 'spree/checkout/special_instructions', form: form %>
 
-      <%= hidden_field_tag 'save_user_address', true, data: { hook: "save_user_address" } %>
     </div>
     <div class="flex justify-end w-full">
       <%= button_tag Spree.t(:save_and_continue),

data/app/views/spree/checkout/_address_list_item.html.erb

@@ -0,0 +1,14 @@
+<li class="p-0 m-0 border-b border-default" id="<%= [address_type, dom_id(address)].join('_') %>">
+  <% checked = (address.id == @order.ship_address_id || (!@order.ship_address_id && idx == 0)) %>
+  <div class="custom-control custom-radio px-5 py-4 flex items-center">
+    <%= radio_button_tag "order_#{address_name}_id", address.id, checked, class: 'custom-control-input radio-input mt-1 mr-5', data: { action: 'checkout-address-book#select' } %>
+    <label class="custom-control-label d-block select-none cursor-pointer max-w-[calc(100%-58px)]" for="<%= "order_#{address_name}_id_#{address.id}" %>">
+      <%= turbo_frame_tag dom_id(address) do %>
+        <%= render 'spree/shared/address', address: address %>
+        <div class="address-book-actions mt-3 <% unless checked %>hidden<% end %>">
+          <%= link_to Spree.t(:edit), spree.edit_address_path(address, checkout: @order.token), class: 'text-dark' %>
+        </div>
+      <% end %>
+    </label>
+  </div>
+</li>

data/app/views/spree/checkout/_coupon_code.html.erb

@@ -1,5 +1,5 @@
 <%= turbo_frame_tag :checkout_coupon_code, class: "shopping-cart-coupon-code #{local_assigns[:classes]} flex flex-col gap-3" do %>
-  <% if promotion.nil? %>
+  <% if promotion.nil? && @order.gift_card.blank? %>
     <%= form_tag spree.checkout_apply_coupon_code_path(@order.token), method: :patch, data: {controller: "checkout-promotions"} do %>
       <div class="flex" data-controller="enable-button">
         <%= hidden_field_tag :promotion_email, @order.email, data: {checkout_promotions_target: 'promotionEmailField'} %>
@@ -8,7 +8,7 @@
                                                   aria: { label: Spree.t('cart_page.add_promo_code') },
                                                   data: { 'enable-button-target': 'input' },
                                                   required: true %>
-        <%= button_tag 'Apply', class: 'min-h-full ml-3 btn-primary !px-4 !py-3', data: { 'enable-button-target': 'button' }, disabled: true %>
+        <%= button_tag Spree.t(:apply), class: 'min-h-full ml-3 btn-primary !px-4 !py-3', data: { 'enable-button-target': 'button' }, disabled: true %>
       </div>
     <% end %>
   <% elsif promotion.present? %>
@@ -26,7 +26,7 @@
         </div>
       </div>
     <% end %>
-  <% elsif @order.respond_to?(:gift_card) && @order.gift_card %>
+  <% elsif @order.gift_card.present? %>
     <%= form_tag spree.checkout_remove_coupon_code_path(@order.token), method: :delete do %>
       <%= hidden_field_tag :gift_card, @order.gift_card.code %>
       <div class="m-0">