spree_cm_commissioner 2.5.0.pre.pre7 → 2.5.0.pre.pre8

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -5,7 +5,6 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::VariantOptionsConcern
       base.include SpreeCmCommissioner::KycBitwise
-      base.include SpreeCmCommissioner::Integrations::IntegrationMappable
 
       base.after_commit :update_vendor_price
       base.validate     :validate_option_types
@@ -17,6 +16,10 @@ module SpreeCmCommissioner
       base.has_one :vehicle, class_name: 'SpreeCmCommissioner::Vehicle', through: :trip
 
       base.has_many :taxons, class_name: 'Spree::Taxon', through: :product
+      base.has_many :visible_option_values, lambda {
+                                              joins(:option_type).where(spree_option_types: { hidden: false })
+                                            }, through: :option_value_variants, source: :option_value
+
       base.has_many :video_on_demands, class_name: 'SpreeCmCommissioner::VideoOnDemand', dependent: :destroy
       base.has_many :complete_line_items, -> { complete }, class_name: 'Spree::LineItem'
 
@@ -39,12 +42,6 @@ module SpreeCmCommissioner
       base.before_validation -> { self.product_type = product.product_type }, if: -> { product_type.nil? }
     end
 
-    # Override variant.rb to return cached formatted options text, avoiding repeated database queries.
-    # Falls back to database queries & computing the format if preload data is unavailable.
-    def options_text
-      public_metadata[:preload_options_text].presence || Spree::Variants::VisibleOptionsPresenter.new(self).to_sentence
-    end
-
     def delivery_required?
       delivery_option == 'delivery'
     end

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -9,7 +9,6 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::VendorPreference
       base.include SpreeCmCommissioner::TenantUpdatable
       base.include SpreeCmCommissioner::StoreMetadata
-      base.include SpreeCmCommissioner::Integrations::IntegrationMappable
 
       base.attr_accessor :service_availabilities
 
@@ -40,9 +39,6 @@ module SpreeCmCommissioner
       base.has_many :vendor_kind_option_values,
                     through: :option_value_vendors, source: :option_value
 
-      # currently a vendor can have only one integration, but in future it can be many.
-      base.has_one :integration, class_name: 'SpreeCmCommissioner::Integration', dependent: :destroy, inverse_of: :vendor
-
       base.has_many :branches, -> { branch }, class_name: 'SpreeCmCommissioner::VendorPlace'
       base.has_many :stops, -> { stop }, class_name: 'SpreeCmCommissioner::VendorPlace'
       base.has_many :locations, -> { location }, class_name: 'SpreeCmCommissioner::VendorPlace'

data/app/presenters/spree/variants/{visible_options_presenter.rb → visable_options_presenter.rb}

@@ -1,9 +1,11 @@
 module Spree
   module Variants
-    class VisibleOptionsPresenter < OptionsPresenter
+    class VisableOptionsPresenter < OptionsPresenter
+      delegate :visible_option_values, to: :variant
+
       # override
       def to_sentence
-        options = variant.option_values.reject { |ov| ov.option_type.hidden? }
+        options = visible_option_values
         options = sort_options(options)
         options = present_options(options)
 

data/app/request_schemas/spree_cm_commissioner/popular_route_places_request_schema.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class PopularRoutePlacesRequestSchema < ApplicationRequestSchema
+    params do
+      optional(:query).maybe(:string)
+      optional(:route_type).maybe(:string)
+    end
+    route_types = SpreeCmCommissioner::RouteType::ROUTE_TYPES.map(&:to_s)
+    rule(:route_type) do
+      key.failure("Invalid route_type. Use #{route_types}") if value.present? && route_types.exclude?(value)
+    end
+  end
+end

data/app/request_schemas/spree_cm_commissioner/route_places_request_schema.rb

@@ -6,6 +6,11 @@ module SpreeCmCommissioner
       optional(:place_id).maybe(:integer)
       optional(:route_type).maybe(:string)
     end
+    route_types = SpreeCmCommissioner::RouteType::ROUTE_TYPES.map(&:to_s)
+
+    rule(:route_type) do
+      key.failure("Invalid route_type. Use #{route_types}") if value.present? && route_types.exclude?(value)
+    end
 
     rule(:place_type) do
       key.failure('Invalid place_type. Use origin or destination') unless %w[origin destination].include?(value)

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

@@ -74,6 +74,8 @@
       <%= content_tag :div, nil, style: "background-color: #{@object.preferred_brand_primary_color}; width: 60px; height: 60px; border: 1px solid #ccc; box-sizing: border-box; display: block;" %>
     </div>
   </div>
+
+  <!-- Assetlinks Field -->
   <div class="col-12">
     <%= f.field_container :preferred_assetlinks do %>
       <%= f.label :preferred_assetlinks, raw(Spree.t(:assetlinks)) %>
@@ -182,6 +184,22 @@
   </div>
 </div>
 
+<!-- ======================== Footer ======================== -->
+<div class="card mb-4">
+  <div class="card-body">
+    <div data-hook="admin_tenant_form_fields" class="row mt-4">
+      <div class="col-12 mb-4">
+        <h4>Footer <span class="text-muted" style="font-size: 1rem; font-weight: normal;">(Footer is for customer support details and tenant address)</span></h4>
+      </div>
+      <!-- Footer Field -->
+      <div class="col-12">
+        <%= render partial: 'spree/admin/tenants/form/footer', locals: { f: f } %>
+        <%= render partial: 'spree/admin/tenants/form/social', locals: { f: f } %>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- ======================== Redirect Settings ======================== -->
 <div class="card mb-4">
   <div class="card-body">

data/app/views/spree/admin/tenants/form/_footer.html.erb

@@ -0,0 +1,31 @@
+<div data-hook="admin_tenant_support_fields" class="row">
+  <div class="col-6">
+    <%= f.field_container :customer_support_email do %>
+      <%= f.label :customer_support_email, 'Customer support email' %>
+      <%= f.email_field :customer_support_email, class: 'form-control', placeholder: 'support@example.com' %>
+      <% if f.object.errors[:customer_support_email].any? %>
+        <div class="error text-danger"><%= f.object.errors[:customer_support_email].join(', ') %></div>
+      <% end %>
+    <% end %>
+  </div>
+
+  <div class="col-6">
+    <%= f.field_container :contact_phone do %>
+      <%= f.label :contact_phone, 'Contact phone' %>
+      <%= f.telephone_field :contact_phone, class: 'form-control', placeholder: '+855 12 345 678' %>
+      <% if f.object.errors[:contact_phone].any? %>
+        <div class="error text-danger"><%= f.object.errors[:contact_phone].join(', ') %></div>
+      <% end %>
+    <% end %>
+  </div>
+
+  <div class="col-12 mt-3">
+    <%= f.field_container :address do %>
+      <%= f.label :address, 'Address' %>
+      <%= f.text_area :address, class: 'form-control', rows: 3, placeholder: 'Store address' %>
+      <% if f.object.errors[:address].any? %>
+        <div class="error text-danger"><%= f.object.errors[:address].join(', ') %></div>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/tenants/form/_social.html.erb

@@ -0,0 +1,31 @@
+<div data-hook="admin_tenant_social_fields" class="row">
+  <div class="col-4">
+    <%= f.field_container :preferred_facebook do %>
+      <%= f.label :preferred_facebook, 'Facebook URL' %>
+      <%= f.url_field :preferred_facebook, class: 'form-control', placeholder: 'https://facebook.com/yourpage' %>
+      <% if f.object.errors[:preferred_facebook].any? %>
+        <div class="error text-danger"><%= f.object.errors[:preferred_facebook].join(', ') %></div>
+      <% end %>
+    <% end %>
+  </div>
+
+  <div class="col-4">
+    <%= f.field_container :preferred_twitter do %>
+      <%= f.label :preferred_twitter, 'Twitter URL' %>
+      <%= f.url_field :preferred_twitter, class: 'form-control', placeholder: 'https://twitter.com/yourhandle' %>
+      <% if f.object.errors[:preferred_twitter].any? %>
+        <div class="error text-danger"><%= f.object.errors[:preferred_twitter].join(', ') %></div>
+      <% end %>
+    <% end %>
+  </div>
+
+  <div class="col-4">
+    <%= f.field_container :preferred_instagram do %>
+      <%= f.label :preferred_instagram, 'Instagram URL' %>
+      <%= f.url_field :preferred_instagram, class: 'form-control', placeholder: 'https://instagram.com/youraccount' %>
+      <% if f.object.errors[:preferred_instagram].any? %>
+        <div class="error text-danger"><%= f.object.errors[:preferred_instagram].join(', ') %></div>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -21,7 +21,7 @@
                   <%= render 'spree_cm_commissioner/order_mailer/order_total', order: @order %>
                   <%= render 'spree_cm_commissioner/order_mailer/your_booking', order: @order, show_booking_header: true %>
                   <%= render 'spree_cm_commissioner/order_mailer/tenant/customer_info', order: @order %>
-                  <%= render 'spree_cm_commissioner/order_mailer/tenant/support_contact' %>
+                  <%= render 'spree_cm_commissioner/order_mailer/tenant/support_contact', order: @order, name: @name%>
                 </div>
               </div>
             <% end %>

data/app/views/spree_cm_commissioner/layouts/order_mailer.html.erb

@@ -26,7 +26,7 @@
                 <% if @order.tenant.nil? %>
                   <%= render 'spree_cm_commissioner/order_mailer/footer', store: @order.store %>
                 <% else %>
-                  <%= render 'spree_cm_commissioner/order_mailer/tenant/footer', store: @order.store %>
+                  <%= render 'spree_cm_commissioner/order_mailer/tenant/footer', tenant: @order.tenant %>
                 <% end %>
               </td>
             </tr>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_footer.html.erb

@@ -1,24 +1,31 @@
 <div class="email-footer_inner">
-  <div class="mb-24"><%= store.description%></div>
-  <div class="mb-24 f-14"><%= store.address%></div>
+  <div class="mb-24"><%= tenant&.description %></div>
+  <div class="mb-24 f-14"><%= tenant&.address %></div>
   <h2 class="mb-24">Connect with us</h2>
   <table class="mb-24 social_icons">
     <tbody>
       <tr>
-        <% if store.facebook? %>
+        <% if tenant&.preferred_facebook.present? %>
           <td class="social_icon">
-            <%= link_to store.facebook, target: :_blank do %>
+            <%= link_to tenant.preferred_facebook, target: :_blank do %>
               <%= image_tag "mailer/facebook.png", class: "mail-icon"%>
             <% end %>
           </td>
         <% end %>
-        <% if store.instagram?%>
+        <% if tenant&.preferred_instagram.present? %>
           <td class="social_icon">
-            <%= link_to store.instagram, target: :_blank do %>
+            <%= link_to tenant.preferred_instagram, target: :_blank do %>
               <%= image_tag "mailer/instagram.png", class: "mail-icon"%>
             <% end %>
           </td>
         <% end %>
+        <% if tenant&.preferred_twitter.present? %>
+          <td class="social_icon">
+            <%= link_to tenant.preferred_twitter, target: :_blank do %>
+              <%= image_tag "mailer/twitter.png", class: "mail-icon"%>
+            <% end %>
+          </td>
+        <% end %>
       </tr>
     </tbody>
   </table>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_support_contact.html.erb

@@ -1,33 +1,32 @@
 <div class="content-cell">
-<div class="container">
-  <h2><%= I18n.t('mail.order_mailer.bookmeplus_support')%></h2>
-  <div class="flex two-columns">
-    <div class="two-columns-item">
-      <div class="flex two-columns-item_detail">
-        <div class="two-columns_icon"><%= image_tag "mailer/tenant_phone.png", class: "mail-icon"%></div>
-        <div class="two-columns_text-container">
-          <p class="two-columns_title">Contact</p>
-          <% if @order.store.contact_phone.present? %>
-            <p class="two-columns_description">
-              <%= link_to @order.store.contact_phone, "tel:#{@order.store.contact_phone}" %>
-            </p>
-          <% end %>
+  <div class="container">
+    <h2><%= name %> Support</h2>
+    <div class="flex two-columns">
+      <div class="two-columns-item">
+        <div class="flex two-columns-item_detail">
+          <div class="two-columns_icon"><%= image_tag "mailer/tenant_phone.png", class: "mail-icon"%></div>
+          <div class="two-columns_text-container">
+            <p class="two-columns_title">Contact</p>
+            <% if order&.tenant&.contact_phone&.present? %>
+              <p class="two-columns_description">
+                <%= link_to order.tenant.contact_phone, "tel:#{order.tenant.contact_phone}" %>
+              </p>
+            <% end %>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="vertical-separater"></div>
-    <div class="two-columns-item">
-      <div class="flex two-columns-item_detail">
-        <div class="two-columns_icon"><%= image_tag "mailer/mail.png", class: "mail-icon"%></div>
-        <div class="two-columns_text-container">
-          <p class="two-columns_title">Email</p>
+      <div class="vertical-separater"></div>
+      <div class="two-columns-item">
+        <div class="flex two-columns-item_detail">
+          <div class="two-columns_icon"><%= image_tag "mailer/mail.png", class: "mail-icon"%></div>
+          <div class="two-columns_text-container">
+            <p class="two-columns_title">Email</p>
             <p class="two-columns_description">
-          <%= @vendor&.support_email.present? ? link_to(@vendor.support_email, "mailto:#{@vendor.support_email}") : "N/A" %>
-          </p>
-
+              <%= order&.tenant&.customer_support_email.present? ? link_to(order.tenant.customer_support_email, "mailto:#{order.tenant.customer_support_email}") : "N/A" %>
+            </p>
+          </div>
         </div>
       </div>
     </div>
   </div>
 </div>
-</div>

data/config/locales/en.yml

@@ -454,14 +454,6 @@ en:
     admin:
       display_on:
         frontend_for_early_adopter: "Storefront for Early Adopter"
-      external_integrations_title: "External Integrations"
-      integration_sync_enqueued: "Integration sync has been enqueued"
-      integration_inactive: "Integration is inactive"
-      external_integrations:
-        view_result: "View Result"
-        sync_result: "Sync Result"
-        external_payload: "External Payload"
-        no_results: "No results found"
     event:
       check_in:
         success: "Guest check-in in successfully"

data/config/locales/km.yml

@@ -341,14 +341,6 @@ km:
     admin:
       display_on:
         frontend_for_early_adopter: "Storefront for Early Adopter"
-      external_integrations_title: "ការភ្ជាប់ខាងក្រៅ"
-      integration_sync_enqueued: "ការធ្វើសមកាលកម្មបានដាក់ក្នុងជួរ"
-      integration_inactive: "ការភ្ជាប់មិនដំណើរការ"
-      external_integrations:
-        view_result: "មើលលទ្ធផល"
-        sync_result: "លទ្ធផលធ្វើសមកាលកម្ម"
-        external_payload: "ទិន្នន័យខាងក្រៅ"
-        no_results: "មិនមានលទ្ធផលទេ"
     event:
       check_in:
         success: "Guest check-in in successfully"

data/config/routes.rb

@@ -283,13 +283,6 @@ Spree::Core::Engine.add_routes do
         post :set_webhook
       end
     end
-    resources :integrations do
-      member do
-        post :enqueue_polling
-      end
-      resources :sessions, only: [:index], controller: 'integration_sessions'
-      resources :mappings, only: [:index], controller: 'integration_mappings'
-    end
 
     resources :webhooks_subscribers do
       resources :rules, controller: :webhooks_subscriber_rules, except: %i[index show]
@@ -702,7 +695,6 @@ Spree::Core::Engine.add_routes do
 
         resources :seat_layouts, only: %i[show index]
         resources :inventory_items, only: %i[index]
-        resources :event_matches, only: %i[index]
         namespace :transit do
           resources :draft_orders, only: %i[create]
         end

data/db/migrate/20251209022924_add_contact_fields_to_cm_tenants.rb

@@ -0,0 +1,9 @@
+class AddContactFieldsToCmTenants < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_tenants, :customer_support_email, :string, if_not_exists: true
+    add_column :cm_tenants, :address, :text, if_not_exists: true
+    add_column :cm_tenants, :contact_phone, :string, if_not_exists: true
+    add_index :cm_tenants, :customer_support_email, if_not_exists: true
+    add_index :cm_tenants, :contact_phone, if_not_exists: true
+  end
+end

data/lib/cm_app_logger.rb

@@ -1,18 +1,17 @@
 # lib/cm_app_logger.rb
 module CmAppLogger
   def self.log(label:, data: nil)
-    message = { label: label, data: safe_serialize(data) }
+    message = { label: label, data: data }
     start_time = Time.current
     Rails.logger.info(message.to_json)
 
     return unless block_given?
 
-    # Capture the block's return value and return it to preserve existing behavior for callers expecting that value.
+    # Capture the block’s return value and return it to preserve existing behavior for callers expecting that value.
     block_result = yield
 
     message[:start_time] = start_time
     message[:duration_ms] = (Time.current - start_time) * 1000
-    message[:result] = safe_serialize(block_result)
     Rails.logger.info(message.to_json)
     block_result
   end
@@ -20,26 +19,9 @@ module CmAppLogger
   def self.error(label:, data: nil)
     message = {
       label: label,
-      data: safe_serialize(data)
+      data: data
     }
 
     Rails.logger.error(message.to_json)
   end
-
-  def self.safe_serialize(obj)
-    case obj
-    when Hash
-      obj.transform_values { |v| safe_serialize(v) }
-    when Array
-      obj.map { |item| safe_serialize(item) }
-    when NilClass, TrueClass, FalseClass, Numeric, String, Symbol
-      obj
-    when ActiveJob::Base
-      # Don't serialize the entire job object - just its class and ID
-      { job_class: obj.class.name, job_id: obj.job_id }
-    else
-      # For other objects, try to_s as fallback
-      obj.respond_to?(:id) ? { class: obj.class.name, id: obj.id } : obj.to_s
-    end
-  end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.0-pre7'.freeze
+  VERSION = '2.5.0.pre.pre8'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -55,17 +55,16 @@ require 'byebug' if Rails.env.development? || Rails.env.test?
 
 module SpreeCmCommissioner
   class << self
-    # Allows overriding the default Redis connection pools with custom ones
-    attr_writer :inventory_redis_pool
+    # Allows overriding the default Redis connection pool with a custom one
+    attr_writer :redis_pool
 
-    # Inventory Redis pool for inventory management
-    def inventory_redis_pool
-      @inventory_redis_pool ||= default_redis_pool
+    def redis_pool
+      @redis_pool ||= default_redis_pool
     end
 
-    # Resets all Redis pools, useful for testing or reinitialization
-    def reset_redis_pools
-      @inventory_redis_pool = nil
+    # Resets the Redis pool, useful for testing or reinitialization
+    def reset_redis_pool
+      @redis_pool = nil
     end
 
     private