spree_cm_commissioner 2.0.3.pre.pre5 → 2.0.3.pre.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de104e725d2f24613de706e3246bdc7d316520fac6eb9b21789a6b2f2c45ab06
-  data.tar.gz: df640f714603d5d38bb33ad1b7ded9f66ca5126610bf2d8bdeba79890e7ac090
+  metadata.gz: 3386c245e402dd11660e1215a50dac52acfd59950f95afb03117bff6c56053a5
+  data.tar.gz: 551927bdc54caee21d0ca26601c2d42b5ee0cd14b5c4264da1a5ae3968270d4d
 SHA512:
-  metadata.gz: 782d5091a568ece086d739de4c0e8b9e1a00a97302b68d1cc982b8f9a5718fb5c4cfa928f9310427e69e11fd34211c54893104fbacbc8293d8033bf4d2213ad0
-  data.tar.gz: 8aeca4178f0bf6ce687b9cd2dffd5d648db14f1c2a5537964e6e728a73801362495d370d32509029408ec7d9d5d8fe88094fbd3da392b61e68446f4ad58b5e68
+  metadata.gz: f8c9f527ea17e43fabfcf7ecba55e70887a51a31a85849e918cf508cc8bc8d6a3b6f6165f534139fad9704902a7aea8875b58798514caf63882b2914534cc693
+  data.tar.gz: ca8d78212f84afd5091ac23617a88d49b096cc526e84a3aedc2c9b432fe02aaf55546a5a54bfe8c0704be30a72050d01c7be88a505b37abea3f4d634a1829ea5

data/Gemfile.lock

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

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

@@ -11,17 +11,11 @@ module Spree
             types = ADDITIONAL_FIELDS + kyc_fields
 
             resources = types.map do |type|
-              event_chart = SpreeCmCommissioner::EventChartQueries.new(
-                taxon_id: params[:taxon_id],
-                chart_type: type,
-                refreshed: params[:refreshed] || false
-              ).call
-
               # Create unique ID by using chart_type as the identifier
               SpreeCmCommissioner::EventChart.new(
                 id: type.to_s,
-                chart_type: event_chart.chart_type,
-                product_charts: event_chart.product_charts
+                chart_type: type,
+                product_charts: nil
               )
             end
 

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

@@ -0,0 +1,29 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class TripPlacesController < ::Spree::Api::V2::ResourceController
+          # override
+          def collection
+            base_scope = model_class.joins(:location_vendor_places).distinct
+
+            if params[:q].present?
+              @search = base_scope.ransack(params[:q])
+              @search.result
+            else
+              base_scope
+            end
+          end
+
+          def model_class
+            SpreeCmCommissioner::Place
+          end
+
+          def collection_serializer
+            Spree::V2::Storefront::TripPlaceSerializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,8 @@ module Spree
               origin_id: params[:origin_id],
               destination_id: params[:destination_id],
               date: params[:date],
+              vendor_id: params[:vendor_id],
+              number_of_guests: params[:number_of_guests],
               params: params
             ).call
 

data/app/controllers/spree_cm_commissioner/admin/products_controller_decorator.rb

@@ -5,6 +5,7 @@ module SpreeCmCommissioner
         # spree update user sign_in_count
         base.around_action :set_writing_role, only: %i[index]
         base.after_action :set_tenant_after_update, only: %i[update]
+        base.before_action :merge_industry_taxons_into_taxons, only: [:update]
       end
 
       # Override
@@ -50,6 +51,19 @@ module SpreeCmCommissioner
 
       protected
 
+      def merge_industry_taxons_into_taxons
+        return if params[:product].blank?
+
+        industry_ids = Array(params[:product][:industry_taxon_ids]).compact_blank
+        taxon_ids = Array(params[:product][:taxon_ids]).compact_blank
+
+        merged_ids = (taxon_ids + industry_ids).uniq
+
+        params[:product][:taxon_ids] = merged_ids
+
+        params[:product].delete(:industry_taxon_ids)
+      end
+
       def find_resource
         product_scope.with_deleted.includes(vendor: :tenant).friendly.find(params[:id])
       end

