spree_cm_commissioner 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9270cf6464159655e0c794de5c2cfd928bb6a696707676f4166a5062d80810d1
-  data.tar.gz: e5039d47fd725c87a214187184f9610fd7be488b1d0e5b75925ec382088d0fc0
+  metadata.gz: 2c10fd2782b1a1ac7ecab5d27e02a49212f8e816f8f2325fadbcd717fe9882e9
+  data.tar.gz: 3b1b296e3403e5dd040063c19a3ac4952afafb617af17cd2ca924ea8df25de23
 SHA512:
-  metadata.gz: 22b9ab443f30d5214daa18cb51b487c7bbce4764af5a4c27afe3d65b20102c11536a75122167b58bd9b12030b0e9cd737e89f6b3424a2894a746d07917baa154
-  data.tar.gz: 4bc00907e7fe3afe5d7266fcb0b40cde518d3b9c9f9bd343ef7b0e80caaa958e76f127028d87292a53e7204fc50b7d4e9e56e48a1c81d7500bcd53bc4275e9ab
+  metadata.gz: 1f31cf8a9073664246d505c0494b2da2dc6565ec14c57fae06f34320039a478af4d8a1e0ee5eb1e68c42a5de37baf393bee0e791f7d9dfb8fd2b66356f143566
+  data.tar.gz: e29ba3d6d3e2d8343209260edd69117fe67c14ea1c20c13891b6cd9930f044467daa7b2fffaff51ab27db42e98eb7f43a85254e33a4644927e3eb61a1e9d742f

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.17.0)
+    spree_cm_commissioner (1.18.0)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -572,10 +572,6 @@ GEM
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
-      racc (~> 1.4)
     noticed (1.6.3)
       http (>= 4.0.0)
       rails (>= 5.2.0)

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

@@ -38,7 +38,24 @@ module Spree
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            if resource.update(guest_params)
+            if guest_params[:guest_dynamic_fields_attributes]
+              resource.guest_dynamic_fields.destroy_all
+
+              guest_params[:guest_dynamic_fields_attributes].each do |attr|
+                field = resource.guest_dynamic_fields.build(attr.except(:id))
+
+                if field.dynamic_field.requires_dynamic_field_options?
+                  option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
+                  field.dynamic_field_option = option if option
+                end
+
+                field.save!
+              end
+            end
+
+            resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
+
+            if resource.save
               render_serialized_payload { serialize_resource(resource) }
             else
               render_error_payload(resource, 400)
@@ -76,7 +93,7 @@ module Spree
               :upload_later,
               :country_code,
               :contact,
-              guest_dynamic_fields_attributes: %i[id dynamic_field_id value _destroy]
+              guest_dynamic_fields_attributes: %i[id dynamic_field_id dynamic_field_option_id value _destroy]
             )
           end
         end

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

@@ -37,7 +37,7 @@ module SpreeCmCommissioner
         bit_fields = SpreeCmCommissioner::KycBitwise::BIT_FIELDS.keys
 
         if permitted_resource_params[:use_product_kyc] == '1'
-          permitted_resource_params[:kyc] = @product.kyc
+          permitted_resource_params[:kyc] = nil
         else
           @kyc_result = calculate_kyc_value(params[:variant])
           permitted_resource_params[:kyc] = @kyc_result

data/app/models/spree_cm_commissioner/dynamic_field.rb

@@ -6,15 +6,27 @@ module SpreeCmCommissioner
     has_many :guest_dynamic_fields, class_name: 'SpreeCmCommissioner::GuestDynamicField', dependent: :destroy
     has_many :product_dynamic_fields, class_name: 'SpreeCmCommissioner::ProductDynamicField', dependent: :destroy
 
-    enum data_type: { string: 0, integer: 1, boolean: 2, checkbox: 3, radio: 4 }
+    enum data_type: { text: 0, number: 1, boolean: 2, checkbox: 3, radio: 4, selection: 5, textarea: 6 }
 
     accepts_nested_attributes_for :dynamic_field_options, allow_destroy: true, reject_if: :all_blank
 
     validates :label, presence: true
     validates :data_type, presence: true
+    validates :configurations, presence: true, allow_blank: false
 
-    def selection?
-      checkbox? || radio?
+    def requires_dynamic_field_options?
+      checkbox? || radio? || selection?
+    end
+
+    def multiple_select
+      return nil unless selection?
+
+      configurations['multiple_select'] == true
+    end
+
+    def multiple_select=(value)
+      self.configurations ||= {}
+      self.configurations['multiple_select'] = ActiveModel::Type::Boolean.new.cast(value)
     end
   end
 end

data/app/models/spree_cm_commissioner/dynamic_field_option.rb

@@ -1,8 +1,12 @@
 module SpreeCmCommissioner
   class DynamicFieldOption < SpreeCmCommissioner::Base
     belongs_to :dynamic_field, class_name: 'SpreeCmCommissioner::DynamicField', optional: false
+    has_many :guest_dynamic_fields, class_name: 'SpreeCmCommissioner::GuestDynamicField', dependent: :restrict_with_error
+
+    enum status: { active: 0, draft: 1, archived: 2 }
 
     validates :value, presence: true, uniqueness: { scope: :dynamic_field_id }
+    validates :status, presence: true
     validate :parent_field_must_be_selection_type
 
     private
@@ -10,7 +14,7 @@ module SpreeCmCommissioner
     def parent_field_must_be_selection_type
       return unless dynamic_field
 
