spree_cm_commissioner 2.5.14.pre.pre6 → 2.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40530545badfcae7bcf0a9ea607b78503c757c18669fa49fc8b6cf206f6df984
-  data.tar.gz: 279f9a33c706c9ab20628168a35283a1e4d2c5dd5013ff3cfc88bd29a0d99c9d
+  metadata.gz: 574ed1a0c32a052dce78787ecfa40603a68f033ff8a113f3ae7a91e415656fe6
+  data.tar.gz: 3640a360d2df37c723529f091136e1491c2a0cf61515993d6ebd502e01b3996f
 SHA512:
-  metadata.gz: 556876458e952e2e910b5387515fcf1bff9a35bdfc041f66d9b6ad08e8bae795b12ffa572d4cf93a4bc012f6da9807d8f2e48e37ab6c489202636adf6ec8b66e
-  data.tar.gz: 23f197a4d3344d26832aa8cf0421fedbcf19c2345d7647bd3c154b54029ef3e6bea633e1b98cc8184edfd516d1e0b6bb7bcfa565edad86ed2b01ea5b3cb5ddc5
+  metadata.gz: 893ac42ed0c4c306260bd8b578fed2619d7ee65daf13d009228f81ae2047a98e164983b89b0345344d384cffe1f88989c20b717685e40a38c5abf8a159609e77
+  data.tar.gz: 5d145d664bbba939d59f2a5797ff96494993c911b2dba2159a23c8accafce6bc0e9719b7e62697f1bebd2f2ef7151544031a47f9993eb8311c745ef84c76283d

data/.env.example

@@ -44,7 +44,9 @@ CACHE_DEFAULT_MAX_AGE=300 # Default for unlisted controllers - 5 minutes
 # Batch size for processing maintenance tasks in app/jobs/spree_cm_commissioner/maintenance_tasks/orchestrate_job.rb
 MAINTENANCE_TASKS_BATCH_SIZE=100
 
+# Export related:
+OPERATOR_GUEST_JSON_GZIP_CACHE_HOURS=24
+EXPORT_PRESIGNED_URL_EXPIRATION_MINUTES=15
+
 # import order batch size
 IMPORT_ORDERS_BATCH_SIZE=50
-# How long event crews/organizers can regenerate guest exports. See: app/services/spree_cm_commissioner/operator_guest_json_gzips/create.rb
-OPERATOR_GUEST_JSON_GZIP_CACHE_HOURS=24

data/Gemfile.lock

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

data/app/controllers/spree/admin/import_existing_orders_controller.rb

@@ -3,7 +3,9 @@ module Spree
     class ImportExistingOrdersController < BaseImportOrdersController
       # override
       def collection
-        @collection ||= model_class.existing_order.page(params[:page])
+        @collection ||= model_class.existing_order
+                                   .order(created_at: :desc)
+                                   .page(params[:page])
                                    .per(params[:per_page])
       end
 

data/app/controllers/spree/admin/import_new_orders_controller.rb

@@ -3,7 +3,9 @@ module Spree
     class ImportNewOrdersController < BaseImportOrdersController
       # override
       def collection
-        @collection ||= model_class.new_order.page(params[:page])
+        @collection ||= model_class.new_order
+                                   .order(created_at: :desc)
+                                   .page(params[:page])
                                    .per(params[:per_page])
       end
 

data/app/controllers/spree/api/v2/operator/check_ins_controller.rb

@@ -5,10 +5,23 @@ module Spree
         class CheckInsController < ::Spree::Api::V2::ResourceController
           before_action :require_spree_current_user, only: %i[index create]
 
+          # Check-in history data requires fresh/recent data for operator dashboards
+          # Short cache duration ensures operators see near real-time check-in activity
+          CACHE_EXPIRES_IN = 1.minute
+
           def collection
-            @collection = SpreeCmCommissioner::CheckIn.where(checkinable: params[:taxon_id])
+            @collection ||= SpreeCmCommissioner::CheckIn
+                            .where(checkinable_type: 'Spree::Taxon', checkinable_id: params[:taxon_id])
+                            .page(params[:page])
+                            .per(params[:per_page])
+          end
 