data/app/interactors/spree_cm_commissioner/transit/draft_order_creator.rb

@@ -53,6 +53,8 @@ module SpreeCmCommissioner
 
         legs.each do |leg|
           leg_line_items = build_line_items_for!(leg, order, current_leg_date)
+          leg_line_items = insert_saved_guests_per_line_items_leg(leg_line_items)
+
           all_line_items.concat(leg_line_items)
           current_leg_date = leg_line_items.last.to_date.to_date if leg_line_items.any?
         end
@@ -85,13 +87,11 @@ module SpreeCmCommissioner
             }
           )
 
-          build_guests!(line_item, seat_selections)
-
-          line_item
+          build_guests_for!(line_item, seat_selections)
         end
       end
 
-      def build_guests!(line_item, seat_selections)
+      def build_guests_for!(line_item, seat_selections)
         block_ids = seat_selections.flat_map(&:block_ids)
 
         if block_ids.any? && block_ids.size != line_item.quantity
@@ -101,6 +101,19 @@ module SpreeCmCommissioner
         Array.new(line_item.quantity) do |index|
           line_item.guests.new(block_id: block_ids[index])
         end
+
+        line_item
+      end
+
+      def insert_saved_guests_per_line_items_leg(line_items)
+        line_items.flat_map(&:guests).each_with_index do |guest, index|
+          context.saved_guests ||= []
+          context.saved_guests << SpreeCmCommissioner::SavedGuest.new if context.saved_guests[index].blank?
+
+          guest.saved_guest = context.saved_guests[index]
+        end
+
+        line_items
       end
 
       def calculate_line_item_duration!(date:, departure_time:, arrival_time:)

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

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5 }
+      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5, transit: 6, industry: 7 }
     end
   end
 end

data/app/models/spree_cm_commissioner/address_decorator.rb

@@ -8,6 +8,12 @@ module SpreeCmCommissioner
       base.validates :country, presence: true, if: :require_country?
     end
 
+    # override to return false instead of true
+    # in case no country
+    def require_zipcode?
+      country ? country.zipcode_required? : false
+    end
+
     def require_address1?
       false
     end
@@ -22,9 +28,17 @@ module SpreeCmCommissioner
   end
 end
 
-unless Spree::Address.included_modules.include?(SpreeCmCommissioner::AddressDecorator)
-  # remove validators for the specified attributes
-  %i[address1 city country].each { |attr| Spree::Address._validators.delete(attr) }
+if Spree::Address.included_modules.exclude?(SpreeCmCommissioner::AddressDecorator)
+  keys = %i[address1 city country]
+
+  Spree::Address._validators.reject! { |key, _| keys.include?(key) }
+  Spree::Address._validate_callbacks.each do |c|
+    next unless c.filter.respond_to?(:attributes)
+
+    c.filter.attributes.delete(:address1)
+    c.filter.attributes.delete(:city)
+    c.filter.attributes.delete(:country)
+  end
 
   Spree::Address.prepend(SpreeCmCommissioner::AddressDecorator)
 end

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

@@ -5,30 +5,48 @@
 module SpreeCmCommissioner
   module Order
     module AddressBookDecorator
-      def guest_order? = user.blank?
-
       # override
       def bill_address_attributes=(attributes)
-        attributes[:id] = bill_address&.id if attributes[:id].blank?
-        return if guest_order? && !basic_info_included?(attributes)
+        attributes[:id] = bill_address_id if attributes[:id].blank?
+        attributes[:phone] = intel_phone_number if intel_phone_number.present?
 
-        super
+        self.bill_address = assign_address_attributes(attributes)
+        user.bill_address = bill_address if user && user.bill_address.nil?
       end
 
       # override
       def ship_address_attributes=(attributes)
