ba_spree 1.0.0

data/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb

@@ -0,0 +1,148 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb %>
+<%# reason: モバイルメニューに nav_taxon_square_image を追加し settings_modal を eager 読み込みに変更している %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/cdbd620ff4b0a09724ff5c060eb90ef002539222 %>
+<div class="bg-background border-default border-t overflow-x-hidden h-full w-screen overflow-y-hidden">
+  <div class="h-full flex transform has-[.currency-and-locale-modal:not(.hidden)]:transform-none relative transition-transform duration-300" data-controller="mobile-nav">
+    <div class="w-screen shrink-0 flex flex-col h-full grow-0">
+      <div class="flex-grow overflow-y-scroll">
+        <% if section.blocks.any? %>
+          <% section.blocks.each do |block| %>
+            <% presenter = Spree::MegaNavPresenter.new(block) %>
+            <% presenter.instance_variable_set(:@max_columns, 1000) %>
+            <% main_link = presenter.main_link %>
+            <% next unless main_link.present? %>
+
+            <% if presenter.columns.any? %>
+              <button
+                data-action="click->mobile-nav#openSubmenu touch->mobile-nav#openSubmenu"
+                data-title="<%= main_link.label.downcase.strip %>"
+                class='text-base text-left tracking-widest p-4 w-full uppercase border-default border-b flex justify-between items-center header--nav-link'>
+                <span class="flex items-start text-left">
+                  <%= render('spree/shared/nav_taxon_square_image', taxon: main_link.linkable) %>
+                  <%= main_link.label %>
+                </span>
+                <%= render 'spree/shared/icons/chevron_right', size: 12 %>
+                <template>
+                  <button data-action="click->mobile-nav#closeSubmenu touch->mobile-nav#closeSubmenu" class='flex gap-2 items-center text-base font-medium text-left tracking-widest p-4 w-full uppercase border-default border-b header--mega-nav-close-submenu bg-background sticky top-0'>
+                    <%= render 'spree/shared/icons/chevron', size: 12 %>
+                    <span class="flex items-start text-left">
+                      <%= render('spree/shared/nav_taxon_square_image', taxon: main_link.linkable) %>
+                      <%= main_link.label %>
+                    </span>
+                  </button>
+                  <div class="p-4 pt-0 w-full gap-2 flex flex-col">
+                    <% if block.try(:featured_taxon) %>
+                      <% cache spree_storefront_base_cache_scope.call(block.featured_taxon) do %>
+                        <% if block.featured_taxon.image.attached? && block.featured_taxon.image.variable? %>
+                          <%= link_to spree_storefront_resource_url(block.featured_taxon), class: "flex w-full pt-4" do %>
+                            <%= spree_image_tag(block.featured_taxon.image, width: 140, height: 140, class: 'h-auto aspect-1 w-2/5 max-w-[140px]', loading: :lazy, alt: block.featured_taxon.name) %>
+                            <span class="bg-accent w-full flex items-center justify-center header--mega-nav-featured-taxon-title text-sm tracking-widest font-semibold uppercase">
+                              <%= Spree.t(:explore_taxon, taxon_name: block.featured_taxon.name) %>
+                            </span>
+                          <% end %>
+                        <% end %>
+                      <% end %>
+                    <% end %>
+                    <% presenter.columns.each do |column| %>
+                      <div
+                        data-controller='toggle'
+                        data-toggle-class='hidden'
+                        class="w-full flex flex-col gap-2">
+                        <% unless presenter.columns.size == 1 %>
+                          <button
+                            type="button"
+                            class="text-base font-semibold tracking-widest uppercase w-full inline-flex justify-between py-3"
+                            data-action='click->toggle#toggle touch->toggle#toggle'>
+                            <span class="flex items-start text-left">
+                              <%= render('spree/shared/nav_taxon_square_image', taxon: column.view_all_linkable) %>
+                              <%= column.title %>
+                            </span>
+                            <span data-toggle-target='toggleable'>
+                              <%= render 'spree/shared/icons/chevron_down' %>
+                            </span>
+                            <span data-toggle-target='toggleable' class="hidden rotate-180">
+                              <%= render 'spree/shared/icons/chevron_down' %>
+                            </span>
+                          </button>
+                        <% end %>
+                        <div
+                          class="<%= class_names(hidden: presenter.columns.size != 1) %>"
+                          data-toggle-target='toggleable'>
+                          <% column.links.each do |link| %>
+                            <%= page_builder_link_to link, data: { title: link.label.downcase.strip }, class: "block text-base py-3 w-full uppercase header--nav-link", target: link.open_in_new_tab.presence && "_blank", rel: link.open_in_new_tab.presence && "noopener noreferrer" do %>
+                              <span class="flex items-start text-left">
+                                <%= render('spree/shared/nav_taxon_square_image', taxon: link.linkable) %>
+                                <%= link.label %>
+                              </span>
+                            <% end %>
+                          <% end %>
+                        </div>
+                      </div>
+                    <% end %>
+                  </div>
+                </template>
+              </button>
+            <% else %>
+              <%= page_builder_link_to main_link, data: { title: main_link.label.downcase.strip }, class: "block text-base tracking-widest p-4 w-full uppercase border-default border-b header--nav-link", target: main_link.open_in_new_tab.presence && "_blank", rel: main_link.open_in_new_tab.presence && "noopener noreferrer" do %>
+                <span><%= main_link.label %></span>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% else %>
+          <% section.links.each do |link| %>
+            <%= page_builder_link_to link, data: { title: link.label.downcase.strip }, class: "block text-base tracking-widest p-4 w-full uppercase border-default border-b header--nav-link", target: link.open_in_new_tab.presence && "_blank", rel: link.open_in_new_tab.presence && "noopener noreferrer" do %>
+              <span><%= link.label %></span>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
+      <div class='p-4 bg-accent'>
+        <% if try_spree_current_user %>
+          <%= link_to spree.account_path, class: 'btn-secondary gap-2 flex justify-center items-center w-full' do %>
+            <span><%= Spree.t(:my_account) %></span>
+            <%= render 'spree/shared/icons/account' %>
+          <% end %>
+
+          <% if defined?(spree_logout_path) %>
+            <%= link_to spree_logout_path, method: :delete, data: { turbo_method: :delete }, class: 'btn-secondary gap-2 flex justify-center items-center w-full mt-2' do %>
+              <%= Spree.t(:sign_out) %>
+            <% end %>
+          <% end %>
+        <% else %>
+          <button
+            id='mobile-menu'
+            data-action='click->slideover-account#toggle click@window->slideover-account#hide click->toggle-menu#hide touch->toggle-menu#hide'
+            class='btn-secondary gap-2 flex justify-center items-center w-full'>
+            <span><%= Spree.t(:my_account) %></span>
+            <%= render 'spree/shared/icons/account' %>
+          </button>
+        <% end %>
+
+        <% if should_render_currency_dropdown? || should_render_locale_dropdown? %>
+          <div class="flex mt-4 justify-end">
+            <div data-controller="modal" data-modal-disable-backdrop="true">
+              <%= button_tag class: 'flex gap-2 items-center', data: {action: 'modal#open'} do %>
+                <% if should_render_currency_dropdown? %>
+                  <span>
+                    <%= "#{current_currency} (#{currency_money(current_currency).symbol})" %>
+                  </span>
+                <% end %>
+                <% if should_render_locale_dropdown? %>
+                  <span class="uppercase <%= should_render_currency_dropdown?.presence && "border-l pl-2" %> flex items-center gap-1">
+                    <% country_code = current_locale.to_s.split("-").last %>
+                    <%= svg_country_icon(country_code) %>
+                    <span ><%= country_code %></span>
+                  </span>
+                <% end %>
+              <% end %>
+              <%= turbo_frame_tag :settings_modal, src: spree.settings_path, loading: :eager  %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <% if section.blocks.any? %>
+      <div class="w-screen shrink-0 relative overflow-y-scroll" data-mobile-nav-target="submenuContainer"></div>
+    <% end %>
+  </div>
+</div>

