spree_cm_commissioner 2.5.0.pre.pre13 → 2.5.0.pre.pre14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a830fb7087d89f6789c9a4e0cad9c3d98d782e00d4c79cd6d4a47f9bb17cdb7f
-  data.tar.gz: 29f6d23d6c75f2770f021c162167b67c2fadac360887ec88302b8ede9aab9d31
+  metadata.gz: 1a284ecbc4094b414d407ecc02ee8892b199ff39ea3049b79c9ab9feb1f56545
+  data.tar.gz: 0df5f1a16d68f0927ccbff0e265c7984343853f31e2c6d9473b0818f5013a9ef
 SHA512:
-  metadata.gz: 88d46953b8a89c7240b78a3f546813617bd3787212a304b20a9d9b62ded7a00e7fb9e4089c22452969e6bf713463eddc3a954137c13b8cf2f11e95d809f7eb01
-  data.tar.gz: cef3c5a4743aacd9e4833700b6fef3ef9078d58f58122aaec68e8903c0f1a79681dff5a41126ecffcf2d04f5ec3892fc5a92e1bb421a277587db5f4213a78f64
+  metadata.gz: fb468b68eaeeecb491b899a84f5bb6153bb26d7bd29dfe13713dc98226e7e0e1e67ba33646212193b30730ba6bfbb250f652a2f4b4ca6f7ba783d252fd8d0de2
+  data.tar.gz: 5e9cfb969a2d94bda9a23f2ef5bfe8382705d5df502458eba98ad5eb9082e1f9bfee08ef258555548834240ae2c5241b9091c00e0bd39cab58c8c975fa2dc2f7

data/.env.example

@@ -27,3 +27,7 @@ VATTANAC_PUBLIC_KEY=""
 
 # Organizer URL
 ORGANIZER_URL=http://127.0.0.1:4000/organizer
+
+# Use to sign & verify Distance object:
+# spree_cm_commissioner/distance.rb
+DISTANCE_SIGNING_KEY=hei********************VY

data/Gemfile.lock

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

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

@@ -32,42 +32,16 @@ module Spree
       end
 
       # POST
-      def invalidate_api_caches # rubocop:disable Metrics/CyclomaticComplexity
+      def invalidate_api_caches
         if params[:model].present?
-          model = case params[:model]
-                  when 'SpreeCmCommissioner::HomepageSection'
-                    SpreeCmCommissioner::HomepageSection
-                  when 'SpreeCmCommissioner::HomepageBackground'
-                    SpreeCmCommissioner::HomepageBackground
-                  when 'Spree::Menu'
-                    Spree::Menu
-                  when 'Spree::Taxon'
-                    Spree::Taxon
-                  when 'Spree::Product'
-                    Spree::Product
-                  else
-                    flash[:error] = 'Invalid model provided' # rubocop:disable Rails/I18nLocaleTexts
-                    redirect_back fallback_location: admin_root_path and return
-                  end
+          result = SpreeCmCommissioner::ApiCaches::Invalidate.call(
+            model: params[:model],
+            id: params[:id]
+          )
 
-          model.find_each(&:touch)
-          api_patterns_map = {
-            SpreeCmCommissioner::HomepageSection => '/api/v2/storefront/homepage/*',
-            SpreeCmCommissioner::HomepageBackground => '/api/v2/storefront/homepage/*',
-            Spree::Menu => '/api/v2/storefront/menus*',
-            Spree::Taxon => '/api/v2/storefront/taxons*',
-            Spree::Product => '/api/v2/storefront/products*'
-          }
-          api_patterns = api_patterns_map[model]
-
-          if api_patterns.is_a?(Array)
-            api_patterns.each { |pattern| SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(pattern: pattern) }
-          elsif api_patterns.is_a?(String)
-            SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(pattern: api_patterns)
-          elsif params[:api_pattern].present?
-            SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(pattern: params[:api_pattern])
-          end
+          flash[:error] = result.error if result.failure?
         end
+
         redirect_back fallback_location: admin_root_path
       end
 

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

@@ -42,18 +42,11 @@ module Spree
           end
 
           def update
-            spree_authorize! :update, spree_current_order, order_token
+            spree_authorize! :update, spree_current_order, order_token unless guest_for_update.pre_registration?
 
             begin
-              ActiveRecord::Base.transaction do
-                process_dynamic_fields(guest_params[:guest_dynamic_fields_attributes]) if guest_params[:guest_dynamic_fields_attributes]
-
-                resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
-                resource.save!
-              end
-
-              resource.save_and_move_to_next_stage
-              render_serialized_payload { serialize_resource(resource) }
+              SpreeCmCommissioner::UpdateGuestService.new(guest_for_update, guest_params).call
+              render_serialized_payload { serialize_resource(guest_for_update) }
             rescue ActiveRecord::RecordInvalid => e
               render_error_payload(e.record.errors, 422)
             end
@@ -70,6 +63,10 @@ module Spree
             @parent ||= spree_current_order.line_items.find(params[:line_item_id])
           end
 
+          def guest_for_update
+            @guest_for_update ||= SpreeCmCommissioner::Guest.find(params[:id])
+          end
+
           def guest_params
             params.permit(
               :first_name,
@@ -93,47 +90,6 @@ module Spree
               guest_dynamic_fields_attributes: %i[id dynamic_field_id dynamic_field_option_id value _destroy]
             )
           end
-
-          def process_dynamic_fields(dynamic_fields_attributes)
-            dynamic_fields_attributes.each do |raw_attributes|
-              attributes = raw_attributes.to_h.symbolize_keys
-
-              if ActiveModel::Type::Boolean.new.cast(attributes[:_destroy])
-                destroy_guest_dynamic_field(attributes[:id])
-                next
-              end
-
-              upsert_guest_dynamic_field(attributes)
-            end
-          end
-
-          def associate_dynamic_field_option(field)
-            return unless field.dynamic_field&.requires_dynamic_field_options?
-
-            option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
-            field.dynamic_field_option = option
-          end
-
-          def destroy_guest_dynamic_field(id)
-            return if id.blank?
-
-            resource.guest_dynamic_fields.find(id).destroy!
-          end
-
-          def upsert_guest_dynamic_field(attributes)
-            field = find_or_initialize_guest_dynamic_field(attributes)
-            field.assign_attributes(attributes.except(:id, :_destroy))
-            associate_dynamic_field_option(field) if field.dynamic_field.present?
-            field.save!
-          end
-
-          def find_or_initialize_guest_dynamic_field(attributes)
-            if attributes[:id].present?
-              resource.guest_dynamic_fields.find(attributes[:id])
-            else
-              resource.guest_dynamic_fields.find_or_initialize_by(dynamic_field_id: attributes[:dynamic_field_id])
-            end
-          end
         end
       end
     end

data/app/controllers/spree/api/v2/storefront/intercity_taxi/distance_calculator_controller.rb

@@ -0,0 +1,47 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module IntercityTaxi
+          class DistanceCalculatorController < ::Spree::Api::V2::ResourceController
+            include Spree::Api::V2::Storefront::OrderConcern
+            include SpreeCmCommissioner::OrderConcern
+
+            def create
+              result = SpreeCmCommissioner::CalculateDistance.call(
+                pickups_attributes: Array(params[:pickups_attributes]).map do |pickup|
+                  {
+                    lat: pickup[:lat],
+                    lng: pickup[:lng]
+                  }
+                end,
+                dropoffs_attributes: Array(params[:dropoffs_attributes]).map do |dropoff|
+                  {
+                    lat: dropoff[:lat],
+                    lng: dropoff[:lng]
+                  }
+                end,
+                pickup_oob_confirmed: params[:pickup_oob_confirmed],
+                dropoff_oob_confirmed: params[:dropoff_oob_confirmed],
+                trip_id: params[:trip_id]
+              )
+
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value) }
+              else
+                render_error_payload(result.error)
+              end
+            end
+
+            private
+
+            # override
+            def resource_serializer
+              SpreeCmCommissioner::V2::Storefront::DistanceSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -29,27 +29,29 @@ module Spree
               result = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
                 order: spree_current_order,
                 remark: params[:remark],
-                pickup_map_place_attributes: params.require(:pickup_map_place_attributes).permit(
+                pickup_map_place_attributes: params[:pickup_map_place_attributes]&.permit(
                   :place_name,
                   :lat,
                   :lng,
                   :oob_confirmed
                 ),
-                dropoff_map_place_attributes: params.require(:dropoff_map_place_attributes).permit(
+                dropoff_map_place_attributes: params[:dropoff_map_place_attributes]&.permit(
                   :place_name,
                   :lat,
                   :lng,
                   :oob_confirmed
                 ),
-                distance_attributes: params.require(:distance_attributes).permit(
+                distance_attributes: params[:distance_attributes]&.permit(
                   :distance_km,
-                  :ordered_points,
+                  { ordered_points: %i[lat lng] },
                   :estimated_time_minutes,
                   :base_km,
                   :detour_pickup_km,
                   :detour_dropoff_km,
                   :extra_pickup_km,
-                  :extra_dropoff_km
+                  :extra_dropoff_km,
+                  :signed_at,
+                  :signature
                 )
               )
 

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

@@ -63,8 +63,8 @@ module Spree
             [
               'trips.vendor',
               'trips.vendor.logo',
-              'trips.vehicle',
-              'trips.vehicle.vehicle_photos',
+              'trips.vehicle_type',
+              'trips.vehicle_type.vehicle_photos',
               'trips.amenities'
             ]
           end

data/app/controllers/spree/api/v2/tenant/intercity_taxi/distance_calculator_controller.rb

@@ -0,0 +1,47 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        module IntercityTaxi
+          class DistanceCalculatorController < BaseController
+            include Spree::Api::V2::Storefront::OrderConcern
+            include SpreeCmCommissioner::OrderConcern
+
+            def create
+              result = SpreeCmCommissioner::CalculateDistance.call(
+                pickups_attributes: Array(params[:pickups_attributes]).map do |pickup|
+                  {
+                    lat: pickup[:lat],
+                    lng: pickup[:lng]
+                  }
+                end,
+                dropoffs_attributes: Array(params[:dropoffs_attributes]).map do |dropoff|
+                  {
+                    lat: dropoff[:lat],
+                    lng: dropoff[:lng]
+                  }
+                end,
+                pickup_oob_confirmed: params[:pickup_oob_confirmed],
+                dropoff_oob_confirmed: params[:dropoff_oob_confirmed],
+                trip_id: params[:trip_id]
+              )
+
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value) }
+              else
+                render_error_payload(result.error)
+              end
+            end
+
+            private
+
+            # override
+            def resource_serializer
+              SpreeCmCommissioner::V2::Storefront::DistanceSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/intercity_taxi/draft_orders_controller.rb

@@ -29,27 +29,29 @@ module Spree
               result = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
                 order: spree_current_order,
                 remark: params[:remark],
-                pickup_map_place_attributes: params.require(:pickup_map_place_attributes).permit(
+                pickup_map_place_attributes: params[:pickup_map_place_attributes]&.permit(
                   :place_name,
                   :lat,
                   :lng,
                   :oob_confirmed
                 ),
-                dropoff_map_place_attributes: params.require(:dropoff_map_place_attributes).permit(
+                dropoff_map_place_attributes: params[:dropoff_map_place_attributes]&.permit(
                   :place_name,
                   :lat,
                   :lng,
                   :oob_confirmed
                 ),
-                distance_attributes: params.require(:distance_attributes).permit(
+                distance_attributes: params[:distance_attributes]&.permit(
                   :distance_km,
-                  :ordered_points,
+                  { ordered_points: %i[lat lng] },
                   :estimated_time_minutes,
                   :base_km,
                   :detour_pickup_km,
                   :detour_dropoff_km,
                   :extra_pickup_km,
-                  :extra_dropoff_km
+                  :extra_dropoff_km,
+                  :signed_at,
+                  :signature
                 )
               )
 

data/app/controllers/spree/api/v2/tenant/trip_search_controller.rb

@@ -63,8 +63,8 @@ module Spree
             [
               'trips.vendor',
               'trips.vendor.logo',
-              'trips.vehicle',
-              'trips.vehicle.vehicle_photos',
+              'trips.vehicle_type',
+              'trips.vehicle_type.vehicle_photos',
               'trips.amenities'
             ]
           end

data/app/interactors/spree_cm_commissioner/google_routes_distance_calculator.rb

@@ -11,7 +11,6 @@ module SpreeCmCommissioner
   # - distance_km (Float)
   # - ordered_waypoints (Array<Hash>)
   # - ordered_points (Array<Hash>)
-  # - directions_url (String)
   # - estimated_time_minutes (Integer) when optimize is true
   #
   # On failure, context.fail!(message: ...) is called.
@@ -47,7 +46,6 @@ module SpreeCmCommissioner
       context.distance_km = (distance_meters / 1000.0).round(3)
       context.ordered_waypoints = ordered_waypoints
       context.ordered_points = ordered_points
-      context.directions_url = build_human_link(ordered_waypoints)
       # Only expose estimated time when optimize is enabled (per requirement)
       context.estimated_time_minutes = (@optimize ? (duration_seconds / 60.0).round : nil)
     end
@@ -196,16 +194,5 @@ module SpreeCmCommissioner
     def format_point(point)
       "#{point[:lat]},#{point[:lng]}"
     end
-
-    def build_human_link(ordered_waypoints)
-      params = {
-        api: 1,
-        origin: format_point(@origin),
-        destination: format_point(@destination),
-        travelmode: 'driving'
-      }
-      params[:waypoints] = ordered_waypoints.map { |p| format_point(p) }.join('|') if ordered_waypoints.any?
-      "https://www.google.com/maps/dir/?#{URI.encode_www_form(params)}"
-    end
   end
 end

data/app/interactors/spree_cm_commissioner/invalidate_cache_request.rb

@@ -5,7 +5,7 @@ require 'aws-sdk-cloudfront'
 
 module SpreeCmCommissioner
   class InvalidateCacheRequest < BaseInteractor
-    delegate :pattern, to: :context
+    delegate :patterns, to: :context
 
     def call
       client = ::Aws::CloudFront::Client.new(
@@ -21,8 +21,8 @@ module SpreeCmCommissioner
         invalidation_batch: {
           caller_reference: Time.now.to_i.to_s,
           paths: {
-            quantity: 1,
-            items: [pattern]
+            quantity: patterns.size,
+            items: patterns
           }
         }
       )

data/app/interactors/spree_cm_commissioner/vehicle_type_updater.rb

@@ -0,0 +1,41 @@
+module SpreeCmCommissioner
+  class VehicleTypeUpdater < BaseInteractor
+    def call
+      vehicle_type = context.vehicle_type
+      data = context.data
+
+      option_value_ids = data[:option_value_ids] || []
+      option_type_ids  = data[:option_type_ids] || []
+
+      ActiveRecord::Base.transaction do
+        update_vehicle_type!(vehicle_type, data[:vehicle_type_attributes])
+        update_amenities!(vehicle_type, option_value_ids, option_type_ids)
+      end
+
+      context.message = I18n.t('views.transit.vehicle_types.update_success')
+    rescue StandardError => e
+      context.fail!(message: "Failed to update vehicle type: #{e.message}")
+    end
+
+    private
+
+    def update_vehicle_type!(vehicle_type, attributes)
+      return if attributes.blank? || vehicle_type.update(attributes.slice(:name, :kind, :number_of_seats))
+
+      raise vehicle_type.errors.full_messages.to_sentence
+    end
+
+    def update_amenities!(vehicle_type, option_value_ids, option_type_ids)
+      vehicle_type.option_value_vehicle_types.where.not(option_value_id: option_value_ids).destroy_all
+      vehicle_type.vehicle_type_option_types.where.not(option_type_id: option_type_ids).destroy_all
+
+      option_value_ids.each do |option_value_id|
+        vehicle_type.option_value_vehicle_types.find_or_create_by(option_value_id: option_value_id)
+      end
+
+      option_type_ids.each do |option_type_id|
+        vehicle_type.vehicle_type_option_types.find_or_create_by(option_type_id: option_type_id)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/invalidate_cache_request_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class InvalidateCacheRequestJob < ApplicationUniqueJob
     def perform(options = {})
-      SpreeCmCommissioner::InvalidateCacheRequest.call(pattern: options[:pattern])
+      SpreeCmCommissioner::InvalidateCacheRequest.call(patterns: options[:patterns])
     end
   end
 end

data/app/mailers/spree/order_mailer_decorator.rb

@@ -4,7 +4,22 @@ module Spree
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       return false if @order.email.blank?
 
-      super
+      setup_tenant_and_store
+      if @tenant.present?
+        @name = @order.tenant.name
+        @logo = @order.tenant.active_vendor&.logo&.original_url
+        @brand_color = @order.tenant.preferred_brand_primary_color
+      end
+      @product_type = @order.products.first&.product_type || 'accommodation'
+
+      mail(to: @order.email,
+           from: from_email_address,
+           subject: cancel_subject(resend),
+           store_url: store_url
+          ) do |format|
+        format.html { render layout: 'spree_cm_commissioner/layouts/cancel_order_mailer' }
+        format.text
+      end
     end
 
     def confirm_email(order, resend: false)
@@ -52,6 +67,12 @@ module Spree
       "#{prefix}#{store_name} Booking Confirmation ##{@order.number}"
     end
 
+    def cancel_subject(resend)
+      prefix = resend ? "[#{Spree.t(:resend).upcase}] " : ''
+      store_name = @tenant.present? ? @tenant.name : @current_store&.name
+      "#{prefix}#{store_name} Cancellation of Order ##{@order.number}"
+    end
+
     def store_url
       @tenant.present? ? @tenant.url : @current_store.url
     end

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

@@ -0,0 +1,40 @@
+module SpreeCmCommissioner
+  module LineItemSeatSelection
+    extend ActiveSupport::Concern
+
+    included do
+      before_create :set_required_seat_selection_flag
+    end
+
+    # Caches the required_seat_selection flag from the trip in private_metadata.
+    #
+    # Why cache?
+    # Most line items don't have trips, so checking `product.trip.required_seat_selection`
+    # on every read would cause N+1 queries. Caching avoids this performance hit.
+    #
+    # Behavior:
+    # The flag is set once at line item creation and remains immutable. This preserves
+    # the historical seat selection state of the order, even if the trip's settings
+    # change later. We don't have use cases requiring dynamic updates of this yet,
+    # so we keep it constant for simplicity and consistency.
+
+    def required_seat_selection?
+      return false if private_metadata['required_seat_selection'].nil?
+
+      ActiveModel::Type::Boolean.new.cast(private_metadata['required_seat_selection'])
+    end
+
+    private
+
+    def set_required_seat_selection_flag
+      return if private_metadata.key?('required_seat_selection')
+      return if product.nil?
+
+      private_metadata['required_seat_selection'] = if product.trip.present?
+                                                      product.trip.allow_seat_selection && variant.blocks.any?
+                                                    else
+                                                      variant.blocks.any?
+                                                    end
+    end
+  end
+end

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

@@ -76,7 +76,7 @@ module SpreeCmCommissioner
       distance_hash = public_metadata&.dig('distance')
       return nil if distance_hash.blank?
 
-      SpreeCmCommissioner::IntercityTaxi::Distance.from_hash(distance_hash)
+      SpreeCmCommissioner::Distance.from_hash(distance_hash)
     end
 
     def pickup_map_place=(value)

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

@@ -0,0 +1,21 @@
+module SpreeCmCommissioner
+  module VehicleKind
+    extend ActiveSupport::Concern
+
+    VEHICLE_KINDS = %i[suv sedan minivan van sleeping_bus luxury_van air_bus bus ferry].freeze
+
+    included do
+      enum kind: VEHICLE_KINDS if table_exists? && column_names.include?('kind')
+    end
+
+    def self.options
+      VEHICLE_KINDS.map { |k| [I18n.t("vehicle_type.#{k}"), k] }
+    end
+
+    def display_vehicle_kind
+      return nil if kind.blank?
+
+      I18n.t("vehicle_type.#{kind}")
+    end
+  end
+end

data/app/models/spree_cm_commissioner/adjustable/adjuster/pricing_action.rb

@@ -0,0 +1,25 @@
+module SpreeCmCommissioner
+  module Adjustable
+    module Adjuster
+      class PricingAction < Spree::Adjustable::Adjuster::Base
+        def update
+          pricing_adjustments = adjustments.pricing_action.eligible.reload
+          pricing_total = pricing_adjustments.sum(&:amount)
+
+          update_totals(pricing_total)
+        end
+
+        private
+
+        def adjustments
+          adjustable.try(:all_adjustments) || adjustable.adjustments
+        end
+
+        def update_totals(pricing_total)
+          pricing_total ||= 0.0
+          @totals[:non_taxable_adjustment_total] += pricing_total
+        end
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/guest.rb

@@ -67,7 +67,7 @@ module SpreeCmCommissioner
 
     validate :validate_block, if: :should_validate_block?
 
-    self.whitelisted_ransackable_associations = %w[id_card event line_item]
+    self.whitelisted_ransackable_associations = %w[id_card event line_item guest_dynamic_fields]
     self.whitelisted_ransackable_attributes = %w[first_name last_name phone_number gender contact occupation_id card_type created_at check_in_status]
 
     scope :with_dynamic_fields_and_options, lambda {

data/app/models/spree_cm_commissioner/guest_dynamic_field.rb

@@ -16,6 +16,9 @@ module SpreeCmCommissioner
       includes(:dynamic_field, :dynamic_field_option)
     }
 
+    self.whitelisted_ransackable_associations = %w[guest]
+    self.whitelisted_ransackable_attributes = %w[value]
+
     private
 
     def validate_value_format

data/app/models/spree_cm_commissioner/homepage_background_app_image.rb

@@ -4,7 +4,7 @@ module SpreeCmCommissioner
       {
         mini: '187x67>',
         small: '375x135>',
-        large: '750x270>'
+        large: '960x346>'
       }
     end
   end

data/app/models/spree_cm_commissioner/invite_guest.rb

@@ -20,12 +20,9 @@ module SpreeCmCommissioner
       line_item.guests.count >= order.line_items.first.number_of_guests
     end
 
-    def invitation_link
-      "#{Spree::Store.default.formatted_url}/invite_guests/#{token}?utm_source=email"
-    end
-
     def ticket_url(guest_token)
-      "#{Spree::Store.default.formatted_url}/invite_guests/#{token}/guest_invitations/#{guest_token}"
+      # Build URL string directly since route is defined in cm-market-server
+      "/invite_guests/#{token}/guest_invitations/#{guest_token}"
     end
   end
 end

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -32,9 +32,8 @@ module SpreeCmCommissioner
       base.before_save :update_vendor_id
 
       base.before_create :add_due_date, if: :subscription?
-
       base.validate :ensure_not_exceed_max_quantity_per_order, if: -> { variant&.max_quantity_per_order.present? }
-      base.validate :ensure_all_guests_have_blocks, if: -> { variant&.blocks&.any? }
+      base.validate :ensure_all_guests_have_blocks, if: :required_seat_selection?
 
       base.whitelisted_ransackable_associations |= %w[guests order]
       base.whitelisted_ransackable_attributes |= %w[number to_date from_date vendor_id]
@@ -77,6 +76,7 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::LineItemsFilterScope
       base.include SpreeCmCommissioner::LineItemGuestsConcern
       base.include SpreeCmCommissioner::LineItemTransitable
+      base.include SpreeCmCommissioner::LineItemSeatSelection
       base.include SpreeCmCommissioner::Integrations::IntegrationMappable
       base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation