ba_spree 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 928297a415af2201eeb6d7efb51208009e83031c1fe49479353638547b476580
-  data.tar.gz: 5c4596bb2a8ffd0de972ebde989ab76d06b257565bd786c12d0982508e51dcd6
+  metadata.gz: 82aeb70ed5e30afcc4c5849eb6daf41f9a311b649e9e3f86adb0ff519feee6c9
+  data.tar.gz: 771f95d599301938053a772c997baca793f9237451568b1072ed127be2770f17
 SHA512:
-  metadata.gz: 327f8c3028bcbc0009959ef3c2d263e26e2303defd268fef9f7b5a62a62bdfc2d411cea9fb5d20862fd5ebc222e9fea9cac4071656ccf9a9dcbc89b27d8f704b
-  data.tar.gz: d8585120e0e45e573af880c6eff9e2e4fe7ed9f283bf9033b795dbe0182a89f7968c89ee0ad977b7d812ead9164fc2a575d94ad2c9e614121d78b58f0e6607f6
+  metadata.gz: 1e15809db814b48a2211a17dce5ac0e3e2fcd6dd40aaf0dcf0d7a96f0c43664a71eb33ff718eded86546cef5a6384706a35bc0a2c1361eea5219e12c178720c2
+  data.tar.gz: 0a2c180bdf9a3e648affd0f56fe915f87a8ee7c2b790e30d04a80298fbfc52c4f907a511d30ecd0283330bc96e953abad0be333a0625d65e54263bcefa91b75f

data/app/controllers/ba_spree/checkout_controller_decorator.rb

@@ -2,6 +2,7 @@ module BaSpree
   module CheckoutControllerDecorator
     def self.prepended(base)
       base.before_action :filter_bill_address_when_use_shipping, only: [ :update ], if: -> { params[:state] == 'payment' }
+      base.before_action :ensure_line_item_prices_current, only: [ :edit, :update ]
     end
 
     protected
@@ -94,6 +95,20 @@ module BaSpree
       end
     end
 
+    # チェックアウトを放置している間に商品価格が変わっていたら、住所入力からやり直させる。
+    # address から次へ進むときに Spree が明細価格を再計算し、続く配送・支払ステップで
+    # 送料・税・支払金額が現在価格で作り直される。
+    # @see https://github.com/be-agile/giga-repeat/issues/1392
+    def ensure_line_item_prices_current
+      # 価格の再計算が走るのは address から次へ進むときだけなので、それより後の state だけ判定する
+      return unless %w[delivery payment confirm].include?(@order.state)
+      return unless @order.line_item_prices_stale?
+
+      @order.restart_checkout_flow
+      flash[:error] = Spree.t(:line_item_prices_changed)
+      redirect_to spree.checkout_state_path(@order.token, 'address')
+    end
+
     def filter_bill_address_when_use_shipping
       return unless params[:order]&.dig(:bill_address_attributes)
 

data/app/helpers/spree/base_helper_decorator.rb

@@ -32,14 +32,8 @@ module Spree
     class ChildTaxonsSection < SimpleDelegator
       def cache_key
         child_taxon_ids = links.map(&:linkable_id)
-        max_updated_at = links.filter_map(&:linkable).map(&:updated_at).max.to_i
-        "spree/page_sections/child_taxons/#{child_taxon_ids.join('-')}-#{max_updated_at}"
-      end
-
-      # ActiveSupport::Cache は cache_key より先にこちらを見るため、
-      # 委譲先の実装が使われないよう合わせて上書きする
-      def cache_key_with_version
-        cache_key
+        max_updated_at = links.map(&:linkable).map(&:updated_at).max.to_i
+        "#{child_taxon_ids.join('-')}-#{max_updated_at}"
       end
     end
 

data/app/models/ba_spree/line_item_decorator.rb

@@ -0,0 +1,14 @@
+module BaSpree
+  module LineItemDecorator
+    # 注文に写し取った price が、現在の販売価格(Spree::LineItem#update_price と同じ計算)とずれているか。
+    # 価格の再計算は address から次へ進むときにしか走らないため、チェックアウトを長期間放置した注文で
+    # 商品価格(予約割引の終了・価格改定)が変わったことを検知するのに使う。
+    # @see https://github.com/be-agile/giga-repeat/issues/1392
+    def price_stale?
+      context = Spree::Pricing::Context.from_order(variant, order, quantity: quantity)
+      variant.price_for(context).price_including_vat_for(tax_zone: tax_zone) != price
+    end
+  end
+end
+
+Spree::LineItem.prepend(BaSpree::LineItemDecorator)

data/app/models/ba_spree/order_decorator.rb

@@ -89,6 +89,12 @@ module BaSpree
       # （cancel! 内の after_cancel が 'order.canceled' を publish 済みなので、ここは update のみ）
       publish_event('order.updated')
     end
+
+    # 現在の販売価格とずれている明細が1つでもあるか
+    # @see https://github.com/be-agile/giga-repeat/issues/1392
+    def line_item_prices_stale?
+      line_items.any?(&:price_stale?)
+    end
   end
 end
 

data/app/overrides/keep_bill_address_form_open_on_error.rb

@@ -0,0 +1,13 @@
+# payment 画面で請求先住所(bill_address)を新規入力して送信し、バリデーションで差し戻された
+# とき、本家は bill_address が new_record? のため「配送先と同じ(use_shipping)」を再びチェック
+# 済みにし、入力したフォームを hidden に戻してしまう。入力欄の直下に出したエラーも一緒に
+# 隠れて、何が悪かったのか分からなくなる。
+#
+# 請求先住所にエラーがあるときは use_shipping を外し、フォームを開いたままにする。
+# @see https://github.com/be-agile/giga-repeat/issues/1397
+Deface::Override.new(
+  virtual_path: 'spree/checkout/_payment',
+  name: 'keep_bill_address_form_open_on_error',
+  replace: "erb[silent]:contains('use_shipping = ')",
+  text: "<% use_shipping = (@order.shipping_eq_billing_address? || @order.bill_address.nil? || @order.bill_address.new_record?) && @order.requires_ship_address? && (@order.bill_address.nil? || @order.bill_address.errors.empty?) %>"
+)

data/config/locales/en.yml

@@ -1,5 +1,6 @@
 en:
   spree:
+    line_item_prices_changed: Some item prices have changed. Please review your order and proceed again.
     promotions: Promotions
     confirm_order: Confirm Order
     continue_without_logging_in: Continue without logging in

data/config/locales/ja.yml

@@ -1,5 +1,6 @@
 ja:
   spree:
+    line_item_prices_changed: 商品の価格が変更されたため、注文内容をご確認のうえ再度お手続きください
     promotions: 販売促進
     confirm_order: 注文を確定する
     continue_without_logging_in: ログインせずに続ける

data/lib/ba_spree/version.rb

@@ -1,3 +1,3 @@
 module BaSpree
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/ba_spree.rb

@@ -16,5 +16,25 @@ require 'spree_materials'
 # Spree::Calculator::FlatPercentOrderTotal を参照する。
 # @see https://github.com/be-agile/giga-repeat/issues/1307
 require 'spree_order_total_discount'
+# @see https://github.com/be-agile/giga-repeat/issues/1400
+require 'spree_common_shipping_method_splitter'
 require 'ba_spree/engine'
 require 'ba_spree/version'
+
+module BaSpree
+  # ba_spree が束ねる engine の gem 名(ba_spree.gemspec の記載順)。
+  # 依存のうち be-agile org で公開している gem を engine とみなし、spree 本体や deface は除く。
+  def self.bundled_engine_names
+    Gem.loaded_specs.fetch('ba_spree').runtime_dependencies.map(&:name).select do |name|
+      Gem.loaded_specs[name]&.homepage&.start_with?('https://github.com/be-agile/')
+    end
+  end
+end
+
+# ba_spree.gemspec が依存する engine を、gemspec の記載順ですべて require する(上で require 済みのものは何も起きない)。
+# Bundler.require は Gemfile に書かれた gem しか require しないため、`gem "ba_spree"` だけを書いた利用者の環境では
+# ここで require しないと engine として登録されない。ba_spree より後にロードするので decorator は ba_spree の外側に重なる。
+# giga-repeat でも Gemfile.basic の先頭の ba_spree がここで全て require するため、本番の engine のロード順も
+# gemspec の記載順で決まる。engine の一覧を gemspec だけに持ち、ここや Gemfile との二重管理を避ける。
+# @see https://github.com/be-agile/giga-repeat/issues/1403
+BaSpree.bundled_engine_names.each { |name| require name }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ba_spree
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.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
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_address_format_i18n
+  name: ba_spree_loyalty_points
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_zip_autocomplete
+  name: spree_materials
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ba_spree_bank_transfer
+  name: spree_order_total_discount
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ba_spree_cash_on_delivery
+  name: ba_spree_google_analytics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_np_atobarai
+  name: spree_yahoo_ads
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_gmo_pg
+  name: spree_products_payment_methods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_direct_debit
+  name: ba_spree_cash_on_delivery
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_custom_email
+  name: ba_spree_related_products
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ba_spree_loyalty_points
+  name: spree_np_atobarai
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_materials
+  name: spree_direct_debit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_order_total_discount
+  name: spree_zip_autocomplete
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ba_spree_related_products
+  name: spree_address_format_i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +263,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_products_payment_methods
+  name: spree_custom_email
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ba_spree_bank_transfer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -361,7 +375,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ba_spree_google_analytics
+  name: spree_gmo_pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -375,7 +389,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spree_yahoo_ads
+  name: spree_common_shipping_method_splitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -443,6 +457,7 @@ files:
 - app/javascript/spree/admin/controllers/slug_form_controller.js
 - app/models/ba_spree/address_decorator.rb
 - app/models/ba_spree/adjustment_decorator.rb
+- app/models/ba_spree/line_item_decorator.rb
 - app/models/ba_spree/order_decorator.rb
 - app/models/ba_spree/order_updater_decorator.rb
 - app/models/ba_spree/payment_method_decorator.rb
@@ -490,6 +505,7 @@ files:
 - app/overrides/fix_coupon_apply_button_layout.rb
 - app/overrides/hide_gift_cards_and_store_credits_from_account_nav.rb
 - app/overrides/hide_shipping_message_for_digital_only_orders.rb
+- app/overrides/keep_bill_address_form_open_on_error.rb
 - app/overrides/localize_apply_button_text.rb
 - app/overrides/localize_newsletter_button_text.rb
 - app/overrides/replace_announcement_bar_text.rb