spree_cm_commissioner 2.0.0.pre.pre → 2.0.0

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/create_ticket.rb

@@ -9,7 +9,8 @@ module SpreeCmCommissioner
         set_option_value
         create_variant
         create_stock_item
-        upload_image
+        upload_image_to(@ticket.master)
+        upload_image_to(@variant)
         create_place
       end
     end
@@ -77,13 +78,13 @@ module SpreeCmCommissioner
       context.fail!(message: @stock_item.errors.full_messages.join(', '))
     end
 
-    def upload_image
+    def upload_image_to(target)
       return if context.params[:ticket_image].blank?
 
-      @image = @ticket.master.images.new(attachment: context.params[:ticket_image])
-      return if @image.save
+      image = target.images.new(attachment: context.params[:ticket_image])
+      return if image.save
 
-      context.fail!(message: @image.errors.full_messages.join(', '))
+      context.fail!(message: image.errors.full_messages.join(', '))
     end
 
     def create_place

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/pin_code_sender.rb

@@ -18,7 +18,6 @@ module  SpreeCmCommissioner
 
     def send_sms
       options = {
-        from: sender_name(context.tenant),
         to: context.pin_code.contact,
         body: I18n.t('pincode_sender.sms.body', code: context.pin_code.code, readable_type: context.pin_code.readable_type)
       }

data/app/interactors/spree_cm_commissioner/sms.rb

@@ -42,7 +42,7 @@ module  SpreeCmCommissioner
     end
 
     def sms_options
-      opts = { from: context.from, to: context.to, body: context.body }
+      opts = { to: context.to, body: context.body }
       opts[:to] = sanitize(opts[:to]) if opts[:to].present?
       opts[:from] = from_number
       opts

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/interactors/spree_cm_commissioner/user_id_token_authenticator.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class UserIdTokenAuthenticator < BaseInteractor
-    # :id_token
+    # :id_token, :tenant_id (optional)
     def call
       context.user = if checker.user.nil?
                        register_user
@@ -14,7 +14,11 @@ module SpreeCmCommissioner
     end
 
     def register_user
-      register_context = SpreeCmCommissioner::UserRegistrationWithIdToken.call(id_token: context.id_token)
+      register_context = SpreeCmCommissioner::UserRegistrationWithIdToken.call(
+        id_token: context.id_token,
+        tenant_id: context.tenant_id
+      )
+
       register_context.user
     end
 
@@ -27,7 +31,7 @@ module SpreeCmCommissioner
     end
 
     def checker
-      @checker ||= SpreeCmCommissioner::UserIdTokenChecker.call(id_token: context.id_token)
+      @checker ||= SpreeCmCommissioner::UserIdTokenChecker.call(id_token: context.id_token, tenant_id: context.tenant_id)
       @checker
     end
   end

data/app/interactors/spree_cm_commissioner/user_id_token_checker.rb

@@ -1,6 +1,9 @@
 module SpreeCmCommissioner
   class UserIdTokenChecker < BaseInteractor
-    # :id_token
+    # expects:
+    #   context.id_token
+    #   context.tenant_id (optional)
+
     def call
       firebase_id_token_context = SpreeCmCommissioner::FirebaseIdTokenProvider.call(id_token: context.id_token)
 
@@ -11,9 +14,14 @@ module SpreeCmCommissioner
       end
     end
 
-    # :identity_type, :sub
+    # :identity_type, :sub, :tenant_id
     def validate_user_by_provider(provider)
-      identity_checker = SpreeCmCommissioner::UserIdentityChecker.call(provider)
+      identity_checker = SpreeCmCommissioner::UserIdentityChecker.call(
+        identity_type: provider[:identity_type],
+        sub: provider[:sub],
+        tenant_id: context.tenant_id
+      )
+
       if identity_checker.success?
         context.user = identity_checker.user
       else

data/app/interactors/spree_cm_commissioner/user_identity_checker.rb

@@ -1,6 +1,10 @@
 module SpreeCmCommissioner
   class UserIdentityChecker < BaseInteractor
-    # :identity_type, :sub
+    # expects:
+    #   context.identity_type
+    #   context.sub
+    #   context.tenant_id (optional)
+
     def call
       load_user
 
@@ -11,12 +15,14 @@ module SpreeCmCommissioner
     end
 
     def load_user
-      user_identity_provider = UserIdentityProvider.where(
-        identity_type: context.identity_type,
-        sub: context.sub
-      ).first
+      return if context.sub.blank? || context.identity_type.blank?
+
+      user_identity_provider = UserIdentityProvider.joins(:user)
+                                                   .where(identity_type: context.identity_type, sub: context.sub)
+                                                   .where(spree_users: { tenant_id: context.tenant_id })
+                                                   .first
 
-      context.user = (user_identity_provider.user if user_identity_provider.present?)
+      context.user = user_identity_provider&.user
     end
   end
 end

data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb

@@ -15,7 +15,13 @@ module SpreeCmCommissioner
     end
 
     def register_user!(name, email)
-      user = Spree.user_class.new(password: SecureRandom.base64(16), email: email, **name_attributes(name))
+      user = Spree.user_class.new(
+        password: SecureRandom.base64(16),
+        email: email,
+        tenant_id: context.tenant_id,
+        **name_attributes(name)
+      )
+
       if user.save(validate: false)
         context.user = user
       else

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -93,6 +93,10 @@ module SpreeCmCommissioner
       context.fail!(message: "User creation failed: #{context.user.errors.full_messages.join(', ')}")
     end
 
+    def disable_services
+      'bus,ferry'
+    end
+
     def construct_data
       user = context.user
 
@@ -101,7 +105,7 @@ module SpreeCmCommissioner
         name: user.full_name,
         phone: user.phone_number,
         email: user.email,
-        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}"
+        webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}&ds=#{CGI.escape(disable_services)}"
       }
 
       json_data = raw_data.to_json

data/app/jobs/spree_cm_commissioner/application_job.rb

@@ -1,25 +1,5 @@
 module SpreeCmCommissioner
   class ApplicationJob < ::ApplicationJob
     queue_as :default
-
-    around_perform :log_exceptions
-
-    private
-
-    def log_exceptions
-      yield
-    rescue StandardError => e
-      CmAppLogger.log(
-        label: "#{self.class.name} failed",
-        data: {
-          error_class: e.class.name,
-          error_message: e.message,
-          arguments: arguments.inspect,
-          backtrace: e.backtrace&.first(5)&.join("\n")
-        }
-      )
-
-      raise # Re-raise the exception to let Sidekiq handle retries or failure
-    end
   end
 end

data/app/jobs/spree_cm_commissioner/application_unique_job.rb

@@ -2,25 +2,5 @@
 module SpreeCmCommissioner
   class ApplicationUniqueJob < ::ApplicationUniqueJob
     queue_as :default
-
-    around_perform :log_exceptions
-
-    private
-
-    def log_exceptions
-      yield
-    rescue StandardError => e
-      CmAppLogger.log(
-        label: "#{self.class.name} failed",
-        data: {
-          error_class: e.class.name,
-          error_message: e.message,
-          arguments: arguments.inspect,
-          backtrace: e.backtrace&.first(5)&.join("\n")
-        }
-      )
-
-      raise # Re-raise the exception to let Sidekiq handle retries or failure
-    end
   end
 end

data/app/jobs/spree_cm_commissioner/sms_pin_code_job.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class SmsPinCodeJob < SpreeCmCommissioner::SmsJob
-    # options = { from: xxx, to: xxxx, body: xxxx }
+    # options = { to: xxxx, body: xxxx }
     def perform(options)
       SpreeCmCommissioner::Sms.call(options)
     end

data/app/mailers/spree/order_mailer_decorator.rb

@@ -1,6 +1,5 @@
 module Spree
   module OrderMailerDecorator
-    # overrided
     def cancel_email(order, resend: false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       return false if @order.email.blank?
@@ -12,18 +11,34 @@ module Spree
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       return false if @order.email.blank?
 
+      @tenant = @order.tenant
+      if @tenant.present?
+        @brand_color = @tenant.preferences[:brand_primary_color]
+        @vendor_logo_url = @tenant.active_vendor&.logo&.original_url
+      end
+
       @current_store = @order.store
       @product_type = @order.products.first&.product_type || 'accommodation'
 
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+      subject = resend ? "[#{Spree.t(:resend).upcase}] " : ''
       subject += "#{@current_store&.name} Booking Confirmation ##{@order.number}"
 
-      mail(to: @order.email, from: from_address, subject: subject, store_url: @current_store.url) do |format|
+      mail(to: @order.email, from: from_email_address, subject: subject, store_url: @current_store.url) do |format|
         format.html { render layout: 'spree_cm_commissioner/layouts/order_mailer' }
         format.text
       end
     end
 
+    private
+
+    def from_email_address
+      if @order.tenant.nil?
+        from_address
+      else
+        @order.tenant.active_vendor&.from_email
+      end
+    end
+
     def ticket_email(guest, email)
       @guest = guest
       @event = @guest.event

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

@@ -0,0 +1,30 @@
+module SpreeCmCommissioner
+  module EventCheckInFlowable
+    extend ActiveSupport::Concern
+
+    included do
+      preference :group_check_in_enabled, :boolean, default: true
+      preference :individual_check_in_enabled, :boolean, default: true
+
+      before_validation :validate_at_least_one_check_in_flow_presence
+    end
+
+    def check_in_flows
+      flows = []
+      flows << 'group' if group_check_in_enabled?
+      flows << 'individual' if individual_check_in_enabled?
+      flows
+    end
+
+    def group_check_in_enabled? = preferred_group_check_in_enabled
+    def individual_check_in_enabled? = preferred_individual_check_in_enabled
+
+    private
+
+    def validate_at_least_one_check_in_flow_presence
+      return if check_in_flows.any?
+
+      errors.add(:check_in_flows, 'must have at least one flow selected')
+    end
+  end
+end

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

@@ -18,23 +18,29 @@ module SpreeCmCommissioner
     def date_unit
       return nil unless permanent_stock?
 
-      date_range.size
+      date_range_excluding_checkout.size if accommodation?
     end
 
-    def date_range
+    def date_range_excluding_checkout
       return [] unless date_present?
 
-      (from_date.to_date..to_date.to_date).to_a
+      date_range = (from_date.to_date..to_date.to_date).to_a
+      date_range.pop if date_range.size > 1
+      date_range
     end
 
-    def checkin_date
-      from_date&.to_date
-    end
+    def date_range_including_checkout
+      return [] unless date_present?
 
-    def checkout_date
-      return to_date ? to_date.to_date - 1.day : nil if accommodation?
+      (from_date.to_date..to_date.to_date).to_a
+    end
 
-      to_date&.to_date
+    def date_range
+      if accommodation?
+        date_range_excluding_checkout
+      else
+        date_range_including_checkout
+      end
     end
 
     private

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

@@ -14,6 +14,13 @@ module SpreeCmCommissioner
       state_selection
       payment_option
       delivery_option
+      amenity
+      departure_time
+      duration
+      vehicle_id
+      origin
+      destination
+      place_id
     ].freeze
 
     RESERVED_OPTIONS = {
@@ -40,7 +47,12 @@ module SpreeCmCommissioner
       'bib-zerofill' => 'integer',
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
-      'seat-number-positions' => 'array'
+      'seat-number-positions' => 'array',
+      'origin' => 'place_id',
+      'destination' => 'place_id',
+      'departure-time' => 'time',
+      'vehicle' => 'vehicle_id',
+      'allow-seat-selection' => 'boolean'
     }.freeze
 
     included do