-        attributes[:id] = bill_address&.id if attributes[:id].blank?
-        return if guest_order? && !basic_info_included?(attributes)
+        attributes[:id] = ship_address_id if attributes[:id].blank?
+        attributes[:phone] = intel_phone_number if intel_phone_number.present?
 
-        super
+        self.ship_address = assign_address_attributes(attributes)
+        user.ship_address = ship_address if user && user.ship_address.nil?
       end
 
-      private
+      def assign_address_attributes(attributes = {})
+        return if attributes.blank?
+
+        attributes.transform_values! { |v| v == '' ? nil : v }
+        attributes = attributes.to_h.symbolize_keys
 
-      def basic_info_included?(attributes)
-        return true if attributes[:id].present?
+        existing_address = attributes[:id].present? ? find_existing_address(attributes[:id]) : nil
+
+        if existing_address&.editable?
+          existing_address.assign_attributes(attributes)
+          existing_address
+        else
+          ::Spree::Address.new(attributes.except(:id, :updated_at, :created_at))
+        end
+      end
 
-        %i[firstname lastname phone].all? { |key| attributes[key].present? }
+      def find_existing_address(id)
+        if user.present?
+          ::Spree::Address.where('(user_id = ? OR user_id IS NULL) AND deleted_at IS NULL', user.id)
+                          .find_by(id: id)
+        else
+          ::Spree::Address.where(user_id: nil, deleted_at: nil)
+                          .find_by(id: id)
+        end
       end
     end
   end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -43,7 +43,12 @@ module SpreeCmCommissioner
       base.has_many :vendors, through: :products, class_name: 'Spree::Vendor'
       base.has_many :taxons, through: :products, class_name: 'Spree::Taxon'
       base.has_many :guests, through: :line_items, class_name: 'SpreeCmCommissioner::Guest'
-      base.has_many :saved_guests, -> { distinct }, through: :guests, class_name: 'SpreeCmCommissioner::SavedGuest'
+
+      base.has_many :saved_guests, -> { distinct.reorder('cm_saved_guests.created_at DESC') },
+                    through: :guests,
+                    source: :saved_guest,
+                    class_name: 'SpreeCmCommissioner::SavedGuest'
+
       base.has_many :blocks, through: :guests, class_name: 'SpreeCmCommissioner::Block', source: :block
       base.has_many :reserved_blocks, through: :guests, class_name: 'SpreeCmCommissioner::ReservedBlock'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variants
@@ -53,6 +58,8 @@ module SpreeCmCommissioner
       base.whitelisted_ransackable_associations |= %w[customer taxon payments guests invoice]
       base.whitelisted_ransackable_attributes |= %w[intel_phone_number phone_number email number state]
 
+      base.accepts_nested_attributes_for :saved_guests, allow_destroy: true
+
       def base.search_by_qr_data!(data)
         token = data.match(/^R\d{9,}-([A-Za-z0-9_\-]+)$/)&.captures
 

data/app/models/spree_cm_commissioner/place.rb

@@ -14,6 +14,8 @@ module SpreeCmCommissioner
     has_many :product_places, class_name: 'SpreeCmCommissioner::ProductPlace', dependent: :destroy
     has_many :products, through: :product_places
 
+    has_many :location_vendor_places, -> { where(place_type: :location) }, class_name: 'SpreeCmCommissioner::VendorPlace'
+
     has_many :children, -> { order(:lft) }, class_name: 'SpreeCmCommissioner::Place', foreign_key: :parent_id, dependent: :destroy
 
     has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -48,6 +48,9 @@ module SpreeCmCommissioner
 
       base.belongs_to :event, class_name: 'Spree::Taxon', optional: true
 