data/app/views/themes/default/spree/posts/_post.html.erb

@@ -0,0 +1,16 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/posts/_post.html.erb %>
+<%# reason: 投稿カードを swiper スライドから通常ブロックに変更し、日時を local_date 表示にしている %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/cdbd620ff4b0a09724ff5c060eb90ef002539222 %>
+<div id="<%= dom_id(post) %>">
+  <%= link_to spree.post_path(post), class: 'block hover:opacity-70 transition-opacity' do %>
+    <div class="h-[200px] w-full bg-gray-100">
+      <% if post.image.attached? && post.image.variable? %>
+        <%= spree_image_tag(post.image, width: 400, height: 200, class: 'h-full w-full object-cover object-center', loading: :lazy, alt: post.title) %>
+      <% end %>
+    </div>
+
+    <h1 class="uppercase text-lg font-medium mt-4"><%= post.title %></h1>
+    <div class="mt-2 text-sm"><%= local_date(post.published_at) %></div>
+    <div class="mt-4"><%= post.shortened_description %></div>
+  <% end %>
+</div>

data/app/views/themes/default/spree/products/_description.html.erb

@@ -0,0 +1,7 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/products/_description.html.erb %>
+<%# reason: 商品説明を常に全文表示にする(read more / Read less トグルと truncate を撤去) %>
+<% if product.storefront_description.present? %>
+  <div class="prose product-description text-sm">
+    <%= raw(product.storefront_description) %>
+  </div>
+<% end %>

