spree_cm_commissioner 1.18.1 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60a9ca64e7401f96f8cb7e220a28a12ca89d7bc84ce724b0e7751e1c0abf1d0e
-  data.tar.gz: cb4e4fbfd87c785a73c23ee8fd3a02fadacf864d5c905df5a654c56069a79769
+  metadata.gz: dbe05a913d5525e83a57e29a837c4c1d5b9eec1607daba170f5ce305079b340b
+  data.tar.gz: '096d9299fd1faf8d19d7ca1ba00c82fbef35f1e1a938e48b0742f38a1f017aa8'
 SHA512:
-  metadata.gz: 0db6f0473e7663f28e179e51cc68034c6b96315d402a38bb49fef0669ba23ae46cc615d7ee350ec551b1c7fd1686a724a1aef0057ce2b4f637913766c8cdd8c9
-  data.tar.gz: bf5d35d082edc126bcead686c1d1de3e74f2a2bed22a1cbdd62e60dea23679c007ff1fb523f0a3447a3b598b1e3c66838b28f35e408b82024de877c5da237657
+  metadata.gz: a5b1efce06f85b8b0439b3d9bba50066547f386c7960fe808014ee29f52598f307407d4f3e40f8320b337adcb1776882bc5d31f9f30da2b8600ecef19e74b3db
+  data.tar.gz: 1a8bbf21cce85c8d0ce52acd9e1fe9a54f48e90a010829514f1a2e192542f4b03eb9ca40fc6e91d4a2450cd2b477d380aa9bd0dfdc23f748a07e78381f7fe810

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.18.1)
+    spree_cm_commissioner (1.19.0)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -572,10 +572,6 @@ GEM
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
-      racc (~> 1.4)
     noticed (1.6.3)
       http (>= 4.0.0)
       rails (>= 5.2.0)

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

@@ -2,21 +2,28 @@ module Spree
   module Admin
     class EventBlazerQueriesController < Spree::Admin::ResourceController
       def model_class
-        SpreeCmCommissioner::TaxonBlazerQuery
+        SpreeCmCommissioner::BlazerQueryable
       end
 
       def object_name
-        'spree_cm_commissioner_taxon_blazer_query'
+        'spree_cm_commissioner_blazer_queryable'
       end
 
       def create
-        event_blazer = SpreeCmCommissioner::TaxonBlazerQuery.new(taxon_id: params[:event_id], blazer_query_id: params[:blazer_query_id])
+        queryable = Spree::Taxon.find(params[:event_id])
+
+        event_blazer = SpreeCmCommissioner::BlazerQueryable.new(
+          queryable: queryable,
+          blazer_query_id: params[:blazer_query_id]
+        )
+
         if event_blazer.save
           flash[:success] = I18n.t('event_blazer_queries.success')
         else
           flash[:alert] = event_blazer.errors.full_messages.join(', ')
         end
-        redirect_to blazer.query_path(id: event_blazer.blazer_query_id, event_id: event_blazer.taxon_id)
+
+        redirect_to blazer.query_path(id: event_blazer.blazer_query_id, event_id: queryable.id)
       end
     end
   end

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

@@ -0,0 +1,35 @@
+module Spree
+  module Admin
+    class TripBlazerQueriesController < Spree::Admin::ResourceController
+      def model_class
+        SpreeCmCommissioner::BlazerQueryable
+      end
+
+      def object_name
+        'spree_cm_commissioner_blazer_queryable'
+      end
+
+      def create
+        queryable = SpreeCmCommissioner::Trip.find_by(id: params[:trip_id])
+
+        if queryable.nil?
+          flash[:alert] = I18n.t('trip_blazer_queries.not_found')
+          redirect_to request.referer || spree.admin_trips_path and return
+        end
+
+        trip_blazer = SpreeCmCommissioner::BlazerQueryable.new(
+          queryable: queryable,
+          blazer_query_id: params[:blazer_query_id]
+        )
+
+        if trip_blazer.save
+          flash[:success] = I18n.t('trip_blazer_queries.success')
+        else
+          flash[:alert] = trip_blazer.errors.full_messages.join(', ')
+        end
+
+        redirect_to blazer.query_path(id: trip_blazer.blazer_query_id, trip_id: queryable.id)
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/organizer/invite_crews_controller.rb

@@ -0,0 +1,33 @@
+module Spree
+  module Api
+    module V2
+      module Organizer
+        class InviteCrewsController < ::Spree::Api::V2::Organizer::BaseController
+          def show
+            render_serialized_payload { serialize_resource(invite) }
+          end
+
+          def update
+            context = SpreeCmCommissioner::CrewInviteLinkHandler.call(
+              params: params
+            )
+
+            if context.success?
+              render_serialized_payload { serialize_resource(context.invite) }
+            else
+              render_error_payload(context.message || I18n.t('invite.accept_fail'))
+            end
+          end
+
+          def invite
+            @invite ||= SpreeCmCommissioner::Invite.find_by!(token: params[:id])
+          end
+
+          def resource_serializer
+            ::Spree::V2::Organizer::InviteCrewsSerializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,11 @@ module Spree
             return @collection if defined?(@collection)
             return SpreeCmCommissioner::DynamicFieldOption.none if params[:dynamic_field_id].blank?
 
