spree_cm_commissioner 2.13.3.pre.pre2 → 2.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c04efc07b0defa6eedb7b800bf8c5504401b7de9042751e32a6eb40c1ec6897
-  data.tar.gz: 414a5fb2a306e1a1e948c9e08cbb14e412752b112c2509332ba6c15132870369
+  metadata.gz: f8c022ba33110958bd0da63395b5e814fb1c5d82469b4801a134b5697dde8a7b
+  data.tar.gz: 30f528c86e5b3cd05e22c4ad44fa85d68a0446065c25b1d30b790897afd73f5f
 SHA512:
-  metadata.gz: d658bc4bfad3c59f0fb602afefd148e1ba7edc05a95925e4f7da564780f434178b16a910f747a58a21d9fe3644089ebd77e38a9b5751ec77804a6e91fb427ad5
-  data.tar.gz: fc0f5fb8a6c7ceed9874f78d2428f700afb508f1589d9ac1477c3e5768ce19885819719b74f7151309a671ec5eb51a0020a981f27da5fc977818bf4a5b067bb6
+  metadata.gz: fdb920f19e40a0634796748e15283642dcec8bbcc5d75ff4140628b2c4146e424a987f88c89c14e211e16f0646cae97964af025620aecc69457e518df5cbf1c7
+  data.tar.gz: '09ce9911bf7008a80d729b93890f06f24b2deb98e00be9f811550c5803daa49fcb57e94c40decdfdc88e90e8e0a908964984ad7d8c3b146a10e331c93573da15'

data/.env.example

@@ -87,4 +87,3 @@ PAYMENT_INCOMPLETE_NOTIFICATION_DELAY_IN_MINUTES=5  # Delay before notifying a c
 
 # See: app/jobs/spree_cm_commissioner/telegram_alerts/order_integrity_check_job.rb
 ORDER_INTEGRITY_TELEGRAM_ALERT_ENABLED="no"  # Set to yes to enable the order integrity Telegram alert job (off by default to avoid flooding Telegram rate limits during traffic spikes)
-

data/Gemfile.lock

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

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

@@ -47,7 +47,6 @@ module Spree
           :full_sync_interval_hours,
           :tenant_id,
           :vendor_id,
-          :oauth_application_id,
           public_metadata: {},
           private_metadata: {}
         )
@@ -63,7 +62,6 @@ module Spree
         @conflict_strategy_options ||= enum_to_options(SpreeCmCommissioner::Integration.conflict_strategies)
         @tenants ||= SpreeCmCommissioner::Tenant.select(:id, :name).order(:name)
         @vendors ||= Spree::Vendor.select(:id, :name).order(:name)
-        @oauth_applications ||= Spree::OauthApplication.select(:id, :name).order(:name)
       end
 
       def enum_to_options(enum_hash)
@@ -71,10 +69,14 @@ module Spree
       end
 
       def integration_type_options
-        types = SpreeCmCommissioner::Integration.types
-        return [[Spree.t(:type), 'SpreeCmCommissioner::Integration']] if types.blank?
+        files = Dir[SpreeCmCommissioner::Engine.root.join('app/models/spree_cm_commissioner/integrations/*.rb')]
 
-        types.map { |class_name| [class_name, class_name] }
+        return [[Spree.t(:type), 'SpreeCmCommissioner::Integration']] if files.blank?
+
+        files.map do |path|
+          class_name = "SpreeCmCommissioner::Integrations::#{File.basename(path, '.rb').camelize}"
+          [class_name, class_name]
+        end.sort_by(&:first)
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Spree
   module Admin
     class InventoryItemsController < StockManagementsController
       before_action :load_parent
-      before_action :reject_external_inventory_edits, only: %i[bulk_update_prices bulk_update_stocks]
 
       # GET /products/:slug/inventory_items/prices?inventory_item_ids=1,2,3
       def prices
@@ -79,17 +78,6 @@ module Spree
 
         redirect_back fallback_location: admin_product_stock_managements_path(@product)
       end
-
-      private
-
-      # The partner owns these per-night stocks and prices; its next update would silently overwrite
-      # an edit made here.
-      def reject_external_inventory_edits
-        return unless @product.variants.includes(vendor: :integration).any?(&:inventory_external_wins?)
-
-        flash[:error] = Spree.t('admin.inventory_external_wins', name: @product.vendor.integration.name)
-        redirect_back fallback_location: admin_product_stock_managements_path(@product)
-      end
     end
   end
 end

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

@@ -12,7 +12,9 @@ module Spree
           # Creates a generic draft order from a locally-assembled cart in a single request.
           # Endpoint: POST /api/v2/storefront/draft_orders
           # Params:
-          # - line_items: Array of { variant_id:, quantity:, options: {}, public_metadata: {}, private_metadata: {} } (required)
+          # - line_items: Array of { variant_id:, quantity:, options: { from_date:, to_date:, guests_attributes: [] },
+          #   public_metadata: {}, private_metadata: {} } (required) — guests_attributes fields mirror the checkout
+          #   API's line_items_attributes.guests_attributes (see Spree::PermittedAttributes checkout_attributes).
           # - st: private sale token granting this order the product's locked stock (optional).
           def create
             result = SpreeCmCommissioner::DraftOrders::Create.call(
@@ -45,8 +47,44 @@ module Spree
           end
 
           def draft_order_line_items
-            params.permit(line_items: [:variant_id, :quantity, { options: {}, public_metadata: {}, private_metadata: {} }])
-                  .fetch(:line_items, [])
+            params.permit(
+              line_items: [
+                :variant_id,
+                :quantity,
+                {
+                  options: [
+                    :from_date,
+                    :to_date,
+                    {
+                      guests_attributes: [
+                        :block_id,
+                        :first_name,
+                        :last_name,
+                        :address,
+                        :dob,
+                        :gender,
+                        :occupation_id,
+                        :other_occupation,
+                        :nationality_id,
+                        :age,
+                        :emergency_contact,
+                        :phone_number,
+                        :other_organization,
+                        :social_contact,
+                        :social_contact_platform,
+                        :expectation,
+                        :country_code,
+                        :upload_later,
+                        :contact,
+                        { guest_dynamic_fields_attributes: %i[dynamic_field_id dynamic_field_option_id value] }
+                      ]
+                    }
+                  ],
+                  public_metadata: {},
+                  private_metadata: {}
+                }
+              ]
+            ).fetch(:line_items, [])
           end
 
           def draft_order_products

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

@@ -9,6 +9,8 @@ module Spree
           before_action :load_guest, only: [:show]
 
           def show
+            return head :not_found if @guest.qr_data.blank?
+
             respond_to do |format|
               format.png { send_data @guest.generate_png_qr, type: 'image/png', disposition: 'inline' }
               format.svg { send_data @guest.generate_svg_qr, type: 'image/svg+xml', disposition: 'inline' }

data/app/controllers/spree_cm_commissioner/api/v2/storefront/checkout_controller_decorator.rb

@@ -5,9 +5,6 @@ module SpreeCmCommissioner
         module CheckoutControllerDecorator
           def self.prepended(base)
             base.include SpreeCmCommissioner::OrderConcern
-            base.include SpreeCmCommissioner::TurnstileProtectable
-
-            base.before_action -> { verify_turnstile! }, only: %i[create_payment]
             # Sets Current.load_test_bypass from the X-Request-Verify secret so
             # InventoryHolds::ValidateLimits can skip anti-abuse checks for trusted load tests.
             base.include SpreeCmCommissioner::LoadTestBypassable

data/app/factory/spree_cm_commissioner/order_telegram_message_factory.rb

@@ -200,14 +200,10 @@ module SpreeCmCommissioner
       grouped.map { |nationality_group, guests| customer_type_summary(nationality_group, guests) }.join(', ')
     end
 
-    # e.g. "Local (Adult x1, Child x1)". `cm_saved_guests.age_group` is declared `null: false` in
-    # the migration, but a dev/staging DB whose column predates that migration (added via
-    # `add_column ... if_not_exists: true`, which silently skips the constraint if the column
-    # already exists) can still carry real NULL rows - group those under "Unknown" rather than
-    # crashing the whole order-completion Telegram notification on nil.humanize.
+    # e.g. "Local (Adult x1, Child x1)". age_group is NOT NULL, so it is always present.
     def customer_type_summary(nationality_group, guests)
       age_breakdown = guests
-                      .group_by { |sg| sg.age_group&.humanize || 'Unknown' }
+                      .group_by { |sg| sg.age_group.humanize }
                       .map { |age_group, age_guests| "#{age_group} x#{age_guests.count}" }
                       .join(', ')
 

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

@@ -0,0 +1,38 @@
+module SpreeCmCommissioner
+  # Groups add-on line items (sold via a ProductRelation) under the line item they were bought with.
+  #
+  # Grouping is display-only: each child keeps its own price, quantity and adjustments, since
+  # promotions, tax, service fees, payouts, refunds and open-dated redemption all work per line item.
+  # `relation_type` is a snapshot of the ProductRelation type at purchase, so later edits to the
+  # relation don't change what the order sold.
+  module LineItemBundleable
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :parent, class_name: 'Spree::LineItem', optional: true, inverse_of: :children
+      has_many :children, class_name: 'Spree::LineItem', foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
+
+      enum relation_type: SpreeCmCommissioner::ProductRelationType::PRODUCT_RELATION_TYPES.each_with_index.to_h { |type, index| [type, index] },
+           _prefix: :relation
+
+      scope :top_level, -> { where(parent_id: nil) }
+
+      money_methods :bundle_amount
+
+      validates :relation_type, presence: true, if: -> { parent_id.present? || parent.present? }
+      validates :relation_type, absence: true, if: -> { parent_id.blank? && parent.blank? }
+      validate :ensure_valid_parent, if: -> { parent.present? }
+    end
+
+    def bundle_amount
+      amount + children.sum(&:amount)
+    end
+
+    private
+
+    def ensure_valid_parent
+      errors.add(:parent, :invalid) if parent.parent_id.present? || parent == self
+      errors.add(:parent, :invalid) if parent.order_id.present? && order_id.present? && parent.order_id != order_id
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module VehicleKind
     extend ActiveSupport::Concern
 
-    VEHICLE_KINDS = %i[suv sedan minivan van sleeping_bus luxury_van air_bus bus ferry boat train].freeze
+    VEHICLE_KINDS = %i[suv sedan minivan van sleeping_bus luxury_van air_bus bus ferry train].freeze
 
     included do
       enum kind: VEHICLE_KINDS if table_exists? && column_names.include?('kind')

data/app/models/spree_cm_commissioner/guest.rb

@@ -201,6 +201,8 @@ module SpreeCmCommissioner
     end
 
     def generate_svg_qr
+      return nil if qr_data.blank?
+
       qrcode = RQRCode::QRCode.new(qr_data)
       qrcode.as_svg(
         color: '000',
@@ -213,6 +215,8 @@ module SpreeCmCommissioner
     end
 
     def generate_png_qr(size = 120)
+      return nil if qr_data.blank?
+
       qrcode = RQRCode::QRCode.new(qr_data)
       qrcode.as_png(
         bit_depth: 1,
@@ -228,7 +232,11 @@ module SpreeCmCommissioner
       )
     end
 
+    # Transferred guests no longer own the ticket, so they must not receive any
+    # scannable QR data. The ownership moved to the guest created by
+    # SpreeCmCommissioner::TicketTransfers::TransferGuest.
     def qr_data
+      return nil if transferred?
       return external_qr_data if external_qr_data.present?
 
       token

data/app/models/spree_cm_commissioner/integration.rb

@@ -14,25 +14,10 @@ module SpreeCmCommissioner
     validates :incremental_sync_interval_seconds, presence: true, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 3600 }
     validates :full_sync_interval_hours, presence: true, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 168 }
 
-    # Listed from the folder rather than `descendants`, which misses subclasses Zeitwerk hasn't
-    # loaded yet in dev and test.
-    def self.types
-      Dir[SpreeCmCommissioner::Engine.root.join('app/models/spree_cm_commissioner/integrations/*.rb')]
-        .map { |path| "SpreeCmCommissioner::Integrations::#{File.basename(path, '.rb').camelize}" }
-        .sort
-    end
-
     def sync_manager
       raise NotImplementedError, 'Subclasses must implement the sync_manager method'
     end
 
-    # Whether the partner, not BookMe+, sets this variant's per-night stock, prices and closings.
-    # When true, stock resets and dashboard edits leave its inventory items alone, and new nights
-    # start closed until the partner opens them (InventoryItem). Off by default.
-    def inventory_external_wins?(_variant)
-      false
-    end
-
     def restock_external_inventory!(_order, _line_items)
       raise NotImplementedError, 'Subclasses must implement the restock_external_inventory! method'
     end
@@ -40,36 +25,5 @@ module SpreeCmCommissioner
     def unstock_external_inventory!(_order, _line_items)
       raise NotImplementedError, 'Subclasses must implement the unstock_external_inventory! method'
     end
-
-    def sync_item_availability!(_options = {})
-      raise NotImplementedError, 'Subclasses must implement the sync_item_availability! method'
-    end
-
-    def hold_inventory!(_order, _line_items)
-      raise NotImplementedError, 'Subclasses must implement the hold_inventory! method'
-    end
-
-    # Integrations that manage external inventory reservations should override this to return true
-    def supports_external_inventory_holding?
-      false
-    end
-
-    # Integrations that support automatically releasing external inventory
-    # after reservation expiration or order cancellation should override this to return true
-    def supports_auto_release_inventory?
-      false
-    end
-
-    def release_inventory!(_order, _line_items)
-      raise NotImplementedError, 'Subclasses must implement the release_inventory! method'
-    end
-
-    def external_inventory_items(_order)
-      raise NotImplementedError, 'Subclasses must implement the external_inventory_items method'
-    end
-
-    def external_inventory_item_status(_order, _options)
-      raise NotImplementedError, 'Subclasses must implement the external_inventory_item_status method'
-    end
   end
 end

data/app/models/spree_cm_commissioner/integrations/stadium_x_v1.rb

@@ -5,7 +5,10 @@ class SpreeCmCommissioner::Integrations::StadiumXV1 < SpreeCmCommissioner::Integ
 
   # override
   def sync_manager
-    SpreeCmCommissioner::Integrations::StadiumXV1::SyncManager.new(integration: self)
+    SpreeCmCommissioner::Integrations::StadiumXV1::SyncManager.new(
+      integration: self,
+      client: client
+    )
   end
 
   # override
@@ -15,6 +18,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1 < SpreeCmCommissioner::Integ
       order: order,
       line_items: line_items
     )
+
     raise SpreeCmCommissioner::Integrations::SyncError, result.error unless result.success?
   end
 
@@ -23,9 +27,11 @@ class SpreeCmCommissioner::Integrations::StadiumXV1 < SpreeCmCommissioner::Integ
     raise SpreeCmCommissioner::Integrations::SyncError, 'Ticket cannot be cancelled'
   end
 
-  def sync_item_availability!(_options = {}); end
-
   def client
-    @client ||= SpreeCmCommissioner::Integrations::StadiumXV1::ExternalClient::Client.new(integration: self)
+    SpreeCmCommissioner::Integrations::StadiumXV1::ExternalClient::Client.new(
+      public_key: public_key,
+      private_key: private_key,
+      base_url: base_url
+    )
   end
 end

data/app/models/spree_cm_commissioner/inventory_item.rb

@@ -2,15 +2,10 @@ module SpreeCmCommissioner
   class InventoryItem < Base
     include SpreeCmCommissioner::ProductType
     include SpreeCmCommissioner::StoreMetadata
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
 
     MAX_DISPLAY_STOCK = 20
     LOW_STOCK_THRESHOLD = 20
 
-    store_public_metadata :last_synced_at, :datetime
-    store_public_metadata :original_price, :integer
-    store_public_metadata :currency, :string
-
     # Association
     belongs_to :variant, class_name: 'Spree::Variant', optional: false
 
@@ -41,11 +36,6 @@ module SpreeCmCommissioner
 
     before_save -> { self.product_type = variant.product_type }, if: -> { product_type.nil? }
 
-    # A night whose inventory a partner owns (Integration#inventory_external_wins?) starts closed: its
-    # count is only our seed from the physical room count, which the partner may already have sold
-    # elsewhere. The partner's first availability push opens it.
-    before_create -> { self.closed = true }, if: -> { permanent_stock? && variant&.inventory_external_wins? }
-
     after_commit :schedule_product_cache_invalidation
     after_commit :publish_live_stock_status_to_firestore
 
@@ -119,14 +109,6 @@ module SpreeCmCommissioner
     # This method is only used when admin update stock
     def adjust_quantity!(quantity)
       with_lock do
-        # Warm the Redis cache from the current DB value BEFORE applying the delta below.
-        # adjust_quantity_in_redis treats a missing key as 0, so a negative delta against a
-        # never-cached key would compute e.g. 0 - 3 = -3, clamp to 0, and permanently cache the
-        # wrong value (the read path only self-heals from a genuinely *missing* key, not a wrong
-        # one). This is the same warm-before-delta pattern already used by
-        # InventoryItems::AdjustAvailableQuantity for the same reason.
-        SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new([self]).call
-
         # IMPORTANT: Apply quantity changes directly without defensive clamping.
         # The model validation will catch any attempts to go negative, surfacing bugs
         # in upstream logic rather than silently losing data.

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -94,6 +94,7 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::LineItemOpenDatedTrippable
+      base.include SpreeCmCommissioner::LineItemBundleable
       base.include SpreeCmCommissioner::KycBitwise
     end
 

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -11,7 +11,6 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::OrderScopes
       base.include SpreeCmCommissioner::TicketTransferable
       base.include SpreeCmCommissioner::OrderQrCodeable
-      base.include SpreeCmCommissioner::Integrations::IntegrationMappable
 
       base.before_create :link_by_phone_number
       base.before_create :associate_customer
@@ -52,7 +51,6 @@ module SpreeCmCommissioner
       base.has_many :reserved_blocks, through: :guests, class_name: 'SpreeCmCommissioner::ReservedBlock'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variants
       base.has_many :product_completion_steps, class_name: 'SpreeCmCommissioner::ProductCompletionStep', through: :line_items
-      base.has_many :audit_events, class_name: 'SpreeCmCommissioner::AuditEvent', as: :auditable
 
       base.delegate :customer, to: :user, allow_nil: true
 

data/app/models/spree_cm_commissioner/place.rb

@@ -1,7 +1,5 @@
 module SpreeCmCommissioner
   class Place < Base
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
-
     acts_as_nested_set
 
     validates :reference, presence: true, if: :validate_reference?

data/app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb

@@ -49,8 +49,7 @@ module SpreeCmCommissioner
           quantity_locked_on_hold: cache_inventory(locked_hold_keys[index], item, item.quantity_locked_on_hold, locked_hold[index]),
           max_capacity: item.max_capacity,
           inventory_item_id: item.id,
-          variant_id: item.variant_id,
-          closed: item.closed
+          variant_id: item.variant_id
         )
       end
 

data/app/models/spree_cm_commissioner/route.rb

@@ -1,7 +1,6 @@
 module SpreeCmCommissioner
   class Route < Base
     include SpreeCmCommissioner::RouteType
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
     include SpreeCmCommissioner::StoreMetadata
     include SpreeCmCommissioner::ServiceOrigin
 

data/app/models/spree_cm_commissioner/seat_layout.rb

@@ -1,6 +1,5 @@
 module SpreeCmCommissioner
   class SeatLayout < Base
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
     include StoreMetadata
 
     # Whole-screen theming for the app's seat-selection scaffold (background / app bar / status

data/app/models/spree_cm_commissioner/stock/availability_checker.rb

@@ -23,7 +23,7 @@ module SpreeCmCommissioner
         return true if variant.need_confirmation?
         return false if cached_inventory_items.empty?
 
-        cached_inventory_items.all? { |item| item.sellable? && quantity_in_pool(item, include_locked: include_locked) >= quantity }
+        cached_inventory_items.all? { |item| item.active? && quantity_in_pool(item, include_locked: include_locked) >= quantity }
       end
 
       # The cache row carries both pools, so choosing between them is a read, not another Redis trip.

data/app/models/spree_cm_commissioner/stock/order_availability_checker.rb

@@ -45,7 +45,7 @@ module SpreeCmCommissioner
         # stock, i.e. read sold out exactly when its allotment was still sellable.
         cached_inventory_items.all? do |item|
           quantity = line_item.locked_stock? ? item.quantity_locked : item.quantity_available
-          item.sellable? && quantity >= line_item.quantity
+          item.active? && quantity >= line_item.quantity
         end
       end
     end

data/app/models/spree_cm_commissioner/stock_item_decorator.rb

@@ -15,10 +15,6 @@ module SpreeCmCommissioner
     private
 
     def create_inventory_items
-      # Skip automatic inventory generation when variant has manual_generate_inventory_items set to true
-      # Use case: For variants where inventory items need to be manually created/managed (e.g., external integrations)
-      return if variant.manual_generate_inventory_items?
-
       SpreeCmCommissioner::InventoryItems::GenerateInventoryItemsJob.perform_later(variant_id: variant.id)
     end
 

data/app/models/spree_cm_commissioner/trip.rb

@@ -2,7 +2,6 @@ module SpreeCmCommissioner
   class Trip < Base
     include SpreeCmCommissioner::StoreMetadata
     include SpreeCmCommissioner::RouteType
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
     include SpreeCmCommissioner::ServiceOrigin
 
     attr_accessor :hours, :minutes, :seconds
@@ -39,7 +38,7 @@ module SpreeCmCommissioner
     after_commit :update_route_price_range, on: %i[create update]
 
     belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :trips, optional: false
-    belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: true
+    belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: false
 
     belongs_to :service_origin, class_name: 'Spree::Taxon', optional: true
 

data/app/models/spree_cm_commissioner/trip_stop.rb

@@ -1,7 +1,5 @@
 module SpreeCmCommissioner
   class TripStop < Base
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
-
     acts_as_list column: :sequence, scope: :trip_id
 
     belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip', optional: false

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -6,7 +6,6 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::VariantOptionsConcern
       base.include SpreeCmCommissioner::KycBitwise
       base.include SpreeCmCommissioner::Integrations::IntegrationMappable
-      base.include SpreeCmCommissioner::VariantMetadata
 
       base.after_commit :update_vendor_price
       base.validate     :validate_option_types
@@ -81,10 +80,6 @@ module SpreeCmCommissioner
       delivery_option == 'delivery'
     end
 
-    def inventory_external_wins?
-      vendor&.integration&.inventory_external_wins?(self) || false
-    end
-
     def non_digital_ecommerce?
       !digital? && ecommerce?
     end

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -1,7 +1,6 @@
 module SpreeCmCommissioner
   class Vehicle < Base
     include SpreeCmCommissioner::VehicleKind
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
 
     belongs_to :vendor, class_name: 'Spree::Vendor'
     belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType'
@@ -14,8 +13,6 @@ module SpreeCmCommissioner
     validates :name, presence: true
     validates :license_plate, uniqueness: true, allow_blank: true
 
-    has_one :seat_layout, through: :vehicle_type
-
     self.whitelisted_ransackable_attributes = %w[name license_plate kind]
 
     def display_name

data/app/models/spree_cm_commissioner/vehicle_type.rb

@@ -2,7 +2,6 @@ module SpreeCmCommissioner
   class VehicleType < Base
     include SpreeCmCommissioner::StoreMetadata
     include SpreeCmCommissioner::VehicleKind
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
 
     # This model has no seat_layout column (polymorphic association), so we store the preload_seat_layout_id ID in public_metadata.
     # This lets us check if a seat layout exists without triggering a database query.

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -33,7 +33,6 @@ module SpreeCmCommissioner
       base.has_many :nearby_places, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VendorPlace', dependent: :destroy
 
       base.has_many :stock_items, through: :variants, class_name: 'Spree::StockItem'
-      base.has_many :currency_rates, class_name: 'SpreeCmCommissioner::CurrencyRate', dependent: :destroy
 
       base.has_many :taxon_vendors, class_name: 'SpreeCmCommissioner::TaxonVendor'
       base.has_many :taxons, through: :taxon_vendors
@@ -105,7 +104,6 @@ module SpreeCmCommissioner
       base.has_many :boarding_trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop', source: :boarding_trip_stops
       base.has_many :drop_off_trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop', source: :drop_off_trip_stops
       base.has_many :pricing_models, class_name: 'SpreeCmCommissioner::PricingModel', foreign_key: :vendor_id, dependent: :destroy
-      base.has_many :orders, -> { distinct }, through: :variants, source: :orders
 
       base.has_many :agency_categories, -> { where(kind: :agency_category) }, class_name: 'Spree::Taxon', foreign_key: :vendor_id
 
@@ -250,21 +248,6 @@ module SpreeCmCommissioner
 
     delegate :present?, to: :tenant, prefix: true
 
-    # Returns the exchange rate between two currencies
-    # If no direct rate exists, calculates the inverse rate from the reverse pair
-    # Returns 1.0 for identical currencies, nil if no rate is found
-    def exchange_rate(from_currency, to_currency)
-      return 1.0 if from_currency == to_currency
-
-      pair = currency_rates.by_pair(from_currency, to_currency).first
-      return pair.rate if pair.present?
-
-      reverse_pair = currency_rates.by_pair(to_currency, from_currency).first
-      return (1.0 / reverse_pair.rate).round(6) if reverse_pair.present?
-
-      nil
-    end
-
     def validate_sellable_product_types
       valid_types = SpreeCmCommissioner::ProductType::PRODUCT_TYPES.map(&:to_s)
       return if sellable_product_types.all? { |type| valid_types.include?(type.to_s) }

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -1,7 +1,5 @@
 module SpreeCmCommissioner
   class VendorPlace < Base
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
-
     enum place_type: { venue: 0, branch: 1, stop: 2, location: 3 }
     acts_as_list scope: :vendor
 

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

@@ -10,7 +10,8 @@ module Spree
                           :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,
                           :high_demand, :jwt_token,
                           :direction, :trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id,
-                          :service_fee_total, :display_service_fee_total
+                          :service_fee_total, :display_service_fee_total,
+                          :parent_id, :relation_type, :bundle_amount, :display_bundle_amount
 
           base.attribute :required_self_check_in_location, &:required_self_check_in_location?
           base.attribute :allowed_self_check_in, &:allowed_self_check_in?

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

@@ -10,7 +10,8 @@ module SpreeCmCommissioner
           base.attributes :phone_number, :intel_phone_number, :country_code, :request_state,
                           :term_accepted_at,
                           :channel, :hold_expires_at,
-                          :service_fee_total, :display_service_fee_total
+                          :service_fee_total, :display_service_fee_total,
+                          :order_total_after_store_credit, :display_order_total_after_store_credit
 
           base.attribute :has_incomplete_guest_info, &:has_incomplete_guest_info?
           base.attribute :required_payway_payout, &:required_payway_payout?