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

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,13 +36,12 @@ module SpreeCmCommissioner
       base.has_many :vendor_kind_option_values,
                     through: :option_value_vendors, source: :option_value
 
-      base.has_many :branches, -> { branches }, class_name: 'SpreeCmCommissioner::VendorPlace'
-      base.has_many :stops, -> { stops }, class_name: 'SpreeCmCommissioner::VendorPlace'
-      base.has_many :locations, -> { locations }, 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'
@@ -79,17 +78,22 @@ module SpreeCmCommissioner
       base.has_many :invoices, class_name: 'SpreeCmCommissioner::Invoice', dependent: :destroy
       base.has_many :subscriptions, through: :customers, class_name: 'SpreeCmCommissioner::Subscription'
       base.has_many :subscription_orders, through: :subscriptions, class_name: 'Spree::Order', source: :orders
+      base.has_many :promotion_categories, class_name: 'Spree::PromotionCategory', foreign_key: :vendor_id, dependent: :destroy
 
       base.has_many :homepage_section_relatables,
                     class_name: 'SpreeCmCommissioner::HomepageSectionRelatable',
                     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 :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

@@ -7,15 +7,14 @@ module SpreeCmCommissioner
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
 
     validates :place_type, presence: true
-    validates :position, presence: true, numericality: { only_integer: true, greater_than: 0 }
-
-    # include place when using these delegate to avoid N+1
-    def display_name
-      place&.name
-    end
+    validates :place_id, uniqueness: { scope: %i[vendor_id place_type] }
 
     accepts_nested_attributes_for :place, allow_destroy: true
 
+    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)
     end

data/app/models/spree_cm_commissioner/vendor_stop.rb

@@ -1,5 +1,6 @@
+require_dependency 'spree_cm_commissioner'
 module SpreeCmCommissioner
-  class VendorStop < Base
+  class VendorStop < ApplicationRecord
     belongs_to :vendor, class_name: 'Spree::Vendor'
     belongs_to :stop, class_name: 'SpreeCmCommissioner::Place'
 

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

@@ -0,0 +1,18 @@
+<!-- insert_before "erb[loud]:contains('field_container :hide_from_nav')" -->
+
+<%# Sections don't use video banner, so we hide the form here to avoid confusing admin. %>
+
+<%= f.field_container :preferred_group_check_in_enabled, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+  <%= f.check_box :preferred_group_check_in_enabled, class: 'custom-control-input' %>
+  <%= f.label :preferred_group_check_in_enabled, Spree.t(:enable_group_check_in), class: 'custom-control-label' %>
+  <%= f.error_message_on :preferred_group_check_in_enabled %>
+  <small class="form-text text-muted">
+    Enabled by default for most events where users can purchase multiple tickets or use group scanning. For large events (like PSK, ASK, etc.) or invitation-based events, you should disable this to ensure each ticket or invitation is scanned individually.
+  </small>
+<% end if @taxon.event? && @taxon.depth == 1 %> %>
+
+<%= f.field_container :preferred_individual_check_in_enabled, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+  <%= f.check_box :preferred_individual_check_in_enabled, class: 'custom-control-input' %>
+  <%= f.label :preferred_individual_check_in_enabled, Spree.t(:enable_individual_check_in), class: 'custom-control-label' %>
+  <%= f.error_message_on :preferred_individual_check_in_enabled %>
+<% end if @taxon.event? && @taxon.depth == 1 %> %>

data/app/overrides/spree/admin/variants/_form/kyc_field.html.erb.deface

@@ -2,13 +2,13 @@
 
 <p>Guest Information Fields</p>
 <div class="form-check mb-3">
-  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: (@variant.kyc == @product.kyc) %>
+  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: @variant.kyc.nil? %>
   <label for="toggleGuestInfo" class="form-check-label">
     Use Product Guest Information
   </label>
 </div>
 
-<div id="guestInfoForm" <% if @variant.kyc == @product.kyc %>style="display: none;"<% end %>">
+<div id="guestInfoForm" <% if @variant.kyc.nil? %>style="display: none;"<% end %>">
   <small class="form-text text-muted mb-4">
     <%= raw I18n.t('kyc.variant_note') %>
   </small>

data/app/queries/spree_cm_commissioner/guest_searcher_query.rb

@@ -8,20 +8,36 @@ module SpreeCmCommissioner
 
     def event_id = params[:event_id]
 
-    def call
+    def call # rubocop:disable Metrics/PerceivedComplexity
       return SpreeCmCommissioner::Guest.none if event_id.blank?
 
-      if params[:qr_data].present?
+      if params[:qr_data].present? && order_qr_data?
+        search_by_order_qr
+      elsif params[:qr_data].present? && line_item_qr_data?
+        search_by_line_item_qr
+      elsif params[:qr_data].present? && guest_qr_data?
         search_by_guest_qr
       elsif params[:term].present?
         search_by_term
+      elsif params[:ids].present?
+        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id, id: params[:ids])
       else
-        SpreeCmCommissioner::Guest.none
+        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id)
       end
     end
 
     private
 
+    def search_by_order_qr
+      order = Spree::Order.complete_or_canceled.search_by_qr_data!(params[:qr_data])
+      order.guests.where(event_id: event_id)
+    end
+
+    def search_by_line_item_qr
+      line_item = Spree::LineItem.complete_or_canceled.search_by_qr_data!(params[:qr_data])
+      line_item.guests.where(event_id: event_id)
+    end
+
     def search_by_guest_qr
       SpreeCmCommissioner::Guest.complete_or_canceled.where(
         token: params[:qr_data],
@@ -29,6 +45,32 @@ module SpreeCmCommissioner
       )
     end
 
+    def order_qr_data?
+      matches = construct_matches
+      matches&.size == 2
+    end
+
+    def line_item_qr_data?
+      matches = construct_matches
+      matches&.size == 3
+    end
+
+    def guest_qr_data?
+      matches = construct_matches
+      matches.nil?
+    end
+
+    def construct_matches
+      qr_data = params[:qr_data]
+      return nil unless qr_data
+
+      if qr_data =~ /-L\d+$/
+        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)-(L\d+)/)&.captures
+      else
+        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)/)&.captures
+      end
+    end
+
     def search_by_term
       terms = params[:term].split.map { |term| "%#{term.downcase}%" }
 

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -2,18 +2,18 @@ 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
-      @date = Time.zone.now if date.to_date == Time.zone.now.to_date
+      @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 || []
@@ -35,18 +35,18 @@ module SpreeCmCommissioner
                         trips.duration AS duration,
                         trips.vehicle_id AS vehicle_id'
                       )
-               .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
-               .joins('INNER JOIN cm_trips AS trips ON trips.product_id = routes.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[:variant_id],
@@ -70,18 +70,20 @@ 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 routes1 ON routes1.id = trip1.product_id
-                INNER JOIN spree_products AS routes2 ON routes2.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 = routes1.vendor_id
-                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = routes2.vendor_id'
+                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,
@@ -90,7 +92,7 @@ module SpreeCmCommissioner
                         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,
@@ -104,9 +106,10 @@ module SpreeCmCommissioner
                         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)

data/app/queries/spree_cm_commissioner/trip_search_query.rb

@@ -0,0 +1,76 @@
+module SpreeCmCommissioner
+  class TripSearchQuery
+    attr_reader :origin_id, :destination_id, :vendor_id, :date
+
+    def initialize(origin_id:, destination_id:, date:, vendor_id: nil)
+      @origin_id = origin_id
+      @destination_id = destination_id
+      @vendor_id = vendor_id
+      @date = date
+    end
+
+    def call
+      trips_info.map do |trip|
+        trip_result_options = {
+          trip_id: trip.trip_id,
+          vendor_id: trip.vendor_id,
+          vendor_name: trip.vendor_name,
+          route_name: trip.route_name,
+          short_name: trip.short_name,
+          detail: trip.trip_id,
+          origin_id: trip.origin_id,
+          origin: trip.origin,
+          destination_id: trip.destination_id,
+          destination: trip.destination,
+          total_sold: trip.total_sold,
+          total_seats: trip.total_seats,
+          vehicle_id: trip.vehicle_id,
+          departure_time: trip.departure_time.strftime('%H:%M'),
+          duration: trip.duration
+        }
+        SpreeCmCommissioner::TripResult.new(trip_result_options)
+      end
+    end
+
+    def trips_info
+      result = Spree::Variant.select('spree_variants.id as trip_id,
+                              spree_vendors.id as vendor_id,
+                              spree_vendors.name as vendor_name,
+                              routes.name as route_name,
+                              routes.short_name as short_name,
+                              details.id as detail_id,
+                              boarding.stop_id as origin_id,
+                              drop_off.stop_id as destination_id,
+                              details.departure_time as departure_time,
+                              details.duration as duration,
+                              boarding.stop_name as origin,
+                              drop_off.stop_name as destination,
+                              COALESCE(ts.total_sold, 0) as total_sold,
+                              cm_vehicles.number_of_seats as total_seats,
+                              cm_vehicles.id as vehicle_id
+                            '
+                                    )
+                             .joins('INNER JOIN spree_products routes ON routes.id = spree_variants.product_id')
+                             .joins('INNER JOIN cm_trips details on details.product_id = routes.id')
+                             .joins('INNER JOIN cm_vehicles ON cm_vehicles.id = details.vehicle_id')
+                             .joins("INNER JOIN cm_trip_stops boarding ON boarding.trip_id = details.id AND boarding.stop_type = '0'")
+                             .joins("INNER JOIN cm_trip_stops drop_off ON drop_off.trip_id = details.id AND drop_off.stop_type = '1'")
+                             .joins('INNER JOIN spree_vendors ON spree_vendors.id = spree_variants.vendor_id')
+                             .joins("LEFT JOIN (#{total_sold.to_sql}) ts ON spree_variants.id = ts.trip_id")
+
+      # TODO: migrat to new table: vehicle, orign and destination
+      result = result.where(boarding: { stop_id: origin_id }, drop_off: { stop_id: destination_id })
+      result = result.where(vendor_id: vendor_id) if vendor_id.present?
+      result
+    end
+
+    def total_sold
+      Spree::Variant.select('spree_variants.id as trip_id, SUM(spree_line_items.quantity) as total_sold')
+                    .joins('INNER JOIN spree_line_items ON spree_line_items.variant_id = spree_variants.id')
+                    .joins('INNER JOIN spree_orders ON spree_orders.id = spree_line_items.order_id')
+                    .where(spree_orders: { state: 'complete' })
+                    .where(spree_line_items: { date: date })
+                    .group('spree_variants.id')
+    end
+  end
+end

data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb

@@ -0,0 +1,45 @@
+module SpreeCmCommissioner
+  module VariantAvailability
+    class NonPermanentStockQuery
+      attr_reader :variant, :except_line_item_id, :error_message
+
+      def initialize(variant:, except_line_item_id: nil)
+        @variant = variant
+        @except_line_item_id = except_line_item_id
+        @error_message = nil
+      end
+
+      def available?(quantity)
+        reserve_variants =
+          Spree::LineItem
+          .complete
+          .select('(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity')
+          .joins(variant: :stock_items)
+          .where(variant_id: variant.id)
+          .where.not(id: except_line_item_id)
+          .group(:variant_id)
+
+        # there is a case when variant does not have any purchaces yet, it will return empty & always available true.
+        # in this case, we check with stock items directly.
+
+        available_quantity = if reserve_variants.any?
+                               reserve_variants.sum(&:available_quantity)
+                             else
+                               variant.stock_items.sum(:count_on_hand)
+                             end
+        if available_quantity >= quantity
+          true
+        elsif available_quantity == 1
+          @error_message = I18n.t('variant_availability.item_available_instock')
+          false
+        elsif available_quantity <= 0
+          @error_message = I18n.t('variant_availability.items_out_of_stock')
+          false
+        else
+          @error_message = I18n.t('variant_availability.items_available_instock', available_quantity: available_quantity)
+          false
+        end
+      end
+    end
+  end
+end

data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb

@@ -0,0 +1,55 @@
+module SpreeCmCommissioner
+  module VariantAvailability
+    class PermanentStockQuery
+      attr_reader :variant, :from_date, :to_date, :except_line_item_id
+
+      def initialize(variant:, from_date:, to_date:, except_line_item_id: nil)
+        @variant = variant
+        @from_date = from_date
+        @to_date = to_date
+        @except_line_item_id = except_line_item_id
+      end
+
+      def available?(quantity)
+        (from_date..from_date).all? do |booking_date|
+          booked_date_quantity[booking_date].nil? ||
+            (booked_date_quantity[booking_date] - quantity) >= 0
+        end
+      end
+
+      def booked_date_quantity
+        dates_sql = ApplicationRecord.sanitize_sql_array(
+          [
+            'SELECT date FROM generate_series(?::date, ?::date, ?) AS date',
+            from_date,
+            to_date,
+            date_interval
+          ]
+        )
+
+        @booked_variants ||=
+          Spree::LineItem
+          .complete
+          .select(
+            '(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity',
+            'dates.date AS reservation_date'
+          )
+          .joins(variant: :stock_items)
+          .where(variant_id: variant.id)
+          .where.not(id: except_line_item_id)
+          .joins("INNER JOIN (#{dates_sql}) dates ON dates.date >= spree_line_items.from_date AND dates.date < spree_line_items.to_date")
+          .group(:variant_id, :reservation_date)
+          .order(:reservation_date)
+          .each_with_object({}) do |record, hash|
+            hash[record.reservation_date.to_date] = record.available_quantity
+          end
+      end
+
+      # override this for product that have
+      # different date time interval than 1 day.
+      def date_interval
+        '1 day'
+      end
+    end
+  end
+end

data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb

@@ -3,9 +3,6 @@ module SpreeCmCommissioner
     params do
       required(:from_date).value(:date)
       required(:to_date).value(:date)
-      required(:province_id).value(:integer)
-      required(:adult).value(:integer)
-      required(:children).value(:integer)
     end
 
     rule(:from_date, :to_date) do

data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb

@@ -11,7 +11,7 @@ module SpreeCmCommissioner
     end
 
     def error_message
-      errors.map { |error| "#{error.path.join(', ')}: #{error.text}" }.to_sentence
+      errors.map(&:text).join(', ')
     end
 
     private

data/app/serializers/spree/v2/organizer/invite_crews_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Organizer
+      class InviteCrewsSerializer < BaseSerializer
+        attributes :token, :expires_at
+        belongs_to :taxon, serializer: Spree::V2::Organizer::TaxonSerializer
+        belongs_to :inviter, serializer: Spree::V2::Organizer::UserSerializer
+      end
+    end
+  end
+end

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

@@ -9,12 +9,10 @@ module Spree
 
         attributes :total_inventory, :service_availabilities
 
-        # Deprecated
         attribute :total_booking do |vendor|
           vendor.respond_to?(:total_booking) ? vendor.total_booking : 0
         end
 
-        # Deprecated
         attribute :remaining do |vendor|
           vendor.respond_to?(:remaining) ? vendor.remaining : vendor.total_inventory
         end

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

@@ -4,7 +4,6 @@ module Spree
       module LineItemSerializerDecorator
         def self.prepended(base)
           base.attributes :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount, :display_amount,
-                          :checkin_date, :checkout_date,
                           :number, :qr_data,
                           :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
                           :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,