-            @collection = SpreeCmCommissioner::DynamicFieldOption.where(dynamic_field_id: params[:dynamic_field_id])
+            @collection = SpreeCmCommissioner::DynamicFieldOption
+                          .where(dynamic_field_id: params[:dynamic_field_id])
+                          .active
+                          .order(position: :asc)
+
             @collection = @collection.where('value LIKE ?', "%#{params[:query]}%") if params[:query].present?
             @collection
           end

data/app/controllers/spree/api/v2/tenant/checkout_controller.rb

@@ -27,6 +27,8 @@ module Spree
           end
 
           def complete
+            return render_serialized_payload { serialized_current_order } if spree_current_order.confirm? || spree_current_order.complete?
+
             spree_authorize! :update, spree_current_order, order_token
 
             result = complete_service.call(order: spree_current_order)

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

@@ -6,6 +6,17 @@ module SpreeCmCommissioner
           def self.prepended(base)
             base.include SpreeCmCommissioner::OrderConcern
           end
+
+          # Override Spree's default behavior:
+          # By default, Spree raises an error if `complete` is called on a completed or confirmed order.
+          # We want to allow this call to succeed, so the API can be used both to:
+          # - complete the order (if it's not yet complete), or
+          # - return the latest state of a confirmed or completed order without raising a forbidden error.
+          def complete
+            return render_serialized_payload { serialized_current_order } if spree_current_order.confirm? || spree_current_order.complete?
+
+            super
+          end
         end
       end
     end

data/app/controllers/spree_cm_commissioner/well_known_controller.rb

@@ -4,25 +4,37 @@ module SpreeCmCommissioner
     rescue_from StandardError, with: :handle_error
 
     def assetlinks_json
-      render_universal_link('assetlinks.json')
+      render_platform_link(:android)
     end
 
     def apple_app_site_association
-      render_universal_link('apple-app-site-association')
+      render_platform_link(:ios)
     end
 
     private
 
-    def render_universal_link(universal_link)
-      result = SpreeCmCommissioner::UniversalLinkFetcher.new(
-        universal_link: universal_link,
+    def render_platform_link(platform)
+      fetcher_class = platform_link_finder(platform)
+
+      result = fetcher_class.call(
         store: @store,
         tenant: @tenant,
-        refresh: params[:_refresh].to_s == 'true'
-      ).call
+        refreshed: params[:_refreshed].present?
+      )
+
+      if result.success? && result.contents.present?
+        render json: result.contents
+      else
+        render_not_found
+      end
+    end
 
-      if result[:success]
-        render json: result[:data]
+    def platform_link_finder(platform)
+      case platform
+      when :android
+        SpreeCmCommissioner::AssetLinksFetcher
+      when :ios
+        SpreeCmCommissioner::AppleAppSiteAssociationFetcher
       else
         render_not_found
       end

data/app/interactors/spree_cm_commissioner/apple_app_site_association_fetcher.rb

@@ -0,0 +1,27 @@
+module SpreeCmCommissioner
+  class AppleAppSiteAssociationFetcher < BaseInteractor
+    delegate :store, :tenant, :refreshed, to: :context
+
+    def call
+      key = cache_key
+
+      CmAppLogger.log(label: 'LOOKING_UP_CACHE', data: { cache_key: key })
+
+      Rails.cache.delete(key) if refreshed
+
+      context.contents = Rails.cache.fetch(key) do
+        CmAppLogger.log(label: 'CACHE_MISS', data: { cache_key: key })
+        resource.preferred_apple_app_site_association
+      end
+    end
+
+    def cache_key
+      updated_at = tenant&.updated_at || store&.updated_at
+      "well_known:apple-app-site-association:#{resource.class.name}:#{resource.id}:#{updated_at}"
+    end
+
+    def resource
+      tenant || store
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/asset_links_fetcher.rb

@@ -0,0 +1,27 @@
+module SpreeCmCommissioner
+  class AssetLinksFetcher < BaseInteractor
+    delegate :store, :tenant, :refreshed, to: :context
+
+    def call
+      key = cache_key
+
+      CmAppLogger.log(label: 'LOOKING_UP_CACHE', data: { cache_key: key })
+
+      Rails.cache.delete(key) if refreshed
+
+      context.contents = Rails.cache.fetch(key) do
+        CmAppLogger.log(label: 'CACHE_MISS', data: { cache_key: key })
+        resource.preferred_assetlinks
+      end
+    end
+
+    def cache_key
+      updated_at = tenant&.updated_at || store&.updated_at
+      "well_known:assetlinks.json:#{resource.class.name}:#{resource.id}:#{updated_at}"
+    end
+
+    def resource
+      tenant || store
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/crew_invite_link_handler.rb

@@ -0,0 +1,48 @@
+module SpreeCmCommissioner
+  class CrewInviteLinkHandler < BaseInteractor
+    delegate :params, to: :context
+
+    def call
+      validate_data
+      assign_role_to_user
+      create_user_event
+    end
+
+    private
+
+    def validate_data
+      if invite.nil?
+        context.fail!(message: I18n.t('invite.url_not_found'))
+      else
+        context.invite = invite
+      end
+    end
+
+    def assign_role_to_user
+      return if user.operator?
+
+      role = Spree::Role.find_by(name: 'operator')
+      role_user = Spree::RoleUser.new(user_id: user.id, role_id: role.id)
+      role_user.save
+    end
+
+    def create_user_event
+      @user_event = SpreeCmCommissioner::UserEvent.new(
+        taxon_id: invite.taxon_id,
+        user_id: user.id
+      )
+
+      return if @user_event.save
+
+      context.fail!(message: I18n.t('invite.already_invited'))
+    end
+
+    def invite
+      @invite ||= SpreeCmCommissioner::Invite.find_by(token: params[:id])
+    end
+
+    def user
+      @user ||= Spree::User.find(params[:user_id])
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/telegram_chats_auto_finder.rb

@@ -0,0 +1,144 @@
+module SpreeCmCommissioner
+  class TelegramChatsAutoFinder < BaseInteractor
+    delegate :contact, :pin_code, to: :context
+
+    def call
+      context.chats = []
+      context.verified_chat_ids = []
+
+      updates = fetch_updates
+
+      if updates['result'].any?
+        updates['result'].sort_by { |u| u['update_id'] }.reverse.each do |update|
+          handle_message_update(update) if update['message']
+          handle_channel_post_update(update) if update['channel_post']
+          handle_chat_member_update(update) if update['my_chat_member']
+        end
+      end
+      context.fail!(message: 'No pin codes verified') if context.verified_chat_ids.empty?
+    end
+
+    private
+
+    def handle_chat_member_update(update)
+      chat = update.dig('my_chat_member', 'chat')
+      return unless chat
+
+      chat_data = {
+        id: chat['id'],
+        title: chat['title'] || 'Unnamed Chat',
+        type: chat['type']
+      }
+
+      return if context.chats.any? { |c| c[:id] == chat_data[:id] }
+
+      db_chat = SpreeCmCommissioner::TelegramChat.find_or_initialize_by(chat_id: chat_data[:id])
+      is_new_chat = db_chat.new_record?
+      db_chat.update(chat_title: chat_data[:title], chat_type: chat_data[:type])
+      context.chats << chat_data
+      message = "👋Hello! This is Bookme+ bot.\n\nPlease enter the 6-digit PIN code displayed in your portal."
+      send_message(chat_data[:id], message) if is_new_chat
+    end
+
+    def handle_channel_post_update(update)
+      message = update['channel_post']
+      process_pin_code_message(message)
+    end
+
+    def handle_message_update(update)
+      message = update['message']
+      process_pin_code_message(message)
+    end
+
+    def process_pin_code_message(message)
+      chat_id = message.dig('chat', 'id')
+      text = message['text']&.strip
+
+      return unless valid_pin_code?(text, chat_id)
+
+      pin_code_record = find_pin_code_record
+      return unless pin_code_record
+
+      vendor = find_vendor
+      return unless vendor
+
+      chat = update_telegram_chat(message, chat_id)
+      return unless chat
+
+      handle_successful_verification(chat, vendor, pin_code_record)
+    end
+
+    def valid_pin_code?(text, chat_id)
+      text && chat_id && text == pin_code
+    end
+
+    def find_pin_code_record
+      pin_code_record = SpreeCmCommissioner::PinCodeTelegram.find_by(code: pin_code, contact: contact)
+      unless pin_code_record
+        context.fail!(message: "Pin code #{pin_code} not found for contact #{contact}")
+        return nil
+      end
+      pin_code_record
+    end
+
+    def find_vendor
+      vendor = Spree::Vendor.find_by(id: contact)
+      unless vendor
+        context.fail!(message: "Vendor not found for contact #{contact}")
+        return nil
+      end
+      vendor
+    end
+
+    def update_telegram_chat(message, chat_id)
+      chat = SpreeCmCommissioner::TelegramChat.find_or_initialize_by(chat_id: chat_id)
+      unless chat.update(
+        chat_title: message.dig('chat', 'title') || 'Unnamed Chat',
+        chat_type: message.dig('chat', 'type')
+      )
+        context.fail!(message: "Failed to update chat: #{chat.errors.full_messages.join(', ')}")
+        return nil
+      end
+
+      context.chats << { id: chat.chat_id, title: chat.chat_title, type: chat.chat_type }
+      chat
+    end
+
+    def handle_successful_verification(chat, vendor, pin_code_record)
+      return if chat.vendor && chat.vendor != vendor
+
+      update_vendor_preferences(vendor, chat)
+      chat.update(active: true, vendor: vendor)
+      expire_pin_code(pin_code_record)
+      send_success_message(chat.chat_id, vendor.name)
+      context.verified_chat_ids << chat.chat_id
+    end
+
+    def update_vendor_preferences(vendor, chat)
+      vendor.update(
+        preferred_telegram_chat_id: chat.chat_id,
+        preferred_telegram_chat_name: chat.chat_title,
+        preferred_telegram_chat_type: chat.chat_type
+      )
+    end
+
+    def expire_pin_code(pin_code_record)
+      pin_code_record.expire
+      pin_code_record.save
+    end
+
+    def send_success_message(chat_id, vendor_name)
+      message = "✅ PIN code verified successfully! This chat is now connected to <b>#{vendor_name}</b>.\n\n" \
+                'All completed orders will be sent to this chat.'
+      send_message(chat_id, message)
+    end
+
+    def fetch_updates
+      ::Telegram.bot.get_updates
+    end
+
+    def send_message(chat_id, text)
+      ::Telegram.bot.send_message(chat_id: chat_id, text: text, parse_mode: 'HTML')
+    end
+  end
+end

