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

data/app/jobs/spree_cm_commissioner/customer_notification_sender_job.rb

@@ -1,8 +1,8 @@
 module SpreeCmCommissioner
   class CustomerNotificationSenderJob < ApplicationUniqueJob
-    def perform(customer_notification_id, user_ids = nil)
-      customer_notification = SpreeCmCommissioner::CustomerNotification.find(customer_notification_id)
-      SpreeCmCommissioner::CustomerNotificationSender.call(customer_notification: customer_notification, user_ids: user_ids)
+    def perform(options = {})
+      customer_notification = SpreeCmCommissioner::CustomerNotification.find(options[:customer_notification_id])
+      SpreeCmCommissioner::CustomerNotificationSender.call(customer_notification: customer_notification, user_ids: options[:user_ids])
     end
   end
 end

data/app/jobs/spree_cm_commissioner/enqueue_cart/add_item_job.rb

@@ -1,14 +1,14 @@
 module SpreeCmCommissioner
   module EnqueueCart
     class AddItemJob < ApplicationUniqueJob
-      def perform(order_id, variant_id, quantity, public_metadata, private_metadata, options) # rubocop:disable Metrics/ParameterLists
+      def perform(options = {})
         SpreeCmCommissioner::EnqueueCart::AddItem.call(
-          order_id: order_id,
-          variant_id: variant_id,
-          quantity: quantity,
-          public_metadata: public_metadata,
-          private_metadata: private_metadata,
-          options: options,
+          order_id: options[:order_id],
+          variant_id: options[:variant_id],
+          quantity: options[:quantity],
+          public_metadata: options[:public_metadata],
+          private_metadata: options[:private_metadata],
+          options: options[:options],
           job_id: job_id
         )
       end

data/app/jobs/spree_cm_commissioner/ensure_event_for_product_line_item_guests_job.rb

@@ -5,7 +5,7 @@ module SpreeCmCommissioner
       Spree::Taxon.event.includes(:children_products).find_each do |event|
         event.children_products.where('event_id IS NULL OR event_id != ?', event.id).find_each do |product|
           product.update_columns(event_id: event.id) # rubocop:disable Rails/SkipsModelValidations
-          ::SpreeCmCommissioner::ProductEventIdToChildrenSyncerJob.perform_later(product.id)
+          ::SpreeCmCommissioner::ProductEventIdToChildrenSyncerJob.perform_later(product_id: product.id)
         end
       end
     end

data/app/jobs/spree_cm_commissioner/event_line_items_date_syncer_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class EventLineItemsDateSyncerJob < ApplicationJob
-    def perform(event_id)
-      event = Spree::Taxon.event.find(event_id)
+    def perform(options = {})
+      event = Spree::Taxon.event.find(options[:event_id])
       SpreeCmCommissioner::EventLineItemsDateSyncer.call(event: event)
     end
   end

data/app/jobs/spree_cm_commissioner/export_csv_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class ExportCsvJob < ApplicationUniqueJob
-    def perform(id)
-      Exports::ExportGuestCsvService.new(id).call
+    def perform(options = {})
+      Exports::ExportGuestCsvService.new(options[:export_id]).call
     end
   end
 end

data/app/jobs/spree_cm_commissioner/import_order_job.rb

@@ -1,14 +1,14 @@
 module SpreeCmCommissioner
   class ImportOrderJob < ApplicationUniqueJob
-    def perform(import_order_id, import_by_user_id, import_type)
-      if import_type == 'new_order'
+    def perform(options = {})
+      if options[:import_type] == 'new_order'
         SpreeCmCommissioner::Imports::CreateOrderService.new(
-          import_order_id: import_order_id,
-          import_by_user_id: import_by_user_id
+          import_order_id: options[:import_order_id],
+          import_by_user_id: options[:import_by_user_id]
         ).call
       else
         SpreeCmCommissioner::Imports::UpdateOrderService.new(
-          import_order_id: import_order_id
+          import_order_id: options[:import_order_id]
         ).call
       end
     end

data/app/jobs/spree_cm_commissioner/invalidate_cache_request_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class InvalidateCacheRequestJob < ApplicationUniqueJob
-    def perform(pattern)
-      SpreeCmCommissioner::InvalidateCacheRequest.call(pattern: pattern)
+    def perform(options = {})
+      SpreeCmCommissioner::InvalidateCacheRequest.call(pattern: options[:pattern])
     end
   end
 end

data/app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb

@@ -1,7 +1,13 @@
 module SpreeCmCommissioner
   class InventoryItemSyncerJob < ApplicationUniqueJob