-      return if dynamic_field.selection?
+      return if dynamic_field.requires_dynamic_field_options?
 
       errors.add(:dynamic_field, 'must be a selection type field')
     end

data/app/models/spree_cm_commissioner/guest_dynamic_field.rb

@@ -2,9 +2,11 @@ module SpreeCmCommissioner
   class GuestDynamicField < SpreeCmCommissioner::Base
     belongs_to :guest, class_name: 'SpreeCmCommissioner::Guest', optional: false
     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? }
 
     private
 
@@ -12,14 +14,30 @@ module SpreeCmCommissioner
       return if dynamic_field.blank?
 
       case dynamic_field.data_type.to_s
-      when 'integer'
+      when 'number'
         errors.add(:value, 'must be a number') unless value.to_s.match?(/\A\d+\z/)
       when 'boolean'
-        errors.add(:value, 'must be true or false') unless %w[true false 1 0].include?(value.to_s.downcase)
-      when 'checkbox', 'radio'
+        errors.add(:value, 'must be true or false') unless %w[true false].include?(value.to_s.downcase)
+      when 'checkbox', 'radio', 'selection'
+        validate_option_value
+      end
+    end
+
+    def validate_option_value
+      if dynamic_field_option.present?
+        self.value ||= dynamic_field_option.value
+      else
         valid_options = dynamic_field.dynamic_field_options.pluck(:id).map(&:to_s)
         errors.add(:value, 'is not a valid option') unless valid_options.include?(value)
       end
     end
+
+    def validate_option_reference
+      return if dynamic_field.blank? || dynamic_field_option.blank?
+
+      return if dynamic_field_option.dynamic_field_id == dynamic_field_id
+
+      errors.add(:dynamic_field_option, 'must belong to the same dynamic field')
+    end
   end
 end

data/app/models/spree_cm_commissioner/invite_team.rb

@@ -1,5 +1,7 @@
 module SpreeCmCommissioner
   class InviteTeam < SpreeCmCommissioner::Base
+    validates :email, presence: true, uniqueness: { scope: :vendor_id, message: I18n.t('invite.already_invited') }
+
     belongs_to :user, class_name: 'Spree::User', optional: true
     belongs_to :inviter, class_name: 'Spree::User'
     belongs_to :vendor, class_name: 'Spree::Vendor'

data/app/overrides/spree/admin/variants/_form/kyc_field.html.erb.deface

@@ -2,13 +2,13 @@
 
 <p>Guest Information Fields</p>
 <div class="form-check mb-3">
-  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: (@variant.kyc == @product.kyc) %>
+  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: @variant.kyc.nil? %>
   <label for="toggleGuestInfo" class="form-check-label">
     Use Product Guest Information
   </label>
 </div>
 
-<div id="guestInfoForm" <% if @variant.kyc == @product.kyc %>style="display: none;"<% end %>">
+<div id="guestInfoForm" <% if @variant.kyc.nil? %>style="display: none;"<% end %>">
   <small class="form-text text-muted mb-4">
     <%= raw I18n.t('kyc.variant_note') %>
   </small>

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

@@ -2,9 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldOptionSerializer < BaseSerializer
-        set_type :dynamic_field_option
-
-        attributes :id, :value, :dynamic_field_id, :created_at, :updated_at
+        attributes :id, :value, :dynamic_field_id, :status, :created_at, :updated_at
       end
     end
   end

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

@@ -2,9 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        set_type :dynamic_field
-
-        attributes :id, :label, :data_type, :vendor_id, :created_at, :updated_at
+        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at
 
         has_many :dynamic_field_options, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end

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

@@ -4,9 +4,10 @@ module SpreeCmCommissioner
       class GuestDynamicFieldSerializer < BaseSerializer
         set_type :guest_dynamic_field
 
-        attributes :id, :value, :guest_id, :dynamic_field_id, :created_at, :updated_at
+        attributes :id, :value, :guest_id, :dynamic_field_id, :dynamic_field_option_id, :created_at, :updated_at
 
         belongs_to :dynamic_field, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
+        belongs_to :dynamic_field_option, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end
     end
   end

data/db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb

@@ -0,0 +1,6 @@
+class AddConfigurationsToCmDynamicField < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_dynamic_fields, :configurations, :jsonb, default: {}, null: false, if_not_exists: true
+    add_index :cm_dynamic_fields, :configurations, if_not_exists: true
+  end
+end

data/db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb

@@ -0,0 +1,5 @@
+class AddDynamicFieldOptionToGuestDynamicField < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_guest_dynamic_fields, :dynamic_field_option, index: true, foreign_key: { to_table: :cm_dynamic_field_options }, if_not_exists: true
+  end
+end

data/db/migrate/20250702091935_add_status_to_dynamic_field_option.rb

@@ -0,0 +1,5 @@
+class AddStatusToDynamicFieldOption < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_dynamic_field_options, :status, :integer, default: 0, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.17.0'.freeze
+  VERSION = '1.18.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -2517,6 +2517,9 @@ files:
 - db/migrate/20250611023548_add_country_code_to_guests.rb
 - db/migrate/20250612035937_add_intel_phone_number_to_guests.rb
 - db/migrate/20250616084219_add_description_to_cm_vendor_place.rb
+- db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb
+- db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb
+- db/migrate/20250702091935_add_status_to_dynamic_field_option.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem