spree_cm_commissioner 1.17.0.pre.pre → 1.17.0.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cc0c166a073d01107caea18b4b7f2381d12b9372ac67aa80b570687aaf59702
-  data.tar.gz: 0d736865e66226bed4f07171d02879c6d009d760595d88f6f63605e57bc228a6
+  metadata.gz: bd0a9d4b3819bd12ab5e38ffd050cf46ca5b8a937965a25ae911f9208b26586a
+  data.tar.gz: a17a1eea391cdf4c4c2c17d300ee275ab70b67dbc87b4448cbc4a2a6cae1c533
 SHA512:
-  metadata.gz: e55841d41f47a5aedd68cb9c81309f356f1731d24c1771d8955f6d20d0cb8050f5aefe867bbe3d1501b4fb421aca87daea26a9314281efda5d2b89792f332c63
-  data.tar.gz: 2f6b56fb52a8cf35206c8b24c99d0b991fbed3343c8ca56377f53febc7080c25af53ff1d839ae63c6bfa6ca6a148ffcb427c88fce10e58f60892d536106a14bb
+  metadata.gz: 45451b1d44bf6820463098e3c2a37cfd113753206b1ccbc13247a7f3db577be706fff5b1dd54e528036e6120dacfb4d9472672f3f196d8866dbdfff7557bbdde
+  data.tar.gz: d52c8b30b4e67599eac1eba6f75025c6ee01c6967caaebd7874e22fa71ca7202a1927facd4d8c3ad0e8da256ece71e3977b83a3ea56292e0a740c0b56bc05566

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.17.0.pre.pre)
+    spree_cm_commissioner (1.17.0.pre.pre2)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -572,6 +572,10 @@ 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/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/guest.rb

@@ -51,7 +51,7 @@ module SpreeCmCommissioner
     validates :seat_number, uniqueness: { scope: :event_id }, allow_nil: true, if: -> { event_id.present? }
     validates :bib_index, uniqueness: true, allow_nil: true
 
-    self.whitelisted_ransackable_associations = %w[id_card event]
+    self.whitelisted_ransackable_associations = %w[id_card event line_item]
     self.whitelisted_ransackable_attributes = %w[first_name last_name phone_number gender contact occupation_id card_type created_at check_in_status]
 
     def self.csv_importable_columns

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/user_taxon.rb

@@ -2,5 +2,6 @@ module SpreeCmCommissioner
   class UserTaxon < Base
     belongs_to :user, class_name: Spree.user_class.to_s, optional: false
     belongs_to :taxon, class_name: 'Spree::Taxon', optional: false
+    has_many :invite_user_taxons, class_name: 'SpreeCmCommissioner::InviteUserTaxon', dependent: :destroy
   end
 end

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -1,8 +1,6 @@
-require_dependency 'spree_cm_commissioner'
-
 module SpreeCmCommissioner
-  class VendorPlace < ApplicationRecord
-    enum place_type: { branch: 0, stop: 1, locations: 2 }
+  class VendorPlace < Base
+    enum place_type: { location: 0, branch: 1, stop: 2 }
     acts_as_list scope: :vendor
 
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
@@ -13,9 +11,9 @@ module SpreeCmCommissioner
 
     accepts_nested_attributes_for :place, allow_destroy: true
 
-    scope :branches, -> { where(place_type: :branch) }
-    scope :stops, -> { where(place_type: :stop) }
-    scope :locations, -> { where(place_type: :locations) }
+    scope :branches,  -> { where(place_type: :branch) }
+    scope :stops,     -> { where(place_type: :stop) }
+    scope :locations, -> { where(place_type: :location) }
 
     def selected
       vendor.selected_place_references.include?(place&.reference)

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/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb

@@ -1,11 +1,12 @@
 module SpreeCmCommissioner
   module Organizer
     class ExportGuestCsvService
-      attr_reader :event_id, :columns
+      attr_reader :event_id, :columns, :filters
 
-      def initialize(event_id, columns)
+      def initialize(event_id, columns, filters = {})
         @event_id = event_id
         @columns = columns
+        @filters = filters
       end
 
       def call
@@ -18,7 +19,7 @@ module SpreeCmCommissioner
       private
 
       def headers
-        columns.map(&:humanize).uniq
+        columns.map { |col| col.titleize(keep_id_suffix: true) }.uniq
       end
 
       def build_row(guest)
@@ -28,10 +29,8 @@ module SpreeCmCommissioner
       def fetch_value(guest, column)
         if guest_field?(column)
           fetch_guest_value(guest, column)
-        elsif option_type_field?(column)
-          fetch_option_value(guest, column)
         else
-          ''
+          fetch_option_value(guest, column)
         end
       end
 
@@ -39,19 +38,21 @@ module SpreeCmCommissioner
         SpreeCmCommissioner::KycBitwise::ORDERED_BIT_FIELDS.include?(column.to_sym)
       end
 
-      def option_type_field?(column)
-        Spree::OptionType.exists?(name: column)
-      end
-
       def fetch_guest_value(guest, column)
         column_mappings(guest)[column] || ''
       end
 
-      def fetch_option_value(guest, option_type_name)
-        return guest.formatted_bib_number if option_type_name == 'bib-prefix'
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def fetch_option_value(guest, column_name)
+        return guest.formatted_bib_number if column_name == 'bib-prefix'
+        return guest.line_item&.number if column_name == 'item_id'
+        return guest.line_item&.order&.number if column_name == 'order_id'
+        return guest.created_at if column_name == 'created_at'
+        return guest.updated_at if column_name == 'updated_at'
 
-        guest.line_item&.variant&.find_option_value_name_for(option_type_name: option_type_name)
+        guest.line_item&.variant&.find_option_value_name_for(option_type_name: column_name) || ''
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def column_mappings(guest)
         {
@@ -77,12 +78,19 @@ module SpreeCmCommissioner
       end
 
       def guests_with_associations
-        event.guests.includes(
+        scope = event.guests.includes(
           :occupation,
           :nationality,
           :id_card,
           line_item: { variant: { option_values: :option_type } }
-        )
+        ).complete
+        scope = scope.where('cm_guests.created_at >= ?', formatted_date_time(filters[:from_date])) if filters[:from_date].present?
+        scope = scope.where('cm_guests.created_at <= ?', formatted_date_time(filters[:to_date])) if filters[:to_date].present?
+        scope
+      end
+
+      def formatted_date_time(date)
+        Time.zone.parse(date.to_s).strftime('%Y-%m-%d %H:%M:%S %z')
       end
 
       def event

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/lib/spree_cm_commissioner/test_helper/factories/vendor_place_factory.rb

@@ -14,8 +14,8 @@ FactoryBot.define do
       place_type { :stop }
     end
 
-    trait :locations do
-      place_type { :locations }
+    trait :location do
+      place_type { :location }
     end
   end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.17.0-pre'.freeze
+  VERSION = '1.17.0-pre2'.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.pre
+  version: 1.17.0.pre.pre2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-27 00:00:00.000000000 Z
+date: 2025-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1179,6 +1179,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
@@ -1484,6 +1485,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