data/app/views/themes/default/spree/products/_details.html.erb

@@ -0,0 +1,65 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/products/_details.html.erb %>
+<%# reason: 商品説明の read more を無効化し、商品プロパティの取得・並び順を独自実装に置き換えたコピー上書き %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/cdbd620ff4b0a09724ff5c060eb90ef002539222 %>
+<% cache spree_base_cache_scope.call(product) do %>
+<% if product.storefront_description.present? %>
+<% description_text = strip_tags(product.storefront_description) %>
+<div data-controller="read-more" class="py-4 flex flex-col gap-4" data-read-more-more-text-value="<%= Spree.t(:read_more) %>" data-read-more-less-text-value="Read less">
+  <div class="prose product-description text-sm">
+    <%= raw(product.storefront_description) %>
+  </div>
+  <%
+=begin%>
+<% if description_text.size > 250 %>
+  <%= button_tag Spree.t(:read_more), data: { action: "read-more#toggle" }, class: "font-bold underline text-sm" %>
+  <% end %>
+<%
+=end%>
+</div>
+<% end %>
+
+<div class="st-accordion" data-controller="accordion">
+  <% short_description = product.property_metafield_value('short_description') %>
+
+  <% if short_description.present? %>
+  <div class="product-property py-4 border-b border-default">
+    <%= link_to '#property_details', class: 'text-sm uppercase tracking-widest inline-flex w-full justify-between !border-b-transparent', data: { action: 'accordion#toggle' } do %>
+    <%= Spree.t(:details) %>
+    <%= render 'spree/shared/icons/chevron_down' %>
+    <% end %>
+    <div class="text-sm st-accordion__content" data-accordion-id="property_details">
+      <div class="pt-4"><%= product.description %></div>
+    </div>
+  </div>
+  <% end %>
+
+  <% shipping_policy = current_store.customer_shipping_policy %>
+  <% if shipping_policy.present? %>
+  <div class="product-property py-4 border-b border-default">
+    <%= link_to "#property_shipping_policy", class: 'text-sm uppercase tracking-widest inline-flex w-full justify-between !border-b-transparent', data: { action: 'accordion#toggle' } do %>
+    <%= Spree.t(:shipping_policy) %>
+    <%= render 'spree/shared/icons/chevron_down' %>
+    <% end %>
+    <div class="text-sm st-accordion__content" data-accordion-id="property_shipping_policy">
+      <div class="pt-4"><%= shipping_policy %></div>
+    </div>
+  </div>
+  <% end %>
+
+  <%# ProductProperty -> metafields 移行(Spree 5.4 の Property 削除対応)。
+      フロント表示対象(namespace=properties かつ display_on=both)の metafield を表示。
+      short_description は上で「詳細」として別表示済みのため、ここでは除外して二重表示を防ぐ。 %>
+  <% product.front_end_property_metafields.reject { |mf| mf.key == 'short_description' }.each do |metafield| %>
+  <div class="product-property py-4 border-b border-default">
+
+    <%= link_to "#property_#{metafield.id}", class: 'text-sm uppercase tracking-widest inline-flex w-full justify-between !border-b-transparent', data: { action: 'accordion#toggle' } do %>
+    <%= metafield.name %>
+    <%= render 'spree/shared/icons/chevron_down' %>
+    <% end %>
+    <div class="text-sm st-accordion__content" data-accordion-id="property_<%= metafield.id %>">
+      <div class="pt-4"><%= simple_format(metafield.value) %></div>
+    </div>
+  </div>
+  <% end %>
+</div>
+<% end %>

