spree_cm_commissioner 2.0.3.pre.pre.pre7 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40333398b1c99d171c10d9a492997548b47564457bebb9acd63e6ccc772d452e
-  data.tar.gz: f63faf26e0692314727b1b7ec1c7b136cc6c524103841b662dca80b2ecf3b1c4
+  metadata.gz: 7bf7248e4cc07ac469eb711e9e0762d4abf4a65c005d10c87e29d1585b801773
+  data.tar.gz: 8505bf10f5484deb73a279db64631f96305c451417f8d0a3d66e7095d259ab58
 SHA512:
-  metadata.gz: 7795b3fb7ceea60d329929f2f2675a9e3732733e2c61405cd269d663f345bffc2d7362e7943e89d2e2051a82d07bfc56beb9f7d8717d8205e96b7db0cc61c4f9
-  data.tar.gz: 657f01f615ed198403d66bb6dfb2f507d0f7c1e4cb5081cf6cc2ba16b968b73214476a09fb4bc930039592150e8d4bb6c64ade0824cae0565a4f6416e4f8ee4d
+  metadata.gz: 64b2c412be4b09ccf25b3e139712259bdf55633ff39512c2aedd69ccb182125ab741951231f159b302cd7caa4d270a1b7f43124bd45abfb0e7f5371d64cdafb6
+  data.tar.gz: 14c96136c77a0a02fd2780484bc0de2ce237018f4e1bc17d34e6415da6873666609acf0895e06e4179cf6b265f61bc49f52f257b87e235e1016ef3d7d06f9c15

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.0.3.pre.pre.pre7)
+    spree_cm_commissioner (2.0.3)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -446,6 +446,7 @@ GEM
     google-cloud-recaptcha_enterprise-v1beta1 (0.10.0)
       gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
+    google-protobuf (3.25.8)
     google-protobuf (3.25.8-x86_64-darwin)
     google-protobuf (3.25.8-x86_64-linux)
     googleapis-common-protos (1.4.0)
@@ -460,6 +461,9 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
+    grpc (1.72.0)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
     grpc (1.72.0-x86_64-darwin)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
@@ -547,6 +551,7 @@ GEM
     method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.4)
     minitest (5.20.0)
     monetize (1.12.0)
       money (~> 6.12)
@@ -564,9 +569,12 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.18.9-x86_64-darwin)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     noticed (1.6.3)
       http (>= 4.0.0)
@@ -922,11 +930,11 @@ GEM
     zeitwerk (2.6.12)
 
 PLATFORMS
+  ruby
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-darwin-21
   x86_64-darwin-22
-  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES

data/app/controllers/spree/api/v2/storefront/guests_controller.rb

@@ -29,7 +29,6 @@ module Spree
             resource = scope.new(guest_params)
 
             if resource.save
-              resource.save_and_move_to_next_stage
               render_serialized_payload(201) { serialize_resource(resource) }
             else
               render_error_payload(resource.errors, 400)
@@ -55,7 +54,6 @@ module Spree
                 resource.save!
               end
 
-              resource.save_and_move_to_next_stage
               render_serialized_payload { serialize_resource(resource) }
             rescue ActiveRecord::RecordInvalid => e
               render_error_payload(e.record.errors, 400)

data/app/controllers/spree_cm_commissioner/admin/products_controller_decorator.rb

@@ -5,7 +5,6 @@ module SpreeCmCommissioner
         # spree update user sign_in_count
         base.around_action :set_writing_role, only: %i[index]
         base.after_action :set_tenant_after_update, only: %i[update]
-        base.before_action :merge_industry_taxons_into_taxons, only: [:update]
       end
 
       # Override
@@ -51,19 +50,6 @@ module SpreeCmCommissioner
 
       protected
 
