spree_cm_commissioner 2.3.1 → 2.3.2.pre.pre4

data/app/mailers/spree/order_mailer_decorator.rb

@@ -12,14 +12,20 @@ module Spree
       return false if @order.email.blank?
 
       setup_tenant_and_store
+      if @tenant.present?
+        @name = @order.tenant.name
+        @logo = @order.tenant.active_vendor&.logo&.original_url
+        @brand_color = @order.tenant.preferred_brand_primary_color
+      end
       @product_type = @order.products.first&.product_type || 'accommodation'
 
       subject = build_subject(resend)
 
       mail(to: @order.email,
-           from: from_email_address, subject: subject,
+           from: from_email_address,
+           subject: subject,
            store_url: store_url
-      ) do |format|
+          ) do |format|
         format.html { render layout: 'spree_cm_commissioner/layouts/order_mailer' }
         format.text
       end
@@ -37,22 +43,17 @@ module Spree
 
     def setup_tenant_and_store
       @tenant = @order.tenant
-      if @tenant.present?
-        @brand_color = @tenant.preferences[:brand_primary_color]
-        @vendor_logo_url = @tenant.active_vendor&.logo&.original_url
-        @current_store = @tenant
-      else
-        @current_store = @order.store
-      end
+      @current_store = @order.store
     end
 
     def build_subject(resend)
       prefix = resend ? "[#{Spree.t(:resend).upcase}] " : ''
-      "#{prefix}#{@current_store&.name} Booking Confirmation ##{@order.number}"
+      store_name = @tenant.present? ? @tenant.name : @current_store&.name
+      "#{prefix}#{store_name} Booking Confirmation ##{@order.number}"
     end
 
     def store_url
-      @tenant.present? ? @current_store.host : @current_store.url
+      @tenant.present? ? @tenant.url : @current_store.url
     end
 
     def ticket_email(guest, email)

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

@@ -27,11 +27,6 @@ module SpreeCmCommissioner
       validates :boarding_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
       validates :drop_off_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
-      validates :pickup_lat, numericality: { greater_than_or_equal_to: -90, less_than_or_equal_to: 90 }, allow_nil: true
-      validates :pickup_lng, numericality: { greater_than_or_equal_to: -180, less_than_or_equal_to: 180 }, allow_nil: true
-      validates :drop_off_lat, numericality: { greater_than_or_equal_to: -90, less_than_or_equal_to: 90 }, allow_nil: true
-      validates :drop_off_lng, numericality: { greater_than_or_equal_to: -180, less_than_or_equal_to: 180 }, allow_nil: true
-
       validates :passenger_count, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
       # Groups LineItems by trip fields. Some fields can be null,
@@ -61,121 +56,71 @@ module SpreeCmCommissioner
     def boarding_trip_stop_id = private_metadata['boarding_trip_stop_id']&.to_i
     def drop_off_trip_stop_id = private_metadata['drop_off_trip_stop_id']&.to_i
 
-    def pickup_place_name = public_metadata['pickup_place_name']
-    def drop_off_place_name = public_metadata['drop_off_place_name']
-
-    def pickup_lat = public_metadata['pickup_lat']&.to_f
-    def pickup_lng = public_metadata['pickup_lng']&.to_f
-    def drop_off_lat = public_metadata['drop_off_lat']&.to_f
-    def drop_off_lng = public_metadata['drop_off_lng']&.to_f
     def passenger_count = public_metadata['passenger_count']&.to_i
-    def distance_km = public_metadata['distance_km']&.to_f
-    def ordered_points = public_metadata['ordered_points']
-    def base_km = public_metadata['base_km']&.to_f
-    def detour_pickup_km = public_metadata['detour_pickup_km']&.to_f
-    def detour_dropoff_km = public_metadata['detour_dropoff_km']&.to_f
-    def extra_pickup_km = public_metadata['extra_pickup_km']&.to_f
-    def extra_dropoff_km = public_metadata['extra_dropoff_km']&.to_f
-    def extra_pickup_charge_usd = public_metadata['extra_pickup_charge_usd']&.to_f
-    def extra_dropoff_charge_usd = public_metadata['extra_dropoff_charge_usd']&.to_f
-    def estimated_time_minutes = public_metadata['estimated_time_minutes']&.to_i
-    def pickup_oob_confirmed = private_metadata['pickup_oob_confirmed']
-    def drop_off_oob_confirmed = private_metadata['drop_off_oob_confirmed']
 
-    def direction=(value)
-      set_private_metadata_value('direction', value)
-    end
+    def pickup_map_place
+      pickup_hash = public_metadata&.dig('pickup_map_place')
+      return nil if pickup_hash.blank?
 
-    def trip_id=(value)
-      set_private_metadata_value('trip_id', value)
+      SpreeCmCommissioner::IntercityTaxi::MapPlace.from_hash(pickup_hash)
     end
 
-    def boarding_trip_stop_id=(value)
-      set_private_metadata_value('boarding_trip_stop_id', value)
-    end
+    def dropoff_map_place
+      dropoff_hash = public_metadata&.dig('dropoff_map_place')
+      return nil if dropoff_hash.blank?
 
-    def drop_off_trip_stop_id=(value)
-      set_private_metadata_value('drop_off_trip_stop_id', value)
+      SpreeCmCommissioner::IntercityTaxi::MapPlace.from_hash(dropoff_hash)
     end
 
-    def pickup_oob_confirmed=(value)
-      set_private_metadata_value('pickup_oob_confirmed', value)
+    def distance
+      distance_hash = public_metadata&.dig('distance')
+      return nil if distance_hash.blank?
+
+      SpreeCmCommissioner::IntercityTaxi::Distance.from_hash(distance_hash)
     end
 
-    def drop_off_oob_confirmed=(value)
-      set_private_metadata_value('drop_off_oob_confirmed', value)
+    def pickup_map_place=(value)
+      set_public_metadata_object('pickup_map_place', value)
     end
 
-    def pickup_place_name=(value)
-      set_public_metadata_value('pickup_place_name', value)
+    def dropoff_map_place=(value)
+      set_public_metadata_object('dropoff_map_place', value)
     end
 
-    def drop_off_place_name=(value)
-      set_public_metadata_value('drop_off_place_name', value)
+    def distance=(value)
+      set_public_metadata_object('distance', value)
     end
 
-    def pickup_lat=(value)
-      set_public_metadata_value('pickup_lat', value)
+    def direction=(value)
+      set_private_metadata_value('direction', value)
     end
 
-    def pickup_lng=(value)
-      set_public_metadata_value('pickup_lng', value)
+    def trip_id=(value)
+      set_private_metadata_value('trip_id', value)
     end
 
-    def drop_off_lat=(value)
-      set_public_metadata_value('drop_off_lat', value)
+    def boarding_trip_stop_id=(value)
+      set_private_metadata_value('boarding_trip_stop_id', value)
     end
 
-    def drop_off_lng=(value)
-      set_public_metadata_value('drop_off_lng', value)
+    def drop_off_trip_stop_id=(value)
+      set_private_metadata_value('drop_off_trip_stop_id', value)
     end
 
     def passenger_count=(value)
       set_public_metadata_value('passenger_count', value)
     end
 
-    def distance_km=(value)
-      set_public_metadata_value('distance_km', value)
-    end
-
-    def ordered_points=(value)
-      set_public_metadata_value('ordered_points', value)
-    end
-
-    def base_km=(value)
-      set_public_metadata_value('base_km', value)
-    end
-
-    def detour_pickup_km=(value)
-      set_public_metadata_value('detour_pickup_km', value)
-    end
-
-    def detour_dropoff_km=(value)
-      set_public_metadata_value('detour_dropoff_km', value)
-    end
-
-    def extra_pickup_km=(value)
-      set_public_metadata_value('extra_pickup_km', value)
-    end
-
-    def extra_dropoff_km=(value)
-      set_public_metadata_value('extra_dropoff_km', value)
-    end
-
-    def extra_pickup_charge_usd=(value)
-      set_public_metadata_value('extra_pickup_charge_usd', value)
-    end
-
-    def extra_dropoff_charge_usd=(value)
-      set_public_metadata_value('extra_dropoff_charge_usd', value)
-    end
+    private
 