data/app/models/spree_cm_commissioner/blazer_queryable.rb

@@ -0,0 +1,8 @@
+module SpreeCmCommissioner
+  class BlazerQueryable < SpreeCmCommissioner::Base
+    belongs_to :queryable, polymorphic: true
+    belongs_to :blazer_query, class_name: 'Blazer::Query'
+
+    validates :queryable_id, uniqueness: { scope: %i[queryable_type blazer_query_id], message: I18n.t('event_blazer_queries.fail') }
+  end
+end

data/app/models/spree_cm_commissioner/crew_invite_link.rb

@@ -0,0 +1,4 @@
+module SpreeCmCommissioner
+  class CrewInviteLink < Invite
+  end
+end

data/app/models/spree_cm_commissioner/dynamic_field.rb

@@ -1,5 +1,7 @@
 module SpreeCmCommissioner
   class DynamicField < SpreeCmCommissioner::Base
+    acts_as_list column: :position, scope: :vendor_id
+
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
 
     has_many :dynamic_field_options, class_name: 'SpreeCmCommissioner::DynamicFieldOption', dependent: :destroy

data/app/models/spree_cm_commissioner/dynamic_field_option.rb

@@ -1,5 +1,7 @@
 module SpreeCmCommissioner
   class DynamicFieldOption < SpreeCmCommissioner::Base
+    acts_as_list column: :position, scope: :dynamic_field_id
+
     belongs_to :dynamic_field, class_name: 'SpreeCmCommissioner::DynamicField', optional: false
     has_many :guest_dynamic_fields, class_name: 'SpreeCmCommissioner::GuestDynamicField', dependent: :restrict_with_error
 

data/app/models/spree_cm_commissioner/invite.rb

@@ -5,16 +5,14 @@ module SpreeCmCommissioner
     has_many :invite_user_events, class_name: 'SpreeCmCommissioner::InviteUserEvent', dependent: :destroy
     scope :active, -> { where('expires_at > ?', Time.current) }
 
-    after_create :set_expiration
-
-    def set_expiration
-      update(expires_at: 3.days.from_now)
-    end
-
     def invite_url
       "#{Spree::Store.default.formatted_url}/invite/#{token}?utm_source=email"
     end
 
+    def invite_crew_link
+      "#{Spree::Store.default.formatted_url}/invite_crews/#{token}"
+    end
+
     def url_valid?
       expires_at.present? && expires_at > Time.current
     end

data/app/models/spree_cm_commissioner/pin_code.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class PinCode < SpreeCmCommissioner::Base
     has_secure_token
 
-    enum contact_type: { 'phone_number' => 0, 'email' => 1 }
+    enum contact_type: { 'phone_number' => 0, 'email' => 1, 'telegram' => 2 }
 
     validates :code, length: { maximum: 6 }
     validates :contact, presence: true
@@ -130,7 +130,8 @@ module SpreeCmCommissioner
         'SpreeCmCommissioner::PinCodeMobileConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
         'SpreeCmCommissioner::PinCodeUpdateUserLogin' => I18n.t('pincode.readable_type.update_user_login'),
         'SpreeCmCommissioner::PinCodeEmailConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
