spree_cm_commissioner 2.3.1 → 2.3.2.pre.pre2

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

data/app/models/spree_cm_commissioner/tenant.rb

@@ -12,7 +12,10 @@ module SpreeCmCommissioner
                                       through: :vendors,
                                       source: :payment_methods
 
-    validates :host, uniqueness: true, presence: true
+    validates :host, presence: true, uniqueness: true,
+                     format: { without: %r{\Ahttps?://},
+                               message: :format
+                             }
 
     enum state: { enabled: 0, disabled: 1 }
 
@@ -22,6 +25,12 @@ module SpreeCmCommissioner
       vendors.where(state: :active).first
     end
 
+    def url
+      return if host.blank?
+
+      Rails.env.development? || Rails.env.test? ? "http://#{host}" : "https://#{host}"
+    end
+
     private
 
     def generate_slug

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -1,8 +1,9 @@
 module SpreeCmCommissioner
   class VendorPlace < Base
-    enum place_type: { location: 0, branch: 1, stop: 2 }
+    enum place_type: { venue: 0, branch: 1, stop: 2, location: 3 }
     acts_as_list scope: :vendor
 
+    belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
     belongs_to :location, class_name: 'SpreeCmCommissioner::VendorPlace', optional: true
@@ -16,6 +17,8 @@ module SpreeCmCommissioner
 
     accepts_nested_attributes_for :place, allow_destroy: true
 
+    before_save :set_tenant_id
+
     # include place when using these delegate to avoid N+1
     def display_name
       place&.name
@@ -28,5 +31,11 @@ module SpreeCmCommissioner
     def selected
       vendor.selected_place_references.include?(place&.reference)
     end
+
+    private
+
+    def set_tenant_id
+      self.tenant_id = vendor&.tenant_id
+    end
   end
 end

data/app/overrides/spree/admin/stores/_form/store_preferences.html.erb.deface

@@ -37,6 +37,15 @@
             <% end %>
           </div>
 
+          <!-- Telegram New Vendor Alert Chat ID -->
+          <div class="col-6">
+            <%= f.field_container :preferred_telegram_new_vendor_alert_chat_id do %>
+              <%= f.label :preferred_telegram_new_vendor_alert_chat_id, Spree.t(:telegram_new_vendor_alert_chat_id) %>
+              <%= f.text_field :preferred_telegram_new_vendor_alert_chat_id, class: 'form-control' %>
+              <%= f.error_message_on :preferred_telegram_new_vendor_alert_chat_id %>
+            <% end %>
+          </div>
+
           <!-- Assetlinks -->
           <div class="col-12">
             <%= f.field_container :preferred_assetlinks do %>

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -1,12 +1,13 @@
 module SpreeCmCommissioner
   class TripQuery
-    attr_reader :origin_id, :destination_id, :date, :vendor_id, :number_of_guests, :route_type, :params
+    attr_reader :origin_id, :destination_id, :date, :vendor_id, :tenant_id, :number_of_guests, :route_type, :params
 
-    def initialize(origin_id:, destination_id:, date:, route_type: nil, vendor_id: nil, number_of_guests: nil, params: {}) # rubocop:disable Metrics/ParameterLists
+    def initialize(origin_id:, destination_id:, date:, route_type: nil, vendor_id: nil, tenant_id: nil, number_of_guests: nil, params: {}) # rubocop:disable Metrics/ParameterLists
       @origin_id = origin_id
       @destination_id = destination_id
       @date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
       @vendor_id = vendor_id
+      @tenant_id = tenant_id
       @number_of_guests = number_of_guests || 1
       @route_type = route_type
       @params = params
@@ -36,8 +37,9 @@ module SpreeCmCommissioner
 
     def direct_trips
       result = trip_scope
-      result = result.where({ vendor_id: vendor_id }.compact)
+      result = result.where({ vendor_id: vendor_id }.compact) if vendor_id.present?
       result = result.where(route_type: route_type) if route_type.present?
+      result = result.where(spree_vendors: { tenant_id: tenant_id }) if tenant_id.present?
       paginate(result)
     end
 
@@ -56,20 +58,24 @@ module SpreeCmCommissioner
     private
 
     def trip_scope
-      SpreeCmCommissioner::Trip
-        .select(<<~SQL.squish)
-          cm_trips.*,
-          boarding.departure_time AS boarding_departure_time,
-          boarding.stop_place_id AS boarding_stop_id, boarding.stop_name AS boarding_stop_name,
-          drop_off.stop_name AS drop_off_stop_name, drop_off.stop_place_id AS drop_off_stop_id,
-          drop_off.arrival_time AS drop_off_arrival_time,
-          COALESCE(iv.quantity_available, 0) AS quantity_available,
-          COALESCE(iv.max_capacity, 0) AS max_capacity,
-          origin_places.name AS origin_place_name, dest_places.name AS destination_place_name,
-          prices.amount AS amount, prices.compare_at_amount AS compare_at_amount,
-          prices.currency AS currency
-        SQL
-        .includes(vendor: :logo, vehicle: :option_values)
+      scope = SpreeCmCommissioner::Trip
+              .select(<<~SQL.squish)
+                cm_trips.*,
+                boarding.departure_time AS boarding_departure_time,
+                boarding.stop_place_id AS boarding_stop_id, boarding.stop_name AS boarding_stop_name,
+                drop_off.stop_name AS drop_off_stop_name, drop_off.stop_place_id AS drop_off_stop_id,
+                drop_off.arrival_time AS drop_off_arrival_time,
+                COALESCE(iv.quantity_available, 0) AS quantity_available,
+                COALESCE(iv.max_capacity, 0) AS max_capacity,
+                origin_places.name AS origin_place_name, dest_places.name AS destination_place_name,
+                prices.amount AS amount, prices.compare_at_amount AS compare_at_amount,
+                prices.currency AS currency
+              SQL
+              .includes(vendor: :logo, vehicle: :option_values)
+
+      scope = scope.joins(:vendor) if tenant_id.present?
+
+      scope
         .joins(<<~SQL.squish)
           INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = cm_trips.id AND boarding.stop_type = 0
           INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.stop_type = 1

data/app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_schema.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  class IntercityTaxiDraftOrderSchema < ApplicationRequestSchema
+    params do
+      required(:trip_id).value(:integer)
+      required(:from_date).value(:date)
+      required(:to_date).value(:date)
+      required(:quantity).value(:integer)
+    end
+  end
+end

data/app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_update_schema.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  class IntercityTaxiDraftOrderUpdateSchema < ApplicationRequestSchema
+    params do
+      required(:order).hash do
+        # Rails nested attributes send line_items_attributes as hash with numeric string keys (e.g., "0", "1")
+        required(:line_items_attributes).hash
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module SpreeCmCommissioner
       class TripVehicleSerializer < BaseSerializer
         set_type :vehicle
 
-        attributes :id, :code, :vehicle_type
+        attributes :id, :code, :vehicle_type, :number_of_seats
 
         has_many :vehicle_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
         has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer

data/app/services/spree_cm_commissioner/intercity_taxi_order/create.rb

@@ -1,23 +1,23 @@
 module SpreeCmCommissioner
   module IntercityTaxiOrder
     class Create
-      attr_reader :trip_id, :from_date, :to_date, :user_id, :quantity
+      attr_reader :trip_id, :from_date, :to_date, :user, :quantity
 
-      def self.call(trip_id:, from_date:, to_date:, user_id: nil, quantity: 1)
+      def self.call(trip_id:, from_date:, to_date:, user: nil, quantity: 1)
         new(
           trip_id: trip_id,
           from_date: from_date,
           to_date: to_date,
-          user_id: user_id,
+          user: user,
           quantity: quantity
         ).call
       end
 
-      def initialize(trip_id:, from_date:, to_date:, user_id:, quantity:)
+      def initialize(trip_id:, from_date:, to_date:, user:, quantity:)
         @trip_id = trip_id
         @from_date = from_date
         @to_date = to_date
-        @user_id = user_id
+        @user = user
         @quantity = quantity.to_i <= 0 ? 1 : quantity.to_i
       end
 
@@ -29,7 +29,7 @@ module SpreeCmCommissioner
           variant = trip.product.variants.first
           raise ArgumentError, 'No variant found for trip' if variant.blank?
 
-          order = Spree::Order.new(state: 'cart', use_billing: true, user_id: user_id)
+          order = Spree::Order.new(state: 'cart', use_billing: true, user: user)
 
           line_item = order.line_items.new(
             variant_id: variant.id,
@@ -42,6 +42,7 @@ module SpreeCmCommissioner
           )
 
           build_guests_for!(line_item, quantity)
+          assign_saved_guests_to_line_item(line_item)
 
           order.save!
           order.update_with_updater!
@@ -62,6 +63,13 @@ module SpreeCmCommissioner
       def build_guests_for!(line_item, qty)
         Array.new(qty) { line_item.guests.new }
       end
+
+      def assign_saved_guests_to_line_item(line_item)
+        line_item.guests.each do |guest|
+          saved_guest = SpreeCmCommissioner::SavedGuest.new
+          guest.saved_guest = saved_guest
+        end
+      end
     end
   end
 end

data/app/services/spree_cm_commissioner/intercity_taxi_order/update.rb

@@ -1,79 +1,22 @@
 module SpreeCmCommissioner
   module IntercityTaxiOrder
     class Update
-      attr_reader :order_number, :params
+      attr_reader :order, :order_params
 
-      def self.call(order_number:, params:)
-        new(order_number: order_number, params: params).call
+      def self.call(order:, order_params:)
+        new(order: order, order_params: order_params).call
       end
 
-      def initialize(order_number:, params:)
-        @order_number = order_number
-        @params = ensure_parameters(params)
+      def initialize(order:, order_params:)
+        @order = order
+        @order_params = order_params
       end
 
       def call
-        order = Spree::Order.find_by!(number: order_number)
         order.update!(order_params)
 
-        create_billing_address_if_missing(order)
-
         order
       end
-
-      private
-
-      def ensure_parameters(params)
-        return params if params.is_a?(::ActionController::Parameters)
-
-        ::ActionController::Parameters.new(params)
-      end
-
-      def create_billing_address_if_missing(order)
-        return if order.bill_address.present?
-
-        SpreeCmCommissioner::BillingAddressCreator.call(order: order)
-      end
-
-      def order_params
-        params.require(:order).permit(
-          :intel_phone_number,
-          :email,
-          line_items_attributes: [
-            :id,
-            :pickup_place_name,
-            :drop_off_place_name,
-            :from_date,
-            :pickup_lat,
-            :pickup_lng,
-            :pickup_oob_confirmed,
-            :drop_off_lat,
-            :drop_off_lng,
-            :drop_off_oob_confirmed,
-            :distance_km,
-            :ordered_points,
-            :base_km,
-            :detour_pickup_km,
-            :detour_dropoff_km,
-            :extra_pickup_km,
-            :extra_dropoff_km,
-            :extra_pickup_charge_usd,
-            :extra_dropoff_charge_usd,
-            :estimated_time_minutes,
-            :remark,
-            :passenger_count,
-            { guests_attributes: %i[
-              id
-              first_name
-              last_name
-              gender
-              nationality_id
-              age
-            ]
-            }
-          ]
-        )
-      end
     end
   end
 end

data/app/views/shared/_asset_field.html.erb

@@ -3,6 +3,8 @@
 <%# :asset %>
 <%# :remove_url, optional %>
 <%# :classes, optional %>
+<%# :aspect_ratio, optional %>
+<%# :size_info, optional %>
 <%# :form %>
 <%# :required, optional, default: false %>
 
@@ -16,6 +18,17 @@
     class: 'rounded border mb-4 mw-100',
     style: 'max-height: 100px') if asset.present? && asset.attachment.present? %>
 