-    def perform(inventory_id_and_quantities:)
-      InventoryItemSyncer.call(inventory_id_and_quantities:)
+    # :line_item_ids, :inventory_id_and_quantities
+    #
+    # :line_item_ids is included for unique job key generation to prevent duplicate jobs,
+    # though it's not used in the perform method implementation.
+    def perform(options = {})
+      InventoryItemSyncer.call(
+        inventory_id_and_quantities: options[:inventory_id_and_quantities]
+      )
     end
   end
 end

data/app/jobs/spree_cm_commissioner/option_type_variants_public_metadata_updater_job.rb

@@ -1,8 +1,12 @@
 module SpreeCmCommissioner
   class OptionTypeVariantsPublicMetadataUpdaterJob < ApplicationUniqueJob
-    def perform(option_type_id)
-      optino_type = ::Spree::OptionType.find(option_type_id)
-      optino_type.variants.find_each(&:set_options_to_public_metadata!)
+    def perform(options = {})
+      option_type = ::Spree::OptionType.find_by(id: options[:option_type_id])
+
+      # job can be queued with invalid id or record is created but rolled back or deleted.
+      return if option_type.blank?
+
+      option_type.variants.find_each(&:set_options_to_public_metadata!)
     end
   end
 end

data/app/jobs/spree_cm_commissioner/option_value_variants_public_metadata_updater_job.rb

@@ -1,7 +1,11 @@
 module SpreeCmCommissioner
   class OptionValueVariantsPublicMetadataUpdaterJob < ApplicationUniqueJob
-    def perform(option_value_id)
-      option_value = ::Spree::OptionValue.find(option_value_id)
+    def perform(options = {})
+      option_value = ::Spree::OptionValue.find_by(id: options[:option_value_id])
+
+      # job can be queued with invalid id or record is created but rolled back or deleted.
+      return if option_value.blank?
+
       option_value.variants.find_each(&:set_options_to_public_metadata!)
     end
   end

data/app/jobs/spree_cm_commissioner/order_complete_telegram_sender_job.rb

@@ -4,8 +4,8 @@ module SpreeCmCommissioner
   class OrderCompleteTelegramSenderJob < ApplicationUniqueJob
     queue_as :telegram_bot
 
-    def perform(order_id)
-      order = Spree::Order.find(order_id)
+    def perform(options = {})
+      order = Spree::Order.find(options[:order_id])
       SpreeCmCommissioner::OrderCompleteTelegramSender.call(order: order)
     end
   end

data/app/jobs/spree_cm_commissioner/product_event_id_to_children_syncer_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class ProductEventIdToChildrenSyncerJob < ApplicationUniqueJob
-    def perform(product_id)
-      product = Spree::Product.find(product_id)
+    def perform(options = {})
+      product = Spree::Product.find(options[:product_id])
       SpreeCmCommissioner::ProductEventIdToChildrenSyncer.call(product: product)
     end
   end

data/app/jobs/spree_cm_commissioner/reports_assigner_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class ReportsAssignerJob < ApplicationUniqueJob
-    def perform(queryable_id, queryable_type)
-      SpreeCmCommissioner::ReportsAssigner.call(queryable_id: queryable_id, queryable_type: queryable_type)
+    def perform(options = {})
+      SpreeCmCommissioner::ReportsAssigner.call(queryable_id: options[:queryable_id], queryable_type: options[:queryable_type])
     end
   end
 end

data/app/jobs/spree_cm_commissioner/sms_pin_code_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class SmsPinCodeJob < SpreeCmCommissioner::SmsJob
     # options = { from: xxxx, to: xxxx, body: xxxx }
-    def perform(options)
+    def perform(options = {})
       SpreeCmCommissioner::Sms.call(options)
     end
   end

data/app/jobs/spree_cm_commissioner/state_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class StateJob < ApplicationUniqueJob
-    def perform(state_id)
-      state = ::Spree::State.find_by(id: state_id)
+    def perform(options = {})
+      state = ::Spree::State.find_by(id: options[:state_id])
       StateUpdater.call(state: state)
     end
   end

data/app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb

@@ -2,7 +2,10 @@ module SpreeCmCommissioner
   module Stock
     class InventoryItemsAdjusterJob < ApplicationUniqueJob
       def perform(options = {})
-        variant = Spree::Variant.find(options[:variant_id])
+        variant = Spree::Variant.find_by(id: options[:variant_id])
+
+        # potentially the variant was deleted during the job wait time, we just skip in that case.
+        return if variant.blank?
 
         SpreeCmCommissioner::Stock::InventoryItemsAdjuster.call(variant: variant, quantity: options[:quantity])
       end

data/app/jobs/spree_cm_commissioner/stock/inventory_items_generator_job.rb

@@ -1,8 +1,8 @@
 module SpreeCmCommissioner
   module Stock
     class InventoryItemsGeneratorJob < ApplicationUniqueJob
-      def perform(variant_id:)
-        variant = Spree::Variant.find(variant_id)
+      def perform(options = {})
+        variant = Spree::Variant.find(options[:variant_id])
 
         SpreeCmCommissioner::Stock::InventoryItemsGenerator.call(variant: variant)
       end

data/app/jobs/spree_cm_commissioner/transit/route_fulfilled_order_count_incrementer_job.rb

@@ -1,8 +1,8 @@
 module SpreeCmCommissioner
   module Transit
     class RouteFulfilledOrderCountIncrementerJob < ApplicationUniqueJob
-      def perform(order_id:)
-        order = Spree::Order.find(order_id)
+      def perform(options = {})
+        order = Spree::Order.find(options[:order_id])
         SpreeCmCommissioner::Routes::IncrementFulfilledOrderCount.call(order: order)
       end
     end

data/app/jobs/spree_cm_commissioner/transit/route_order_count_incrementer_job.rb

@@ -1,8 +1,8 @@
 module SpreeCmCommissioner
   module Transit
     class RouteOrderCountIncrementerJob < ApplicationUniqueJob
-      def perform(order_id:)
-        order = Spree::Order.find(order_id)
+      def perform(options = {})
+        order = Spree::Order.find(options[:order_id])
         SpreeCmCommissioner::Routes::IncrementOrderCount.call(order: order)
       end
     end

data/app/jobs/spree_cm_commissioner/transit/route_previous_trip_count_decrementer_job.rb

@@ -5,8 +5,8 @@ module SpreeCmCommissioner
     class RoutePreviousTripCountDecrementerJob < ApplicationUniqueJob
       queue_as :default
 
-      def perform(previous_route_id:)
-        SpreeCmCommissioner::Routes::DecrementPreviousTripCount.call(previous_route_id: previous_route_id)
+      def perform(options = {})
+        SpreeCmCommissioner::Routes::DecrementPreviousTripCount.call(previous_route_id: options[:previous_route_id])
       end
     end
   end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_decrementer_job.rb

@@ -1,8 +1,8 @@
 module SpreeCmCommissioner
   module Transit
     class RouteTripCountDecrementerJob < ApplicationUniqueJob
-      def perform(trip_id:)
-        trip = SpreeCmCommissioner::Trip.find(trip_id)
+      def perform(options = {})
+        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
         SpreeCmCommissioner::Routes::DecrementTripCount.call(trip: trip)
       end
     end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_incrementer_job.rb

@@ -1,8 +1,8 @@
 module SpreeCmCommissioner
   module Transit
     class RouteTripCountIncrementerJob < ApplicationUniqueJob
-      def perform(trip_id:)
-        trip = SpreeCmCommissioner::Trip.find(trip_id)
+      def perform(options = {})
+        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
         SpreeCmCommissioner::Routes::IncrementTripCount.call(trip: trip)
       end
     end

data/app/jobs/spree_cm_commissioner/vendor_creation_telegram_alert_sender_job.rb

@@ -2,8 +2,8 @@ module SpreeCmCommissioner
   class VendorCreationTelegramAlertSenderJob < ApplicationUniqueJob
     queue_as :telegram_bot
 
-    def perform(vendor_id)
-      vendor = Spree::Vendor.find(vendor_id)
+    def perform(options = {})
+      vendor = Spree::Vendor.find(options[:vendor_id])
       SpreeCmCommissioner::VendorCreationTelegramAlertSender.call(vendor: vendor)
     end
   end

data/app/jobs/spree_cm_commissioner/vendor_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class VendorJob < ApplicationUniqueJob
-    def perform(vendor_id)
-      vendor = ::Spree::Vendor.find(vendor_id)
+    def perform(options = {})
+      vendor = ::Spree::Vendor.find(options[:vendor_id])
       VendorUpdater.call(vendor: vendor)
     end
   end

data/app/jobs/spree_cm_commissioner/waiting_room_session_firebase_logger_job.rb

@@ -23,7 +23,7 @@ module SpreeCmCommissioner
   class WaitingRoomSessionFirebaseLoggerJob < ApplicationUniqueJob
     retry_on StandardError, wait: :exponentially_longer, attempts: 4
 
-    def perform(options)
+    def perform(options = {})
       room_session = SpreeCmCommissioner::WaitingRoomSession.find(options[:room_session_id])
       waiting_guest_firebase_doc_id = options[:waiting_guest_firebase_doc_id]
 

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

@@ -104,7 +104,7 @@ module SpreeCmCommissioner
     end
 
     def update_variants_metadata
-      SpreeCmCommissioner::OptionTypeVariantsPublicMetadataUpdaterJob.perform_later(id)
+      SpreeCmCommissioner::OptionTypeVariantsPublicMetadataUpdaterJob.perform_later(option_type_id: id)
     end
 
     private

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

@@ -76,7 +76,7 @@ module SpreeCmCommissioner
     end
 
     def update_variants_metadata
-      SpreeCmCommissioner::OptionValueVariantsPublicMetadataUpdaterJob.perform_later(id)
+      SpreeCmCommissioner::OptionValueVariantsPublicMetadataUpdaterJob.perform_later(option_value_id: id)
     end
 
     private

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

@@ -83,7 +83,7 @@ module SpreeCmCommissioner
 
     def precalculate_conversion
       line_items.each do |item|
-        SpreeCmCommissioner::ConversionPreCalculatorJob.perform_later(item.product_id)
+        SpreeCmCommissioner::ConversionPreCalculatorJob.perform_later(product_id: item.product_id)
       end
     end
 
@@ -246,7 +246,7 @@ module SpreeCmCommissioner
     end
 
     def notify_order_complete_telegram_notification_to_user
-      SpreeCmCommissioner::OrderCompleteTelegramSenderJob.perform_later(id) if user_id.present?
+      SpreeCmCommissioner::OrderCompleteTelegramSenderJob.perform_later(order_id: id) if user_id.present?
     end
 
     def send_order_requested_app_notification_to_user

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

@@ -22,7 +22,7 @@ module SpreeCmCommissioner
     end
 
     def export_csv
-      SpreeCmCommissioner::ExportCsvJob.perform_later(id)
+      SpreeCmCommissioner::ExportCsvJob.perform_later(export_id: id)
     end
   end
 end

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -151,7 +151,7 @@ module SpreeCmCommissioner
     end
 
     def sync_event_id_to_children
-      ::SpreeCmCommissioner::ProductEventIdToChildrenSyncerJob.perform_later(id)
+      ::SpreeCmCommissioner::ProductEventIdToChildrenSyncerJob.perform_later(product_id: id)
     end
 
     def validate_event_taxons

data/app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb

@@ -119,7 +119,10 @@ module SpreeCmCommissioner
       end
 
       def schedule_sync_inventory(inventory_id_and_quantities)
-        SpreeCmCommissioner::InventoryItemSyncerJob.perform_later(inventory_id_and_quantities:)
+        SpreeCmCommissioner::InventoryItemSyncerJob.perform_later(
+          inventory_id_and_quantities: inventory_id_and_quantities,
+          line_item_ids: @line_item_ids
+        )
       end
     end
   end

data/app/models/spree_cm_commissioner/stock_item_decorator.rb

@@ -9,7 +9,7 @@ module SpreeCmCommissioner
     end
 
     def update_vendor_total_inventory
-      SpreeCmCommissioner::VendorJob.perform_later(vendor.id) if vendor.present?
+      SpreeCmCommissioner::VendorJob.perform_later(vendor_id: vendor.id) if vendor.present?
     end
 
     private
@@ -20,9 +20,9 @@ module SpreeCmCommissioner
 
     # When admin delete stock item, it will deduct stock from inventory item
     def adjust_inventory_items_async
-      params = { variant_id: variant.id, quantity: -count_on_hand }
-      CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: params) do
-        SpreeCmCommissioner::Stock::InventoryItemsAdjusterJob.perform_later(**params)
+      args = { variant_id: variant.id, quantity: -count_on_hand }
+      CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: args) do
+        SpreeCmCommissioner::Stock::InventoryItemsAdjusterJob.perform_later(**args)
       end
     end
   end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -135,7 +135,7 @@ module SpreeCmCommissioner
     def sync_event_dates_to_line_items
       return unless event? && depth == 1
 
-      ::SpreeCmCommissioner::EventLineItemsDateSyncerJob.perform_later(id)
+      ::SpreeCmCommissioner::EventLineItemsDateSyncerJob.perform_later(event_id: id)
     end
 
     private

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -185,7 +185,7 @@ module SpreeCmCommissioner
       end
 
       def update_state_total_inventory
-        SpreeCmCommissioner::StateJob.perform_later(default_state_id) unless default_state_id.nil?
+        SpreeCmCommissioner::StateJob.perform_later(state_id: default_state_id) unless default_state_id.nil?
       end
     end
 
@@ -209,7 +209,7 @@ module SpreeCmCommissioner
     end
 
     def send_telegram_vendor_creation_alert
-      VendorCreationTelegramAlertSenderJob.perform_later(id)
+      VendorCreationTelegramAlertSenderJob.perform_later(vendor_id: id)
     end
 
     delegate :present?, to: :tenant, prefix: true

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/services/spree_cm_commissioner/integrations/stadium_x_v1/inventory/unstock_inventory.rb

@@ -66,7 +66,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
             integration: integration
           )
 
-          guest_mapping.external_qr_data = ticket._id
+          guest_mapping.external_qr_data = group_ticket_qr_data([ticket])
           guest_mapping.mark_as_active!(external_payload: ticket.to_h)
         end
       end

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>