spree_cm_commissioner 2.0.3.pre.pre → 2.0.3.pre.pre1

data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb

@@ -1,26 +1,16 @@
-# 🎟️ --- [TICKET CLAIMED] ---
+# 🎫 --- [NEW INVITATION CLAIMED] ---
 #
-# Order Number:
-# <code>R621016753</code>
-#
-# ✅ <b>Ticket Successfully Claimed!</b>
-#
-# [ x1 ]
-# <b>5km Running Ticket</b>
-# <i>👉 Distance: 5km, T-shirt: M</i>
-# <i>🗓️ Nov 15, 2023</i>
-# <i>🏪 Temple Run with Sai</i>
+# <b>🙍 Claimed By</b>
+# Name: Orng SreyMoch
+# Tel: <code>+85570760548</code>
 #
-# [ x2 ]
 # <b>5km Running Ticket</b>
+# Quantity: 1
 # <i>👉 Distance: 5km, T-shirt: S</i>
 # <i>🗓️ Nov 15, 2023 -> Nov 17, 2023</i>
-# <i>🏪 Temple Run with Sai</i>
 #
-# <b>🙍 Claimed By</b>
-# Name: Vaneath Awesome
-# Tel: <code>+85570760548</code>
-# Email: <code>admin_dev@cm.com</code>
+# Order Number:
+# <code>R621016753</code>
 
 module SpreeCmCommissioner
   class InviteGuestClaimedTelegramMessageFactory < TelegramMessageFactory
@@ -36,85 +26,38 @@ module SpreeCmCommissioner
     end
 
     def selected_line_items
-      return order.line_items.for_vendor(vendor) if vendor.present?
-
-      order.line_items
+      vendor.present? ? order.line_items.for_vendor(vendor) : order.line_items
     end
 
     # override
     def body
       text = []
-      text << "Order Number:\n<code>#{order.number}</code>\n"
-      text << "\n✅ <b>Ticket Successfully Claimed!</b>\n"
-      text << selected_line_items.map { |item| line_item_content(item) }.compact.join("\n\n")
-      text.compact.join("\n")
-    end
 
-    def line_item_content(line_item)
-      text = []
+      text << bold('🙍 Claimed By')
+      text << "Name: #{guest.first_name} #{guest.last_name}"
+      text << "Tel: #{inline_code(guest.phone_number)}"
+      text << ''
+
+      # Each invitation_link leads to one order with one line_item, claimed by one guest so quantity is always 1.
+      selected_line_items.each do |item|
+        text << bold(item.product.name.to_s)
+        text << '🎟️ Quantity: 1'
+        text << italic("👉 #{item.options_text}") if item.options_text.present?
+        text << italic(pretty_date_for(item)) if item.date_present?
+        text << ''
+      end
 
-      text << bold(line_item.product.name.to_s)
-      text << "Quantity: #{line_item.quantity}"
-      text << italic("👉 #{line_item.options_text}") if line_item.options_text.present?
-      text << italic(pretty_date_for(line_item)) if pretty_date_for(line_item).present?
-      text << italic("🏪 #{line_item.vendor.name}") if line_item.vendor&.name.present? && vendor.blank?
+      text << bold('Order Number:')
+      text << inline_code(order.number)
 
       text.compact.join("\n")
     end
 
     def pretty_date_for(line_item)
-      return nil unless line_item.date_present?
-
       from_date = pretty_date(line_item.from_date)
       to_date = pretty_date(line_item.to_date)
 
-      if from_date == to_date
-        "🗓️ #{from_date}"
-      else
-        "🗓️ #{from_date} -> #{to_date}"
-      end
-    end
-
-    # override
-    def footer
-      text = []
-
-      text << bold('🙍 Claimed By')
-      text << "Name: #{guest.first_name} #{guest.last_name}" if guest.first_name.present? || guest.last_name.present?
-      text << "Tel: #{inline_code(guest.intel_phone_number)}" if guest.intel_phone_number.present?
-
-      if show_details_link && order.guests.any?
-        text << ''
-        text << 'View Tickets:'
-        text += generate_guests_links(order.guests)
-      end
-
-      text.compact.join("\n")
-    end
-
-    # Result:
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 |
-    def generate_guests_links(guests, guests_per_row = 2)
-      rows = (guests.size.to_f / guests_per_row).ceil
-      formatted_rows = []
-
-      rows.times do |i|
-        row_guests = guests.slice(i * guests_per_row, guests_per_row)
-        formatted_row = row_guests.map do |guest|
-          button_label = guest.seat_number.present? ? "No. #{guest.seat_number}" : "No. #{guest.formatted_bib_number || 'N/A'}"
-          link = Rails.application.routes.url_helpers.guest_cards_url(guest.token)
-          "| <a href='#{link}'>#{button_label}</a>"
-        end.join(' ')
-
-        formatted_rows << ("#{formatted_row} |")
-      end
-
-      formatted_rows
+      from_date == to_date ? "🗓️ #{from_date}" : "🗓️ #{from_date} -> #{to_date}"
     end
   end
 end

data/app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb

@@ -0,0 +1,20 @@
+module SpreeCmCommissioner
+  module LineItems
+    module FindByVariantDecorator
+      # ovveride
+      def execute(order:, variant:, options: {})
+        return super unless variant.product.product_type == 'transit'
+
+        order.line_items.detect do |line_item|
+          next if options[:date].present? && !(line_item.variant_id == variant.id && line_item.date == options[:date])
+
+          Spree::Dependencies.cart_compare_line_items_service.constantize.call(order: order, line_item: line_item, options: options).value
+        end
+      end
+    end
+  end
+end
+
+unless Spree::LineItems::FindByVariant.included_modules.include?(SpreeCmCommissioner::LineItems::FindByVariantDecorator)
+  Spree::LineItems::FindByVariant.prepend(SpreeCmCommissioner::LineItems::FindByVariantDecorator)
+end

data/app/interactors/spree_cm_commissioner/create_event.rb

@@ -11,6 +11,7 @@ module SpreeCmCommissioner
         create_child_taxon
         build_asset
         create_place
+        generate_reports
       end
     end
 
@@ -91,5 +92,9 @@ module SpreeCmCommissioner
         context.fail!(message: place.errors.full_messages.join(', '))
       end
     end
+
+    def generate_reports
+      SpreeCmCommissioner::ReportsAssignerJob.perform_later(@parent_taxon.id, @parent_taxon.class.to_s)
+    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/create_vendor.rb

@@ -0,0 +1,44 @@
+module SpreeCmCommissioner
+  class CreateVendor
+    include Interactor
+
+    def call
+      validate_context!
+
+      ActiveRecord::Base.transaction do
+        create_vendor
+        assign_vendor_to_user
+        create_role
+      end
+    end
+
+    private
+
+    def validate_context!
+      context.fail!(message: 'User is missing') unless context.user
+      context.fail!(message: 'Vendor parameters are missing') unless context.vendor_params
+    end
+
+    def create_vendor
+      @vendor = Spree::Vendor.new(context.vendor_params)
+      return if @vendor.save
+
+      context.fail!(message: @vendor.errors.full_messages.join(', '))
+    end
+
+    def assign_vendor_to_user
+      context.user.vendors << @vendor
+    end
+
+    def create_role
+      role = context.user.spree_roles.create(
+        name: "#{@vendor.name.downcase.parameterize(separator: '-')}-organizer",
+        vendor_id: @vendor.id,
+        presentation: 'Organizer'
+      )
+      return if role.persisted?
+
+      context.fail!(message: role.errors.full_messages.to_sentence)
+    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/reports_assigner.rb

@@ -0,0 +1,17 @@
+module SpreeCmCommissioner
+  class ReportsAssigner < BaseInteractor
+    delegate :queryable_id, :queryable_type, to: :context
+
+    def call
+      preset_queries = Blazer::Query.where(preset: true)
+
+      preset_queries.find_each do |query|
+        SpreeCmCommissioner::BlazerQueryable.find_or_create_by!(
+          queryable_type: queryable_type,
+          queryable_id: queryable_id,
+          blazer_query_id: query.id
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module SpreeCmCommissioner
+  class ReportsAssignerJob < ApplicationUniqueJob
+    def perform(queryable_id, queryable_type)
+      SpreeCmCommissioner::ReportsAssigner.call(queryable_id: queryable_id, queryable_type: queryable_type)
+    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/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
@@ -49,6 +55,24 @@ module SpreeCmCommissioner
     def set_duration
       self.from_date ||= variant.start_date_time || event&.from_date
       self.to_date ||= variant.end_date_time || event&.to_date
+
+      return if persisted?
+
+      apply_variant_time(:from_date, variant.start_date_time)
+      apply_variant_time(:to_date, variant.end_date_time)
+    end
+
+    def apply_variant_time(field, variant_time)
+      field_value = send(field)
+
+      return unless field_value.present? && field_value.hour.zero? && variant_time.present?
+
+      send("#{field}=", field_value.change(
+                          hour: variant_time.hour,
+                          min: variant_time.min,
+                          sec: variant_time.sec
+                        )
+      )
     end
   end
 end

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 = {
@@ -41,7 +48,11 @@ module SpreeCmCommissioner
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
       'seat-number-positions' => 'array',
-      'seat-type' => 'string'
+      'origin' => 'place_id',
+      'destination' => 'place_id',
+      'departure-time' => 'time',
+      'vehicle' => 'vehicle_id',
+      'allow-seat-selection' => 'boolean'
     }.freeze
 
     included do

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

@@ -5,8 +5,6 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      state_machine.before_transition to: :payment, do: :hold_blocks!
-
       state_machine.before_transition to: :complete, do: :request, if: :need_confirmation?
       state_machine.before_transition to: :complete, do: :generate_bib_number
 
@@ -16,14 +14,10 @@ module SpreeCmCommissioner
       state_machine.after_transition to: :complete, do: :send_order_complete_telegram_alert_to_vendors, unless: :need_confirmation?
       state_machine.after_transition to: :complete, do: :send_order_complete_telegram_alert_to_store, unless: :need_confirmation?
 
-      state_machine.around_transition to: :complete, do: :unstock_inventory!
-
       state_machine.after_transition to: :complete, do: :send_transaction_email_to_user, if: :user_has_email?
       state_machine.after_transition to: :resumed, do: :precalculate_conversion
-      state_machine.around_transition to: :resumed, do: :unstock_inventory!
 
       state_machine.after_transition to: :canceled, do: :precalculate_conversion
-      state_machine.after_transition to: :canceled, do: :restock_inventory!
 
       scope :accepted, -> { where(request_state: 'accepted') }
 
@@ -73,39 +67,6 @@ module SpreeCmCommissioner
       end
     end
 
-    def unstock_inventory!
-      ActiveRecord::Base.transaction do
-        yield # Equal to block.call
-
-        # After the transition is complete, the following code will execute first before proceeding to other `after_transition` callbacks.
-        # This ensures that if `reserve_blocks!` or `unstock_inventory_in_redis!` fails, the state will be rolled back,
-        # and neither the `finalize!` method nor any notifications will be triggered.
-        # The payment will be reversed in vPago gem, and `Spree::Checkout::Complete` will be called, which checks `order.reload.complete?`.
-        # This is critical because if the order state is complete, the payment will be marked as paid.
-
-        reserve_blocks!
-        unstock_inventory_in_redis!
-
-        # We rollback only order state, and we keep payment state as it is.
-        # We implement payment in vPago gem, and it will be reversed in the gem.
-        # Some bank has api for refund, but some don't have the api to refund yet. So we keep the payment state as it is and refund manually.
-      end
-    rescue StandardError => e
-      CmAppLogger.log(
-        label: 'SpreeCmCommissioner::OrderStateMachine#reserve_inventory failed',
-        data: { order_id: id, error: e.message, type: e.class.name, backtrace: e.backtrace&.first(5)&.join("\n") }
-      )
-
-      raise e
-    end
-
-    def restock_inventory!
-      ActiveRecord::Base.transaction do
-        cancel_blocks!
-        restock_inventory_in_redis!
-      end
-    end
-
     def generate_bib_number
       line_items.find_each(&:generate_remaining_guests)
 

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

@@ -3,10 +3,12 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      delegate :subscribable?,
+      delegate :product_type,
+               :subscribable?,
                :allowed_upload_later?,
                :need_confirmation?, :need_confirmation,
                :allow_anonymous_booking,
+               :accommodation?, :service?, :ecommerce?,
                :allow_self_check_in,
                :allow_self_check_in?,
                :required_self_check_in_location,