-      def merge_industry_taxons_into_taxons
-        return if params[:product].blank?
-
-        industry_ids = Array(params[:product][:industry_taxon_ids]).compact_blank
-        taxon_ids = Array(params[:product][:taxon_ids]).compact_blank
-
-        merged_ids = (taxon_ids + industry_ids).uniq
-
-        params[:product][:taxon_ids] = merged_ids
-
-        params[:product].delete(:industry_taxon_ids)
-      end
-
       def find_resource
         product_scope.with_deleted.includes(vendor: :tenant).friendly.find(params[:id])
       end

data/app/interactors/spree_cm_commissioner/create_vendor.rb

@@ -8,7 +8,6 @@ module SpreeCmCommissioner
       ActiveRecord::Base.transaction do
         create_vendor
         assign_vendor_to_user
-        create_logo
         create_role
       end
     end
@@ -31,18 +30,9 @@ module SpreeCmCommissioner
       context.user.vendors << @vendor
     end
 
-    def create_logo
-      return if context.logo.blank?
-
-      vendor_logo = SpreeCmCommissioner::VendorLogo.create(viewable: @vendor, attachment: context.logo)
-      return if vendor_logo.persisted?
-
-      context.fail!(message: vendor_logo.errors.full_messages.join(', '))
-    end
-
     def create_role
       role = context.user.spree_roles.create(
-        name: "#{@vendor.id}-organizer",
+        name: "#{@vendor.name.downcase.parameterize(separator: '-')}-organizer",
         vendor_id: @vendor.id,
         presentation: 'Organizer'
       )

data/app/models/concerns/spree_cm_commissioner/taxon_kind.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5, transit: 6, industry: 7 }
+      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5, transit: 6 }
     end
   end
 end

data/app/models/spree_cm_commissioner/guest.rb

@@ -213,124 +213,75 @@ module SpreeCmCommissioner
       save!
     end
 
-    # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 5 => return 5KM00345
-    # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 2 => return 5KM345
-    def formatted_bib_number
-      return nil if bib_prefix.blank?
-      return nil if bib_number.blank?
-
-      filled_bib_number = bib_number.to_s.rjust(line_item.variant.bib_zerofill.to_i, '0')
+    def missing_dynamic_fields_for_stage(stage)
+      required_fields = line_item.product.dynamic_fields.where(data_fill_stage: stage)
+      filled_ids = guest_dynamic_fields.map(&:dynamic_field_id)
 
-      if bib_display_prefix?
-        "#{bib_prefix}#{filled_bib_number}"
-      else
-        filled_bib_number
-      end
+      required_fields.reject { |field| filled_ids.include?(field.id) }
     end
 
     def all_required_dynamic_fields_completed?(stage)
       missing_dynamic_fields_for_stage(stage).blank?
     end
 
-    state_machine :data_fill_stage_phase, initial: 'pre_registration' do
-      state 'pre_registration', value: 'pre_registration'
-      state 'post_registration', value: 'post_registration'
-      state 'during_check_in', value: 'during_check_in'
-      state 'completed', value: 'completed'
-
-      event :complete_pre_registration do
-        transition 'pre_registration' => 'post_registration',
-                   if: -> (guest) { guest.pre_registration_completed? && guest.post_registration_fields? }
-        transition 'pre_registration' => 'during_check_in',
-                   if: -> (guest) { guest.pre_registration_completed? && !guest.post_registration_fields? && guest.during_check_in_fields? }
-        transition 'pre_registration' => 'completed',
-                   if: -> (guest) { guest.pre_registration_completed? && !guest.post_registration_fields? && !guest.during_check_in_fields? }
-      end
-
-      event :complete_post_registration do
-        transition 'post_registration' => 'during_check_in',
-                   if: -> (guest) { guest.post_registration_completed? && guest.during_check_in_fields? }
-        transition 'post_registration' => 'completed',
-                   if: -> (guest) { guest.post_registration_completed? && !guest.during_check_in_fields? }
-      end
+    def validate_dynamic_fields_for_phase(phase)
+      required_fields = line_item.product.dynamic_fields.where(data_fill_stage: phase)
+      filled_ids = guest_dynamic_fields.map(&:dynamic_field_id)
 
-      event :complete_check_in do
-        transition 'during_check_in' => 'completed',
-                   if: -> (guest) { guest.check_in_completed? }
+      required_fields.each do |field|
+        errors.add(:base, "#{field.label} is required for #{phase} phase") unless filled_ids.include?(field.id)
       end
     end
 
-    def save_and_move_to_next_stage(_transition = nil)
-      # Trigger state machine transitions based on completion status
-      case data_fill_stage_phase
-      when 'pre_registration'
-        complete_pre_registration! if pre_registration_completed?
-      when 'post_registration'
-        complete_post_registration! if post_registration_completed?
-      when 'during_check_in'
-        complete_check_in! if check_in_completed?
-      end
-    end
-
-    def completed_phases
-      phases = []
-      phases << 'pre_registration' if pre_registration_completed?
-      phases << 'post_registration' if post_registration_completed?
-      phases << 'during_check_in' if check_in_completed?
-      phases
-    end
-
     def pre_registration_completed?
-      return true unless line_item&.product&.dynamic_fields&.pre_registration&.any?
+      return true unless line_item.product.dynamic_fields.pre_registration.any?
 
-      required_fields = line_item.product.dynamic_fields.pre_registration.pluck(:id)
-      filled_fields = guest_dynamic_fields.where(dynamic_field_id: required_fields).pluck(:dynamic_field_id)
-      (required_fields - filled_fields).empty?
+      pre_registration_fields_completed?
     end
 
     def post_registration_completed?
-      return true unless line_item&.product&.dynamic_fields&.post_registration&.any?
+      return true unless line_item.product.dynamic_fields.post_registration.any?
 
-      required_fields = line_item.product.dynamic_fields.post_registration.pluck(:id)
-      filled_fields = guest_dynamic_fields.where(dynamic_field_id: required_fields).pluck(:dynamic_field_id)
-      (required_fields - filled_fields).empty?
+      post_registration_fields_completed?
     end
 
     def check_in_completed?
-      return true unless line_item&.product&.dynamic_fields&.during_check_in&.any?
-
-      required_fields = line_item.product.dynamic_fields.during_check_in.pluck(:id)
-      filled_fields = guest_dynamic_fields.where(dynamic_field_id: required_fields).pluck(:dynamic_field_id)
-      (required_fields - filled_fields).empty?
-    end
+      return true unless line_item.product.dynamic_fields.during_check_in.any?
 
-    def pre_registration_fields?
-      line_item&.product&.dynamic_fields&.pre_registration&.any?
+      check_in_fields_completed?
     end
 
-    def post_registration_fields?
-      line_item&.product&.dynamic_fields&.post_registration&.any?
-    end
-
-    def during_check_in_fields?
-      line_item&.product&.dynamic_fields&.during_check_in&.any?
+    def current_collection_phase
+      if check_in.present?
+        :during_check_in
+      elsif line_item.order.completed?
+        :post_registration
+      else
+        :pre_registration
+      end
     end
 
-    private
-
-    def product_dynamic_fields
-      @product_dynamic_fields ||= line_item.product.dynamic_fields
+    def phase_completion_status
+      {
+        pre_registration: pre_registration_completed?,
+        post_registration: post_registration_completed?,
+        during_check_in: check_in_completed?
+      }
     end
 
-    def missing_dynamic_fields_for_stage(stage)
-      return [] if line_item.blank? || line_item.product.blank?
+    # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 5 => return 5KM00345
+    # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 2 => return 5KM345
+    def formatted_bib_number
+      return nil if bib_prefix.blank?
+      return nil if bib_number.blank?
 
-      # Cache product dynamic fields to avoid multiple queries
-      @product_dynamic_fields ||= line_item.product.dynamic_fields
-      required_fields = @product_dynamic_fields.where(data_fill_stage: stage)
-      filled_ids = guest_dynamic_fields&.pluck(:dynamic_field_id) || []
+      filled_bib_number = bib_number.to_s.rjust(line_item.variant.bib_zerofill.to_i, '0')
 
