spree_cm_commissioner 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87608fab14f473c498987cb8ecf0793926b031a1368d9a1d03f05fc3bf03e819
-  data.tar.gz: 9472eaf172e1346757684e9c2b69cec671053927d1a99739f13d0eea1fcb17ce
+  metadata.gz: f69009264c3f351003ddd4885f403db68bc0a589a9e28123188a26bdd382b3d6
+  data.tar.gz: fea37b83621c4eb39ee2936ae4d72c377ee6d0767fb240be01c2de82e63d4c83
 SHA512:
-  metadata.gz: b3da7fbad39575ce43d6b39e088c24ec878095d88a6652e4dd07d87ae0b474403ef368dba1233e0a2d3a2084a03c45d1932c20eee21ee6a65f99e0cb8e4d1e1d
-  data.tar.gz: 92f4f8a8a446c765568b23b8a1183f7f2f83a499a608a59a34ab315314bf4ea256fbb8264da0da2e80ad0dab527a9fed4c8498a9c77342e186f61386dfad735b
+  metadata.gz: 8530a8855d325ffae9223d3ed705be0f445bd5ce01c2479ef809f783804af5d4b90cd716a5c10076cbad561f6d57c03becf4d8ccb2e7e33bd57144c29bd1ff5e
+  data.tar.gz: 9d2bada64c5ac4701bb9f18d233e8948e0e8b6b9cf6fd0e923157007bd06cde7ef79b13ffa0476aad2a3ec955a268e66249b3f49097fce93136a61dfa0856f4f

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.3.1)
+    spree_cm_commissioner (2.3.2)
       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/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,6 +1,6 @@
 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 :vendor, class_name: 'Spree::Vendor', optional: false

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/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/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:

data/config/locales/km.yml

@@ -370,6 +370,10 @@ km:
           attributes:
             exception_rules:
               invalid_json: "Format មិនត្រឹមត្រូវ"
+        spree_cm_commissioner/tenant:
+          attributes:
+            host:
+              format: "មិនអនុញ្ញាតឱ្យបញ្ចូលឈ្មោះដែលភ្ជាប់ជាមួយ (http:// ឬ https://)"
 
   mail:
     order_mailer:
@@ -469,64 +473,64 @@ km:
 
   blazer:
     columns:
-      'No.': "លេខរៀង"
-      'Reservation No.': "លេខកក់"
-      'Direction': "ទិសដៅ"
-      'Vehicle type': "ប្រភេទយានយន្ត"
-      'Seller': "អ្នកលក់"
-      'Paid to': "បង់ទៅ"
-      'Branch': "សាខា"
-      'Gateway': "ច្រកទ្វារ"
-      'Departure': "ចេញដំណើរ"
-      'Issued': "ចេញឲ្យ"
-      'Paid': "បានបង់"
-      '# of seats': "ចំនួនកៅអី"
-      'Source': "ប្រភព"
-      'Status': "ស្ថានភាព"
-      'Fare': "តម្លៃឈ្នួល"
-      'Discount': "ការបញ្ចុះតម្លៃ"
-      'Commission': "កម្រៃជើងសារ"
-      'Amount': "ចំនួនទឹកប្រាក់"
-      'Metric': "រង្វាស់"
-      'Value': "តម្លៃ"
-      'Group': "ក្រុម"
-      'Orders': "ការបញ្ជាទិញ"
-      'Passengers': "អ្នកដំណើរ"
-      'Total fare': "តម្លៃឈ្នួលសរុប"
-      'Total discount': "ការបញ្ចុះតម្លៃសរុប"
-      'Total commission': "កម្រៃជើងសារសរុប"
-      'Total amount': "ចំនួនទឹកប្រាក់សរុប"
-      'Trip ID': "លេខសម្គាល់ជើងដំណើរ"
-      'Route': "ផ្លូវ"
-      'Origin': "ទីតាំងដើម"
-      'Destination': "ទីតាំងគោលដៅ"
-      'Departure Time': "ម៉ោងចេញដំណើរ"
-      'Vehicle': "យានយន្ត"
-      'Total Seats': "ចំនួនកៅអីសរុប"
-      'Bookings': "ការកក់"
-      'Seats Sold': "កៅអីលក់បាន"
-      'Occupancy %': "ភាគរយនៃការកាន់កាប់"
-      'Total Revenue': "ចំណូលសរុប"
-      'Avg Ticket Price': "តម្លៃសំបុត្រជាមធ្យម"
-      'Date': "កាលបរិច្ឆេទ"
-      'Time': "ម៉ោង"
-      'From': "ពី"
-      'To': "ទៅ"
-      'Capacity': "ចំណុះ"
-      'Available': "ទំនេរ"
-      'Filled %': "ភាគរយនៃការបំពេញ"
-      'Vehicle Code': "លេខកូដយានយន្ត"
-      'Plate': "ស្លាកលេខ"
-      'Type': "ប្រភេទ"
-      'Total Trips': "ចំនួនជើងដំណើរ​សរុប"
-      'Trips with Bookings': "ជើងដំណើរ​មានការកក់"
-      'Total Bookings': "ចំនួនការកក់​សរុប"
-      'Total Passengers': "ចំនួនអ្នកដំណើរ​សរុប"
-      'Avg Occupancy %': "ភាគរយនៃការកាន់កាប់​ជាមធ្យម"
-      'Lead Time': "រយៈពេលនៃការរង់ចាំ"
-      'Revenue': "ចំណូល"
-      'Avg Days in Advance': "ចំនួនថ្ងៃជាមធ្យមមុន"
-      'Current Period': "រយៈពេលបច្ចុប្បន្ន"
-      'Previous Period': "រយៈពេលមុន"
-      'Change': "បំលាស់ប្តូរ"
-      'Change %': "ភាគរយនៃបំលាស់ប្តូរ"
+      "No.": "លេខរៀង"
+      "Reservation No.": "លេខកក់"
+      "Direction": "ទិសដៅ"
+      "Vehicle type": "ប្រភេទយានយន្ត"
+      "Seller": "អ្នកលក់"
+      "Paid to": "បង់ទៅ"
+      "Branch": "សាខា"
+      "Gateway": "ច្រកទ្វារ"
+      "Departure": "ចេញដំណើរ"
+      "Issued": "ចេញឲ្យ"
+      "Paid": "បានបង់"
+      "# of seats": "ចំនួនកៅអី"
+      "Source": "ប្រភព"
+      "Status": "ស្ថានភាព"
+      "Fare": "តម្លៃឈ្នួល"
+      "Discount": "ការបញ្ចុះតម្លៃ"
+      "Commission": "កម្រៃជើងសារ"
+      "Amount": "ចំនួនទឹកប្រាក់"
+      "Metric": "រង្វាស់"
+      "Value": "តម្លៃ"
+      "Group": "ក្រុម"
+      "Orders": "ការបញ្ជាទិញ"
+      "Passengers": "អ្នកដំណើរ"
+      "Total fare": "តម្លៃឈ្នួលសរុប"
+      "Total discount": "ការបញ្ចុះតម្លៃសរុប"
+      "Total commission": "កម្រៃជើងសារសរុប"
+      "Total amount": "ចំនួនទឹកប្រាក់សរុប"
+      "Trip ID": "លេខសម្គាល់ជើងដំណើរ"
+      "Route": "ផ្លូវ"
+      "Origin": "ទីតាំងដើម"
+      "Destination": "ទីតាំងគោលដៅ"
+      "Departure Time": "ម៉ោងចេញដំណើរ"
+      "Vehicle": "យានយន្ត"
+      "Total Seats": "ចំនួនកៅអីសរុប"
+      "Bookings": "ការកក់"
+      "Seats Sold": "កៅអីលក់បាន"
+      "Occupancy %": "ភាគរយនៃការកាន់កាប់"
+      "Total Revenue": "ចំណូលសរុប"
+      "Avg Ticket Price": "តម្លៃសំបុត្រជាមធ្យម"
+      "Date": "កាលបរិច្ឆេទ"
+      "Time": "ម៉ោង"
+      "From": "ពី"
+      "To": "ទៅ"
+      "Capacity": "ចំណុះ"
+      "Available": "ទំនេរ"
+      "Filled %": "ភាគរយនៃការបំពេញ"
+      "Vehicle Code": "លេខកូដយានយន្ត"
+      "Plate": "ស្លាកលេខ"
+      "Type": "ប្រភេទ"
+      "Total Trips": "ចំនួនជើងដំណើរ​សរុប"
+      "Trips with Bookings": "ជើងដំណើរ​មានការកក់"
+      "Total Bookings": "ចំនួនការកក់​សរុប"
+      "Total Passengers": "ចំនួនអ្នកដំណើរ​សរុប"
+      "Avg Occupancy %": "ភាគរយនៃការកាន់កាប់​ជាមធ្យម"
+      "Lead Time": "រយៈពេលនៃការរង់ចាំ"
+      "Revenue": "ចំណូល"
+      "Avg Days in Advance": "ចំនួនថ្ងៃជាមធ្យមមុន"
+      "Current Period": "រយៈពេលបច្ចុប្បន្ន"
+      "Previous Period": "រយៈពេលមុន"
+      "Change": "បំលាស់ប្តូរ"
+      "Change %": "ភាគរយនៃបំលាស់ប្តូរ"

data/config/routes.rb

@@ -163,6 +163,10 @@ Spree::Core::Engine.add_routes do
         collection do
           post :update_positions
         end
+
+        member do
+          delete :remove_banner
+        end
       end
 
       resources :product_places do

data/lib/spree_cm_commissioner/test_helper/factories/product_completion_step_banner_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :cm_product_completion_step_banner, class: SpreeCmCommissioner::ProductCompletionStepBanner do
+    viewable_type { 'SpreeCmCommissioner::ProductCompletionStep' }
+    viewable_id { nil }
+    attachment { Rack::Test::UploadedFile.new(Spree::Core::Engine.root.join('spec', 'fixtures', 'files', 'icon_256x256.png'), 'image/*') }
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.3.2'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-14 00:00:00.000000000 Z
+date: 2025-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1484,6 +1484,7 @@ files:
 - app/models/spree_cm_commissioner/place.rb
 - app/models/spree_cm_commissioner/price_decorator.rb
 - app/models/spree_cm_commissioner/product_completion_step.rb
+- app/models/spree_cm_commissioner/product_completion_step_banner.rb
 - app/models/spree_cm_commissioner/product_completion_steps/chatrace_telegram.rb
 - app/models/spree_cm_commissioner/product_completion_steps/social_entry_url.rb
 - app/models/spree_cm_commissioner/product_decorator.rb
@@ -2101,6 +2102,7 @@ files:
 - app/views/spree/admin/orders/notifications.html.erb
 - app/views/spree/admin/product_commissions/index.html.erb
 - app/views/spree/admin/product_completion_steps/_form.html.erb
+- app/views/spree/admin/product_completion_steps/_supported_fields.html.erb
 - app/views/spree/admin/product_completion_steps/edit.html.erb
 - app/views/spree/admin/product_completion_steps/index.html.erb
 - app/views/spree/admin/product_completion_steps/new.html.erb
@@ -2922,6 +2924,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/permission.rb
 - lib/spree_cm_commissioner/test_helper/factories/pin_code_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/place_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/product_completion_step_banner_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/product_completion_step_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/product_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/products_taxons_factory.rb