spree_cm_commissioner 2.5.1.pre.pre2 → 2.5.1.pre.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20effeac142fface8df473f26f1a62707092ee81066953512b51f0a021657fa0
-  data.tar.gz: 82ffb806998821e0432c86aaabbe664b87d076453419926c392935e55b11d517
+  metadata.gz: 2ee953cf63ab26a979ddaa919500a3f7da95e812f8dc20557cb54411047821b6
+  data.tar.gz: bb72deade157e1dde753706bc7a9ad4dbfd329ebb0fc7290074983bdc3d17eca
 SHA512:
-  metadata.gz: 944769159e8f13b6be0cfb8fda0929fb2ef5c19716c882aa7cfa0a16847820e19657e52cc50f831995c85a24299cb73f6d346a82f08483f702461f20f81199ea
-  data.tar.gz: fd28f9f3960e2bd0967e42d91f0434165f383fedf3c0e330fd812cce1a2ccea2921e1f07e380bbf8bd426a2e18adb5732974322b2083f2578b160cb57bd480f1
+  metadata.gz: e4db3651d96a7e492cc13d3755ba0ec2f8474f49cbe5918e1af02855dba9d74786feacf7215806f3fb744919a710378ff25551829319ec96740d1d42f3d19d02
+  data.tar.gz: 5f28bd001f3cc004058ccbdb253dd9b7614aa6ecdef0673da30ba03492abd900dfe3c48b2af18cfccd2c8f228c9753e0c9c3c51f896be6e13b5d6e23cc478c54

data/Gemfile.lock

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

data/app/controllers/spree/api/chatrace/guests_controller.rb

@@ -27,32 +27,52 @@ module Spree
           end
         end
 
+        def serialize_resource(guest)
+          guest_auto_payload(guest)
+            .merge(default_payload(guest))
+            .merge(dynamic_field_key_value(guest))
+        end
+
+        private
+
+        # In API Response eg: "field_17": "chhunlin", "field_18": "on",......
         def dynamic_field_key_value(guest)
           guest.guest_dynamic_fields
                .includes(:dynamic_field)
                .to_h do |gdf|
-            key = gdf.dynamic_field.label
-                     .parameterize
-                     .underscore
+            label = "field_#{gdf.dynamic_field.id}"
 
-            [key, gdf.value]
+            value = gdf.value.strip
+
+            [label, value]
           end
         end
 
-        def serialize_resource(guest)
+        EXCLUDED_GUEST_COLUMNS = %w[
+          id created_at updated_at occupation_id event_id nationality_id
+          preferences upload_later social_contact_platform user_id
+          bib_number bib_prefix bib_index public_metadata private_metadata
+          seat_number intel_phone_number block_id saved_guest_id
+          data_fill_stage_phase
+        ].freeze
+
+        def guest_base_columns
+          SpreeCmCommissioner::Guest.column_names - EXCLUDED_GUEST_COLUMNS
+        end
+
+        def guest_auto_payload(guest)
+          guest_base_columns.index_with do |column|
+            guest.public_send(column)
+          end
+        end
+
+        def default_payload(guest) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
           order = guest.line_item.order
 
