ba_spree 1.0.0

data/app/services/ba_spree/setup_service.rb

@@ -0,0 +1,144 @@
+module BaSpree
+  # Spree のストアを日本仕様に初期設定する。
+  #
+  # 扱うのは「日本で EC を始めるなら誰でも必要になる設定」だけで、
+  # ストア名・URL・メールアドレスといった各ショップ固有の情報には触れない。
+  # それらは呼び出し側が設定する。
+  #
+  # @see https://github.com/be-agile/giga-repeat/issues/1317
+  class SetupService
+    # 国マスタ (Spree の seed が作る) が無いときに投げる
+    class CountryNotFoundError < StandardError; end
+
+    COUNTRY_NOT_FOUND_MESSAGE =
+      "日本 (iso: JP) が spree_countries に見つかりません。先に `rails db:seed` を実行してください。".freeze
+
+    PREFECTURES = [
+      "北海道", "青森県", "岩手県", "宮城県", "秋田県", "山形県", "福島県", "茨城県", "栃木県", "群馬県",
+      "埼玉県", "千葉県", "東京都", "神奈川県", "新潟県", "富山県", "石川県", "福井県", "山梨県",
+      "長野県", "岐阜県", "静岡県", "愛知県", "三重県", "滋賀県", "京都府", "大阪府", "兵庫県",
+      "奈良県", "和歌山県", "鳥取県", "島根県", "岡山県", "広島県", "山口県", "徳島県", "香川県",
+      "愛媛県", "高知県", "福岡県", "佐賀県", "長崎県", "熊本県", "大分県", "宮崎県", "鹿児島県", "沖縄県"
+    ].freeze
+
+    # Spree::Seeds::Zones が作る海外向けゾーン全7種。日本国内向けストアでは不要なので削除する。
+    # @see spree_core-5.3.6/app/services/spree/seeds/zones.rb
+    FOREIGN_ZONE_NAMES = [
+      "EU_VAT", "UK_VAT", "North America", "South America",
+      "Middle East", "Asia", "Australia and Oceania"
+    ].freeze
+
+    # 標準税率。配送料の税区分にも使う
+    STANDARD_TAX_CODE = "consumption10".freeze
+
+    TAX_RATES = [
+      { amount: 0.1, name: "消費税10%", code: STANDARD_TAX_CODE },
+      # 軽減税率 (飲食料品・定期購読の新聞)
+      { amount: 0.08, name: "消費税8%", code: "consumption8" },
+      { amount: 0, name: "消費税非課税", code: "consumption0" }
+    ].freeze
+
+    ZONE_NAME = "日本".freeze
+    SHIPPING_METHOD_CODE = "fixed".freeze
+    SHIPPING_RATE = 500
+    SAGAWA_TRACKING_URL = "https://k2k.sagawa-exp.co.jp/p/web/okurijosearch.do?okurijoNo=:tracking".freeze
+
+    class << self
+      # @param store [Spree::Store] 日本仕様に設定するストア
+      # @param load_seed [Boolean] Spree の seed (国マスタ等) を先に流すか
+      def setup(store:, load_seed: true)
+        Spree::Core::Engine.load_seed if load_seed
+
+        japan = setup_country
+        zone = setup_zone(japan)
+        setup_tax_rates(zone)
+        setup_store(store, japan, zone)
+        setup_shipping_method(zone)
+        store
+      end
+
+      private
+
+      # 国マスタは Spree の seed が作る。load_seed: false で呼ぶ場合は
+      # 事前に `rails db:seed` を済ませておく必要があるため、
+      # 見つからなければ理由の分かる例外で止める。
+      def setup_country
+        japan = Spree::Country.find_by(iso: "JP")
+        raise CountryNotFoundError, COUNTRY_NOT_FOUND_MESSAGE if japan.nil?
+
+        japan.update(states_required: true)
+        PREFECTURES.each do |prefecture|
+          Spree::State.find_or_create_by(name: prefecture, country: japan, abbr: prefecture)
+        end
+        japan
+      end
+
+      def setup_zone(japan)
+        FOREIGN_ZONE_NAMES.each { |name| Spree::Zone.find_by(name: name)&.destroy }
+
+        zone = Spree::Zone.find_or_create_by(name: ZONE_NAME, description: "", default_tax: true, kind: "country")
+        zone.zone_members = [ Spree::ZoneMember.new(zoneable: japan) ]
+        zone.save
+        zone
+      end
+
+      def setup_tax_rates(zone)
+        TAX_RATES.each do |attr|
+          # is_default は検索条件に含めない。Spree::TaxCategory#set_default_category が
+          # 「default は1つだけ」を保つため他カテゴリの is_default を false に落とすので、
+          # 条件に含めると2回目以降マッチせず重複レコードが増える
+          tax_category = Spree::TaxCategory.find_or_create_by!(name: attr[:name], tax_code: attr[:code]) do |category|
+            category.description = ""
+            category.is_default = true
+          end
+          tax_rate = Spree::TaxRate.find_or_initialize_by(
+            amount: attr[:amount],
+            zone: zone,
+            tax_category: tax_category,
+            included_in_price: true,
+            name: "消費税",
+            show_rate_in_label: true)
+          tax_rate.calculator = Spree::Calculator::DefaultTax.new
+          tax_rate.save
+        end
+      end
+
+      # 通貨・ロケール・課税ゾーンなど、日本で運用するうえで必要な設定のみを行う。
+      # ストア名・URL・メールアドレスは各ショップ固有の情報なので呼び出し側の責務とする。
+      def setup_store(store, japan, zone)
+        store.default_currency = "JPY"
+        store.supported_currencies = "JPY"
+        store.supported_locales = "ja"
+        store.default_country = japan
+        store.checkout_zone = zone
+        store.save
+      end
+
+      def setup_shipping_method(zone)
+        tax_category = Spree::TaxCategory.find_by(tax_code: STANDARD_TAX_CODE)
+        shipping_method = Spree::ShippingMethod.find_or_initialize_by(
+          name: "配送料",
+          display_on: "both",
+          tracking_url: SAGAWA_TRACKING_URL,
+          admin_name: "配送料(定額)",
+          tax_category: tax_category,
+          code: SHIPPING_METHOD_CODE)
+        shipping_method.shipping_categories = [ default_shipping_category ]
+        calculator = Spree::Calculator::Shipping::FlatRate.new
+        calculator.preferred_currency = "JPY"
+        calculator.preferred_amount = SHIPPING_RATE
+        shipping_method.calculator = calculator
+        shipping_method.save
+        Spree::ShippingMethodZone.create(shipping_method: shipping_method, zone: zone)
+        shipping_method
+      end
+
+      # Spree の seed が作る既定の配送カテゴリ。
+      # 名前は spree.seed.shipping.categories.default の訳 (日本語なら「既定」) になるが、
+      # seed 未実行だと存在しないため、無ければここで作る。
+      def default_shipping_category
+        Spree::ShippingCategory.find_or_create_by!(name: I18n.t("spree.seed.shipping.categories.default"))
+      end
+    end
+  end
+end

data/app/services/spree/assets/position_normalizer.rb

@@ -0,0 +1,67 @@
+module Spree
+  module Assets
+    # 同一 viewable に属する Spree::Asset の position を、現在の並び順 (position, id) を
+    # 保ったまま 1..N の連番へ詰め直す。
+    #
+    # 管理画面の並び替え (stimulus-sortable) は、移動した 1 件だけに
+    # `asset[position] = 画面上のインデックス + 1` を送る。受け側の acts_as_list は
+    # 送られた position が既存レコードと衝突したときにしか周囲を詰め直さないため、
+    # position が 1..N の連番でないと 200 を返すのに並び順が変わらない。
+    # 並び替えの直前と、position が壊れうる経路の直後にこのサービスを呼ぶ。
+    #
+    # @see https://github.com/be-agile/giga-repeat/issues/1292
+    class PositionNormalizer
+      # position が 1..N の連番になっていない viewable を検出する条件。
+      # 欠番 (最小が 1 でない / 最大が件数と一致しない) と重複 (distinct 数が件数と一致しない) を見る。
+      BROKEN_SCOPE_CONDITION = <<~SQL.squish.freeze
+        MIN(position) <> 1
+        OR MAX(position) <> COUNT(*)
+        OR COUNT(DISTINCT position) <> COUNT(*)
+      SQL
+
+      class << self
+        # @param viewable_type [String]
+        # @param viewable_id [Integer]
+        # @return [Boolean] 詰め直しを行った場合 true、もともと連番だった場合 false
+        def call(viewable_type:, viewable_id:)
+          return false if viewable_type.blank? || viewable_id.blank?
+
+          assets = ordered_assets(viewable_type, viewable_id)
+          return false if sequential?(assets)
+
+          # 1 件ずつ書き換える途中では position が一時的に重複しうるため、
+          # 中断や並行読み取りに晒さないようトランザクションでまとめる。
+          Spree::Asset.transaction do
+            assets.each_with_index do |asset, index|
+              asset.update_column(:position, index + 1) unless asset.position == index + 1
+            end
+          end
+          true
+        end
+
+        # position が壊れている viewable の一覧。
+        # @return [Array<Array(String, Integer)>] [viewable_type, viewable_id] の配列
+        def broken_scopes
+          Spree::Asset.unscoped
+                      .where.not(viewable_id: nil)
+                      .group(:viewable_type, :viewable_id)
+                      .having(BROKEN_SCOPE_CONDITION)
+                      .pluck(:viewable_type, :viewable_id)
+        end
+
+        private
+
+        def ordered_assets(viewable_type, viewable_id)
+          Spree::Asset.unscoped
+                      .where(viewable_type: viewable_type, viewable_id: viewable_id)
+                      .order(:position, :id)
+                      .to_a
+        end
+
+        def sequential?(assets)
+          assets.each_with_index.all? { |asset, index| asset.position == index + 1 }
+        end
+      end
+    end
+  end
+end

data/app/services/spree/products/duplicator_decorator.rb

@@ -0,0 +1,39 @@
+module Spree
+  module Products
+    # 商品複製時の variant_count カウンタキャッシュずれを補正する。
+    #
+    # 背景:
+    #   Spree 5.3.6 で `spree_products.variant_count` カウンタキャッシュが導入され、
+    #   `Spree::Product#has_variants?` はこの値を参照するようになった。
+    #   しかし upstream の Duplicator は `product.dup` で元商品の variant_count を
+    #   そのまま引き継いだ上、複製したバリエーションを autosave するため
+    #   `Spree::Variant#increment_product_variant_count` が二重に走り、
+    #   複製先の variant_count が「元の件数 + 複製件数」に膨らむ。
+    #
+    #   その状態で複製先のバリエーションを全削除すると、
+    #   削除1件につき1ずつしか減らないため variant_count が 0 にならず、
+    #   バリエーションが無いのに has_variants? が true のままとなり、
+    #   バリエーションなし商品としての在庫(数量)設定フォームが表示されなくなる。
+    #
+    # 対策:
+    #   複製・保存後の新商品について、実際の非マスターバリエーション件数で
+    #   variant_count を上書きし、dup 引き継ぎ + autosave 二重カウントを打ち消す。
+    #
+    # @see https://github.com/be-agile/giga-repeat/issues/1250
+    module DuplicatorDecorator
+      # @gem-override spree_core-5.3.6/app/services/spree/products/duplicator.rb#call
+      # @see https://github.com/be-agile/giga-repeat/issues/1250
+      def call(product:, include_images: true)
+        super.tap do |result|
+          new_product = result.value
+          next unless new_product.is_a?(Spree::Product) && new_product.persisted?
+
+          actual_count = new_product.variants.reload.count
+          new_product.update_column(:variant_count, actual_count)
+        end
+      end
+    end
+  end
+end
+
+Spree::Products::Duplicator.prepend(Spree::Products::DuplicatorDecorator)

data/app/services/spree/products/prepare_nested_attributes_decorator.rb

@@ -0,0 +1,58 @@
+module Spree
+  module Products
+    module PrepareNestedAttributesDecorator
+      # @gem-override spree_core-5.3.6/app/services/spree/products/prepare_nested_attributes.rb#update_option_value_variants
+      # @see https://github.com/be-agile/giga-repeat/commit/108316dd2cab88a61933080614e15663517c7291
+      def update_option_value_variants(option_value_params, existing_variant)
+        return {} unless option_value_params.present?
+        return {} unless can_manage_option_types?
+
+        option_value_variant_params = {}
+
+        option_value_params.each_with_index do |opt, index|
+          option_type = Spree::OptionType.find_by(id: opt[:id]) if opt.fetch(:id)
+          option_type ||= Spree::OptionType.where(name: opt[:name]).first_or_initialize do |o|
+            o.name = o.presentation = opt[:name]
+            o.position = opt[:position]
+            o.save!
+          end
+          option_value_identificator = if opt[:option_value_name].present?
+            opt[:option_value_name]
+          else
+            opt[:option_value_presentation]
+          end.strip
+
+          option_value = option_type.option_values.where(name: option_value_identificator).first_or_initialize do |o|
+            o.presentation = opt[:option_value_presentation]
+            o.save!
+          end
+
+          existing_option_value_variant = existing_variant&.option_value_variants&.find { |ovv| ovv.option_value_id == option_value.id }
+
+          option_value_variant_params[index.to_s] = { id: existing_option_value_variant&.id, option_value_id: option_value.id }.compact_blank
+
+          next if product_option_types_params.find { |_i, v| v[:option_type_id] == option_type.id }
+
+          existing_product_option_type = @product.product_option_types.find { |pot| pot.option_type_id == option_type.id }
+
+          if existing_product_option_type
+            product_option_types_to_remove.delete(existing_product_option_type.id)
+            product_option_types_params[opt[:position]] = {
+              id: existing_product_option_type.id,
+              position: opt[:position],
+              option_type_id: option_type.id
+            }
+          else
+            product_option_types_params[opt[:position]] = {
+              option_type_id: option_type.id,
+              position: opt[:position]
+            }
+          end
+        end
+
+        option_value_variant_params
+      end
+    end
+  end
+end
+Spree::Products::PrepareNestedAttributes.prepend(Spree::Products::PrepareNestedAttributesDecorator)

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

@@ -0,0 +1,64 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/spree/addresses/edit.html.erb %>
+<%# reason: 破棄ボタンの配色を btn-light からインラインスタイル付き btn-primary に変更している %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/74d9106123e9f58bf410e9cee3d2fefc4336123c %>
+<% if params[:checkout].present? %>
+  <%= turbo_frame_tag dom_id(@address) do %>
+    <%= render 'spree/shared/error_messages', target: @address %>
+    <%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
+      <%= render 'spree/addresses/form',
+        address_name: 'address',
+        address_form: f,
+        address_type: 'shipping',
+        address: @address %>
+
+      <%= hidden_field_tag :checkout, params[:checkout] %>
+      <div class="flex justify-between items-center">
+        <%= f.submit Spree.t(:update), class: 'btn btn-primary w-25 !py-2' %>
+        <%= link_to Spree.t('actions.discard'), :back, class: 'btn btn-primary w-25 !py-2', style: "background-color: #D9D9D9; color: #5E5B5B; border: 1px solid #D9D9D9" %>
+      </div>
+    <% end %>
+  <% end %>
+<% elsif turbo_frame_request? %>
+  <%= turbo_frame_tag "edit_address_modal_#{@address.id}" do %>
+    <%= render partial: 'spree/account/addresses/edit_address_modal', locals: { address: @address } %>
+  <% end %>
+<% else %>
+  <div class="page-container grid grid-cols-1 lg:grid-cols-12 lg:gap-6 lg:mt-6">
+    <div class="lg:col-span-2">
+      <%= render 'spree/account/account_nav', current: 'address' %>
+    </div>
+    <div class="lg:col-span-6 lg:col-start-4">
+      <div class="pb-4 border-b border-default -mx-4 lg:mx-0 px-4 lg:px-8">
+        <h3 class="text-xl uppercase font-medium lg:font-semibold"><%= Spree.t(:edit_address) %></h3>
+      </div>
+      <%= render 'spree/shared/error_messages', target: @address %>
+      <%= form_for @address, html: { id: 'checkout_form_address' }, method: :put do |f| %>
+        <div class="lg:px-8 pt-4">
+          <%= render 'spree/addresses/form',
+            address_name: 'address',
+            address_form: f,
+            address_type: 'shipping',
+            address: @address %>
+        </div>
+        <div class="lg:px-8 pb-4">
+          <%= label_tag "default_shipping", class: "flex items-center gap-2 text-sm mb-4" do %>
+            <%= check_box_tag "default_shipping", "true", @address.user_default_shipping?,
+              class: 'input-checkbox input-address-default',
+              disabled: @address.user_default_shipping? %>
+            <%= 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? %>
+            <%= 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">
+          <%= link_to Spree.t('actions.cancel'), :back, class: 'uppercase text-sm font-semibold tracking-widest' %>
+          <%= f.submit Spree.t(:update), class: 'btn-primary' %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/orders/_order.html.erb

@@ -0,0 +1,32 @@
+<%# @gem-override spree_admin-5.3.6/app/views/spree/admin/orders/_order.html.erb %>
+<%# reason: 注文日時の表示を本家の local_time_ago から l(..., format: :middle) に置き換えて日本語ロケール書式で表示する (Issue #605) %>
+<%# Spree 5.3 追従: Bootstrap クラスを v4 化(font-weight-bolder→font-bolder, d-block→block, px-3→px-4, text-decoration-none→no-underline, text-wrap→whitespace-normal) %>
+<%# @see https://github.com/be-agile/giga-repeat/issues/605 %>
+<tr id="<%= dom_id(order) %>" data-controller="row-link">
+  <td class="p-0 w-10">
+    <%= link_to order.number, spree.edit_admin_order_path(order), class: 'font-bolder block p-2 px-4 no-underline', data: { 'turbo-frame': '_top', row_link_target: :link } %>
+  </td>
+  <td class="w-15 cursor-pointer" data-action="click->row-link#openLink">
+    <%= l((order.completed? ? order.completed_at : order.created_at), format: :middle) %>
+  </td>
+  <td class="d-customer w-15 cursor-pointer" data-action="click->row-link#openLink">
+    <%= render 'spree/admin/orders/customer_summary', order: order %>
+  </td>
+  <td class="whitespace-normal w-20 cursor-pointer" data-action="click->row-link#openLink">
+    <% order.shipments.map(&:stock_location).compact.uniq.each_with_index do |stock_location, index| %>
+      <% if index > 0 %>, <% end %><%= stock_location.name %>
+    <% end %>
+  </td>
+  <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
+    <%= order_payment_state(order) %>
+  </td>
+  <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
+    <%= order_shipment_state(order) %>
+  </td>
+  <td class="text-right w-10 cursor-pointer" data-action="click->row-link#openLink">
+    <%= pluralize(order.item_count, 'item') %>
+  </td>
+  <td class="text-right w-10 cursor-pointer" data-action="click->row-link#openLink">
+    <%= order.display_total.to_html %>
+  </td>
+</tr>

data/app/views/spree/admin/orders/_summary.html.erb

@@ -0,0 +1,122 @@
+<%# @gem-override spree_admin-5.3.6/app/views/spree/admin/orders/_summary.html.erb %>
+<%# reason: 注文サマリの割引表示を本家の promo_total から all_adjustments を符号別に列挙する方式に変更し、order_page_body_partials に差し替えている %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/85fdfe348ab8f9182a3ca8ac73b521462d6a89ae %>
+<%# Spree 5.3 追従: 本家は OrderSummaryPresenter 化したが giga の符号別 adjustment 列挙・独自 partial フックを %>
+<%#   維持するため独自構造のまま。admin Tailwind v4 化に合わせ Bootstrap クラス(d-flex/justify-content-between/ %>
+<%#   align-items-center/font-weight-bold/text-capitalize/text-right/bg-light/border-top)のみ v4 化。margin系(mr/ml/mb)は v4 でも有効なため維持。 %>
+<div class="card mb-6" id="order_tab_summary">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:summary) %></h5>
+  </div>
+  <ul class="list-group list-group-flush">
+    <% if @order.canceled? && @order.canceled_at %>
+      <li class="list-group-item flex justify-between items-center border-0">
+        <span><%= Spree.t(:canceled_at) %></span>
+        <span class="text-end font-bold">
+          <%= spree_time(@order.canceled_at) %>
+        </span>
+      </li>
+      <% if @order.canceler.present? %>
+        <li class="list-group-item flex justify-between items-center border-0">
+          <span><%= Spree.t(:canceler) %></span>
+          <span class="text-end font-bold">
+            <%= @order.canceler.name %>
+          </span>
+        </li>
+      <% end %>
+    <% end %>
+
+    <li class="list-group-item flex justify-between items-center border-0">
+      <span><%= Spree.t(:currency) %></span>
+      <span id='currency'>
+        <%= @order.currency %>
+      </span>
+    </li>
+
+    <li class="list-group-item flex justify-between items-center border-0">
+      <span data-hook='admin_order_tab_subtotal_title'><%= Spree.t(:subtotal) %></span>
+      <span id='item_total'>
+        <%= @order.display_item_total.to_html %>
+      </span>
+    </li>
+
+    <% @order.all_adjustments.eligible.where('amount < 0').non_tax.each do |adjustment| %>
+      <li class="list-group-item flex justify-between items-center border-0">
+        <span data-hook='admin_order_tab_np_fee_adjustment'><%= adjustment.label %></span>
+        <span class="font-bold capitalize" id='adjustment'>
+          <%= adjustment.display_amount.to_html %>
+        </span>
+      </li>
+    <% end %>
+
+    <% if @order.checkout_steps.include?("delivery") && @order.ship_total > 0 %>
+      <li class="list-group-item flex justify-between items-center border-0">
+        <span data-hook='admin_order_tab_ship_total_title'>
+          <%= Spree.t(:ship_total) %>
+        </span>
+        <span id='ship_total'>
+          <%= @order.display_ship_total.to_html %>
+        </span>
+      </li>
+    <% end %>
+
+    <li class="list-group-item flex justify-between items-center border-0">
+      <span data-hook='admin_order_tab_included_tax_title'><%= Spree.t(:tax_included) %></span>
+      <span id='included_tax_total'>
+        <%= @order.display_included_tax_total.to_html %>
+      </span>
+    </li>
+
+    <% tax_lines = order_summary_tax_lines_additional(@order) %>
+
+    <li class="list-group-item border-0" data-controller="reveal">
+      <span class="flex justify-between items-center">
+        <span><%= Spree.t(:tax) %></span>
+        <span id="additional_tax_total">
+          <% if tax_lines.any? %>
+            <button type="button" class="btn btn-light btn-sm mr-2" data-action="click->reveal#toggle">
+              <%= Spree.t(:show_details) %>
+              <%= icon('selector', height: 12, class: 'mr-0 ml-1') %>
+            </button>
+          <% end %>
+
+          <%= @order.display_additional_tax_total.to_html %>
+        </span>
+      </span>
+
+      <%= render 'tax_lines', tax_lines: tax_lines %>
+    </li>
+
+    <%= render_admin_partials(:order_page_body_partials, order: @order) %>
+
+    <% @order.all_adjustments.eligible.where('amount > 0').non_tax.each do |adjustment| %>
+      <li class="list-group-item flex justify-between items-center border-0">
+        <span data-hook='admin_order_tab_np_fee_adjustment'><%= adjustment.label %></span>
+        <span class="font-bold capitalize" id='adjustment'>
+          <%= adjustment.display_amount.to_html %>
+        </span>
+      </li>
+    <% end %>
+
+    <li class="list-group-item flex justify-between items-center border-0">
+      <span data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %></span>
+      <span class="font-bold capitalize" id='order_total'>
+        <%= @order.display_total.to_html %>
+      </span>
+    </li>
+
+    <li class="list-group-item flex justify-between items-center border-t bg-gray-25">
+      <span data-hook='admin_order_tab_payment_total_title'><%= Spree.t(:payment_total) %></span>
+      <span id='payment_total'>
+        <%= @order.display_payment_total.to_html %>
+      </span>
+    </li>
+
+    <li class="list-group-item flex justify-between items-center bg-gray-25">
+      <span data-hook='admin_order_tab_outstanding_balance_title'><%= Spree.t(:outstanding_balance) %></span>
+      <span id='outstanding_balance'>
+        <%= @order.display_outstanding_balance.to_html %>
+      </span>
+    </li>
+  </ul>
+</div>

data/app/views/spree/admin/shared/_custom_head.html.erb

@@ -0,0 +1,56 @@
+<%# @gem-override spree_admin-5.3.6/app/views/spree/admin/shared/_custom_head.html.erb %>
+<%# reason: 本家では空の管理画面 head 用 partial に、ba_spree の admin/custom スタイルシート読み込みを追加している %>
+<%#   (日本語だと管理画面の項目名が長くなり見切れるため、その折り返し対応を含む) %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/99098e3ab960a54164fd6766de4dbd7918c1252c %>
+<%= stylesheet_link_tag "spree/admin/custom", media: "all", "data-turbo-track": "reload" %>
+
+<%# local-time gem の JS は config.locale が "en" 固定のため、日時の %a(曜日)が
+    「Mon」のように英語で描画される(例: promotions の作成日時 2025年06月23日(Mon))。
+    Ruby 側の I18n(ja.date.abbr_day_names)を反映できないので、JS の LocalTime に
+    日本語ロケールを登録し locale を ja に切り替えて、曜日を日本語(月)で描画する。
+    24時間表記(useFormat24)も合わせ、注文・お客様等の日時表記とも揃える。 %>
+<script type="module">
+  import LocalTime from "local-time"
+
+  LocalTime.config.i18n["ja"] = {
+    date: {
+      dayNames: ["日曜日", "月曜日", "火曜日", "水曜日", "木曜日", "金曜日", "土曜日"],
+      abbrDayNames: ["日", "月", "火", "水", "木", "金", "土"],
+      monthNames: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+      abbrMonthNames: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+      yesterday: "昨日",
+      today: "今日",
+      tomorrow: "明日",
+      on: "{date}",
+      formats: { default: "%Y年%m月%d日", thisYear: "%m月%d日" }
+    },
+    time: {
+      am: "午前", pm: "午後",
+      singular: "約{time}", singularAn: "約{time}",
+      elapsed: "{time}前",
+      second: "秒", seconds: "秒",
+      minute: "分", minutes: "分",
+      hour: "時間", hours: "時間",
+      formats: { default: "%H時%M分", default_24h: "%H時%M分" }
+    },
+    datetime: {
+      at: "{date} {time}",
+      formats: { default: "%Y年%m月%d日 %H時%M分", default_24h: "%Y年%m月%d日 %H時%M分" }
+    }
+  }
+  LocalTime.config.locale = "ja"
+  LocalTime.config.useFormat24 = true
+
+  // admin の application.js が先に LocalTime.start() を実行し、既存の <time> 要素には
+  // 英語ロケールのまま data-localized が付与され「再処理対象外」になっている場合がある。
+  // ロケール切替後に data-localized を外して再描画させ、日本語(曜日)に置き換える。
+  const applyJaLocalTime = () => {
+    document.querySelectorAll("time[data-local][data-localized]").forEach((el) => {
+      el.removeAttribute("data-localized")
+    })
+    LocalTime.run()
+  }
+  document.addEventListener("turbo:load", applyJaLocalTime)
+  document.addEventListener("turbo:morph", applyJaLocalTime)
+  applyJaLocalTime()
+</script>

data/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb

@@ -0,0 +1,55 @@
+<%# @gem-override spree_admin-5.3.6/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb %>
+<%# reason: プロモーション系サイドバーに scheduled_discounts / volume_discount / amount_discount / gift_cards のメニューを追加している %>
+<%# Spree 5.3 追従: 折りたたみサイドバー用 dropdown の非表示クラスを Bootstrap d-none → Tailwind v4 hidden に変更 %>
+<%# @see https://github.com/be-agile/giga-repeat/issues/697 %>
+<% promotions_active = %w[promotions scheduled_discounts volume_discount_tier_groups amount_discount_tier_groups].include?(controller_name) %>
+<% discounts_active = %w[promotions gift_cards gift_card_batches coupon_codes].include?(controller_name) %>
+<% if can?(:manage, Spree::Promotion) %>
+  <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path, icon: 'box-seam', active: promotions_active) %>
+
+  <%# Submenu for expanded sidebar (only shown when active) %>
+  <% if promotions_active %>
+    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+      <% if can?(:manage, Spree::Promotion) && defined?(Spree::ScheduledDiscount) %>
+        <li class="nav-item">
+          <%= nav_item(Spree.t(:scheduled_discounts), spree.admin_scheduled_discounts_path, icon: 'basket-star', active: %w[scheduled_discounts].include?(controller_name)) %>
+        </li>
+      <% end %>
+
+      <% if can?(:manage, Spree::Promotion) && defined?(Spree::VolumeDiscountTierGroup) %>
+        <li class="nav-item">
+          <%= nav_item(Spree.t(:volume_discount_tier_groups), spree.admin_volume_discount_tier_groups_path, icon: 'history', active: %w[volume_discount_tier_groups].include?(controller_name)) %>
+        </li>
+      <% end %>
+
+      <% if can?(:manage, Spree::Promotion) && defined?(Spree::AmountDiscountTierGroup) %>
+        <li class="nav-item">
+          <%= nav_item(Spree.t(:amount_discount_tier_groups), spree.admin_amount_discount_tier_groups_path, icon: 'calculator', active: %w[amount_discount_tier_groups].include?(controller_name)) %>
+        </li>
+      <% end %>
+
+      <% if discounts_active && defined?(Spree::GiftCard) && spree.respond_to?(:admin_gift_cards_path) && can?(:manage, Spree::GiftCard) %>
+        <li class="nav-item">
+          <%= active_link_to Spree.t(:gift_cards), spree.admin_gift_cards_path, class: 'nav-link', active: %w[gift_cards gift_card_batches].include?(controller_name) %>
+        </li>
+      <% end %>
+    </ul>
+  <% end %>
+
+  <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+  <ul class="nav-submenu-dropdown hidden dropdown-container">
+    <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path) %>
+    <% if can?(:manage, Spree::Promotion) && defined?(Spree::ScheduledDiscount) %>
+      <%= nav_item(Spree.t(:scheduled_discounts), spree.admin_scheduled_discounts_path) %>
+    <% end %>
+    <% if can?(:manage, Spree::Promotion) && defined?(Spree::VolumeDiscountTierGroup) %>
+      <%= nav_item(Spree.t(:volume_discount_tier_groups), spree.admin_volume_discount_tier_groups_path) %>
+    <% end %>
+    <% if can?(:manage, Spree::Promotion) && defined?(Spree::AmountDiscountTierGroup) %>
+      <%= nav_item(Spree.t(:amount_discount_tier_groups), spree.admin_amount_discount_tier_groups_path) %>
+    <% end %>
+    <% if defined?(Spree::GiftCard) && spree.respond_to?(:admin_gift_cards_path) && can?(:manage, Spree::GiftCard) %>
+      <%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path) %>
+    <% end %>
+  </ul>
+<% end %>

data/app/views/spree/admin/stores/_special_instruction_message_settings.html.erb

@@ -0,0 +1,14 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:special_instruction_message) %></h5>
+  </div>
+
+  <div class="card-body">
+    <p class="text-muted">
+      <%= Spree.t('admin.checkout_settings.special_instruction_message_description') %>
+    </p>
+    <div class="trix-container">
+      <%= f.rich_text_area :special_instruction_message, class: 'overflow-auto', style: 'height: 300px' %>
+    </div>
+  </div>
+</div>