spree_cm_commissioner 2.5.8 → 2.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ecb9b50cd59df5354348171034968d7c6c1b7a59ba4ad1eb1a6b134d3b3a8b
-  data.tar.gz: bc18344da1e94917ceff4341cec0bfaa82d1160941ec54a5ea8dd0b2d13860b8
+  metadata.gz: 673c4b3d46c1121063b406d0a7228e1f640467906b8c0960d9c76bc4553c7a59
+  data.tar.gz: 45b5352a4f194674bae8fb259d766057d9404d498539ff5ebae46f202534ba6c
 SHA512:
-  metadata.gz: 1e364c0093ef94862e7ab2d94f9e44b6ba2dee21b0951885c3c6e0feaded3e12ba572b856d33ea1fce84fc86c19ea87eb7bcf716c817ed4b5269c59b912976a4
-  data.tar.gz: d6dc9e74e163f64d353513020ba7b8fdba7ab149774eb1dd3cf3153005ebdabea14de798968e043e6d9681aed59eed03334f36ea35d59707b20db277858bad59
+  metadata.gz: 2a0209ab5b1a8b0b381cf33211265acad61b368a0cc09eed582d0b4d6264b9151dd522fcf3d7609b3c501e1a957fb16779bab58f717a93664219a6ed2a9781b7
+  data.tar.gz: 88b21257aba4536f9ffbc86d2c94a631440b772af6f7ac724e80f943152ed33ac0c6207f15e12af32b96a3530ad6ef819fc4e216e6ce003c0fefecd796d4fcde

data/Gemfile.lock

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

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

@@ -0,0 +1,53 @@
+module Spree
+  module Api
+    module V2
+      module Operator
+        class GuestJsonGzipsController < ::Spree::Api::V2::ResourceController
+          before_action :require_spree_current_user
+
+          # POST /api/v2/operator/guest_json_gzips
+          # - taxon_id=1
+          # - resource_includes[]=[check_ins,check_ins.check_in_by]
+          # - force_create=true (optional, to bypass recent export check)
+          def create
+            spree_authorize! :create, SpreeCmCommissioner::Exports::OperatorGuestJsonGzip
+
+            exportable = Spree::Taxon.find(params[:taxon_id])
+
+            result = SpreeCmCommissioner::OperatorGuestJsonGzips::Create.call(
+              exportable: exportable,
+              resource_includes: params[:resource_includes] || [],
+              force_create: params[:force_create] == 'true'
+            )
+
+            if result.success?
+              status = result.value.created_at < 1.minute.ago ? 200 : 201
+              @export = result.value
+              render_serialized_payload(status) { serialize_resource(@export) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          # override
+          def scope
+            SpreeCmCommissioner::Exports::OperatorGuestJsonGzip.where(
+              exportable_type: 'Spree::Taxon',
+              exportable_id: params[:taxon_id]
+            ).order(created_at: :desc)
+          end
+
+          # override
+          def collection_serializer
+            SpreeCmCommissioner::V2::Operator::ExportSerializer
+          end
+
+          # override
+          def resource_serializer
+            SpreeCmCommissioner::V2::Operator::ExportSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree_cm_commissioner/orders_controller.rb

@@ -7,7 +7,7 @@ module SpreeCmCommissioner
       @order = if params[:id].match?(/^R\d{9,}-([A-Za-z0-9_\-]+)$/)
                  Spree::Order.search_by_qr_data!(params[:id])
                else
-                 SpreeCmCommissioner::Orders::Tickets::VerifyToken.call(token: params[:id]).value[:order]
+                 SpreeCmCommissioner::Orders::JwtToken::Verify.call(token: params[:t]).value[:order]
                end
 
       @product_type = @order.products.first&.product_type || 'accommodation'

data/app/jobs/spree_cm_commissioner/export_job.rb

@@ -0,0 +1,8 @@
+module SpreeCmCommissioner
+  class ExportJob < ApplicationUniqueJob
+    def perform(options = {})
+      export_id = options[:export_id]
+      SpreeCmCommissioner::Export.find(export_id).export
+    end
+  end
+end

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

@@ -53,6 +53,7 @@ module SpreeCmCommissioner
 
     def direction = private_metadata['direction']
     def trip_id = private_metadata['trip_id']&.to_i
+    def connected_trip_id = private_metadata['connected_trip_id']
     def boarding_trip_stop_id = private_metadata['boarding_trip_stop_id']&.to_i
     def drop_off_trip_stop_id = private_metadata['drop_off_trip_stop_id']&.to_i
 
@@ -99,6 +100,10 @@ module SpreeCmCommissioner
       set_private_metadata_value('trip_id', value)
     end
 
+    def connected_trip_id=(value)
+      set_private_metadata_value('connected_trip_id', value)
+    end
+
     def boarding_trip_stop_id=(value)
       set_private_metadata_value('boarding_trip_stop_id', value)
     end

data/app/models/spree_cm_commissioner/check_in_ability.rb

@@ -5,9 +5,11 @@ module SpreeCmCommissioner
     def initialize(user)
       if user.has_spree_role?('operator')
         can :manage, CheckIn
+        can :create, Export
       elsif user.has_spree_role?('organizer')
         can :manage, CheckIn
         can :manage, Guest
+        can :create, Export
       else
         cannot :manage, CheckIn
       end

data/app/models/spree_cm_commissioner/export.rb

@@ -1,26 +1,42 @@
 module SpreeCmCommissioner
   class Export < Base
-    before_create :set_uuid
+    self.inheritance_column = :export_type
+
+    include SpreeCmCommissioner::StoreMetadata
+    include ::Rails.application.routes.url_helpers
+
+    belongs_to :exportable, polymorphic: true
+
     has_one_attached :exported_file
 
+    before_validation :set_uuid
+
+    after_create :enqueue_export
+
     enum status: { :queue => 0, :progress => 1, :done => 2, :failed => 3 }
 
-    def construct_header
-      raise 'You must implement construct_header method in your sub class'
+    def set_uuid
+      self.uuid = SecureRandom.uuid
     end
 
-    def construct_row(_resource)
-      raise 'You must implement construct_row method in your sub class'
+    def exported_file_name
+      return nil if exported_file.blank?
+
+      exported_file.filename.to_s
     end
 
-    def scope
-      raise 'You must implement scope method in your sub class'
+    def exported_file_url
+      return nil if exported_file.blank?
+
+      cdn_image_url(exported_file)
     end
 
-    def set_uuid
-      self.uuid = SecureRandom.uuid
+    def enqueue_export
+      SpreeCmCommissioner::ExportJob.perform_later(export_id: id)
     end
 
-    def export_csv; end
+    def export
+      raise NotImplementedError, 'Subclasses must implement the export method'
+    end
   end
 end

data/app/models/spree_cm_commissioner/exports/operator_guest_json_gzip.rb

@@ -0,0 +1,37 @@
+module SpreeCmCommissioner
+  module Exports
+    class OperatorGuestJsonGzip < ::SpreeCmCommissioner::Export
+      # eg. ['check_ins', 'check_ins.check_in_by', 'line_item', 'line_item.order']
+      store_public_metadata :resource_includes, :array
+      store_public_metadata :guests_count, :integer
+
+      # override
+      def export
+        update(status: :progress)
+
+        guests = SpreeCmCommissioner::GuestSearcherQuery.new(event_id: exportable_id).call
+        hash = SpreeCmCommissioner::V2::Operator::GuestSerializer.new(
+          guests,
+          { include: resource_includes }
+        ).serializable_hash
+
+        file_name = "exports_operator_guest_#{id}.json.gz"
+        json_gzip = ActiveSupport::Gzip.compress(JSON.generate(hash))
+
+        exported_file.attach(
+          io: StringIO.new(json_gzip),
+          filename: file_name,
+          content_type: 'application/gzip'
+        )
+
+        update(
+          guests_count: guests.size,
+          status: :done
+        )
+      rescue StandardError => e
+        CmAppLogger.error(label: "#{self.class.name}#export", data: { export_id: id, error: e.message, backtrace: e.backtrace })
+        update(status: :failed)
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -264,6 +264,20 @@ module SpreeCmCommissioner
       tenant&.formatted_url.presence || ENV.fetch('DEFAULT_URL_HOST')
     end
 
+    # Returns arrays of connected line_item IDs grouped by connected_trip_id.
+    # Example: [[1,2,3], [4,5], [6]]
+    #
+    # Line items with the same connected_trip_id are grouped together.
+    # Line items without a group_id are returned as singletons.
+    def connected_line_item_ids(direction: nil)
+      scoped = line_items
+      scoped = scoped.select { |li| li.direction == direction } if direction.present?
+
+      scoped.group_by { |li| li.connected_trip_id || li.id }
+            .values
+            .map { |group| group.map(&:id).sort }
+    end
+
     private
 
     def unstock_inventory_in_redis!

data/app/models/spree_cm_commissioner/pricing_action.rb

@@ -1,27 +1,34 @@
 module SpreeCmCommissioner
   class PricingAction < Base
-    belongs_to :pricing_rule_group, class_name: 'SpreeCmCommissioner::PricingRuleGroup'
+    include Spree::CalculatedAdjustments
+    include Spree::AdjustmentSource
 
-    has_one :calculator, as: :calculable, class_name: 'Spree::Calculator', dependent: :destroy
-    accepts_nested_attributes_for :calculator
+    has_many :adjustments, as: :source, class_name: 'Spree::Adjustment'
 
-    def perform(line_item)
-      return if pricing_rule_group.pricing_rules.blank?
+    belongs_to :pricing_rule_group, class_name: 'SpreeCmCommissioner::PricingRuleGroup'
 
-      amount = calculator&.compute(line_item)
+    delegate :pricing_rules, to: :pricing_rule_group
 
-      line_item.adjustments.create!(
-        amount: amount,
-        source: self,
-        adjustable: line_item,
-        order: line_item.order,
-        label: pricing_rule_group.pricing_model.name,
-        mandatory: true
-      )
+    def perform(_options = {})
+      raise NotImplementedError, "#{self.class}#perform must be implemented"
+    end
+
+    def compute_amount(adjustable)
+      calculator&.compute(adjustable) || 0
     end
 
     def self.available_calculator_types
       SpreeCmCommissioner::Calculators.constants.map(&:to_s)
     end
+
+    protected
+
+    def label
+      pricing_rule_group.name
+    end
+
+    def order_currency(order)
+      order&.currency || Spree::Config[:currency]
+    end
   end
 end

data/app/models/spree_cm_commissioner/pricing_actions/create_line_item_adjustments.rb

@@ -1,6 +1,20 @@
 module SpreeCmCommissioner
   module PricingActions
     class CreateLineItemAdjustments < SpreeCmCommissioner::PricingAction
+      def perform(options = {})
+        order = options[:order]
+        line_items = options[:line_items] || []
+
+        return if line_items.blank?
+
+        line_items.each do |line_item|
+          create_unique_adjustment(order, line_item)
+        end
+      end
+
+      def compute_amount(line_item)
+        compute(line_item)
+      end
     end
   end
 end

data/app/models/spree_cm_commissioner/pricing_actions/create_route_adjustments.rb

@@ -0,0 +1,70 @@
+module SpreeCmCommissioner
+  module PricingActions
+    class CreateRouteAdjustments < SpreeCmCommissioner::PricingAction
+      def perform(options = {})
+        order = options[:order]
+        line_items = options[:line_items] || []
+
+        return if pricing_rules.blank?
+        return if line_items.blank?
+
+        eligible_guests = collect_unique_eligible_guests(line_items)
+        return if eligible_guests.empty?
+
+        total_amount = compute_total_amount(order, eligible_guests)
+        return if total_amount.zero?
+
+        create_route_adjustment(order, total_amount)
+      end
+
+      private
+
+      def collect_unique_eligible_guests(line_items)
+        seen = {}
+
+        line_items.each_with_object([]) do |line_item, result|
+          line_item.guests.select { |guest| guest_eligible?(guest) }.each_with_index do |guest, index|
+            key = guest.saved_guest_id.present? ? [guest.saved_guest_id, index] : guest.id
+            next if seen[key]
+
+            seen[key] = true
+            result << guest
+          end
+        end
+      end
+
+      def guest_eligible?(guest)
+        pricing_rules.all? do |rule|
+          !rule.respond_to?(:guest_eligible?) || rule.guest_eligible?(guest)
+        end
+      end
+
+      def compute_total_amount(order, guests)
+        guests.sum { |guest| compute_per_guest_amount(order, guest) }
+      end
+
+      def compute_per_guest_amount(order, guest)
+        item = build_per_guest_item(order, guest)
+        compute_amount(item)
+      end
+
+      def build_per_guest_item(order, guest)
+        Struct.new(:amount, :currency, :quantity).new(
+          guest.line_item.amount_per_guest,
+          order_currency(order),
+          1
+        )
+      end
+
+      def create_route_adjustment(order, amount)
+        adjustments.create!(
+          adjustable: order,
+          amount: amount,
+          order: order,
+          label: label,
+          mandatory: true
+        )
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/pricing_model.rb

@@ -6,6 +6,8 @@ module SpreeCmCommissioner
 
     has_many :pricing_model_variants, class_name: 'SpreeCmCommissioner::PricingModelVariant', dependent: :destroy
     has_many :variants, through: :pricing_model_variants, class_name: 'Spree::Variant'
+    has_many :pricing_model_routes, class_name: 'SpreeCmCommissioner::PricingModelRoute', dependent: :destroy
+    has_many :routes, through: :pricing_model_routes, class_name: 'SpreeCmCommissioner::Route'
     has_many :pricing_rule_groups, class_name: 'SpreeCmCommissioner::PricingRuleGroup', dependent: :destroy
     has_many :pricing_rules, through: :pricing_rule_groups, class_name: 'SpreeCmCommissioner::PricingRule'
 
@@ -14,5 +16,42 @@ module SpreeCmCommissioner
     validates :name, presence: true, uniqueness: { scope: :vendor_id }
 
     enum status: { draft: 0, active: 1, archived: 2 }
+
+    # Activates pricing model for an order (similar to Spree::Promotion#activate)
+    def activate(order:, line_items:)
+      pricing_rule_groups.each do |group|
+        activate_group(group, order, line_items)
+      end
+    end
+
+    private
+
+    def activate_group(group, order, line_items)
+      eligible_rules = group.pricing_rules.select { |r| any_line_item_eligible?(r, line_items) }
+
+      return if eligible_rules.empty?
+
+      if group_eligible?(group, eligible_rules)
+
+        group.pricing_action&.perform(order: order, line_items: line_items)
+      else
+        Rails.logger.info("PricingRuleGroup #{group.id} not eligible for order #{order.id}")
+      end
+    end
+
+    def any_line_item_eligible?(rule, line_items)
+      line_items.any? { |li| rule.eligible?(li) }
+    end
+
+    def group_eligible?(group, eligible_rules)
+      case group.match_type
+      when 'all'
+        eligible_rules.size == group.pricing_rules.size
+      when 'any'
+        eligible_rules.any?
+      else
+        false
+      end
+    end
   end
 end

data/app/models/spree_cm_commissioner/pricing_model_handler/order.rb

@@ -0,0 +1,72 @@
+module SpreeCmCommissioner
+  module PricingModelHandler
+    # Handles pricing model activation for orders
+    class Order
+      attr_reader :order
+
+      def initialize(order)
+        @order = order
+      end
+
+      def activate
+        return unless order&.persisted?
+
+        order.adjustments.pricing_action.delete_all
+
+        order.connected_line_item_ids.each do |group_ids|
+          line_items_in_group = order.line_items.where(id: group_ids)
+          activate_for_line_items(line_items_in_group)
+        end
+      end
+
+      private
+
+      def activate_for_line_items(line_items)
+        return if line_items.blank?
+
+        pricing_models = find_pricing_models(line_items).compact
+        return if pricing_models.blank?
+
+        pricing_models.each do |pricing_model|
+          pricing_model.activate(order: order, line_items: line_items)
+        end
+      end
+
+      def find_pricing_models(line_items)
+        route_pricing_models(line_items) + variant_pricing_models(line_items)
+      end
+
+      def route_pricing_models(line_items)
+        transit_line_items = line_items.select { |li| li.trip_id.present? }
+        return [] if transit_line_items.blank?
+
+        origin_place_id, destination_place_id = determine_origin_destination(transit_line_items)
+
+        SpreeCmCommissioner::PricingModelRoute
+          .active
+          .for_origin_destination(origin_place_id, destination_place_id)
+          .includes(:pricing_model)
+          .map(&:pricing_model)
+      end
+
+      def variant_pricing_models(line_items)
+        line_items.flat_map { |li| li.variant&.pricing_models&.active&.to_a || [] }
+      end
+
+      def determine_origin_destination(line_items)
+        if line_items.size > 1
+          first_line_item = line_items.min_by(&:id)
+          last_line_item = line_items.max_by(&:id)
+
+          first_trip = SpreeCmCommissioner::Trip.find(first_line_item.trip_id)
+          last_trip = SpreeCmCommissioner::Trip.find(last_line_item.trip_id)
+
+          [first_trip.origin_place_id, last_trip.destination_place_id]
+        else
+          trip = SpreeCmCommissioner::Trip.find(line_items.first.trip_id)
+          [trip.origin_place_id, trip.destination_place_id]
+        end
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/pricing_model_route.rb

@@ -0,0 +1,16 @@
+module SpreeCmCommissioner
+  class PricingModelRoute < Base
+    belongs_to :route, class_name: 'SpreeCmCommissioner::Route'
+    belongs_to :pricing_model, class_name: 'SpreeCmCommissioner::PricingModel'
+    belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place'
+    belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place'
+
+    scope :for_origin_destination, lambda { |origin_place_id, destination_place_id|
+      where(origin_place_id: origin_place_id, destination_place_id: destination_place_id)
+    }
+
+    scope :active, lambda {
+      joins(:pricing_model).where(pricing_model: { status: :active })
+    }
+  end
+end

data/app/models/spree_cm_commissioner/route.rb

@@ -14,6 +14,8 @@ module SpreeCmCommissioner
     has_many :route_photos, class_name: 'SpreeCmCommissioner::RoutePhoto', as: :viewable, dependent: :destroy
 
     has_many :trips, inverse_of: :route
+    has_many :pricing_model_routes, class_name: 'SpreeCmCommissioner::PricingModelRoute', dependent: :destroy
+    has_many :pricing_models, through: :pricing_model_routes, class_name: 'SpreeCmCommissioner::PricingModel'
 
     validates :route_name, presence: true
 

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -41,6 +41,8 @@ module SpreeCmCommissioner
       base.has_many :visible_classifications, -> { where(visible: true).order(:position) }, class_name: 'Spree::Classification'
       base.has_many :visible_products, through: :visible_classifications, class_name: 'Spree::Product', source: :product
 
+      base.has_many :exports, -> { order(created_at: :desc) }, class_name: 'SpreeCmCommissioner::Export', as: :exportable
+
       base.belongs_to :vendor, class_name: 'Spree::Vendor'
 
       base.validates_associated :category_icon

data/app/queries/spree_cm_commissioner/check_in_sessions_metrics_query.rb

@@ -0,0 +1,24 @@
+module SpreeCmCommissioner
+  class CheckInSessionsMetricsQuery
+    def initialize(event:, session:)
+      @event = event
+      @session = session
+    end
+
+    def call
+      guests = @session.check_in_rules.any? ? eligible_guests_for_session : @event.guests
+      guests_count = guests.count
+      check_ins_count = guests.left_joins(:check_in).where.not(cm_check_ins: { id: nil })
+                              .where(cm_check_ins: { check_in_session_id: [@session.id, nil] })
+                              .distinct.count(:id)
+
+      CheckInSessionsMetric.new(check_ins_count: check_ins_count, guests_count: guests_count)
+    end
+
+    private
+
+    def eligible_guests_for_session
+      @event.guests.where('cm_guests.public_metadata @> ?::jsonb', { eligible_check_in_session_ids: [@session.id] }.to_json)
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/cart_serializer_decorator.rb

@@ -4,6 +4,7 @@ module Spree
       module CartSerializerDecorator
         def self.prepended(base)
           base.attributes :phone_number, :intel_phone_number, :country_code, :request_state,
+                          :term_accepted_at,
                           :channel, :hold_expires_at
 
           base.attribute :qr_data do |order|

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

@@ -0,0 +1,14 @@
+module SpreeCmCommissioner
+  module V2
+    module Operator
+      class ExportSerializer < BaseSerializer
+        attributes :status,
+                   :exported_file_name,
+                   :exported_file_url,
+                   :public_metadata,
+                   :created_at,
+                   :updated_at
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/cart/recalculate_decorator.rb

@@ -24,10 +24,6 @@ module SpreeCmCommissioner
         else
           order.ensure_updated_shipments
         end
-        # SPREE: Original Spree::Cart::Recalculate code ends here
-
-        # CUSTOM: Apply pricing models (intercity taxi, line item pricing) to the line item
-        SpreeCmCommissioner::LineItems::ApplyPricingModels.call(order: order, line_item: line_item)
 
         # SPREE: Original Spree::Cart::Recalculate code continues here
         ::Spree::PromotionHandler::Cart.new(order, line_item).activate

data/app/services/spree_cm_commissioner/integrations/stadium_x_v1/polling/sync_matches.rb

@@ -36,6 +36,8 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
 
         match_mapping = Spree::Taxon.find_or_initialize_integration_mapping(integration_id: @integration.id, external_id: external_match._id)
         match_taxon = match_mapping.internal
+        match_name = "#{external_match.home_name} vs #{external_match.away_name}"
+        match_permalink = generate_match_permalink(match_name)
 
         # Track match sync and create event taxon directly under events/
         @sync_result.track(:match, match_taxon) do |tracker|
@@ -43,7 +45,8 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
             vendor: @integration.vendor,
             parent: events_root_taxon,
             taxonomy: events_taxonomy,
-            name: "#{external_match.home_name} vs #{external_match.away_name}",
+            name: match_name,
+            permalink: match_permalink,
             kind: :event,
             from_date: external_match.match_datetime,
             to_date: external_match.match_datetime + 120.minutes,
@@ -108,6 +111,13 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
       def events_taxonomy
         @events_taxonomy ||= Spree::Taxonomy.events
       end
+
+      def generate_match_permalink(match_name)
+        loop do
+          base_permalink = "#{events_root_taxon.permalink}/#{match_name.to_s.parameterize}-#{SecureRandom.hex(4)}"
+          break base_permalink unless Spree::Taxon.exists?(permalink: base_permalink)
+        end
+      end
     end
   end
 end

data/app/services/spree_cm_commissioner/operator_guest_json_gzips/create.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module SpreeCmCommissioner
+  module OperatorGuestJsonGzips
+    class Create
+      prepend ::Spree::ServiceModule::Base
+
+      def call(exportable:, resource_includes: [], force_create: false)
+        unless force_create
+          recent_export = find_recent_export(exportable)
+          return success(recent_export) if recent_export
+        end
+
+        export = build_export(exportable, resource_includes)
+        if export.save
+          success(export)
+        else
+          failure(export, export.errors.full_messages.to_sentence)
+        end
+      end
+
+      private
+
+      def find_recent_export(exportable)
+        SpreeCmCommissioner::Exports::OperatorGuestJsonGzip
+          .where(exportable: exportable)
+          .where('created_at > ?', 2.hours.ago)
+          .order(created_at: :desc)
+          .first
+      end
+
+      def build_export(exportable, resource_includes)
+        SpreeCmCommissioner::Exports::OperatorGuestJsonGzip.new(
+          exportable: exportable,
+          resource_includes: resource_includes
+        )
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/orders/jwt_token/generate.rb

@@ -5,7 +5,7 @@ module SpreeCmCommissioner
 
       def call(order:)
         nonce = generate_nonce
-        token = "#{order.number}?jwt_token=#{nonce}-#{generate_qr_jwt(order: order, nonce: nonce)}"
+        token = "#{order.number}?t=#{nonce}-#{generate_qr_jwt(order: order, nonce: nonce)}"
 
         success(token: token)
       end

data/app/services/spree_cm_commissioner/transit/legs_builder_service.rb

@@ -13,6 +13,7 @@ module SpreeCmCommissioner
           SpreeCmCommissioner::Transit::Leg.new(
             direction: direction,
             trip_id: leg['trip_id'].to_i,
+            main_trip_id: leg['main_trip_id']&.to_i,
             boarding_trip_stop_id: leg['boarding_trip_stop_id'].to_i,
             drop_off_trip_stop_id: leg['drop_off_trip_stop_id'].to_i,
             seat_selections: Array(leg['seat_selections']).map do |seat|
@@ -35,7 +36,7 @@ module SpreeCmCommissioner
         else
           legs_params.map do |leg|
             leg.permit(
-              :trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id,
+              :trip_id, :main_trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id,
               seat_selections: [:variant_id, :quantity, { block_ids: [] }]
             )
           end

data/app/services/spree_cm_commissioner/transit_order/create.rb

@@ -53,8 +53,11 @@ module SpreeCmCommissioner
         all_line_items = []
         current_leg_date = initial_date
 
+        # Use main_trip_id for connected trips (when legs have multiple trips)
+        connected_trip_id = legs.size > 1 ? legs.first.main_trip_id&.to_s : nil
+
         legs.each do |leg|
-          leg_line_items = build_line_items_for!(leg, order, current_leg_date)
+          leg_line_items = build_line_items_for!(leg, order, current_leg_date, connected_trip_id)
           leg_line_items = insert_saved_guests_per_line_items_leg(leg_line_items)
 
           all_line_items.concat(leg_line_items)
@@ -64,7 +67,7 @@ module SpreeCmCommissioner
         all_line_items
       end
 
-      def build_line_items_for!(leg, order, date)
+      def build_line_items_for!(leg, order, date, connected_trip_id = nil)
         trip = SpreeCmCommissioner::Trip.find(leg.trip_id)
         trip_stops = trip.trip_stops.where(id: [leg.boarding_trip_stop_id, leg.drop_off_trip_stop_id]).index_by(&:id)
 
@@ -75,18 +78,21 @@ module SpreeCmCommissioner
         )
 
         leg.seat_selections.group_by(&:variant_id).map do |variant_id, seat_selections|
+          metadata = {
+            direction: leg.direction,
+            trip_id: leg.trip_id.to_s,
+            boarding_trip_stop_id: leg.boarding_trip_stop_id.to_s,
+            drop_off_trip_stop_id: leg.drop_off_trip_stop_id.to_s
+          }
+          metadata[:connected_trip_id] = connected_trip_id if connected_trip_id.present?
+
           line_item = order.line_items.new(
             product_type: :transit,
             from_date: from_date,
             to_date: to_date,
             variant_id: variant_id,
             quantity: seat_selections.sum(&:quantity),
-            private_metadata: {
-              direction: leg.direction,
-              trip_id: leg.trip_id.to_s,
-              boarding_trip_stop_id: leg.boarding_trip_stop_id.to_s,
-              drop_off_trip_stop_id: leg.drop_off_trip_stop_id.to_s
-            }
+            private_metadata: metadata
           )
 
           build_guests_for!(line_item, seat_selections)

data/app/views/blazer/queries/_preset.html.erb

@@ -4,8 +4,6 @@
     <%= f.label :preset, Spree.t(:preset) %>
   </div>
   <small style="margin-bottom: 6px; display: inline-block;">
-    Mark as <strong>preset</strong> to auto-assign this report to new organizers or vendors.
+    Preset reports are generated automatically for all new organizers and vendors once created.
   </small>
-<% end %>
-
-
+<% end %>

data/config/initializers/spree_permitted_attributes.rb

@@ -63,6 +63,7 @@ module Spree
       :channel,
       :phone_number,
       :country_code,
+      :term_accepted_at,
       {
         saved_guests_attributes: %i[
           id

data/config/routes.rb

@@ -703,6 +703,7 @@ Spree::Core::Engine.add_routes do
         resources :event_qrs, only: [:show]
         resources :recalculate_tickets, only: [:create]
         resources :check_in_sessions, only: %i[index]
+        resources :guest_json_gzips, only: %i[index show create]
 
         resources :taxons, only: %i[show] do
           resource :event_ticket_aggregators, only: %i[show]

data/db/migrate/20260110073000_create_cm_pricing_model_routes.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# Migration to create cm_route_pricing_models table
+# This table links pricing models to routes with specific origin/destination pairs
+#
+# Example: A route PP → KP → KPC → SR can have different pricing models for each O-D pair:
+# - PP → SR: $1 extra charge
+# - PP → KP: $2 extra charge
+# - KP → KPC: $3 extra charge
+# - KPC → SR: $4 extra charge
+#
+# When a user books PP → SR, only the PP → SR pricing model ($1) applies,
+# not the sum of all segment charges
+
+class CreateCmPricingModelRoutes < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_pricing_model_routes, if_not_exists: true do |t|
+      t.references :route, null: false, foreign_key: { to_table: :cm_routes }
+      t.references :pricing_model, null: false, foreign_key: { to_table: :cm_pricing_models }
+      t.references :origin_place, null: false, foreign_key: { to_table: :cm_places }
+      t.references :destination_place, null: false, foreign_key: { to_table: :cm_places }
+
+      t.timestamps
+    end
+
+    # Ensure unique combination of route + pricing_model + origin + destination
+    add_index :cm_pricing_model_routes,
+              %i[route_id pricing_model_id origin_place_id destination_place_id],
+              unique: true,
+              name: 'idx_pricing_model_routes_unique'
+
+    # Index for efficient lookup by route and origin/destination
+    add_index :cm_pricing_model_routes,
+              %i[route_id origin_place_id destination_place_id],
+              name: 'idx_pricing_model_routes_on_route_origin_dest'
+  end
+end

data/db/migrate/20260128093305_add_exportable_to_cm_exports.rb

@@ -0,0 +1,5 @@
+class AddExportableToCmExports < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_exports, :exportable, polymorphic: true, index: true
+  end
+end

data/db/migrate/20260128093313_add_metadata_to_cm_exports.rb

@@ -0,0 +1,11 @@
+class AddMetadataToCmExports < ActiveRecord::Migration[7.0]
+  def up
+    add_column :cm_exports, :public_metadata, :jsonb, default: '{}', if_not_exists: true
+    add_column :cm_exports, :private_metadata, :jsonb, default: '{}', if_not_exists: true
+  end
+
+  def down
+    remove_column :cm_exports, :public_metadata, if_exists: true
+    remove_column :cm_exports, :private_metadata, if_exists: true
+  end
+end

data/db/migrate/20260129082338_remove_preferences_file_name_columns_from_cm_exports.rb

@@ -0,0 +1,13 @@
+class RemovePreferencesFileNameColumnsFromCmExports < ActiveRecord::Migration[7.0]
+  def up
+    remove_column :cm_exports, :preferences, if_exists: true
+    remove_column :cm_exports, :file_name, if_exists: true
+    remove_column :cm_exports, :file_path, if_exists: true
+  end
+
+  def down
+    add_column :cm_exports, :preferences, :text, if_not_exists: true
+    add_column :cm_exports, :file_name, :string, if_not_exists: true
+    add_column :cm_exports, :file_path, :string, if_not_exists: true
+  end
+end

data/db/migrate/20260204092321_add_type_to_cm_exports.rb

@@ -0,0 +1,11 @@
+class AddTypeToCmExports < ActiveRecord::Migration[7.0]
+  def up
+    add_column :cm_exports, :type, :string, if_not_exists: true
+    remove_column :cm_exports, :export_type, if_exists: true
+  end
+
+  def down
+    add_column :cm_exports, :export_type, :string, if_not_exists: true
+    remove_column :cm_exports, :type, if_exists: true
+  end
+end

data/db/migrate/20260204183545_add_term_accepted_at_to_spree_orders.rb

@@ -0,0 +1,6 @@
+class AddTermAcceptedAtToSpreeOrders < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_orders, :term_accepted_at, :datetime, null: true, if_not_exists: true
+    add_index :spree_orders, :term_accepted_at, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/check_in_sessions_metric.rb

@@ -0,0 +1,34 @@
+module SpreeCmCommissioner
+  class CheckInSessionsMetric
+    attr_reader :check_ins_count, :guests_count, :percent, :other_value
+
+    def initialize(check_ins_count:, guests_count:)
+      @check_ins_count = check_ins_count
+      @guests_count = guests_count
+      @percent = calculate_attendance_percent
+      @other_value = 100 - @percent
+    end
+
+    def to_h
+      {
+        check_ins_count: check_ins_count,
+        guests_count: guests_count,
+        no_show: no_show,
+        percent: percent,
+        other_value: other_value
+      }
+    end
+
+    def no_show
+      guests_count - check_ins_count
+    end
+
+    private
+
+    def calculate_attendance_percent
+      return 0 if guests_count.zero?
+
+      ((check_ins_count.to_f / guests_count) * 100).round(2)
+    end
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/pricing_action_factory.rb

@@ -6,4 +6,8 @@ FactoryBot.define do
   factory :pricing_action_guest_adjustments, class: 'SpreeCmCommissioner::PricingActions::CreateGuestAdjustments' do
     association :pricing_rule_group, factory: :pricing_rule_group
   end
+
+  factory :pricing_action_route_adjustment, class: 'SpreeCmCommissioner::PricingActions::CreateRouteAdjustments' do
+    association :pricing_rule_group, factory: :pricing_rule_group
+  end
 end

data/lib/spree_cm_commissioner/test_helper/factories/pricing_model_route_factory.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :cm_pricing_model_route, class: 'SpreeCmCommissioner::PricingModelRoute' do
+    association :pricing_model, factory: :cm_pricing_model
+    association :route, factory: :cm_route
+    association :origin_place, factory: :cm_place
+    association :destination_place, factory: :cm_place
+  end
+end

data/lib/spree_cm_commissioner/transit/leg.rb

@@ -1,10 +1,11 @@
 module SpreeCmCommissioner::Transit
   class Leg
-    attr_accessor :direction, :trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id, :seat_selections
+    attr_accessor :direction, :trip_id, :main_trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id, :seat_selections
 
     def initialize(options = {})
       @direction = options[:direction]
       @trip_id = options[:trip_id]
+      @main_trip_id = options[:main_trip_id]
       @boarding_trip_stop_id = options[:boarding_trip_stop_id]
       @drop_off_trip_stop_id = options[:drop_off_trip_stop_id]
       @seat_selections = options[:seat_selections] || []
@@ -14,6 +15,7 @@ module SpreeCmCommissioner::Transit
       new(
         direction: hash[:direction], # outbound / inbound
         trip_id: hash[:trip_id],
+        main_trip_id: hash[:main_trip_id],
         boarding_trip_stop_id: hash[:boarding_trip_stop_id],
         drop_off_trip_stop_id: hash[:drop_off_trip_stop_id],
         seat_selections: (hash[:seat_selections] || []).map { |seat_selection| SeatSelection.from_hash(seat_selection) }
@@ -28,6 +30,7 @@ module SpreeCmCommissioner::Transit
       {
         direction: @direction,
         trip_id: @trip_id,
+        main_trip_id: @main_trip_id,
         boarding_trip_stop_id: @boarding_trip_stop_id,
         drop_off_trip_stop_id: @drop_off_trip_stop_id,
         seat_selections: @seat_selections.map(&:to_h)

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.8'.freeze
+  VERSION = '2.5.10'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -30,6 +30,7 @@ require 'spree_cm_commissioner/transit/trip_stop_form'
 require 'spree_cm_commissioner/transit/service_calendar_form'
 require 'spree_cm_commissioner/intercity_taxi/map_place'
 require 'spree_cm_commissioner/distance'
+require 'spree_cm_commissioner/check_in_sessions_metric'
 
 require 'activerecord_multi_tenant'
 require 'google/cloud/recaptcha_enterprise'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.10
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-03 00:00:00.000000000 Z
+date: 2026-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -910,6 +910,7 @@ files:
 - app/controllers/spree/api/v2/operator/event_charts_controller.rb
 - app/controllers/spree/api/v2/operator/event_qrs_controller.rb
 - app/controllers/spree/api/v2/operator/event_ticket_aggregators_controller.rb
+- app/controllers/spree/api/v2/operator/guest_json_gzips_controller.rb
 - app/controllers/spree/api/v2/operator/guests_controller.rb
 - app/controllers/spree/api/v2/operator/line_items_controller.rb
 - app/controllers/spree/api/v2/operator/pie_chart_event_aggregators_controller.rb
@@ -1319,6 +1320,7 @@ files:
 - app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb
 - app/jobs/spree_cm_commissioner/ensure_event_for_product_line_item_guests_job.rb
 - app/jobs/spree_cm_commissioner/ensure_event_id_for_guests_job.rb
+- app/jobs/spree_cm_commissioner/export_job.rb
 - app/jobs/spree_cm_commissioner/firebase_email_fetcher_job.rb
 - app/jobs/spree_cm_commissioner/guests/preload_check_in_session_ids_job.rb
 - app/jobs/spree_cm_commissioner/import_order_job.rb
@@ -1444,6 +1446,7 @@ files:
 - app/models/spree_cm_commissioner/dynamic_field_option.rb
 - app/models/spree_cm_commissioner/event_ticket_google_wallet.rb
 - app/models/spree_cm_commissioner/export.rb
+- app/models/spree_cm_commissioner/exports/operator_guest_json_gzip.rb
 - app/models/spree_cm_commissioner/feature_image.rb
 - app/models/spree_cm_commissioner/front_image.rb
 - app/models/spree_cm_commissioner/google_wallet.rb
@@ -1515,7 +1518,10 @@ files:
 - app/models/spree_cm_commissioner/pricing_action.rb
 - app/models/spree_cm_commissioner/pricing_actions/create_guest_adjustments.rb
 - app/models/spree_cm_commissioner/pricing_actions/create_line_item_adjustments.rb
+- app/models/spree_cm_commissioner/pricing_actions/create_route_adjustments.rb
 - app/models/spree_cm_commissioner/pricing_model.rb
+- app/models/spree_cm_commissioner/pricing_model_handler/order.rb
+- app/models/spree_cm_commissioner/pricing_model_route.rb
 - app/models/spree_cm_commissioner/pricing_model_variant.rb
 - app/models/spree_cm_commissioner/pricing_rule.rb
 - app/models/spree_cm_commissioner/pricing_rule_group.rb
@@ -1776,6 +1782,7 @@ files:
 - app/overrides/spree/layouts/admin/map_head.html.erb.deface
 - app/presenters/spree/variants/visible_options_presenter.rb
 - app/queries/spree_cm_commissioner/accommodation_query.rb
+- app/queries/spree_cm_commissioner/check_in_sessions_metrics_query.rb
 - app/queries/spree_cm_commissioner/dashboard_crew_event_query.rb
 - app/queries/spree_cm_commissioner/event_chart_queries.rb
 - app/queries/spree_cm_commissioner/event_ticket_aggregator_query.rb
@@ -1912,6 +1919,7 @@ files:
 - app/serializers/spree_cm_commissioner/v2/operator/dashboard_crew_event_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/event_qr_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/event_ticket_aggregator_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/operator/export_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/guest_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/line_item_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/order_serializer.rb
@@ -2043,9 +2051,9 @@ files:
 - app/services/spree_cm_commissioner/intercity_taxi_order/calculate_distance.rb
 - app/services/spree_cm_commissioner/intercity_taxi_order/create.rb
 - app/services/spree_cm_commissioner/intercity_taxi_order/update.rb
-- app/services/spree_cm_commissioner/line_items/apply_pricing_models.rb
 - app/services/spree_cm_commissioner/line_items/sync_event_date.rb
 - app/services/spree_cm_commissioner/metafields/product_metadata_service.rb
+- app/services/spree_cm_commissioner/operator_guest_json_gzips/create.rb
 - app/services/spree_cm_commissioner/order_params_checker.rb
 - app/services/spree_cm_commissioner/orders/bulk_archive_inactive_orders.rb
 - app/services/spree_cm_commissioner/orders/daily_archive_inactive_orders.rb
@@ -2056,7 +2064,6 @@ files:
 - app/services/spree_cm_commissioner/organizer/export_invite_guest_csv_service.rb
 - app/services/spree_cm_commissioner/payment_method_type_mapper.rb
 - app/services/spree_cm_commissioner/penalty_calculator.rb
-- app/services/spree_cm_commissioner/pricing_models/apply.rb
 - app/services/spree_cm_commissioner/pricing_models/create_with_rule_groups.rb
 - app/services/spree_cm_commissioner/pricing_models/update_with_rule_groups.rb
 - app/services/spree_cm_commissioner/pricing_rules/build_params.rb
@@ -2998,9 +3005,15 @@ files:
 - db/migrate/20260105072450_migrate_cm_trip_stops_to_support_trip_connection.rb
 - db/migrate/20260106093359_add_contact_phone_to_cm_vendor_places.rb
 - db/migrate/20260108101406_add_allow_booking_to_cm_trips.rb
+- db/migrate/20260110073000_create_cm_pricing_model_routes.rb
 - 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/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
+- db/migrate/20260204092321_add_type_to_cm_exports.rb
+- db/migrate/20260204183545_add_term_accepted_at_to_spree_orders.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -3025,6 +3038,7 @@ files:
 - lib/spree_cm_commissioner.rb
 - lib/spree_cm_commissioner/cached_inventory_item.rb
 - lib/spree_cm_commissioner/calendar_event.rb
+- lib/spree_cm_commissioner/check_in_sessions_metric.rb
 - lib/spree_cm_commissioner/distance.rb
 - lib/spree_cm_commissioner/engine.rb
 - lib/spree_cm_commissioner/factories.rb
@@ -3081,6 +3095,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/place_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_action_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_model_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/pricing_model_route_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_model_variant_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_rule_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_rule_group_factory.rb

data/app/services/spree_cm_commissioner/line_items/apply_pricing_models.rb

@@ -1,27 +0,0 @@
-module SpreeCmCommissioner
-  module LineItems
-    class ApplyPricingModels
-      prepend ::Spree::ServiceModule::Base
-
-      def call(order:, line_item:)
-        return success(nil) if line_item.blank?
-
-        return success(line_item) unless order&.persisted?
-        return success(line_item) if line_item.variant.blank?
-
-        active_pricing_models = line_item.variant.pricing_models.active
-        return success(line_item) unless active_pricing_models.exists?
-
-        line_item.adjustments.pricing_action.delete_all
-
-        active_pricing_models.each do |pricing_model|
-          SpreeCmCommissioner::PricingModels::Apply.new(
-            line_item: line_item,
-            pricing_model: pricing_model
-          ).call
-        end
-        success(line_item)
-      end
-    end
-  end
-end

data/app/services/spree_cm_commissioner/pricing_models/apply.rb

@@ -1,43 +0,0 @@
-module SpreeCmCommissioner
-  module PricingModels
-    class Apply
-      def initialize(line_item:, pricing_model:)
-        @line_item = line_item
-        @pricing_model = pricing_model
-      end
-
-      def call
-        pricing_model.pricing_rule_groups.each do |group|
-          apply_group(group, line_item)
-        end
-      end
-
-      private
-
-      attr_reader :line_item, :pricing_model
-
-      def apply_group(group, line_item)
-        eligible_rules = group.pricing_rules.select { |r| r.eligible?(line_item) }
-
-        return if eligible_rules.empty?
-
-        if group_eligible?(group, eligible_rules)
-          group.pricing_action&.perform(line_item)
-        else
-          Rails.logger.info("Group #{group.id} not eligible for line_item #{line_item.id}")
-        end
-      end
-
-      def group_eligible?(group, eligible_rules)
-        case group.match_type
-        when 'all'
-          eligible_rules.size == group.pricing_rules.size
-        when 'any'
-          eligible_rules.any?
-        else
-          false
-        end
-      end
-    end
-  end
-end