data/app/views/themes/default/spree/products/_json_ld_variant.html.erb

@@ -0,0 +1,15 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/products/_json_ld_variant.html.erb %>
+<%# reason: JSON-LD の variant 配列出力で末尾以外にカンマを付与して有効な JSON にしている %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/69b4884768f21e2ed68e82521538a8a7b8736b09 %>
+<% cache ["json-ld-variant", spree_base_cache_scope, variant.cache_key_with_version] do %>
+{
+  "@type": "Offer",
+  <% if variant.sku.present? %>
+    "sku": <%= variant.sku.to_json.html_safe %>,
+  <% end %>
+  "availability": "http://schema.org/<%= variant.available? ? 'InStock' : 'OutOfStock' %>",
+  "price": <%= variant.amount_in(current_currency).to_json.html_safe %>,
+  "priceCurrency": <%= current_currency.to_json.html_safe %>,
+  "url": <%= spree.product_url(product, variant_id: variant.id, host: current_store.url_or_custom_domain).to_json.html_safe %>
+}<%= ',' if defined?(variant_iteration) && !variant_iteration.last? %>
+<% end %>

data/app/views/themes/default/spree/products/_price.html.erb

@@ -0,0 +1,76 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/products/_price.html.erb %>
+<%# reason: 価格表示の From 表記を「〜」に変更し、税込み表示 (show_tax_included) ラベルを追加している %>
+<%# Spree 5.3 追従: price_in → pricing context 経由の価格取得(pricing_context_for_variant / price_for) %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/8426d0be020a6751c7d476e265e716d1973048d4 %>
+<% use_variant ||= false %>
+<% sold_out ||= !product.available? %>
+<% price_class ||= ''%>
+<% price_container_class ||= '' %>
+<% selected_variant ||= nil %>
+<% show_tax_included ||= false %>
+<div class="<%= price_class %>">
+  <div class="flex flex-col gap-3 <%= price_container_class %>">
+    <%
+      if use_variant
+        target = selected_variant
+        sold_out = selected_variant.nil?
+        if sold_out
+          target = @variant_from_options
+          sold_out = @variant_from_options.nil?
+        end
+      else
+        target = product
+        sold_out = !product.available?
+      end
+
+      target ||= product
+
+      # Spree 5.3 追従: price_in → pricing context 経由(default_variant / price_for)
+      variant_for_context = target.is_a?(Spree::Product) ? target.default_variant : target
+      pricing_context = pricing_context_for_variant(variant_for_context)
+      price = variant_for_context.price_for(pricing_context)
+      money_price = price.display_amount
+
+      if target.is_a?(Spree::Product) && !use_variant && product.price_varies?(current_currency)
+        price = target.lowest_price(current_currency)
+        money_price = price.display_amount
+        money_price = "#{money_price} 〜"
+      end
+
+      # 税込み表示用のロジック
+      tax_label = ''
+      if show_tax_included && product.tax_category.present?
+        tax_rates = Spree::TaxRate.for_tax_category(product.tax_category).included_in_price
+        if tax_rates.any?
+          tax_label = " #{Spree.t(:tax_included)}"
+        end
+      end
+    %>
+    <div>
+      <% if price.compare_at_amount.present? && price.compare_at_amount > price.amount %>
+        <span class="hidden">
+          <%= Spree.t(:regular_price) %>
+        </span>
+        <p class="inline pr-2 opacity-50 line-through">
+          <%= price.display_compare_at_amount %><%= tax_label %>
+        </p>
+        <span class="hidden pr-2">
+          <%= Spree.t(:sale_price) %>
+        </span>
+        <p class="inline text-danger">
+          <%= money_price %><%= tax_label %>
+        </p>
+      <% else %>
+        <span class="hidden">
+          <%= Spree.t(:regular_price) %>
+        </span>
+
+        <% if price&.amount.nil? %>
+          <span class="uppercase"><%= Spree.t(:not_available) %></span>
+        <% else %>
+          <p><%= money_price %><%= tax_label %></p>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/themes/default/spree/products/_swiper.html.erb

@@ -0,0 +1,90 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/products/_swiper.html.erb %>
+<%# reason: 商品カルーセルのブレークポイント別表示数 (1024px:6 等) を変更したコピー上書き %>
+<%# Spree 5.3 追従: prev/next ボタンから aria: { hidden: true } を削除 %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/cdbd620ff4b0a09724ff5c060eb90ef002539222 %>
+<% desktop_slides ||= 4 %>
+<% slides_per_view ||= desktop_slides %>
+<% arrows_on_top ||= false %>
+<% pagination ||= 'bottom' %>
+<% layout ||= 'swiper' %>
+<% heading ||= nil %>
+
+<% heading_size = case section.try(:preferred_heading_size)
+  when 'small'
+    'text-base font-medium'
+  when 'medium'
+    'text-lg lg:text-xl font-medium'
+  when 'large'
+    'text-xl lg:text-2xl font-medium'
+  else
+    heading_class || ''
+  end %>
+
+<% heading_alignment = case section.try(:preferred_heading_alignment)
+  when 'left'
+    'text-left'
+  when 'center'
+    'text-center'
+  when 'right'
+    'text-right'
+  else
+    ''
+  end %>
+
+<% if heading.present? %>
+<h3 class='<%= "#{heading_size} font-medium uppercase #{heading_alignment}" %> pb-8'>
+  <%= heading %>
+</h3>
+<% end %>
+
+<div class='flex h-full relative'>
+  <div class='swiper-container overflow-hidden flex-1 pr-8 lg:pr-0 -mx-4 lg:mx-0 flex flex-col <%= pagination == 'bottom' ? 'lg:flex-col lg:justify-between lg:h-full' : 'lg:flex-col-reverse' %>' data-controller='carousel' data-carousel-options-value='{
+      "slidesPerView": 2,
+      "centeredSlides": false,
+      "spaceBetween": 16,
+      "grabCursor": true,
+      "breakpoints": {
+        "1024": {
+          "slidesPerView": 6,
+          "spaceBetween": 24
+        },
+        "768": {
+          "slidesPerView": 4,
+          "spaceBetween": 24
+        }
+      },
+      "navigation": {
+        "nextEl": ".swiper-custom-button-next-<%= section.id %>",
+        "prevEl": ".swiper-custom-button-prev-<%= section.id %>"
+      }
+    }'>
+    <div class='swiper-wrapper px-4 lg:px-0 h-auto'>
+      <%= render 'spree/shared/products', products: products %>
+    </div>
+    <div class='-mr-8 lg:mr-0 flex <%= arrows_on_top ? 'hidden' : '' %> <%= pagination == 'bottom' ? 'justify-end lg:mt-6' : 'justify-between lg:mb-8 items-end' %> <%= section.try(:heading_alignment) == 'right' && pagination != 'bottom' ? 'lg:flex-row-reverse' : '' %>'>
+      <div class="mt-8 mx-4 lg:m-0 lg:shrink-0 gap-2 w-full flex <%= arrows_on_top ? 'md:hidden' : '' %> items-center <%= section.try(:layout) == 'swiper' && section.try(:show_more_button) ? 'justify-between' : 'lg:w-auto justify-end' %>">
+        <% if section.try(:preferred_layout) == 'swiper' && section.try(:preferred_show_more_button) %>
+        <%= link_to section.try(:preferred_show_all_button_link), class: "#{section.try(:preferred_button_style) == 'primary' ? 'btn-primary' : 'btn-secondary'} w-full lg:w-72 block text-center", data: { turbo_frame: '_top' } do %>
+        <%= section.button_text %>
+        <% end %>
+        <% end %>
+        <% unless arrows_on_top %>
+        <div class='justify-center items-center gap-4 md:flex hidden'>
+          <%= button_tag class: "swiper-custom-button-prev-#{section.id} disabled:opacity-50" do %>
+          <%= render 'spree/shared/icons/chevron' %>
+          <% end %>
+          <%= button_tag class: "swiper-custom-button-next-#{section.id} disabled:opacity-50" do %>
+          <%= render 'spree/shared/icons/chevron_right' %>
+          <% end %>
+        </div>
+        <% end %>
+      </div>
+    </div>
+    <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent left-0 disabled:hidden hover:border-primary ml-2 lg:ml-0 swiper-custom-button-prev-#{section.id} block #{arrows_on_top ? '' : 'md:hidden'} top-[--top] lg:top-[--desktop-top]", style: "--top: calc(#{theme_setting('product_listing_image_height_mobile')}px/2); --desktop-top: calc(#{theme_setting('product_listing_image_height')}px/2); transform: translate(-50%, -50%);" do %>
+    <%= render 'spree/shared/icons/chevron' %>
+    <% end %>
+    <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent right-0 disabled:hidden hover:border-primary mr-2 lg:mr-0 swiper-custom-button-next-#{section.id} block #{arrows_on_top ? '' : 'md:hidden'} top-[--top] lg:top-[--desktop-top]", style: "--top: calc(#{theme_setting('product_listing_image_height_mobile')}px/2); --desktop-top: calc(#{theme_setting('product_listing_image_height')}px/2); transform: translate(50%, -50%);" do %>
+    <%= render 'spree/shared/icons/chevron_right' %>
+    <% end %>
+  </div>
+</div>

data/app/views/themes/default/spree/shared/_account_pane.html.erb

@@ -0,0 +1,18 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/shared/_account_pane.html.erb %>
+<%# reason: アカウントスライドオーバーに overflow-auto を追加するなど軽微な表示調整をしたコピー上書き %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/cdbd620ff4b0a09724ff5c060eb90ef002539222 %>
+<div id='account-pane' data-turbo-permanent data-slideover-account-target='overlay' class='fixed inset-0 flex flex-row-reverse z-50 transition-opacity hidden'>
+  <div class='fixed inset-0'>
+    <div data-action='click->slideover-account#toggle' class='absolute inset-0 bg-background opacity-75'></div>
+  </div>
+  <div id='slideover-account' data-slideover-account-target='menu' class='relative overflow-auto sidebar-pane flex-1 !flex flex-col w-full bg-background text-text md:border-l border-default transition ease-in-out duration-300 translate-x-full'>
+    <div class='p-4 gap-4 flex-shrink-0 flex items-center justify-between border-b border-default z-50'>
+      <button data-action='slideover-account#toggle' class='flex items-center justify-center rounded-full focus:outline-none focus:bg-background' aria-label='Close account sidebar'>
+        <%= render 'spree/shared/icons/cross' %>
+      </button>
+      <span class='text-xl font-medium uppercase leading-loose'><%= Spree.t(:account) %></span>
+      <span></span>
+    </div>
+    <%= turbo_frame_tag "login", src: spree_login_path, loading: "lazy" %>
+  </div>
+</div>

data/app/views/themes/default/spree/shared/_cart_icon.html.erb

@@ -0,0 +1,19 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/shared/_cart_icon.html.erb %>
+<%# reason: カートアイコンに title 属性とカウンター位置の調整を加えたコピー上書き %>
+<%# @see https://github.com/be-agile/giga-repeat/issues/920 %>
+<% item_count ||= current_order&.item_count %>
+
+<%= turbo_frame_tag "cart-icon-#{item_count}", target: '_top' do %>
+  <%= link_to spree.cart_path,
+    class: 'relative block w-6',
+    id: "cart-pane-link",
+    title: Spree.t('storefront.cart.items_in_cart'),
+    data: { action: 'click->slideover#toggle click@window->slideover#hide' },
+    onclick: 'event.preventDefault()' do %>
+    <%= render 'spree/shared/icons/cart' %>
+    <span class='cart-counter w-full text-[10px] font-extrabold absolute text-center' style='top: -10px; left: 50%; transform: translateX(-50%);'>
+      <%= item_count if item_count&.positive? %>
+    </span>
+    <span class='sr-only'><%= Spree.t('storefront.cart.items_in_cart') %></span>
+  <% end %>
+<% end %>

data/app/views/themes/default/spree/shared/_line_item_options.html.erb

@@ -0,0 +1,9 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/shared/_line_item_options.html.erb %>
+<%# reason: オプション表示を色見本付きの詳細表示から options_text の簡易表示に置き換えている %>
+<%# Spree 5.3 追従: 本家の変更(option_values.includes(:option_type) 削除)は本独自実装に該当箇所が無いため版上げのみ %>
+<%# @see https://github.com/be-agile/giga-repeat/issues/859 %>
+<% if line_item.variant.options_text.present? %>
+  <div class="px-2 text-sm line-clamp-2">
+    <%= line_item.variant.options_text %>
+  </div>
+<% end %>

data/app/views/themes/default/spree/shared/_logo.html.erb

@@ -0,0 +1,39 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/shared/_logo.html.erb %>
+<%# reason: ロゴが未添付のときストアロゴにフォールバックする条件と、既定 logo_css に object-contain を設定している %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/d0f0ce224dd5696b38676f2fe4dc1e52743f115a %>
+<% logo = current_store.logo unless logo&.attached? %>
+<% height ||= 64 %>
+<% logo_css ||= 'object-contain' %>
+
+<%= link_to spree.root_path, id: 'site-logo' do %>
+  <% if logo.present? && logo.attached? && logo.variable? %>
+    <% aspect_ratio = spree_asset_aspect_ratio(logo) %>
+    <% logo_style = "aspect-ratio: #{aspect_ratio};" %>
+    <% if aspect_ratio.to_f > 10 %>
+      <% mobile_class = "h-[16px]" %>
+      <% desktop_class = "md:h-[32px]" %>
+    <% elsif aspect_ratio.to_f > 5 %>
+      <% mobile_class = "h-[25px]" %>
+      <% desktop_class = "md:h-[32px]" %>
+    <% elsif aspect_ratio.to_f < 3 %>
+      <% mobile_class = "h-[32px]" %>
+      <% desktop_class = "md:h-[64px]" %>
+    <% else %>
+      <% mobile_class = "h-[32px]" %>
+    <% end %>
+    <% if defined?(height) && height > 0 %>
+      <% logo_style += "--desktop-height: #{height}px;" %>
+      <% cdn_height = height %>
+      <% desktop_class = "custom-desktop-height" %>
+    <% elsif aspect_ratio.to_f < 3 %>
+      <% cdn_height = 64 %>
+    <% else %>
+      <% cdn_height = 32 %>
+    <% end %>
+    <% img_class = "w-auto #{mobile_class} #{desktop_class} #{logo_css}" %>
+    <% variant_options = spree_image_variant_options(resize_to_fit: [nil, cdn_height * 3]) %>
+    <%= image_tag main_app.cdn_image_url(logo.variant(variant_options)), class: img_class, alt: current_store.name + " logo", style: logo_style, height: cdn_height %>
+  <% else %>
+    <h1 class='text-lg text-center uppercase'><%= current_store.name %></h1>
+  <% end %>
+<% end %>

data/app/views/themes/default/spree/shared/_nav_taxon_square_image.html.erb

@@ -0,0 +1,8 @@
+<% cache ['nav_taxon_square_image', taxon.cache_key_with_version] do %>
+  <% if taxon.present? && taxon.class.name == 'Spree::Taxon' && taxon.square_image&.attached? && taxon.square_image.variable? %>
+    <% img_class ||= 'mr-1' %>
+    <% width ||= 25 %>
+    <% height ||= 25 %>
+    <%= spree_image_tag(taxon.square_image, class: img_class, width: width, height: height, loading: :lazy) %>
+  <% end %>
+<% end %>

data/app/views/themes/default/spree/shared/_order_shipment.html.erb

