spree_cm_commissioner 2.5.13 → 2.5.14.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e4173db9eaef31ba44153b210477bd83e359559c6b007f644723d320e9e8f30
-  data.tar.gz: 38aba375ecb1177922443efbe00c09e923c75f3f2547c3df5cb383378e45a8b8
+  metadata.gz: 9fc822ca647b6847cc80bc5d4f24f68312c67c3cf772e8422801f29d36b8c871
+  data.tar.gz: ac27932993e5c366efcfe5d1f15491c7b0248a886f0d804af69545a28a6a83cd
 SHA512:
-  metadata.gz: 698f5ca602839ec3b8293cd2aecf31a1cc89d6125c16b831a8500ec0aa8c01d705bf15bc215dde6cd50de568c3d505803cf97ad4c4c6a4493f7018f7b535dde1
-  data.tar.gz: ef9ffdee2d499c102c1f8e2c7166d3ed0d3ccea24f9f6259d74555f4cdc8f7646b9e97ae373710f1412cf256f510e0296259e44fa5d693a19d927b9eecf51396
+  metadata.gz: 6030cee41764d55a73430c81849bc91b12dcf12c04097795c3646297e75c53b3206ca186a704a6603eddcb6a57e4226d437e25227bf6a005fe514ea784891d26
+  data.tar.gz: d48e1f3ec06affa85260babeea658b9a9cb95ddffffe01175fa9dd24837df25c2a087fd5e4dbc3849ce2592178db9d71793719c21e783ca425820b226f142862

data/Gemfile.lock

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

data/app/services/spree_cm_commissioner/check_ins/create_bulk.rb

@@ -8,12 +8,23 @@ module SpreeCmCommissioner
 
         confirmed_at ||= Time.current
         guest_ids = check_ins_attributes.pluck(:guest_id)
-        indexed_guests = SpreeCmCommissioner::Guest.where(id: guest_ids).index_by(&:id)
+
+        indexed_guests = SpreeCmCommissioner::Guest
+                         .includes(:event, line_item: :order)
+                         .where(id: guest_ids)
+                         .index_by(&:id)
 
         check_ins = ActiveRecord::Base.transaction do
           check_ins_attributes.map do |attrs|
             guest = indexed_guests[attrs[:guest_id].to_i]
-            raise ActiveRecord::RecordNotFound, "Couldn't find Guest with 'id'=#{attrs[:guest_id]}" if guest.blank?
+            raise ActiveRecord::RecordNotFound, "Couldn't find Guest to check in" if guest.blank?
+
+            order = guest.line_item.order
+            if order.canceled?
+              error = ActiveRecord::RecordInvalid.new(guest)
+              error.record.errors.add(:base, 'Cannot check in Guest from cancelled order')
+              raise error
+            end
 
             check_in = check_in!(guest, attrs, check_in_by, confirmed_at)
             update_guest!(guest, attrs[:guest_attributes]) if attrs[:guest_attributes].present?
@@ -25,8 +36,8 @@ module SpreeCmCommissioner
         success(check_ins: check_ins)
       rescue ActiveRecord::RecordInvalid => e
         failure(:invalid_record, e.record.errors.full_messages.join(', '))
-      rescue ActiveRecord::RecordNotFound => e
-        failure(:record_not_found, e.message)
+      rescue ActiveRecord::RecordNotFound
+        failure(:record_not_found, 'Guest or related record not found')
       end
 
       private

data/app/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb

@@ -29,6 +29,8 @@ module SpreeCmCommissioner
       def fetch_value(guest, column)
         if guest_field?(column)
           fetch_guest_value(guest, column)
+        elsif dynamic_field?(column)
+          fetch_dynamic_field_value(guest, column)
         else
           fetch_option_value(guest, column)
         end
@@ -38,6 +40,39 @@ module SpreeCmCommissioner
         SpreeCmCommissioner::KycBitwise::ORDERED_BIT_FIELDS.include?(column.to_sym)
       end
 
+      def dynamic_field?(column)
+        return false unless dynamic_fields_exist?
+
+        dynamic_field_labels.include?(column)
+      end
+
+      def dynamic_field_labels
+        return [] unless dynamic_fields_exist?
+
+        @dynamic_field_labels ||= load_dynamic_field_labels
+      end
+
+      def dynamic_fields_exist?
+        return @has_dynamic_fields unless @has_dynamic_fields.nil?
+
+        @has_dynamic_fields = event.event_products.joins(:product_dynamic_fields).exists?
+      end
+
+      def load_dynamic_field_labels
+        event.event_products.joins(product_dynamic_fields: :dynamic_field).distinct.pluck('label')
+      end
+
+      def fetch_dynamic_field_value(guest, column)
+        guest_dynamic_field = guest.guest_dynamic_fields.find { |gdf| gdf.dynamic_field&.label == column }
+        return '' unless guest_dynamic_field
+
+        if guest_dynamic_field.dynamic_field_option.present?
+          guest_dynamic_field.dynamic_field_option.value
+        else
+          guest_dynamic_field.value || ''
+        end
+      end
+
       def fetch_guest_value(guest, column)
         column_mappings(guest)[column] || ''
       end
@@ -82,6 +117,7 @@ module SpreeCmCommissioner
           :occupation,
           :nationality,
           :id_card,
+          guest_dynamic_fields: %i[dynamic_field dynamic_field_option],
           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?

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.13'.freeze
+  VERSION = '2.5.14.pre.pre2'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.13
+  version: 2.5.14.pre.pre2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-18 00:00:00.000000000 Z
+date: 2026-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -3215,9 +3215,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1