+      base.has_many :industry_classifications, -> { joins(:taxon).where(spree_taxons: { kind: :industry }) }, class_name: 'Spree::Classification'
+      base.has_many :industry_taxons, through: :industry_classifications, source: :taxon
+
       base.scope :min_price, lambda { |vendor|
         joins(:prices_including_master)
           .where(vendor_id: vendor.id, product_type: vendor.primary_product_type)
@@ -74,6 +77,16 @@ module SpreeCmCommissioner
       base.after_update :sync_event_id_to_children, if: :saved_change_to_event_id?
 
       base.enum purchasable_on: { both: 0, web: 1, app: 2 }
+      base.enum call_to_action: { buy_now: 0,
+                                  book_now: 1,
+                                  reserve: 2,
+                                  register: 3,
+                                  apply: 4,
+                                  get_ticket: 5,
+                                  secure_your_seat: 6,
+                                  join_the_event: 7,
+                                  request_to_book: 8
+                                }
 
       base.multi_tenant :tenant, class_name: 'SpreeCmCommissioner::Tenant'
       base.before_save :set_tenant
@@ -83,6 +96,22 @@ module SpreeCmCommissioner
       "#{Spree::Store.default.formatted_url}/tickets/#{slug}"
     end
 
+    def action_button
+      return :request_to_book if need_confirmation?
+      return :reserve if free?
+      return call_to_action.to_sym if call_to_action.present?
+
+      :buy_now
+    end
+
+    def free?
+      return false if prices_including_master.empty?
+
+      prices_including_master.all? do |master_price|
+        master_price.price.zero? && (master_price.compare_at_price.nil? || master_price.compare_at_price.zero?)
+      end
+    end
+
     def dynamic_fields_by_collection_phase
       {
         pre_registration: dynamic_fields.pre_registration.order(:position),

data/app/models/spree_cm_commissioner/saved_guest.rb

@@ -9,5 +9,7 @@ module SpreeCmCommissioner
     belongs_to :nationality, class_name: 'Spree::Taxon', optional: true
 
     has_many :guests, class_name: 'SpreeCmCommissioner::Guest', dependent: :nullify
+
+    accepts_nested_attributes_for :guests, allow_destroy: true
   end
 end

data/app/models/spree_cm_commissioner/trip.rb

@@ -8,6 +8,7 @@ module SpreeCmCommissioner
 
     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 :vehicle, class_name: 'SpreeCmCommissioner::Vehicle', optional: false
 
     belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
@@ -17,8 +18,8 @@ module SpreeCmCommissioner
     has_many :blazer_queries, through: :trip_blazer_queries, source: :blazer_query, class_name: 'Blazer::Query'
 
     has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy
-    has_many :boarding_trip_stops, -> { boarding }, class_name: 'SpreeCmCommissioner::TripStop'
-    has_many :drop_off_trip_stops, -> { drop_off }, class_name: 'SpreeCmCommissioner::TripStop'
+    has_many :boarding_trip_stops, -> { boarding.order('departure_time ASC NULLS LAST, id ASC') }, class_name: 'SpreeCmCommissioner::TripStop'
+    has_many :drop_off_trip_stops, -> { drop_off.order('arrival_time ASC NULLS LAST') }, class_name: 'SpreeCmCommissioner::TripStop'
 
     has_many :variants, through: :product
     has_many :inventory_items, through: :variants
@@ -32,6 +33,7 @@ module SpreeCmCommissioner
     accepts_nested_attributes_for :trip_stops, :product, allow_destroy: true
 
     self.whitelisted_ransackable_associations = %w[product vehicle]
+    self.whitelisted_ransackable_attributes = %w[origin_place_id destination_place_id]
 
     def convert_duration_to_seconds
       return if hours.blank? && minutes.blank? && seconds.blank?

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -84,6 +84,9 @@ module SpreeCmCommissioner
 
       base.has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
       base.has_many :trips, class_name: 'SpreeCmCommissioner::Trip', dependent: :destroy
+      base.has_many :trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop'
+      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.validates :account_name, :account_number, presence: true, if: lambda {
                                                                            payment_qrcode.present? && Spree::Store.default.code.include?('billing')

data/app/overrides/spree/admin/products/_form/industry_taxons.html.erb.deface

@@ -0,0 +1,26 @@
+<!-- insert_after "[data-hook='admin_product_form_taxons']" -->
+
+<div data-hook="admin_product_form_industry_taxons">
+  <%= f.field_container :industry_taxons do %>
+    <%= f.label :industry_taxon_ids, Spree.t(:Industries) %>
+
+    <% if can? :modify, Spree::Classification %>
+      <%= f.select :industry_taxon_ids, options_from_collection_for_select(@product.industry_taxons, :id, :pretty_name, @product.industry_taxon_ids),
+                                { include_hidden: true },
+                                  multiple: true,
+                                  data: { autocomplete_url_value: 'taxons_api_v2',
+                                          autocomplete_return_attr_value: 'pretty_name',
+                                          autocomplete_multiple_value: true,
+                                          autocomplete_additional_url_params_value: "q[kind_eq]=7" } %>
+    <% elsif @product.industry_taxons.any? %>
+      <ul class="text_list">
+        <% @product.industry_taxons.each do |taxon| %>
+          <li><%= taxon.name %></li>
+        <% end %>
+      </ul>
+    <% else %>
+      <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :taxons) %></div>
+    <% end %>
+
+  <% end %>
+</div>

data/app/overrides/spree/admin/products/_form/taxons.html.erb.deface

@@ -0,0 +1,26 @@
+<!-- replace "[data-hook='admin_product_form_taxons']" -->
+
+<div data-hook="admin_product_form_taxons">
+  <%= f.field_container :taxons do %>
+    <%= f.label :taxon_ids, Spree.t(:taxons) %>
+
+    <% if can? :modify, Spree::Classification %>
+      <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxon_ids.reject { |id| @product.industry_taxon_ids.include?(id) }),
+                                { include_hidden: true },
+                                  multiple: true,
+                                  data: { autocomplete_url_value: 'taxons_api_v2',
+                                          autocomplete_return_attr_value: 'pretty_name',
+                                          autocomplete_multiple_value: true,
+                                          autocomplete_additional_url_params_value: "q[kind_not_eq]=7" } %>
+    <% elsif @product.taxons.any? %>
+      <ul class="text_list">
+        <% @product.taxons.each do |taxon| %>
+          <li><%= taxon.name %></li>
+        <% end %>
+      </ul>
+    <% else %>
+      <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :taxons) %></div>
+    <% end %>
+
+  <% end %>
+</div>

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -1,14 +1,16 @@
 module SpreeCmCommissioner
   class TripQuery
-    attr_reader :origin_id, :destination_id, :date
+    attr_reader :origin_id, :destination_id, :date, :vendor_id, :number_of_guests, :params
 
-    def initialize(origin_id:, destination_id:, date:, params: {})
+    def initialize(origin_id:, destination_id:, date:, vendor_id: nil, number_of_guests: nil, params: {}) # rubocop:disable Metrics/ParameterLists
       @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)
+      @vendor_id = vendor_id
+      @number_of_guests = number_of_guests || 1
       @params = params
       @page = (params[:page] || 1).to_i
-      @per_page = (params[:per_page] || 25).to_i
+      @per_page = params[:per_page]
     end
 
     def call
@@ -17,15 +19,16 @@ module SpreeCmCommissioner
       paginated_relation = direct_trips
       return Kaminari.paginate_array([]) if paginated_relation.empty?
 
-      results_array = paginated_relation.map do |trip|
+      unique_trips = paginated_relation.uniq(&:id)
+      results_array = unique_trips.map do |trip|
         result = build_trip_result(trip)
         SpreeCmCommissioner::TripQueryResult.new([result])
       end
 
       Kaminari.paginate_array(
         results_array,
-        total_count: paginated_relation.total_count,
-        limit: @per_page,
+        total_count: unique_trips.size,
+        limit: unique_trips.size,
         offset: paginated_relation.offset_value
       )
     end
@@ -51,17 +54,17 @@ module SpreeCmCommissioner
                  INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.stop_type = 1
                  INNER JOIN cm_places AS origin_places ON origin_places.id = cm_trips.origin_place_id
                  INNER JOIN cm_places AS dest_places ON dest_places.id = cm_trips.destination_place_id
-                 INNER JOIN spree_products ON spree_products.id = cm_trips.product_id
-                 INNER JOIN spree_variants AS master ON master.product_id = spree_products.id AND master.is_master = true
+                 INNER JOIN spree_variants AS master ON master.product_id = cm_trips.product_id AND master.is_master = true
                  INNER JOIN spree_prices AS prices ON prices.variant_id = master.id AND prices.deleted_at IS NULL
                SQL
-               .where('(boarding.location_place_id = ? OR boarding.stop_place_id = ?)
-                        AND (drop_off.location_place_id = ? OR drop_off.stop_place_id = ?)', origin_id, origin_id, destination_id, destination_id
+               .where('(boarding.location_place_id = ? OR boarding.stop_place_id = ? OR cm_trips.origin_place_id = ?)
+                        AND (drop_off.location_place_id = ? OR drop_off.stop_place_id = ? OR cm_trips.destination_place_id = ?)',
+                      origin_id, origin_id, origin_id, destination_id, destination_id, destination_id
                )
-               .joins("LEFT JOIN (#{@inventory_sql.to_sql}) iv ON cm_trips.product_id = iv.product_id")
+               .joins("INNER JOIN (#{@inventory_sql.to_sql}) iv ON cm_trips.product_id = iv.product_id")
 
-      result = result.where(vendor_id: @params[:vendor_id]) if @params[:vendor_id].present?
-      result.page(@page).per(@per_page)
+      result = result.where(vendor_id: vendor_id) if vendor_id.present?
+      @per_page.to_i.positive? ? result.page(@page).per(@per_page) : result.page(@page)
     end
 
     def product_inventory_totals
@@ -72,16 +75,12 @@ module SpreeCmCommissioner
               SUM(cm_inventory_items.quantity_available) AS quantity_available'
         )
         .joins(variants: :inventory_items)
-        .where(cm_inventory_items: { inventory_date: date.to_date })
+        .where('cm_inventory_items.inventory_date = ? AND cm_inventory_items.quantity_available >= ?', @date.to_date, @number_of_guests)
         .group('spree_products.id')
     end
 
     private
 
-    def cached_inventory_sql
-      @inventory_sql ||= product_inventory_totals
-    end
-
     def build_trip_result(trip)
       vehicle = trip&.vehicle
       vendor = trip&.vendor
@@ -90,6 +89,7 @@ module SpreeCmCommissioner
         departure_time: trip&.departure_time,
         duration: trip&.duration,
         allow_seat_selection: trip&.allow_seat_selection,
+        route_type: trip&.route_type,
         origin_place: {
           id: trip&.origin_place_id,
           name: trip&.origin_place_name

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

@@ -44,6 +44,8 @@ module Spree
           end
 
           base.cache_options store: nil
+
+          base.attribute :action_button, &:action_button
         end
       end
     end

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

@@ -0,0 +1,10 @@
+module Spree
+  module V2
+    module Storefront
+      class TripPlaceSerializer < BaseSerializer
+        attributes :reference, :name, :vicinity, :lat, :lon, :icon, :url, :rating,
+                   :formatted_phone_number, :formatted_address, :address_components, :types
+      end
+    end
+  end
+end

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

@@ -5,8 +5,9 @@ module Spree
         set_type :trip_result
 
         attributes :origin_place, :destination_place, :boarding, :drop_off, :price, :compare_at_amount, :currency, :quantity_available, :max_capacity,
-                   :allow_seat_selection, :departure_time
+                   :allow_seat_selection, :departure_time, :route_type
         attribute :duration_in_hms, &:duration_in_hms
+        attribute :arrival_time, &:arrival_time
         belongs_to :vendor, serializer: Spree::V2::Storefront::TripVendorSerializer
         belongs_to :vehicle, serializer: Spree::V2::Storefront::TripVehicleSerializer
         has_many :amenities, serializer: Spree::V2::Storefront::AmenitySerializer

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

@@ -4,7 +4,7 @@ module Spree
       class TripVehicleSerializer < BaseSerializer
         set_type :vehicle
 
-        attributes :id, :code
+        attributes :id, :code, :vehicle_type
       end
     end
   end

data/db/migrate/20250812015522_remove_unique_indexes_from_cm_user_identity_providers.rb

@@ -0,0 +1,8 @@
+class RemoveUniqueIndexesFromCmUserIdentityProviders < ActiveRecord::Migration[7.0]
+  def change
+    if index_exists?(:cm_user_identity_providers, [:identity_type, :sub], name: "index_cm_user_identity_providers_on_identity_type_and_sub")
+      remove_index :cm_user_identity_providers,
+                   name: "index_cm_user_identity_providers_on_identity_type_and_sub"
+    end
+  end
+end

data/db/migrate/20250814073854_add_call_to_action_to_spree_products.rb

@@ -0,0 +1,5 @@
+class AddCallToActionToSpreeProducts < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_products, :call_to_action, :integer, null: true, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/transit/leg.rb

@@ -19,5 +19,19 @@ module SpreeCmCommissioner::Transit
         seat_selections: (hash[:seat_selections] || []).map { |seat_selection| SeatSelection.from_hash(seat_selection) }
       )
     end
+
+    def quantity
+      @seat_selections.sum(&:quantity).to_i
+    end
+
+    def to_h
+      {
+        direction: @direction,
+        trip_id: @trip_id,
+        boarding_trip_stop_id: @boarding_trip_stop_id,
+        drop_off_trip_stop_id: @drop_off_trip_stop_id,
+        seat_selections: @seat_selections.map(&:to_h)
+      }
+    end
   end
 end

data/lib/spree_cm_commissioner/transit/seat_selection.rb

@@ -4,7 +4,7 @@ module SpreeCmCommissioner::Transit
 
     def initialize(options = {})
       @variant_id = options[:variant_id]
-      @quantity = options[:quantity]
+      @quantity = options[:quantity]&.to_i
       @block_ids = options[:block_ids] || []
     end
 
@@ -15,5 +15,13 @@ module SpreeCmCommissioner::Transit
         block_ids: hash[:block_ids] || [] # empty when no seat selection.
       )
     end
+
+    def to_h
+      {
+        variant_id: @variant_id,
+        quantity: @quantity,
+        block_ids: @block_ids
+      }
+    end
   end
 end

data/lib/spree_cm_commissioner/trip_query_result.rb

@@ -26,5 +26,39 @@ module SpreeCmCommissioner
     def max_capacity
       @trips.map(&:max_capacity).compact.min
     end
+
+    def total_price
+      @trips.map(&:price).compact.sum
+    end
+
+    def total_duration
+      @trips.map(&:duration).compact.sum
+    end
+
+    def total_duration_in_hms
+      total_seconds = total_duration || 0
+      return { hours: 0, minutes: 0, seconds: 0 } if total_seconds.nil? || total_seconds <= 0
+
+      hours = total_seconds / 3600
+      minutes = (total_seconds % 3600) / 60
+      seconds = total_seconds % 60
+      { hours: hours, minutes: minutes, seconds: seconds }
+    end
+
+    def departure_time
+      @trips.first.departure_time
+    end
+
+    def arrival_time
+      @trips.last.arrival_time
+    end
+
+    def vendors
+      @trips.map(&:vendor).uniq
+    end
+
+    def vehicle_types
+      @trips.map(&:vehicle).map(&:vehicle_type).uniq
+    end
   end
 end

data/lib/spree_cm_commissioner/trip_result.rb

@@ -1,6 +1,7 @@
 module SpreeCmCommissioner
   class TripResult
