spree_cm_commissioner 2.5.12 → 2.5.13.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 551e9b905e46e5892f9030e6946c1dee64cef1903f0d67755bfe86d41d6216f4
-  data.tar.gz: '08459daa2ed21ad41dacd58bed6dce8783cf780827eaa4fdd2e8f7a86190041b'
+  metadata.gz: 04eebbcbb9d83ad9530360d3a22e480a61ccb4b29f4c7a4e189e8b5ae90fa3ce
+  data.tar.gz: ed548b05a0f06e308bcdb09c7afe8d1c48c7eb5ed30cf8096f721681f75f2122
 SHA512:
-  metadata.gz: 37eff54bfa59d1f91ed29a7e8a93fce2c6f760fa3e125fe00c0a253a617b2604e482a2cd75747d6927870d89ceb5eaf2074e410b472ee2a35cf565cfdc861f65
-  data.tar.gz: b14e8a9eba71eefec8ff7cc7e2a333f2fad8cdadaeaacc709b7f0211ac36777859e238eb996a642323d7818d7e94407e5778456873aa3bd855135c2d7be6c413
+  metadata.gz: 4c2583b7b967f27e1d5d71b979936ef27e0da0f516f16368899d9b8bd38954ff7db95ab901d1f1d0497af7726d906a618f90ada65901954d6e3f7be86209fe53
+  data.tar.gz: f4c154d199890f8550df41a68105ff71b266ad8e56148b371ea7049fb4a28e2f10e42bd2ead83052ee5e8d2001d509e4782df01b3ad0b9e0c5fff21a0243b73c

data/Gemfile.lock

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

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

@@ -36,6 +36,7 @@ module Spree
               resource.save!
               run_dynamic_fields(resource)
               resource.save_and_move_to_next_stage
+              recalculate_cart(resource.line_item)
             end
 
             render_serialized_payload(201) { serialize_resource(resource) }
@@ -49,6 +50,7 @@ module Spree
               resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
               resource.save!
               resource.save_and_move_to_next_stage
+              recalculate_cart(resource.line_item)
             end
 
             render_serialized_payload { serialize_resource(resource) }
@@ -111,6 +113,13 @@ module Spree
           def handle_record_not_found(exception)
             render_error_payload({ base: [exception.message] }, 404)
           end
+
+          def recalculate_cart(line_item)
+            ::Spree::Dependencies.cart_recalculate_service.constantize.call(
+              line_item: line_item,
+              order: spree_current_order
+            )
+          end
         end
       end
     end

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

@@ -5,7 +5,8 @@
 #   'direction': 'outbound' or 'inbound',
 #   'trip_id': 123,
 #   'boarding_trip_stop_id': 456,
-#   'drop_off_trip_stop_id': 789
+#   'drop_off_trip_stop_id': 789,
+#   'service_origin_id': 101
 # }
 #
 # Direction:
@@ -26,6 +27,7 @@ module SpreeCmCommissioner
       validates :trip_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
       validates :boarding_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
       validates :drop_off_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+      validates :service_origin_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
       validates :passenger_count, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
@@ -56,6 +58,7 @@ module SpreeCmCommissioner
     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
+    def service_origin_id = private_metadata['service_origin_id']&.to_i
 
     def passenger_count = public_metadata['passenger_count']&.to_i
 
@@ -112,6 +115,10 @@ module SpreeCmCommissioner
       set_private_metadata_value('drop_off_trip_stop_id', value)
     end
 
+    def service_origin_id=(value)
+      set_private_metadata_value('service_origin_id', value)
+    end
+
     def passenger_count=(value)
       set_public_metadata_value('passenger_count', value)
     end

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

@@ -1,24 +1,25 @@
 module SpreeCmCommissioner
   module PricingActions
     class CreateGuestAdjustments < SpreeCmCommissioner::PricingAction
-      def perform(line_item)
-        return if pricing_rule_group.pricing_rules.blank?
-        return if line_item.guests.blank?
+      def perform(options = {})
+        line_items = extract_line_items(options)
 
-        eligible_guests = find_eligible_guests(line_item)
-        return if eligible_guests.empty?
+        return if pricing_rule_group.pricing_rules.blank?
+        return if line_items.blank?
 
-        total_amount = eligible_guests.sum do |guest|
-          compute_guest_amount(line_item, guest)
+        line_items.each do |line_item|
+          perform_for_line_item(line_item)
         end
-
-        return if total_amount.zero?
-
-        create_adjustment(line_item, total_amount)
       end
 
       private
 
+      def extract_line_items(options)
+        return [options] if options.respond_to?(:guests)
+
+        Array(options[:line_items])
+      end
+
       def find_eligible_guests(line_item)
         line_item.guests.select do |guest|
           guest_eligible_for_all_rules?(guest)
@@ -47,6 +48,21 @@ module SpreeCmCommissioner
           mandatory: true
         )
       end
+
+      def perform_for_line_item(line_item)
+        return if line_item.guests.blank?
+
+        eligible_guests = find_eligible_guests(line_item)
+        return if eligible_guests.empty?
+
+        total_amount = eligible_guests.sum do |guest|
+          compute_guest_amount(line_item, guest)
+        end
+
+        return if total_amount.zero?
+
+        create_adjustment(line_item, total_amount)
+      end
     end
   end
 end

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

@@ -12,6 +12,7 @@ module SpreeCmCommissioner
         return unless order&.persisted?
 
         order.adjustments.pricing_action.delete_all
+        order.line_items.each { |li| li.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)

data/app/models/spree_cm_commissioner/pricing_rules/nationality.rb

@@ -5,49 +5,54 @@ module SpreeCmCommissioner
 
       store_accessor :private_metadata, :rule_type, :nationalities
 
-      def eligible?(line_item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      def eligible?(line_item)
         return false if nationalities.blank? || line_item.guests.blank?
 
-        targets = Array.wrap(nationalities).map(&:downcase)
-        guest_nationalities = line_item.guests.map { |g| guest_nationality(g) }.compact
-
-        return false if guest_nationalities.empty?
+        guests = line_item.guests
 
         case rule_type
-
-        when 'all'
-          guest_nationalities.all? { |n| targets.include?(n) }
-        when 'any'
-          guest_nationalities.any? { |n| targets.include?(n) }
-        when 'none'
-          guest_nationalities.any? { |n| targets.exclude?(n) }
-        else
-          false
+        when 'all'  then guests.all?  { |g| match?(g) }
+        when 'any'  then guests.any?  { |g| match?(g) }
+        when 'none' then guests.any?  { |g| !match?(g) }
+        else false
         end
       end
 
       def guest_eligible?(guest)
         return false if nationalities.blank?
 
-        targets = Array.wrap(nationalities).map(&:downcase)
-        guest_nat = guest_nationality(guest)
+        matched = match?(guest)
+        rule_type == 'none' ? !matched : matched
+      end
+
+      private
 
-        return false if guest_nat.blank?
+      def match?(guest)
+        id = guest_nationality_id(guest)
+        return target_ids.include?(id) if id.present?
 
-        case rule_type
-        when 'all', 'any'
-          targets.include?(guest_nat)
-        when 'none'
-          targets.exclude?(guest_nat)
-        else
-          false
-        end
+        group = guest_nationality_group(guest)
+
+        group.present? && group.to_sym == expected_group(guest)
       end
 
-      private
+      def target_ids
+        @target_ids ||= Array(nationalities).map(&:to_i)
+      end
+
+      def guest_nationality_id(guest)
+        guest.saved_guest&.nationality&.id || guest.nationality&.id
+      end
+
+      def guest_nationality_group(guest)
+        guest.saved_guest&.nationality_group || guest.nationality_group
+      end
+
+      def expected_group(guest)
+        service_origin_id = guest.line_item&.service_origin_id
+        return :foreigner if service_origin_id.blank?
 
-      def guest_nationality(guest)
-        (guest.nationality&.name || guest.saved_guest&.nationality&.name).to_s.downcase
+        target_ids.include?(service_origin_id) ? :local : :foreigner
       end
     end
   end

data/app/models/spree_cm_commissioner/route.rb

@@ -5,6 +5,8 @@ module SpreeCmCommissioner
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
     belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
 
+    belongs_to :service_origin, class_name: 'Spree::Taxon', optional: true
+
     belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
     belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place', optional: false
 

data/app/models/spree_cm_commissioner/trip.rb

@@ -14,13 +14,14 @@ module SpreeCmCommissioner
 
     # before create, duplicate seat layout from vehicle_type if present
     before_validation :duplicate_seat_layout_from_vehicle, if: -> { seat_layout.nil? && vehicle_type&.seat_layout.present? }
-
     after_create :increment_route_metric_trip_count
     before_destroy :decrement_route_metric_trip_count
 
     belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :trips, optional: false
     belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: false
 
+    belongs_to :service_origin, class_name: 'Spree::Taxon', optional: true
+
     belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType', optional: false
     belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle', optional: true
     has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout', dependent: :destroy
@@ -91,12 +92,12 @@ module SpreeCmCommissioner
                     section.attributes.except('id', 'created_at', 'updated_at', 'seat_layout_id')
                           .merge(
                             blocks_attributes: section.blocks.map do |block|
-                              block.attributes.except('id', 'created_at', 'updated_at', 'seat_layout_id', 'seat_section_id')
+                              block.attributes.except('id', 'created_at', 'updated_at', 'seat_layout_id', 'seat_section_id', 'variant_id')
                             end
                           )
                   end,
                   top_level_blocks_attributes: original.top_level_blocks.map do |block|
-                    block.attributes.except('id', 'created_at', 'updated_at', 'seat_layout_id', 'seat_section_id')
+                    block.attributes.except('id', 'created_at', 'updated_at', 'seat_layout_id', 'seat_section_id', 'variant_id')
                   end
                 )
     end

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -63,6 +63,7 @@ module SpreeCmCommissioner
       base.has_one  :stock_location, -> { where(active: true) }, class_name: 'Spree::StockLocation', dependent: :destroy
 
       base.belongs_to :default_state, class_name: 'Spree::State', inverse_of: :vendors
+      base.belongs_to :service_origin, class_name: 'Spree::Taxon', optional: true
       base.multi_tenant :tenant, class_name: 'SpreeCmCommissioner::Tenant'
 
       base.delegate :lat, :lon, to: :stock_location, allow_nil: true

data/app/overrides/spree/admin/vendors/_form/service_origin.html.erb.deface

@@ -0,0 +1,6 @@
+<!-- insert_before "erb[loud]:contains('field_container :state')" -->
+
+<%= f.field_container :service_origin_id do %>
+  <%= f.label :service_origin_id %>
+  <%= f.collection_select :service_origin_id, Spree::Taxon.where(kind: Spree::Taxon.kinds[:nationality]).order(:name), :id, :name, { include_blank: true }, { class: 'fullwidth select2' } %>
+<% end %>

data/app/serializers/spree_cm_commissioner/v2/storefront/transit_line_item_serializer.rb

@@ -8,7 +8,8 @@ module SpreeCmCommissioner
                    :trip_id,
                    :direction,
                    :boarding_trip_stop_id,
-                   :drop_off_trip_stop_id
+                   :drop_off_trip_stop_id,
+                   :service_origin_id
 
         cache_options store: nil
       end

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

@@ -24,6 +24,11 @@ module SpreeCmCommissioner
         else
           order.ensure_updated_shipments
         end
+        # SPREE: Original Spree::Cart::Recalculate code ends here
+
+        # CUSTOM: Apply pricing models at order level (groups connected trips together)
+
+        SpreeCmCommissioner::PricingModelHandler::Order.new(order).activate
 
         # SPREE: Original Spree::Cart::Recalculate code continues here
         ::Spree::PromotionHandler::Cart.new(order, line_item).activate

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

@@ -15,14 +15,17 @@ module SpreeCmCommissioner
 
           order = Spree::Order.new(state: 'cart', use_billing: true, user: user)
 
+          metadata = {
+            trip_id: trip.id,
+            service_origin_id: trip.service_origin_id.presence&.to_s
+          }.compact
+
           line_item = order.line_items.new(
             variant_id: variant.id,
             quantity: quantity,
             from_date: from_date,
             to_date: to_date,
-            private_metadata: {
-              trip_id: trip.id
-            }
+            private_metadata: metadata
           )
 
           build_guests_for!(line_item, quantity)

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

@@ -27,6 +27,7 @@ module SpreeCmCommissioner
         attrs = attrs.merge(
           tenant_id: vendor.tenant_id,
           route_name: attrs[:route_name] || "#{origin_place.name} -> #{destination_place.name}",
+          service_origin_id: vendor.service_origin_id,
           origin_place_id: origin_place.id,
           destination_place_id: destination_place.id,
           route_stops: route_stops

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

@@ -82,9 +82,10 @@ module SpreeCmCommissioner
             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?
+            drop_off_trip_stop_id: leg.drop_off_trip_stop_id.to_s,
+            connected_trip_id: connected_trip_id.presence&.to_s,
+            service_origin_id: trip.service_origin_id.presence&.to_s
+          }.compact
 
           line_item = order.line_items.new(
             product_type: :transit,

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

@@ -15,6 +15,7 @@ module SpreeCmCommissioner
         ApplicationRecord.transaction do
           variant = create_variant!(vendor, trip_form)
           trip = create_trip!(vendor, trip_form, variant)
+          assign_blocks_to_variant!(trip, variant)
           calendar = setup_calendar!(variant.product, trip_form.service_calendar)
           generate_inventory!(variant)
 
@@ -56,10 +57,13 @@ module SpreeCmCommissioner
 
       # Creates the main trip record with details extracted from the trip form.
       # Associates the trip with vendor, product, vehicle, route, and time.
+
       def create_trip!(vendor, trip_form, variant)
         first_stop = trip_form.trip_stops.first
         last_stop  = trip_form.trip_stops.last
 
+        route = vendor.routes.find(trip_form.route_id)
+
         locations = vendor.locations.where(id: trip_form.trip_stops.map(&:location_id)).index_by(&:id)
 
         # vendor_places are either stops or branches
@@ -73,12 +77,13 @@ module SpreeCmCommissioner
           vehicle: SpreeCmCommissioner::Vehicle.find_by(id: first_stop.vehicle_id),
           origin_place_id: locations[first_stop.location_id.to_i].place_id,
           destination_place_id: locations[last_stop.location_id.to_i].place_id,
-          route: vendor.routes.find(trip_form.route_id),
+          service_origin_id: route.service_origin_id || vendor.service_origin_id,
+          route: route,
           departure_time: first_stop.departure_time,
           duration: trip_form.total_duration_seconds,
           allow_booking: trip_form.allow_booking,
           allow_seat_selection: trip_form.allow_seat_selection,
-          route_type: trip_form.route_type || vendor.routes.find(trip_form.route_id)&.route_type
+          route_type: trip_form.route_type || route&.route_type
         )
 
         create_trip_stops(trip, trip_form, locations, vendor_places)
@@ -125,6 +130,18 @@ module SpreeCmCommissioner
         res.value[:calendar]
       end
 
+      # Assigns sellable blocks from the trip's seat layout to the variant.
+      # Only assigns blocks with nil variant_id to avoid overwriting existing assignments.
+      def assign_blocks_to_variant!(trip, variant)
+        return if trip.seat_layout.blank?
+
+        sellable_block_types = SpreeCmCommissioner::Block.block_types.slice('seat', 'sleeping_seat', 'standing').values
+
+        trip.seat_layout.blocks
+            .where(variant_id: nil, block_type: sellable_block_types)
+            .update_all(variant_id: variant.id) # rubocop:disable Rails/SkipsModelValidations
+      end
+
       # Triggers asynchronous generation of permanent inventory items for the variant.
       def generate_inventory!(variant)
         SpreeCmCommissioner::Stock::PermanentInventoryItemsGeneratorJob.perform_later(variant_ids: [variant[:id]])

data/config/initializers/spree_permitted_attributes.rb

@@ -4,6 +4,7 @@ module Spree
     mattr_reader :route_attributes
 
     @@vendor_attributes << :logo
+    @@vendor_attributes << :service_origin_id
 
     # Permitted all guest attributes for now as permitting only some guest attributes is not working by design
     # of spree add_item service, if we want to only permit some guest attributes,

data/db/migrate/20260204100000_add_service_origin_to_spree_vendors.rb

@@ -0,0 +1,5 @@
+class AddServiceOriginToSpreeVendors < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :spree_vendors, :service_origin, foreign_key: { to_table: :spree_taxons }, index: true, if_not_exists: true
+  end
+end

data/db/migrate/20260204100001_add_service_origin_to_cm_routes.rb

@@ -0,0 +1,5 @@
+class AddServiceOriginToCmRoutes < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_routes, :service_origin, foreign_key: { to_table: :spree_taxons }, index: true, if_not_exists: true
+  end
+end

data/db/migrate/20260204100002_add_service_origin_to_cm_trips.rb

@@ -0,0 +1,5 @@
+class AddServiceOriginToCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_trips, :service_origin, foreign_key: { to_table: :spree_taxons }, index: true, if_not_exists: true
+  end
+end

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

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :pricing_rule_nationality, class: 'SpreeCmCommissioner::PricingRules::Nationality' do
     association :pricing_rule_group, factory: :pricing_rule_group
     rule_type { 'any' }
-    nationalities { ["Cambodian"] }
+    nationalities { [create(:taxon, name: 'Cambodian').id] }
   end
 
   factory :pricing_rule_extra_pick_up_distance, class: 'SpreeCmCommissioner::PricingRules::ExtraPickUpDistance' do

data/lib/spree_cm_commissioner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.12
+  version: 2.5.13.pre.pre2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-07 00:00:00.000000000 Z
+date: 2026-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1771,6 +1771,7 @@ files:
 - app/overrides/spree/admin/vendors/_form/note.html.erb.deface
 - app/overrides/spree/admin/vendors/_form/option_type.html.erb.deface
 - app/overrides/spree/admin/vendors/_form/product_type.html.erb.deface
+- app/overrides/spree/admin/vendors/_form/service_origin.html.erb.deface
 - app/overrides/spree/admin/vendors/_form/short_description.html.erb.deface
 - app/overrides/spree/admin/vendors/_form/star_rating.html.erb.deface
 - app/overrides/spree/admin/vendors/_form/vendor_min_max_price.html.erb.deface
@@ -3017,6 +3018,9 @@ files:
 - 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/20260204100000_add_service_origin_to_spree_vendors.rb
+- db/migrate/20260204100001_add_service_origin_to_cm_routes.rb
+- db/migrate/20260204100002_add_service_origin_to_cm_trips.rb
 - db/migrate/20260204183545_add_term_accepted_at_to_spree_orders.rb
 - db/migrate/20260207040752_clear_cm_exports.rb
 - docker-compose.yml
@@ -3202,9 +3206,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1