+  <% if defined?(aspect_ratio) || defined?(size_info) %>
+    <small class="mb-2 form-text text-muted d-block">
+      <% if defined?(aspect_ratio) && aspect_ratio.present? %>
+        <strong>Aspect Ratio:</strong> <%= aspect_ratio %><br>
+      <% end %>
+      <% if defined?(size_info) && size_info.present? %>
+        <strong>Recommended Size:</strong> <%= size_info %>
+      <% end %>
+    </small>
+  <% end %>
+
   <div data-hook="file" class="form-group">
     <%= form.label field, label || Spree.t(field) %>
     <%= form.file_field field, required: required %>

data/app/views/spree/admin/product_completion_steps/_form.html.erb

@@ -1,7 +1,7 @@
 <div data-hook="admin_product_completion_step_form_fields">
   <div data-hook="product_completion_step" class="row">
     <div class="col-12 col-md-6">
-      <div class="card mb-3">
+      <div class="mb-3 card">
         <div class="card-header">
           <h5 class="mb-0"><%= Spree.t(:settings) %></h5>
         </div>
@@ -32,7 +32,7 @@
     </div>
 
     <div class="col-12 col-md-6">
-      <div class="card mb-3">
+      <div class="mb-3 card">
         <div class="card-header">
           <h5 class="mb-0"><%= Spree.t(:completion_settings) %></h5>
         </div>
@@ -49,6 +49,32 @@
           </div>
         </div>
       </div>
+
+      <div class="mb-3 card">
+        <div class="card-header">
+          <h5 class="mb-0"><%= Spree.t(:banner) %></h5>
+        </div>
+        <div class="card-body">
+          <%= render 'shared/asset_field',
+            field: :banner,
+            label: Spree.t(:banner),
+            asset: @object.banner,
+            remove_url: (@object.banner.present? ? remove_banner_admin_product_product_completion_step_url(@object.product, @object) : nil),
+            form: f,
+            size_info: 'Min: 480x270, Max: 960x540',
+            aspect_ratio: '16x9',
+            classes: ['col-md-12']
+          %>
+        </div>
+      </div>
     </div>
   </div>
+
+  <% if @object.is_a?(SpreeCmCommissioner::ProductCompletionSteps::SocialEntryUrl) %>
+    <div class="row mt-3">
+      <div class="col-12">
+        <%= render 'supported_fields' %>
+      </div>
+    </div>
+  <% end %>
 </div>

data/app/views/spree/admin/product_completion_steps/_supported_fields.html.erb

@@ -0,0 +1,33 @@
+<div class="mb-3 card">
+  <div class="card-header">
+    <h5 class="mb-0">Supported Placeholder Fields</h5>
+  </div>
+  <div class="card-body">
+    <p class="text-muted mb-3">Use these placeholders in your entry point link template:</p>
+
+    <% if @object.is_a?(SpreeCmCommissioner::ProductCompletionSteps::SocialEntryUrl) && @object.supported_fields.present? %>
+      <% @object.supported_fields.each do |category, fields| %>
+        <div class="mb-3">
+          <h6 class="fw-bold text-capitalize">
+            <%= category.to_s.humanize %>
+            <span class="badge bg-secondary"><%= fields.count %></span>
+          </h6>
+          <div class="field-list">
+            <% fields.each do |field| %>
+              <div class="field-item d-inline-block me-2 mb-2">
+                <code class="bg-light p-2 rounded">
+                  {<%= category %><%= category == :guests ? '[index]' : '' %>.<%=field %>}
+                </code>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+
+      <div class="alert alert-info mt-3">
+        <strong>Example:</strong><br>
+        <code>https://example.com?order={order.number}&name={bill_address.first_name}&guest={guests[0].first_name}</code>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/tenants/_form.html.erb

@@ -36,7 +36,7 @@
   <div class="col-12">
     <%= f.field_container :host do %>
       <%= f.label :host, raw(Spree.t(:host) + required_span_tag) %>
-      <%= f.text_field :host, required: true, class: 'form-control', placeholder: 'host' %>
+      <%= f.text_field :host, required: true, class: 'form-control', placeholder: 'example.com' %>
       <% if f.object.errors[:host].any? %>
         <div class="error text-danger"><%= f.object.errors[:host].join(', ') %></div>
       <% end %>

data/config/initializers/spree_permitted_attributes.rb

@@ -48,6 +48,7 @@ module Spree
       :preferred_sms_sender_id,
       :preferred_telegram_order_alert_chat_id,
       :preferred_telegram_order_request_alert_chat_id,
+      :preferred_telegram_new_vendor_alert_chat_id,
       :preferred_assetlinks,
       :preferred_apple_app_site_association,
       { default_notification_image_attributes: {} },

data/config/locales/en.yml

@@ -509,6 +509,10 @@ en:
           attributes:
             place_id:
               taken: "has already existed with this place type"
+        spree_cm_commissioner/tenant:
+          attributes:
+            host:
+              format: "must not include protocol (http:// or https://)"
 
   mail:
     order_mailer: