ba_spree 1.0.0

data/app/models/spree/taxon_decorator.rb

@@ -0,0 +1,42 @@
+module Spree
+  module TaxonDecorator
+    def self.prepended(base)
+      base.after_create :update_temp_permalink_to_id
+      base.after_destroy :touch_parent_on_destroy
+    end
+
+    def set_permalink
+      self.permalink = generate_slug
+    end
+
+    private
+    def generate_slug
+      if new_record?
+        uuid_for_friendly_id
+      else
+        if parent.present?
+          [ parent.permalink, self.id.to_s ].join('/')
+        else
+          self.id.to_s
+        end
+      end
+    end
+
+    def update_temp_permalink_to_id
+      update_column(:permalink, self.id.to_s)
+    end
+
+    def touch_parent_on_destroy
+      # Touch parent and all ancestors when a taxon is destroyed to invalidate cache
+      if parent.present?
+        parent.touch
+        parent.ancestors.update_all(updated_at: Time.current)
+      end
+      # Also touch taxonomy
+      taxonomy.try!(:touch)
+    end
+  end
+end
+
+# Decoratorを適用
+Spree::Taxon.prepend(Spree::TaxonDecorator)

data/app/models/spree/user_bill_address_sync_decorator.rb

@@ -0,0 +1,33 @@
+module Spree
+  # User の bill_address(請求先)が確定したタイミングで、
+  # User の first_name / last_name / phone / company を bill_address から同期する。
+  #
+  # 配送先(ship_address)が「贈り先」であるケースを考慮し、
+  # 配送先からは User 情報を更新しないようにするための仕組み。
+  module UserBillAddressSyncDecorator
+    def self.prepended(base)
+      base.after_update :sync_attributes_from_bill_address,
+                        if: :saved_change_to_bill_address_id?
+    end
+
+    private
+
+    def sync_attributes_from_bill_address
+      return unless bill_address
+
+      # 名前は未入力の場合のみコピー(既に入力済みの名前は上書きしない)
+      if name.blank?
+        self.first_name = bill_address.firstname
+        self.last_name = bill_address.lastname
+      end
+
+      # phone / company は User 側に値があれば守る(name と方針を揃える)
+      self.phone = phone.presence || bill_address.phone
+      self.company = company.presence || bill_address.company
+
+      save! if changed?
+    end
+  end
+end
+
+Spree.user_class.prepend(Spree::UserBillAddressSyncDecorator)

data/app/overrides/add_ba_spree_storefront_javascript_importmap_tags.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path: 'spree/shared/_head',
+  name: 'add_ba_spree_storefront_javascript_importmap_tags',
+  insert_after: "erb[loud]:contains('javascript_importmap_tags')",
+  text: <<-ERB
+    <%= javascript_import_module_tag 'ba_spree' %>
+  ERB
+)

data/app/overrides/add_cache_to_product_listing_page.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# Add fragment cache to product listing page to improve performance
+# This prevents the expensive product query and filter UI from being executed on every request
+
+# Cache for product_grid render (turbo_frame_request path)
+Deface::Override.new(
+  virtual_path: 'spree/shared/_product_listing_page',
+  name: 'add_cache_to_product_grid_render',
+  surround: "erb[loud]:contains('product_grid')",
+  text: <<~ERB
+    <% cache spree_base_cache_scope.call([
+         @taxon,           # Auto-invalidate when product/property/child category changes
+         current_page.sections.find_by(type: 'Spree::PageSections::ProductGrid'),  # Section settings
+         params[:page],    # Pagination support
+         params[:sort_by], # Sorting support
+         params[:filter],  # Filter support (price, categories, options)
+         'product-grid'
+       ].compact) do %>
+      <%= render_original %>
+    <% end %>
+  ERB
+)
+
+# Cache for render_page (normal page render path)
+Deface::Override.new(
+  virtual_path: 'spree/shared/_product_listing_page',
+  name: 'add_cache_to_render_page',
+  surround: "erb[loud]:contains('render_page')",
+  text: <<~ERB
+    <% cache spree_base_cache_scope.call([
+         @taxon,           # Auto-invalidate when product/property/child category changes
+         params[:page],    # Pagination support
+         params[:sort_by], # Sorting support
+         params[:filter],  # Filter support (price, categories, options)
+         'render-page'
+       ].compact) do %>
+      <%= render_original %>
+    <% end %>
+  ERB
+)

data/app/overrides/add_class_to_login_link.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  virtual_path: "devise/shared/_links",
+  name: "add_class_to_login_link",
+  replace: "erb[loud]:contains('link_to Spree.t(:login)')",
+  text: "<%= link_to Spree.t(:login), new_session_path(resource_name), class: 'btn btn-secondary' %>"
+)

data/app/overrides/add_confirm_state_to_checkout_content_block.rb.rb

@@ -0,0 +1,30 @@
+Deface::Override.new(
+  virtual_path: 'spree/checkout/edit',
+  name: 'replace_entire_checkout_content_block',
+  replace: "div#checkout_content",
+  text: <<~ERB
+    <div class="checkout-content mt-5" id="checkout_content">
+      <% if @order.address? %>
+        <%= render partial: 'spree/checkout/address', locals: { order: @order } %>
+      <% elsif @order.payment? %>
+        <%= render partial: 'spree/checkout/payment', locals: { order: @order } %>
+      <% elsif @order.confirm? %>
+        <%= render partial: 'spree/checkout/confirm', locals: { order: @order } %>
+      <% elsif @order.delivery? %>
+        <%= render partial: 'spree/checkout/delivery', locals: { order: @order } %>
+      <% else %>
+        <%= 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 unless @order.errors.any? %>
+            <%= render @order.state, form: form %>
+          </div>
+          <div>
+            <%= button_tag Spree.t(:save_and_continue),
+                          class: 'btn btn-primary font-weight-bold w-full lg:w-48 float-right checkout-content-save-continue-button',
+                          data: { 'turbo-submits-with': (render 'button_processing', is_hidden: false) } %>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  ERB
+)

data/app/overrides/add_promotions_nav.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path: 'spree/admin/shared/sidebar/_store_nav',
+  name: 'add_promotions_nav_to_store_nav',
+  replace: "erb[loud]:contains(\"render 'spree/admin/shared/sidebar/promotions_nav'\")",
+  text: <<-HTML
+    <%= render 'spree/admin/shared/sidebar/promotions_nav' %>
+  HTML
+)

data/app/overrides/add_turbo_frame_to_admin_order_line_item_edit_link.rb

@@ -0,0 +1,23 @@
+# @gem-override spree_admin-5.3.6/app/views/spree/admin/orders/_line_item.html.erb
+# reason: 注文明細(line_item)の「編集」リンクに data-turbo-frame を付与する。
+#   本家は各明細を turbo_frame_tag dom_id(line_item) で囲み、編集リンクはその frame 内クリックで
+#   インライン編集される想定だが、dropdown が Floating UI でメニューを body 直下へ portal するため、
+#   編集リンクが frame の外に出てしまい、data-turbo-frame 無指定だとフルページ遷移になる。
+#   (同種の不具合をプロモーションのルール/アクション編集でも修正済み)
+#   対象 frame を明示してインライン編集に戻す。
+#
+# Spree 5.3 追従: 本家は dropdown に portal: false を追加し、メニューを body 直下へ portal しなくなった。
+#   これにより本来の不具合は本家側で解消し得るが、selector(edit_admin_order_line_item_path を含む erb)は
+#   5.3 でも存在しマッチするため、安全側に倒して override を維持する(turbo_frame 明示は無害)。
+Deface::Override.new(
+  virtual_path: 'spree/admin/orders/_line_item',
+  name: 'add_turbo_frame_to_admin_order_line_item_edit_link',
+  replace: "erb[loud]:contains('edit_admin_order_line_item_path')",
+  text: <<-ERB
+    <%= link_to_with_icon "edit",
+      Spree.t(:edit),
+      spree.edit_admin_order_line_item_path(@order, line_item),
+      class: "dropdown-item",
+      data: { turbo_frame: dom_id(line_item) } %>
+  ERB
+)

data/app/overrides/add_turbo_frame_to_promotion_action_edit_link.rb

@@ -0,0 +1,20 @@
+# @gem-override spree_admin-5.3.6/app/views/spree/admin/promotion_actions/_promotion_action.html.erb
+# reason: プロモーションアクションの「編集」リンクに data-turbo-frame を付与する。
+#   本家は各アクションを turbo_frame_tag promotion_action(=dom_id) で囲み、編集リンクは
+#   その frame 内クリックでインライン編集(モーダル相当)される想定だが、dropdown が
+#   Floating UI でメニューを body 直下へ portal するため、編集リンクが frame の外に出てしまい、
+#   data-turbo-frame 無指定だとフルページ遷移(/promotion_actions/:id/edit)になり、更新後も
+#   プロモーション画面へ戻らない。対象 frame を明示してインライン編集に戻す。
+#   (削除リンクは元から turbo_frame: '_top' 指定があり影響なし)
+#
+# Spree 5.3 追従: 本家は dropdown に portal: false を追加し、メニューを body 直下へ portal しなくなった。
+#   これにより本来の不具合は本家側で解消し得るが、selector(edit_admin_promotion_action_path を含む erb)は
+#   5.3 でも存在しマッチするため、安全側に倒して override を維持する(turbo_frame 明示は無害)。
+Deface::Override.new(
+  virtual_path: 'spree/admin/promotion_actions/_promotion_action',
+  name: 'add_turbo_frame_to_promotion_action_edit_link',
+  replace: "erb[loud]:contains('edit_admin_promotion_action_path')",
+  text: <<-ERB
+    <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), spree.edit_admin_promotion_action_path(promotion_action.promotion, promotion_action), class: 'dropdown-item', data: { turbo_frame: dom_id(promotion_action) } if can?(:update, promotion_action) %>
+  ERB
+)

data/app/overrides/add_turbo_stream_format_to_cart_path_in_cart_pane.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path: 'spree/shared/_cart_pane',
+  name: 'add_turbo_stream_format_to_cart_path_in_cart_pane',
+  replace: "erb[loud]:contains('turbo_frame_tag cart_id(order)')",
+  text: <<-ERB
+    <%= turbo_frame_tag cart_id(order), class: 'cart-contents', src: spree.cart_path(format: :turbo_stream), loading: :lazy %>
+  ERB
+)

data/app/overrides/ba_spree_local_time_add_custom_javascript_import_map_tags.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path: 'spree/shared/_head',
+  name: 'ba_spree_loca_time_add_custom_javascript_importmap_tags',
+  insert_after: "erb[loud]:contains('javascript_importmap_tags')",
+  text: <<-ERB
+    <%= javascript_import_module_tag 'ba-spree-local-time' %>
+  ERB
+)

data/app/overrides/disable_hidden_bill_address_fields_on_payment.rb

@@ -0,0 +1,15 @@
+# payment 画面の請求先住所(bill_address)フォームは「配送先と同じ(use_shipping)」のとき
+# hidden クラスで隠されるが、中の firstname_kana / lastname_kana などには required が
+# 付いたまま残る。空のまま「保存して続ける」を押すと HTML5 バリデーションが非表示の
+# required フィールドを検証しようとし "An invalid form control ... is not focusable" で
+# submit が完全に中止される(POST が一切飛ばない)。
+#
+# disable-when-hidden コントローラを付与し、非表示の間は中の入力欄を disabled にして
+# 検証・送信の対象から外す。表示に戻れば disabled を解除して挙動を元に戻す。
+# @see https://github.com/be-agile/giga-repeat/issues/1210
+Deface::Override.new(
+  virtual_path: 'spree/checkout/_payment',
+  name: 'disable_hidden_bill_address_fields_on_payment',
+  add_to_attributes: "div[data-toggle-target='toggleable']",
+  attributes: { 'data-controller': 'disable-when-hidden' }
+)

data/app/overrides/disable_turbo_on_user_registration_form.rb

@@ -0,0 +1,18 @@
+# 会員登録フォームのバリデーションエラーを画面に表示するためのオーバーライド。
+#
+# spree_storefront の devise/registrations/new はフォームを turbo_frame_tag :login で囲み、
+# data: { turbo_frame: '_top' } で送信する。この状態でサーバが 422 を返すと、レスポンスは
+# turbo-frame レイアウトで描画される（error_messages パーシャルは含まれる）が、フォームは
+# _top を狙うため Turbo がフレーム応答を反映できず、エラーが画面に出ないまま再描画される。
+#
+# パスワード変更フォーム(edit)は data: { turbo: false } で通常の全画面再描画となりエラーが
+# 表示されるため、それに合わせて登録フォームも Turbo を無効化し、エラーを表示できるようにする。
+# @see https://github.com/be-agile/giga-repeat/issues/1216
+Deface::Override.new(
+  virtual_path: "devise/registrations/new",
+  name: "disable_turbo_on_user_registration_form",
+  replace: "erb[loud]:contains('form_for(resource')",
+  text: <<~ERB
+    <%= form_for(resource, as: resource_name, url: registration_path(resource_name), data: { turbo: false }) do |f| %>
+  ERB
+)

data/app/overrides/fix_coupon_apply_button_layout.rb

@@ -0,0 +1,7 @@
+# Fix coupon code apply button layout to prevent text wrapping
+Deface::Override.new(
+  virtual_path: 'spree/checkout/_coupon_code',
+  name: 'fix_coupon_apply_button_layout',
+  replace: 'erb[loud]:contains("button_tag Spree.t(:apply)"):contains("btn-primary")',
+  text: '<%= button_tag Spree.t(:apply), class: "ml-3 btn-primary !px-3 !py-2 text-sm whitespace-nowrap", data: { "enable-button-target": "button" }, disabled: true %>'
+)

data/app/overrides/hide_gift_cards_and_store_credits_from_account_nav.rb

@@ -0,0 +1,11 @@
+Deface::Override.new(
+  virtual_path: "spree/account/_account_nav",
+  name: "hide_gift_cards_menu_from_account_nav",
+  remove: "erb[loud]:contains('account_gift_cards_path')"
+)
+
+Deface::Override.new(
+  virtual_path: "spree/account/_account_nav",
+  name: "hide_store_credits_menu_from_account_nav",
+  remove: "erb[loud]:contains('account_store_credits_path')"
+)

data/app/overrides/hide_shipping_message_for_digital_only_orders.rb

@@ -0,0 +1,15 @@
+# Hide shipping confirmation message for digital-only orders
+# For digital products, there is no physical shipment, so the message
+# "When your order is ready, you will receive an email confirmation"
+# should not be displayed.
+# See: https://github.com/be-agile/giga-repeat/issues/1006
+Deface::Override.new(
+  virtual_path: "spree/checkout/complete",
+  name: "hide_shipping_message_for_digital_only_orders",
+  replace: "erb[loud]:contains('order_success_message')",
+  text: <<~ERB
+    <% unless @order.digital? %>
+      <%= Spree.t('storefront.checkout.order_success_message') %>
+    <% end %>
+  ERB
+)

data/app/overrides/localize_apply_button_text.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  virtual_path: "spree/checkout/_coupon_code",
+  name: "localize_apply_button_text",
+  replace: "erb[loud]:contains('button_tag Spree.t(:apply)')",
+  text: "<%= button_tag Spree.t(:apply), class: 'ml-3 btn-primary !px-4 !py-3 text-sm whitespace-nowrap', data: { 'enable-button-target': 'button' }, disabled: true %>"
+)

data/app/overrides/localize_newsletter_button_text.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  virtual_path: "spree/account/newsletter/_newsletter_settings",
+  name: "localize_newsletter_button_text",
+  replace: "erb[loud]:contains('@user.accepts_email_marketing?')",
+  text: "<%= @user.accepts_email_marketing? ? Spree.t(:unsubscribe) : Spree.t(:subscribe) %>"
+)

data/app/overrides/replace_announcement_bar_text.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  virtual_path: "spree/page_sections/_announcement_bar",
+  name: "replace_announcement_bar_text",
+  replace: "div.tracking-widest",
+  text: "<div class='tracking-widest w-full'><%= CGI.unescapeHTML(section.text.body.to_s).html_safe %></div>"
+)

data/app/overrides/replace_button_edit_checkout.rb

@@ -0,0 +1,10 @@
+Deface::Override.new(
+  virtual_path: "spree/checkout/edit",
+  name: "replace_button_edit_checkout",
+  replace: "div.text-xs",
+  text: <<-HTML
+    <div class="text-xs text-end whitespace-nowrap">
+      <%= link_to Spree.t(:edit), spree.checkout_state_path(@order.token, 'address'), class: "btn-secondary !py-1 !font-normal-important !text-xs-important" %>
+    </div>
+  HTML
+)

data/app/overrides/replace_checkout_delivery_info.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  virtual_path: "spree/checkout/_delivery",
+  name: "replace_delivery_method_header_content",
+  replace_contents: "h5.checkout-content-header",
+  text: "<strong><%= Spree.t('storefront.checkout.delivery_method').capitalize %></strong>"
+)

data/app/overrides/replace_checkout_pay_button_with_dynamic_label.rb

@@ -0,0 +1,14 @@
+Deface::Override.new(
+  virtual_path: 'spree/checkout/_payment_methods',
+  name: 'replace_checkout_pay_button_with_dynamic_label',
+  replace: "#checkout-payment-submit erb[loud]:contains('Spree.t(:pay)')",
+  text: <<-ERB
+    <% if @order.confirm? %>
+      <%= Spree.t(:confirm_order).titleize %>
+    <% elsif @order.payment? %>
+      <%= Spree.t(:save_and_continue).titleize %>
+    <% else %>
+      <%= Spree.t(:pay).titleize %>
+    <% end %>
+  ERB
+)

data/app/overrides/replace_variant_not_available_button.rb

@@ -0,0 +1,19 @@
+Deface::Override.new(
+  virtual_path: "spree/products/_add_to_cart_button",
+  name: "replace_variant_not_available_button",
+  replace: "erb[loud]:contains('notify_me_when_available')",
+  text: <<-ERB
+    <% if product&.discontinued? || selected_variant&.discontinued? %>
+      <%= Spree.t(:add_to_cart_discontinued) %>
+    <% elsif selected_variant.present? && !selected_variant.purchasable? %>
+      <%= Spree.t(:add_to_cart_not_purchasable) %>
+    <% else %>
+      <%= Spree.t(:add_to_cart_not_available) %>
+    <% end %>
+  ERB
+)
+
+Deface::Override.new(
+  virtual_path: "spree/products/_add_to_cart_button",
+  name: "remove_variant_not_available_button_bell_icon",
+  remove: "erb[loud]:contains('bell')")

data/app/overrides/set_logo_width_height_in_admin_store_basic_form.rb

@@ -0,0 +1,12 @@
+Deface::Override.new(
+  virtual_path: "spree/admin/stores/form/_basic",
+  name: "set_logo_width_height_in_admin_store_basic_form",
+  replace: "erb[loud]:contains('f.spree_file_field :logo')",
+  text: <<~ERB
+    <% logo = f.object.logo %>
+    <% logo.analyze if logo.present? && !logo.analyzed? %>
+    <% width = logo.metadata&.dig('width') || 240  %>
+    <% height = logo.metadata&.dig('height') || 240 %>
+    <%= f.spree_file_field :logo, width: width, height: height, crop: true, help_bubble: Spree.t('admin.store.logo_help') %>
+  ERB
+)

data/app/overrides/show_breadcrumbs_on_taxon_page.rb

@@ -0,0 +1,30 @@
+# カテゴリ(Taxon)ページの Breadcrumbs セクションにパンくずを表示する。
+# upstream のセクション用パーシャルは @product があるときしか描画しないため、
+# @taxon があるカテゴリページでは何も表示されなかった。
+# nav#breadcrumbs の内側末尾に @taxon 分岐を追加し、祖先→現在カテゴリのパンくずを描画する。
+# @product 側の既存出力には手を入れないため、商品詳細ページへの影響はない。
+# See: https://github.com/be-agile/giga-repeat/issues/1256
+Deface::Override.new(
+  virtual_path: "spree/page_sections/_breadcrumbs",
+  name: "show_breadcrumbs_on_taxon_page",
+  insert_bottom: "nav#breadcrumbs",
+  text: <<~ERB
+    <% if @product.blank? && @taxon.present? %>
+      <% taxons = @taxon.self_and_ancestors.includes(:translations).find_all { |taxon| taxon.depth != 0 } %>
+
+      <ul class="inline-flex gap-3 text-sm">
+        <% taxons.each_with_index do |taxon, index| %>
+          <% is_current = taxon == @taxon %>
+          <li class="<%= is_current ? 'text-text opacity-100 font-medium' : 'opacity-50' %>">
+            <% if is_current %>
+              <%= taxon.name %>
+            <% else %>
+              <%= link_to taxon.name, spree.nested_taxons_path(taxon), title: taxon.name %>
+            <% end %>
+          </li>
+          <div class="breadcrumb-square opacity-50 <%= 'hidden' if index == taxons.length - 1 %>"></div>
+        <% end %>
+      </ul>
+    <% end %>
+  ERB
+)

data/app/overrides/show_individual_adjustments_in_order_details.rb

@@ -0,0 +1,18 @@
+Deface::Override.new(
+  virtual_path: 'spree/shared/_order_details',
+  name: 'show_individual_adjustments_in_order_details',
+  replace: "erb[silent]:contains('if order.promo_total != 0')",
+  closing_selector: "erb[silent]:contains('end'):first",
+  text: <<~ERB
+    <% sort_adjustments_with_flat_percent_last(order.adjustments.nonzero.non_tax.eligible).each do |adjustment| %>
+      <div class="flex items-center justify-between py-2">
+        <div>
+          <%= adjustment.label %>
+        </div>
+        <div>
+          <%= adjustment.display_amount.to_html %>
+        </div>
+      </div>
+    <% end %>
+  ERB
+)

data/app/overrides/show_only_selected_payment_method_on_confirm.rb

@@ -0,0 +1,29 @@
+Deface::Override.new(
+  virtual_path: 'spree/checkout/_payment_method',
+  name: 'show_only_selected_payment_method_on_confirm',
+  replace: "erb[loud]:contains(\"link_to spree.checkout_state_path\")",
+  closing_selector: "erb[silent]:contains(\"end\")",
+  text: <<~ERB
+    <% if @order.state == 'confirm' %>
+      <% if selected_method == method %>
+        <%= link_to spree.checkout_state_path(token: @order.token, state: 'payment', payment_method_id: method.id),
+                    class: 'custom-control custom-radio flex items-center px-5 py-4 cursor-pointer w-full' do %>
+          <%= radio_button_tag "order[payments_attributes][][payment_method_id]",
+                method.id,
+                selected_method == method,
+                class: 'mr-3' %>
+          <%= Spree.t(method.name, scope: :payment_methods, default: method.name) %>
+        <% end %>
+      <% end %>
+    <% else %>
+      <%= link_to spree.checkout_state_path(token: @order.token, state: 'payment', payment_method_id: method.id),
+                  class: 'custom-control custom-radio flex items-center px-5 py-4 cursor-pointer w-full' do %>
+        <%= radio_button_tag "order[payments_attributes][][payment_method_id]",
+              method.id,
+              selected_method == method,
+              class: 'mr-3' %>
+        <%= Spree.t(method.name, scope: :payment_methods, default: method.name) %>
+      <% end %>
+    <% end %>
+  ERB
+)

data/app/overrides/spree/admin/preserve_filter_params_across_table_forms.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+# 一覧テーブルのツールバーにある「検索」「期間」「フィルタービルダー」は独立した GET フォームで、
+# 送信すると他のフォームの絞り込み条件が URL から消えてしまう。
+# 各フォームに、自分が送信しないパラメータを hidden input として持たせて併用できるようにする。
+# @see https://github.com/be-agile/giga-repeat/issues/1262
+
+# 検索フォーム: 期間・フィルターを引き継ぐ
+Deface::Override.new(
+  virtual_path: 'spree/admin/tables/_table',
+  name: 'preserve_filter_params_in_table_search_form',
+  insert_bottom: 'div.form-input',
+  text: <<~ERB
+    <%= preserved_filter_params_inputs(except_q: [search_param]) %>
+  ERB
+)
+
+# 期間フォーム: 検索・フィルターを引き継ぐ
+Deface::Override.new(
+  virtual_path: 'spree/admin/tables/_table',
+  name: 'preserve_filter_params_in_table_date_range_form',
+  insert_after: "erb[loud]:contains('calendar_range_picker')",
+  text: <<~ERB
+    <%= preserved_filter_params_inputs(except_q: ["\#{date_range_param}_gt", "\#{date_range_param}_lt"]) %>
+  ERB
+)
+
+# フィルタービルダーのフォーム: 検索・期間を引き継ぐ
+# (query_state 由来の q[...] は JS が生成し直すため、ここでは引き継がない)
+Deface::Override.new(
+  virtual_path: 'spree/admin/tables/_query_builder',
+  name: 'preserve_filter_params_in_table_query_builder_form',
+  insert_after: 'input[name="query_state"]',
+  text: <<~ERB
+    <%= preserved_filter_params_inputs(owns_query_state: true, table: table) %>
+  ERB
+)
+
+# ページネーションのリンク: 壊れた ransack キー (OR グループ) を URL に載せない。
+# 本家は url_for(request.query_parameters.merge(page: ...)) で、壊れたキーを名前を変質させながら
+# 引き回してしまう。
+Deface::Override.new(
+  virtual_path: 'spree/admin/shared/_index_table_options',
+  name: 'sanitize_ransack_params_in_pagination_previous_link',
+  replace: "erb[loud]:contains('@pagy.previous')",
+  text: <<~ERB
+    <%= link_to icon('chevron-left', class: 'text-gray-900 mr-0'),
+        url_for(preserved_pagination_params(@pagy.previous)),
+        class: "btn btn-light p-2",
+        'aria-label': 'Previous page' %>
+  ERB
+)
+
+Deface::Override.new(
+  virtual_path: 'spree/admin/shared/_index_table_options',
+  name: 'sanitize_ransack_params_in_pagination_next_link',
+  replace: "erb[loud]:contains('@pagy.next')",
+  text: <<~ERB
+    <%= link_to icon('chevron-right', class: 'text-gray-900 mr-0'),
+        url_for(preserved_pagination_params(@pagy.next)),
+        class: "btn btn-light p-2",
+        'aria-label': 'Next page' %>
+  ERB
+)

data/app/overrides/spree/admin/promotion_rules/_promotion_rule/set_turbo_frame_on_edit_link.html.erb.deface