-    def estimated_time_minutes=(value)
-      set_public_metadata_value('estimated_time_minutes', value)
+    def set_public_metadata_object(key, value)
+      if value.nil?
+        public_metadata.delete(key)
+      else
+        public_metadata[key] = value.to_h.stringify_keys
+      end
     end
 
-    private
-
     def set_public_metadata_value(key, value)
       if value.nil?
         public_metadata.delete(key)

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

@@ -50,9 +50,9 @@ module SpreeCmCommissioner
       private
 
       def tenant_link_or_default(tenant, default_link)
-        return default_link unless tenant.respond_to?(:host)
+        return default_link unless tenant.respond_to?(:formatted_url)
 
-        site = tenant.host.to_s.strip
+        site = tenant.formatted_url.to_s.strip
         site.presence || default_link
       rescue StandardError
         default_link

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

@@ -6,6 +6,7 @@ module SpreeCmCommissioner
       preference :sms_sender_id, :string
       preference :telegram_order_alert_chat_id, :string
       preference :telegram_order_request_alert_chat_id, :string
+      preference :telegram_new_vendor_alert_chat_id, :string
       preference :assetlinks, :string, default: ''
       preference :apple_app_site_association, :string, default: ''
     end

data/app/models/spree_cm_commissioner/adjustment_decorator.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module AdjustmentDecorator
     def self.prepended(base)
       base.belongs_to :payable, polymorphic: true, optional: true
-
+      base.scope :pricing_action, -> { where(source_type: 'SpreeCmCommissioner::PricingAction') }
       base.whitelisted_ransackable_attributes |= %w[payable_id]
     end
 

data/app/models/spree_cm_commissioner/calculators/extra_drop_off_distance.rb

@@ -0,0 +1,15 @@
+module SpreeCmCommissioner
+  module Calculators
+    class ExtraDropOffDistance < ExtraPickUpDistance
+      preference :base_price, :decimal, default: 0
+      preference :amount, :decimal, default: 0
+
+      def compute(line_item)
+        distance_km = line_item.distance.extra_dropoff_km
+        return nil if distance_km.nil?
+
+        preferred_base_price + (distance_km * preferred_amount)
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/calculators/extra_pick_up_distance.rb

@@ -0,0 +1,15 @@
+module SpreeCmCommissioner
+  module Calculators
+    class ExtraPickUpDistance < Spree::Calculator
+      preference :base_price, :decimal, default: 0
+      preference :amount, :decimal, default: 0
+
+      def compute(line_item)
+        distance_km = line_item.distance.extra_pickup_km
+        return nil if distance_km.nil?
+
+        preferred_base_price + (distance_km * preferred_amount)
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/place.rb

@@ -21,6 +21,13 @@ module SpreeCmCommissioner
     has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
     has_many :taxons, through: :taxon_places
 
+    has_many :routes_as_origin, class_name: 'SpreeCmCommissioner::Route', foreign_key: :origin_place_id
+    has_many :routes_as_destination, class_name: 'SpreeCmCommissioner::Route', foreign_key: :destination_place_id
+
+    # Scopes for route-based filtering
+    scope :with_routes_as_origin, -> { joins(:routes_as_origin).distinct }
+    scope :with_routes_as_destination, -> { joins(:routes_as_destination).distinct }
+
     def self.ransackable_attributes(auth_object = nil)
       super & %w[name code]
     end

data/app/models/spree_cm_commissioner/pricing_action.rb