-        'SpreeCmCommissioner::OtpCode' => I18n.t('pincode.readable_type.otp_code')
+        'SpreeCmCommissioner::OtpCode' => I18n.t('pincode.readable_type.otp_code'),
+        'SpreeCmCommissioner::PinCodeTelegram' => I18n.t('pincode.readable_type.telegram_verification')
       }
     end
 

data/app/models/spree_cm_commissioner/pin_code_telegram.rb

@@ -0,0 +1,28 @@
+module SpreeCmCommissioner
+  class PinCodeTelegram < PinCode
+    before_validation :set_telegram_attrs, on: :create
+    validates :contact, presence: true, numericality: { only_integer: true }, if: :telegram?
+
+    belongs_to :vendor, class_name: 'Spree::Vendor', foreign_key: 'contact', primary_key: 'id'
+
+    def telegram?
+      true
+    end
+
+    def expires_in_seconds
+      5 * 60
+    end
+
+    def expired?
+      expired_at < Time.zone.now
+    end
+
+    private
+
+    def set_telegram_attrs
+      self.contact_type = :telegram
+      self.type = 'SpreeCmCommissioner::PinCodeTelegram'
+      self.expired_at = Time.zone.now + expires_in_seconds unless expired_at
+    end
+  end
+end

data/app/models/spree_cm_commissioner/promotion_category_decorator.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module PromotionCategoryDecorator
+    def self.prepended(base)
+      base.belongs_to :vendor, class_name: 'Spree::Vendor', optional: true
+    end
+  end
+end
+
+unless Spree::PromotionCategory.included_modules.include?(SpreeCmCommissioner::PromotionCategoryDecorator)
+  Spree::PromotionCategory.prepend(SpreeCmCommissioner::PromotionCategoryDecorator)
+end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -57,14 +57,16 @@ module SpreeCmCommissioner
       base.has_many :crew_invites, class_name: 'SpreeCmCommissioner::CrewInvite', dependent: :destroy
       base.has_many :invite_user_events, through: :user_events, class_name: 'SpreeCmCommissioner::InviteUserEvent'
 
+      base.has_many :crew_invite_links, class_name: 'SpreeCmCommissioner::CrewInviteLink', dependent: :destroy
+
       base.has_many :invite_guests, class_name: 'SpreeCmCommissioner::InviteGuest', foreign_key: :event_id
 
       base.has_many :line_items, through: :products
       base.has_many :event_line_items, class_name: 'Spree::LineItem', foreign_key: :event_id
       base.has_many :event_products, class_name: 'Spree::Product', foreign_key: :event_id
 
-      base.has_many :event_blazer_queries, class_name: 'SpreeCmCommissioner::TaxonBlazerQuery'
-      base.has_many :blazer_queries, through: :event_blazer_queries, class_name: 'Blazer::Query'
+      base.has_many :event_blazer_queries, as: :queryable, class_name: 'SpreeCmCommissioner::BlazerQueryable'
+      base.has_many :blazer_queries, through: :event_blazer_queries, source: :blazer_query, class_name: 'Blazer::Query'
 
       base.has_many :taxon_option_types, class_name: 'SpreeCmCommissioner::TaxonOptionType'
       base.has_many :taxon_option_values, class_name: 'SpreeCmCommissioner::TaxonOptionValue'

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

@@ -4,6 +4,18 @@ module SpreeCmCommissioner
     attr_accessor :hours, :minutes, :seconds
 
     before_validation :convert_duration_to_seconds
+
+    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
+
+    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
+    has_many :inventory_items, through: :variants
     belongs_to :variant, class_name: 'Spree::Variant'
 
     belongs_to :route, class_name: 'Spree::Product'

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -78,6 +78,7 @@ 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',

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/storefront/dynamic_field_option_serializer.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldOptionSerializer < BaseSerializer
-        attributes :id, :value, :dynamic_field_id, :status, :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,7 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :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/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>
 

data/config/locales/en.yml

@@ -547,6 +547,7 @@ en:
       update_user_login: "update user code"
       contact_update: "update contact code"
       otp_code: "OTP code"
+      telegram_verification: "telegram code"
 
   notifications:
     spree_cm_commissioner:

data/config/routes.rb

@@ -274,6 +274,7 @@ Spree::Core::Engine.add_routes do
       resources :vendors, controller: :tenant_vendors
     end
     resources :event_blazer_queries
+    resources :trip_blazer_queries
   end
 
   resources :events, controller: 'events/base' do
@@ -450,6 +451,7 @@ Spree::Core::Engine.add_routes do
         resources :images
         resource :s3_signed_urls
         resources :invites
+        resources :invite_crews, only: %i[show update]
         resources :invite_guests, only: %i[show update]
       end
 