@@ -0,0 +1,79 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/shared/_order_shipment.html.erb %>
+<%# reason: 配送追跡リンクを tracking_url_for_shipment ベースに変更し、発送後の案内文を追加している %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/b27d2f2b8c7a6c585333d4b74edafb9fe11a2aa0 %>
+<li class="border border-accent mb-4">
+  <div class="p-4 lg:p-6">
+    <div class="flex flex-col lg:flex-row lg:gap-6 gap-4">
+      <% ship_address = shipment.address || shipment.order.ship_address %>
+      <% if shipment.order.requires_ship_address? && ship_address.present? %>
+        <div class="text-sm lg:w-1/2">
+          <div class="tracking-widest uppercase mb-1">
+            <%= Spree.t(:delivery_address) %>
+          </div>
+          <div class="!leading-[1.375rem] text-neutral-800">
+            <%= render "spree/shared/address",
+            address: ship_address %>
+          </div>
+        </div>
+      <% end %>
+      <div class="text-sm lg:w-1/2 lg:flex justify-between">
+        <div>
+          <div class="tracking-widest uppercase mb-1">
+            <%= Spree.t(:shipping_method) %>
+          </div>
+          <div class="!leading-[1.375rem] text-neutral-800">
+            <% if shipment.shipping_method.present? %>
+              <%= shipment.shipping_method.name %>
+            <% else %>
+              <%= Spree.t("shipment_states.canceled") %>
+            <% end %>
+            <br>
+            <% if shipment.stock_location.present? %>
+              <%= Spree.t(:shipped_from) %>
+              <%= shipment.stock_location.name %>
+            <% end %>
+          </div>
+        </div>
+        <% unless shipment.digital? %>
+          <div class="mt-4 lg:-mt-2 lg:-mr-2">
+            <% tracking_url = tracking_url_for_shipment(shipment) %>
+            <% if shipment.shipped? && shipment.tracked? && tracking_url.present? %>
+              <%= link_to Spree.t(:track_items),
+              tracking_url,
+              class: "!px-3 !py-1 block btn-primary !leading-6 text-sm text-center",
+              target: :_blank %>
+            <% else %>
+              <button
+                class="
+                  !px-3 !py-1 block btn-primary !leading-6 text-sm text-center
+                "
+                disabled
+              ><%= Spree.t(:track_items) %></button>
+              <div class="text-xs text-neutral pt-2">※発送後、配送状況を確認できます</div>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <% if shipment.canceled? && shipment.shipped_at.nil? %>
+      <div class="alert-warning text-sm uppercase mt-3 px-3 py-2">
+        <strong><%= Spree.t(:shipment) %>
+          <%= Spree.t("shipment_states.canceled") %></strong>.
+        <%= Spree.t(:shipment_refunded_message) %>
+      </div>
+    <% elsif (!shipment.tracked? || !shipment.shipped?) && !shipment.digital? %>
+      <div class="text-sm uppercase text-center bg-neutral-100 mt-3 px-3 py-2">
+        <%= Spree.t(:no_tracking_present) %>
+      </div>
+    <% end %>
+  </div>
+
+  <hr class="border-accent mx-4">
+
+  <div class="grid grid-cols-1 gap-4 lg:gap-6 p-4 lg:p-6">
+    <%= render partial: "spree/shared/order_line_item",
+    collection: shipment.inventory_units,
+    as: :inventory_unit,
+    cached: spree_storefront_base_cache_scope %>
+  </div>
+</li>

data/app/views/themes/default/spree/shared/_search.html.erb

@@ -0,0 +1,33 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/shared/_search.html.erb %>
+<%# reason: 検索オーバーレイからヘッダーロゴ表示を除くなどレイアウトを調整したコピー上書き %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/cdbd620ff4b0a09724ff5c060eb90ef002539222 %>
+<%# Spree 5.3 追従: 検索候補 dialog に aria-label を i18n 対応で付与 %>
+<div id="search-suggestions" role="dialog" aria-label="<%= Spree.t(:search) %>" aria-modal="true">
+  <div class='w-full flex flex-col border-b border-default' data-controller="search-suggestions" data-show-class="h-screen min-h-screen" data-search-suggestions-url-value="<%= spree.search_suggestions_path %>">
+    <%= form_with url: spree.search_path, method: :get, local: true do %>
+    <div class='page-container bg-background flex w-full my-2 lg:mb-3 animate-fadeIn'>
+      <%= button_tag class: 'items-center justify-center pr-4', type: :button, data: { action: "click->search-suggestions#hide touch->search-suggestions#hide" } do %>
+      <span class='sr-only'><%= Spree.t(:close) %></span>
+      <%= render 'spree/shared/icons/close', color: 'black' %>
+      <% end %>
+
+      <div class='relative mx-auto w-full md:w-1/2' data-controller='clear-input'>
+        <%= button_tag type: 'submit', class: 'absolute left-2 top-2' do %>
+        <%= render 'spree/shared/icons/search' %>
+        <% end %>
+
+        <%= text_field_tag :q, params[:q], class: 'p-2 lg:text-sm !leading-6 pl-10 !h-auto bg-accent w-full uppercase pr-14 focus:outline-none text-input', placeholder: Spree.t(:search), data: { search_suggestions_target: 'input', clear_input_target: 'input' } %>
+        <%= button_tag class: 'hidden text-sm font-semibold absolute top-2 right-2 uppercase h-6 tracking-widest', data: { clear_input_target: 'button', action: 'click->clear-input#clear touch->clear-input#clear click->search-suggestions#clear touch->search-suggestions#clear' } do %>
+        <%= Spree.t(:clear) %>
+        <% end %>
+      </div>
+    </div>
+    <% end %>
+    <div id="search-suggestions-content" class="flex-grow hidden" data-show-class="animate-fadeIn"></div>
+  </div>
+
+  <!-- rendering search flyover skeleton -->
+  <template id="loading">
+    <%= render 'spree/search/suggestions' %>
+  </template>
+</div>