spree_address_format_i18n 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76657c24fe75eeb3cdab63a6b4f33037641af4991301006dfa95c1c2fa93106a
-  data.tar.gz: 4fcdcd7d057309512b4a75acdd559cea323a4b9edf8bf0aebd96cbc1aaf3b207
+  metadata.gz: fe05594137f4e266415994c41802623185b224482a10060db4ed94732c6fafbd
+  data.tar.gz: edb6bceca9d561083f43481be33570bbc83b774a1b3886b564d68553c102e47a
 SHA512:
-  metadata.gz: c52d39a726183870533476554c009fc480e17aa539bfec3e945ead8a09b6f7328662ea410a2d8696c3cef777efaf021b08b17898fae21812fc7afccf5d2ae763
-  data.tar.gz: e584eba778c53eb5db4196e0eefb2fdc1369eb84ebf4f4e5209cf2a777a877705989cf2ba511286f11cb62fc5fb5eb1d1899e62247a19e0fc78f9394f2c0b408
+  metadata.gz: 2194c8c9a7f3e6d587878ee2dbc5300f65bc48b4a7c71eaaad8c84659a059d3535df4768abd7684beb1cff83932731c5358cdaf5afe23451f47d10764da8e739
+  data.tar.gz: ac88ba2170c5467d3bfe93cbbdaa2b92e1fce50255eae6561cb96a37178ded5503b405c63ad1e85a52d14d7ddba7cbe29fd16696776fb59eb1de537f9e31e6f0

data/app/helpers/spree/addresses_helper_decorator.rb

@@ -3,6 +3,42 @@ module Spree
     # List of kana fields that should not be excluded even when `store.use_kana_fields` is false.
     IGNORED_KANA_FIELDS = [ :company_kana ]
 
+    # @gem-override spree_core-5.3.6/app/helpers/spree/addresses_helper.rb#address_field
+    # @see https://github.com/be-agile/giga-repeat/issues/1397
+    # 本家を super で呼び、入力欄の直下にその欄のエラーを足し、placeholder を入力例にする
+    # (引数リストは本家のシグネチャに依存する)。本家はエラーをページ最上部の一覧にしか
+    # 出さないため、入力欄から遠くて気づかれない。
+    def address_field(form, method, address_id = 'b', required = false, text_field_attributes: {}, &handler)
+      label = I18n.t("activerecord.attributes.spree/address.#{method}")
+      field = super(form, method, address_id, required, text_field_attributes: text_field_attributes.merge(placeholder: address_placeholder(method, label)), &handler)
+      field + address_field_errors(form, method)
+    end
+
+    # @gem-override spree_core-5.3.6/app/helpers/spree/addresses_helper.rb#address_zipcode
+    # @see https://github.com/be-agile/giga-repeat/issues/1397
+    # placeholder を入力例にする以外は本家のまま。
+    def address_zipcode(form, country, address_id = 'b')
+      method_name = Spree.t(:zipcode)
+      form.label(:zipcode, method_name, id: address_id + '_zipcode_label', class: 'block text-xs text-neutral-600 mb-1') +
+      form.text_field(:zipcode,
+                      class: 'text-input',
+                      placeholder: address_placeholder(:zipcode, method_name),
+                      required: country&.zipcode_required?,
+                      data: { 'address-form-target': 'zipcode', address_autocomplete_target: 'zipcode' },
+                      aria: { label: Spree.t(:zipcode) })
+    end
+
+    # 入力例(spree.address_placeholders.*)が無いロケール・欄では、本家と同じくラベル名を使う。
+    def address_placeholder(method, label)
+      I18n.t("spree.address_placeholders.#{method}", default: label)
+    end
+
+    def address_field_errors(form, method)
+      safe_join(form.object.errors.full_messages_for(method).map do |message|
+        content_tag(:p, message, class: 'text-red-500 text-xs mt-1')
+      end)
+    end
+
     def order_address_fields(store)
       name_order = I18n.t('address_format_i18n.fields')
       return Spree::Address::ADDRESS_FIELDS if name_order.blank?

data/app/models/spree_address_format_i18n/address_decorator.rb

@@ -27,7 +27,7 @@ module SpreeAddressFormatI18n
       base.validates :firstname_kana, presence: true, if: -> { kana_presence_required.call(self, :firstname_kana) }
       base.validates :firstname_kana, format: { with: /\A[\p{Katakana}\p{Blank}ー・]+\z/, allow_blank: true, message: :invalid_katakana }, if: -> { Spree::Store.current.use_kana_fields }
 
-      base.validates :company_kana, format: { with: /\A[\p{Katakana}\p{Blank}ー・]+\z/ }, if: -> { company_kana.present? }
+      base.validates :company_kana, format: { with: /\A[\p{Katakana}\p{Blank}ー・]+\z/, message: :invalid_katakana }, if: -> { company_kana.present? }
     end
 
 

data/config/locales/ja.yml

@@ -4,6 +4,19 @@ ja:
     firstname_kana: メイ
     fax: FAX
     company_kana: カナ会社名
+    address_placeholders:
+      company: 例）株式会社山田商事
+      company_kana: 例）カブシキガイシャヤマダショウジ
+      lastname: 例）山田
+      firstname: 例）太郎
+      lastname_kana: 例）ヤマダ
+      firstname_kana: 例）タロウ
+      zipcode: 例）150-0001
+      city: 例）渋谷区
+      address1: 例）神宮前1-1-1
+      address2: 例）山田ビル3F
+      phone: 例）03-1234-5678
+      fax: 例）03-1234-5679
     use_kana_fields: "住所にかなフィールドを使用する"
     show_country_field: "住所に国フィールドを表示する"
     address_field_settings: "住所フィールド設定"
@@ -25,3 +38,6 @@ ja:
         firstname_kana: メイ
         company_kana: カナ会社名
         fax: FAX
+  errors:
+    messages:
+      invalid_katakana: は全角カタカナで入力してください（漢字・ひらがな・数字・記号は使えません）

data/lib/spree_address_format_i18n/version.rb

@@ -1,5 +1,5 @@
 module SpreeAddressFormatI18n
-  VERSION = '1.1.0'.freeze  # Increment minor version for new feature
+  VERSION = '1.2.0'.freeze  # Increment minor version for new feature
 
   def gem_version
     Gem::Version.new(VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_address_format_i18n
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - be agile Co., Ltd.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-20 00:00:00.000000000 Z
+date: 2026-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -136,7 +136,6 @@ files:
 - app/.gitkeep
 - app/controllers/.gitkeep
 - app/helpers/spree/addresses_helper_decorator.rb
-- app/helpers/spree/admin/base_helper_decorator.rb
 - app/models/.gitkeep
 - app/models/spree/user_decorator.rb
 - app/models/spree_address_format_i18n/address_decorator.rb
@@ -153,7 +152,6 @@ files:
 - app/views/spree/address_format/_address_field.html.erb
 - app/views/spree/address_format/_address_group.html.erb
 - app/views/spree/addresses/_form.html.erb
-- app/views/spree/admin/shared/_address_form.html.erb
 - app/views/spree/admin/stores/_country_field_settings.html.erb
 - bin/rails
 - config/initializers/spree_permitted_attributes.rb
@@ -164,7 +162,6 @@ files:
 - db/migrate/20250428020947_change_value_country.rb
 - db/migrate/20250505070307_add_company_kana_and_fax_to_spree_addresses.rb
 - lib/generators/spree_address_format_i18n/add_kana_fields_generator.rb
-- lib/generators/spree_address_format_i18n/install/install_generator.rb
 - lib/generators/spree_address_format_i18n/install_generator.rb
 - lib/generators/spree_address_format_i18n/templates/initializer.rb
 - lib/spree_address_format_i18n.rb

data/app/helpers/spree/admin/base_helper_decorator.rb

@@ -1,16 +0,0 @@
-module Spree
-  module Admin
-    module BaseHelperDecorator
-      def order_address_fields(address_fields)
-        name_order = I18n.t('address_format_i18n')
-        return address_fields if name_order.blank?
-
-        Spree::Address::ADDRESS_FIELDS.sort_by do |field|
-          name_order.index(field) || Float::INFINITY
-        end
-      end
-    end
-
-    Spree::Admin::BaseHelper.prepend(BaseHelperDecorator)
-  end
-end

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

@@ -1,45 +0,0 @@
-<% s_or_b = type.chars.first %>
-
-<div id="<%= type %>" data-hook="address_fields">
-  <% order_address_fields(Spree::Address::ADDRESS_FIELDS).each do |field| %>
-    <% if field == "country" %>
-      <%= field_container (s_or_b + '_' + field), nil, class: ["#{type}-row"] do %>
-        <%= f.label :country_id, Spree.t(:country) %>
-        <div id="<%= s_or_b %>country">
-          <%= f.collection_select :country_id, all_countries, :id, :name, {}, { class: 'select2 w-100' } %>
-        </div>
-      <% end %>
-    <% elsif field == "state" %>
-      <%= field_container (s_or_b + '_' + field), :state, class: ["#{type}-row"] do %>
-        <%= f.label :state_id, Spree.t(:state) %>
-        <div id="<%= s_or_b %>state">
-          <% if f.object.country.try(:states) %>
-            <%= f.text_field :state_name,
-                             style: "display: #{f.object.country.try(:states) && f.object.country.states.empty? ? 'block' : 'none' };",
-                             disabled: !(f.object.country.try(:states) && f.object.country.states.empty?), class: 'form-control state_name' %>
-            <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, { class: 'select2 w-100', disabled: f.object.country.states.empty? } %>
-          <% else %>
-            <div>
-              <em><%= Spree.t(:no_country) %></em>
-            </div>
-          <% end %>
-        </div>
-        <%= error_message_on f.object, :state_id %>
-      <% end %>
-    <% else %>
-      <%= field_container (s_or_b + '_' + field), nil, class: ["#{type}-row"] do %>
-        <%= f.label field, Spree.t(field) %>
-        <%= f.text_field field, class: 'form-control' %>
-        <%= error_message_on f.object, field %>
-      <% end %>
-    <% end %>
-  <% end %>
-</div>
-
-<% content_for :head do %>
-  <script>
-    document.addEventListener("spree:load", function() {
-      $('#<%= s_or_b %>country select').on('change', function() { updateAddressState('<%= s_or_b %>'); });
-    })
-  </script>
-<% end %>

data/lib/generators/spree_address_format_i18n/install/install_generator.rb

@@ -1,20 +0,0 @@
-module SpreeAddressFormatI18n
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      class_option :migrate, type: :boolean, default: true
-
-      def add_migrations
-        run 'bundle exec rake railties:install:migrations FROM=spree_address_format_i18n'
-      end
-
-      def run_migrations
-        run_migrations = options[:migrate] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
-        if run_migrations
-          run 'bin/rails db:migrate'
-        else
-          puts 'Skipping rails db:migrate, don\'t forget to run it!'
-        end
-      end
-    end
-  end
-end