@@ -0,0 +1,27 @@
+module SpreeCmCommissioner
+  class PricingAction < Base
+    belongs_to :pricing_rule_group, class_name: 'SpreeCmCommissioner::PricingRuleGroup'
+
+    has_one :calculator, as: :calculable, class_name: 'Spree::Calculator', dependent: :destroy
+    accepts_nested_attributes_for :calculator
+
+    def perform(line_item)
+      return if pricing_rule_group.pricing_rules.blank?
+
+      amount = calculator&.compute(line_item)
+
+      line_item.adjustments.create!(
+        amount: amount,
+        source: self,
+        adjustable: line_item,
+        order: line_item.order,
+        label: pricing_rule_group.pricing_model.name,
+        mandatory: true
+      )
+    end
+
+    def self.available_calculator_types
+      SpreeCmCommissioner::Calculators.constants.map(&:to_s)
+    end
+  end
+end

data/app/models/spree_cm_commissioner/pricing_model.rb

@@ -0,0 +1,18 @@
+module SpreeCmCommissioner
+  class PricingModel < Base
+    acts_as_list column: :position, scope: :vendor_id
+
+    belongs_to :vendor, class_name: 'Spree::Vendor'
+
+    has_many :pricing_model_variants, class_name: 'SpreeCmCommissioner::PricingModelVariant', dependent: :destroy
+    has_many :variants, through: :pricing_model_variants, class_name: 'Spree::Variant'
+    has_many :pricing_rule_groups, class_name: 'SpreeCmCommissioner::PricingRuleGroup', dependent: :destroy
+    has_many :pricing_rules, through: :pricing_rule_groups, class_name: 'SpreeCmCommissioner::PricingRule'
+
+    accepts_nested_attributes_for :pricing_rule_groups, allow_destroy: true
+
+    validates :name, presence: true, uniqueness: { scope: :vendor_id }
+
+    enum status: { draft: 0, active: 1, archived: 2 }
+  end
+end

data/app/models/spree_cm_commissioner/pricing_model_variant.rb

@@ -0,0 +1,6 @@
+module SpreeCmCommissioner
+  class PricingModelVariant < Base
+    belongs_to :pricing_model, class_name: 'SpreeCmCommissioner::PricingModel'
+    belongs_to :variant, class_name: 'Spree::Variant'
+  end
+end

data/app/models/spree_cm_commissioner/pricing_rule.rb

@@ -0,0 +1,15 @@
+module SpreeCmCommissioner
+  class PricingRule < Base
+    acts_as_list column: :position, scope: :pricing_rule_group_id
+
+    belongs_to :pricing_rule_group, class_name: 'SpreeCmCommissioner::PricingRuleGroup'
+
+    def eligible?(_line_item)
+      raise 'eligible? should be implemented in a sub-class of SpreeCmCommissioner::PricingRule'
+    end
+
+    def self.available_rule_types
+      SpreeCmCommissioner::PricingRules.constants.map(&:to_s)
+    end
+  end
+end

data/app/models/spree_cm_commissioner/pricing_rule_group.rb

@@ -0,0 +1,20 @@
+module SpreeCmCommissioner
+  class PricingRuleGroup < Base
+    MATCH_TYPES = %w[all any none].freeze
+
+    acts_as_list column: :position, scope: :pricing_model_id
+    store_accessor :private_metadata, :template_key
+    store_accessor :private_metadata, :match_type
+
+    belongs_to :pricing_model, class_name: 'SpreeCmCommissioner::PricingModel'
+    has_many :pricing_rules, class_name: 'SpreeCmCommissioner::PricingRule', dependent: :destroy
+    has_one :pricing_action, class_name: 'SpreeCmCommissioner::PricingAction', dependent: :destroy
+
+    accepts_nested_attributes_for :pricing_rules, allow_destroy: true
+    accepts_nested_attributes_for :pricing_action, allow_destroy: true
+
+    validates :name, presence: true
+
+    enum status: { draft: 0, active: 1, archived: 2 }
+  end
+end

data/app/models/spree_cm_commissioner/pricing_rules/extra_drop_off_distance.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module PricingRules
+    class ExtraDropOffDistance < ExtraPickUpDistance
+      def eligible?(line_item)
+        distance_km = line_item.distance&.extra_dropoff_km || 0
+        distance_km > min_distance.to_f
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/pricing_rules/extra_pick_up_distance.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  module PricingRules
+    class ExtraPickUpDistance < SpreeCmCommissioner::PricingRule
+      store_accessor :private_metadata, :min_distance
+
+      def eligible?(line_item)
+        distance_km = line_item.distance&.extra_pickup_km || 0
+        distance_km > min_distance.to_f
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/pricing_rules/nationality.rb

@@ -0,0 +1,35 @@
+module SpreeCmCommissioner
+  module PricingRules
+    class Nationality < SpreeCmCommissioner::PricingRule
+      RULE_TYPES = %w[all any none].freeze
+
+      store_accessor :private_metadata, :rule_type, :nationalities
+
+      def eligible?(line_item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+        return false if nationalities.blank? || line_item.guests.blank?
+
+        targets = Array.wrap(nationalities).map(&:downcase)
+        guest_nationalities = line_item.guests.map { |g| guest_nationality(g) }.compact
+
+        return false if guest_nationalities.empty?
+
+        case rule_type
+        when 'all'
+          guest_nationalities.all? { |n| targets.include?(n) }
+        when 'any'
+          guest_nationalities.any? { |n| targets.include?(n) }
+        when 'none'
+          guest_nationalities.none? { |n| targets.include?(n) }
+        else
+          false
+        end
+      end
+
+      private
+
+      def guest_nationality(guest)
+        guest.nationality&.name.to_s.downcase
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/product_completion_step.rb

@@ -4,6 +4,8 @@ module SpreeCmCommissioner
 
     belongs_to :product, class_name: '::Spree::Product', optional: false
 
+    has_one :banner, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::ProductCompletionStepBanner'
+
     # When a completion step is changed, regenerate completion steps for all line items
     # of the product so they reflect the latest step configuration.
     after_destroy :regenerate_line_items_completion_steps
@@ -28,7 +30,8 @@ module SpreeCmCommissioner
         action_label: action_label,
         action_url: action_url_for(line_item),
         completed_at: existing_data&.dig('completed_at'),
-        completed: completed?(line_item)
+        completed: completed?(line_item),
+        banner_url: banner.present? ? banner.original_url : nil
       }
     end
 

data/app/models/spree_cm_commissioner/product_completion_step_banner.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class ProductCompletionStepBanner < Asset
+    # 16x9 aspect ratio
+    def asset_styles
+      {
+        mini: '160x90>',
+        small: '480x270>',
+        medium: '960x540>'
+      }
+    end
+  end
+end

data/app/models/spree_cm_commissioner/product_completion_steps/social_entry_url.rb

@@ -5,6 +5,7 @@ module SpreeCmCommissioner
       # - https://t.me/ThePlatformKHBot?start={order.number}
       # - https://example.com?guest_name={guests[0].first_name}&phone={guests[0].phone_number}
       # - https://example.com?line_item_id={line_item.id}&quantity={line_item.quantity}
+      # - https://example.com?bill_address.first_name={bill_address.first_name}&bill_address.lastname={bill_address.lastname}
       preference :entry_point_link, :string
 
       # Allowed fields per object (excludes private/reference fields like *_id, *_by_id, metadata, etc.)
@@ -14,7 +15,11 @@ module SpreeCmCommissioner
         state
         email
         total
+        display_total
         item_total
+        display_item_total
+        adjustment_total
+        display_adjustment_total
         created_at
         completed_at
         token
@@ -23,12 +28,31 @@ module SpreeCmCommissioner
         currency
         item_count
         channel
+        special_instructions
+      ].freeze
+
+      BILL_ADDRESS_ALLOWED_FIELDS = %w[
+        first_name
+        last_name
+        full_name
+        address1
+        address2
+        city
+        zipcode
+        phone
+        state_name
+        alternative_phone
+        company
+        label
+        age
+        gender
       ].freeze
 
       LINE_ITEM_ALLOWED_FIELDS = %w[
         qr_data
         quantity
         price
+        display_price
         from_date
         to_date
         number
@@ -45,7 +69,6 @@ module SpreeCmCommissioner
         dob
         gender
         age
-        email
         phone_number
         address
         seat_number
@@ -60,9 +83,6 @@ module SpreeCmCommissioner
         expectation
         other_occupation
         other_organization
-        entry_type
-        upload_later
-        data_fill_stage_phase
         created_at
         updated_at
       ].freeze
@@ -72,32 +92,79 @@ module SpreeCmCommissioner
         return nil if preferred_entry_point_link.blank?
 
         url = preferred_entry_point_link.dup
+        url = replace_order_placeholders(url, line_item)
+        url = replace_bill_address_placeholders(url, line_item)
+        url = replace_line_item_placeholders(url, line_item)
+
+        replace_guest_placeholders(url, line_item)
+      end
+
+      def completed?(line_item)
+        return false if line_item.completion_steps.blank?
+
+        step_data = line_item.completion_steps.find { |step| step['position'].to_s == position.to_s }
+        step_data&.dig('completed_at').present?
+      end
+
+      # Returns a hash of all supported placeholder fields grouped by object type.
+      # Used by the admin UI to display available placeholders when configuring the entry_point_link template.
+      # Example usage in template: {order.number}, {bill_address.first_name}, {line_item.quantity}, {guests[0].email}
+      #
+      # @return [Hash] Hash with keys :order, :bill_address, :line_item, :guests
+      #                Each key maps to an array of allowed field names for that object type
+      def supported_fields
+        {
+          order: ORDER_ALLOWED_FIELDS,
+          bill_address: BILL_ADDRESS_ALLOWED_FIELDS,
+          line_item: LINE_ITEM_ALLOWED_FIELDS,
+          guests: GUEST_ALLOWED_FIELDS
+        }
+      end
+
+      private
 
-        # Replace order placeholders: {order.field_name}
-        line_item.order.attributes.each do |field, value|
-          url.gsub!("{order.#{field}}", value.to_s) if ORDER_ALLOWED_FIELDS.include?(field)
+      def replace_order_placeholders(url, line_item)
+        return url if line_item.order.blank?
+
+        ORDER_ALLOWED_FIELDS.each do |field|
+          value = line_item.order.public_send(field)
+          url.gsub!("{order.#{field}}", value.to_s) if value.present?
         end
 
-        # Replace line_item placeholders: {line_item.field_name}
-        line_item.attributes.each do |field, value|
-          url.gsub!("{line_item.#{field}}", value.to_s) if LINE_ITEM_ALLOWED_FIELDS.include?(field)
+        url
+      end
+
+      def replace_bill_address_placeholders(url, line_item)
+        return url if line_item.order&.bill_address.blank?
+
+        BILL_ADDRESS_ALLOWED_FIELDS.each do |field|
+          value = line_item.order.bill_address.public_send(field)
+          url.gsub!("{bill_address.#{field}}", value.to_s) if value.present?
         end
 
-        # Replace guest placeholders: {guests[index].field_name}
-        line_item.guests.each_with_index do |guest, index|
-          guest.attributes.each do |field, value|
-            url.gsub!("{guests[#{index}].#{field}}", value.to_s) if GUEST_ALLOWED_FIELDS.include?(field)
-          end
+        url
+      end
+
+      def replace_line_item_placeholders(url, line_item)
+        LINE_ITEM_ALLOWED_FIELDS.each do |field|
+          value = line_item.public_send(field)
+          url.gsub!("{line_item.#{field}}", value.to_s) if value.present?
         end
 
         url
       end
 
-      def completed?(line_item)
-        return false if line_item.completion_steps.blank?
+      def replace_guest_placeholders(url, line_item)
+        return url if line_item.guests.blank?
 
-        step_data = line_item.completion_steps.find { |step| step['position'].to_s == position.to_s }
-        step_data&.dig('completed_at').present?
+        line_item.guests.each_with_index do |guest, index|
+          GUEST_ALLOWED_FIELDS.each do |field|
+            value = guest.public_send(field)
+            url.gsub!("{guests[#{index}].#{field}}", value.to_s) if value.present?
+          end
+        end
+
+        url
       end
     end
   end