-            @collection = @collection.page(params[:page]).per(params[:per_page])
+          # override
+          def collection_cache_opts
+            {
+              namespace: Spree::Api::Config[:api_v2_collection_cache_namespace],
+              expires_in: CACHE_EXPIRES_IN
+            }
           end
 
           def create

data/app/models/spree_cm_commissioner/export.rb

@@ -35,18 +35,23 @@ module SpreeCmCommissioner
       exported_file.filename.to_s
     end
 
-    def exported_file_url(expires_in: 15.minutes)
+    def exported_file_url
       # Controllers should set ActiveStorage::Current.url_options in a before_action
       # See GuestJsonGzipsController for an example
       return nil if ActiveStorage::Current.url_options.nil?
       return nil if exported_file.blank?
 
       exported_file.url(
-        expires_in: expires_in,
+        expires_in: presigned_url_expires_in,
         disposition: 'attachment'
       )
     end
 
+    # subclasses can override this to set different expiration time base on use case.
+    def presigned_url_expires_in
+      ENV.fetch('EXPORT_PRESIGNED_URL_EXPIRATION_MINUTES', '15').to_i.minutes
+    end
+
     def enqueue_export
       SpreeCmCommissioner::ExportJob.perform_later(export_id: id)
     end

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -9,6 +9,9 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::ServiceType
       base.include SpreeCmCommissioner::ServiceRecommendations
       base.include SpreeCmCommissioner::Integrations::IntegrationMappable
+      base.include SpreeCmCommissioner::StoreMetadata
+
+      base.delegate :is_open_dated, :is_open_dated?, to: :trip, allow_nil: true
 
       base.has_many :variant_kind_option_types, -> { where(kind: :variant).order(:position) },
                     through: :product_option_types, source: :option_type
@@ -79,6 +82,8 @@ module SpreeCmCommissioner
 
       base.whitelisted_ransackable_attributes = %w[description name slug discontinue_on status vendor_id short_name]
 
+      base.store_public_metadata :open_dated_validity_days, :integer, default: 90
+
       base.after_update :update_variants_vendor_id, if: :saved_change_to_vendor_id?
       base.after_update :sync_event_id_to_children, if: :saved_change_to_event_id?
 

data/app/models/spree_cm_commissioner/trip.rb

@@ -22,7 +22,13 @@ module SpreeCmCommissioner
 
     belongs_to :service_origin, class_name: 'Spree::Taxon', optional: true
 
-    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType', optional: false
+    has_one :open_dated_relation, lambda {
+                                    where(relation_type: :open_dated_pair)
+                                  }, class_name: 'SpreeCmCommissioner::ProductRelation',
+                                     foreign_key: :related_product_id, primary_key: :product_id, dependent: :destroy
+    has_one :open_dated_product, through: :open_dated_relation, source: :product
+
+    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType', optional: true
     belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle', optional: true
     has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout', dependent: :destroy
 
@@ -41,8 +47,9 @@ module SpreeCmCommissioner
     has_many :inventory_items, through: :variants
     has_many :blocks, through: :variants
 
-    validates :departure_time, presence: true
-    validates :duration, numericality: { greater_than: 0 }
+    validates :departure_time, presence: true, unless: :open_dated?
+    validates :vehicle_type, presence: true, unless: :open_dated?
+    validates :duration, numericality: { greater_than: 0 }, unless: :open_dated?
     validate :origin_and_destination_cannot_be_the_same
 
     accepts_nested_attributes_for :trip_stops, :product, :seat_layout, allow_destroy: true
@@ -77,6 +84,19 @@ module SpreeCmCommissioner
       errors.add(:base, 'Origin and destination cannot be the same')
     end
 
+    def open_dated?
+      is_open_dated == true
+    end
+
+    # Find the open dated version of this trip's product
+    def open_dated_pair
+      open_dated_product
+    end
+
+    def display_name
+      product&.name
+    end
+
     private
 
     def duplicate_seat_layout_from_vehicle

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -71,7 +71,7 @@ module SpreeCmCommissioner
                 prices.amount AS amount, prices.compare_at_amount AS compare_at_amount,
                 prices.currency AS currency
               SQL
-              .includes(vendor: :logo, vehicle_type: :option_values)
+              .includes(vendor: :logo, vehicle_type: :option_values, route: {}, open_dated_product: %i[trip variants])
 
       scope = scope.joins(:vendor) if tenant_id.present?
 
@@ -129,7 +129,8 @@ module SpreeCmCommissioner
         drop_off: build_drop_off_info(trip),
         quantity_available: trip&.quantity_available,
         max_capacity: trip&.max_capacity,
-        amenities: (trip.vehicle_type&.option_values || [])
+        amenities: (trip.vehicle_type&.option_values || []),
+        open_dated_product: trip&.open_dated_product
       }
       SpreeCmCommissioner::TripResult.new(trip_result_options)
     end

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,7 +36,7 @@ module SpreeCmCommissioner
         success(check_ins: check_ins)
       rescue ActiveRecord::RecordInvalid => e
         failure(:invalid_record, e.record.errors.full_messages.join(', '))
-      rescue ActiveRecord::RecordNotFound => e
+      rescue ActiveRecord::RecordNotFound
         failure(:record_not_found, e.message)
       end
 

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/app/services/spree_cm_commissioner/trips/create_open_dated_trip.rb

@@ -0,0 +1,99 @@
+module SpreeCmCommissioner
+  module Trips
+    # Service class responsible for creating Open Dated trips in the booking system.
+    # Open Dated trips are flexible, date-agnostic products that can be redeemed on any
+    # scheduled trip within the same route. They don't have fixed departure times or calendars.
+    #
+    # Key characteristics of Open Dated trips:
+    # - is_open_dated: true
+    # - departure_time: nil (no fixed schedule)
+    # - No service calendar (not tied to specific dates)
+    # - Special "Open Dated" variant option
+    # - Can be linked to multiple fixed-date trips via ProductRelations (open_dated_pair)
+    # - No specific vehicle type (can be used on any vehicle in the route)
+    #
+    # Required trip_form attributes for Open Dated trips:
+    # - route_id: The route this open dated trip is for
+    # - price: Ticket price
+    # - is_open_dated: Must be true
+    class CreateOpenDatedTrip
+      prepend Spree::ServiceModule::Base
+      include Transit::TripHelper
+
+      # Main service method that validates the trip form and orchestrates OT creation.
+      # Creates variant, trip, and inventory within a database transaction.
+      # Note: Open dated trips do NOT have calendars since they're not date-specific.
+      #
+      # @param vendor [Spree::Vendor] The vendor creating the open dated trip
+      # @param trip_form [OpenStruct/Object] Form object with: route_id, price, is_open_dated
+      # @return [Spree::ServiceModule::Result] Success with trip/variant or failure with error
+      def call(vendor:, trip_form:)
+        return failure(nil, trip_form.errors.full_messages.to_sentence) unless trip_form.valid_open_dated_data?
+
+        ApplicationRecord.transaction do
+          route = vendor.routes.find(trip_form.route_id)
+          variant = create_variant!(vendor, trip_form)
+          trip = create_trip!(vendor, trip_form, variant, route)
+          generate_inventory!(variant)
+
+          success(trip: trip, variant: variant, route: route)
+        end
+      rescue StandardError => e
+        CmAppLogger.error(
+          label: 'SpreeCmCommissioner::Trips::CreateOpenDatedTrip#call',
+          data: {
+            error_class: e.class.name,
+            error_message: e.message,
+            vendor_id: vendor&.id,
+            route_id: trip_form&.route_id
+          }
+        )
+        failure(nil, e.message)
+      end
+
+      private
+
+      # Creates a product variant for the open dated trip using shared Variants::Create
+      # with "Open Dated" option value and fixed capacity of 100.
+      def create_variant!(vendor, trip_form)
+        result = SpreeCmCommissioner::Trips::Variants::Create.call(
+          vendor: vendor,
+          trip_form: trip_form,
+          price: trip_form.price || 0.0,
+          capacity: 100,
+          option_value_name: 'open dated'
+        )
+
+        raise StandardError, result.error unless result.success?
+
+        result.value[:variant]
+      end
+
+      # Creates the Open Dated trip record.
+      # Key difference from regular trips: departure_time is explicitly set to nil
+      # and is_open_dated is true, making this a flexible, date-agnostic product.
+      #
+      # Gets origin and destination from the Route model instead of trip_stops.
+
+      def create_trip!(vendor, trip_form, variant, route)
+        vendor.trips.create!(
+          product: variant.product,
+          origin_place_id: route.origin_place_id,
+          destination_place_id: route.destination_place_id,
+          route: route,
+          departure_time: nil, # Open dated trips have no fixed departure time
+          duration: 0, # Open dated trips have no fixed duration
+          allow_booking: trip_form.allow_booking.nil? ? true : trip_form.allow_booking,
+          allow_seat_selection: false, # Open dated trips don't allow seat selection
+          is_open_dated: true, # This is the key flag for open dated trips
+          route_type: trip_form.route_type || route.route_type
+        )
+      end
+
+      # Triggers asynchronous generation of permanent inventory items for the variant.
+      def generate_inventory!(variant)
+        SpreeCmCommissioner::Stock::PermanentInventoryItemsGeneratorJob.perform_later(variant_ids: [variant[:id]])
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/trips/update_open_dated_trip.rb

@@ -0,0 +1,67 @@
+module SpreeCmCommissioner
+  module Trips
+    # Service class responsible for updating an existing Open Dated trip.
+    # Handles updates to trip, product, and variant only.
+    # Ignored trip stops and service calendar since Open Dated trips don't have them.
+    class UpdateOpenDatedTrip
+      prepend Spree::ServiceModule::Base
+
+      # Main service method that orchestrates trip updates within a database transaction.
+      # Updates trip/product and variant if price provided.
+      # Returns success with updated objects or failure with error message.
+      def call(trip:, trip_form:)
+        return failure(nil, 'Trip is not open dated') unless trip.open_dated?
+
+        ApplicationRecord.transaction do
+          update_trip_and_product(trip, trip_form)
+          update_variant(trip, trip_form) if trip_form.price.present?
+
+          success(trip: trip, variant: trip.product.variants.first)
+        end
+      rescue StandardError => e
+        CmAppLogger.error(
+          label: 'SpreeCmCommissioner::Trips::UpdateOpenDatedTrip#call',
+          data: {
+            error_class: e.class.name,
+            error_message: e.message,
+            trip_id: trip&.id
+          }
+        )
+        failure(nil, e.message)
+      end
+
+      private
+
+      # Updates the trip record and associated product with attributes from the form.
+      def update_trip_and_product(trip, trip_form)
+        trip.update!(trip_attrs(trip_form))
+        trip.product.update!(product_attrs(trip_form))
+      end
+
+      # Updates the variant's price if a new price is provided in the form.
+      def update_variant(trip, trip_form)
+        variant = trip.product.variants.where.not(id: trip.product.master.id).first
+        return unless variant
+
+        variant.update!(price: trip_form.price)
+        trip.product.update!(price: trip_form.price)
+      end
+
+      def trip_attrs(form)
+        {
+          allow_booking: form.allow_booking,
+          allow_seat_selection: false, # Always false for Open Dated trips
+          is_open_dated: true # Always true for Open Dated trips
+        }.compact
+      end
+
+      def product_attrs(form)
+        {
+          name: form.name,
+          short_name: form.short_name,
+          open_dated_validity_days: form.open_dated_validity_days
+        }.compact
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/trips/variants/create.rb

@@ -8,7 +8,9 @@ module SpreeCmCommissioner
 
         # Main method that validates inputs and creates product, options, variant, and stock in transaction.
         # Returns success with product and variant or failure with error message.
-        def call(vendor:, trip_form:, price:, capacity:)
+        # @param option_value_name [String, nil] Seat-type option value name (e.g. 'open dated').
+        #   Defaults to 'Normal' when not passed. Pass explicitly to create variants with custom seat types.
+        def call(vendor:, trip_form:, price:, capacity:, option_value_name: nil)
           return failure(nil, 'vendor must be present') if vendor.blank?
           return failure(nil, 'trip_form must be present') if trip_form.blank?
           return failure(nil, 'price must be present') if price.blank?
@@ -16,9 +18,11 @@ module SpreeCmCommissioner
           return failure(nil, 'capacity must be greater than 0') if capacity <= 0
           return failure(nil, 'name must be present') if trip_form.name.blank?
 
+          option_value_name = option_value_name.presence || 'Normal'
+
           ApplicationRecord.transaction do
             product = create_product!(vendor, trip_form)
-            option_values = setup_option_values!(product)
+            option_values = setup_option_values!(product, option_value_name)
             variant = create_variant!(product, price, option_values)
 
             create_stock_item!(variant, capacity)
@@ -51,7 +55,8 @@ module SpreeCmCommissioner
             price: trip_form.price,
             shipping_category: Spree::ShippingCategory.find_or_create_by!(name: 'Default'),
             option_types: [Spree::OptionType.find_by(name: 'seat-type')].compact,
-            stores: [Spree::Store.default].compact
+            stores: [Spree::Store.default].compact,
+            open_dated_validity_days: trip_form.open_dated_validity_days
           )
         end
 
@@ -60,9 +65,10 @@ module SpreeCmCommissioner
           vendor.branches.where(id: trip_form.trip_stops.map(&:stop_id)).index_by(&:id)
         end
 
-        # Sets up or finds the seat-type option type and creates normal option value.
+        # Sets up or finds the seat-type option type and finds/creates the option value by name.
         # Associates the option type with the product if not already present.
-        def setup_option_values!(product)
+        # @param option_value_name [String] e.g. 'Normal' or 'open dated'; defaults to 'Normal' when not passed to call.
+        def setup_option_values!(product, option_value_name = 'Normal')
           option_type = Spree::OptionType.find_or_create_by!(
             name: 'seat-type',
             presentation: 'Seat Type'
@@ -70,7 +76,7 @@ module SpreeCmCommissioner
 
           product.option_types << option_type unless product.option_types.include?(option_type)
 
-          option_value = option_type.option_values.find_or_create_by_name!(option_type, 'Normal')
+          option_value = option_type.option_values.find_or_create_by_name!(option_type, option_value_name)
 
           [option_value]
         end

data/config/locales/en.yml

@@ -209,7 +209,7 @@ en:
     riel: "៛"
 
   spree:
-    is_open_dated: "Is Open Dated?"
+    is_open_dated: "Is Open Dated Trip?"
     description: Description
     registered_by:
       system_registered: "System Registered"

data/db/migrate/20260128090001_add_is_open_dated_to_cm_trips.rb

@@ -0,0 +1,6 @@
+class AddIsOpenDatedToCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_trips, :is_open_dated, :boolean, default: false unless column_exists?(:cm_trips, :is_open_dated)
+    add_index :cm_trips, :is_open_dated unless index_exists?(:cm_trips, :is_open_dated)
+  end
+end

data/db/migrate/20260207100000_add_index_created_at_to_cm_imports.rb

@@ -0,0 +1,5 @@
+class AddIndexCreatedAtToCmImports < ActiveRecord::Migration[7.0]
+  def change
+    add_index :cm_imports, :created_at, if_not_exists: true
+  end
+end

data/db/migrate/20260217162827_add_index_to_cm_guests_on_event_id_and_bib_prefix_and_bib_number.rb

@@ -0,0 +1,8 @@
+class AddIndexToCmGuestsOnEventIdAndBibPrefixAndBibNumber < ActiveRecord::Migration[7.0]
+  def change
+    # Add composite index for optimal bib number lookup performance
+    add_index :cm_guests, [:event_id, :bib_prefix, :bib_number],
+              name: 'index_cm_guests_on_event_bib_prefix_number',
+              if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/transit/trip_form.rb

@@ -9,7 +9,9 @@ module SpreeCmCommissioner::Transit
                   :total_vehicles,
                   :allow_booking,
                   :allow_seat_selection,
+                  :is_open_dated,
                   :route_type,
+                  :open_dated_validity_days,
                   :trip_stops, # TripStopForm[]
                   :service_calendar # monday, tuesday, wednesday, thursday, friday, saturday, sunday, start_date, end_date
 
@@ -65,6 +67,17 @@ module SpreeCmCommissioner::Transit
       errors.empty?
     end
 
+    def valid_open_dated_data?
+      errors.clear
+
+      errors.add(:route_id, 'must be present') if route_id.blank?
+      errors.add(:price, 'must be present') if price.blank?
+      errors.add(:is_open_dated, 'must be true') unless is_open_dated
+      errors.add(:open_dated_validity_days, 'must be present') if open_dated_validity_days.blank?
+
+      errors.empty?
+    end
+
     # Groups trip_stops into legs by location changes
     # Separates legs when location_id changes (at branch stops)
     # Break stops (stop_type = :stop) are included but don't trigger separation

data/lib/spree_cm_commissioner/trip_query_result.rb

@@ -31,6 +31,11 @@ module SpreeCmCommissioner
       @trips.map(&:price).compact.sum
     end
 
+    def total_open_return_price
+      open_return_price = open_dated_product&.variants&.first&.price.to_d
+      total_price + open_return_price
+    end
+
     def total_duration
       @trips.map(&:duration).compact.sum
     end
@@ -60,5 +65,9 @@ module SpreeCmCommissioner
     def vehicle_types
       @trips.map(&:vehicle_type).uniq
     end
+
+    def open_dated_product
+      @trips.first&.open_dated_product
+    end
   end
 end

data/lib/spree_cm_commissioner/trip_result.rb

@@ -4,7 +4,7 @@ module SpreeCmCommissioner
                   :departure_time, :duration, :route_type,
                   :vehicle_type_id, :vehicle_type, :vendor_id, :vendor,
                   :quantity_available, :max_capacity, :boarding, :drop_off,
-                  :product_id, :amenities, :price, :compare_at_amount, :currency, :distance
+                  :product_id, :amenities, :price, :compare_at_amount, :currency, :distance, :open_dated_product
 
     def initialize(options = {})
       options.each do |key, value|
@@ -51,11 +51,16 @@ module SpreeCmCommissioner
         price,
         quantity_available,
         max_capacity,
-        departure_time&.to_i
+        departure_time&.to_i,
+        open_dated_product&.id
       ].compact.join('-')
 
       version_hash = Digest::MD5.hexdigest(version_parts)
       "trip_results/#{id}-#{version_hash}"
     end
+
+    def open_dated_pair_id
+      open_dated_product&.id
+    end
   end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.14-pre6'.freeze
+  VERSION = '2.5.14'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.14.pre.pre6
+  version: 2.5.14
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-20 00:00:00.000000000 Z
+date: 2026-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -2097,9 +2097,11 @@ files:
 - app/services/spree_cm_commissioner/transit/legs_builder_service.rb
 - app/services/spree_cm_commissioner/transit_order/create.rb
 - app/services/spree_cm_commissioner/trips/clone.rb
+- app/services/spree_cm_commissioner/trips/create_open_dated_trip.rb
 - app/services/spree_cm_commissioner/trips/create_single_leg.rb
 - app/services/spree_cm_commissioner/trips/search.rb
 - app/services/spree_cm_commissioner/trips/service_calendars/create_or_update.rb
+- app/services/spree_cm_commissioner/trips/update_open_dated_trip.rb
 - app/services/spree_cm_commissioner/trips/update_single_leg.rb
 - app/services/spree_cm_commissioner/trips/variants/create.rb
 - app/services/spree_cm_commissioner/update_guest_service.rb
@@ -3020,6 +3022,7 @@ files:
 - db/migrate/20260121024645_add_nationality_group_to_cm_guests.rb
 - db/migrate/20260126110528_seed_user_initial_usernames.rb
 - db/migrate/20260128043540_add_counter_cache_to_spree_users.rb
+- db/migrate/20260128090001_add_is_open_dated_to_cm_trips.rb
 - db/migrate/20260128093305_add_exportable_to_cm_exports.rb
 - db/migrate/20260128093313_add_metadata_to_cm_exports.rb
 - db/migrate/20260129082338_remove_preferences_file_name_columns_from_cm_exports.rb
@@ -3030,6 +3033,8 @@ files:
 - db/migrate/20260204100002_add_service_origin_to_cm_trips.rb
 - db/migrate/20260204183545_add_term_accepted_at_to_spree_orders.rb
 - db/migrate/20260207040752_clear_cm_exports.rb
+- db/migrate/20260207100000_add_index_created_at_to_cm_imports.rb
+- db/migrate/20260217162827_add_index_to_cm_guests_on_event_id_and_bib_prefix_and_bib_number.rb
 - db/migrate/20260218100000_create_cm_maintenance_tasks.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
@@ -3215,9 +3220,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