spree_cm_commissioner 1.17.0.pre.pre6 → 1.17.0.pre.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22af33dbb7a3b02cec407695525b7745f8fee24b4b6fd60d5a18b85c5fd3566e
-  data.tar.gz: 4dc584a0641e4463531a66ef87d2b596b69dd41edd9d11c498fa80569b5aadae
+  metadata.gz: 0a00e3ade6665258924af6b63276add5be49a3b887d193942c41b8ba4a1fa573
+  data.tar.gz: c30315d4d2f4313a342f94be21cf567cab1dbc4bac07cd754542d61d5de17990
 SHA512:
-  metadata.gz: f3486c5f18f49a85918ed8b6f78440955fbff5f86820b66327b36eb028ffb884517428ecf4a822301d73b91c3f0ce729f9285381c91ee58fce424f03efce9e41
-  data.tar.gz: a1c6454f5da6873e47cd7ffc4cda002a879ad764d72c925cb8d83dc0b645e5f34b3d0a19c80652b7666c8e4c968210f3e59c2b8e9fe458019f115cde5a18caa8
+  metadata.gz: 30c14950496e7a3df59fd8a5e3233572a30437f750d0d546d4ec87cc405a8d24850912b161ca74eab4530d1d7cf27e3cb333625b0b4915e63102e3b45f1a3e94
+  data.tar.gz: 3062f419e60420e2e9a87c57b8720051292ebdbff63b4308bc739e32309b4aef55498b06c1b2134ee3761b9c4fca5cea8d0ecf912d3bf928701292123a23e11b

data/.env.example

@@ -24,3 +24,6 @@ WAITING_ROOM_DISABLED=no
 # Vattanac Bank
 VATTANAC_AES_SECRET_KEY= ""
 VATTANAC_PUBLIC_KEY=""
+
+# Organizer URL
+ORGANIZER_URL=http://127.0.0.1:4000/organizer

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.17.0.pre.pre6)
+    spree_cm_commissioner (1.17.0.pre.pre7)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

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/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -93,6 +93,10 @@ module SpreeCmCommissioner
       context.fail!(message: "User creation failed: #{context.user.errors.full_messages.join(', ')}")
     end
 
+    def disable_services
+      'bus,ferry'
+    end
+
     def construct_data
       user = context.user
 
@@ -101,7 +105,7 @@ module SpreeCmCommissioner
         name: user.full_name,
         phone: user.phone_number,
         email: user.email,
-        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}"
+        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}&ds=#{CGI.escape(disable_services)}"
       }
 
       json_data = raw_data.to_json

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

@@ -0,0 +1,30 @@
+module SpreeCmCommissioner
+  module EventCheckInFlowable
+    extend ActiveSupport::Concern
+
+    included do
+      preference :group_check_in_enabled, :boolean, default: true
+      preference :individual_check_in_enabled, :boolean, default: true
+
+      before_validation :validate_at_least_one_check_in_flow_presence
+    end
+
+    def check_in_flows
+      flows = []
+      flows << 'group' if group_check_in_enabled?
+      flows << 'individual' if individual_check_in_enabled?
+      flows
+    end
+
+    def group_check_in_enabled? = preferred_group_check_in_enabled
+    def individual_check_in_enabled? = preferred_individual_check_in_enabled
+
+    private
+
+    def validate_at_least_one_check_in_flow_presence
+      return if check_in_flows.any?
+
+      errors.add(:check_in_flows, 'must have at least one flow selected')
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module SpreeCmCommissioner
     end
 
     def invitation_link
-      "http://#{ENV.fetch('APP_HOST')}/organizer/invite_teams/#{token}?utm_source=email"
+      "#{ENV.fetch('ORGANIZER_URL')}/invite_teams/#{token}?utm_source=email"
     end
 
     def url_valid?

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -4,6 +4,7 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::TaxonKind
       base.include SpreeCmCommissioner::Transit::TaxonBitwise
       base.include SpreeCmCommissioner::ParticipationTypeBitwise
+      base.include SpreeCmCommissioner::EventCheckInFlowable
 
       base.preference :background_color, :string
       base.preference :foreground_color, :string

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -7,7 +7,7 @@ module SpreeCmCommissioner
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
 
     validates :place_type, presence: true
-    validates :position, presence: true, numericality: { only_integer: true, greater_than: 0 }
+    validates :place_id, uniqueness: { scope: %i[vendor_id place_type] }
 
     accepts_nested_attributes_for :place, allow_destroy: true
 

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

@@ -0,0 +1,18 @@
+<!-- insert_before "erb[loud]:contains('field_container :hide_from_nav')" -->
+
+<%# Sections don't use video banner, so we hide the form here to avoid confusing admin. %>
+
+<%= f.field_container :preferred_group_check_in_enabled, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+  <%= f.check_box :preferred_group_check_in_enabled, class: 'custom-control-input' %>
+  <%= f.label :preferred_group_check_in_enabled, Spree.t(:enable_group_check_in), class: 'custom-control-label' %>
+  <%= f.error_message_on :preferred_group_check_in_enabled %>
+  <small class="form-text text-muted">
+    Enabled by default for most events where users can purchase multiple tickets or use group scanning. For large events (like PSK, ASK, etc.) or invitation-based events, you should disable this to ensure each ticket or invitation is scanned individually.
+  </small>
+<% end if @taxon.event? && @taxon.depth == 1 %> %>
+
+<%= f.field_container :preferred_individual_check_in_enabled, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+  <%= f.check_box :preferred_individual_check_in_enabled, class: 'custom-control-input' %>
+  <%= f.label :preferred_individual_check_in_enabled, Spree.t(:enable_individual_check_in), class: 'custom-control-label' %>
+  <%= f.error_message_on :preferred_individual_check_in_enabled %>
+<% end if @taxon.event? && @taxon.depth == 1 %> %>

data/app/queries/spree_cm_commissioner/guest_searcher_query.rb

@@ -8,20 +8,36 @@ module SpreeCmCommissioner
 
     def event_id = params[:event_id]
 
-    def call
+    def call # rubocop:disable Metrics/PerceivedComplexity
       return SpreeCmCommissioner::Guest.none if event_id.blank?
 
-      if params[:qr_data].present?
+      if params[:qr_data].present? && order_qr_data?
+        search_by_order_qr
+      elsif params[:qr_data].present? && line_item_qr_data?
+        search_by_line_item_qr
+      elsif params[:qr_data].present? && guest_qr_data?
         search_by_guest_qr
       elsif params[:term].present?
         search_by_term
+      elsif params[:ids].present?
+        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id, id: params[:ids])
       else
-        SpreeCmCommissioner::Guest.none
+        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id)
       end
     end
 
     private
 
+    def search_by_order_qr
+      order = Spree::Order.complete_or_canceled.search_by_qr_data!(params[:qr_data])
+      order.guests.where(event_id: event_id)
+    end
+
+    def search_by_line_item_qr
+      line_item = Spree::LineItem.complete_or_canceled.search_by_qr_data!(params[:qr_data])
+      line_item.guests.where(event_id: event_id)
+    end
+
     def search_by_guest_qr
       SpreeCmCommissioner::Guest.complete_or_canceled.where(
         token: params[:qr_data],
@@ -29,6 +45,32 @@ module SpreeCmCommissioner
       )
     end
 
+    def order_qr_data?
+      matches = construct_matches
+      matches&.size == 2
+    end
+
+    def line_item_qr_data?
+      matches = construct_matches
+      matches&.size == 3
+    end
+
+    def guest_qr_data?
+      matches = construct_matches
+      matches.nil?
+    end
+
+    def construct_matches
+      qr_data = params[:qr_data]
+      return nil unless qr_data
+
+      if qr_data =~ /-L\d+$/
+        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)-(L\d+)/)&.captures
+      else
+        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)/)&.captures
+      end
+    end
+
     def search_by_term
       terms = params[:term].split.map { |term| "%#{term.downcase}%" }
 

data/app/serializers/spree_cm_commissioner/v2/operator/dashboard_crew_event_serializer.rb

@@ -2,7 +2,10 @@ module SpreeCmCommissioner
   module V2
     module Operator
       class DashboardCrewEventSerializer < BaseSerializer
-        attributes :id, :name, :permalink, :from_date, :to_date, :updated_at
+        attributes :id, :name, :permalink,
+                   :from_date, :to_date,
+                   :check_in_flows,
+                   :updated_at
 
         has_many :children_classifications, serializer: :classification
         has_one :category_icon, serializer: SpreeCmCommissioner::V2::Storefront::AssetSerializer

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/config/initializers/spree_permitted_attributes.rb

@@ -31,6 +31,8 @@ module Spree
       subtitle
       preferred_background_color
       preferred_foreground_color
+      preferred_group_check_in_enabled
+      preferred_individual_check_in_enabled
       show_badge_status
       purchasable_on
       available_on

data/config/locales/en.yml

@@ -459,6 +459,10 @@ en:
               businesses_cant_be_blank: "Businesses can't be blank"
               phone_number_cant_be_blank: "Phone number can't be blank"
               quantity_cant_be_less_than_or_equal_to_zero: "Quantity can't be less or equal than 0"
+        spree_cm_commissioner/vendor_place:
+          attributes:
+            place_id:
+              taken: "has already existed with this place type"
 
   mail:
     order_mailer:

data/db/migrate/20250616084219_add_description_to_cm_vendor_place.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToCmVendorPlace < ActiveRecord::Migration[7.0]
+  def change
+      add_column :cm_vendor_places, :description, :string, if_not_exists: true
+  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-pre6'.freeze
+  VERSION = '1.17.0-pre7'.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.pre.pre6
+  version: 1.17.0.pre.pre7
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1185,6 +1185,7 @@ files:
 - app/mailers/spree_cm_commissioner/pin_code_mailer.rb
 - app/mailers/spree_cm_commissioner/team_invite_mailer.rb
 - app/models/.gitkeep
+- app/models/concerns/spree_cm_commissioner/event_check_in_flowable.rb
 - app/models/concerns/spree_cm_commissioner/homepage_section_bitwise.rb
 - app/models/concerns/spree_cm_commissioner/json_preference_validator.rb
 - app/models/concerns/spree_cm_commissioner/kyc_bitwise.rb
@@ -1490,6 +1491,7 @@ files:
 - app/overrides/spree/admin/taxons/_form/assets_form.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/available_on.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/background_color_and_foreground_color.html.erb.deface
+- app/overrides/spree/admin/taxons/_form/check_in_flows.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/custom_redirect_url.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/hide_video_banner.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/kind_html.erb.deface
@@ -2514,6 +2516,10 @@ files:
 - db/migrate/20250610080108_add_contact_to_cm_guests.rb
 - 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