spree_cm_commissioner 2.3.0.pre.pre21 → 2.3.1.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfed0f91fdd9c96b14fdd179bfca7cdce626d8268468b3d6a22b7622c8aee3f5
-  data.tar.gz: b2e6802c655db5e83abb39e20f3478b0068a79a847744e1a812b7f22191ac345
+  metadata.gz: 7791d1c6474375315937bc020c5bb5274abecbddc5e9b9f5df5a73e53576d626
+  data.tar.gz: 03c0f3ccc698d12697c135f4daaab5718b1a72117288de9270069397660d62a5
 SHA512:
-  metadata.gz: 7cdfd95dbabf86d3201d45b5ba89987d572850707f652a4b55432c08b4245604dbb4f3b8b9edf62661d3c78c7b65b8c0cddfffb00a331bb1f4721c56ce034f97
-  data.tar.gz: c7c061df9dc72b3c0fc8cc49b01fbb424b65f75a67bca9586c743093a20508dc6a7be1adaa219d1d1ca32c0cef86c3976ae88abae5d19241f257b6b3e2098cd1
+  metadata.gz: 5cb82c98aac134ebedbdb29c1daf2cc22035ac4e5856c548b22015ffb9a574e6873e897407b8043d899164a9a1ffa941ec04fc25df2263e255e5fd1ad362531c
+  data.tar.gz: 4ff0e66a420d2e7f589f2c63d55ca18acc0065aa015033b3917a5dbf603440df4f8a56a32834a02135f5e216a2e5f7d82e8e78f5c6d1df571dc7b261ddb90a79

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.3.0.pre.pre21)
+    spree_cm_commissioner (2.3.1.pre.pre1)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

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

@@ -4,6 +4,7 @@ module Spree
       belongs_to 'spree/product', find_by: :slug
 
       before_action :load_step_types, if: :member_action?
+      before_action :build_assets, only: %i[create update]
 
       def load_step_types
         @step_types = [
@@ -14,10 +15,13 @@ module Spree
 
       # override
       def permitted_resource_params
+        return @permitted_resource_params if defined?(@permitted_resource_params)
+
         key = ActiveModel::Naming.param_key(@object)
         permit_keys = params.require(key).keys
 
-        params.require(key).permit(permit_keys)
+        @permitted_resource_params = params.require(key).permit(permit_keys)
+        @permitted_resource_params
       end
 
       # @overrided
@@ -54,6 +58,18 @@ module Spree
       def location_after_save
         edit_object_url(@object)
       end
+
+      def remove_banner
+        @object.banner&.destroy
+        flash[:success] = Spree.t(:successfully_removed)
+        redirect_to edit_object_url(@object)
+      end
+
+      private
+
+      def build_assets
+        @object.build_banner(attachment: permitted_resource_params.delete(:banner)) if permitted_resource_params[:banner].present?
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class TenantsController < Spree::Admin::ResourceController
-      before_action :load_vector_icons, only: %i[new edit]
+      before_action :load_vector_icons, only: %i[new edit create update]
 
       # override
       def collection

data/app/controllers/spree/api/v2/storefront/intercity_taxi/draft_orders_controller.rb

@@ -20,7 +20,6 @@ module Spree
 
             def update
               order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
-                order_number: params[:id],
                 params: params
               )
 

data/app/controllers/spree/api/v2/tenant/intercity_taxi/draft_orders_controller.rb

@@ -0,0 +1,41 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        module IntercityTaxi
+          class DraftOrdersController < BaseController
+            def create
+              order = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
+                trip_id: params[:trip_id],
+                from_date: params[:from_date],
+                to_date: params[:to_date],
+                user_id: params[:user_id],
+                quantity: params[:quantity]
+              )
+
+              render_serialized_payload { serialize_resource(order) }
+            rescue StandardError => e
+              render_error_payload(e.message)
+            end
+
+            def update
+              order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
+                params: params
+              )
+
+              render_serialized_payload { serialize_resource(order) }
+            rescue StandardError => e
+              render_error_payload(e.message)
+            end
+
+            private
+
+            def resource_serializer
+              SpreeCmCommissioner::V2::Storefront::IntercityTaxiCartSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class TripPlacesController < BaseController
+          def index
+            render_serialized_payload do
+              serialize_collection(paginated_collection)
+            end
+          end
+
+          private
+
+          def paginated_collection
+            collection.page(params[:page]).per(params[:per_page])
+          end
+
+          def collection
+            @collection ||= begin
+              base_scope = scope
+
+              if params[:q].present?
+                @search = base_scope.ransack(params[:q])
+                @search.result
+              else
+                base_scope
+              end
+            end
+          end
+
+          def scope
+            model_class.joins(:location_vendor_places)
+                       .where(location_vendor_places: { tenant_id: @tenant.id })
+                       .distinct
+          end
+
+          def model_class
+            SpreeCmCommissioner::Place
+          end
+
+          def collection_serializer
+            SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,103 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class TripSearchController < BaseController
+          CACHE_EXPIRES_IN = 5.minutes
+
+          def index
+            render_serialized_payload do
+              Rails.cache.fetch(collection_cache_key, collection_cache_opts) do
+                trips = SpreeCmCommissioner::TripQuery.new(
+                  origin_id: params[:origin_id],
+                  destination_id: params[:destination_id],
+                  date: params[:date],
+                  route_type: params[:route_type],
+                  number_of_guests: params[:number_of_guests],
+                  tenant_id: @tenant.id,
+                  params: params
+                ).call
+
+                serialize_collection(trips)
+              end
+            end
+          end
+
+          private
+
+          # override from ContentCacheable
+          def max_age
+            CACHE_EXPIRES_IN.to_i
+          end
+
+          # override
+          def collection_cache_key
+            cache_key_parts = [
+              'trip_search',
+              @tenant.id,
+              params[:origin_id],
+              params[:destination_id],
+              params[:date],
+              params[:route_type],
+              params[:number_of_guests],
+              resource_includes&.sort&.join(','),
+              sparse_fields&.sort&.join(','),
+              serializer_params.to_json,
+              params[:page]&.to_s&.strip,
+              params[:per_page]&.to_s&.strip
+            ].compact.join('-')
+
+            Digest::MD5.hexdigest(cache_key_parts)
+          end
+
+          # override
+          def collection_cache_opts
+            {
+              namespace: Spree::Api::Config[:api_v2_collection_cache_namespace],
+              expires_in: CACHE_EXPIRES_IN
+            }
+          end
+
+          # override
+          def default_resource_includes
+            [
+              'trips.vendor',
+              'trips.vendor.logo',
+              'trips.vehicle',
+              'trips.vehicle.vehicle_photos',
+              'trips.amenities'
+            ]
+          end
+
+          def serialize_collection(collection)
+            serialized_data = SpreeCmCommissioner::V2::Storefront::TripQueryResultSerializer.new(
+              collection,
+              include: default_resource_includes,
+              params: serializer_params
+            ).serializable_hash
+            serialized_data[:meta] = {
+              count: collection.size,
+              total_count: collection.respond_to?(:total_count) ? collection.total_count : collection.size,
+              current_page: collection.respond_to?(:current_page) ? collection.current_page : 1,
+              per_page: collection.respond_to?(:limit_value) ? collection.limit_value : collection.size,
+              pages: collection.respond_to?(:total_pages) ? collection.total_pages : 1,
+              next_page: collection.respond_to?(:next_page) ? collection.next_page : nil,
+              prev_page: collection.respond_to?(:prev_page) ? collection.prev_page : nil
+            }
+            serialized_data
+          end
+
+          # override
+          def serializer_params
+            params.permit(:include).to_hash
+          end
+
+          # override
+          def required_schema
+            SpreeCmCommissioner::TripSearchRequestSchema
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class TripsController < BaseController
+          def show
+            resource = scope.find(params[:id])
+
+            render_serialized_payload do
+              serialize_resource(resource)
+            end
+          end
+
+          private
+
+          def scope
+            model_class.joins(:vendor)
+                       .where(spree_vendors: { tenant_id: @tenant.id })
+          end
+
+          def model_class
+            SpreeCmCommissioner::Trip
+          end
+
+          def resource_serializer
+            SpreeCmCommissioner::V2::Storefront::TripSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/create_ticket.rb

@@ -48,6 +48,8 @@ module SpreeCmCommissioner
         name: 'ticket-type',
         presentation: 'Ticket Type'
       )
+      # auto assign the option type to the ticket
+      @ticket.option_types << @option_type unless @ticket.option_types.include?(@option_type)
 
       @option_value = Spree::OptionValue.find_or_create_by!(
         name: @ticket.name,

data/app/interactors/spree_cm_commissioner/host_matcher.rb

@@ -22,7 +22,7 @@ module SpreeCmCommissioner
     end
 
     def find_tenant(normalized_host)
-      SpreeCmCommissioner::Tenant.find_by(host: "https://#{normalized_host}")
+      SpreeCmCommissioner::Tenant.find_by(host: normalized_host)
     end
   end
 end

data/app/interactors/spree_cm_commissioner/vendor_creation_telegram_alert_sender.rb

@@ -22,7 +22,7 @@ module SpreeCmCommissioner
     end
 
     def admin_chat_id
-      ENV.fetch('EXCEPTION_NOTIFIER_TELEGRAM_CHANNEL_ID', nil)
+      Spree::Store.default&.preferred_telegram_new_vendor_alert_chat_id
     end
   end
 end

data/app/mailers/spree/order_mailer_decorator.rb

@@ -37,22 +37,21 @@ 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
+      return if @tenant.blank?
+
+      @brand_color = @tenant.preferences[:brand_primary_color]
+      @vendor_logo_url = @tenant.active_vendor&.logo&.original_url
     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/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?(:url)
 
-        site = tenant.host.to_s.strip
+        site = tenant.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/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

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 %>