spree_cm_commissioner 2.5.0.pre.pre7 → 2.5.0.pre.pre9

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/bin/run_spec_group

@@ -0,0 +1,101 @@
+#!/usr/bin/env ruby
+
+# ============================================================================
+# Spec Group Runner - Parallel Test Execution
+# ============================================================================
+#
+# PURPOSE:
+#   Split all spec files into N equal groups and run a specific group.
+#   Used for parallel test execution in CI (GitHub Actions) and locally.
+#
+# HOW IT WORKS:
+#   1. Finds all *_spec.rb files in spec/ directory
+#   2. Sorts them alphabetically for consistent ordering
+#   3. Divides them into N equal groups (e.g., 10 groups)
+#   4. Runs RSpec on the files in the specified group
+#
+# USAGE:
+#   bin/run_spec_group <group_number> <total_groups>
+#
+# EXAMPLES:
+#   bin/run_spec_group 1 10   # Run group 1 out of 10 (files 1-15 if 150 total)
+#   bin/run_spec_group 5 10   # Run group 5 out of 10 (files 61-75 if 150 total)
+#   bin/run_spec_group 1 3    # Run first third of all specs
+#
+# CI USAGE (GitHub Actions):
+#   - Matrix strategy runs 10-12 parallel jobs (groups 1-12)
+#   - Each job runs ~1/10th or ~1/12th of total specs
+#   - Total test time = slowest group time (not sum of all)
+#   - Example: 150 specs × 2s each = 300s sequential
+#              150 specs ÷ 10 groups = 15 specs × 2s = 30s parallel
+#              150 specs ÷ 12 groups = 13 specs × 2s = 26s parallel
+#
+# LOCAL USAGE:
+#   - Run specific group to debug failing tests
+#   - Run multiple groups in parallel terminals
+#   - Faster iteration than running all specs
+#
+# OUTPUT:
+#   - Shows total spec count
+#   - Shows files per group
+#   - Lists all files in current group
+#   - Runs RSpec with those files
+#
+# WHERE USED:
+#   - .github/workflows/test_and_build_gem.yml (test job, matrix strategy)
+#   - Can be run locally for debugging
+#
+# ============================================================================
+
+group_num = ARGV[0]&.to_i
+total_groups = ARGV[1]&.to_i
+
+unless group_num && group_num > 0 && group_num <= total_groups
+  puts "Usage: bin/run_spec_group <group_number> [total_groups]"
+  puts "Example: bin/run_spec_group 1 10"
+  puts "  Runs group 1 out of 10 total groups"
+  exit 1
+end
+
+spec_dir = File.expand_path('../spec', __dir__)
+
+# Find all spec files and sort for consistent ordering
+all_spec_files = Dir.glob("#{spec_dir}/**/*_spec.rb").sort
+
+if all_spec_files.empty?
+  puts "❌ No spec files found in #{spec_dir}"
+  exit 1
+end
+
+# Calculate files per group
+files_per_group = (all_spec_files.length.to_f / total_groups).ceil
+
+# Get the files for this specific group
+start_idx = (group_num - 1) * files_per_group
+end_idx = [start_idx + files_per_group - 1, all_spec_files.length - 1].min
+
+if start_idx >= all_spec_files.length
+  puts "⚠️  Group #{group_num} has no spec files (total: #{all_spec_files.length} files across #{total_groups} groups)"
+  exit 0
+end
+
+group_files = all_spec_files[start_idx..end_idx]
+
+puts "=" * 80
+puts "Running Group #{group_num}/#{total_groups}"
+puts "Total spec files: #{all_spec_files.length}"
+puts "Files per group: ~#{files_per_group}"
+puts "This group: #{group_files.length} files (#{start_idx + 1}-#{end_idx + 1})"
+puts "=" * 80
+puts
+puts "📋 Files in this group:"
+group_files.each_with_index do |file, idx|
+  relative_path = file.sub("#{spec_dir}/", '')
+  puts "  #{start_idx + idx + 1}. #{relative_path}"
+end
+puts
+puts "=" * 80
+puts
+
+# Run rspec with the specific files
+exec("bundle", "exec", "rspec", *group_files)

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

@@ -10,7 +10,7 @@ module CmAppLogger
     # 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[:start_time] = start_time.iso8601(3)
     message[:duration_ms] = (Time.current - start_time) * 1000
     message[:result] = safe_serialize(block_result)
     Rails.logger.info(message.to_json)
@@ -26,20 +26,34 @@ module CmAppLogger
     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 }
+  # Safely serializes objects for JSON logging.
+  #
+  # @param obj [Object] The object to serialize
+  # @param depth [Integer] Internal parameter tracking recursion depth (max: 50)
+  # @return [Object] A JSON-safe representation of the input object
+  def self.safe_serialize(obj, depth: 0) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    return '[Max Depth Exceeded]' if depth > 50
+
+    if obj.is_a?(Hash)
+      obj.each_with_object({}) do |(k, v), memo|
+        memo[safe_serialize(k, depth: depth + 1)] = safe_serialize(v, depth: depth + 1)
+      end
+    elsif obj.is_a?(Array)
+      obj.map { |item| safe_serialize(item, depth: depth + 1) }
+    elsif obj.is_a?(Date)
+      obj.iso8601
+    elsif obj.is_a?(Time) || obj.is_a?(DateTime) || obj.is_a?(ActiveSupport::TimeWithZone)
+      obj.iso8601(3)
+    elsif obj.is_a?(ActiveJob::Base)
+      {
+        job_class: obj.class.name,
+        job_id: obj.job_id,
+        arguments: safe_serialize(obj.arguments, depth: depth + 1)
+      }
+    elsif obj.respond_to?(:id)
+      { class: obj.class.name, id: obj.id }
     else
-      # For other objects, try to_s as fallback
-      obj.respond_to?(:id) ? { class: obj.class.name, id: obj.id } : obj.to_s
+      obj.to_s
     end
   end
 end

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

@@ -5,6 +5,7 @@ FactoryBot.define do
   end
 
   factory :cm_vendor, parent: :vendor do
+    sequence(:name) { |n| "#{FFaker::Company.name} #{n}#{Kernel.rand(9999)}" }
     state { :active }
     default_state_id { Spree::State.first&.id }
     primary_product_type { :ecommerce }

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :cm_location_vendor_place, class: SpreeCmCommissioner::VendorPlace do
-    association :vendor, factory: :vendor
+    association :vendor, factory: :cm_vendor
     association :place, factory: :cm_place
 
     distance  { FFaker::Number.decimal }
@@ -10,7 +10,7 @@ FactoryBot.define do
   end
 
   factory :cm_vendor_place, class: SpreeCmCommissioner::VendorPlace do
-    association :vendor, factory: :vendor
+    association :vendor, factory: :cm_vendor
     association :place, factory: :cm_place
     association :location, factory: :cm_location_vendor_place
 
@@ -28,6 +28,7 @@ FactoryBot.define do
 
     trait :location do
       place_type { :location }
+      location { nil }
     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.pre9'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.0.pre.pre7
+  version: 2.5.0.pre.pre9
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-16 00:00:00.000000000 Z
+date: 2025-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1791,6 +1791,7 @@ files:
 - app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_schema.rb
 - app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_update_schema.rb
 - app/request_schemas/spree_cm_commissioner/inventory_item_schema.rb
+- app/request_schemas/spree_cm_commissioner/popular_route_places_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/profile_image_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/route_places_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/seat_layout_schema.rb
@@ -2244,6 +2245,8 @@ files:
 - app/views/spree/admin/tenants/_form.html.erb
 - app/views/spree/admin/tenants/_tabs.html.erb
 - app/views/spree/admin/tenants/edit.html.erb
+- app/views/spree/admin/tenants/form/_footer.html.erb
+- app/views/spree/admin/tenants/form/_social.html.erb
 - app/views/spree/admin/tenants/index.html.erb
 - app/views/spree/admin/tenants/new.html.erb
 - app/views/spree/admin/user_events/_events.html.erb
@@ -2527,6 +2530,7 @@ files:
 - app/views/spree_cm_commissioner/team_invite_mailer/_mailer_stylesheets.html.erb
 - app/views/spree_cm_commissioner/team_invite_mailer/send_team_invite_email.html.erb
 - bin/rails
+- bin/run_spec_group
 - config/brakeman.yml
 - config/initializers/assets.rb
 - config/initializers/doorkeeper.rb
@@ -2946,6 +2950,7 @@ files:
 - db/migrate/20251017101605_create_cm_integration_mappings.rb
 - db/migrate/20251113081853_add_index_to_spree_orders_updated_at.rb
 - db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb
+- db/migrate/20251209022924_add_contact_fields_to_cm_tenants.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md