data/db/migrate/20250630103536_create_cm_telegram_chats.rb

@@ -0,0 +1,13 @@
+class CreateCmTelegramChats < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_telegram_chats, if_not_exists: true do |t|
+      t.bigint :chat_id, null: false
+      t.string :chat_title
+      t.string :chat_type
+      t.boolean :active, default: false
+      t.references :vendor, foreign_key: { to_table: :spree_vendors }
+      t.timestamps
+    end
+    add_index :cm_telegram_chats, :chat_id, unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250707032008_add_vendor_id_to_spree_category.rb

@@ -0,0 +1,7 @@
+class AddVendorIdToSpreeCategory < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:spree_promotion_categories, :vendor_id)
+      add_reference :spree_promotion_categories, :vendor, index: true, foreign_key: { to_table: :spree_vendors }
+    end
+  end
+end

data/db/migrate/20250711092937_add_position_to_cm_dynamic_fields.rb

@@ -0,0 +1,11 @@
+class AddPositionToCmDynamicFields < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_dynamic_fields, :position)
+      add_column :cm_dynamic_fields, :position, :integer, default: 0, null: false
+    end
+
+    unless index_exists?(:cm_dynamic_fields, :position, name: 'index_dynamic_fields_on_position')
+      add_index :cm_dynamic_fields, :position, name: 'index_dynamic_fields_on_position'
+    end
+  end
+end

data/db/migrate/20250711093045_add_position_to_cm_dynamic_field_options.rb

@@ -0,0 +1,11 @@
+class AddPositionToCmDynamicFieldOptions < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_dynamic_field_options, :position)
+      add_column :cm_dynamic_field_options, :position, :integer, default: 0, null: false
+    end
+
+    unless index_exists?(:cm_dynamic_field_options, :position, name: 'index_dynamic_field_options_on_position')
+      add_index :cm_dynamic_field_options, :position, name: 'index_dynamic_field_options_on_position'
+    end
+  end
+end

data/db/migrate/20250714121508_rename_cm_taxon_blazer_query_to_blazer_queryables.rb

@@ -0,0 +1,7 @@
+class RenameCmTaxonBlazerQueryToBlazerQueryables < ActiveRecord::Migration[7.0]
+  def change
+    if table_exists?(:cm_taxon_blazer_queries)
+      rename_table :cm_taxon_blazer_queries, :cm_blazer_queryables
+    end
+  end
+end

data/db/migrate/20250714124323_make_cm_blazer_queryables_polymorphic.rb

@@ -0,0 +1,19 @@
+class MakeCmBlazerQueryablesPolymorphic < ActiveRecord::Migration[7.0]
+  def change
+    if column_exists?(:cm_blazer_queryables, :taxon_id) && !column_exists?(:cm_blazer_queryables, :queryable_id)
+      rename_column :cm_blazer_queryables, :taxon_id, :queryable_id
+    end
+
+    unless column_exists?(:cm_blazer_queryables, :queryable_type)
+      add_column :cm_blazer_queryables, :queryable_type, :string, default: 'Spree::Taxon'
+    end
+
+    if foreign_key_exists?(:cm_blazer_queryables, column: :queryable_id)
+      remove_foreign_key :cm_blazer_queryables, column: :queryable_id
+    end
+
+    unless index_exists?(:cm_blazer_queryables, [:queryable_type, :queryable_id], name: 'index_cm_blazer_queryables_on_queryable_type_and_id')
+      add_index :cm_blazer_queryables, [:queryable_type, :queryable_id], name: 'index_cm_blazer_queryables_on_queryable_type_and_id'
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.18.1'.freeze
+  VERSION = '1.19.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.19.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-10 00:00:00.000000000 Z
+date: 2025-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -787,6 +787,7 @@ files:
 - app/controllers/spree/admin/telegram_bots_controller.rb
 - app/controllers/spree/admin/tenant_vendors_controller.rb
 - app/controllers/spree/admin/tenants_controller.rb
+- app/controllers/spree/admin/trip_blazer_queries_controller.rb
 - app/controllers/spree/admin/user_events_controller.rb
 - app/controllers/spree/admin/user_identity_providers_controller.rb
 - app/controllers/spree/admin/users_controller_decorator.rb
@@ -819,6 +820,7 @@ files:
 - app/controllers/spree/api/v2/operator/taxons_controller.rb
 - app/controllers/spree/api/v2/organizer/base_controller.rb
 - app/controllers/spree/api/v2/organizer/images_controller.rb
+- app/controllers/spree/api/v2/organizer/invite_crews_controller.rb
 - app/controllers/spree/api/v2/organizer/invite_guests_controller.rb
 - app/controllers/spree/api/v2/organizer/invites_controller.rb
 - app/controllers/spree/api/v2/organizer/s3_signed_urls_controller.rb
@@ -1038,7 +1040,9 @@ files:
 - app/interactors/spree_cm_commissioner/account_linkage.rb
 - app/interactors/spree_cm_commissioner/account_recover.rb
 - app/interactors/spree_cm_commissioner/account_updater.rb
+- app/interactors/spree_cm_commissioner/apple_app_site_association_fetcher.rb
 - app/interactors/spree_cm_commissioner/apply_service_availability.rb
+- app/interactors/spree_cm_commissioner/asset_links_fetcher.rb
 - app/interactors/spree_cm_commissioner/base_interactor.rb
 - app/interactors/spree_cm_commissioner/bib_number_swapper.rb
 - app/interactors/spree_cm_commissioner/chatrace_order_creator.rb
@@ -1048,6 +1052,7 @@ files:
 - app/interactors/spree_cm_commissioner/conversion_pre_calculator.rb
 - app/interactors/spree_cm_commissioner/create_event.rb
 - app/interactors/spree_cm_commissioner/create_ticket.rb
+- app/interactors/spree_cm_commissioner/crew_invite_link_handler.rb
 - app/interactors/spree_cm_commissioner/crew_inviter.rb
 - app/interactors/spree_cm_commissioner/customer_content_notification_creator.rb
 - app/interactors/spree_cm_commissioner/customer_notification_cron_executor.rb
@@ -1107,6 +1112,7 @@ files:
 - app/interactors/spree_cm_commissioner/subscriptions_order_creator.rb
 - app/interactors/spree_cm_commissioner/subscriptions_order_cron_executor.rb
 - app/interactors/spree_cm_commissioner/subscriptions_prepaid_order_creator.rb
+- app/interactors/spree_cm_commissioner/telegram_chats_auto_finder.rb
 - app/interactors/spree_cm_commissioner/telegram_chats_finder.rb
 - app/interactors/spree_cm_commissioner/telegram_debug_pin_code_sender.rb
 - app/interactors/spree_cm_commissioner/telegram_notification_sender.rb
@@ -1116,7 +1122,6 @@ files:
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_checker.rb
 - app/interactors/spree_cm_commissioner/transactional_email_sender.rb
 - app/interactors/spree_cm_commissioner/unique_device_token_cron_executor.rb
-- app/interactors/spree_cm_commissioner/universal_link_fetcher.rb
 - app/interactors/spree_cm_commissioner/update_payment_gateway_status.rb
 - app/interactors/spree_cm_commissioner/user_contact_updater.rb
 - app/interactors/spree_cm_commissioner/user_device_token_deregister.rb
@@ -1223,6 +1228,7 @@ files:
 - app/models/spree_cm_commissioner/asset.rb
 - app/models/spree_cm_commissioner/back_image.rb
 - app/models/spree_cm_commissioner/base.rb
+- app/models/spree_cm_commissioner/blazer_queryable.rb
 - app/models/spree_cm_commissioner/branch.rb
 - app/models/spree_cm_commissioner/check_in.rb
 - app/models/spree_cm_commissioner/check_in_ability.rb
@@ -1231,6 +1237,7 @@ files:
 - app/models/spree_cm_commissioner/cms_page_decorator.rb
 - app/models/spree_cm_commissioner/configuration.rb
 - app/models/spree_cm_commissioner/crew_invite.rb
+- app/models/spree_cm_commissioner/crew_invite_link.rb
 - app/models/spree_cm_commissioner/customer.rb
 - app/models/spree_cm_commissioner/customer_notification.rb
 - app/models/spree_cm_commissioner/customer_promotion_rule.rb
@@ -1302,6 +1309,7 @@ files:
 - app/models/spree_cm_commissioner/pin_code_mobile_confirm.rb
 - app/models/spree_cm_commissioner/pin_code_otp.rb
 - app/models/spree_cm_commissioner/pin_code_registration.rb
+- app/models/spree_cm_commissioner/pin_code_telegram.rb
 - app/models/spree_cm_commissioner/pin_code_update_user_login.rb
 - app/models/spree_cm_commissioner/place.rb
 - app/models/spree_cm_commissioner/product_completion_step.rb
@@ -1321,6 +1329,7 @@ files:
 - app/models/spree_cm_commissioner/promotion/rules/guest_occupations.rb
 - app/models/spree_cm_commissioner/promotion/rules/vendors.rb
 - app/models/spree_cm_commissioner/promotion/rules/weekend.rb
+- app/models/spree_cm_commissioner/promotion_category_decorator.rb
 - app/models/spree_cm_commissioner/promotion_decorator.rb
 - app/models/spree_cm_commissioner/property_decorator.rb
 - app/models/spree_cm_commissioner/prototype_decorator.rb
@@ -1342,7 +1351,6 @@ files:
 - app/models/spree_cm_commissioner/store_decorator.rb
 - app/models/spree_cm_commissioner/subscription.rb
 - app/models/spree_cm_commissioner/taxon_app_banner.rb
-- app/models/spree_cm_commissioner/taxon_blazer_query.rb
 - app/models/spree_cm_commissioner/taxon_brand_logo.rb
 - app/models/spree_cm_commissioner/taxon_category_icon.rb
 - app/models/spree_cm_commissioner/taxon_decorator.rb
@@ -1355,6 +1363,7 @@ files:
 - app/models/spree_cm_commissioner/taxon_web_banner.rb
 - app/models/spree_cm_commissioner/taxonomy_decorator.rb
 - app/models/spree_cm_commissioner/telegram_bot.rb
+- app/models/spree_cm_commissioner/telegram_chat.rb
 - app/models/spree_cm_commissioner/tenant.rb
 - app/models/spree_cm_commissioner/transactional_email.rb
 - app/models/spree_cm_commissioner/trip.rb
@@ -1567,6 +1576,7 @@ files:
 - app/serializers/spree/v2/organizer/asset_serializer.rb
 - app/serializers/spree/v2/organizer/base_serializer.rb
 - app/serializers/spree/v2/organizer/image_serializer.rb
+- app/serializers/spree/v2/organizer/invite_crews_serializer.rb
 - app/serializers/spree/v2/organizer/invite_guest_serializer.rb
 - app/serializers/spree/v2/organizer/invite_serializer.rb
 - app/serializers/spree/v2/organizer/s3_signed_url_serializer.rb
@@ -2518,9 +2528,15 @@ files:
 - db/migrate/20250611023548_add_country_code_to_guests.rb
 - db/migrate/20250612035937_add_intel_phone_number_to_guests.rb
 - db/migrate/20250616084219_add_description_to_cm_vendor_place.rb
+- db/migrate/20250630103536_create_cm_telegram_chats.rb
 - db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb
 - db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb
 - db/migrate/20250702091935_add_status_to_dynamic_field_option.rb
+- db/migrate/20250707032008_add_vendor_id_to_spree_category.rb
+- db/migrate/20250711092937_add_position_to_cm_dynamic_fields.rb
+- db/migrate/20250711093045_add_position_to_cm_dynamic_field_options.rb
+- db/migrate/20250714121508_rename_cm_taxon_blazer_query_to_blazer_queryables.rb
+- db/migrate/20250714124323_make_cm_blazer_queryables_polymorphic.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem

data/app/interactors/spree_cm_commissioner/universal_link_fetcher.rb

@@ -1,54 +0,0 @@
-module SpreeCmCommissioner
-  class UniversalLinkFetcher < BaseInteractor
-    delegate :universal_link, :store, :tenant, :refresh, to: :context
-
-    def call
-      return not_found unless resource
-
-      data = load_cached_preference(resource)
-      return not_found if data.blank?
-
-      { success: true, data: data }
-    end
-
-    private
-
-    def resource
-      @resource ||= store.presence || tenant
-    end
-
-    def load_cached_preference(resource)
-      preference_key = preference_key_for(universal_link)
-      return nil unless preference_key && resource.respond_to?(preference_key)
-
-      updated_at = resource.try(:updated_at)&.to_i || 'no_updated_at'
-      cache_key = build_cache_key(universal_link, resource, updated_at)
-
-      CmAppLogger.log(label: 'LOOKING_UP_CACHE', data: { cache_key: cache_key })
-
-      Rails.cache.delete(cache_key) if refresh
-
-      Rails.cache.fetch(cache_key, expires_in: 1.day, force: refresh) do
-        CmAppLogger.log(label: 'CACHE_MISS', data: { cache_key: cache_key })
-        resource.public_send(preference_key).presence
-      end
-    end
-
-    def build_cache_key(universal_link, resource, updated_at)
-      "well_known:#{universal_link}:#{resource.class.name}:#{resource.id}:#{updated_at}"
-    end
-
-    def preference_key_for(universal_link)
-      case universal_link
-      when 'assetlinks.json'
-        :preferred_assetlinks
-      when 'apple-app-site-association'
-        :preferred_apple_app_site_association
-      end
-    end
-
-    def not_found
-      { success: false, error: 'Not found' }
-    end
-  end
-end

data/app/models/spree_cm_commissioner/taxon_blazer_query.rb

@@ -1,8 +0,0 @@
-module SpreeCmCommissioner
-  class TaxonBlazerQuery < SpreeCmCommissioner::Base
-    belongs_to :taxon, class_name: 'Spree::Taxon'
-    belongs_to :blazer_query, class_name: 'Blazer::Query'
-
-    validates :taxon_id, uniqueness: { scope: :blazer_query_id, message: I18n.t('event_blazer_queries.fail') }
-  end
-end