-    attr_accessor :id, :origin_place, :destination_place, :allow_seat_selection, :departure_time, :duration,
+    attr_accessor :id, :origin_place, :destination_place, :allow_seat_selection,
+                  :departure_time, :duration, :route_type,
                   :vehicle_id, :vehicle, :vendor_id, :vendor,
                   :quantity_available, :max_capacity, :boarding, :drop_off,
                   :product_id, :amenities, :price, :compare_at_amount, :currency
@@ -29,5 +30,11 @@ module SpreeCmCommissioner
       seconds = duration % 60
       { hours: hours, minutes: minutes, seconds: seconds }
     end
+
+    def arrival_time
+      return nil if departure_time.nil? || duration.nil?
+
+      departure_time + duration.seconds
+    end
   end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.0.3-pre5'.freeze
+  VERSION = '2.0.3-pre6'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.0.3.pre.pre5
+  version: 2.0.3.pre.pre6
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-12 00:00:00.000000000 Z
+date: 2025-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -941,6 +941,7 @@ files:
 - app/controllers/spree/api/v2/storefront/reset_passwords_controller.rb
 - app/controllers/spree/api/v2/storefront/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/storefront/self_check_in_controller.rb
+- app/controllers/spree/api/v2/storefront/trip_places_controller.rb
 - app/controllers/spree/api/v2/storefront/trip_search_controller.rb
 - app/controllers/spree/api/v2/storefront/user_account_linkages_controller.rb
 - app/controllers/spree/api/v2/storefront/user_contacts_controller.rb
@@ -1541,6 +1542,7 @@ files:
 - app/overrides/spree/admin/products/_form/allow_self_check_in.html.erb.deface
 - app/overrides/spree/admin/products/_form/available_on.html.erb.deface
 - app/overrides/spree/admin/products/_form/discontinue_on.html.erb.deface
+- app/overrides/spree/admin/products/_form/industry_taxons.html.erb.deface
 - app/overrides/spree/admin/products/_form/need_confirmation_checkbox.html.erb.deface
 - app/overrides/spree/admin/products/_form/option_types.html.erb.deface
 - app/overrides/spree/admin/products/_form/product_types.html.erb.deface
@@ -1549,6 +1551,7 @@ files:
 - app/overrides/spree/admin/products/_form/required_self_check_in_location.html.erb.deface
 - app/overrides/spree/admin/products/_form/reveal_description_to_user.html.erb.deface
 - app/overrides/spree/admin/products/_form/subscribable_checkbox.html.erb.deface
+- app/overrides/spree/admin/products/_form/taxons.html.erb.deface
 - app/overrides/spree/admin/products/_form/use_video_as_default.html.erb.deface
 - app/overrides/spree/admin/products/edit/clear_cache_button.html.erb.deface
 - app/overrides/spree/admin/products/index/product_vendor_link.html.erb.deface
@@ -1705,6 +1708,7 @@ files:
 - app/serializers/spree/v2/storefront/stock_location_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/store_promotion_serializer.rb
 - app/serializers/spree/v2/storefront/taxon_serializer_decorator.rb
+- app/serializers/spree/v2/storefront/trip_place_serializer.rb
 - app/serializers/spree/v2/storefront/trip_query_result_serializer.rb
 - app/serializers/spree/v2/storefront/trip_result_serializer.rb
 - app/serializers/spree/v2/storefront/trip_vehicle_serializer.rb
@@ -2686,6 +2690,8 @@ files:
 - db/migrate/20250731062816_add_departure_time_and_arrival_time_to_trip_stop.rb
 - db/migrate/20250807033035_create_spree_cm_commissioner_saved_guests.rb
 - db/migrate/20250808054835_add_saved_guest_reference_to_cm_blocks.rb
+- db/migrate/20250812015522_remove_unique_indexes_from_cm_user_identity_providers.rb
+- db/migrate/20250814073854_add_call_to_action_to_spree_products.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem