spree_cm_commissioner 2.0.1.pre.pre → 2.0.1.pre.pre1

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -1,7 +1,6 @@
 module SpreeCmCommissioner
   module VariantDecorator
-    def self.prepended(base) # rubocop:disable Metrics/AbcSize
-      base.include SpreeCmCommissioner::ProductType
+    def self.prepended(base)
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::VariantOptionsConcern
       base.include SpreeCmCommissioner::KycBitwise
@@ -21,21 +20,24 @@ module SpreeCmCommissioner
       base.has_many :video_on_demands, class_name: 'SpreeCmCommissioner::VideoOnDemand', dependent: :destroy
       base.has_many :complete_line_items, -> { complete }, class_name: 'Spree::LineItem'
 
-      base.has_many :variant_blocks, class_name: 'SpreeCmCommissioner::VariantBlock', dependent: :destroy
-      base.has_many :blocks, class_name: 'SpreeCmCommissioner::Block', through: :variant_blocks
-
       base.has_many :variant_guest_card_class, class_name: 'SpreeCmCommissioner::VariantGuestCardClass'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variant_guest_card_class
 
-      base.has_many :inventory_items, class_name: 'SpreeCmCommissioner::InventoryItem'
-
       base.scope :subscribable, -> { active.joins(:product).where(product: { subscribable: true, status: :active }) }
-      base.scope :with_permanent_stock, -> { where(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }
-      base.scope :with_non_permanent_stock, -> { where.not(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }
-
+      base.has_one :trip,
+                   class_name: 'SpreeCmCommissioner::Trip'
+      base.has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy, foreign_key: :trip_id
       base.accepts_nested_attributes_for :option_values
+      base.after_commit :sync_trip, if: :transit?
+      base.accepts_nested_attributes_for :trip_stops, allow_destroy: true
+      base.after_commit :create_trip_stops, if: :transit?
+    end
+
+    def create_trip_stops
+      return if is_master?
 
-      base.before_save -> { self.product_type = product.product_type }, if: -> { product_type.nil? }
+      trip_stops.find_or_create_by(stop_type: :boarding, stop_id: options.origin)
+      trip_stops.find_or_create_by(stop_type: :drop_off, stop_id: options.destination)
     end
 
     def delivery_required?
@@ -51,20 +53,8 @@ module SpreeCmCommissioner
       super || product.discontinued?
     end
 
-    def default_inventory_item_exist?
-      inventory_items.exists?(inventory_date: nil)
-    end
-
-    def create_default_non_permanent_inventory_item!(quantity_available: nil, max_capacity: nil)
-      return if product_type.blank? # handle in case product not exist for variant.
-      return unless should_track_inventory?
-      return if default_inventory_item_exist?
-
-      inventory_items.create!(
-        product_type: product_type,
-        quantity_available: [0, quantity_available || total_on_hand].max,
-        max_capacity: [0, max_capacity || total_on_hand].max
-      )
+    def permanent_stock?
+      accommodation?
     end
 
     # override
@@ -82,26 +72,30 @@ module SpreeCmCommissioner
       "#{display_sku} - #{display_price}"
     end
 
+    def transit?
+      product.product_type == 'transit'
+    end
+
     # override
-    def in_stock?(options = {})
-      SpreeCmCommissioner::Stock::AvailabilityChecker.new(self, options).can_supply?
+    def in_stock?
+      available_quantity.positive?
     end
 
-    def price_for_date(currency:, date:)
-      currency = currency.upcase
+    private
 
-      prices.joins(:inventory_item)
-            .find_by(
-              currency: currency,
-              inventory_item: { inventory_date: date }
-            )
+    def total_purchases
+      Spree::LineItem.complete.where(variant_id: id).sum(:quantity).to_i
     end
 
-    private
+    def available_quantity
+      stock_count = stock_items.sum(&:count_on_hand)
+      return stock_count if delivery_required?
+
+      stock_count - total_purchases
+    end
 
     def update_vendor_price
-      return unless vendor.present? && product_type == vendor&.primary_product_type
-      return if price.blank?
+      return unless vendor.present? && product&.product_type == vendor&.primary_product_type
 
       vendor.update(min_price: price) if vendor.min_price.nil? || price < vendor.min_price
       vendor.update(max_price: price) if vendor.max_price.nil? || price > vendor.max_price
@@ -125,6 +119,22 @@ module SpreeCmCommissioner
         end
       end
     end
+
+    def sync_trip
+      return unless product.product_type == 'transit'
+
+      trip = SpreeCmCommissioner::Trip.find_or_initialize_by(variant_id: id)
+
+      trip.assign_attributes(
+        product_id: product_id,
+        origin_id: options.origin,
+        destination_id: options.destination,
+        departure_time: options.departure_time,
+        duration: options.total_duration_in_seconds,
+        vehicle_id: options.vehicle
+      )
+      trip.save
+    end
   end
 end
 

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -143,5 +143,28 @@ module SpreeCmCommissioner
     def number_of_guests
       number_of_adults + number_of_kids
     end
+
+    def origin
+      @origin ||= option_value_name_for(option_type_name: 'origin')&.to_i
+    end
+
+    def destination
+      @destination ||= option_value_name_for(option_type_name: 'destination')&.to_i
+    end
+
+    def vehicle
+      @vehicle ||= option_value_name_for(option_type_name: 'vehicle')&.to_i
+    end
+
+    def allow_seat_selection
+      @allow_seat_selection ||= option_value_name_for(option_type_name: 'allow-seat-selection')&.to_i
+    end
+
+    def departure_time
+      @departure_time ||= begin
+        time = option_value_name_for(option_type_name: 'departure-time')
+        Time.zone.parse(time) if time.present?
+      end
+    end
   end
 end

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -1,24 +1,29 @@
+require_dependency 'spree_cm_commissioner'
+
 module SpreeCmCommissioner
-  class Vehicle < Base
+  class Vehicle < SpreeCmCommissioner::Base
     include SpreeCmCommissioner::RouteType
 
+    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType'
+    has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
     belongs_to :vendor, class_name: 'Spree::Vendor'
 
-    has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
-    has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout'
+    after_commit :create_vehicle_option_value
 
-    has_many :vehicle_photos, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
+    has_many :vehicle_photo, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
+    has_many :vehicle_seats, class_name: 'SpreeCmCommissioner::VehicleSeat', through: :vehicle_type
 
     has_many :vehicle_option_types, class_name: 'SpreeCmCommissioner::VehicleOptionType', dependent: :destroy
     has_many :option_value_vehicles, class_name: 'SpreeCmCommissioner::OptionValueVehicle', dependent: :destroy
 
     validates :code, uniqueness: { scope: :vendor_id }, presence: true
-    validates :license_plate, uniqueness: true, allow_blank: true
+    validates :license_plate, uniqueness: {}, allow_blank: true
 
-    self.whitelisted_ransackable_attributes = %w[license_plate code]
-
-    def display_name
-      "#{code} (#{license_plate})"
+    def create_vehicle_option_value
+      SpreeCmCommissioner::VehicleOptionValueCreator.call(self)
     end
+
+    self.whitelisted_ransackable_attributes = %w[license_plate code]
+    self.whitelisted_ransackable_associations = %w[vehicle_type]
   end
 end

data/app/models/spree_cm_commissioner/vehicle_seat.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  class VehicleSeat < SpreeCmCommissioner::Base
+    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType', dependent: :destroy
+    has_many :line_item_seats, class_name: 'SpreeCmCommissioner::LineItemSeat', dependent: :destroy
+    counter_culture :vehicle_type, column_name: proc { |model|
+                                                  model.seat_type.in?(%w[normal vip]) && model.vehicle_type.allow_seat_selection == true ? 'vehicle_seats_count' : nil # rubocop:disable Layout/LineLength
+                                                },
+                                   column_names: { ['cm_vehicle_seats.seat_type IN (?)', %i[0 2]] => 'vehicle_seats_count' }
+    enum seat_type: %i[normal empty vip driver].freeze
+  end
+end

data/app/models/spree_cm_commissioner/vehicle_type.rb

@@ -0,0 +1,76 @@
+module SpreeCmCommissioner
+  class VehicleType < SpreeCmCommissioner::Base
+    include SpreeCmCommissioner::RouteType
+
+    after_commit :recalculate_vehicle_seats_count, if: -> { saved_change_to_allow_seat_selection? && allow_seat_selection }
+    after_commit :set_vehicles_attributes
+
+    has_many :vehicle_seats, class_name: 'SpreeCmCommissioner::VehicleSeat', dependent: :destroy
+    has_many :option_value_vehicle_types, class_name: 'SpreeCmCommissioner::OptionValueVehicleType'
+    has_many :option_values, through: :option_value_vehicle_types, class_name: 'Spree::OptionValue'
+    has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
+    belongs_to :vendor, class_name: 'Spree::Vendor'
+
+    validates :code, presence: true
+    validates :code, uniqueness: true
+    validates :name, presence: true
+    validates :name, uniqueness: true
+    accepts_nested_attributes_for :vehicle_seats, allow_destroy: true
+
+    state_machine :status, initial: :draft do
+      event :draft do
+        transition to: :draft
+      end
+      after_transition to: :draft, do: :after_draft
+
+      event :activate do
+        transition to: :active
+      end
+      after_transition to: :active, do: :after_activate
+
+      event :archive do
+        transition to: :archived
+      end
+      after_transition to: :archived, do: :after_archive
+    end
+
+    self.whitelisted_ransackable_attributes = %w[name code route_type id status]
+
+    def after_activate; end
+    def after_archive; end
+    def after_draft; end
+
+    def set_vehicles_attributes
+      vehicles.each(&:set_attributes)
+      vehicles.each(&:save)
+    end
+
+    def recalculate_vehicle_seats_count
+      self.vehicle_seats_count = vehicle_seats.where(seat_type: %w[normal vip]).count
+      save
+    end
+
+    def seat_layers
+      grouped_seats = SpreeCmCommissioner::VehicleSeat.where(vehicle_type_id: id).group_by(&:layer).transform_values do |seats|
+        seats.group_by(&:row).transform_values do |row_seats|
+          row_seats.sort_by(&:column).map do |seat|
+            {
+              row: seat.row,
+              column: seat.column,
+              label: seat.label,
+              layer: seat.layer,
+              seat_type: seat.seat_type,
+              created_at: seat.created_at,
+              vehicle_type_id: seat.vehicle_type_id
+            }
+          end
+        end
+      end
+      grouped_seats.map do |_layer, layer_seats|
+        layer_seats.map do |_row, row_seats|
+          row_seats
+        end
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -36,17 +36,21 @@ module SpreeCmCommissioner
       base.has_many :vendor_kind_option_values,
                     through: :option_value_vendors, source: :option_value
 
-      base.has_many :branches, -> { branch }, class_name: 'SpreeCmCommissioner::VendorPlace'
-      base.has_many :stops, -> { stop }, class_name: 'SpreeCmCommissioner::VendorPlace'
-      base.has_many :locations, -> { location }, class_name: 'SpreeCmCommissioner::VendorPlace'
-
-      base.has_many :branch_places, through: :branches, class_name: 'SpreeCmCommissioner::Place', source: :place
-      base.has_many :stop_places, through: :stops, class_name: 'SpreeCmCommissioner::Place', source: :place
-      base.has_many :location_places, through: :locations, class_name: 'SpreeCmCommissioner::Place', source: :place
+      base.has_many :branches, lambda {
+                                 where(cm_vendor_places: { place_type: 0 })
+                               }, through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :stops, -> { where(cm_vendor_places: { place_type: 1 }) }, through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :locations, -> { where(cm_vendor_places: { place_type: 2 }) },
+                    through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
 
       base.has_many :places,
                     through: :nearby_places, source: :place, class_name: 'SpreeCmCommissioner::Place'
 
+      base.has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy
+      base.has_many :boarding_points, -> { where(cm_vendor_stops: { stop_type: 0 }) },
+                    through: :vendor_stops, source: :stop, class_name: 'SpreeCmCommissioner::Place'
+      base.has_many :drop_off_points, -> { where(cm_vendor_stops: { stop_type: 1 }) },
+                    through: :vendor_stops, source: :stop, class_name: 'SpreeCmCommissioner::Place'
       base.has_many :dynamic_fields, class_name: 'SpreeCmCommissioner::DynamicField', foreign_key: :vendor_id, dependent: :destroy
 
       base.has_one  :logo, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::VendorLogo'
@@ -77,19 +81,19 @@ module SpreeCmCommissioner
       base.has_many :promotion_categories, class_name: 'Spree::PromotionCategory', foreign_key: :vendor_id, dependent: :destroy
 
       base.has_many :homepage_section_relatables,
-                    as: :relatable,
                     class_name: 'SpreeCmCommissioner::HomepageSectionRelatable',
-                    dependent: :destroy,
-                    inverse_of: :relatable
+                    dependent: :destroy, inverse_of: :relatable
 
+      base.has_many :vehicle_types, class_name: 'SpreeCmCommissioner::VehicleType', dependent: :destroy
       base.has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
-      base.has_many :trips, class_name: 'SpreeCmCommissioner::Trip', dependent: :destroy
+      # base.has_many :vehicles, through: :vehicle_types, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
 
       base.validates :account_name, :account_number, presence: true, if: lambda {
                                                                            payment_qrcode.present? && Spree::Store.default.code.include?('billing')
                                                                          }
 
       base.validates :commission_rate, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }
+      base.validates :from_email, presence: true, if: :tenant_present?
 
       def base.by_vendor_id!(vendor_id)
         if vendor_id.to_s =~ /^\d+$/
@@ -192,6 +196,8 @@ module SpreeCmCommissioner
 
       vendor_kind_option_values.where(option_type_id: rules_option_type.id)
     end
+
+    delegate :present?, to: :tenant, prefix: true
   end
 end
 

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -5,21 +5,15 @@ module SpreeCmCommissioner
 
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
-    belongs_to :location, class_name: 'SpreeCmCommissioner::VendorPlace', optional: true
-
-    has_many :branches, -> { branch }, class_name: 'SpreeCmCommissioner::VendorPlace'
-    has_many :stops, -> { stop }, class_name: 'SpreeCmCommissioner::VendorPlace'
 
     validates :place_type, presence: true
     validates :place_id, uniqueness: { scope: %i[vendor_id place_type] }
-    validates :location, presence: true, if: -> { branch? || stop? }
 
     accepts_nested_attributes_for :place, allow_destroy: true
 
-    # include place when using these delegate to avoid N+1
-    def display_name
-      place&.name
-    end
+    scope :branches,  -> { where(place_type: :branch) }
+    scope :stops,     -> { where(place_type: :stop) }
+    scope :locations, -> { where(place_type: :location) }
 
     def selected
       vendor.selected_place_references.include?(place&.reference)

data/app/models/spree_cm_commissioner/vendor_stop.rb

@@ -0,0 +1,10 @@
+require_dependency 'spree_cm_commissioner'
+module SpreeCmCommissioner
+  class VendorStop < ApplicationRecord
+    belongs_to :vendor, class_name: 'Spree::Vendor'
+    belongs_to :stop, class_name: 'SpreeCmCommissioner::Place'
+
+    validates :trip_count, numericality: { greater_than_or_equal_to: 0 }
+    enum :stop_type, { boarding: 0, drop_off: 1 }
+  end
+end

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -2,57 +2,54 @@ module SpreeCmCommissioner
   class TripQuery
     include SpreeCmCommissioner::Transit::TripHelper
 
-    attr_reader :origin_id, :destination_id, :date, :params
+    attr_reader :origin_id, :destination_id, :travel_date, :params
 
-    def initialize(origin_id:, destination_id:, date:, params: {})
+    def initialize(origin_id:, destination_id:, travel_date:, params: {})
       @origin_id = origin_id
       @destination_id = destination_id
-      @date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
+      @travel_date = travel_date
+      @travel_date = Time.zone.now if travel_date.to_date == Time.zone.now.to_date
       @params = params
     end
 
     def call
-      return [] if date.to_date < Date.current
+      return [] if travel_date.to_date < Date.current
 
       direct_results = direct_trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
       connected_results = connected_trips || []
       direct_results + connected_results
     end
 
-    def direct_trips # rubocop:disable Metrics/MethodLength
-      result = Spree::Product
-               .select('
+    def direct_trips
+      result = Spree::Variant
+               .select('spree_variants.id AS variant_id,
                         vendors.id AS vendor_id,
                         vendors.name AS vendor_name,
-                        spree_products.name AS route_name,
-                        spree_products.short_name AS short_name,
+                        routes.name AS route_name,
+                        routes.short_name AS short_name,
                         boarding.stop_id AS origin_id,
                         drop_off.stop_id AS destination_id,
                         boarding.stop_name AS origin,
                         drop_off.stop_name AS destination,
-                        spree_products.id AS trip_id,
                         trips.departure_time AS departure_time,
                         trips.duration AS duration,
-                        trips.vehicle_id AS vehicle_id,
-                        COALESCE(iv.quantity_available, 0) AS quantity_available,
-                        COALESCE(iv.max_capacity, 0) AS max_capacity'
+                        trips.vehicle_id AS vehicle_id'
                       )
-               .joins('INNER JOIN cm_trips AS trips ON trips.product_id = spree_products.id')
-               .joins('INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = trips.id AND boarding.stop_type = 0')
-               .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = trips.id AND drop_off.stop_type = 1')
-               .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_products.vendor_id')
-               .joins("LEFT JOIN (#{product_inventory_totals.to_sql}) iv ON spree_products.id = iv.product_id")
-
+               .joins('INNER JOIN cm_trips AS trips ON trips.variant_id = spree_variants.id')
+               .joins('INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = spree_variants.id AND boarding.stop_type = 0')
+               .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = spree_variants.id AND drop_off.stop_type = 1')
+               .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_variants.vendor_id')
+               .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
       result = result.where(vendors: { id: params[:vendor_id] }) if params[:vendor_id].present?
       result = result.where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
                      .where('trips.departure_time > ? AND trips.departure_time <= ?',
-                            date.strftime('%H:%M:%S'),
-                            date.end_of_day.strftime('%H:%M:%S')
+                            travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
                            )
 
       result.map do |trip|
         trip_result_options = {
-          trip_id: trip[:trip_id],
+          trip_id: trip[:variant_id],
           vendor_id: trip[:vendor_id],
           vendor_name: trip[:vendor_name],
           route_name: trip[:route_name],
@@ -64,9 +61,7 @@ module SpreeCmCommissioner
           destination: trip[:destination],
           vehicle_id: trip[:vehicle_id],
           departure_time: parse_time(trip[:departure_time]),
-          duration: trip[:duration],
-          quantity_available: trip[:quantity_available].to_i,
-          max_capacity: trip[:max_capacity].to_i
+          duration: trip[:duration]
         }
         SpreeCmCommissioner::TripResult.new(trip_result_options)
       end
@@ -74,69 +69,52 @@ module SpreeCmCommissioner
 
     def connected_trips # rubocop:disable Metrics/MethodLength
       result = SpreeCmCommissioner::TripConnection
-               .joins("
-                INNER JOIN cm_trips trip1 ON trip1.id = cm_trip_connections.from_trip_id
-                INNER JOIN cm_trips trip2 ON trip2.id = cm_trip_connections.to_trip_id
-                INNER JOIN spree_products AS product1 ON product1.id = trip1.product_id
-                INNER JOIN spree_products AS product2 ON product2.id = trip2.product_id
-                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = trip1.id AND trip1_origin.stop_type = 0
-                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = trip2.id AND trip2_origin.stop_type = 0
-                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = trip2.id AND trip2_destination.stop_type = 1
-                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = product1.vendor_id
-                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = product2.vendor_id
-                LEFT JOIN (#{product_inventory_totals.to_sql}) AS iv1 ON iv1.product_id = product1.id
-                LEFT JOIN (#{product_inventory_totals.to_sql}) AS iv2 ON iv2.product_id = product2.id"
+               .joins('
+                INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
+                INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
+                INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
+                INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
+                INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
+                INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
+                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
+                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
+                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
                      )
                .select('cm_trip_connections.id AS id,
-                        trip1.id AS trip1_id,
+                        trip1.variant_id AS trip1_id,
                         trip1.origin_id AS trip1_origin_id,
                         trip1.destination_id AS trip1_destination_id,
                         trip1.departure_time AS trip1_departure_time,
                         trip1.duration AS trip1_duration,
-                        product1.id AS trip1_id,
-                        product1.short_name AS route1_short_name,
-                        product1.name AS route1_name,
+                        routes1.short_name AS route1_short_name,
+                        routes1.name AS route1_name,
                         trip1.vehicle_id AS trip1_vehicle,
                         vendor1.name AS trip1_vendor_name,
-                        trip2.id AS trip2_id,
+                        trip2.variant_id AS trip2_id,
                         trip2.origin_id AS trip2_origin_id,
                         trip2.destination_id AS trip2_destination_id,
                         trip2.departure_time AS trip2_departure_time,
                         trip2.duration AS trip2_duration,
                         trip2.vehicle_id AS trip2_vehicle,
-                        product2.id AS trip2_id,
-                        product2.short_name AS route2_short_name,
-                        product2.name AS route2_name,
+                        routes2.short_name AS route2_short_name,
+                        routes2.name AS route2_name,
                         trip1_origin.stop_name AS trip1_origin,
                         trip2_origin.stop_name AS trip2_origin,
                         trip2_destination.stop_name AS trip2_destination,
-                        vendor2.name AS trip2_vendor_name,
-                        COALESCE(iv1.quantity_available, 0) as trip1_quantity_available,
-                        COALESCE(iv2.quantity_available, 0) as trip2_quantity_available,
-                        COALESCE(iv1.max_capacity, 0) as trip1_max_capacity,
-                        COALESCE(iv2.max_capacity, 0) as trip2_max_capacity'
+                        vendor2.name AS trip2_vendor_name'
                       ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id)
       result = result.where('vendor1.id = ? OR vendor2.id = ?', params[:vendor_id], params[:vendor_id]) if params[:vendor_id].present?
-      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', date.strftime('%H:%M:%S'),
-                            date.end_of_day.strftime('%H:%M:%S')
+      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
       ).uniq
+
       return [] if result.blank?
 
       build_trip_query_result(result)
     end
 
-    def product_inventory_totals
-      Spree::Product
-        .select(
-          'spree_products.id AS product_id,
-            SUM(cm_inventory_items.max_capacity) AS max_capacity,
-            SUM(cm_inventory_items.quantity_available) AS quantity_available'
-        )
-        .joins(variants: :inventory_items)
-        .where(cm_inventory_items: { inventory_date: date.to_date })
-        .group('spree_products.id')
-    end
-
     private
 
     def build_trip_query_result(connections)
@@ -152,9 +130,7 @@ module SpreeCmCommissioner
           short_name: trip[:route1_short_name],
           vehicle_id: trip[:trip1_vehicle],
           origin: trip[:trip1_origin],
-          destination: trip[:trip2_origin],
-          quantity_available: trip[:trip1_quantity_available].to_i,
-          max_capacity: trip[:trip1_max_capacity].to_i
+          destination: trip[:trip2_origin]
         }
         to_trip = {
           trip_id: trip[:trip2_id],
@@ -167,9 +143,7 @@ module SpreeCmCommissioner
           short_name: trip[:route2_short_name],
           vehicle_id: trip[:trip2_vehicle],
           origin: trip[:trip2_origin],
-          destination: trip[:trip2_destination],
-          quantity_available: trip[:trip2_quantity_available].to_i,
-          max_capacity: trip[:trip2_max_capacity].to_i
+          destination: trip[:trip2_destination]
         }
         data = [SpreeCmCommissioner::TripResult.new(from_trip),
                 SpreeCmCommissioner::TripResult.new(to_trip)