@@ -0,0 +1,11 @@
+<!-- replace 'erb[loud]:contains("edit_admin_promotion_rule_path")' -->
+<%# @see https://github.com/be-agile/giga-repeat/issues/1075 %>
+<%#
+  dropdown は Floating UI でメニューを body 直下へ portal するため、編集リンクが
+  turbo_frame_tag promotion_rule(=dom_id(promotion_rule))の外に出てしまい、
+  data-turbo-frame 無指定だとフルページ遷移になる(更新後にプロモ画面へ戻らない)。
+  対象frameを明示してインライン編集(モーダル相当)に戻す。
+  (元は spree_promotion_rule_property の全面override に含まれていた汎用修正。
+   engine削除に伴い Deface 部分override として ba_spree へ退避。)
+%>
+<%= link_to_with_icon 'pencil', Spree.t('actions.edit'), spree.edit_admin_promotion_rule_path(promotion_rule.promotion, promotion_rule), class: 'dropdown-item', data: { turbo_frame: dom_id(promotion_rule) } if can?(:update, promotion_rule) %>

data/app/overrides/spree/admin/stores/add_special_instruction_message_settings.rb

@@ -0,0 +1,17 @@
+Deface::Override.new(
+  virtual_path: 'spree/admin/stores/form/_checkout',
+  name: 'add_special_instruction_message_settings',
+  insert_after: "erb[loud]:contains('preferred_special_instructions_enabled')",
+  partial: 'spree/admin/stores/special_instruction_message_settings'
+)
+
+Deface::Override.new(
+  virtual_path: 'spree/checkout/_special_instructions',
+  name: 'add_special_instruction_message_checkout',
+  insert_after: 'h5.font-body',
+  text: '
+    <div id="special-instruction-message">
+      <%= current_store.special_instruction_message if current_store.special_instruction_message.present? %>
+    </div>
+  '
+)

data/app/overrides/use_absolute_time_for_order_header_completed_at.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Spree 5.3 追従: 注文詳細ヘッダーの「完了日時」を日本語の絶対日時で表示する
+#
+# spree_admin 5.3 の orders/_header.html.erb は完了日時を spree_time_ago で描画するため、
+# 「yesterday at 8:29am」のような英語相対表示+ホバーで絶対日時、となる。
+# 日本語の絶対日時(例 2026年06月11日 08:29)を最初から表示するため spree_time に差し替える。
+# (注文一覧テーブルの completed_at 列は config/initializers/spree_admin_orders_table.rb で
+#  format: :spree_time として同等の対応済み)
+Deface::Override.new(
+  virtual_path: 'spree/admin/orders/_header',
+  name: 'use_absolute_time_for_order_header_completed_at',
+  replace: "erb[loud]:contains('spree_time_ago')",
+  text: '<%= spree_time(@order.completed_at) %>'
+)

data/app/presenters/spree/mega_nav_presenter_decorator.rb

@@ -0,0 +1,26 @@
+module Spree
+  module MegaNavPresenterDecorator
+    ColumnPresenter = Struct.new(:title, :links, :view_all_linkable, keyword_init: true)
+
+    # @gem-override spree_storefront-5.3.6/app/presenters/spree/mega_nav_presenter.rb#columns
+    # @see https://github.com/be-agile/giga-repeat/commit/3d8f8c44f9a0d119fb24f9b8b19001fd7be20c2c
+    def columns
+      @columns ||=
+        if mega_nav.is_a?(Spree::PageBlocks::MegaNavWithSubcategories)
+          grouped_by_parent = mega_nav.taxon&.self_and_descendants&.group_by(&:parent_id) || []
+          main_subcategories = grouped_by_parent[mega_nav.taxon.id].to_a.sort_by(&:position)
+
+          main_subcategories.first(max_columns).map do |child_category|
+            links = grouped_by_parent[child_category.id].to_a.sort_by(&:position).map(&method(:to_link))
+            ColumnPresenter.new(title: child_category.name, links: links, view_all_linkable: child_category)
+          end.compact_blank
+        elsif mega_nav.is_a?(Spree::PageBlocks::MegaNav)
+          [ ColumnPresenter.new(title: main_link.label, links: mega_nav.links.drop(1), view_all_linkable: main_link.linkable) ]
+        else
+          []
+        end
+    end
+  end
+end
+
+Spree::MegaNavPresenter.prepend Spree::MegaNavPresenterDecorator