ba_spree 1.0.0

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

@@ -0,0 +1,40 @@
+      <div class="py-2">
+        <%
+          # ゲストユーザーの場合: guest=true かつ deleted_at!=nil（論理削除されている）
+          # 会員の場合: guest!=true かつ deleted_at==nil
+          # 同じメールアドレスで既に購読済みなら表示しない
+          show_marketing_checkbox = false
+          if try_spree_current_user
+            # ログイン済みユーザー（会員）
+            show_marketing_checkbox = !try_spree_current_user.guest? && try_spree_current_user.deleted_at.nil? && !try_spree_current_user.accepts_email_marketing?
+          else
+            # 未ログインユーザー（ゲスト）
+            if @order.email.present?
+              existing_user = User.with_deleted.find_by(email: @order.email.downcase)
+              if existing_user
+                # 既存ユーザーがいる場合
+                if existing_user.guest? && existing_user.deleted_at.present?
+                  # ゲストユーザーで論理削除されている場合、購読状況をチェック
+                  show_marketing_checkbox = !existing_user.accepts_email_marketing?
+                end
+              else
+                # 新規ユーザーの場合は表示
+                show_marketing_checkbox = true
+              end
+            else
+              # メールアドレスが未入力の場合は表示
+              show_marketing_checkbox = true
+            end
+          end
+        %>
+        <% if show_marketing_checkbox %>
+          <div class="flex items-center gap-2">
+            <%= form.check_box :accept_marketing, { checked: true, class: 'checkbox-input' } %>
+            <%= form.label :accept_marketing, class: 'cursor-pointer text-sm select-none' do %>
+              <%= Spree.t('storefront.newsletter_subscription.join') %>
+            <% end %>
+          </div>
+        <% else %>
+          <%= form.hidden_field :accept_marketing, value: true %>
+        <% end %>
+      </div>

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

@@ -0,0 +1,135 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/spree/checkout/_address.html.erb %>
+<%# reason: accept_marketing チェックボックスを共通 partial に切り出し、住所初期値を新規 Address 固定にするなどチェックアウト挙動を調整している %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/b0920403041181332b55b45773c3d0d2d0415970 %>
+<%= render 'spree/checkout/quick_checkout' %>
+
+<% address_type = 'shipping' %>
+<% address_name = "#{address_type[0...4]}_address" %>
+
+<% if @order.requires_ship_address? &&user_available_addresses.present? %>
+  <div data-controller="checkout-address-book">
+    <%= turbo_frame_tag :checkout_address_book do %>
+      <div class="mb-4" data-checkout-address-book-target="list">
+        <div id="<%= address_type %>">
+          <h5 class="font-body">
+            <%= Spree.t(address_type + '_address') %>
+          </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| %>
+              <%= 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">
+                <%= radio_button_tag "order_#{address_name}_id", 0, false, class: 'custom-control-input radio-input mr-5', data: { action: 'checkout-address-book#select' } %>
+                <label class="custom-control-label d-block select-none cursor-pointer w-full max-w-[calc(100%-58px)]" for="<%= "order_#{address_name}_id_0" %>">
+                  <%= Spree.t(:new_address) %>
+                  <div class="mt-4 hidden" data-checkout-address-book-target="newAddressForm">
+                    <%= turbo_frame_tag :new_address do %>
+                      <%= form_for try_spree_current_user.addresses.build(country: current_store.default_country), 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 :order_token, @order.token %>
+                        <%= hidden_field_tag "default_shipping", true %>
+                        <%= hidden_field_tag "default_billing", true %>
+                        <%= f.submit Spree.t('actions.save'), class: 'btn btn-primary btn-block spree-btn mb-5' %>
+                      <% end %>
+                    <% end %>
+                  </div>
+                </label>
+              </div>
+            </li>
+          </ul>
+        </div>
+      </div>
+    <% end %>
+
+    <%= form_for @order, url: spree.update_checkout_path(@order.token, @order.state), html: { id: "checkout_form_#{@order.state}" } do |form| %>
+      <div>
+        <%= render 'spree/checkout/order_lock_version', order: @order %>
+        <%= form.hidden_field :ship_address_id, data: { 'checkout-address-book-target': 'addressId' } %>
+      </div>
+
+      <%= render 'spree/checkout/special_instructions', form: form %>
+
+      <%= render 'spree/checkout/accept_marketing_checkbox', form: form %>
+
+      <div>
+        <%= button_tag Spree.t(:save_and_continue),
+                       data: {
+                         'checkout-address-book-target': 'submit',
+                         'turbo-submits-with': (render 'spree/checkout/button_processing', is_hidden: false)
+                       },
+                       class: 'btn btn-primary font-weight-bold w-full lg:w-48 float-right checkout-content-save-continue-button',
+                       disabled: @order.ship_address_id.nil? %>
+      </div>
+    <% end %>
+  </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">
+      <% 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">
+            <%= Spree.t(:contact_information) %>
+          </h5>
+          <% if !already_have_an_account? && defined?(spree_login_path) %>
+            <div class="lg:text-right">
+              <span class="text-muted text-sm">
+                <%= Spree.t('storefront.checkout.already_have_an_account') %> <span class="text-primary"><%= link_to Spree.t(:login), spree_login_path, data: { turbo_frame: '_top' } %></span>
+              </span>
+            </div>
+          <% end %>
+        </div>
+        <div class="form-group has-float-label mb-3">
+          <%= form.email_field :email, class: 'w-full text-input', required: true, placeholder: Spree.t(:email), id: 'order_ship_address_attributes_email' %>
+          <label for="order_ship_address_attributes_email"><%= Spree.t(:email) %></label>
+        </div>
+      <% end %>
+
+      <%= render 'spree/checkout/accept_marketing_checkbox', form: form %>
+
+      <% unless try_spree_current_user %>
+        <% if already_have_an_account? %>
+          <div class="py-2 text-sm">
+            <%= 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 %>
+
+      <% 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: Spree::Address.new(country: current_store.default_country, user: try_spree_current_user),
+                  form: form
+                } %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+        <%= hidden_field_tag 'save_user_address', true, data: { hook: "save_user_address" } %>
+      <% end %>
+
+      <%= render 'spree/checkout/special_instructions', form: form %>
+    </div>
+    <div class="flex justify-end w-full gap-2">
+      <%= button_tag Spree.t(:save_and_continue),
+                     class: 'btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4',
+                     data: {
+                       'turbo-submits-with': (render 'spree/checkout/button_processing', is_hidden: false)
+                     } %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,25 @@
+<%= form_for @order, url: spree.update_checkout_path(@order.token, @order.state), html: { id: "checkout_form_#{@order.state}" } do |form| %>
+  <%= form.hidden_field :state_lock_version %>
+
+  <% if @order.respond_to?(:gift_card) %>
+    <%= turbo_frame_tag :gift_card_code_field do %>
+      <%= hidden_field_tag 'order[gift_card_code]', @order.gift_card&.code %>
+      <%= hidden_field_tag 'order[gift_card_amount]', @order.gift_card_total %>
+    <% end %>
+  <% end %>
+
+  <% use_shipping = @order.shipping_eq_billing_address? || @order.bill_address.nil? || @order.bill_address.new_record? %>
+
+  <div class="border text-sm px-5 mb-6 py-4 rounded-md border-default">
+      <div class="flex items-center">
+        <div class="min-w-[60px] max-w-[60px]">
+          <%= Spree.t(:bill_address) %>
+        </div>
+        <div class="px-5 word-break">
+          <%= @order.bill_address.to_s.gsub('<br/>', I18n.t("address_format_i18n.delimiter", default: " ")).html_safe %>
+        </div>
+      </div>
+  </div>
+
+  <%= render 'spree/checkout/payment_methods', form: form %>
+<% end %>

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

@@ -0,0 +1,26 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/spree/checkout/_line_item.html.erb %>
+<%# reason: カート明細のサムネイルサイズ (64→60) と価格表示を pre_tax_amount から Spree::Money(line_item.amount) に変更している %>
+<%# note: 5.3 で本家は spree_image_tag に variant: :mini (128px の preprocessed named variant) を追加したが、 %>
+<%#   variant 指定は width/height を無視するため ba_spree の 60px サムネイル方針と競合する。 %>
+<%#   60px の動的 variant を維持するため variant: :mini は取り込まない。 %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/46ac63582aa36aea93e250a14274626e98c5207a %>
+<div class="flex justify-between items-center pt-3">
+  <div class="mr-5 w-[60px] h-[60px] relative rounded bg-accent-100 shrink-0">
+    <span class="rounded-full text-xs text-center font-bold pl-[0.5px] py-1 w-6 text-sidebar-text bg-background absolute -right-2 -top-3">
+      <%= line_item.quantity %>
+    </span>
+    <% image = line_item.variant.default_image %>
+    <% if image.present? && image.attached? && image.variable? %>
+      <%= spree_image_tag(image, class: 'rounded border border-default bg-transparent object-cover object-center', loading: :lazy, width: 60, height: 60) %>
+    <% else %>
+      <div style="width:60px;height:60px;" class="bg-accent-100 border border-default rounded"></div>
+    <% end %>
+  </div>
+  <div class="flex-1 pr-3 text-sm">
+    <p class="font-bold word-break"><%= line_item.name %></p>
+    <p class="text-xs"><%= line_item.options_text %></p>
+  </div>
+  <div class="font-semibold text-sm text-right shrink-0">
+    <%= Spree::Money.new(line_item.amount, currency: line_item.currency) %>
+  </div>
+</div>

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

@@ -0,0 +1,8 @@
+<li class="list-group-item p-0 m-0 border-b border-default">
+  <div class="px-5 py-4">
+    <div class="font-medium mb-2">
+      <%= Spree.t(method.name, scope: :payment_methods, default: method.name) %>
+    </div>
+    <%= render partial: "spree/checkout/payment/#{method.method_type}", locals: { payment_method: method } %>
+  </div>
+</li>

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

@@ -0,0 +1,88 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/spree/checkout/_payment_methods.html.erb %>
+<%# reason: confirm 画面ではラジオなしの確認表示、それ以外は選択用ラジオ表示と、注文状態で支払い方法 UI を分岐させている %>
+<%# @see https://github.com/be-agile/giga-repeat/issues/994 %>
+<%= turbo_frame_tag :checkout_payment_methods do %>
+  <% if !@order.payment_required? && @order.using_store_credit? %>
+    <div class="d-flex flex-column mb-5">
+      <p>
+        <% if @order.respond_to?(:gift_card) && @order.gift_card.present? %>
+          <%= Spree.t('storefront.checkout.gift_card_amount_applied', amount: @order.display_gift_card_total, code: @order.gift_card.code) %>
+        <% else %>
+          <%= Spree.t('storefront.checkout.store_credits_amount_applied', amount: @order.display_total_applicable_store_credit.abs) %>
+        <% end %>
+
+        <%= Spree.t('storefront.checkout.order_already_paid') %>
+      </p>
+    </div>
+    <div class="flex justify-end w-full">
+      <%= button_tag Spree.t(:place_order),
+                      class: 'btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4',
+                      data: { 'turbo-submits-with': (render 'spree/checkout/button_processing', is_hidden: false) } %>
+    </div>
+  <% else %>
+    <h5 class="mb-3 font-body font-semibold">
+      <%= Spree.t(:payment) %>
+    </h5>
+    <p class="text-muted mb-3 text-neutral-600">
+      <%= Spree.t('storefront.checkout.all_transactions_are_secure_and_encrypted') %>
+    </p>
+
+    <%= render partial: 'spree/checkout/payment/store_credit' %>
+
+    <% if @order.state == 'confirm' %>
+      <!-- 確認画面: シンプルな支払い方法表示（ラジオボタンなし） -->
+      <% if checkout_available_payment_methods.size > 1 %>
+        <ul id="payment-method-fields" class="rounded-md list-group mb-4 border border-default text-sm">
+          <% selected_method = checkout_available_payment_methods.find { |method| @order.payments.valid.any? { |p| p.payment_method_id == method.id } } || checkout_available_payment_methods.first %>
+          <%= render collection: checkout_available_payment_methods.select { |method| @order.payments.valid.any? { |p| p.payment_method_id == method.id } }, partial: 'spree/checkout/payment_method_confirm', as: :method, locals: { selected_method: selected_method } %>
+        </ul>
+      <% elsif checkout_available_payment_methods.any? %>
+        <%= hidden_field_tag "order[payments_attributes][][payment_method_id]", checkout_available_payment_methods.first&.id %>
+        <div class="mb-4">
+          <div class="font-medium mb-2">
+            <%= Spree.t(checkout_available_payment_methods.first.name, scope: :payment_methods, default: checkout_available_payment_methods.first.name) %>
+          </div>
+          <%= render partial: "spree/checkout/payment/#{checkout_available_payment_methods.first.method_type}", locals: { payment_method: checkout_available_payment_methods.first } %>
+        </div>
+      <% end %>
+    <% else %>
+      <!-- 支払い方法選択画面: 通常のラジオボタン付きリスト -->
+      <% if checkout_available_payment_methods.size > 1 %>
+        <ul id="payment-method-fields" class="rounded-md list-group mb-4 border border-default border-b-0 text-sm border-default">
+          <%
+            # spree_products_payment_methodsエンジンのフィルタリングロジックを適用
+            filtered_methods = if @order.respond_to?(:availiable_products_payment_methods)
+              checkout_available_payment_methods.to_a & @order.availiable_products_payment_methods.to_a
+            else
+              checkout_available_payment_methods
+            end
+
+            selected_method = if params[:payment_method_id].present?
+              filtered_methods.find { |method| method.id.to_s == params[:payment_method_id].to_s }
+            elsif @order.payment_method.present?
+              filtered_methods.find { |method| method.id == @order.payment_method.id }
+            else
+              filtered_methods.first
+            end
+          %>
+          <%= render collection: filtered_methods, partial: 'spree/checkout/payment_method', as: :method, locals: { selected_method: selected_method } %>
+        </ul>
+      <% elsif checkout_available_payment_methods.any? %>
+        <%= hidden_field_tag "order[payments_attributes][][payment_method_id]", checkout_available_payment_methods.first&.id %>
+        <%= render partial: "spree/checkout/payment/#{checkout_available_payment_methods.first.method_type}", locals: { payment_method: checkout_available_payment_methods.first } %>
+      <% end %>
+    <% end %>
+  <% end %>
+
+  <%= render 'spree/checkout/terms_and_conditions' %>
+
+  <div class="flex justify-end w-full gap-2">
+    <button type="submit"
+            id="checkout-payment-submit"
+            class="btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4"
+    >
+      <%= render 'button_processing', is_hidden: true %>
+      <%= @order.state == 'confirm' ? Spree.t(:place_order) : Spree.t(:pay) %>
+    </button>
+  </div>
+<% end %>

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

@@ -0,0 +1,146 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/spree/checkout/_summary.html.erb %>
+<%# reason: 注文状態 (address/delivery/payment/confirm/complete) ごとに小計・調整・税・合計の算出と表示を作り分けている %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/e6cedf7043ffca764a28841deb78005d66b87a79 %>
+<%= turbo_frame_tag :checkout_summary, id: 'summary' do %>
+  <div class="checkout-content-summary text-sm">
+    <% cache [*spree_storefront_base_cache_scope.call(order.cache_key_with_version), order.state] do %>
+      <div data-hook="order_summary">
+        <div class="flex justify-between items-center mb-2">
+          <span><%= Spree.t(:subtotal) %>:</span>
+          <span><%= order.display_item_total.to_html %></span>
+        </div>
+        <div class="d-table-cell text-right font-weight-bold"></div>
+
+        <% cache spree_storefront_base_cache_scope.call(order.line_item_adjustments.nonzero.cache_key_with_version) do %>
+          <% if order.line_item_adjustments.nonzero.exists? %>
+            <% order.line_item_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+              <div class="flex justify-between items-center mb-2">
+                <span class="max-w-[250px] truncate">
+                  <%= label %>:
+                </span>
+                <span>
+                  <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %>
+                </span>
+              </div>
+            <% end %>
+          <% end %>
+        <% end %>
+
+        <% if order.state == 'confirm' || order.state == 'complete' %>
+          <% if order.adjustments.nonzero.non_tax.eligible.exists? %>
+            <% sort_adjustments_with_flat_percent_last(order.adjustments.nonzero.non_tax.eligible).each do |adjustment| %>
+              <div class="flex justify-between items-center mb-2">
+                <span>
+                  <%= adjustment.label %>:
+                </span>
+                <span>
+                  <%= adjustment.display_amount.to_html %>
+                </span>
+              </div>
+            <% end %>
+          <% end %>
+        <% else %>
+          <% if order.adjustments.nonzero.non_tax.non_payment_method.eligible.exists? %>
+            <% sort_adjustments_with_flat_percent_last(order.adjustments.nonzero.non_tax.non_payment_method.eligible).each do |adjustment| %>
+              <div class="flex justify-between items-center mb-2">
+                <span>
+                  <%= adjustment.label %>:
+                </span>
+                <span>
+                  <%= adjustment.display_amount.to_html %>
+                </span>
+              </div>
+            <% end %>
+          <% end %>
+        <% end %>
+
+        <% if !(order.state == 'address' || order.state == 'delivery') && order.shipments.any? %>
+          <% if order.has_free_shipping? %>
+            <div class="flex justify-between items-center mb-2">
+              <span><%= Spree.t(:shipping) %>:</span>
+              <span><%= Spree.t(:free) %></span>
+            </div>
+          <% else %>
+            <div class="flex justify-between items-center mb-2">
+              <span><%= Spree.t(:shipping) %>:</span>
+              <span>
+                <%= order.ship_total <= 0 ? Spree.t(:free) : order.display_ship_total.to_html %>
+              </span>
+            </div>
+
+            <% if order.shipment_adjustments.nonzero.exists? %>
+              <% order.shipment_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+                <div class="flex justify-between items-center mb-2">
+                  <span>
+                    <%= label %>:
+                  </span>
+                  <span>
+                    <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %>
+                  </span>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
+
+        <% if order.respond_to?(:gift_card) && order.gift_card.present? %>
+          <div class="flex justify-between items-center mb-2">
+            <span><%= Spree.t(:gift_card) %>:</span>
+            <span>-<%= order.display_gift_card_total %></span>
+          </div>
+        <% elsif order.using_store_credit? %>
+          <div class="flex justify-between items-center mb-2">
+            <span>Store credit:</span>
+            <span><%= order.display_total_applied_store_credit %></span>
+          </div>
+        <% end %>
+
+        <div>
+          <div class="flex justify-between items-center">
+            <span class="font-bold text-lg"><%= Spree.t(:total) %></span>
+            <div class="">
+              <span class="font-semibold text-lg inline" id='summary-order-total' data-currency="<%= Money::Currency.find(order.currency).symbol %>">
+                <% if order.address? %>
+                  <% line_item_adj_total = BigDecimal(order.line_item_adjustments.nonzero.promotion.eligible.sum(:amount).to_s).round(2, BigDecimal::ROUND_HALF_UP) %>
+                  <% order_adj_total = BigDecimal(order.adjustments.nonzero.non_tax.non_payment_method.eligible.sum(:amount).to_s).round(2, BigDecimal::ROUND_HALF_UP) %>
+                  <%= Spree::Money.new(order.item_total + line_item_adj_total + order_adj_total, currency: order.currency).to_html %>
+                <% elsif order.delivery? %>
+                  <% line_item_adj_total = BigDecimal(order.line_item_adjustments.nonzero.promotion.eligible.sum(:amount).to_s).round(2, BigDecimal::ROUND_HALF_UP) %>
+                  <% order_adj_total = BigDecimal(order.adjustments.nonzero.non_tax.non_payment_method.eligible.sum(:amount).to_s).round(2, BigDecimal::ROUND_HALF_UP) %>
+                  <%= Spree::Money.new(order.item_total + line_item_adj_total + order_adj_total, currency: order.currency).to_html %>
+                <% elsif order.payment? %>
+                  <% line_item_adj_total = BigDecimal(order.line_item_adjustments.nonzero.promotion.eligible.sum(:amount).to_s).round(2, BigDecimal::ROUND_HALF_UP) %>
+                  <% order_adj_total = BigDecimal(order.adjustments.nonzero.non_tax.non_payment_method.eligible.sum(:amount).to_s).round(2, BigDecimal::ROUND_HALF_UP) %>
+                  <%= Spree::Money.new(order.item_total + order.shipment_total + line_item_adj_total + order_adj_total, currency: order.currency).to_html %>
+                <% else %>
+                  <%= order.display_total_minus_store_credits.to_html %>
+                <% end %>
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+
+    <%# キャッシュキーに order.state を含める: 税の表示を confirm/complete のみに絞っているため、
+        payment 状態(税は確定済みだが非表示)で先にこのフラグメントが「空」でキャッシュされると、
+        税 adjustment 集合が同一(= cache_key_with_version も同一)の confirm でも空キャッシュが
+        再利用され内税が出なくなる(クレカ決済等 payment に滞在してから confirm に進む経路で顕在化)。
+        state をキーに加え payment と confirm を分離する。本家は税表示を payment? でも出すため衝突しない。 %>
+    <% cache [spree_base_cache_scope.call(order.all_adjustments.nonzero.tax.eligible.cache_key_with_version), order.state] do %>
+      <% if order.state == 'confirm' || order.state == 'complete' %>
+        <% taxes = order.all_adjustments.nonzero.tax.eligible.group_by(&:label) %>
+        <% taxes.each do |label, adjustments| %>
+          <div class="flex justify-between items-center mb-2">
+            <span><%= label %></span>
+            <% tax_total = Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+            <span><%= tax_total.to_html %></span>
+          </div>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <div id="checkout-message" class="mt-8">
+      <%= current_store.checkout_message if current_store.checkout_message.present? %>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/shared/_purchased_items_table.html.erb

@@ -0,0 +1,60 @@
+<%# @gem-override spree_emails-5.3.6/app/views/spree/shared/_purchased_items_table.html.erb %>
+<%# reason: メール明細の割引集計を all_adjustments から line_item_adjustments / 調整 partial / 税ラベル別集計に組み替えている %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/8f447188bc31d60e0ce4af8e9d5377d34360433d %>
+<table class="purchase_content">
+  <%= render collection: line_items, partial: 'spree/shared/purchased_items_table/line_item', as: :line_item %>
+  <%= render 'spree/shared/purchased_items_table/subtotal', order: order %>
+  <% if order.line_item_adjustments.exists? %>
+    <% if order.line_item_adjustments.promotion.eligible.exists? %>
+      <% order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+        <tr>
+          <td></td>
+          <td>
+            <p class="f-fallback purchase_total purchase_total--label">
+              <%= label %>:
+            </p>
+          </td>
+          <td class="purchase_total-col">
+            <p class="f-fallback purchase_total">
+              <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+            </p>
+          </td>
+        </tr>
+      <% end %>
+    <% end %>
+  <% end %>
+  <% sort_adjustments_with_flat_percent_last(order.adjustments.eligible.non_tax.non_zero).each do |adjustment| %>
+    <%= render 'spree/shared/purchased_items_table/adjustment', adjustment: adjustment, order: order %>
+  <% end %>
+  <% order.shipments.group_by { |s| s.selected_shipping_rate&.name }.each do |name, shipments| %>
+    <tr>
+      <td></td>
+      <td>
+        <p class="f-fallback purchase_total purchase_total--label">
+          <%= name %>:
+        </p>
+      </td>
+      <td class="purchase_total-col">
+        <p class="f-fallback purchase_total">
+          <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
+        </p>
+      </td>
+    </tr>
+  <% end %>
+  <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
+    <tr>
+      <td></td>
+      <td>
+        <p class="f-fallback purchase_total purchase_total--label">
+          <%= label %>:
+        </p>
+      </td>
+      <td class="purchase_total-col">
+        <p class="f-fallback purchase_total">
+          <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %>
+        </p>
+      </td>
+    </tr>
+  <% end %>
+  <%= render 'spree/shared/purchased_items_table/total', order: order %>
+</table>

data/app/views/spree/shared/_purchased_items_table.text.erb

@@ -0,0 +1,24 @@
+<%# @gem-override spree_emails-5.3.6/app/views/spree/shared/_purchased_items_table.text.erb %>
+<%# reason: テキストメール明細の数量・割引・送料・税の表示を line_item_adjustments ベースに組み替えている %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/8f447188bc31d60e0ce4af8e9d5377d34360433d %>
+<% line_items.each do |item| %>
+<%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%> x <%= item.single_money %>) = <%= item.display_amount %>
+<% end %>
+============================================================
+<%= Spree.t('order_mailer.subtotal') %> <%= order.display_item_total %>
+<% if order.line_item_adjustments.exists? %>
+  <% if order.line_item_adjustments.promotion.eligible.exists? %>
+    <% order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+<%= label %>: <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+    <% end %>
+  <% end %>
+<% end %>
+<% sort_adjustments_with_flat_percent_last(order.adjustments.eligible.non_tax.non_zero).each do |adjustment| %>
+<%= adjustment.label %> <%= adjustment.display_amount %>
+<% end %>
+<% order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
+<%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
+<% end %>
+<% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
+<%= label %>: <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %>
+<% end %>

data/app/views/themes/default/spree/orders/_empty.html.erb

@@ -0,0 +1,14 @@
+<%# @gem-override spree_storefront-5.3.6/app/views/themes/default/spree/orders/_empty.html.erb %>
+<%# reason: 空カート表示を本家からコピーした丸ごと上書き (本家と現状差分なし) %>
+<%# @see https://github.com/be-agile/giga-repeat/commit/f7ea162f7ef78b6e1883a8fd5a02ada9a7ad017e %>
+<div class="flex flex-col justify-between h-full">
+  <div class="h-full flex flex-col items-center place-content-center py-10">
+    <%= render 'spree/shared/icons/cart_48' %>
+    <p class="mb-8 mt-4 uppercase text-sm">
+      <%= Spree.t('cart_page.empty_info').html_safe %>
+    </p>
+    <div class="mx-10">
+      <%= link_to Spree.t(:continue_shopping), spree.products_path, class: 'btn-primary !no-underline', data: { 'turbo-frame': '_top' } %>
+    </div>
+  </div>
+</div>