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

data/app/models/spree_cm_commissioner/telegram_chat.rb

@@ -0,0 +1,6 @@
+module SpreeCmCommissioner
+  class TelegramChat < Base
+    belongs_to :vendor, class_name: 'Spree::Vendor'
+    validates :chat_id, presence: true, uniqueness: true
+  end
+end

data/app/models/spree_cm_commissioner/trip.rb

@@ -1,15 +1,18 @@
 module SpreeCmCommissioner
   class Trip < Base
-    include SpreeCmCommissioner::RouteType
-
     attr_accessor :hours, :minutes, :seconds
 
     before_validation :convert_duration_to_seconds
 
+    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, class_name: 'SpreeCmCommissioner::Place', optional: true
-    belongs_to :destination, class_name: 'SpreeCmCommissioner::Place', optional: true
+
+    belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
+    belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place', optional: false
+
+    has_many :trip_blazer_queries, as: :queryable, class_name: 'SpreeCmCommissioner::BlazerQueryable'
+    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 :variants, through: :product
@@ -19,9 +22,7 @@ module SpreeCmCommissioner
     validates :duration, numericality: { greater_than: 0 }
     validate :origin_and_destination_cannot_be_the_same
 
-    accepts_nested_attributes_for :trip_stops, allow_destroy: true
-
-    after_create :create_trip_stops
+    accepts_nested_attributes_for :trip_stops, :product, allow_destroy: true
 
     def convert_duration_to_seconds
       return if hours.blank? && minutes.blank? && seconds.blank?
@@ -29,11 +30,6 @@ module SpreeCmCommissioner
       self.duration = (hours.to_i * 3600) + (minutes.to_i * 60) + seconds.to_i
     end
 
-    def create_trip_stops
-      trip_stops.find_or_create_by(stop_type: :boarding, stop_id: origin_id)
-      trip_stops.find_or_create_by(stop_type: :drop_off, stop_id: destination_id)
-    end
-
     def duration_in_hms
       return { hours: 0, minutes: 0, seconds: 0 } if duration.nil?
 
@@ -52,7 +48,7 @@ module SpreeCmCommissioner
     private
 
     def origin_and_destination_cannot_be_the_same
-      return unless origin_id == destination_id
+      return unless origin_place_id == destination_place_id
 
       errors.add(:base, 'Origin and destination cannot be the same')
     end

data/app/models/spree_cm_commissioner/trip_stop.rb

@@ -3,33 +3,15 @@ module SpreeCmCommissioner
     acts_as_list column: :sequence, scope: :trip_id
     enum :stop_type, { boarding: 0, drop_off: 1 }
 
-    belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip'
-    belongs_to :stop, class_name: 'SpreeCmCommissioner::Place'
+    belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip', optional: false
+    belongs_to :stop_place, class_name: 'SpreeCmCommissioner::Place', optional: false
+    belongs_to :location_place, class_name: 'SpreeCmCommissioner::Place', optional: false
 
     before_validation :set_stop_name
-    after_destroy :decrement_trip_count
-    after_commit :create_vendor_stop
-    validates :stop_id, uniqueness: { scope: :trip_id }
+    validates :stop_place_id, uniqueness: { scope: :trip_id }
 
     def set_stop_name
-      self.stop_name = stop.name if stop.present?
-    end
-
-    def create_vendor_stop
-      vendor_stop = vendor.vendor_stops.where(stop_id: stop_id, stop_type: stop_type).first_or_create
-      vendor_stop.update(trip_count: vendor_stop.trip_count.to_i + 1)
-    end
-
-    private
-
-    def decrement_trip_count
-      vendor.vendor_stops.where(stop_id: stop_id, stop_type: stop_type).find_each do |vendor_stop|
-        vendor_stop.update(trip_count: [vendor_stop.trip_count - 1, 0].max)
-      end
-    end
-
-    def vendor
-      Spree::Product.find(trip&.product_id).vendor
+      self.stop_name = stop_place.name if stop_place.present?
     end
   end
 end

data/app/models/spree_cm_commissioner/user_taxon.rb

@@ -2,5 +2,6 @@ module SpreeCmCommissioner
   class UserTaxon < Base
     belongs_to :user, class_name: Spree.user_class.to_s, optional: false
     belongs_to :taxon, class_name: 'Spree::Taxon', optional: false
+    has_many :invite_user_taxons, class_name: 'SpreeCmCommissioner::InviteUserTaxon', dependent: :destroy
   end
 end

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -101,6 +101,7 @@ module SpreeCmCommissioner
 
     def update_vendor_price
       return unless vendor.present? && product_type == vendor&.primary_product_type
+      return if price.blank?
 
       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

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -36,9 +36,9 @@ 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 :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
@@ -47,11 +47,6 @@ module SpreeCmCommissioner
       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'
@@ -79,12 +74,17 @@ 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,
+                    as: :relatable,
                     class_name: 'SpreeCmCommissioner::HomepageSectionRelatable',
-                    dependent: :destroy, inverse_of: :relatable
+                    dependent: :destroy,
+                    inverse_of: :relatable
 
       base.has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
+      base.has_many :trips, class_name: 'SpreeCmCommissioner::Trip', dependent: :destroy
+
       base.validates :account_name, :account_number, presence: true, if: lambda {
                                                                            payment_qrcode.present? && Spree::Store.default.code.include?('billing')
                                                                          }

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -5,17 +5,22 @@ 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 :position, presence: true, numericality: { only_integer: true, greater_than: 0 }
+    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
 
-    accepts_nested_attributes_for :place, allow_destroy: true
-
     def selected
       vendor.selected_place_references.include?(place&.reference)
     end

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

@@ -7,8 +7,7 @@ module SpreeCmCommissioner
     def initialize(origin_id:, destination_id:, 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
+      @date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
       @params = params
     end
 
@@ -20,26 +19,29 @@ module SpreeCmCommissioner
       direct_results + connected_results
     end
 
-    def direct_trips
-      result = Spree::Variant
-               .select('spree_variants.id AS variant_id,
+    def direct_trips # rubocop:disable Metrics/MethodLength
+      result = Spree::Product
+               .select('
                         vendors.id AS vendor_id,
                         vendors.name AS vendor_name,
-                        routes.name AS route_name,
-                        routes.short_name AS short_name,
+                        spree_products.name AS route_name,
+                        spree_products.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'
+                        trips.vehicle_id AS vehicle_id,
+                        COALESCE(iv.quantity_available, 0) AS quantity_available,
+                        COALESCE(iv.max_capacity, 0) AS max_capacity'
                       )
-               .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_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 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")
 
       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)
@@ -47,9 +49,10 @@ module SpreeCmCommissioner
                             date.strftime('%H:%M:%S'),
                             date.end_of_day.strftime('%H:%M:%S')
                            )
+
       result.map do |trip|
         trip_result_options = {
-          trip_id: trip[:variant_id],
+          trip_id: trip[:trip_id],
           vendor_id: trip[:vendor_id],
           vendor_name: trip[:vendor_name],
           route_name: trip[:route_name],
@@ -61,7 +64,9 @@ module SpreeCmCommissioner
           destination: trip[:destination],
           vehicle_id: trip[:vehicle_id],
           departure_time: parse_time(trip[:departure_time]),
-          duration: trip[:duration]
+          duration: trip[:duration],
+          quantity_available: trip[:quantity_available].to_i,
+          max_capacity: trip[:max_capacity].to_i
         }
         SpreeCmCommissioner::TripResult.new(trip_result_options)
       end
@@ -69,16 +74,18 @@ module SpreeCmCommissioner
 
     def connected_trips # rubocop:disable Metrics/MethodLength
       result = SpreeCmCommissioner::TripConnection
-               .joins('
+               .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 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 = routes1.vendor_id
-                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = routes2.vendor_id'
+                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"
                      )
                .select('cm_trip_connections.id AS id,
                         trip1.id AS trip1_id,
@@ -86,8 +93,9 @@ module SpreeCmCommissioner
                         trip1.destination_id AS trip1_destination_id,
                         trip1.departure_time AS trip1_departure_time,
                         trip1.duration AS trip1_duration,
-                        routes1.short_name AS route1_short_name,
-                        routes1.name AS route1_name,
+                        product1.id AS trip1_id,
+                        product1.short_name AS route1_short_name,
+                        product1.name AS route1_name,
                         trip1.vehicle_id AS trip1_vehicle,
                         vendor1.name AS trip1_vendor_name,
                         trip2.id AS trip2_id,
@@ -96,12 +104,17 @@ module SpreeCmCommissioner
                         trip2.departure_time AS trip2_departure_time,
                         trip2.duration AS trip2_duration,
                         trip2.vehicle_id AS trip2_vehicle,
-                        routes2.short_name AS route2_short_name,
-                        routes2.name AS route2_name,
+                        product2.id AS trip2_id,
+                        product2.short_name AS route2_short_name,
+                        product2.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'
+                        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'
                       ).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'),
@@ -112,6 +125,18 @@ module SpreeCmCommissioner
       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)
@@ -127,7 +152,9 @@ module SpreeCmCommissioner
           short_name: trip[:route1_short_name],
           vehicle_id: trip[:trip1_vehicle],
           origin: trip[:trip1_origin],
-          destination: trip[:trip2_origin]
+          destination: trip[:trip2_origin],
+          quantity_available: trip[:trip1_quantity_available].to_i,
+          max_capacity: trip[:trip1_max_capacity].to_i
         }
         to_trip = {
           trip_id: trip[:trip2_id],
@@ -140,7 +167,9 @@ module SpreeCmCommissioner
           short_name: trip[:route2_short_name],
           vehicle_id: trip[:trip2_vehicle],
           origin: trip[:trip2_origin],
-          destination: trip[:trip2_destination]
+          destination: trip[:trip2_destination],
+          quantity_available: trip[:trip2_quantity_available].to_i,
+          max_capacity: trip[:trip2_max_capacity].to_i
         }
         data = [SpreeCmCommissioner::TripResult.new(from_trip),
                 SpreeCmCommissioner::TripResult.new(to_trip)

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_cm_commissioner/v2/operator/dashboard_crew_event_serializer.rb

@@ -2,7 +2,10 @@ module SpreeCmCommissioner
   module V2
     module Operator
       class DashboardCrewEventSerializer < BaseSerializer
-        attributes :id, :name, :permalink, :from_date, :to_date, :updated_at
+        attributes :id, :name, :permalink,
+                   :from_date, :to_date,
+                   :check_in_flows,
+                   :updated_at
 
         has_many :children_classifications, serializer: :classification
         has_one :category_icon, serializer: SpreeCmCommissioner::V2::Storefront::AssetSerializer

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

@@ -2,9 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldOptionSerializer < BaseSerializer
-        set_type :dynamic_field_option
-
-        attributes :id, :value, :dynamic_field_id, :created_at, :updated_at
+        attributes :id, :value, :dynamic_field_id, :status, :created_at, :updated_at, :position
       end
     end
   end

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

@@ -2,9 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        set_type :dynamic_field
-
-        attributes :id, :label, :data_type, :vendor_id, :created_at, :updated_at
+        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at, :position
 
         has_many :dynamic_field_options, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end

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

@@ -4,9 +4,10 @@ module SpreeCmCommissioner
       class GuestDynamicFieldSerializer < BaseSerializer
         set_type :guest_dynamic_field
 
-        attributes :id, :value, :guest_id, :dynamic_field_id, :created_at, :updated_at
+        attributes :id, :value, :guest_id, :dynamic_field_id, :dynamic_field_option_id, :created_at, :updated_at
 
         belongs_to :dynamic_field, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
+        belongs_to :dynamic_field_option, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end
     end
   end

data/app/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb

@@ -1,11 +1,12 @@
 module SpreeCmCommissioner
   module Organizer
     class ExportGuestCsvService
-      attr_reader :event_id, :columns
+      attr_reader :event_id, :columns, :filters
 
-      def initialize(event_id, columns)
+      def initialize(event_id, columns, filters = {})
         @event_id = event_id
         @columns = columns
+        @filters = filters
       end
 
       def call
@@ -18,7 +19,7 @@ module SpreeCmCommissioner
       private
 
       def headers
-        columns.map(&:humanize).uniq
+        columns.map { |col| col.titleize(keep_id_suffix: true) }.uniq
       end
 
       def build_row(guest)
@@ -28,10 +29,8 @@ module SpreeCmCommissioner
       def fetch_value(guest, column)
         if guest_field?(column)
           fetch_guest_value(guest, column)
-        elsif option_type_field?(column)
-          fetch_option_value(guest, column)
         else
-          ''
+          fetch_option_value(guest, column)
         end
       end
 
@@ -39,19 +38,21 @@ module SpreeCmCommissioner
         SpreeCmCommissioner::KycBitwise::ORDERED_BIT_FIELDS.include?(column.to_sym)
       end
 
-      def option_type_field?(column)
-        Spree::OptionType.exists?(name: column)
-      end
-
       def fetch_guest_value(guest, column)
         column_mappings(guest)[column] || ''
       end
 
-      def fetch_option_value(guest, option_type_name)
-        return guest.formatted_bib_number if option_type_name == 'bib-prefix'
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def fetch_option_value(guest, column_name)
+        return guest.formatted_bib_number if column_name == 'bib-prefix'
+        return guest.line_item&.number if column_name == 'item_id'
+        return guest.line_item&.order&.number if column_name == 'order_id'
+        return guest.created_at if column_name == 'created_at'
+        return guest.updated_at if column_name == 'updated_at'
 
-        guest.line_item&.variant&.find_option_value_name_for(option_type_name: option_type_name)
+        guest.line_item&.variant&.find_option_value_name_for(option_type_name: column_name) || ''
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def column_mappings(guest)
         {
@@ -77,12 +78,19 @@ module SpreeCmCommissioner
       end
 
       def guests_with_associations
-        event.guests.includes(
+        scope = event.guests.includes(
           :occupation,
           :nationality,
           :id_card,
           line_item: { variant: { option_values: :option_type } }
-        )
+        ).complete
+        scope = scope.where('cm_guests.created_at >= ?', formatted_date_time(filters[:from_date])) if filters[:from_date].present?
+        scope = scope.where('cm_guests.created_at <= ?', formatted_date_time(filters[:to_date])) if filters[:to_date].present?
+        scope
+      end
+
+      def formatted_date_time(date)
+        Time.zone.parse(date.to_s).strftime('%Y-%m-%d %H:%M:%S %z')
       end
 
       def event

data/app/views/blazer/queries/_content.html.erb

@@ -47,6 +47,14 @@
                   class: "btn btn-primary",
                   style: "margin-left: 10px;" %>
     </div>
+  <% elsif !@error && @success && params[:trip_id].present? %>
+    <div>
+      <%= link_to 'Save Trip',
+                  spree.admin_trip_blazer_queries_path(trip_id: params[:trip_id], blazer_query_id: @query.id),
+                  method: :post,
+                  class: "btn btn-primary",
+                  style: "margin-left: 10px;" %>
+    </div>
   <% end %>
 </div>