spree_cm_commissioner 2.3.1.pre.pre2 → 2.3.1

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="mb-3 card">
+      <div class="card mb-3">
         <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="mb-3 card">
+      <div class="card mb-3">
         <div class="card-header">
           <h5 class="mb-0"><%= Spree.t(:completion_settings) %></h5>
         </div>
@@ -49,32 +49,6 @@
           </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/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: 'example.com' %>
+      <%= f.text_field :host, required: true, class: 'form-control', placeholder: 'host' %>
       <% 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,7 +48,6 @@ 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,10 +509,6 @@ 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,10 +370,6 @@ km:
           attributes:
             exception_rules:
               invalid_json: "Format មិនត្រឹមត្រូវ"
-        spree_cm_commissioner/tenant:
-          attributes:
-            host:
-              format: "មិនអនុញ្ញាតឱ្យបញ្ចូលឈ្មោះដែលភ្ជាប់ជាមួយ (http:// ឬ https://)"
 
   mail:
     order_mailer:
@@ -473,64 +469,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,10 +163,6 @@ Spree::Core::Engine.add_routes do
         collection do
           post :update_positions
         end
-
-        member do
-          delete :remove_banner
-        end
       end
 
       resources :product_places do
@@ -550,18 +546,6 @@ Spree::Core::Engine.add_routes do
         resources :guest_card_classes
         resources :tickets, only: :index
 
-        resources :trip_places, only: :index
-        resources :trip_search, only: [:index]
-        resources :trips, only: %i[show]
-
-        namespace :intercity_taxi do
-          resources :draft_orders, only: [:create] do
-            collection do
-              patch :update
-            end
-          end
-        end
-
         resource :reset_passwords, only: [:update]
         resource :change_passwords, only: [:update]
         resource :user_contacts, only: [:update]

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.1.pre.pre2'.freeze
+  VERSION = '2.3.1'.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.pre.pre2
+  version: 2.3.1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-27 00:00:00.000000000 Z
+date: 2025-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1013,7 +1013,6 @@ files:
 - app/controllers/spree/api/v2/tenant/guests_controller.rb
 - app/controllers/spree/api/v2/tenant/homepage_sections_controller.rb
 - app/controllers/spree/api/v2/tenant/id_cards_controller.rb
-- app/controllers/spree/api/v2/tenant/intercity_taxi/draft_orders_controller.rb
 - app/controllers/spree/api/v2/tenant/line_items_controller.rb
 - app/controllers/spree/api/v2/tenant/notifications_controller.rb
 - app/controllers/spree/api/v2/tenant/order_histories_controller.rb
@@ -1026,9 +1025,6 @@ files:
 - app/controllers/spree/api/v2/tenant/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/tenant/taxons_controller.rb
 - app/controllers/spree/api/v2/tenant/tickets_controller.rb
-- app/controllers/spree/api/v2/tenant/trip_places_controller.rb
-- app/controllers/spree/api/v2/tenant/trip_search_controller.rb
-- app/controllers/spree/api/v2/tenant/trips_controller.rb
 - app/controllers/spree/api/v2/tenant/user_account_linkages_controller.rb
 - app/controllers/spree/api/v2/tenant/user_contacts_controller.rb
 - app/controllers/spree/api/v2/tenant/user_device_tokens_controller.rb
@@ -1488,7 +1484,6 @@ 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
@@ -2106,7 +2101,6 @@ 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
@@ -2856,7 +2850,6 @@ files:
 - db/migrate/20251009073040_add_lock_version_to_cm_routes.rb
 - db/migrate/20251009073929_add_lock_version_to_cm_vendor_routes.rb
 - db/migrate/20251113081853_add_index_to_spree_orders_updated_at.rb
-- db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -2929,7 +2922,6 @@ 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
@@ -3021,9 +3013,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1

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

@@ -1,41 +0,0 @@
-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

@@ -1,48 +0,0 @@
-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

@@ -1,103 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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/models/spree_cm_commissioner/product_completion_step_banner.rb

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

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

@@ -1,33 +0,0 @@
-<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/db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb

@@ -1,7 +0,0 @@
-class AddTenantIdToCmVendorPlaces < ActiveRecord::Migration[7.0]
-  def change
-    add_column :cm_vendor_places, :tenant_id, :integer, if_not_exists: true
-    add_index :cm_vendor_places, :tenant_id, if_not_exists: true
-    add_index :cm_vendor_places, %i[tenant_id vendor_id], if_not_exists: true, name: 'index_cm_vendor_places_on_tenant_and_vendor'
-  end
-end

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

@@ -1,7 +0,0 @@
-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