Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Ability to pass `email` to `FirstOrder` promotion rule (#12098)
Damian Legawiec18be973ab3cf
diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rbindex 121b2ea771..7c486acd16 100644--- a/core/app/models/spree/promotion.rb+++ b/core/app/models/spree/promotion.rb@@ -128,10 +128,10 @@ module Spreeend# called anytime order.update_with_updater! happens- def eligible?(promotable)+ def eligible?(promotable, options = {})return false if expired? || usage_limit_exceeded?(promotable) || blacklisted?(promotable)- !!eligible_rules(promotable, {})+ !!eligible_rules(promotable, options)end# eligible_rules returns an array of promotion rules where eligible? is true for the promotablediff --git a/core/app/models/spree/promotion/rules/first_order.rb b/core/app/models/spree/promotion/rules/first_order.rbindex 269a800493..a0765bf4f7 100644--- a/core/app/models/spree/promotion/rules/first_order.rb+++ b/core/app/models/spree/promotion/rules/first_order.rb@@ -10,7 +10,12 @@ module Spreedef eligible?(order, options = {})@user = order.try(:user) || options[:user]- @email = order.email+ @email = if options[:email].present?+ order.email = options[:email]+ order.email+ elsif order.email.present?+ order.email+ end@store = order.storeif user || emaildiff --git a/core/app/models/spree/promotion_handler/coupon.rb b/core/app/models/spree/promotion_handler/coupon.rbindex a2093e8e41..d9f7f9cf58 100644--- a/core/app/models/spree/promotion_handler/coupon.rb+++ b/core/app/models/spree/promotion_handler/coupon.rb@@ -1,12 +1,13 @@module Spreemodule PromotionHandlerclass Coupon- attr_reader :order, :store+ attr_reader :order, :store, :optionsattr_accessor :error, :success, :status_code- def initialize(order)+ def initialize(order, options = {})@order = order@store = order.store+ @options = optionsenddef apply