-      required_fields.reject { |field| filled_ids.include?(field.id) }
+      if bib_display_prefix?
+        "#{bib_prefix}#{filled_bib_number}"
+      else
+        filled_bib_number
+      end
     end
   end
 end

data/app/models/spree_cm_commissioner/guest_dynamic_field.rb

@@ -4,13 +4,10 @@ module SpreeCmCommissioner
     belongs_to :dynamic_field, class_name: 'SpreeCmCommissioner::DynamicField', optional: false
     belongs_to :dynamic_field_option, class_name: 'SpreeCmCommissioner::DynamicFieldOption', optional: true
 
+    validates :value, presence: true
     validate :validate_value_format, if: -> { value.present? && dynamic_field.present? }
     validate :validate_option_reference, if: -> { dynamic_field_option.present? }
-    validate :validate_phase_sequence
     validate :check_required_fields_based_on_phase
-    validate :reject_empty_string_for_text_fields
-
-    after_commit :sync_guest_data_fill_stage_phase
 
     private
 
@@ -18,8 +15,6 @@ module SpreeCmCommissioner
       return if dynamic_field.blank?
 
       case dynamic_field.data_type.to_s
-      when 'text', 'textarea'
-        errors.add(:value, "can't be blank") if value.is_a?(String) && value.strip == ''
       when 'number'
         errors.add(:value, 'must be a number') unless value.to_s.match?(/\A\d+\z/)
       when 'boolean'
@@ -45,49 +40,44 @@ module SpreeCmCommissioner
       errors.add(:dynamic_field_option, 'must belong to the same dynamic field')
     end
 
-    def validate_phase_sequence
-      return if dynamic_field.blank? || guest.blank?
+    def before_checkin_phase?
+      guest.present? && guest.line_item.present? && guest.check_in.nil?
+    end
 
-      case dynamic_field.data_fill_stage.to_sym
-      when :post_registration
-        errors.add(:base, 'Must complete pre_registration fields first') unless guest.pre_registration_completed?
-      when :during_check_in
-        unless guest.post_registration_completed? || !guest.post_registration_fields?
-          errors.add(:base, 'Must complete post_registration fields first')
-        end
-      end
+    def after_purchase_phase?
+      guest.present? && guest.line_item.present? && guest.line_item.completed? && guest.check_in.nil?
     end
 
-    def field_required_in_current_phase?
-      return false if dynamic_field.blank? || guest.blank?
+    def during_checkin_phase?
+      guest.present? && guest.check_in.present?
+    end
 
-      case dynamic_field.data_fill_stage.to_sym
-      when :pre_registration, :post_registration
+    def pre_registration_required?
+      dynamic_field.data_fill_stage.to_sym == :pre_registration &&
         guest.line_item.order.completed? && guest.check_in.blank?
-      when :during_check_in
-        guest.check_in.present?
-      else
-        false
-      end
     end
 
-    def check_required_fields_based_on_phase
-      return if dynamic_field.blank? || value.present?
-      return unless field_required_in_current_phase?
-
-      errors.add(:value, I18n.t("guest_dynamic_field.errors.#{dynamic_field.data_fill_stage}_required"))
+    def post_registration_required?
+      dynamic_field.data_fill_stage.to_sym == :post_registration &&
+        guest.line_item.order.completed? && guest.check_in.blank?
     end
 
-    def sync_guest_data_fill_stage_phase
-      guest&.save_and_move_to_next_stage
+    def during_check_in_required?
+      dynamic_field.data_fill_stage.to_sym == :during_check_in &&
+        guest.check_in.present?
     end
 
-    def reject_empty_string_for_text_fields
-      return if dynamic_field.blank?
-      return unless %w[text textarea].include?(dynamic_field.data_type.to_s)
-      return unless value.is_a?(String)
+    def check_required_fields_based_on_phase
+      return if dynamic_field.blank? || value.present?
 
-      errors.add(:value, "can't be blank") if value.strip == ''
+      case dynamic_field.data_fill_stage.to_sym
+      when :pre_registration
+        errors.add(:value, I18n.t('guest_dynamic_field.errors.pre_registration_required')) if pre_registration_required?
+      when :post_registration
+        errors.add(:value, I18n.t('guest_dynamic_field.errors.post_registration_required')) if post_registration_required?
+      when :during_check_in
+        errors.add(:value, I18n.t('guest_dynamic_field.errors.during_check_in_required')) if during_check_in_required?
+      end
     end
   end
 end

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -48,9 +48,6 @@ module SpreeCmCommissioner
 
       base.belongs_to :event, class_name: 'Spree::Taxon', optional: true
 
-      base.has_many :industry_classifications, -> { joins(:taxon).where(spree_taxons: { kind: :industry }) }, class_name: 'Spree::Classification'
-      base.has_many :industry_taxons, through: :industry_classifications, source: :taxon
-
       base.scope :min_price, lambda { |vendor|
         joins(:prices_including_master)
           .where(vendor_id: vendor.id, product_type: vendor.primary_product_type)
@@ -78,16 +75,6 @@ module SpreeCmCommissioner
       base.after_update :sync_event_id_to_children, if: :saved_change_to_event_id?
 
       base.enum purchasable_on: { both: 0, web: 1, app: 2 }
-      base.enum call_to_action: { buy_now: 0,
-                                  book_now: 1,
-                                  reserve: 2,
-                                  register: 3,
-                                  apply: 4,
-                                  get_ticket: 5,
-                                  secure_your_seat: 6,
-                                  join_the_event: 7,
-                                  request_to_book: 8
-                                }
 
       base.accepts_nested_attributes_for :trip, allow_destroy: true
 
@@ -99,22 +86,6 @@ module SpreeCmCommissioner
       "#{Spree::Store.default.formatted_url}/tickets/#{slug}"
     end
 
-    def action_button
-      return :request_to_book if need_confirmation?
-      return :reserve if free?
-      return call_to_action.to_sym if call_to_action.present?
-
-      :buy_now
-    end
-
-    def free?
-      return false if prices_including_master.empty?
-
-      prices_including_master.all? do |master_price|
-        master_price.price.zero? && (master_price.compare_at_price.nil? || master_price.compare_at_price.zero?)
-      end
-    end
-
     def dynamic_fields_by_collection_phase
       {
         pre_registration: dynamic_fields.pre_registration.order(:position),

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -90,7 +90,7 @@ module SpreeCmCommissioner
 
     def vendor_organizer?(vendor)
       spree_roles.any? do |role|
-        role.name == "#{vendor.id}-organizer"
+        role.name == "#{vendor.name.downcase.parameterize(separator: '-')}-organizer"
       end
     end
 

data/app/serializers/spree/v2/storefront/product_serializer_decorator.rb

@@ -44,8 +44,6 @@ module Spree
           end
 
           base.cache_options store: nil
-
-          base.attribute :action_button, &:action_button
         end
       end
     end

data/app/serializers/spree_cm_commissioner/v2/storefront/guest_serializer.rb

@@ -7,7 +7,7 @@ module SpreeCmCommissioner
         attributes :first_name, :last_name, :dob, :gender, :kyc_fields, :other_occupation, :created_at, :updated_at,
                    :qr_data, :social_contact_platform, :social_contact, :available_social_contact_platforms,
                    :age, :emergency_contact, :other_organization, :expectation, :upload_later, :address, :formatted_bib_number, :phone_number,
-                   :token, :country_code, :contact, :data_fill_stage_phase
+                   :token, :country_code, :contact
 
         # temporary, once app release after cm-app v1.9.1, we no longer need this.
         attribute :seat_number do |object|
@@ -22,6 +22,8 @@ module SpreeCmCommissioner
         belongs_to :nationality, serializer: Spree::V2::Storefront::TaxonSerializer
         belongs_to :line_item, serializer: Spree::V2::Storefront::LineItemSerializer
 
+        has_many :guest_dynamic_fields, serializer: SpreeCmCommissioner::V2::Storefront::GuestDynamicFieldSerializer
+
         has_one :id_card, serializer: Spree::V2::Storefront::IdCardSerializer
         has_one :check_in
 

data/config/routes.rb

@@ -622,7 +622,6 @@ Spree::Core::Engine.add_routes do
           resources :id_cards
         end
         resources :dynamic_field_options
-        resources :dynamic_fields
         resources :user_guests do
           resources :id_cards
         end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.0.3.pre-pre7'.freeze
+  VERSION = '2.0.3'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.0.3.pre.pre.pre7
+  version: 2.0.3
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-20 00:00:00.000000000 Z
+date: 2025-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -853,7 +853,6 @@ files:
 - app/controllers/spree/api/v2/storefront/confirm_pin_code_checkers_controller.rb
 - app/controllers/spree/api/v2/storefront/customer_notifications_controller.rb
 - app/controllers/spree/api/v2/storefront/dynamic_field_options_controller.rb
-- app/controllers/spree/api/v2/storefront/dynamic_fields_controller.rb
 - app/controllers/spree/api/v2/storefront/events_controller.rb
 - app/controllers/spree/api/v2/storefront/google_wallet_object_tokens_controller.rb
 - app/controllers/spree/api/v2/storefront/guest_card_classes_controller.rb
@@ -1450,7 +1449,6 @@ files:
 - app/overrides/spree/admin/products/_form/allow_self_check_in.html.erb.deface
 - app/overrides/spree/admin/products/_form/available_on.html.erb.deface
 - app/overrides/spree/admin/products/_form/discontinue_on.html.erb.deface
-- app/overrides/spree/admin/products/_form/industry_taxons.html.erb.deface
 - app/overrides/spree/admin/products/_form/need_confirmation_checkbox.html.erb.deface
 - app/overrides/spree/admin/products/_form/option_types.html.erb.deface
 - app/overrides/spree/admin/products/_form/product_types.html.erb.deface
@@ -1459,7 +1457,6 @@ files:
 - app/overrides/spree/admin/products/_form/required_self_check_in_location.html.erb.deface
 - app/overrides/spree/admin/products/_form/reveal_description_to_user.html.erb.deface
 - app/overrides/spree/admin/products/_form/subscribable_checkbox.html.erb.deface
-- app/overrides/spree/admin/products/_form/taxons.html.erb.deface
 - app/overrides/spree/admin/products/_form/use_video_as_default.html.erb.deface
 - app/overrides/spree/admin/products/edit/clear_cache_button.html.erb.deface
 - app/overrides/spree/admin/products/index/product_vendor_link.html.erb.deface
@@ -2559,9 +2556,6 @@ files:
 - db/migrate/20250714124323_make_cm_blazer_queryables_polymorphic.rb
 - db/migrate/20250715103333_remove_indexes_from_cm_user_identity_providers.rb
 - db/migrate/20250718071620_add_data_fill_stage_to_dynamic_fields.rb
-- db/migrate/20250812015522_remove_unique_indexes_from_cm_user_identity_providers.rb
-- db/migrate/20250812121745_add_data_fill_stage_phase_to_cm_guests.rb
-- db/migrate/20250814073854_add_call_to_action_to_spree_products.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2715,9 +2709,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1

data/app/controllers/spree/api/v2/storefront/dynamic_fields_controller.rb

@@ -1,42 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Storefront
-        class DynamicFieldsController < ::Spree::Api::V2::ResourceController
-          before_action :load_product
-
-          # override
-          def collection
-            return @collection if defined?(@collection)
-
-            dynamic_fields = @product.dynamic_fields
-            if params[:phase].present?
-              requested_phase = params[:phase].to_s
-              if SpreeCmCommissioner::DynamicField.data_fill_stages.key?(requested_phase)
-                dynamic_fields = dynamic_fields.where(data_fill_stage: requested_phase)
-              end
-            end
-
-            @collection = dynamic_fields.order(:position)
-          end
-
-          private
-
-          def load_product
-            return render_error_payload({ error: 'product_id is required' }, 400) if params[:product_id].blank?
-
-            @product ||= Spree::Product.find(params[:product_id])
-          end
-
-          def collection_serializer
-            SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
-          end
-
-          def model_class
-            SpreeCmCommissioner::DynamicField
-          end
-        end
-      end
-    end
-  end
-end

data/app/overrides/spree/admin/products/_form/industry_taxons.html.erb.deface

@@ -1,26 +0,0 @@
-<!-- insert_after "[data-hook='admin_product_form_taxons']" -->
-
-<div data-hook="admin_product_form_industry_taxons">
-  <%= f.field_container :industry_taxons do %>
-    <%= f.label :industry_taxon_ids, Spree.t(:Industries) %>
-
-    <% if can? :modify, Spree::Classification %>
-      <%= f.select :industry_taxon_ids, options_from_collection_for_select(@product.industry_taxons, :id, :pretty_name, @product.industry_taxon_ids),
-                                { include_hidden: true },
-                                  multiple: true,
-                                  data: { autocomplete_url_value: 'taxons_api_v2',
-                                          autocomplete_return_attr_value: 'pretty_name',
-                                          autocomplete_multiple_value: true,
-                                          autocomplete_additional_url_params_value: "q[kind_eq]=7" } %>
-    <% elsif @product.industry_taxons.any? %>
-      <ul class="text_list">
-        <% @product.industry_taxons.each do |taxon| %>
-          <li><%= taxon.name %></li>
-        <% end %>
-      </ul>
-    <% else %>
-      <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :taxons) %></div>
-    <% end %>
-
-  <% end %>
-</div>

data/app/overrides/spree/admin/products/_form/taxons.html.erb.deface

@@ -1,26 +0,0 @@
-<!-- replace "[data-hook='admin_product_form_taxons']" -->
-
-<div data-hook="admin_product_form_taxons">
-  <%= f.field_container :taxons do %>
-    <%= f.label :taxon_ids, Spree.t(:taxons) %>
-
-    <% if can? :modify, Spree::Classification %>
-      <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxon_ids.reject { |id| @product.industry_taxon_ids.include?(id) }),
-                                { include_hidden: true },
-                                  multiple: true,
-                                  data: { autocomplete_url_value: 'taxons_api_v2',
-                                          autocomplete_return_attr_value: 'pretty_name',
-                                          autocomplete_multiple_value: true,
-                                          autocomplete_additional_url_params_value: "q[kind_not_eq]=7" } %>
-    <% elsif @product.taxons.any? %>
-      <ul class="text_list">
-        <% @product.taxons.each do |taxon| %>
-          <li><%= taxon.name %></li>
-        <% end %>
-      </ul>
-    <% else %>
-      <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :taxons) %></div>
-    <% end %>
-
-  <% end %>
-</div>

data/db/migrate/20250812015522_remove_unique_indexes_from_cm_user_identity_providers.rb

@@ -1,8 +0,0 @@
-class RemoveUniqueIndexesFromCmUserIdentityProviders < ActiveRecord::Migration[7.0]
-  def change
-    if index_exists?(:cm_user_identity_providers, [:identity_type, :sub], name: "index_cm_user_identity_providers_on_identity_type_and_sub")
-      remove_index :cm_user_identity_providers,
-                   name: "index_cm_user_identity_providers_on_identity_type_and_sub"
-    end
-  end
-end

data/db/migrate/20250812121745_add_data_fill_stage_phase_to_cm_guests.rb

@@ -1,5 +0,0 @@
-class AddDataFillStagePhaseToCmGuests < ActiveRecord::Migration[7.0]
-  def change
-    add_column :cm_guests, :data_fill_stage_phase, :string, default: 'pre_registration', null: false, if_not_exists: true
-  end
-end

data/db/migrate/20250814073854_add_call_to_action_to_spree_products.rb

@@ -1,5 +0,0 @@
-class AddCallToActionToSpreeProducts < ActiveRecord::Migration[7.0]
-  def change
-    add_column :spree_products, :call_to_action, :integer, null: true, if_not_exists: true
-  end
-end