-          base_payload = {
-            token: guest.token,
-            first_name: guest.first_name,
-            last_name: guest.last_name,
-            dob: guest.dob,
-            gender: guest.gender,
-            age: guest.age,
+          {
+            guest_nationality: guest.nationality&.name,
+            guest_id_card_type: guest.id_card&.card_type,
             occupation: guest.occupation&.name || guest.other_occupation,
-            entry_type: guest.entry_type,
-            organization: guest.other_organization,
-            expectation: guest.expectation,
             telegram_user_id: guest.preferred_telegram_user_id,
             telegram_user_verified_at: guest.preferred_telegram_user_verified_at,
             order_number: order.number,
@@ -63,13 +83,10 @@ module Spree
             checked_in_at: guest.earliest_check_in&.created_at,
             qr_data: guest.qr_data,
             order_qr_data: order.qr_data,
-            country_code: guest.country_code,
-            line_item_id: guest.line_item_id,
             order_token: order.token,
-            bib: guest.formatted_bib_number
+            bib: guest.formatted_bib_number,
+            line_item_option_text: guest.line_item&.options_text
           }
-
-          base_payload.merge(dynamic_field_key_value(guest))
         end
       end
     end

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

@@ -8,6 +8,15 @@ module Spree
           def create
             spree_authorize! :create, model_class
 
+            # Optional QR data from a scanned user QR code.
+            # - If provided, the system will validate the QR data before check-in.
+            # - If omitted, check-in proceeds normally (e.g. manual search by operator).
+            # This is only for validating scanned QR codes; operators can always check in guests without it.
+            if params[:scanned_user_qr_data].present?
+              result = SpreeCmCommissioner::Users::QrData::Verify.call(qr_data: params[:scanned_user_qr_data])
+              return render_error_payload(result.error) if result.failure?
+            end
+
             check_ins = []
 
             if params[:check_ins].present?

data/app/controllers/spree/api/v2/storefront/account/qr_data_controller.rb

@@ -0,0 +1,30 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module Account
+          class QrDataController < ::Spree::Api::V2::ResourceController
+            before_action :require_spree_current_user
+
+            # override
+            # invalidate existing QR data and return new QR data with user info.
+            def update
+              result = SpreeCmCommissioner::Users::QrData::Invalidate.call(user: spree_current_user)
+
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value) }
+              else
+                render_error_payload(result.error)
+              end
+            end
+
+            # override
+            def resource_serializer
+              Spree::V2::Storefront::UserSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/popular_route_places_controller.rb

@@ -31,7 +31,7 @@ module Spree
 
           # override
           def collection_finder
-            SpreeCmCommissioner::RouteMetrics::FindPopular
+            SpreeCmCommissioner::Routes::FindPopular
           end
 
           # override

data/app/controllers/spree/api/v2/storefront/transit/draft_orders_controller.rb

@@ -15,7 +15,7 @@ module Spree
               @outbound_legs = params[:outbound_legs].is_a?(Array) && params[:outbound_legs].any? ? build_legs(:outbound, params[:outbound_legs]) : []
               @inbound_legs  = params[:inbound_legs].is_a?(Array) && params[:inbound_legs].any? ? build_legs(:inbound, params[:inbound_legs]) : []
 
-              result = SpreeCmCommissioner::TransitOrder::Create.call(
+              context = SpreeCmCommissioner::Transit::DraftOrderCreator.call(
                 outbound_date: params[:outbound_date]&.to_date,
                 inbound_date: params[:inbound_date]&.to_date,
                 outbound_legs: @outbound_legs,
@@ -23,10 +23,10 @@ module Spree
                 user: spree_current_user
               )
 
-              if result.success?
-                render_serialized_payload { serialize_resource(result.value[:order]) }
+              if context.success?
+                render_serialized_payload { serialize_resource(context.order) }
               else
-                render_error_payload(result.error)
+                render_error_payload(context.message)
               end
             end
 

data/app/controllers/spree/transit/trips_controller.rb

@@ -48,13 +48,13 @@ module Spree
         boarding_points_attributes = (cm_params.delete('boarding_points') || []).compact_blank
                                                                                 .map do |point_id|
           trip_stop = trip_stops.delete(point_id.to_i)
-          { stop_id: point_id, allow_boarding: true, id: trip_stop.try(:id) }
+          { stop_id: point_id, stop_type: 'boarding', id: trip_stop.try(:id) }
         end
 
         drop_off_points_attributes = (cm_params.delete('drop_off_points') || []).compact_blank
                                                                                 .map do |point_id|
           trip_stop = trip_stops.delete(point_id.to_i)
-          { stop_id: point_id, allow_drop_off: true, id: trip_stop.try(:id) }
+          { stop_id: point_id, stop_type: 'drop_off', id: trip_stop.try(:id) }
         end
 
         trip_stops.each_value do |trip_stop|
@@ -74,7 +74,7 @@ module Spree
           :origin_id, :destination_id, :vehicle_id, :hours, :minutes, :seconds,
           'departure_time(1i)', 'departure_time(2i)', 'departure_time(3i)',
           'departure_time(4i)', 'departure_time(5i)', :product_id,
-          trip_stops_attributes: %i[stop_id allow_boarding allow_drop_off _destroy id]
+          trip_stops_attributes: %i[stop_id stop_type _destroy id]
         )
       end
 

data/app/finders/spree_cm_commissioner/places/find_with_route.rb

@@ -1,20 +1,20 @@
-# Finds places connected via route metrics with optional filtering.
+# Finds places connected via routes with optional filtering.
 #
 # @param place_type [String] Required. 'origin' or 'destination'
 # @param place_id [Integer] Optional. Filter by connected place ID
 # @param query [String] Optional. Filter by place name (case-insensitive)
-# @param route_type [Symbol, String] Optional. Filter by route type from route metrics (e.g., :ferry, :bus)
+# @param route_type [Symbol, String] Optional. Filter by route type from associated trips (e.g., :ferry, :bus)
 #
 # @return [ActiveRecord::Relation<SpreeCmCommissioner::Place>]
 #
 # Modes:
 #   - place_id only: returns connected places (origins TO or destinations FROM given place)
 #   - query only: filters by name
-#   - route_type only: filters by route type on route metrics
+#   - route_type only: filters by trip route types on those routes
 #   - combinations: connected places filtered by name and/or route type
-#   - neither: all origins/destinations in route metrics
+#   - neither: all origins/destinations in routes
 #
-# @example Origins with ferry route metrics to place 123
+# @example Origins with ferry trips to place 123
 #   FindWithRoute.new(place_type: 'origin', place_id: 123, route_type: :ferry).execute
 #
 # @example Destinations filtered by query and route type
@@ -46,14 +46,14 @@ module SpreeCmCommissioner
       def scope
         return SpreeCmCommissioner::Place.none unless valid_place_type?
 
-        base_scope = origin? ? SpreeCmCommissioner::Place.with_route_metrics_as_origin : SpreeCmCommissioner::Place.with_route_metrics_as_destination
+        base_scope = origin? ? SpreeCmCommissioner::Place.with_routes_as_origin : SpreeCmCommissioner::Place.with_routes_as_destination
 
         return base_scope if place_id.blank?
 
         if origin?
-          base_scope.where(route_metrics_as_origin: { destination_place_id: place_id })
+          base_scope.where(routes_as_origin: { destination_place_id: place_id })
         else
-          base_scope.where(route_metrics_as_destination: { origin_place_id: place_id })
+          base_scope.where(routes_as_destination: { origin_place_id: place_id })
         end
       end
 
@@ -62,10 +62,10 @@ module SpreeCmCommissioner
       end
 
       def apply_route_type_filter(result)
-        # Use the association name as the table alias in the WHERE clause
-        # This works whether the association is already joined or not
-        association_name = origin? ? :route_metrics_as_origin : :route_metrics_as_destination
-        result.where(association_name => { route_type: route_type.to_sym })
+        trips_association = origin? ? :trips_as_origin : :trips_as_destination
+        result.joins(trips_association)
+              .where(cm_trips: { route_type: route_type.to_sym })
+              .distinct
       end
 
       def origin?

data/app/finders/spree_cm_commissioner/routes/find_popular.rb

@@ -1,31 +1,46 @@
-# Finder to get popular route metrics scoped to a vendor or tenant.
-# Orders by fulfilled_order_count DESC, then order_count DESC.
-# Usage:
-#   finder = SpreeCmCommissioner::Routes::FindPopular.new(vendor: vendor, route_type: :bus, limit: 10)
-#   finder.execute
+# Finds routes ordered by popularity based on order metrics.
+#
+# Routes are sorted by:
+# 1. fulfilled_order_count (completed orders) - DESC
+# 2. order_count (total orders including incomplete) - DESC
+#
+# @param route_type [Symbol, String] Optional. Filter by route type from associated trips (e.g., :ferry, :bus)
+#
+# @return [ActiveRecord::Relation<SpreeCmCommissioner::Route>] Routes with origin and destination places loaded,
+#   ordered from most to least popular
+#
+# @example Get all popular routes
+#   finder = SpreeCmCommissioner::Routes::FindPopular.new
+#   finder.execute # => Returns all routes sorted by fulfillment and order counts
+#
+# @example Get popular ferry routes
+#   finder = SpreeCmCommissioner::Routes::FindPopular.new
+#   finder.execute(route_type: :ferry) # => Returns ferry routes sorted by popularity
+#
+# @example Get popular bus routes
+#   finder = SpreeCmCommissioner::Routes::FindPopular.new
+#   finder.execute(route_type: :bus) # => Returns bus routes sorted by popularity
 
 module SpreeCmCommissioner
   module Routes
     class FindPopular
-      def initialize(vendor: nil, tenant: nil, route_type: nil, limit: 20)
-        @vendor = vendor
-        @tenant = tenant
-        @route_type = route_type
-        @limit = limit.to_i
-      end
-
-      def execute
-        scope = SpreeCmCommissioner::Route.includes(:origin_place, :destination_place, :route_photos)
-        scope = scope.where(vendor_id: vendor.id) if vendor.present?
-        scope = scope.where(tenant_id: tenant.id) if tenant.present?
-        scope = scope.where(route_type: route_type.to_sym) if route_type.present?
-        scope.order(fulfilled_order_count: :desc, order_count: :desc)
-             .limit(limit)
+      def execute(route_type: nil, query: nil)
+        scope(route_type: route_type, query: query)
       end
 
       private
 
-      attr_reader :vendor, :tenant, :route_type, :limit
+      def scope(route_type:, query:)
+        includes_associations = %i[origin_place destination_place]
+        includes_associations << :trips if route_type.present?
+        result = SpreeCmCommissioner::Route.includes(*includes_associations)
+
+        result = result.joins(:trips).where(cm_trips: { route_type: route_type.to_sym }) if route_type.present?
+
+        result = result.where('cm_routes.route_name ILIKE ?', "%#{query}%") if query.present?
+
+        result.distinct.order(fulfilled_order_count: :desc, order_count: :desc)
+      end
     end
   end
 end

data/app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb

@@ -33,18 +33,11 @@ module SpreeCmCommissioner
         end
       end
 
-      # Returns dates for which inventory should be generated, based on calendar or default period.
       def inventory_dates_for(variant)
-        calendar = variant.product&.service_calendar
+        start_date = Time.zone.tomorrow
+        end_date = Time.zone.today + pre_inventory_days_for(variant)
 
-        if calendar.present?
-          calendar.start_date.upto(calendar.end_date).select { |date| calendar.service_available?(date) }
-        else
-          start_date = Time.zone.tomorrow
-          end_date = Time.zone.today + pre_inventory_days_for(variant)
-
-          start_date.upto(end_date).to_a
-        end
+        (start_date..end_date)
       end
 
       def inventory_exist?(variant, inventory_date)
@@ -75,7 +68,7 @@ module SpreeCmCommissioner
       def variants
         scope = Spree::Variant.active.with_permanent_stock.where(is_master: false)
         scope = scope.where(id: variant_ids) if variant_ids.present?
-        scope.includes(product: :service_calendar)
+        scope
       end
     end
   end

data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb

@@ -8,8 +8,7 @@ module SpreeCmCommissioner
 
         return context.fail!(message: Spree.t(:doesnt_track_inventory)) unless variant.track_inventory?
 
-        stock_location = resolve_stock_location(variant, stock_location_id)
-
+        stock_location = Spree::StockLocation.find(stock_location_id)
         stock_movement = stock_location.stock_movements.build(stock_movement_params)
         stock_movement.stock_item = stock_location.set_up_stock_item(variant)
 
@@ -23,14 +22,6 @@ module SpreeCmCommissioner
 
       private
 
-      def resolve_stock_location(variant, stock_location_id = nil)
-        if stock_location_id.present?
-          Spree::StockLocation.find(stock_location_id)
-        else
-          variant.vendor.stock_locations.first || variant.vendor.send(:create_stock_location)
-        end
-      end
-
       def adjust_inventory_items_async(variant_id, quantity)
         args = { variant_id: variant_id, quantity: quantity }
         CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: args) do

data/app/{services/spree_cm_commissioner/transit_order/create.rb → interactors/spree_cm_commissioner/transit/draft_order_creator.rb}

@@ -1,4 +1,4 @@
-# SpreeCmCommissioner::TransitOrder::Create creates a new order for a entire journey, including outbound and (if present) inbound directions.
+# DraftOrderCreator creates a new order for a entire journey, including outbound and (if present) inbound directions.
 #
 # Attributes:
 # - outbound_date: [Date] The date of outbound transit
@@ -12,22 +12,25 @@
 #
 # Note: inbound_legs and inbound_date are optional; the order may represent a one-way (outbound only) journey.
 module SpreeCmCommissioner
-  module TransitOrder
-    class Create
-      prepend ::Spree::ServiceModule::Base
+  module Transit
+    class DraftOrderCreator < BaseInteractor
+      delegate :outbound_date,
+               :inbound_date,
+               :outbound_legs,
+               :inbound_legs,
+               :user, to: :context
 
-      def call(outbound_date:, inbound_date:, outbound_legs:, inbound_legs: [], user: nil)
-        return failure(nil, 'Outbound legs are missing') if outbound_legs.blank?
+      def call
+        return context.fail!(message: 'Outbound legs are missing') if outbound_legs.blank?
 
         begin
-          order = create_order!(outbound_date, inbound_date, outbound_legs, inbound_legs, user)
-          success(order: order)
+          context.order = create_order!
         rescue StandardError => e
-          failure(nil, e.message)
+          context.fail!(message: e.message)
         end
       end
 
-      def create_order!(outbound_date, inbound_date, outbound_legs, inbound_legs, user)
+      def create_order!
         order = Spree::Order.new(state: 'cart', use_billing: true, user: user)
 
         outbound_line_items = build_line_items_for_legs!(order: order, legs: outbound_legs, initial_date: outbound_date)
@@ -109,10 +112,10 @@ module SpreeCmCommissioner
 
       def insert_saved_guests_per_line_items_leg(line_items)
         line_items.flat_map(&:guests).each_with_index do |guest, index|
-          @saved_guests ||= []
-          @saved_guests << SpreeCmCommissioner::SavedGuest.new if @saved_guests[index].blank?
+          context.saved_guests ||= []
+          context.saved_guests << SpreeCmCommissioner::SavedGuest.new if context.saved_guests[index].blank?
 
-          guest.saved_guest = @saved_guests[index]
+          guest.saved_guest = context.saved_guests[index]
         end
 
         line_items

data/app/interactors/spree_cm_commissioner/trip_clone_creator.rb

@@ -91,10 +91,9 @@ module SpreeCmCommissioner
       stop_params = params.dig(:trip_stops_attributes, index.to_s)
       return unless stop_params
 
-      cloned_stop.departure_time = parse_time(stop_params[:departure_time])
-      cloned_stop.arrival_time = parse_time(stop_params[:arrival_time])
-      cloned_stop.allow_boarding = stop_params[:allow_boarding] if stop_params.key?(:allow_boarding)
-      cloned_stop.allow_drop_off = stop_params[:allow_drop_off] if stop_params.key?(:allow_drop_off)
+      cloned_stop.departure_time    = parse_time(stop_params[:departure_time])
+      cloned_stop.arrival_time      = parse_time(stop_params[:arrival_time])
+      cloned_stop.stop_type         = stop_params[:stop_type].presence
       cloned_stop.location_place_id = stop_params[:location_place_id].presence
     end
 

data/app/interactors/spree_cm_commissioner/trip_stops_creator.rb

@@ -26,7 +26,7 @@ module SpreeCmCommissioner
         trip: trip,
         stop_place: origin_place,
         location_place: origin_place,
-        allow_boarding: true
+        stop_type: :boarding
       }
 
       attributes[:departure_time] = departure_time
@@ -42,7 +42,7 @@ module SpreeCmCommissioner
         trip: trip,
         stop_place: destination_place,
         location_place: destination_place,
-        allow_drop_off: true
+        stop_type: :drop_off
       }
 
       attributes[:arrival_time] = departure_time + duration_seconds.seconds

data/app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb

@@ -1,8 +1,8 @@
 module SpreeCmCommissioner
   module Stock
     class PermanentInventoryItemsGeneratorJob < ApplicationUniqueJob
-      def perform(options = {})
-        SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(options)
+      def perform
+        SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call
       end
     end
   end

data/app/jobs/spree_cm_commissioner/transit/route_fulfilled_order_count_incrementer_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteFulfilledOrderCountIncrementerJob < ApplicationUniqueJob
+      def perform(options = {})
+        order = Spree::Order.find(options[:order_id])
+        SpreeCmCommissioner::Routes::IncrementFulfilledOrderCount.call(order: order)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/transit/route_order_count_incrementer_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteOrderCountIncrementerJob < ApplicationUniqueJob
+      def perform(options = {})
+        order = Spree::Order.find(options[:order_id])
+        SpreeCmCommissioner::Routes::IncrementOrderCount.call(order: order)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/transit/route_previous_trip_count_decrementer_job.rb

@@ -0,0 +1,13 @@
+# Perform the previous-route decrement outside the Trip transaction.
+
+module SpreeCmCommissioner
+  module Transit
+    class RoutePreviousTripCountDecrementerJob < ApplicationUniqueJob
+      queue_as :default
+
+      def perform(options = {})
+        SpreeCmCommissioner::Routes::DecrementPreviousTripCount.call(previous_route_id: options[:previous_route_id])
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_decrementer_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteTripCountDecrementerJob < ApplicationUniqueJob
+      def perform(options = {})
+        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
+        SpreeCmCommissioner::Routes::DecrementTripCount.call(trip: trip)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_incrementer_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteTripCountIncrementerJob < ApplicationUniqueJob
+      def perform(options = {})
+        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
+        SpreeCmCommissioner::Routes::IncrementTripCount.call(trip: trip)
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module SpreeCmCommissioner
       state_machine.before_transition to: :payment, do: :ensure_blocks_held
 
       state_machine.before_transition to: :complete, do: :request, if: :need_confirmation?
-      state_machine.before_transition to: :complete, do: :generate_bib_number
+      state_machine.before_transition to: :complete, do: :finalize_guests_and_bibs
       state_machine.before_transition to: :complete, do: :generate_completion_steps!, if: :product_completion_steps_exist?
 
       state_machine.after_transition to: :complete, do: :precalculate_conversion
@@ -168,21 +168,26 @@ module SpreeCmCommissioner
       end
     end
 
-    def generate_bib_number
-      line_items.find_each(&:generate_remaining_guests)
-
-      line_items.with_bib_prefix.each do |line_item|
-        line_item.guests.none_bib.each do |guest|
-          guest.generate_bib
-          next if guest.save
+    def finalize_guests_and_bibs
+      ActiveRecord::Base.transaction do
+        line_items.each do |line_item|
+          line_item.generate_remaining_guests
 
-          guest.errors.each do |msg|
-            errors.add(:guests, msg)
+          line_item.guests.each do |guest|
+            guest.user = user if user.present?
+            guest.generate_bib_if_needed
+            guest.save!
           end
         end
       end
 
-      errors.empty?
+      true
+    rescue ActiveRecord::RecordInvalid => e
+      e.record.errors.each do |msg|
+        errors.add(:guests, msg)
+      end
+
+      false
     end
 
     def rejected_by(user)

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

@@ -7,13 +7,13 @@ module SpreeCmCommissioner
     def increment_route_fulfilled_order_count
       return unless has_trip_ids?
 
-      SpreeCmCommissioner::RouteMetrics::IncreaseFulfilledOrderCountJob.perform_later(order_id: id)
+      SpreeCmCommissioner::Transit::RouteFulfilledOrderCountIncrementerJob.perform_later(order_id: id)
     end
 
     def increment_route_order_count
       return unless has_trip_ids?
 
-      SpreeCmCommissioner::RouteMetrics::IncreaseOrderCountJob.perform_later(order_id: id)
+      SpreeCmCommissioner::Transit::RouteOrderCountIncrementerJob.perform_later(order_id: id)
     end
   end
 end