spree_np_atobarai 1.0.0

data/README.md

@@ -0,0 +1,71 @@
+# SpreeNpAtobarai
+
+`spree_np_atobarai` is a Spree extension that integrates the [NP Atobarai](https://np-atobarai.jp/) payment service into your Spree store. It provides functionalities for managing orders using this payment method, exporting order data in CSV format, and selecting invoice sending methods.
+
+## Features
+
+1. **New Payment Method Type**
+   - Adds `Spree::PaymentMethod::NpAtobarai`, allowing customers to pay using the NP Atobarai service.
+
+2. **Order Management Screen**
+   - Provides an admin interface for managing orders that use the NP Atobarai payment method.
+
+3. **CSV Export for NP Atobarai**
+   - Allows exporting NP orders in CSV format for upload to the NP Atobarai service.
+
+4. **Invoice Sending Methods Selection**
+   - Allows selecting `invoice_sending_methods` when using the `NP Atobarai` payment method.
+
+## Installation
+
+1. Add spree_np_atobarai to your Gemfile:
+
+```ruby
+gem 'spree_np_atobarai'
+```
+
+2. Install the gem using Bundler:
+
+```shell
+bundle install
+```
+
+3. Copy & run migrations:
+
+```shell
+bundle exec rails g spree_np_atobarai:install
+```
+
+## Usage
+
+### Creating the Payment Method
+
+After installing the extension, create a new NP Atobarai payment method using the Rails console:
+
+```ruby
+Spree::PaymentMethod::NpAtobarai.find_or_create_by(
+  name: "Np Atobarai 1",
+  description: "Np Atobarai payment method",
+  active: true,
+  display_on: "both",
+  auto_capture: true
+)
+```
+
+This will register the NP Atobarai payment method in your Spree store and make it available for use.
+
+### Managing NP Orders
+Once installed, an NP Order management screen will be available in the Spree admin panel. Here, you can view and manage all orders that use the NP Atobarai payment method.
+
+### Exporting NP Orders to CSV
+To generate a CSV file for NP orders, navigate to the NP Order section in the admin panel and click the Export CSV button.
+
+## License
+
+This extension is available as open source under the terms of either:
+* [GNU Affero General Public License v3.0 or later (AGPL-3.0-or-later)](https://www.gnu.org/licenses/agpl-3.0.en.html)
+* [BSD 3-Clause License](https://opensource.org/licenses/BSD-3-Clause)
+
+## Credits
+
+[be agile Co., Ltd.](https://be-agile.jp/)

data/app/controllers/spree/admin/np_orders_controller.rb

@@ -0,0 +1,36 @@
+module Spree
+  module Admin
+    class NpOrdersController < Spree::Admin::OrdersController
+      include Spree::Admin::OrderConcern
+
+      respond_to :html
+
+      def index
+        super
+        # Spree 5.3 追従: 本家の index は空メソッドになり、@orders → @collection(controller_name 由来の
+        #   @np_orders)へ移行。np_atobarai 限定は scope override で適用済みなので、ビュー(@orders/@search 前提)
+        #   向けに @collection を @orders へエイリアスする。
+        @orders = @collection
+      end
+
+      def csv_export
+        send_data SpreeNpAtobarai::OrderCSVService.new(params[:order_ids]).to_csv,
+                         filename: "orders-#{Time.current.strftime('%Y%m%d%H%M%S')}.csv",
+                         type: "text/csv",
+                         disposition: "attachment"
+      end
+
+      private
+
+      def scope
+        # Spree 5.3 追従: collection(ransack/ページネーション)の基盤 scope に np_atobarai 限定を適用する。
+        #   本家 OrdersController#scope は index 時に .complete を付けるため、それに合わせる。
+        current_store.orders.accessible_by(current_ability, :index).complete.np_atobarai_orders
+      end
+
+      def model_class
+        Spree::Order
+      end
+    end
+  end
+end

data/app/controllers/spree_np_atobarai/checkout_controller_decorator.rb

@@ -0,0 +1,26 @@
+module SpreeNpAtobarai
+  module CheckoutControllerDecorator
+    def self.prepended(base)
+      base.before_action :validate_invoice_method_for_np_atobarai, only: [ :update ], if: -> { params[:state] == 'payment' }
+    end
+
+    private
+
+    def validate_invoice_method_for_np_atobarai
+      payments_attribute = params.dig(:order, :payments_attributes)&.last
+      return if payments_attribute.blank?
+
+      payment_method_id = payments_attribute[:payment_method_id]
+      invoice_sending = payments_attribute[:invoice_sending]
+
+      payment = Spree::Payment.new(payment_method_id: payment_method_id, invoice_sending: invoice_sending)
+      payment.valid?
+      return if payment.errors[:invoice_sending].blank?
+
+      flash[:error] = Spree.t('please_select_invoice_sending_method')
+      redirect_to(checkout_state_path(@order.token, @order.state))
+    end
+  end
+end
+
+Spree::CheckoutController.prepend SpreeNpAtobarai::CheckoutControllerDecorator

data/app/models/spree/payment_method/np_atobarai.rb

@@ -0,0 +1,94 @@
+class Spree::PaymentMethod::NpAtobarai < Spree::PaymentMethod
+  INVOICE_SENDING_OPTIONS = [ :postal, :email ]
+
+  preference :np_atobarai_fee, :float, default: 330
+  preference :np_atobarai_no_fee_same_month, :boolean, default: true
+  preference :tax_category_id, :integer
+
+  def actions
+    %w[capture void]
+  end
+
+  # Indicates whether its possible to capture the payment
+  def can_capture?(payment)
+    [ 'checkout', 'pending' ].include?(payment.state)
+  end
+
+  # Indicates whether its possible to void the payment.
+  def can_void?(payment)
+    payment.state != 'void'
+  end
+
+  def custom_form_fields_partial_name
+    'np_atobarai_form_fields'
+  end
+
+  def capture(*)
+    ActiveMerchant::Billing::Response.new(true, "", {}, {})
+  end
+
+  def cancel(*)
+    ActiveMerchant::Billing::Response.new(true, "", {}, {})
+  end
+
+  def void(*)
+    ActiveMerchant::Billing::Response.new(true, "", {}, {})
+  end
+
+  def source_required?
+    false
+  end
+
+  def np_atobarai_fee_adjustment_applicable?(order, payment)
+    return false if preferred_np_atobarai_fee.blank? || order.blank? || payment&.invoice_sending_email?
+
+    return true if preferred_np_atobarai_no_fee_same_month.blank?
+
+    !has_np_atobarai_orders_this_month?(order.billing_address&.phone)
+  end
+
+  def create_np_atobarai_fee_adjustment!(order)
+    adjustment = order.adjustments.new
+    adjustment.source = self
+    adjustment.order = order
+    adjustment.amount = preferred_np_atobarai_fee
+    adjustment.label = np_atobarai_fee_label
+    adjustment.save!
+    adjustment
+  end
+
+  class << self
+    def destroy_np_atobarai_adjustments(order)
+      order.adjustments.where(label: np_atobarai_fee_label).destroy_all
+    end
+
+    def np_atobarai_fee_label
+      Spree.t('np_atobarai_fee_adjustment')
+    end
+
+    def invoice_sending_options
+      Spree::Payment.invoice_sendings.slice(*INVOICE_SENDING_OPTIONS)
+    end
+  end
+
+  delegate :np_atobarai_fee_label, to: :class
+
+  private
+
+  def has_np_atobarai_orders_this_month?(phone_number)
+    return false if phone_number.blank?
+
+    start_of_month = Time.current.beginning_of_month
+    end_of_month = Time.current.end_of_month
+    payment_method_ids = Spree::PaymentMethod::NpAtobarai.ids
+    return false if payment_method_ids.blank?
+
+    Spree::Order.complete
+                .where(state: 'complete')
+                .completed_between(start_of_month, end_of_month)
+                .joins(:bill_address, :payments)
+                .where("REPLACE(spree_addresses.phone, '-', '') = ?", phone_number.delete('-'))
+                .where(spree_payments: { payment_method_id: payment_method_ids, invoice_sending: Spree::Payment.invoice_sendings[:postal] })
+                .merge(Spree::Payment.valid).exists?
+  end
+end

data/app/models/spree_np_atobarai/order_decorator.rb

@@ -0,0 +1,114 @@
+module SpreeNpAtobarai
+  module OrderDecorator
+    def self.prepended(base)
+      base.set_callback :updating_from_params, :before, :adjust_np_atobarai_fee, prepend: true
+      base.set_callback :updating_from_params, :after, :update_np_atobarai_invoice_sending, prepend: true
+
+      base.scope :np_atobarai_orders, -> {
+        joins(:payments)
+          .where(spree_payments: { payment_method_id: Spree::PaymentMethod::NpAtobarai.ids })
+          .merge(Spree::Payment.unscoped.valid).distinct
+      }
+    end
+
+    def human_invoice_sending_name
+      payments.last&.human_invoice_sending_name
+    end
+
+    def np_atobarai_order?
+      Spree::Order.np_atobarai_orders.exists?(id: id)
+    end
+
+    private
+
+    def adjust_np_atobarai_fee
+      return if payments_attributes.blank?
+
+      destroy_np_atobarai_adjustments
+      payment_method = find_np_atobarai_payment_method
+      create_np_atobarai_fee_adjustment!(payment_method)
+      updater.update
+    end
+
+    def find_np_atobarai_payment_method
+      payment_method_ids = payments_attributes.pluck('payment_method_id')
+      # Spree 5.3 で Order#available_payment_methods は deprecated になり、かつ gem 内部で
+      # collect_payment_methods(store) を arity 0 のメソッドへ 1 引数で呼ぶ不整合があるため
+      # ArgumentError (wrong number of arguments given 1 expected 0) で必ず落ちる。
+      # 5.3 推奨の collect_frontend_payment_methods(配列を返す)へ置き換える。
+      available_method_ids = collect_frontend_payment_methods.map(&:id)
+
+      Spree::PaymentMethod
+        .where(id: payment_method_ids)
+        .where(id: available_method_ids)
+        .find_by(type: 'Spree::PaymentMethod::NpAtobarai')
+    end
+
+    def destroy_np_atobarai_adjustments
+      Spree::PaymentMethod::NpAtobarai.destroy_np_atobarai_adjustments(self)
+    end
+
+    def create_np_atobarai_fee_adjustment!(payment_method)
+      return if payment_method.blank?
+
+      # payments_attributesからinvoice_sendingを取得
+      invoice_sending = payments_attributes.dig(0, 'invoice_sending')
+
+      # メール送付の場合は手数料なし
+      return if invoice_sending == 'email'
+
+      # 郵送の場合、または未指定の場合に手数料を追加
+      # 同月内の既存注文チェックは、np_atobarai_fee_adjustment_applicableで行われる
+      return if preferred_np_atobarai_no_fee_same_month && has_np_atobarai_orders_this_month?(billing_address&.phone)
+
+      payment_method.create_np_atobarai_fee_adjustment!(self)
+    end
+
+    def has_np_atobarai_orders_this_month?(phone_number)
+      return false if phone_number.blank?
+
+      start_of_month = Time.current.beginning_of_month
+      end_of_month = Time.current.end_of_month
+      payment_method_ids = Spree::PaymentMethod::NpAtobarai.ids
+      return false if payment_method_ids.blank?
+
+      Spree::Order.complete
+                  .where(state: 'complete')
+                  .completed_between(start_of_month, end_of_month)
+                  .joins(:bill_address, :payments)
+                  .where("REPLACE(spree_addresses.phone, '-', '') = ?", phone_number.delete('-'))
+                  .where(spree_payments: { payment_method_id: payment_method_ids, invoice_sending: Spree::Payment.invoice_sendings[:postal] })
+                  .merge(Spree::Payment.valid).exists?
+    end
+
+    def preferred_np_atobarai_no_fee_same_month
+      payment_method = find_np_atobarai_payment_method
+      payment_method&.preferred_np_atobarai_no_fee_same_month
+    end
+
+    def update_np_atobarai_invoice_sending
+      return if payments_attributes.blank?
+
+      payment_method = find_np_atobarai_payment_method
+      return if payment_method.blank?
+
+      invoice_sending = payments_attributes.dig(0, 'invoice_sending')
+      return if invoice_sending.blank?
+
+      payment = payments.where(payment_method_id: payment_method.id).where.not(state: Spree::Payment::INVALID_STATES).last
+      return if payment.blank?
+
+      payment.update_columns(invoice_sending: invoice_sending) if payment.invoice_sending != invoice_sending
+    end
+
+    # ba_spree_cash_on_delivery の同名 private メソッドと実装が同一。engine ごとにモジュールを
+    # 分離した結果、両方が Spree::Order の ancestors に載り外側だけが呼ばれるが、実装が同じなので
+    # どちらが外側でも挙動は変わらない。
+    # @see https://github.com/be-agile/giga-repeat/issues/1307
+    def payments_attributes
+      @updating_params&.dig('order', 'payments_attributes') || []
+    end
+  end
+end
+
+Spree::Order.prepend SpreeNpAtobarai::OrderDecorator

data/app/models/spree_np_atobarai/payment_decorator.rb

@@ -0,0 +1,23 @@
+module SpreeNpAtobarai
+  module PaymentDecorator
+    def self.prepended(base)
+      base.attribute :invoice_sending, :string
+      base.enum :invoice_sending, { postal: 'postal', email: 'email' }, prefix: :invoice_sending
+
+      base.validates :invoice_sending, presence: true,
+                                       if: ->(payment) { payment.payment_method.is_a?(Spree::PaymentMethod::NpAtobarai) }
+
+      base.define_singleton_method(:human_invoice_sending_name) do |invoice_sending_type|
+        return if invoice_sending_type.blank?
+
+        I18n.t("activerecord.attributes.spree/payment.invoice_sendings.#{invoice_sending_type}")
+      end
+    end
+
+    def human_invoice_sending_name
+      self.class.human_invoice_sending_name(invoice_sending)
+    end
+  end
+end
+
+Spree::Payment.prepend(SpreeNpAtobarai::PaymentDecorator) unless Spree::Payment.included_modules.include?(SpreeNpAtobarai::PaymentDecorator)

data/app/overrides/add_invoice_sending_method_to_account_orders.rb

@@ -0,0 +1,27 @@
+# This Deface override adds a new column for "Invoice Sending Method"
+# to the orders table on the `account/orders` page.
+Deface::Override.new(
+  virtual_path: 'spree/account/_orders',
+  name: 'add_invoice_sending_method_to_account_orders',
+  insert_after: 'table tr > th:nth-of-type(2)',
+  text: <<-ERB
+    <% if @orders.np_atobarai_orders.any? %>
+      <th class="font-normal px-4">
+        <%= Spree::Payment.human_attribute_name :invoice_sending %>
+      </th>
+    <% end %>
+  ERB
+)
+
+Deface::Override.new(
+  virtual_path: 'spree/account/_order',
+  name: 'add_invoice_sending_method_to_account_orders_rows',
+  insert_after: 'tr > td:nth-of-type(2)',
+  text: <<-ERB
+    <% if @orders.np_atobarai_orders.any? %>
+      <td class="md:w-auto pr-2 md:px-4 md:border-y border-accent">
+        <%= order.human_invoice_sending_name %>
+      </td>
+    <% end %>
+  ERB
+)

data/app/overrides/add_invoice_sending_method_to_checkout_summary.rb

@@ -0,0 +1,13 @@
+Deface::Override.new(
+  virtual_path: 'spree/checkout/_summary',
+  name: 'add_invoice_sending_method_to_checkout_summary',
+  insert_top: "div[data-hook='order_summary']",
+  text: <<-ERB
+    <% if (order.confirm? || order.complete?) && order.np_atobarai_order? %>
+      <div class="flex justify-between items-center mb-2">
+        <span><%= Spree::Payment.human_attribute_name :invoice_sending %>:</span>
+        <span><%= order.human_invoice_sending_name %></span>
+      </div>
+    <% end %>
+  ERB
+)

data/app/overrides/add_invoice_sending_method_to_payment.rb

@@ -0,0 +1,11 @@
+Deface::Override.new(
+  virtual_path: 'spree/admin/payments/_payment',
+  name: 'add_invoice_sending_method_to_payment',
+  insert_after: "strong:contains('payment_method_name(payment)')",
+  text: <<-HTML
+    <% if payment.payment_method.is_a?(Spree::PaymentMethod::NpAtobarai) && payment.invoice_sending.present? %>
+      <p class="mb-1 mt-2"><%= Spree::Payment.human_attribute_name :invoice_sending %>:</p>
+      <strong><%= payment.human_invoice_sending_name %></strong>
+    <% end %>
+  HTML
+)

data/app/overrides/add_invoice_sending_method_to_purchased_items_table.rb

@@ -0,0 +1,22 @@
+Deface::Override.new(
+  virtual_path: 'spree/shared/_purchased_items_table',
+  name: 'add_invoice_sending_method_to_purchased_items_table',
+  insert_before: "erb[loud]:contains('spree/shared/purchased_items_table/total')",
+  text: <<-HTML
+    <% if order.np_atobarai_order? %>
+      <tr>
+        <td></td>
+        <td>
+          <p class="f-fallback purchase_total purchase_total--label">
+            <%= Spree::Payment.human_attribute_name :invoice_sending %>:
+          </p>
+        </td>
+        <td class="purchase_total-col">
+          <p class="f-fallback purchase_total">
+            <%= order.human_invoice_sending_name %>
+          </p>
+        </td>
+      </tr>
+    <% end %>
+  HTML
+)

data/app/overrides/hide_preference_fields_for_payment_method_np_atobarai.rb

@@ -0,0 +1,10 @@
+Deface::Override.new(
+  virtual_path: 'spree/admin/payment_methods/_form',
+  name: 'hide_preference_fields_for_payment_method_np_atobarai',
+  replace: "erb[loud]:contains('preference_fields(@object, f)')",
+  text: <<-HTML
+    <% unless @object.is_a?(Spree::PaymentMethod::NpAtobarai) %>
+      <%= preference_fields(@object, f) unless preference_fields(@object, f).empty? %>
+    <% end %>
+  HTML
+)

data/app/overrides/set_orders_active_for_np_orders.rb

@@ -0,0 +1,10 @@
+Deface::Override.new(
+  virtual_path: 'spree/admin/shared/sidebar/_orders_nav',
+  name: 'set_orders_active_for_np_orders',
+  insert_after: "erb[silent]:contains('orders_active =')",
+  text: <<-ERB
+    <% if controller_name == 'np_orders' %>
+      <% orders_active = true %>
+    <% end %>
+  ERB
+)

data/app/services/spree_np_atobarai/order_csv_service.rb

@@ -0,0 +1,123 @@
+module SpreeNpAtobarai
+  class OrderCSVService
+    CSV_HEADER = [
+      "加盟店取引ID", "加盟店取引受注日", "企業名", "部署名", "担当者名", "購入企業ID",
+      "郵便番号", "住所", "電話番号１", "電話番号２",
+      "メールアドレス（To）", "メールアドレス（Cc）１", "メールアドレス（Cc）２", "メールアドレス（Cc）３", "メールアドレス（Cc）４",
+      "配送先企業名", "配送先部署名", "配送先担当者名", "配送先担当者名（カナ）",
+      "配送先郵便番号", "配送先住所", "配送先電話番号",
+      "決済方法", "FAX番号", "請求書送付方法", "コンビニ払い設定",
+      "取引金額", "明細", "元加盟店取引受注日", "単価", "数量", "金額", "NP購入企業ID", "請求書税区分"
+    ].freeze
+
+    def initialize(order_ids)
+      @order_ids = order_ids.map(&:to_i)
+      @orders = Spree::Order.where(id: order_ids).includes(:line_items, :adjustments, :ship_address, :bill_address, payments: :payment_method)
+    end
+
+    def to_csv
+      options = {
+        encoding: "Shift_JIS",
+        undef: :replace,  # 未定義文字を置換
+        replace: '?',     # 未定義文字の置換文字
+        invalid: :replace # 不正なバイトシーケンスを置換
+      }
+      CSV.generate do |csv|
+        csv << CSV_HEADER
+
+        @order_ids.each do |id|
+          order = @orders.find { |o| o.id == id }
+          next unless order
+
+          rows = build_order_rows(order)
+          rows.each { |row| csv << row }
+        end
+      end.encode("Shift_JIS", **options)
+    end
+
+    private
+
+    def build_order_rows(order)
+      detail_rows = build_detail_rows(order)
+      rows = []
+
+      # Row 1: full info + first detail row
+      rows << build_main_row(order, detail_rows.shift)
+
+      # From row 2 onwards: add detail rows with nil values for the first 27 columns
+      detail_rows.each do |detail_row|
+        base = Array.new(27, nil)
+        rows << base + detail_row + [ nil, nil ]
+      end
+
+      rows
+    end
+
+    def build_main_row(order, detail_row)
+      bill = order.bill_address
+      ship = order.ship_address
+      same_address = bill == ship
+
+      [
+        order.number,
+        order.created_at.strftime('%Y/%m/%d'), # Format to YYYY/MM/DD
+        bill&.company.presence || "#{bill&.last_name} #{bill&.first_name}",
+        nil, nil, nil,
+        bill&.zipcode,
+        "#{bill&.state&.name}#{bill&.city}#{bill&.address1}#{bill&.address2}",
+        bill&.phone,
+        nil,
+        order.email,
+        nil, nil, nil, nil, # Cc emails
+        (!same_address ? (ship&.company.presence || "#{ship&.last_name} #{ship&.first_name}") : nil),
+        nil, nil, nil,
+        (!same_address ? ship&.zipcode : nil),
+        (!same_address ? "#{ship&.state&.name}#{ship&.city}#{ship&.address1}#{ship&.address2}" : nil),
+        (!same_address ? ship&.phone : nil),
+        2,
+        nil,
+        latest_np_payment(order)&.invoice_sending_postal? ? 1 : 2,
+        nil,
+        order.total.to_i
+      ] + detail_row + [ nil, nil ]
+    end
+
+    # Build detail rows for the order
+    # Each detail row contains the following columns:
+    # - 明細
+    # - 元加盟店取引受注日 : always nil
+    # - 単価
+    # - 数量
+    # - 金額
+    def build_detail_rows(order)
+      rows = []
+      set_row = lambda do |name, price, quantity|
+        rows << [ name, nil, price.to_i, quantity, price.to_i * quantity ]
+      end
+
+      order.line_items.each do |li|
+        set_row.call(li.product.name, li.price, li.quantity)
+      end
+
+      order.all_adjustments.eligible.where.not(source_type: [ "Spree::TaxRate" ]).each do |adj|
+        amount = adj.amount
+        next if amount == 0
+
+        set_row.call(adj.label, amount, 1)
+      end
+
+      if order.shipment_total.to_i > 0
+        set_row.call("送料", order.shipment_total, 1)
+      end
+
+      rows
+    end
+
+    def latest_np_payment(order)
+      order.payments.valid
+           .joins(:payment_method)
+           .where(spree_payment_methods: { type: "Spree::PaymentMethod::NpAtobarai" })
+           .last
+    end
+  end
+end

data/app/views/spree/admin/np_orders/index.html.erb

@@ -0,0 +1,29 @@
+<% content_for :page_title do %>
+  <% if controller_name == 'checkouts' %>
+    <%= Spree.t(:draft_orders) %>
+  <% else %>
+    <%= Spree.t(:orders) %>
+  <% end %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_to Spree.t("admin.np_atobarai.btns.btn_export"), csv_export_admin_np_orders_path, 
+      method: :post, 
+      params: { order_ids: @orders.map(&:id) }, 
+      class: "btn btn-primary",
+      data: { turbo: false } %>
+<% end %>
+
+<div class="card-lg np-orders-container">
+  <%= render 'spree/admin/orders/filters' %>
+  <%= render 'spree_np_atobarai/admin/np_orders/list' %>
+</div>
+
+<script>
+  document.addEventListener("turbo:load", function() {
+    const form = document.querySelector(".np-orders-container form.filter-wrap")
+    if (form) {
+      form.removeAttribute("action")
+    }
+  })
+</script>

data/app/views/spree/admin/payment_methods/custom_form_fields/_np_atobarai_form_fields.html.erb

@@ -0,0 +1,32 @@
+<div class="form-group">
+  <%= f.label :preferred_np_atobarai_fee, Spree.t('np_atobarai.fee_label') %>
+  <%= f.text_field :preferred_np_atobarai_fee, class: 'form-control' %>
+  <span class="text-muted form-text mt-2">
+    <%= Spree.t('np_atobarai.fee_hint') %>
+  </span>
+</div>
+
+<div class="form-group">
+  <div class="custom-control custom-checkbox">
+    <%= f.check_box :preferred_np_atobarai_no_fee_same_month, class: 'custom-control-input' %>
+    <%= f.label :preferred_np_atobarai_no_fee_same_month, Spree.t('np_atobarai.no_fee_same_month_label'), class: 'custom-control-label' %>
+  </div>
+  <span class="text-muted form-text mt-2">
+    <%= Spree.t('np_atobarai.no_fee_same_month_hint') %>
+  </span>
+</div>
+
+<div class="form-group">
+  <%= f.label :preferred_tax_category_id, Spree.t(:tax_category) %>
+  <%= f.collection_select(
+    :preferred_tax_category_id,
+    Spree::TaxCategory.all,
+    :id,
+    :name,
+    { include_blank: Spree.t(:none) },
+    { class: 'custom-select' }
+  ) %>
+  <span class="text-muted form-text mt-2">
+    内税計算を適用する税カテゴリーを選択してください
+  </span>
+</div>

data/app/views/spree/checkout/payment/_npatobarai.html.erb

@@ -0,0 +1,12 @@
+<% current_payment = @order.payments.last %>
+
+<%= render 'spree_np_atobarai/np_atobarai_invoice_options', current_payment: current_payment, payment_method: payment_method, order: @order %>
+
+<div class="payment-NpAtobarai">
+  <p><%= Spree.t('storefront.checkout.np_atobarai.description').html_safe %></p>
+  <% if payment_method&.np_atobarai_fee_adjustment_applicable?(@order, current_payment) %>
+    <p>
+      <strong><%= Spree.t('storefront.checkout.np_atobarai.extra', extra: Spree::Money.new(payment_method.preferred_np_atobarai_fee).to_s) %></strong>
+    </p>
+  <% end %>
+</div>