spree_address_format_i18n 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5852477e52069d780efb28d07934018772db5d0caf61e045e4bc27cdeb4ab93b
-  data.tar.gz: 6f7466995355bbb66e42650881c6a1afba4370ee94106912d119f531b0988fb9
+  metadata.gz: fe05594137f4e266415994c41802623185b224482a10060db4ed94732c6fafbd
+  data.tar.gz: edb6bceca9d561083f43481be33570bbc83b774a1b3886b564d68553c102e47a
 SHA512:
-  metadata.gz: 751f86a5837d33781334670e701c31c610223595695c6c192559288861fab213b298a6dc16cc40218629fca741f22312869c6fa98d9492743c72144ffa8e6452
-  data.tar.gz: d5f0cc7c9a785a033340ff9f91d56ecbdd6f9511302b4bd90b6a89fb25ec42510601d62e2628451620604240fe65d1695c20788af40ae7005bcb1eb1f9642fc1
+  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.1'.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.1
+  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