spree_cm_commissioner 2.4.3 → 2.5.0.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f580394367847906251ac52666c73ae79bb1a117948805217616c0a83f9300a
-  data.tar.gz: e8b7ae961151a074aab2084e7600b55da2969405143cf1b9e4cd1b95fcd7040b
+  metadata.gz: 6f64a6d2661d4c1deb862d020b44eca3748d001e0376731881b47de3c1e4965c
+  data.tar.gz: 4a11c037dd432001d56d379c73e1cad574971f2a1cd8cc5ef3cbb1585b297c3b
 SHA512:
-  metadata.gz: 35e303df725eb93bb52a3eceb55672668cea800d77dd7c4e4d938b9caf0585477044e20fe646f2a2a7da5209a4ceff6c78ccf8e6adb862378373a66bd1525d19
-  data.tar.gz: f91afe8506292cf778cfb3b8bfdc87f5d2545c2e079abdf5f5d881441c3ae758f218bcbb6798756f860734b5c3af82be30250c2c0a2f5a9e2aea96782d7623ed
+  metadata.gz: 1e3de7556ebafefc89a00bbf454f2cb70700ef9dc56b8131b103f9f26f7e3af8341fcf0bc4c0b757a372128fbf56d6ecf967682ba46f97f0b117f0b0319ee979
+  data.tar.gz: ea662f3962d01be3d39e11ba4d86611fcc3713c03061ab8e0131c2063acfdb70ade45b77f821a616ad3320637d2ba547389a91a5f14bbe05530d26ac40c692fd

data/Gemfile.lock

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

data/app/controllers/spree/api/v2/storefront/popular_route_places_controller.rb

@@ -19,7 +19,8 @@ module Spree
           # override
           def collection
             @collection ||= collection_finder.new.execute(
-              route_type: params[:route_type]
+              route_type: params[:route_type],
+              query: params[:query]
             )
           end
 
@@ -51,6 +52,11 @@ module Spree
             )
           end
 
+          # override
+          def required_schema
+            SpreeCmCommissioner::PopularRoutePlacesRequestSchema
+          end
+
           def include_vendors?
             resource_includes.include?(:vendors) || false
           end

data/app/controllers/spree/api/v2/storefront/route_places_controller.rb

@@ -3,22 +3,22 @@
 # GET /api/v2/storefront/route_places
 #
 # Finds places (origins or destinations) that are connected to a given place through existing routes.
-# Optionally filters results by keyword or route_type. Supports two modes:
+# Optionally filters results by query or route_type. Supports two modes:
 #
 # Usage 1: Connected places (requires place_id)
 #   - Finds places connected to a specific place via routes
 #   - Returns origins/destinations that have routes with the specified place
 #
-# Usage 2: Keyword search (requires query, place_id optional)
-#   - Searches all route places by keyword
-#   - Returns all origins/destinations matching the keyword
+# Usage 2: query search (requires query, place_id optional)
+#   - Searches all route places by query
+#   - Returns all origins/destinations matching the query
 #
 # Query Parameters:
 #   - place_type: [String] Required. Type of route place: 'origin' or 'destination'
 #     * 'origin': returns origins that have routes TO the specified place (if place_id provided)
 #     * 'destination': returns destinations that have routes FROM the specified place (if place_id provided)
 #   - place_id: [Integer] Optional. The place ID to find connected places for
-#   - query: [String] Optional. Keyword to filter place names (case-insensitive)
+#   - query: [String] Optional. query to filter place names (case-insensitive)
 #   - include: Optional comma-separated list (e.g., 'vendors,nearby_places')
 #
 # Response: Collection of places serialized with PlaceSerializer
@@ -27,15 +27,15 @@
 #   - Returns empty collection if place_type is invalid
 #   - If place_id provided: returns places connected to that place
 #   - If place_id blank: returns all origins/destinations
-#   - Filters results by keyword or route_type if provided
+#   - Filters results by query or route_type if provided
 #
 # @example Mode 1: Find destinations connected to origin place ID 123
 #   GET /api/v2/storefront/route_places?place_id=123&place_type=destination
 #
-# @example Mode 2: Search all destination places by keyword
+# @example Mode 2: Search all destination places by query
 #   GET /api/v2/storefront/route_places?place_type=destination&query=Phnom
 #
-# @example Combined: Find origins connected to place 456, filtered by keyword
+# @example Combined: Find origins connected to place 456, filtered by query
 #   GET /api/v2/storefront/route_places?place_id=456&place_type=origin&query=Siem
 module Spree
   module Api
@@ -49,7 +49,7 @@ module Spree
             @collection ||= collection_finder.new(
               place_type: params[:place_type],
               place_id: params[:place_id],
-              keyword: params[:query],
+              query: params[:query],
               route_type: params[:route_type]
             ).execute
           end

data/app/finders/spree_cm_commissioner/places/find_with_route.rb

@@ -2,14 +2,14 @@
 #
 # @param place_type [String] Required. 'origin' or 'destination'
 # @param place_id [Integer] Optional. Filter by connected place ID
-# @param keyword [String] Optional. Filter by place name (case-insensitive)
+# @param query [String] Optional. Filter by place name (case-insensitive)
 # @param route_type [Symbol, String] Optional. Filter by route type from associated trips (e.g., :ferry, :bus)
 #
 # @return [ActiveRecord::Relation<SpreeCmCommissioner::Place>]
 #
 # Modes:
 #   - place_id only: returns connected places (origins TO or destinations FROM given place)
-#   - keyword only: filters by name
+#   - query only: filters by name
 #   - route_type only: filters by trip route types on those routes
 #   - combinations: connected places filtered by name and/or route type
 #   - neither: all origins/destinations in routes
@@ -17,17 +17,17 @@
 # @example Origins with ferry trips to place 123
 #   FindWithRoute.new(place_type: 'origin', place_id: 123, route_type: :ferry).execute
 #
-# @example Destinations filtered by keyword and route type
-#   FindWithRoute.new(place_type: 'destination', keyword: 'Phnom', route_type: :bus).execute
+# @example Destinations filtered by query and route type
+#   FindWithRoute.new(place_type: 'destination', query: 'Phnom', route_type: :bus).execute
 module SpreeCmCommissioner
   module Places
     class FindWithRoute
-      attr_reader :place_type, :place_id, :keyword, :route_type
+      attr_reader :place_type, :place_id, :query, :route_type
 
-      def initialize(place_type:, place_id: nil, keyword: nil, route_type: nil)
+      def initialize(place_type:, place_id: nil, query: nil, route_type: nil)
         @place_type = place_type
         @place_id = place_id
-        @keyword = keyword
+        @query = query
         @route_type = route_type
       end
 
@@ -36,7 +36,7 @@ module SpreeCmCommissioner
         return SpreeCmCommissioner::Place.none if place_id.present? && !SpreeCmCommissioner::Place.exists?(place_id)
 
         result = scope
-        result = apply_keyword_filter(result) if keyword.present?
+        result = apply_query_filter(result) if query.present?
         result = apply_route_type_filter(result) if route_type.present?
         result
       end
@@ -57,8 +57,8 @@ module SpreeCmCommissioner
         end
       end
 
-      def apply_keyword_filter(result)
-        result.where('cm_places.name ILIKE ?', "%#{keyword}%")
+      def apply_query_filter(result)
+        result.where('cm_places.name ILIKE ?', "%#{query}%")
       end
 
       def apply_route_type_filter(result)

data/app/finders/spree_cm_commissioner/routes/find_popular.rb

@@ -24,26 +24,22 @@
 module SpreeCmCommissioner
   module Routes
     class FindPopular
-      def execute(route_type: nil)
-        scope(route_type: route_type)
+      def execute(route_type: nil, query: nil)
+        scope(route_type: route_type, query: query)
       end
 
       private
 
-      def scope(route_type: nil)
-        result = SpreeCmCommissioner::Route
-                 .includes(:origin_place, :destination_place)
+      def scope(route_type:, query:)
+        includes_associations = %i[origin_place destination_place]
+        includes_associations << :trips if route_type.present?
+        result = SpreeCmCommissioner::Route.includes(*includes_associations)
 
-        if route_type.present?
-          # Filter routes that have trips with the specified route_type
-          route_scope = SpreeCmCommissioner::Route
-                        .joins(:trips)
-                        .where(cm_trips: { route_type: route_type.to_sym })
-          result = result.where(id: route_scope.select(:id))
-        end
+        result = result.joins(:trips).where(cm_trips: { route_type: route_type.to_sym }) if route_type.present?
 
-        result.order(Arel.sql('COALESCE(fulfilled_order_count, 0) DESC'))
-              .order(Arel.sql('COALESCE(order_count, 0) DESC'))
+        result = result.where('cm_routes.route_name ILIKE ?', "%#{query}%") if query.present?
+
+        result.distinct.order(fulfilled_order_count: :desc, order_count: :desc)
       end
     end
   end

data/app/models/concerns/spree_cm_commissioner/tenant_preference.rb

@@ -12,6 +12,9 @@ module SpreeCmCommissioner
       preference :brand_primary_color, :string, default: ''
       preference :redirect_target_host, :string, default: ''
       preference :redirect_excluded_paths, :string, default: ''
+      preference :facebook, :string, default: ''
+      preference :twitter, :string, default: ''
+      preference :instagram, :string, default: ''
     end
   end
 end

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/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/spree_cm_commissioner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.5.0.pre.pre2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-11 00:00:00.000000000 Z
+date: 2025-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1771,6 +1771,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
@@ -2196,6 +2197,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
@@ -2895,6 +2898,7 @@ files:
 - 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
+- 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
@@ -3065,9 +3069,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1